Uecko/AbetoDesign_FactuGES2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tarea #721 -> Meter en facturas de proveedor la posibilidad de %IRPF para autonomos

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@20 93f398dd-4eb6-7a46-baf6-13f46f578da2
This commit is contained in:
David Arranz 2011-12-29 12:03:02 +00:00
parent 74c8cdb267
commit 3843c48282
18 changed files with 595 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Build/Build.fbl6
View File

Binary file not shown.

6
Database/scripts/factuges.sql
View File

@ -941,6 +941,8 @@ CREATE TABLE FACTURAS_PROVEEDOR (
IMPORTE_DESCUENTO TIPO_IMPORTE, IMPORTE_DESCUENTO TIPO_IMPORTE,
IVA TIPO_PORCENTAJE, IVA TIPO_PORCENTAJE,
IMPORTE_IVA TIPO_IMPORTE, IMPORTE_IVA TIPO_IMPORTE,
IRPF TIPO_PORCENTAJE,
IMPORTE_IRPF TIPO_IMPORTE,
RE TIPO_PORCENTAJE, RE TIPO_PORCENTAJE,
IMPORTE_RE TIPO_IMPORTE, IMPORTE_RE TIPO_IMPORTE,
IMPORTE_TOTAL TIPO_IMPORTE, IMPORTE_TOTAL TIPO_IMPORTE,
@ -2756,6 +2758,8 @@ CREATE VIEW V_FACTURAS_PROVEEDOR(
IMPORTE_DESCUENTO, IMPORTE_DESCUENTO,
IVA, IVA,
IMPORTE_IVA, IMPORTE_IVA,
IRPF,
IMPORTE_IRPF,
RE, RE,
IMPORTE_RE, IMPORTE_RE,
IMPORTE_TOTAL, IMPORTE_TOTAL,
@ -2799,6 +2803,8 @@ SELECT FACTURAS_PROVEEDOR.ID,
FACTURAS_PROVEEDOR.IMPORTE_DESCUENTO, FACTURAS_PROVEEDOR.IMPORTE_DESCUENTO,
FACTURAS_PROVEEDOR.IVA, FACTURAS_PROVEEDOR.IVA,
FACTURAS_PROVEEDOR.IMPORTE_IVA, FACTURAS_PROVEEDOR.IMPORTE_IVA,
FACTURAS_PROVEEDOR.IRPF,
FACTURAS_PROVEEDOR.IMPORTE_IRPF,
FACTURAS_PROVEEDOR.RE, FACTURAS_PROVEEDOR.RE,
FACTURAS_PROVEEDOR.IMPORTE_RE, FACTURAS_PROVEEDOR.IMPORTE_RE,
FACTURAS_PROVEEDOR.IMPORTE_TOTAL, FACTURAS_PROVEEDOR.IMPORTE_TOTAL,

96
Source/Base/Base.dproj
View File

@ -58,54 +58,54 @@
<DelphiCompile Include="Base.dpk"> <DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\..\Resources\Iconos\adortl.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\adortl.dcp" />
<DCCReference Include="..\..\Resources\Iconos\cxDataD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\cxDataD11.dcp" />
<DCCReference Include="..\..\Resources\Iconos\cxEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\cxEditorsD11.dcp" />
<DCCReference Include="..\..\Resources\Iconos\cxExtEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\cxExtEditorsD11.dcp" />
<DCCReference Include="..\..\Resources\Iconos\cxGridD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\cxGridD11.dcp" />
<DCCReference Include="..\..\Resources\Iconos\cxLibraryD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\cxLibraryD11.dcp" />
<DCCReference Include="..\..\Resources\Iconos\cxPageControlD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\cxPageControlD11.dcp" />
<DCCReference Include="..\..\Resources\Iconos\DataAbstract_Core_D11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\..\Resources\Iconos\dbrtl.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\dbrtl.dcp" />
<DCCReference Include="..\..\Resources\Iconos\dclIndyCore.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\dclIndyCore.dcp" />
<DCCReference Include="..\..\Resources\Iconos\designide.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\designide.dcp" />
<DCCReference Include="..\..\Resources\Iconos\dsnap.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\dsnap.dcp" />
<DCCReference Include="..\..\Resources\Iconos\dxGDIPlusD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\dxGDIPlusD11.dcp" />
<DCCReference Include="..\..\Resources\Iconos\dxPSCoreD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\dxPSCoreD11.dcp" />
<DCCReference Include="..\..\Resources\Iconos\dxThemeD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\dxThemeD11.dcp" />
<DCCReference Include="..\..\Resources\Iconos\GUISDK_D11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\GUISDK_D11R.dcp" />
<DCCReference Include="..\..\Resources\Iconos\IndyCore.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\IndyCore.dcp" />
<DCCReference Include="..\..\Resources\Iconos\IndyProtocols.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\IndyProtocols.dcp" />
<DCCReference Include="..\..\Resources\Iconos\IndySystem.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\IndySystem.dcp" />
<DCCReference Include="..\..\Resources\Iconos\Jcl.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\Jcl.dcp" />
<DCCReference Include="..\..\Resources\Iconos\JclVcl.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\JclVcl.dcp" />
<DCCReference Include="..\..\Resources\Iconos\JSDialog100.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\JSDialog100.dcp" />
<DCCReference Include="..\..\Resources\Iconos\JvCmpD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\JvCmpD11R.dcp" />
<DCCReference Include="..\..\Resources\Iconos\JvCoreD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\JvCoreD11R.dcp" />
<DCCReference Include="..\..\Resources\Iconos\JvCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\JvCtrlsD11R.dcp" />
<DCCReference Include="..\..\Resources\Iconos\JvDlgsD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\JvDlgsD11R.dcp" />
<DCCReference Include="..\..\Resources\Iconos\JvMMD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\JvMMD11R.dcp" />
<DCCReference Include="..\..\Resources\Iconos\JvNetD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\JvNetD11R.dcp" />
<DCCReference Include="..\..\Resources\Iconos\JvPageCompsD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\JvPageCompsD11R.dcp" />
<DCCReference Include="..\..\Resources\Iconos\JvStdCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\..\Resources\Iconos\JvSystemD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\JvSystemD11R.dcp" />
<DCCReference Include="..\..\Resources\Iconos\pckMD5.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\pckMD5.dcp" />
<DCCReference Include="..\..\Resources\Iconos\pckUCDataConnector.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\pckUCDataConnector.dcp" />
<DCCReference Include="..\..\Resources\Iconos\pckUserControl_RT.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\pckUserControl_RT.dcp" />
<DCCReference Include="..\..\Resources\Iconos\PluginSDK_D11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\PluginSDK_D11R.dcp" />
<DCCReference Include="..\..\Resources\Iconos\PngComponentsD10.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\PngComponentsD10.dcp" />
<DCCReference Include="..\..\Resources\Iconos\PNG_D10.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\PNG_D10.dcp" />
<DCCReference Include="..\..\Resources\Iconos\RemObjects_Core_D11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\..\Resources\Iconos\rtl.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\rtl.dcp" />
<DCCReference Include="..\..\Resources\Iconos\TB2k_D10.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\TB2k_D10.dcp" />
<DCCReference Include="..\..\Resources\Iconos\tbx_d10.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\tbx_d10.dcp" />
<DCCReference Include="..\..\Resources\Iconos\vcl.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\vcl.dcp" />
<DCCReference Include="..\..\Resources\Iconos\vclactnband.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\vclactnband.dcp" />
<DCCReference Include="..\..\Resources\Iconos\vcldb.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\vcldb.dcp" />
<DCCReference Include="..\..\Resources\Iconos\vcljpg.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\vcljpg.dcp" />
<DCCReference Include="..\..\Resources\Iconos\VclSmp.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\VclSmp.dcp" />
<DCCReference Include="..\..\Resources\Iconos\vclx.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\vclx.dcp" />
<DCCReference Include="..\..\Resources\Iconos\xmlrtl.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\xmlrtl.dcp" />
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" /> <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
<DCCReference Include="Conexion\uConfigurarConexion.pas"> <DCCReference Include="Conexion\uConfigurarConexion.pas">
<Form>fConfigurarConexion</Form> <Form>fConfigurarConexion</Form>

56
Source/GUIBase/GUIBase.dproj
View File

@ -58,34 +58,34 @@
<DelphiCompile Include="GUIBase.dpk"> <DelphiCompile Include="GUIBase.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\Base.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\Base.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\ccpackD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\ccpackD11.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\cxDataD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\cxDataD11.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\cxEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\cxEditorsD11.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\cxExportD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\cxExportD11.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\cxLibraryD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\cxLibraryD11.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\dbrtl.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\dbrtl.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\dxGDIPlusD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\dxGDIPlusD11.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\dxLayoutControlD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\dxLayoutControlD11.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\dxPScxCommonD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\dxPScxCommonD11.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\dxPScxGrid6LnkD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\dxThemeD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\dxThemeD11.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\frx11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\frx11.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\frxe11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\frxe11.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\fs11.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\fs11.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\JvAppFrmD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\JvAppFrmD11R.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\JvCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\JvCtrlsD11R.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\JvGlobusD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\JvGlobusD11R.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\PngComponentsD10.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\PngComponentsD10.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\PNG_D10.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\PNG_D10.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\rtl.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\rtl.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\tb2k_d10.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\tb2k_d10.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\tbx_d10.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\tbx_d10.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\vcl.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\vcl.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\vclactnband.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\vclactnband.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\vcldb.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\vcldb.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\vcljpg.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\vcljpg.dcp" />
<DCCReference Include="..\ApplicationBase\Ejercicios\Plugin\vclx.dcp" /> <DCCReference Include="..\Modulos\Facturas de proveedor\vclx.dcp" />
<DCCReference Include="uDialogBase.pas"> <DCCReference Include="uDialogBase.pas">
<Form>fDialogBase</Form> <Form>fDialogBase</Form>
</DCCReference> </DCCReference>

126
Source/GUIBase/uViewTotales.dfm
View File

@ -1,15 +1,15 @@
inherited frViewTotales: TfrViewTotales inherited frViewTotales: TfrViewTotales
Width = 788 Width = 860
Height = 224 Height = 404
Align = alBottom Align = alBottom
ExplicitWidth = 451 ExplicitWidth = 825
ExplicitHeight = 224 ExplicitHeight = 404
object dxLayoutControl1: TdxLayoutControl object dxLayoutControl1: TdxLayoutControl
AlignWithMargins = True AlignWithMargins = True
Left = 0 Left = 0
Top = 0 Top = 0
Width = 788 Width = 860
Height = 217 Height = 233
Margins.Left = 0 Margins.Left = 0
Margins.Top = 0 Margins.Top = 0
Margins.Right = 0 Margins.Right = 0
@ -21,14 +21,14 @@ inherited frViewTotales: TfrViewTotales
AutoContentSizes = [acsWidth, acsHeight] AutoContentSizes = [acsWidth, acsHeight]
ExplicitWidth = 451 ExplicitWidth = 451
object Bevel3: TBevel object Bevel3: TBevel
Left = 389 Left = 423
Top = 28 Top = 28
Width = 3 Width = 3
Height = 122 Height = 122
Shape = bsRightLine Shape = bsRightLine
end end
object Bevel4: TBevel object Bevel4: TBevel
Left = 501 Left = 535
Top = 70 Top = 70
Width = 210 Width = 210
Height = 9 Height = 9
@ -66,7 +66,7 @@ inherited frViewTotales: TfrViewTotales
Width = 93 Width = 93
end end
object ImporteIVA: TcxDBCurrencyEdit object ImporteIVA: TcxDBCurrencyEdit
Left = 572 Left = 606
Top = 105 Top = 105
AutoSize = False AutoSize = False
DataBinding.DataField = 'IMPORTE_IVA' DataBinding.DataField = 'IMPORTE_IVA'
@ -97,8 +97,8 @@ inherited frViewTotales: TfrViewTotales
Width = 137 Width = 137
end end
object ImporteTotal: TcxDBCurrencyEdit object ImporteTotal: TcxDBCurrencyEdit
Left = 502 Left = 536
Top = 159 Top = 186
AutoSize = False AutoSize = False
DataBinding.DataField = 'IMPORTE_TOTAL' DataBinding.DataField = 'IMPORTE_TOTAL'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -124,7 +124,7 @@ inherited frViewTotales: TfrViewTotales
StyleDisabled.TextColor = clWindowText StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 12 TabOrder = 14
Height = 21 Height = 21
Width = 137 Width = 137
end end
@ -159,7 +159,7 @@ inherited frViewTotales: TfrViewTotales
Width = 65 Width = 65
end end
object edtIVA: TcxDBSpinEdit object edtIVA: TcxDBSpinEdit
Left = 501 Left = 535
Top = 105 Top = 105
AutoSize = False AutoSize = False
DataBinding.DataField = 'IVA' DataBinding.DataField = 'IVA'
@ -196,7 +196,7 @@ inherited frViewTotales: TfrViewTotales
Width = 65 Width = 65
end end
object ImporteBase: TcxDBCurrencyEdit object ImporteBase: TcxDBCurrencyEdit
Left = 501 Left = 535
Top = 28 Top = 28
AutoSize = False AutoSize = False
DataBinding.DataField = 'BASE_IMPONIBLE' DataBinding.DataField = 'BASE_IMPONIBLE'
@ -226,8 +226,8 @@ inherited frViewTotales: TfrViewTotales
Width = 92 Width = 92
end end
object edtRE: TcxDBSpinEdit object edtRE: TcxDBSpinEdit
Left = 501 Left = 535
Top = 132 Top = 159
AutoSize = False AutoSize = False
DataBinding.DataField = 'RE' DataBinding.DataField = 'RE'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -258,13 +258,49 @@ inherited frViewTotales: TfrViewTotales
StyleFocused.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 12
Height = 21
Width = 65
end
object edtIRPF: TcxDBSpinEdit
Left = 535
Top = 132
AutoSize = False
DataBinding.DataSource = DADataSource
Enabled = False
ParentFont = False
Properties.Alignment.Horz = taRightJustify
Properties.AssignedValues.EditFormat = True
Properties.DisplayFormat = ',0.00 %;-,0.00 %'
Properties.ImmediatePost = True
Properties.MaxValue = 100.000000000000000000
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
Style.Font.Charset = DEFAULT_CHARSET
Style.Font.Color = clWindowText
Style.Font.Height = -11
Style.Font.Name = 'Tahoma'
Style.Font.Style = []
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
Style.TextColor = clWindowText
Style.ButtonStyle = bts3D
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 10 TabOrder = 10
Height = 21 Height = 21
Width = 65 Width = 65
end end
object ImporteRE: TcxDBCurrencyEdit object ImporteRE: TcxDBCurrencyEdit
Left = 572 Left = 606
Top = 132 Top = 159
AutoSize = False AutoSize = False
DataBinding.DataField = 'IMPORTE_RE' DataBinding.DataField = 'IMPORTE_RE'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -289,6 +325,36 @@ inherited frViewTotales: TfrViewTotales
StyleDisabled.TextColor = clWindowText StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 13
Height = 21
Width = 56
end
object ImporteIRPF: TcxDBCurrencyEdit
Left = 606
Top = 132
AutoSize = False
DataBinding.DataSource = DADataSource
Enabled = False
ParentFont = False
Properties.Alignment.Horz = taRightJustify
Properties.ReadOnly = True
Properties.UseLeftAlignmentOnEditing = False
Properties.UseThousandSeparator = True
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
Style.Font.Charset = DEFAULT_CHARSET
Style.Font.Color = clWindowText
Style.Font.Height = -11
Style.Font.Name = 'Tahoma'
Style.Font.Style = []
Style.HotTrack = False
Style.LookAndFeel.NativeStyle = True
Style.TextColor = clWindowText
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.NativeStyle = True
StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 11 TabOrder = 11
Height = 21 Height = 21
Width = 56 Width = 56
@ -387,7 +453,7 @@ inherited frViewTotales: TfrViewTotales
Width = 81 Width = 81
end end
object bTiposIVA: TButton object bTiposIVA: TButton
Left = 241 Left = 275
Top = 109 Top = 109
Width = 132 Width = 132
Height = 21 Height = 21
@ -563,6 +629,28 @@ inherited frViewTotales: TfrViewTotales
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
end end
object dxLayoutControl1Group1191: TdxLayoutGroup
ShowCaption = False
Visible = False
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControl1Item2011: TdxLayoutItem
AutoAligns = [aaVertical]
Caption = 'IRPF (%):'
CaptionOptions.AlignHorz = taRightJustify
Control = edtIRPF
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item4421: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = 'Importe de IRPF:'
ShowCaption = False
Control = ImporteIRPF
ControlOptions.ShowBorder = False
end
end
object dxLayoutControl1Group8: TdxLayoutGroup object dxLayoutControl1Group8: TdxLayoutGroup
ShowCaption = False ShowCaption = False
Hidden = True Hidden = True

5
Source/GUIBase/uViewTotales.pas
View File

@ -16,6 +16,7 @@ type
ImporteBase: TcxDBCurrencyEdit; ImporteBase: TcxDBCurrencyEdit;
ImporteDto: TcxDBCurrencyEdit; ImporteDto: TcxDBCurrencyEdit;
ImporteIVA: TcxDBCurrencyEdit; ImporteIVA: TcxDBCurrencyEdit;
ImporteIRPF: TcxDBCurrencyEdit;
ImporteTotal: TcxDBCurrencyEdit; ImporteTotal: TcxDBCurrencyEdit;
edtDescuento: TcxDBSpinEdit; edtDescuento: TcxDBSpinEdit;
edtIVA: TcxDBSpinEdit; edtIVA: TcxDBSpinEdit;
@ -32,6 +33,7 @@ type
dxLayoutControl1Group5: TdxLayoutGroup; dxLayoutControl1Group5: TdxLayoutGroup;
dxLayoutControl1Item6: TdxLayoutItem; dxLayoutControl1Item6: TdxLayoutItem;
edtRE: TcxDBSpinEdit; edtRE: TcxDBSpinEdit;
edtIRPF: TcxDBSpinEdit;
dxLayoutControl1Item7: TdxLayoutItem; dxLayoutControl1Item7: TdxLayoutItem;
ImporteRE: TcxDBCurrencyEdit; ImporteRE: TcxDBCurrencyEdit;
dxLayoutControl1Item8: TdxLayoutItem; dxLayoutControl1Item8: TdxLayoutItem;
@ -56,9 +58,12 @@ type
dxLayoutControl1Group6: TdxLayoutGroup; dxLayoutControl1Group6: TdxLayoutGroup;
dsTiposIVA: TDADataSource; dsTiposIVA: TDADataSource;
dxLayoutControl1Item16: TdxLayoutItem; dxLayoutControl1Item16: TdxLayoutItem;
dxLayoutControl1Item2011: TdxLayoutItem;
dxLayoutControl1Item4421: TdxLayoutItem;
cbRecargoEquivalencia: TcxDBCheckBox; cbRecargoEquivalencia: TcxDBCheckBox;
dxLayoutControl1Group10: TdxLayoutGroup; dxLayoutControl1Group10: TdxLayoutGroup;
dxLayoutControl1Group11: TdxLayoutGroup; dxLayoutControl1Group11: TdxLayoutGroup;
dxLayoutControl1Group1191: TdxLayoutGroup;
public public
{ Public declarations } { Public declarations }
end; end;

13
Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm
View File

@ -111,6 +111,19 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor
Alignment = taRightJustify Alignment = taRightJustify
DictionaryEntry = 'FacturasProveedor_IMPORTE_IVA' DictionaryEntry = 'FacturasProveedor_IMPORTE_IVA'
end end
item
Name = 'IRPF'
DataType = datFloat
Alignment = taRightJustify
DictionaryEntry = 'FacturasProveedor_IRPF'
end
item
Name = 'IMPORTE_IRPF'
DataType = datCurrency
DisplayLabel = 'Importe IRPF'
Alignment = taRightJustify
DictionaryEntry = 'FacturasProveedor_IMPORTE_IRPF'
end
item item
Name = 'RE' Name = 'RE'
DataType = datFloat DataType = datFloat

144
Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas
View File

@ -9,10 +9,10 @@ const
{ Data table rules ids { Data table rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_ListaAnosFacturas = '{E4006E34-9471-4B45-8BFB-34D795EE5B47}'; RID_ListaAnosFacturas = '{967EF3B2-AD90-4AF2-916D-06DB5575FD21}';
RID_FacturasProveedor_Contratos = '{AEFE41C5-3FCA-46FB-8174-2704B20E2905}'; RID_FacturasProveedor_Contratos = '{5A804E76-1B25-4E55-A944-CA4F30CB3804}';
RID_FacturasProveedor = '{4621460A-3688-408C-9676-B526823EC8EF}'; RID_FacturasProveedor = '{77312F2D-C1A9-4F2C-8375-214ADAE31665}';
RID_FacturasProveedor_Detalles = '{13D46CB1-CC91-4B2C-83B0-6265D005B1E1}'; RID_FacturasProveedor_Detalles = '{90F07E7A-B93A-4C06-A123-942FDE9320FC}';
{ Data table names } { Data table names }
nme_ListaAnosFacturas = 'ListaAnosFacturas'; nme_ListaAnosFacturas = 'ListaAnosFacturas';
@ -58,6 +58,8 @@ const
fld_FacturasProveedorIMPORTE_DESCUENTO = 'IMPORTE_DESCUENTO'; fld_FacturasProveedorIMPORTE_DESCUENTO = 'IMPORTE_DESCUENTO';
fld_FacturasProveedorIVA = 'IVA'; fld_FacturasProveedorIVA = 'IVA';
fld_FacturasProveedorIMPORTE_IVA = 'IMPORTE_IVA'; fld_FacturasProveedorIMPORTE_IVA = 'IMPORTE_IVA';
fld_FacturasProveedorIRPF = 'IRPF';
fld_FacturasProveedorIMPORTE_IRPF = 'IMPORTE_IRPF';
fld_FacturasProveedorRE = 'RE'; fld_FacturasProveedorRE = 'RE';
fld_FacturasProveedorIMPORTE_RE = 'IMPORTE_RE'; fld_FacturasProveedorIMPORTE_RE = 'IMPORTE_RE';
fld_FacturasProveedorIMPORTE_TOTAL = 'IMPORTE_TOTAL'; fld_FacturasProveedorIMPORTE_TOTAL = 'IMPORTE_TOTAL';
@ -102,35 +104,37 @@ const
idx_FacturasProveedorIMPORTE_DESCUENTO = 10; idx_FacturasProveedorIMPORTE_DESCUENTO = 10;
idx_FacturasProveedorIVA = 11; idx_FacturasProveedorIVA = 11;
idx_FacturasProveedorIMPORTE_IVA = 12; idx_FacturasProveedorIMPORTE_IVA = 12;
idx_FacturasProveedorRE = 13; idx_FacturasProveedorIRPF = 13;
idx_FacturasProveedorIMPORTE_RE = 14; idx_FacturasProveedorIMPORTE_IRPF = 14;
idx_FacturasProveedorIMPORTE_TOTAL = 15; idx_FacturasProveedorRE = 15;
idx_FacturasProveedorOBSERVACIONES = 16; idx_FacturasProveedorIMPORTE_RE = 16;
idx_FacturasProveedorID_PROVEEDOR = 17; idx_FacturasProveedorIMPORTE_TOTAL = 17;
idx_FacturasProveedorNOMBRE_PROVEEDOR = 18; idx_FacturasProveedorOBSERVACIONES = 18;
idx_FacturasProveedorNOMBRE_COMERCIAL_PROVEEDOR = 19; idx_FacturasProveedorID_PROVEEDOR = 19;
idx_FacturasProveedorNIF_CIF = 20; idx_FacturasProveedorNOMBRE_PROVEEDOR = 20;
idx_FacturasProveedorNOMBRE = 21; idx_FacturasProveedorNOMBRE_COMERCIAL_PROVEEDOR = 21;
idx_FacturasProveedorCALLE = 22; idx_FacturasProveedorNIF_CIF = 22;
idx_FacturasProveedorPOBLACION = 23; idx_FacturasProveedorNOMBRE = 23;
idx_FacturasProveedorPROVINCIA = 24; idx_FacturasProveedorCALLE = 24;
idx_FacturasProveedorCODIGO_POSTAL = 25; idx_FacturasProveedorPOBLACION = 25;
idx_FacturasProveedorFECHA_ALTA = 26; idx_FacturasProveedorPROVINCIA = 26;
idx_FacturasProveedorFECHA_MODIFICACION = 27; idx_FacturasProveedorCODIGO_POSTAL = 27;
idx_FacturasProveedorUSUARIO = 28; idx_FacturasProveedorFECHA_ALTA = 28;
idx_FacturasProveedorID_FORMA_PAGO = 29; idx_FacturasProveedorFECHA_MODIFICACION = 29;
idx_FacturasProveedorRECARGO_EQUIVALENCIA = 30; idx_FacturasProveedorUSUARIO = 30;
idx_FacturasProveedorID_TIPO_IVA = 31; idx_FacturasProveedorID_FORMA_PAGO = 31;
idx_FacturasProveedorIMPORTE_NETO = 32; idx_FacturasProveedorRECARGO_EQUIVALENCIA = 32;
idx_FacturasProveedorIMPORTE_PORTE = 33; idx_FacturasProveedorID_TIPO_IVA = 33;
idx_FacturasProveedorIGNORAR_CONTABILIDAD = 34; idx_FacturasProveedorIMPORTE_NETO = 34;
idx_FacturasProveedorID_TIENDA = 35; idx_FacturasProveedorIMPORTE_PORTE = 35;
idx_FacturasProveedorTIENDA = 36; idx_FacturasProveedorIGNORAR_CONTABILIDAD = 36;
idx_FacturasProveedorID_SUBCUENTA = 37; idx_FacturasProveedorID_TIENDA = 37;
idx_FacturasProveedorSUBCUENTA = 38; idx_FacturasProveedorTIENDA = 38;
idx_FacturasProveedorID_EJERCICIO = 39; idx_FacturasProveedorID_SUBCUENTA = 39;
idx_FacturasProveedorESTADO_EJERCICIO = 40; idx_FacturasProveedorSUBCUENTA = 40;
idx_FacturasProveedorASIENTO_PUNTEADO = 41; idx_FacturasProveedorID_EJERCICIO = 41;
idx_FacturasProveedorESTADO_EJERCICIO = 42;
idx_FacturasProveedorASIENTO_PUNTEADO = 43;
{ FacturasProveedor_Detalles fields } { FacturasProveedor_Detalles fields }
fld_FacturasProveedor_DetallesID = 'ID'; fld_FacturasProveedor_DetallesID = 'ID';
@ -167,7 +171,7 @@ const
type type
{ IListaAnosFacturas } { IListaAnosFacturas }
IListaAnosFacturas = interface(IDAStronglyTypedDataTable) IListaAnosFacturas = interface(IDAStronglyTypedDataTable)
['{FC0D46EE-86BF-4511-819E-E9791181DC39}'] ['{F2E406A9-B88C-40D4-8A47-4978C8C116F2}']
{ Property getters and setters } { Property getters and setters }
function GetANOValue: String; function GetANOValue: String;
procedure SetANOValue(const aValue: String); procedure SetANOValue(const aValue: String);
@ -202,7 +206,7 @@ type
{ IFacturasProveedor_Contratos } { IFacturasProveedor_Contratos }
IFacturasProveedor_Contratos = interface(IDAStronglyTypedDataTable) IFacturasProveedor_Contratos = interface(IDAStronglyTypedDataTable)
['{DDCB3A4E-D047-4E73-8B5C-7E5879061F5E}'] ['{5F2BFC11-8077-4879-B2D2-953CA4CF47A2}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -309,7 +313,7 @@ type
{ IFacturasProveedor } { IFacturasProveedor }
IFacturasProveedor = interface(IDAStronglyTypedDataTable) IFacturasProveedor = interface(IDAStronglyTypedDataTable)
['{1D01094B-37F3-499C-84DD-5C94D01CE360}'] ['{133E70B0-5200-4718-A56D-628104E3C948}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -363,6 +367,14 @@ type
procedure SetIMPORTE_IVAValue(const aValue: Currency); procedure SetIMPORTE_IVAValue(const aValue: Currency);
function GetIMPORTE_IVAIsNull: Boolean; function GetIMPORTE_IVAIsNull: Boolean;
procedure SetIMPORTE_IVAIsNull(const aValue: Boolean); procedure SetIMPORTE_IVAIsNull(const aValue: Boolean);
function GetIRPFValue: Float;
procedure SetIRPFValue(const aValue: Float);
function GetIRPFIsNull: Boolean;
procedure SetIRPFIsNull(const aValue: Boolean);
function GetIMPORTE_IRPFValue: Currency;
procedure SetIMPORTE_IRPFValue(const aValue: Currency);
function GetIMPORTE_IRPFIsNull: Boolean;
procedure SetIMPORTE_IRPFIsNull(const aValue: Boolean);
function GetREValue: Float; function GetREValue: Float;
procedure SetREValue(const aValue: Float); procedure SetREValue(const aValue: Float);
function GetREIsNull: Boolean; function GetREIsNull: Boolean;
@ -507,6 +519,10 @@ type
property IVAIsNull: Boolean read GetIVAIsNull write SetIVAIsNull; property IVAIsNull: Boolean read GetIVAIsNull write SetIVAIsNull;
property IMPORTE_IVA: Currency read GetIMPORTE_IVAValue write SetIMPORTE_IVAValue; property IMPORTE_IVA: Currency read GetIMPORTE_IVAValue write SetIMPORTE_IVAValue;
property IMPORTE_IVAIsNull: Boolean read GetIMPORTE_IVAIsNull write SetIMPORTE_IVAIsNull; property IMPORTE_IVAIsNull: Boolean read GetIMPORTE_IVAIsNull write SetIMPORTE_IVAIsNull;
property IRPF: Float read GetIRPFValue write SetIRPFValue;
property IRPFIsNull: Boolean read GetIRPFIsNull write SetIRPFIsNull;
property IMPORTE_IRPF: Currency read GetIMPORTE_IRPFValue write SetIMPORTE_IRPFValue;
property IMPORTE_IRPFIsNull: Boolean read GetIMPORTE_IRPFIsNull write SetIMPORTE_IRPFIsNull;
property RE: Float read GetREValue write SetREValue; property RE: Float read GetREValue write SetREValue;
property REIsNull: Boolean read GetREIsNull write SetREIsNull; property REIsNull: Boolean read GetREIsNull write SetREIsNull;
property IMPORTE_RE: Currency read GetIMPORTE_REValue write SetIMPORTE_REValue; property IMPORTE_RE: Currency read GetIMPORTE_REValue write SetIMPORTE_REValue;
@ -626,6 +642,14 @@ type
procedure SetIMPORTE_IVAValue(const aValue: Currency); virtual; procedure SetIMPORTE_IVAValue(const aValue: Currency); virtual;
function GetIMPORTE_IVAIsNull: Boolean; virtual; function GetIMPORTE_IVAIsNull: Boolean; virtual;
procedure SetIMPORTE_IVAIsNull(const aValue: Boolean); virtual; procedure SetIMPORTE_IVAIsNull(const aValue: Boolean); virtual;
function GetIRPFValue: Float; virtual;
procedure SetIRPFValue(const aValue: Float); virtual;
function GetIRPFIsNull: Boolean; virtual;
procedure SetIRPFIsNull(const aValue: Boolean); virtual;
function GetIMPORTE_IRPFValue: Currency; virtual;
procedure SetIMPORTE_IRPFValue(const aValue: Currency); virtual;
function GetIMPORTE_IRPFIsNull: Boolean; virtual;
procedure SetIMPORTE_IRPFIsNull(const aValue: Boolean); virtual;
function GetREValue: Float; virtual; function GetREValue: Float; virtual;
procedure SetREValue(const aValue: Float); virtual; procedure SetREValue(const aValue: Float); virtual;
function GetREIsNull: Boolean; virtual; function GetREIsNull: Boolean; virtual;
@ -769,6 +793,10 @@ type
property IVAIsNull: Boolean read GetIVAIsNull write SetIVAIsNull; property IVAIsNull: Boolean read GetIVAIsNull write SetIVAIsNull;
property IMPORTE_IVA: Currency read GetIMPORTE_IVAValue write SetIMPORTE_IVAValue; property IMPORTE_IVA: Currency read GetIMPORTE_IVAValue write SetIMPORTE_IVAValue;
property IMPORTE_IVAIsNull: Boolean read GetIMPORTE_IVAIsNull write SetIMPORTE_IVAIsNull; property IMPORTE_IVAIsNull: Boolean read GetIMPORTE_IVAIsNull write SetIMPORTE_IVAIsNull;
property IRPF: Float read GetIRPFValue write SetIRPFValue;
property IRPFIsNull: Boolean read GetIRPFIsNull write SetIRPFIsNull;
property IMPORTE_IRPF: Currency read GetIMPORTE_IRPFValue write SetIMPORTE_IRPFValue;
property IMPORTE_IRPFIsNull: Boolean read GetIMPORTE_IRPFIsNull write SetIMPORTE_IRPFIsNull;
property RE: Float read GetREValue write SetREValue; property RE: Float read GetREValue write SetREValue;
property REIsNull: Boolean read GetREIsNull write SetREIsNull; property REIsNull: Boolean read GetREIsNull write SetREIsNull;
property IMPORTE_RE: Currency read GetIMPORTE_REValue write SetIMPORTE_REValue; property IMPORTE_RE: Currency read GetIMPORTE_REValue write SetIMPORTE_REValue;
@ -836,7 +864,7 @@ type
{ IFacturasProveedor_Detalles } { IFacturasProveedor_Detalles }
IFacturasProveedor_Detalles = interface(IDAStronglyTypedDataTable) IFacturasProveedor_Detalles = interface(IDAStronglyTypedDataTable)
['{4D3A6663-3708-42B0-8D14-5C4E213D48FC}'] ['{AF8434DB-81E3-4993-BA17-6A7EABEC1EAA}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -1516,6 +1544,48 @@ begin
DataTable.Fields[idx_FacturasProveedorIMPORTE_IVA].AsVariant := Null; DataTable.Fields[idx_FacturasProveedorIMPORTE_IVA].AsVariant := Null;
end; end;
function TFacturasProveedorDataTableRules.GetIRPFValue: Float;
begin
result := DataTable.Fields[idx_FacturasProveedorIRPF].AsFloat;
end;
procedure TFacturasProveedorDataTableRules.SetIRPFValue(const aValue: Float);
begin
DataTable.Fields[idx_FacturasProveedorIRPF].AsFloat := aValue;
end;
function TFacturasProveedorDataTableRules.GetIRPFIsNull: boolean;
begin
result := DataTable.Fields[idx_FacturasProveedorIRPF].IsNull;
end;
procedure TFacturasProveedorDataTableRules.SetIRPFIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_FacturasProveedorIRPF].AsVariant := Null;
end;
function TFacturasProveedorDataTableRules.GetIMPORTE_IRPFValue: Currency;
begin
result := DataTable.Fields[idx_FacturasProveedorIMPORTE_IRPF].AsCurrency;
end;
procedure TFacturasProveedorDataTableRules.SetIMPORTE_IRPFValue(const aValue: Currency);
begin
DataTable.Fields[idx_FacturasProveedorIMPORTE_IRPF].AsCurrency := aValue;
end;
function TFacturasProveedorDataTableRules.GetIMPORTE_IRPFIsNull: boolean;
begin
result := DataTable.Fields[idx_FacturasProveedorIMPORTE_IRPF].IsNull;
end;
procedure TFacturasProveedorDataTableRules.SetIMPORTE_IRPFIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_FacturasProveedorIMPORTE_IRPF].AsVariant := Null;
end;
function TFacturasProveedorDataTableRules.GetREValue: Float; function TFacturasProveedorDataTableRules.GetREValue: Float;
begin begin
result := DataTable.Fields[idx_FacturasProveedorRE].AsFloat; result := DataTable.Fields[idx_FacturasProveedorRE].AsFloat;

102
Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas
View File

@ -9,15 +9,15 @@ const
{ Delta rules ids { Delta rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_ListaAnosFacturasDelta = '{89FAA336-EE10-4D08-A890-EFD959DA9FB3}'; RID_ListaAnosFacturasDelta = '{CB11B3AA-8F74-4D54-B57F-8CD48BB85ACF}';
RID_FacturasProveedor_ContratosDelta = '{2BF7C867-86B7-42EB-9FFA-92DF6E9874F0}'; RID_FacturasProveedor_ContratosDelta = '{A93ADBD8-2B39-4B7B-8E6E-CF5E79382C4D}';
RID_FacturasProveedorDelta = '{FB90A42D-E182-4F49-9873-E549CD6C3519}'; RID_FacturasProveedorDelta = '{E5CC9903-4F45-4D55-805C-BD665A8D2739}';
RID_FacturasProveedor_DetallesDelta = '{25250ECD-8E6B-4B25-9F0A-00B4B207C317}'; RID_FacturasProveedor_DetallesDelta = '{F639C514-2787-4375-9E37-A8F1F917400E}';
type type
{ IListaAnosFacturasDelta } { IListaAnosFacturasDelta }
IListaAnosFacturasDelta = interface(IListaAnosFacturas) IListaAnosFacturasDelta = interface(IListaAnosFacturas)
['{89FAA336-EE10-4D08-A890-EFD959DA9FB3}'] ['{CB11B3AA-8F74-4D54-B57F-8CD48BB85ACF}']
{ Property getters and setters } { Property getters and setters }
function GetOldANOValue : String; function GetOldANOValue : String;
@ -51,7 +51,7 @@ type
{ IFacturasProveedor_ContratosDelta } { IFacturasProveedor_ContratosDelta }
IFacturasProveedor_ContratosDelta = interface(IFacturasProveedor_Contratos) IFacturasProveedor_ContratosDelta = interface(IFacturasProveedor_Contratos)
['{2BF7C867-86B7-42EB-9FFA-92DF6E9874F0}'] ['{A93ADBD8-2B39-4B7B-8E6E-CF5E79382C4D}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_FACTURAValue : Integer; function GetOldID_FACTURAValue : Integer;
@ -157,7 +157,7 @@ type
{ IFacturasProveedorDelta } { IFacturasProveedorDelta }
IFacturasProveedorDelta = interface(IFacturasProveedor) IFacturasProveedorDelta = interface(IFacturasProveedor)
['{FB90A42D-E182-4F49-9873-E549CD6C3519}'] ['{E5CC9903-4F45-4D55-805C-BD665A8D2739}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer; function GetOldID_EMPRESAValue : Integer;
@ -172,6 +172,8 @@ type
function GetOldIMPORTE_DESCUENTOValue : Currency; function GetOldIMPORTE_DESCUENTOValue : Currency;
function GetOldIVAValue : Float; function GetOldIVAValue : Float;
function GetOldIMPORTE_IVAValue : Currency; function GetOldIMPORTE_IVAValue : Currency;
function GetOldIRPFValue : Float;
function GetOldIMPORTE_IRPFValue : Currency;
function GetOldREValue : Float; function GetOldREValue : Float;
function GetOldIMPORTE_REValue : Currency; function GetOldIMPORTE_REValue : Currency;
function GetOldIMPORTE_TOTALValue : Currency; function GetOldIMPORTE_TOTALValue : Currency;
@ -216,6 +218,8 @@ type
property OldIMPORTE_DESCUENTO : Currency read GetOldIMPORTE_DESCUENTOValue; property OldIMPORTE_DESCUENTO : Currency read GetOldIMPORTE_DESCUENTOValue;
property OldIVA : Float read GetOldIVAValue; property OldIVA : Float read GetOldIVAValue;
property OldIMPORTE_IVA : Currency read GetOldIMPORTE_IVAValue; property OldIMPORTE_IVA : Currency read GetOldIMPORTE_IVAValue;
property OldIRPF : Float read GetOldIRPFValue;
property OldIMPORTE_IRPF : Currency read GetOldIMPORTE_IRPFValue;
property OldRE : Float read GetOldREValue; property OldRE : Float read GetOldREValue;
property OldIMPORTE_RE : Currency read GetOldIMPORTE_REValue; property OldIMPORTE_RE : Currency read GetOldIMPORTE_REValue;
property OldIMPORTE_TOTAL : Currency read GetOldIMPORTE_TOTALValue; property OldIMPORTE_TOTAL : Currency read GetOldIMPORTE_TOTALValue;
@ -332,6 +336,18 @@ type
function GetOldIMPORTE_IVAIsNull: Boolean; virtual; function GetOldIMPORTE_IVAIsNull: Boolean; virtual;
procedure SetIMPORTE_IVAValue(const aValue: Currency); virtual; procedure SetIMPORTE_IVAValue(const aValue: Currency); virtual;
procedure SetIMPORTE_IVAIsNull(const aValue: Boolean); virtual; procedure SetIMPORTE_IVAIsNull(const aValue: Boolean); virtual;
function GetIRPFValue: Float; virtual;
function GetIRPFIsNull: Boolean; virtual;
function GetOldIRPFValue: Float; virtual;
function GetOldIRPFIsNull: Boolean; virtual;
procedure SetIRPFValue(const aValue: Float); virtual;
procedure SetIRPFIsNull(const aValue: Boolean); virtual;
function GetIMPORTE_IRPFValue: Currency; virtual;
function GetIMPORTE_IRPFIsNull: Boolean; virtual;
function GetOldIMPORTE_IRPFValue: Currency; virtual;
function GetOldIMPORTE_IRPFIsNull: Boolean; virtual;
procedure SetIMPORTE_IRPFValue(const aValue: Currency); virtual;
procedure SetIMPORTE_IRPFIsNull(const aValue: Boolean); virtual;
function GetREValue: Float; virtual; function GetREValue: Float; virtual;
function GetREIsNull: Boolean; virtual; function GetREIsNull: Boolean; virtual;
function GetOldREValue: Float; virtual; function GetOldREValue: Float; virtual;
@ -559,6 +575,14 @@ type
property IMPORTE_IVAIsNull : Boolean read GetIMPORTE_IVAIsNull write SetIMPORTE_IVAIsNull; property IMPORTE_IVAIsNull : Boolean read GetIMPORTE_IVAIsNull write SetIMPORTE_IVAIsNull;
property OldIMPORTE_IVA : Currency read GetOldIMPORTE_IVAValue; property OldIMPORTE_IVA : Currency read GetOldIMPORTE_IVAValue;
property OldIMPORTE_IVAIsNull : Boolean read GetOldIMPORTE_IVAIsNull; property OldIMPORTE_IVAIsNull : Boolean read GetOldIMPORTE_IVAIsNull;
property IRPF : Float read GetIRPFValue write SetIRPFValue;
property IRPFIsNull : Boolean read GetIRPFIsNull write SetIRPFIsNull;
property OldIRPF : Float read GetOldIRPFValue;
property OldIRPFIsNull : Boolean read GetOldIRPFIsNull;
property IMPORTE_IRPF : Currency read GetIMPORTE_IRPFValue write SetIMPORTE_IRPFValue;
property IMPORTE_IRPFIsNull : Boolean read GetIMPORTE_IRPFIsNull write SetIMPORTE_IRPFIsNull;
property OldIMPORTE_IRPF : Currency read GetOldIMPORTE_IRPFValue;
property OldIMPORTE_IRPFIsNull : Boolean read GetOldIMPORTE_IRPFIsNull;
property RE : Float read GetREValue write SetREValue; property RE : Float read GetREValue write SetREValue;
property REIsNull : Boolean read GetREIsNull write SetREIsNull; property REIsNull : Boolean read GetREIsNull write SetREIsNull;
property OldRE : Float read GetOldREValue; property OldRE : Float read GetOldREValue;
@ -684,7 +708,7 @@ type
{ IFacturasProveedor_DetallesDelta } { IFacturasProveedor_DetallesDelta }
IFacturasProveedor_DetallesDelta = interface(IFacturasProveedor_Detalles) IFacturasProveedor_DetallesDelta = interface(IFacturasProveedor_Detalles)
['{25250ECD-8E6B-4B25-9F0A-00B4B207C317}'] ['{F639C514-2787-4375-9E37-A8F1F917400E}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_FACTURAValue : Integer; function GetOldID_FACTURAValue : Integer;
@ -1574,6 +1598,68 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_IVA] := Null; BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_IVA] := Null;
end; end;
function TFacturasProveedorBusinessProcessorRules.GetIRPFValue: Float;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIRPF];
end;
function TFacturasProveedorBusinessProcessorRules.GetIRPFIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIRPF]);
end;
function TFacturasProveedorBusinessProcessorRules.GetOldIRPFValue: Float;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorIRPF];
end;
function TFacturasProveedorBusinessProcessorRules.GetOldIRPFIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorIRPF]);
end;
procedure TFacturasProveedorBusinessProcessorRules.SetIRPFValue(const aValue: Float);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIRPF] := aValue;
end;
procedure TFacturasProveedorBusinessProcessorRules.SetIRPFIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIRPF] := Null;
end;
function TFacturasProveedorBusinessProcessorRules.GetIMPORTE_IRPFValue: Currency;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_IRPF];
end;
function TFacturasProveedorBusinessProcessorRules.GetIMPORTE_IRPFIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_IRPF]);
end;
function TFacturasProveedorBusinessProcessorRules.GetOldIMPORTE_IRPFValue: Currency;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorIMPORTE_IRPF];
end;
function TFacturasProveedorBusinessProcessorRules.GetOldIMPORTE_IRPFIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorIMPORTE_IRPF]);
end;
procedure TFacturasProveedorBusinessProcessorRules.SetIMPORTE_IRPFValue(const aValue: Currency);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_IRPF] := aValue;
end;
procedure TFacturasProveedorBusinessProcessorRules.SetIMPORTE_IRPFIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_IRPF] := Null;
end;
function TFacturasProveedorBusinessProcessorRules.GetREValue: Float; function TFacturasProveedorBusinessProcessorRules.GetREValue: Float;
begin begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorRE]; result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorRE];

18
Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas
View File

@ -47,6 +47,7 @@ type
FSeleccionableInterface : ISeleccionable; FSeleccionableInterface : ISeleccionable;
procedure CalcularDescuento; procedure CalcularDescuento;
procedure CalcularIVA; procedure CalcularIVA;
procedure CalcularIRPF;
procedure CalcularRE; procedure CalcularRE;
procedure CalcularBaseImponible; procedure CalcularBaseImponible;
procedure AsignarTipoIVA (IDTipoIVA : Integer); procedure AsignarTipoIVA (IDTipoIVA : Integer);
@ -77,6 +78,7 @@ type
procedure DESCUENTOOnChange(Sender: TDACustomField); procedure DESCUENTOOnChange(Sender: TDACustomField);
procedure IVAOnChange(Sender: TDACustomField); procedure IVAOnChange(Sender: TDACustomField);
procedure REOnChange(Sender: TDACustomField); procedure REOnChange(Sender: TDACustomField);
procedure IRPFOnChange(Sender: TDACustomField);
procedure SetID_TIENDAValue(const aValue: Integer); procedure SetID_TIENDAValue(const aValue: Integer);
procedure SetID_SUBCUENTAValue(const aValue: Integer); procedure SetID_SUBCUENTAValue(const aValue: Integer);
@ -160,17 +162,25 @@ begin
try try
CalcularBaseImponible; CalcularBaseImponible;
CalcularIVA; CalcularIVA;
CalcularIRPF;
CalcularRE; CalcularRE;
if not Self.DataTable.Editing then if not Self.DataTable.Editing then
Edit; Edit;
IMPORTE_TOTAL := BASE_IMPONIBLE + IMPORTE_IVA + IMPORTE_RE; IMPORTE_TOTAL := BASE_IMPONIBLE + IMPORTE_IVA - IMPORTE_IRPF + IMPORTE_RE;
finally finally
DataTable.Fields.FieldEventsDisabled := False; DataTable.Fields.FieldEventsDisabled := False;
DataTable.EnableControls; DataTable.EnableControls;
end; end;
end; end;
procedure TBizFacturaProveedor.CalcularIRPF;
begin
if not Self.DataTable.Editing then
Edit;
IMPORTE_IRPF := (IRPF / 100) * BASE_IMPONIBLE;
end;
procedure TBizFacturaProveedor.CalcularIVA; procedure TBizFacturaProveedor.CalcularIVA;
begin begin
if not Self.DataTable.Editing then if not Self.DataTable.Editing then
@ -199,6 +209,7 @@ begin
FieldByName(fld_FacturasProveedorIMPORTE_PORTE).OnChange := IMPORTE_PORTEOnChange; FieldByName(fld_FacturasProveedorIMPORTE_PORTE).OnChange := IMPORTE_PORTEOnChange;
FieldByName(fld_FacturasProveedorDESCUENTO).OnChange := DESCUENTOOnChange; FieldByName(fld_FacturasProveedorDESCUENTO).OnChange := DESCUENTOOnChange;
FieldByName(fld_FacturasProveedorIVA).OnChange := IVAOnChange; FieldByName(fld_FacturasProveedorIVA).OnChange := IVAOnChange;
FieldByName(fld_FacturasProveedorIRPF).OnChange := IRPFOnChange;
FieldByName(fld_FacturasProveedorRE).OnChange := REOnChange; FieldByName(fld_FacturasProveedorRE).OnChange := REOnChange;
end; end;
@ -300,6 +311,11 @@ begin
end; end;
procedure TBizFacturaProveedor.IRPFOnChange(Sender: TDACustomField);
begin
CalcularImporteTotal;
end;
procedure TBizFacturaProveedor.IVAOnChange(Sender: TDACustomField); procedure TBizFacturaProveedor.IVAOnChange(Sender: TDACustomField);
begin begin
CalcularImporteTotal; CalcularImporteTotal;

98
Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm
View File

@ -308,6 +308,14 @@ object srvFacturasProveedor: TsrvFacturasProveedor
item item
DatasetField = 'ASIENTO_PUNTEADO' DatasetField = 'ASIENTO_PUNTEADO'
TableField = 'ASIENTO_PUNTEADO' TableField = 'ASIENTO_PUNTEADO'
end
item
DatasetField = 'IRPF'
TableField = 'IRPF'
end
item
DatasetField = 'IMPORTE_IRPF'
TableField = 'IMPORTE_IRPF'
end> end>
end> end>
Name = 'FacturasProveedor' Name = 'FacturasProveedor'
@ -383,6 +391,16 @@ object srvFacturasProveedor: TsrvFacturasProveedor
DataType = datCurrency DataType = datCurrency
DictionaryEntry = 'FacturasProveedor_IMPORTE_IVA' DictionaryEntry = 'FacturasProveedor_IMPORTE_IVA'
end end
item
Name = 'IRPF'
DataType = datFloat
DictionaryEntry = 'FacturasProveedor_IRPF'
end
item
Name = 'IMPORTE_IRPF'
DataType = datCurrency
DictionaryEntry = 'FacturasProveedor_IMPORTE_IRPF'
end
item item
Name = 'RE' Name = 'RE'
DataType = datFloat DataType = datFloat
@ -801,6 +819,14 @@ object srvFacturasProveedor: TsrvFacturasProveedor
Name = 'IMPORTE_DESCUENTO' Name = 'IMPORTE_DESCUENTO'
Value = '' Value = ''
end end
item
Name = 'IRPF'
Value = ''
end
item
Name = 'IMPORTE_IRPF'
Value = ''
end
item item
Name = 'IVA' Name = 'IVA'
Value = '' Value = ''
@ -902,19 +928,20 @@ object srvFacturasProveedor: TsrvFacturasProveedor
'INSERT'#10' INTO FACTURAS_PROVEEDOR'#10' (ID, ID_EMPRESA, REFERENCIA' + 'INSERT'#10' INTO FACTURAS_PROVEEDOR'#10' (ID, ID_EMPRESA, REFERENCIA' +
', REFERENCIA_PROVEEDOR,'#10' FECHA_FACTURA, FECHA_VENCIMIENTO, B' + ', REFERENCIA_PROVEEDOR,'#10' FECHA_FACTURA, FECHA_VENCIMIENTO, B' +
'ASE_IMPONIBLE, DESCUENTO,'#10' IMPORTE_DESCUENTO, IVA, IMPORTE_I' + 'ASE_IMPONIBLE, DESCUENTO,'#10' IMPORTE_DESCUENTO, IVA, IMPORTE_I' +
'VA, RE, IMPORTE_RE, '#10' IMPORTE_TOTAL, OBSERVACIONES, ID_PROVE' + 'VA, IRPF, IMPORTE_IRPF, RE, IMPORTE_RE,'#10' IMPORTE_TOTAL, OBSE' +
'EDOR, NIF_CIF, '#10' NOMBRE, CALLE, POBLACION, PROVINCIA, CODIGO' + 'RVACIONES, ID_PROVEEDOR, NIF_CIF, '#10' NOMBRE, CALLE, POBLACION' +
'_POSTAL, '#10' FECHA_ALTA, FECHA_MODIFICACION, USUARIO, ID_FORMA' + ', PROVINCIA, CODIGO_POSTAL, '#10' FECHA_ALTA, FECHA_MODIFICACION' +
'_PAGO, '#10' RECARGO_EQUIVALENCIA, ID_TIPO_IVA, IMPORTE_NETO, IM' + ', USUARIO, ID_FORMA_PAGO, '#10' RECARGO_EQUIVALENCIA, ID_TIPO_IV' +
'PORTE_PORTE, IGNORAR_CONTABILIDAD,'#10' ID_TIENDA)'#10' VALUES'#10' ' + 'A, IMPORTE_NETO, IMPORTE_PORTE, IGNORAR_CONTABILIDAD,'#10' ID_TI' +
'(:ID, :ID_EMPRESA, :REFERENCIA, :REFERENCIA_PROVEEDOR,'#10' :FEC' + 'ENDA)'#10' VALUES'#10' (:ID, :ID_EMPRESA, :REFERENCIA, :REFERENCIA_P' +
'HA_FACTURA, :FECHA_VENCIMIENTO, :BASE_IMPONIBLE, :DESCUENTO,'#10' ' + 'ROVEEDOR,'#10' :FECHA_FACTURA, :FECHA_VENCIMIENTO, :BASE_IMPONIB' +
' :IMPORTE_DESCUENTO, :IVA, :IMPORTE_IVA, :RE, :IMPORTE_RE, '#10' ' + 'LE, :DESCUENTO,'#10' :IMPORTE_DESCUENTO, :IVA, :IMPORTE_IVA, :IR' +
' :IMPORTE_TOTAL, :OBSERVACIONES, :ID_PROVEEDOR, :NIF_CIF, '#10' ' + 'PF, :IMPORTE_IRPF,'#10' :RE, :IMPORTE_RE, :IMPORTE_TOTAL, :OBSER' +
' :NOMBRE, :CALLE, :POBLACION, :PROVINCIA, :CODIGO_POSTAL, '#10' ' + 'VACIONES, :ID_PROVEEDOR, :NIF_CIF,'#10' :NOMBRE, :CALLE, :POBLAC' +
':FECHA_ALTA, :FECHA_MODIFICACION, :USUARIO, :ID_FORMA_PAGO, '#10' ' + 'ION, :PROVINCIA, :CODIGO_POSTAL, '#10' :FECHA_ALTA, :FECHA_MODIF' +
' :RECARGO_EQUIVALENCIA, :ID_TIPO_IVA, :IMPORTE_NETO, '#10' :IMP' + 'ICACION, :USUARIO, :ID_FORMA_PAGO, '#10' :RECARGO_EQUIVALENCIA, ' +
'ORTE_PORTE, :IGNORAR_CONTABILIDAD, :ID_TIENDA)'#10' '#10' '#10#10 ':ID_TIPO_IVA, :IMPORTE_NETO, '#10' :IMPORTE_PORTE, :IGNORAR_CONT' +
'ABILIDAD, :ID_TIENDA)'#10' '#10' '#10#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = <> ColumnMappings = <>
end> end>
@ -941,6 +968,14 @@ object srvFacturasProveedor: TsrvFacturasProveedor
end end
item item
Params = < Params = <
item
Name = 'IMPORTE_IRPF'
Value = ''
end
item
Name = 'IRPF'
Value = ''
end
item item
Name = 'ID' Name = 'ID'
Value = '' Value = ''
@ -1085,18 +1120,19 @@ object srvFacturasProveedor: TsrvFacturasProveedor
'A, '#10' FECHA_VENCIMIENTO = :FECHA_VENCIMIENTO,'#10' BASE_IMPONIB' + 'A, '#10' FECHA_VENCIMIENTO = :FECHA_VENCIMIENTO,'#10' BASE_IMPONIB' +
'LE = :BASE_IMPONIBLE,'#10' DESCUENTO = :DESCUENTO, '#10' IMPORTE_D' + 'LE = :BASE_IMPONIBLE,'#10' DESCUENTO = :DESCUENTO, '#10' IMPORTE_D' +
'ESCUENTO = :IMPORTE_DESCUENTO, '#10' IVA = :IVA, '#10' IMPORTE_IVA' + 'ESCUENTO = :IMPORTE_DESCUENTO, '#10' IVA = :IVA, '#10' IMPORTE_IVA' +
' = :IMPORTE_IVA, '#10' RE = :RE, '#10' IMPORTE_RE = :IMPORTE_RE, '#10 + ' = :IMPORTE_IVA, '#10' IRPF = :IRPF,'#10' IMPORTE_IRPF = :IMPORTE_' +
' IMPORTE_TOTAL = :IMPORTE_TOTAL, '#10' OBSERVACIONES = :OBSERV' + 'IRPF,'#10' RE = :RE,'#10' IMPORTE_RE = :IMPORTE_RE, '#10' IMPORTE_T' +
'ACIONES, '#10' ID_PROVEEDOR = :ID_PROVEEDOR, '#10' NIF_CIF = :NIF_' + 'OTAL = :IMPORTE_TOTAL, '#10' OBSERVACIONES = :OBSERVACIONES, '#10' ' +
'CIF, '#10' NOMBRE = :NOMBRE, '#10' CALLE = :CALLE, '#10' POBLACION ' + ' ID_PROVEEDOR = :ID_PROVEEDOR, '#10' NIF_CIF = :NIF_CIF, '#10' NOM' +
'= :POBLACION, '#10' PROVINCIA = :PROVINCIA, '#10' CODIGO_POSTAL = ' + 'BRE = :NOMBRE, '#10' CALLE = :CALLE, '#10' POBLACION = :POBLACION,' +
':CODIGO_POSTAL, '#10' FECHA_ALTA = :FECHA_ALTA, '#10' FECHA_MODIFI' + ' '#10' PROVINCIA = :PROVINCIA, '#10' CODIGO_POSTAL = :CODIGO_POSTA' +
'CACION = :FECHA_MODIFICACION, '#10' USUARIO = :USUARIO, '#10' ID_F' + 'L, '#10' FECHA_ALTA = :FECHA_ALTA, '#10' FECHA_MODIFICACION = :FEC' +
'ORMA_PAGO = :ID_FORMA_PAGO, '#10' RECARGO_EQUIVALENCIA = :RECARGO' + 'HA_MODIFICACION, '#10' USUARIO = :USUARIO, '#10' ID_FORMA_PAGO = :' +
'_EQUIVALENCIA, '#10' ID_TIPO_IVA = :ID_TIPO_IVA, '#10' IMPORTE_NET' + 'ID_FORMA_PAGO, '#10' RECARGO_EQUIVALENCIA = :RECARGO_EQUIVALENCIA' +
'O = :IMPORTE_NETO, '#10' IMPORTE_PORTE = :IMPORTE_PORTE,'#10' IGNO' + ', '#10' ID_TIPO_IVA = :ID_TIPO_IVA, '#10' IMPORTE_NETO = :IMPORTE_' +
'RAR_CONTABILIDAD = :IGNORAR_CONTABILIDAD,'#10' ID_TIENDA = :ID_TI' + 'NETO, '#10' IMPORTE_PORTE = :IMPORTE_PORTE,'#10' IGNORAR_CONTABILI' +
'ENDA'#10' WHERE'#10' (ID = :OLD_ID)'#10 'DAD = :IGNORAR_CONTABILIDAD,'#10' ID_TIENDA = :ID_TIENDA'#10' WHERE'#10 +
' (ID = :OLD_ID)'#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = <> ColumnMappings = <>
end> end>
@ -1786,6 +1822,18 @@ object srvFacturasProveedor: TsrvFacturasProveedor
item item
Name = 'FacturasProveedor_Contratos_IMPORTE' Name = 'FacturasProveedor_Contratos_IMPORTE'
DataType = datCurrency DataType = datCurrency
end
item
Name = 'FacturasProveedor_IMPORTE_IRPF'
DataType = datCurrency
DisplayLabel = 'Importe IRPF'
Alignment = taRightJustify
end
item
Name = 'FacturasProveedor_IRPF'
DataType = datFloat
DisplayLabel = 'IRPF'
Alignment = taRightJustify
end> end>
Left = 150 Left = 150
Top = 22 Top = 22

BIN
Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dpk
View File

Binary file not shown.

75
Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj
View File

@ -41,9 +41,6 @@
<Borland.ProjectType>Package</Borland.ProjectType> <Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages> <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FacturasProveedor_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> </Excluded_Packages><Source><Source Name="MainSource">FacturasProveedor_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions> </ProjectExtensions>
@ -52,42 +49,37 @@
<DelphiCompile Include="FacturasProveedor_view.dpk"> <DelphiCompile Include="FacturasProveedor_view.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\adortl.dcp" /> <DCCReference Include="adortl.dcp" />
<DCCReference Include="..\Articulos_view.dcp" /> <DCCReference Include="Articulos_view.dcp" />
<DCCReference Include="..\Contabilidad_controller.dcp" /> <DCCReference Include="Contabilidad_controller.dcp" />
<DCCReference Include="..\Contabilidad_view.dcp" /> <DCCReference Include="Contabilidad_view.dcp" />
<DCCReference Include="..\Contactos_controller.dcp" /> <DCCReference Include="Contactos_controller.dcp" />
<DCCReference Include="..\Contactos_model.dcp" /> <DCCReference Include="Contactos_model.dcp" />
<DCCReference Include="..\ContratosCliente_controller.dcp" /> <DCCReference Include="ContratosCliente_controller.dcp" />
<DCCReference Include="..\ContratosCliente_model.dcp" /> <DCCReference Include="ContratosCliente_model.dcp" />
<DCCReference Include="..\cxDataD11.dcp" /> <DCCReference Include="cxDataD11.dcp" />
<DCCReference Include="..\cxEditorsD11.dcp" /> <DCCReference Include="cxEditorsD11.dcp" />
<DCCReference Include="..\cxExportD11.dcp" /> <DCCReference Include="cxExportD11.dcp" />
<DCCReference Include="..\cxExtEditorsD11.dcp" /> <DCCReference Include="cxExtEditorsD11.dcp" />
<DCCReference Include="..\cxGridD11.dcp" /> <DCCReference Include="cxGridD11.dcp" />
<DCCReference Include="..\cxLibraryD11.dcp" /> <DCCReference Include="cxLibraryD11.dcp" />
<DCCReference Include="..\cxPageControlD11.dcp" /> <DCCReference Include="cxPageControlD11.dcp" />
<DCCReference Include="..\DataAbstract_Core_D11.dcp" /> <DCCReference Include="DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\dbrtl.dcp" /> <DCCReference Include="dbrtl.dcp" />
<DCCReference Include="..\dsnap.dcp" /> <DCCReference Include="dsnap.dcp" />
<DCCReference Include="..\dxComnD11.dcp" /> <DCCReference Include="dxComnD11.dcp" />
<DCCReference Include="..\dxCoreD11.dcp" /> <DCCReference Include="dxCoreD11.dcp" />
<DCCReference Include="..\dxGDIPlusD11.dcp" /> <DCCReference Include="dxGDIPlusD11.dcp" />
<DCCReference Include="..\dxLayoutControlD11.dcp" /> <DCCReference Include="dxLayoutControlD11.dcp" />
<DCCReference Include="..\dxThemeD11.dcp" /> <DCCReference Include="dxThemeD11.dcp" />
<DCCReference Include="..\FacturasProveedor_controller.dcp" /> <DCCReference Include="FacturasProveedor_controller.dcp" />
<DCCReference Include="..\FacturasProveedor_model.dcp" /> <DCCReference Include="FacturasProveedor_model.dcp" />
<DCCReference Include="..\GestorInformes_controller.dcp" /> <DCCReference Include="GestorInformes_controller.dcp" />
<DCCReference Include="..\GUIBase.dcp" /> <DCCReference Include="GUIBase.dcp" />
<DCCReference Include="..\PngComponentsD10.dcp" /> <DCCReference Include="PngComponentsD10.dcp" />
<DCCReference Include="..\PNG_D10.dcp" /> <DCCReference Include="PNG_D10.dcp" />
<DCCReference Include="..\RemObjects_Core_D11.dcp" /> <DCCReference Include="RemObjects_Core_D11.dcp" />
<DCCReference Include="..\rtl.dcp" /> <DCCReference Include="rtl.dcp" />
<DCCReference Include="..\vcl.dcp" />
<DCCReference Include="..\vclactnband.dcp" />
<DCCReference Include="..\vcldb.dcp" />
<DCCReference Include="..\vcljpg.dcp" />
<DCCReference Include="..\vclx.dcp" />
<DCCReference Include="uEditorElegirArticulosFacturaProveedor.pas"> <DCCReference Include="uEditorElegirArticulosFacturaProveedor.pas">
<Form>fEditorElegirArticulosFacturaProveedor</Form> <Form>fEditorElegirArticulosFacturaProveedor</Form>
<DesignClass>TfEditorElegirArticulosFacturaProveedor</DesignClass> <DesignClass>TfEditorElegirArticulosFacturaProveedor</DesignClass>
@ -129,6 +121,11 @@
<Form>frViewProveedorFactura</Form> <Form>frViewProveedorFactura</Form>
<DesignClass>TFrame</DesignClass> <DesignClass>TFrame</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="vcl.dcp" />
<DCCReference Include="vclactnband.dcp" />
<DCCReference Include="vcldb.dcp" />
<DCCReference Include="vcljpg.dcp" />
<DCCReference Include="vclx.dcp" />
</ItemGroup> </ItemGroup>
</Project> </Project>
<!-- EurekaLog First Line <!-- EurekaLog First Line

75
Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm
View File

@ -158,10 +158,6 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 350 Width = 350
ExplicitWidth = 350 ExplicitWidth = 350
inherited Bevel1: TBevel
Width = 242
ExplicitWidth = 242
end
inherited edtlNombre: TcxDBTextEdit inherited edtlNombre: TcxDBTextEdit
DataBinding.DataSource = dsDataTable DataBinding.DataSource = dsDataTable
ExplicitWidth = 259 ExplicitWidth = 259
@ -203,14 +199,11 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
end end
inherited frViewObservaciones1: TfrViewObservaciones inherited frViewObservaciones1: TfrViewObservaciones
Width = 671 Width = 671
Height = 228
ExplicitWidth = 671 ExplicitWidth = 671
ExplicitHeight = 228
inherited memObservaciones: TcxDBMemo inherited memObservaciones: TcxDBMemo
DataBinding.DataSource = frViewFacturaProveedor1.DADataSource DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
ExplicitWidth = 671 ExplicitWidth = 671
ExplicitHeight = 20 ExplicitHeight = 20
Height = 228
Width = 671 Width = 671
end end
end end
@ -262,40 +255,40 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
ExplicitWidth = 57 ExplicitWidth = 57
end end
inherited UpDown1: TUpDown inherited UpDown1: TUpDown
Left = 218 Left = 202
ExplicitLeft = 218 ExplicitLeft = 202
end end
inherited ToolButton13: TToolButton inherited ToolButton13: TToolButton
Left = 235 Left = 219
ExplicitLeft = 235 ExplicitLeft = 219
end end
inherited ToolButton6: TToolButton inherited ToolButton6: TToolButton
Left = 243 Left = 227
ExplicitLeft = 243 ExplicitLeft = 227
end end
inherited ToolButton7: TToolButton inherited ToolButton7: TToolButton
Left = 277 Left = 261
ExplicitLeft = 277 ExplicitLeft = 261
end end
inherited ToolButton8: TToolButton inherited ToolButton8: TToolButton
Left = 311 Left = 295
ExplicitLeft = 311 ExplicitLeft = 295
end end
inherited ToolButton12: TToolButton inherited ToolButton12: TToolButton
Left = 345 Left = 329
ExplicitLeft = 345 ExplicitLeft = 329
end end
inherited ToolButton9: TToolButton inherited ToolButton9: TToolButton
Left = 353 Left = 337
ExplicitLeft = 353 ExplicitLeft = 337
end end
inherited ToolButton10: TToolButton inherited ToolButton10: TToolButton
Left = 387 Left = 371
ExplicitLeft = 387 ExplicitLeft = 371
end end
inherited ToolButton11: TToolButton inherited ToolButton11: TToolButton
Left = 421 Left = 405
ExplicitLeft = 421 ExplicitLeft = 405
end end
end end
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
@ -415,10 +408,8 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
inherited Bevel3: TBevel inherited Bevel3: TBevel
Left = 398 Left = 398
Top = 30 Top = 30
Height = 122
ExplicitLeft = 398 ExplicitLeft = 398
ExplicitTop = 30 ExplicitTop = 30
ExplicitHeight = 122
end end
inherited Bevel4: TBevel inherited Bevel4: TBevel
Left = 510 Left = 510
@ -454,14 +445,14 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
end end
inherited ImporteTotal: TcxDBCurrencyEdit inherited ImporteTotal: TcxDBCurrencyEdit
Left = 511 Left = 511
Top = 131 Top = 158
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 511 ExplicitLeft = 511
ExplicitTop = 131 ExplicitTop = 158
ExplicitWidth = 213 ExplicitWidth = 213
Width = 213 Width = 213
end end
@ -501,7 +492,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
end end
inherited edtRE: TcxDBSpinEdit inherited edtRE: TcxDBSpinEdit
Left = 510 Left = 510
Top = 104 Top = 131
Properties.AssignedValues.MinValue = True Properties.AssignedValues.MinValue = True
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
@ -509,21 +500,38 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 510 ExplicitLeft = 510
ExplicitTop = 131
end
inherited edtIRPF: TcxDBSpinEdit
Left = 510
Top = 104
DataBinding.DataField = 'IRPF'
Enabled = True
Style.IsFontAssigned = True
ExplicitLeft = 510
ExplicitTop = 104 ExplicitTop = 104
end end
inherited ImporteRE: TcxDBCurrencyEdit inherited ImporteRE: TcxDBCurrencyEdit
Left = 581 Left = 581
Top = 104 Top = 131
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 581 ExplicitLeft = 581
ExplicitTop = 104 ExplicitTop = 131
ExplicitWidth = 143 ExplicitWidth = 143
Width = 143 Width = 143
end end
inherited ImporteIRPF: TcxDBCurrencyEdit
Left = 581
Top = 104
DataBinding.DataField = 'IMPORTE_IRPF'
Style.IsFontAssigned = True
ExplicitLeft = 581
ExplicitTop = 104
end
inherited eImporteNeto: TcxDBCurrencyEdit inherited eImporteNeto: TcxDBCurrencyEdit
Top = 30 Top = 30
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -603,6 +611,9 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
Visible = False Visible = False
end end
end end
inherited dxLayoutControl1Group1191: TdxLayoutGroup
Visible = True
end
end end
end end
end end

13
Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm
View File

@ -157,6 +157,19 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor
FooterAlignmentHorz = taRightJustify FooterAlignmentHorz = taRightJustify
HeaderAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify
end end
object cxGridViewIRPF: TcxGridDBColumn
DataBinding.FieldName = 'IRPF'
Visible = False
FooterAlignmentHorz = taRightJustify
HeaderAlignmentHorz = taRightJustify
end
object cxGridViewIMPORTE_IRPF: TcxGridDBColumn
DataBinding.FieldName = 'IMPORTE_IRPF'
PropertiesClassName = 'TcxCurrencyEditProperties'
Visible = False
FooterAlignmentHorz = taRightJustify
HeaderAlignmentHorz = taRightJustify
end
object cxGridViewRE: TcxGridDBColumn object cxGridViewRE: TcxGridDBColumn
DataBinding.FieldName = 'RE' DataBinding.FieldName = 'RE'
Visible = False Visible = False

2
Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas
View File

@ -31,6 +31,8 @@ type
cxGridViewFECHA_FACTURA: TcxGridDBColumn; cxGridViewFECHA_FACTURA: TcxGridDBColumn;
cxGridViewSITUACION: TcxGridDBColumn; cxGridViewSITUACION: TcxGridDBColumn;
cxGridViewBASE_IMPONIBLE: TcxGridDBColumn; cxGridViewBASE_IMPONIBLE: TcxGridDBColumn;
cxGridViewIMPORTE_IRPF: TcxGridDBColumn;
cxGridViewIRPF: TcxGridDBColumn;
cxGridViewIMPORTE_RE: TcxGridDBColumn; cxGridViewIMPORTE_RE: TcxGridDBColumn;
cxGridViewRE: TcxGridDBColumn; cxGridViewRE: TcxGridDBColumn;
cxGridViewIMPORTE_IVA: TcxGridDBColumn; cxGridViewIMPORTE_IVA: TcxGridDBColumn;

6
Source/Servidor/FactuGES_Server.dpr
View File

@ -133,10 +133,10 @@ uses
schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas', schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas',
schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas', schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas',
schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas', schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas',
schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas',
schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas',
schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas', schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas',
schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas'; schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas',
schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas',
schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas';
{$R *.res} {$R *.res}
{$R ..\Servicios\RODLFile.res} {$R ..\Servicios\RODLFile.res}

BIN
Source/Servidor/FactuGES_Server.res
View File

Binary file not shown.