Tecistel/Tecsitel_FactuGES2
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Se arreglan detalles visuales y de calculo de importes totales para facturas de cliente (falta para facturas de proveedor), ademas de acabar la exportación del informe de factura de cliente con soporte para retenciones

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@841 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2009-01-15 18:49:02 +00:00
parent 335caba848
commit 3db055a57f
20 changed files with 858 additions and 771 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
Source/Base/Base.dproj
View File

@ -54,57 +54,57 @@
<DelphiCompile Include="Base.dpk"> <DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Modulos\Pedidos a proveedor\adortl.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\adortl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxDataD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxExportD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxExtEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxGridD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxIntl6D11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\cxIntl6D11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxIntlPrintSys3D11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\cxIntlPrintSys3D11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxLibraryD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxPageControlD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\DataAbstract_Core_D11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dbrtl.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dclIndyCore.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\designide.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\designide.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dsnap.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\dsnap.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dxGDIPlusD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dxPSCoreD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dxThemeD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\GUISDK_D11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\GUISDK_D11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\IndyCore.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\IndyProtocols.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\IndySystem.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\Jcl.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\Jcl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JclVcl.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JSDialog100.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvCmpD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvCoreD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvDlgsD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvMMD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvNetD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvPageCompsD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvStdCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvSystemD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\pckMD5.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\pckUCDataConnector.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\pckUserControl_RT.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\PngComponentsD10.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\PNG_D10.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\RemObjects_Core_D11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\RemObjects_Indy_D11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\RemObjects_Indy_D11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\rtl.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\rtl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\TB2k_D10.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\tbx_d10.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vcl.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\vcl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vclactnband.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vcldb.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\vcldb.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vcljpg.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\VclSmp.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vclx.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\vclx.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\xmlrtl.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\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>

BIN
Source/Base/Base.res
View File

Binary file not shown.

8
Source/Cliente/FactuGES.rc
View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico" MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 1,6,1,0 FILEVERSION 1,6,2,0
PRODUCTVERSION 1,6,1,0 PRODUCTVERSION 1,6,2,0
FILEFLAGSMASK 0x3FL FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L FILEFLAGS 0x00L
FILEOS 0x40004L FILEOS 0x40004L
@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4" BLOCK "0C0A04E4"
BEGIN BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0" VALUE "CompanyName", "Rodax Software S.L.\0"
VALUE "FileVersion", "1.6.1.0\0" VALUE "FileVersion", "1.6.2.0\0"
VALUE "InternalName", "FactuGES\0" VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0" VALUE "ProductName", "FactuGES\0"
VALUE "ProductVersion", "1.6.1.0\0" VALUE "ProductVersion", "1.6.2.0\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

48
Source/GUIBase/GUIBase.dproj
View File

@ -59,30 +59,30 @@
<DelphiCompile Include="GUIBase.dpk"> <DelphiCompile Include="GUIBase.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Servidor\Base.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\Base.dcp" />
<DCCReference Include="..\Servidor\cxLibraryD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\cxLibraryD11.dcp" />
<DCCReference Include="..\Servidor\cxTreeListD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\cxTreeListD11.dcp" />
<DCCReference Include="..\Servidor\dbrtl.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dbrtl.dcp" />
<DCCReference Include="..\Servidor\dxBarD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dxBarD11.dcp" />
<DCCReference Include="..\Servidor\dxBarExtItemsD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dxBarExtItemsD11.dcp" />
<DCCReference Include="..\Servidor\dxComnD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dxComnD11.dcp" />
<DCCReference Include="..\Servidor\dxGDIPlusD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Servidor\dxLayoutControlD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dxLayoutControlD11.dcp" />
<DCCReference Include="..\Servidor\dxPSCoreD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dxPSCoreD11.dcp" />
<DCCReference Include="..\Servidor\dxPScxCommonD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dxPScxCommonD11.dcp" />
<DCCReference Include="..\Servidor\dxPScxGrid6LnkD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="..\Servidor\dxPsPrVwAdvD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dxPsPrVwAdvD11.dcp" />
<DCCReference Include="..\Servidor\dxThemeD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dxThemeD11.dcp" />
<DCCReference Include="..\Servidor\frx11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\frx11.dcp" />
<DCCReference Include="..\Servidor\frxe11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\frxe11.dcp" />
<DCCReference Include="..\Servidor\fs11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\fs11.dcp" />
<DCCReference Include="..\Servidor\JvAppFrmD11R.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\JvAppFrmD11R.dcp" />
<DCCReference Include="..\Servidor\JvCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Servidor\rtl.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\rtl.dcp" />
<DCCReference Include="..\Servidor\vcl.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\vcl.dcp" />
<DCCReference Include="..\Servidor\vcldb.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\vcldb.dcp" />
<DCCReference Include="..\Servidor\vcljpg.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\vcljpg.dcp" />
<DCCReference Include="..\Servidor\vclx.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\vclx.dcp" />
<DCCReference Include="uDialogBase.pas"> <DCCReference Include="uDialogBase.pas">
<Form>fDialogBase</Form> <Form>fDialogBase</Form>
</DCCReference> </DCCReference>

BIN
Source/GUIBase/GUIBase.res
View File

Binary file not shown.

221
Source/GUIBase/uViewTotales.dfm
View File

@ -1,9 +1,9 @@
inherited frViewTotales: TfrViewTotales inherited frViewTotales: TfrViewTotales
Width = 949 Width = 966
Height = 261 Height = 252
Align = alBottom Align = alBottom
ExplicitWidth = 949 ExplicitWidth = 966
ExplicitHeight = 261 ExplicitHeight = 252
object Bevel5: TBevel object Bevel5: TBevel
Left = 666 Left = 666
Top = 109 Top = 109
@ -15,8 +15,8 @@ inherited frViewTotales: TfrViewTotales
AlignWithMargins = True AlignWithMargins = True
Left = 0 Left = 0
Top = 0 Top = 0
Width = 949 Width = 966
Height = 261 Height = 252
Margins.Left = 0 Margins.Left = 0
Margins.Top = 0 Margins.Top = 0
Margins.Right = 0 Margins.Right = 0
@ -26,36 +26,41 @@ inherited frViewTotales: TfrViewTotales
TabOrder = 0 TabOrder = 0
TabStop = False TabStop = False
AutoContentSizes = [acsWidth, acsHeight] AutoContentSizes = [acsWidth, acsHeight]
ExplicitWidth = 451 ExplicitHeight = 265
ExplicitHeight = 257
object Bevel1: TBevel
Left = 131
Top = 109
Width = 73
Height = 9
Shape = bsBottomLine
end
object Bevel3: TBevel object Bevel3: TBevel
Left = 499 Left = 490
Top = 28 Top = 28
Width = 3 Width = 3
Height = 122 Height = 100
Shape = bsRightLine Shape = bsRightLine
end end
object Bevel4: TBevel object Bevel4: TBevel
Left = 611 Left = 602
Top = 109 Top = 70
Width = 192 Width = 342
Height = 9
Shape = bsBottomLine
end
object Bevel1: TBevel
Left = 602
Top = 186
Width = 368
Height = 9
Shape = bsBottomLine
end
object Bevel2: TBevel
Left = 131
Top = 188
Width = 368
Height = 9 Height = 9
Shape = bsBottomLine Shape = bsBottomLine
end end
object ImporteDto: TcxDBCurrencyEdit object ImporteDto: TcxDBCurrencyEdit
Left = 202 Left = 202
Top = 129 Top = 55
AutoSize = False AutoSize = False
DataBinding.DataField = 'IMPORTE_DESCUENTO' DataBinding.DataField = 'IMPORTE_DESCUENTO'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
Enabled = False
ParentFont = False ParentFont = False
Properties.Alignment.Horz = taRightJustify Properties.Alignment.Horz = taRightJustify
Properties.DisplayFormat = '-,0.00 '#8364';,0.00 '#8364 Properties.DisplayFormat = '-,0.00 '#8364';,0.00 '#8364
@ -81,13 +86,13 @@ inherited frViewTotales: TfrViewTotales
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 5 TabOrder = 2
Height = 21 Height = 21
Width = 87 Width = 87
end end
object ImporteIVA: TcxDBCurrencyEdit object ImporteIVA: TcxDBCurrencyEdit
Left = 682 Left = 673
Top = 55 Top = 105
AutoSize = False AutoSize = False
DataBinding.DataField = 'IMPORTE_IVA' DataBinding.DataField = 'IMPORTE_IVA'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -116,13 +121,13 @@ inherited frViewTotales: TfrViewTotales
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 9 TabOrder = 10
Height = 21 Height = 21
Width = 20 Width = 20
end end
object ImporteTotal: TcxDBCurrencyEdit object ImporteTotal: TcxDBCurrencyEdit
Left = 612 Left = 603
Top = 129 Top = 159
AutoSize = False AutoSize = False
DataBinding.DataField = 'IMPORTE_TOTAL' DataBinding.DataField = 'IMPORTE_TOTAL'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -152,13 +157,13 @@ inherited frViewTotales: TfrViewTotales
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 12 TabOrder = 13
Height = 21 Height = 21
Width = 90 Width = 90
end end
object edtDescuento: TcxDBSpinEdit object edtDescuento: TcxDBSpinEdit
Left = 131 Left = 131
Top = 129 Top = 55
AutoSize = False AutoSize = False
DataBinding.DataField = 'DESCUENTO' DataBinding.DataField = 'DESCUENTO'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -186,13 +191,13 @@ inherited frViewTotales: TfrViewTotales
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 4 TabOrder = 1
Height = 21 Height = 21
Width = 65 Width = 65
end end
object edtIVA: TcxDBSpinEdit object edtIVA: TcxDBSpinEdit
Left = 611 Left = 602
Top = 55 Top = 105
AutoSize = False AutoSize = False
DataBinding.DataField = 'IVA' DataBinding.DataField = 'IVA'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -227,12 +232,12 @@ inherited frViewTotales: TfrViewTotales
StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 8 TabOrder = 9
Height = 21 Height = 21
Width = 65 Width = 65
end end
object ImporteBase: TcxDBCurrencyEdit object ImporteBase: TcxDBCurrencyEdit
Left = 611 Left = 602
Top = 28 Top = 28
AutoSize = False AutoSize = False
DataBinding.DataField = 'BASE_IMPONIBLE' DataBinding.DataField = 'BASE_IMPONIBLE'
@ -262,13 +267,13 @@ inherited frViewTotales: TfrViewTotales
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 7 TabOrder = 8
Height = 21 Height = 21
Width = 91 Width = 91
end end
object edtRE: TcxDBSpinEdit object edtRE: TcxDBSpinEdit
Left = 611 Left = 602
Top = 82 Top = 132
AutoSize = False AutoSize = False
DataBinding.DataField = 'RE' DataBinding.DataField = 'RE'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -303,13 +308,13 @@ inherited frViewTotales: TfrViewTotales
StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 10 TabOrder = 11
Height = 21 Height = 21
Width = 65 Width = 65
end end
object ImporteRE: TcxDBCurrencyEdit object ImporteRE: TcxDBCurrencyEdit
Left = 682 Left = 673
Top = 82 Top = 132
AutoSize = False AutoSize = False
DataBinding.DataField = 'IMPORTE_RE' DataBinding.DataField = 'IMPORTE_RE'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -338,7 +343,7 @@ inherited frViewTotales: TfrViewTotales
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 11 TabOrder = 12
Height = 21 Height = 21
Width = 20 Width = 20
end end
@ -378,7 +383,7 @@ inherited frViewTotales: TfrViewTotales
end end
object ePorte: TcxDBCurrencyEdit object ePorte: TcxDBCurrencyEdit
Left = 131 Left = 131
Top = 156 Top = 82
AutoSize = False AutoSize = False
DataBinding.DataField = 'IMPORTE_PORTE' DataBinding.DataField = 'IMPORTE_PORTE'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -406,13 +411,13 @@ inherited frViewTotales: TfrViewTotales
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 6 TabOrder = 3
Height = 21 Height = 21
Width = 158 Width = 158
end end
object eIVA: TcxDBLookupComboBox object eIVA: TcxDBLookupComboBox
Left = 131 Left = 131
Top = 55 Top = 109
DataBinding.DataField = 'ID_TIPO_IVA' DataBinding.DataField = 'ID_TIPO_IVA'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
Properties.ImmediatePost = True Properties.ImmediatePost = True
@ -442,20 +447,20 @@ inherited frViewTotales: TfrViewTotales
StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 1 TabOrder = 4
Width = 20 Width = 20
end end
object bTiposIVA: TButton object bTiposIVA: TButton
Left = 351 Left = 342
Top = 55 Top = 109
Width = 132 Width = 132
Height = 21 Height = 21
Caption = 'Ver los tipos de IVA...' Caption = 'Ver los tipos de IVA...'
TabOrder = 2 TabOrder = 5
end end
object cbRecargoEquivalencia: TcxDBCheckBox object cbRecargoEquivalencia: TcxDBCheckBox
Left = 131 Left = 131
Top = 82 Top = 136
Caption = 'Aplicar recargo de equivalencia' Caption = 'Aplicar recargo de equivalencia'
DataBinding.DataField = 'RECARGO_EQUIVALENCIA' DataBinding.DataField = 'RECARGO_EQUIVALENCIA'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -480,14 +485,13 @@ inherited frViewTotales: TfrViewTotales
StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 3 TabOrder = 6
Width = 221 Width = 221
end end
object edtRetencion: TcxDBSpinEdit object edtRetencion: TcxDBSpinEdit
Left = 676 Left = 602
Top = 218 Top = 206
AutoSize = False AutoSize = False
DataBinding.DataField = 'RETENCION'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
ParentFont = False ParentFont = False
Properties.Alignment.Horz = taRightJustify Properties.Alignment.Horz = taRightJustify
@ -524,10 +528,9 @@ inherited frViewTotales: TfrViewTotales
Width = 65 Width = 65
end end
object edtImporteRetencion: TcxDBCurrencyEdit object edtImporteRetencion: TcxDBCurrencyEdit
Left = 747 Left = 673
Top = 218 Top = 206
AutoSize = False AutoSize = False
DataBinding.DataField = 'IMPORTE_RETENCION'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
Enabled = False Enabled = False
ParentFont = False ParentFont = False
@ -560,8 +563,7 @@ inherited frViewTotales: TfrViewTotales
end end
object edtFechaRetencion: TcxDBDateEdit object edtFechaRetencion: TcxDBDateEdit
Left = 131 Left = 131
Top = 218 Top = 208
DataBinding.DataField = 'FECHA_RETENCION'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
Style.BorderColor = clWindowFrame Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D Style.BorderStyle = ebs3D
@ -580,7 +582,7 @@ inherited frViewTotales: TfrViewTotales
StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 13 TabOrder = 7
Width = 280 Width = 280
end end
object dxLayoutControl1Group_Root: TdxLayoutGroup object dxLayoutControl1Group_Root: TdxLayoutGroup
@ -589,7 +591,6 @@ inherited frViewTotales: TfrViewTotales
ShowBorder = False ShowBorder = False
object dxLayoutControl1Group1: TdxLayoutGroup object dxLayoutControl1Group1: TdxLayoutGroup
AutoAligns = [aaHorizontal] AutoAligns = [aaHorizontal]
AlignVert = avClient
Caption = 'Importes totales' Caption = 'Importes totales'
LayoutDirection = ldHorizontal LayoutDirection = ldHorizontal
object dxLayoutControl1Group2: TdxLayoutGroup object dxLayoutControl1Group2: TdxLayoutGroup
@ -605,6 +606,38 @@ inherited frViewTotales: TfrViewTotales
Control = eImporteNeto Control = eImporteNeto
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
object dxLayoutControl1Group7: TdxLayoutGroup
ShowCaption = False
Hidden = True
ShowBorder = False
object dxLayoutControl1Group10: TdxLayoutGroup
ShowCaption = False
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControl1Item4: TdxLayoutItem
AutoAligns = [aaVertical]
Caption = 'Descuento (%):'
Control = edtDescuento
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item1: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = 'Importe de dto:'
ShowCaption = False
Control = ImporteDto
ControlOptions.ShowBorder = False
end
end
object dxLayoutControl1Item9: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = 'Porte:'
Control = ePorte
ControlOptions.ShowBorder = False
end
end
object dxLayoutControl1Group6: TdxLayoutGroup object dxLayoutControl1Group6: TdxLayoutGroup
ShowCaption = False ShowCaption = False
Hidden = True Hidden = True
@ -630,36 +663,16 @@ inherited frViewTotales: TfrViewTotales
Control = cbRecargoEquivalencia Control = cbRecargoEquivalencia
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
object dxLayoutControl1Item10: TdxLayoutItem object dxLayoutControl1Item19: TdxLayoutItem
Caption = ' ' Caption = ' '
Control = Bevel1 Offsets.Top = 25
Control = Bevel2
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
object dxLayoutControl1Group7: TdxLayoutGroup object dxLayoutControl1Item21: TdxLayoutItem
ShowCaption = False Caption = 'Fecha vto. retenci'#243'n:'
Hidden = True Visible = False
LayoutDirection = ldHorizontal Control = edtFechaRetencion
ShowBorder = False
object dxLayoutControl1Item4: TdxLayoutItem
AutoAligns = [aaVertical]
Caption = 'Descuento (%):'
Control = edtDescuento
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item1: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = 'Importe de dto:'
ShowCaption = False
Control = ImporteDto
ControlOptions.ShowBorder = False
end
end
object dxLayoutControl1Item9: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = 'Porte:'
Control = ePorte
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
end end
@ -693,6 +706,15 @@ inherited frViewTotales: TfrViewTotales
Control = ImporteBase Control = ImporteBase
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
object dxLayoutControl1Item14: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = ' '
Offsets.Bottom = 15
Offsets.Top = 15
Control = Bevel4
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Group9: TdxLayoutGroup object dxLayoutControl1Group9: TdxLayoutGroup
ShowCaption = False ShowCaption = False
Hidden = True Hidden = True
@ -736,13 +758,6 @@ inherited frViewTotales: TfrViewTotales
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
end end
object dxLayoutControl1Item14: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = ' '
Control = Bevel4
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item3: TdxLayoutItem object dxLayoutControl1Item3: TdxLayoutItem
AutoAligns = [aaVertical] AutoAligns = [aaVertical]
AlignHorz = ahClient AlignHorz = ahClient
@ -751,20 +766,14 @@ inherited frViewTotales: TfrViewTotales
Control = ImporteTotal Control = ImporteTotal
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
end object dxLayoutControl1Item10: TdxLayoutItem
end Caption = ' '
end Control = Bevel1
object dxLayoutControl1Group12: TdxLayoutGroup
LayoutDirection = ldHorizontal
object dxLayoutControl1Item21: TdxLayoutItem
Caption = 'Fecha vto. retenci'#243'n:'
Visible = False
Control = edtFechaRetencion
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
object dxLayoutControl1Group11: TdxLayoutGroup object dxLayoutControl1Group11: TdxLayoutGroup
AutoAligns = [aaVertical] AutoAligns = [aaVertical]
AlignHorz = ahRight AlignHorz = ahClient
ShowCaption = False ShowCaption = False
Visible = False Visible = False
Hidden = True Hidden = True
@ -784,6 +793,8 @@ inherited frViewTotales: TfrViewTotales
end end
end end
end end
end
end
object dxLayoutControl1Group4: TdxLayoutGroup object dxLayoutControl1Group4: TdxLayoutGroup
end end
end end

8
Source/GUIBase/uViewTotales.pas
View File

@ -39,8 +39,6 @@ type
dxLayoutControl1Item9: TdxLayoutItem; dxLayoutControl1Item9: TdxLayoutItem;
ePorte: TcxDBCurrencyEdit; ePorte: TcxDBCurrencyEdit;
dxLayoutControl1Group2: TdxLayoutGroup; dxLayoutControl1Group2: TdxLayoutGroup;
Bevel1: TBevel;
dxLayoutControl1Item10: TdxLayoutItem;
dxLayoutControl1Group7: TdxLayoutGroup; dxLayoutControl1Group7: TdxLayoutGroup;
Bevel3: TBevel; Bevel3: TBevel;
dxLayoutControl1Item13: TdxLayoutItem; dxLayoutControl1Item13: TdxLayoutItem;
@ -67,7 +65,11 @@ type
dxLayoutControl1Group11: TdxLayoutGroup; dxLayoutControl1Group11: TdxLayoutGroup;
dxLayoutControl1Item21: TdxLayoutItem; dxLayoutControl1Item21: TdxLayoutItem;
edtFechaRetencion: TcxDBDateEdit; edtFechaRetencion: TcxDBDateEdit;
dxLayoutControl1Group12: TdxLayoutGroup; dxLayoutControl1Group10: TdxLayoutGroup;
dxLayoutControl1Item10: TdxLayoutItem;
Bevel1: TBevel;
dxLayoutControl1Item19: TdxLayoutItem;
Bevel2: TBevel;
public public
{ Public declarations } { Public declarations }
end; end;

BIN
Source/Informes/1/FacturaCliente.rdx
View File

Binary file not shown.

42
Source/Informes/1/InfFacturaCliente.fr3
View File

File diff suppressed because one or more lines are too long

14
Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas
View File

@ -41,7 +41,7 @@ type
TBizFacturaCliente = class(TFacturasClienteDataTableRules, IBizFacturaCliente, ISeleccionable) TBizFacturaCliente = class(TFacturasClienteDataTableRules, IBizFacturaCliente, ISeleccionable)
private private
FSeleccionableInterface : ISeleccionable; FSeleccionableInterface : ISeleccionable;
procedure CalcularDescuento; // procedure CalcularDescuento;
procedure CalcularIVA; procedure CalcularIVA;
procedure CalcularRE; procedure CalcularRE;
procedure CalcularRetencion; procedure CalcularRetencion;
@ -141,12 +141,12 @@ begin
BASE_IMPONIBLE := IMPORTE_NETO - IMPORTE_DESCUENTO + IMPORTE_PORTE; BASE_IMPONIBLE := IMPORTE_NETO - IMPORTE_DESCUENTO + IMPORTE_PORTE;
end; end;
procedure TBizFacturaCliente.CalcularDescuento; {procedure TBizFacturaCliente.CalcularDescuento;
begin begin
if not Self.DataTable.Editing then if not Self.DataTable.Editing then
Edit; Edit;
IMPORTE_DESCUENTO := (DESCUENTO / 100) * BASE_IMPONIBLE; IMPORTE_DESCUENTO := (DESCUENTO / 100) * IMPORTE_NETO;
end; end;}
procedure TBizFacturaCliente.CalcularImporteTotal; procedure TBizFacturaCliente.CalcularImporteTotal;
begin begin
@ -171,21 +171,21 @@ procedure TBizFacturaCliente.CalcularIVA;
begin begin
if not Self.DataTable.Editing then if not Self.DataTable.Editing then
Edit; Edit;
IMPORTE_IVA := (IVA / 100) * (BASE_IMPONIBLE - IMPORTE_DESCUENTO); IMPORTE_IVA := (IVA / 100) * BASE_IMPONIBLE;
end; end;
procedure TBizFacturaCliente.CalcularRE; procedure TBizFacturaCliente.CalcularRE;
begin begin
if not Self.DataTable.Editing then if not Self.DataTable.Editing then
Edit; Edit;
IMPORTE_RE := (RE / 100) * (BASE_IMPONIBLE - IMPORTE_DESCUENTO); IMPORTE_RE := (RE / 100) * BASE_IMPONIBLE;
end; end;
procedure TBizFacturaCliente.CalcularRetencion; procedure TBizFacturaCliente.CalcularRetencion;
begin begin
if not Self.DataTable.Editing then if not Self.DataTable.Editing then
Edit; Edit;
IMPORTE_RETENCION := (RETENCION / 100) * (BASE_IMPONIBLE - IMPORTE_DESCUENTO); IMPORTE_RETENCION := (RETENCION / 100) * BASE_IMPONIBLE;
end; end;
constructor TBizFacturaCliente.Create(aDataTable: TDADataTable); constructor TBizFacturaCliente.Create(aDataTable: TDADataTable);

45
Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.dfm
View File

@ -31,10 +31,11 @@ object RptWordFacturaCliente: TRptWordFacturaCliente
'acturas_cliente.poblacion, v_facturas_cliente.codigo_postal,'#10' ' + 'acturas_cliente.poblacion, v_facturas_cliente.codigo_postal,'#10' ' +
'v_facturas_cliente.recargo_equivalencia, v_facturas_cliente.impo' + 'v_facturas_cliente.recargo_equivalencia, v_facturas_cliente.impo' +
'rte_neto,'#10' v_facturas_cliente.importe_porte, formas_pago.descr' + 'rte_neto,'#10' v_facturas_cliente.importe_porte, formas_pago.descr' +
'ipcion as FORMA_PAGO,'#10' v_facturas_cliente.datos_bancarios'#10'from' + 'ipcion as FORMA_PAGO,'#10' v_facturas_cliente.datos_bancarios, v_f' +
' v_facturas_cliente'#10' left outer join formas_pago on (formas_pa' + 'acturas_cliente.fecha_vencimiento,'#10' v_facturas_cliente.retenci' +
'go.id = v_facturas_cliente.id_forma_pago)'#10'WHERE V_FACTURAS_CLIEN' + 'on, v_facturas_cliente.importe_retencion'#10'from v_facturas_cliente' +
'TE.ID = :ID'#10 #10' left outer join formas_pago on (formas_pago.id = v_facturas_' +
'cliente.id_forma_pago)'#10'WHERE V_FACTURAS_CLIENTE.ID = :ID'#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item
@ -144,6 +145,18 @@ object RptWordFacturaCliente: TRptWordFacturaCliente
item item
DatasetField = 'DATOS_BANCARIOS' DatasetField = 'DATOS_BANCARIOS'
TableField = 'DATOS_BANCARIOS' TableField = 'DATOS_BANCARIOS'
end
item
DatasetField = 'FECHA_VENCIMIENTO'
TableField = 'FECHA_VENCIMIENTO'
end
item
DatasetField = 'RETENCION'
TableField = 'RETENCION'
end
item
DatasetField = 'IMPORTE_RETENCION'
TableField = 'IMPORTE_RETENCION'
end> end>
end> end>
Name = 'Informe_Cabecera' Name = 'Informe_Cabecera'
@ -268,6 +281,18 @@ object RptWordFacturaCliente: TRptWordFacturaCliente
Name = 'DATOS_BANCARIOS' Name = 'DATOS_BANCARIOS'
DataType = datString DataType = datString
Size = 255 Size = 255
end
item
Name = 'FECHA_VENCIMIENTO'
DataType = datDateTime
end
item
Name = 'RETENCION'
DataType = datFloat
end
item
Name = 'IMPORTE_RETENCION'
DataType = datCurrency
end> end>
ReadOnly = True ReadOnly = True
end end
@ -595,6 +620,18 @@ object RptWordFacturaCliente: TRptWordFacturaCliente
Name = 'DATOS_BANCARIOS' Name = 'DATOS_BANCARIOS'
DataType = datString DataType = datString
Size = 255 Size = 255
end
item
Name = 'FECHA_VENCIMIENTO'
DataType = datDateTime
end
item
Name = 'RETENCION'
DataType = datFloat
end
item
Name = 'IMPORTE_RETENCION'
DataType = datCurrency
end> end>
Params = < Params = <
item item

21
Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas
View File

@ -212,13 +212,16 @@ begin
ReplaceBookmark('CodigoFacturaCab', FieldByName('REFERENCIA').AsString); ReplaceBookmark('CodigoFacturaCab', FieldByName('REFERENCIA').AsString);
ReplaceBookmark('FechaFacturaCab', FieldByName('FECHA_FACTURA').AsString); ReplaceBookmark('FechaFacturaCab', FieldByName('FECHA_FACTURA').AsString);
tbl_Vencimientos.First; //Se cambia se omiten los vencimientos de los recibos solo tendremos en cuenta el de la factura
Cadena := FieldByName('FECHA_VENCIMIENTO').AsString;
{ tbl_Vencimientos.First;
Cadena := ''; Cadena := '';
while not tbl_Vencimientos.eof do while not tbl_Vencimientos.eof do
begin begin
Cadena := Cadena + tbl_Vencimientos.FieldByName('FECHA_VENCIMIENTO').AsString + ' '; Cadena := Cadena + tbl_Vencimientos.FieldByName('FECHA_VENCIMIENTO').AsString + ' ';
tbl_Vencimientos.Next; tbl_Vencimientos.Next;
end; end;
}
ReplaceBookmark('VencimientoCab', Cadena); ReplaceBookmark('VencimientoCab', Cadena);
ReplaceBookmark('FormaPagoCab', FieldByName('FORMA_PAGO').AsString); ReplaceBookmark('FormaPagoCab', FieldByName('FORMA_PAGO').AsString);
@ -232,8 +235,8 @@ begin
FieldByName('CODIGO_POSTAL').AsString + ' ' + FieldByName('CODIGO_POSTAL').AsString + ' ' +
FieldByName('POBLACION').AsString + ' ' + FieldByName('PROVINCIA').AsString); FieldByName('POBLACION').AsString + ' ' + FieldByName('PROVINCIA').AsString);
ReplaceBookmark('BaseImponible', FormatFloat(DISPLAY_EUROS2, FieldByName('BASE_IMPONIBLE').AsFloat)); ReplaceBookmark('BaseImponible', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_NETO').AsFloat));
ImporteAux := FieldByName('BASE_IMPONIBLE').AsFloat - FieldByName('IMPORTE_DESCUENTO').AsFloat; ImporteAux := FieldByName('BASE_IMPONIBLE').AsFloat; // - FieldByName('IMPORTE_DESCUENTO').AsFloat;
ReplaceBookmark('BaseImponible2', FormatFloat(DISPLAY_EUROS2, ImporteAux)); ReplaceBookmark('BaseImponible2', FormatFloat(DISPLAY_EUROS2, ImporteAux));
if (FieldByName('DESCUENTO').AsInteger = 0) then if (FieldByName('DESCUENTO').AsInteger = 0) then
@ -254,6 +257,18 @@ begin
ReplaceBookmark('ImporteIVA', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_IVA').AsFloat)); ReplaceBookmark('ImporteIVA', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_IVA').AsFloat));
ReplaceBookmark('ImporteTotal', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat)); ReplaceBookmark('ImporteTotal', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat));
if (FieldByName('RETENCION').AsInteger = 0) then
begin
FWordApp.GotoBookmark('CeldasRetencion');
_ShiftCells := wdDeleteCellsShiftLeft;
FWordApp.Application.Selection.Cells.Delete(_ShiftCells);
end
else begin
ReplaceBookmark('Retencion', FieldByName('RETENCION').AsString);
ReplaceBookmark('ImporteRetencion', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_RETENCION').AsFloat));
ReplaceBookmark('ImporteTotalRet', FormatFloat(DISPLAY_EUROS2, (FieldByName('IMPORTE_TOTAL').AsFloat - FieldByName('IMPORTE_RETENCION').AsFloat)));
end;
Texto := FieldByName('OBSERVACIONES').AsString; Texto := FieldByName('OBSERVACIONES').AsString;
if not EsCadenaVacia(Texto) then if not EsCadenaVacia(Texto) then
begin begin

306
Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
View File

@ -86,20 +86,20 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
end end
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 806 Width = 806
Height = 277 Height = 312
OnChanging = pgPaginasChanging OnChanging = pgPaginasChanging
ExplicitWidth = 806 ExplicitWidth = 806
ExplicitHeight = 318 ExplicitHeight = 277
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
ExplicitLeft = 4 ExplicitLeft = 4
ExplicitTop = 24 ExplicitTop = 24
ExplicitWidth = 798 ExplicitWidth = 798
ExplicitHeight = 290 ExplicitHeight = 249
inline frViewFacturaCliente1: TfrViewFacturaCliente inline frViewFacturaCliente1: TfrViewFacturaCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 798 Width = 798
Height = 249 Height = 284
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -110,15 +110,15 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 798 ExplicitWidth = 798
ExplicitHeight = 290 ExplicitHeight = 249
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 798 Width = 798
Height = 249 Height = 284
ExplicitWidth = 798 ExplicitWidth = 798
ExplicitHeight = 290 ExplicitHeight = 249
DesignSize = ( DesignSize = (
798 798
249) 284)
inherited Label1: TLabel inherited Label1: TLabel
Left = 378 Left = 378
Width = 311 Width = 311
@ -240,12 +240,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
object pagContenido: TTabSheet object pagContenido: TTabSheet
Caption = 'Contenido' Caption = 'Contenido'
ImageIndex = 1 ImageIndex = 1
ExplicitHeight = 290 ExplicitHeight = 249
inline frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente inline frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 798 Width = 798
Height = 249 Height = 284
Align = alClient Align = alClient
BiDiMode = bdLeftToRight BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -258,72 +258,69 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 798 ExplicitWidth = 798
ExplicitHeight = 290 ExplicitHeight = 249
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 798 Width = 798
Height = 73 Height = 73
ExplicitWidth = 798 ExplicitWidth = 798
ExplicitHeight = 73 ExplicitHeight = 73
inherited ToolButton2: TToolButton inherited FontName: TJvFontComboBox [8]
Wrap = False Left = 65
ExplicitLeft = 231 ExplicitLeft = 65
end end
inherited ToolButton4: TToolButton inherited ToolButton10: TToolButton [9]
Left = 345 Left = 210
Top = 0 ExplicitLeft = 210
ExplicitLeft = 345
ExplicitTop = 0
end end
inherited ToolButton14: TToolButton inherited FontSize: TEdit [10]
Left = 401 Left = 335
Top = 0 Top = 49
Wrap = True Width = 248
ExplicitLeft = 401 ExplicitLeft = 335
ExplicitTop = 0 ExplicitTop = 49
ExplicitWidth = 248
end end
inherited FontSize: TEdit inherited UpDown1: TUpDown [11]
Left = 0 Left = 583
Width = 200 Top = 49
ExplicitLeft = 0 ExplicitLeft = 583
ExplicitWidth = 200 ExplicitTop = 49
end end
inherited UpDown1: TUpDown inherited ToolButton8: TToolButton [12]
Left = 216 Left = 600
ExplicitLeft = 216 Top = 49
end ExplicitLeft = 600
inherited FontName: TJvFontComboBox ExplicitTop = 49
Left = 233
ExplicitLeft = 233
end
inherited ToolButton13: TToolButton
Left = 378
ExplicitLeft = 378
end end
inherited ToolButton6: TToolButton inherited ToolButton6: TToolButton
Left = 386 Left = 683
ExplicitLeft = 386
end
inherited ToolButton9: TToolButton
Wrap = False
end
inherited ToolButton10: TToolButton
Left = 369
Top = 49 Top = 49
ExplicitLeft = 369 ExplicitLeft = 683
ExplicitTop = 49 ExplicitTop = 49
end end
inherited ToolButton11: TToolButton [14]
Left = 749
Top = 49
ExplicitLeft = 749
ExplicitTop = 49
end
inherited ToolButton7: TToolButton [15]
Left = 890
ExplicitLeft = 890
end
end end
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Top = 99 Top = 99
Width = 798 Width = 798
Height = 150 Height = 185
ExplicitTop = 99 ExplicitTop = 99
ExplicitWidth = 798 ExplicitWidth = 798
ExplicitHeight = 191 ExplicitHeight = 150
end end
inherited TBXDock1: TTBXDock inherited TBXDock1: TTBXDock
Top = 73 Top = 73
Width = 798 Width = 798
ExplicitTop = 73
ExplicitWidth = 798 ExplicitWidth = 798
inherited TBXToolbar1: TTBXToolbar inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 798 ExplicitWidth = 798
@ -353,9 +350,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
end end
inline frViewTotales1: TfrViewTotales [4] inline frViewTotales1: TfrViewTotales [4]
Left = 0 Left = 0
Top = 359 Top = 394
Width = 812 Width = 812
Height = 230 Height = 195
Align = alBottom Align = alBottom
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -365,128 +362,136 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ParentFont = False ParentFont = False
TabOrder = 4 TabOrder = 4
ReadOnly = False ReadOnly = False
ExplicitTop = 359 ExplicitTop = 394
ExplicitWidth = 812 ExplicitWidth = 812
ExplicitHeight = 230 ExplicitHeight = 195
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 812 Width = 812
Height = 230 Height = 195
LookAndFeel = frViewFacturaCliente1.dxLayoutOfficeLookAndFeel1 LookAndFeel = frViewFacturaCliente1.dxLayoutOfficeLookAndFeel1
ExplicitWidth = 812 ExplicitWidth = 812
ExplicitHeight = 189 ExplicitHeight = 230
inherited Bevel1: TBevel
Top = 111
Width = 73
ExplicitTop = 111
ExplicitWidth = 73
end
inherited Bevel3: TBevel inherited Bevel3: TBevel
Left = 374 Left = 405
Top = 30 Top = 30
Height = 122 Height = 122
ExplicitLeft = 374 ExplicitLeft = 405
ExplicitTop = 30 ExplicitTop = 30
ExplicitHeight = 122 ExplicitHeight = 122
end end
inherited Bevel4: TBevel inherited Bevel4: TBevel
Left = 486 Left = 517
Top = 111 Top = 60
Width = 192 Width = 192
ExplicitLeft = 486 ExplicitLeft = 517
ExplicitTop = 111 ExplicitTop = 60
ExplicitWidth = 192 ExplicitWidth = 192
end end
inherited Bevel1: TBevel
Left = 517
Top = 164
Width = 368
ExplicitLeft = 517
ExplicitTop = 164
ExplicitWidth = 368
end
inherited Bevel2: TBevel
Top = 190
Width = 368
ExplicitTop = 190
ExplicitWidth = 368
end
inherited ImporteDto: TcxDBCurrencyEdit inherited ImporteDto: TcxDBCurrencyEdit
Top = 131 Top = 57
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 = ''
ExplicitTop = 131 ExplicitTop = 57
ExplicitWidth = 184 ExplicitWidth = 184
Width = 184 Width = 184
end end
inherited ImporteIVA: TcxDBCurrencyEdit inherited ImporteIVA: TcxDBCurrencyEdit
Left = 557 Left = 588
Top = 57 Top = 83
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 = 557 ExplicitLeft = 588
ExplicitTop = 57 ExplicitTop = 83
ExplicitWidth = 249 ExplicitWidth = 249
Width = 249 Width = 249
end end
inherited ImporteTotal: TcxDBCurrencyEdit inherited ImporteTotal: TcxDBCurrencyEdit
Left = 487 Left = 518
Top = 131 Top = 137
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 = 487 ExplicitLeft = 518
ExplicitTop = 131 ExplicitTop = 137
ExplicitWidth = 319 ExplicitWidth = 319
Width = 319 Width = 319
end end
inherited edtDescuento: TcxDBSpinEdit inherited edtDescuento: TcxDBSpinEdit
Top = 131
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 131
end
inherited edtIVA: TcxDBSpinEdit
Left = 486
Top = 57 Top = 57
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 = 486
ExplicitTop = 57 ExplicitTop = 57
end end
inherited edtIVA: TcxDBSpinEdit
Left = 517
Top = 83
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 517
ExplicitTop = 83
end
inherited ImporteBase: TcxDBCurrencyEdit inherited ImporteBase: TcxDBCurrencyEdit
Left = 486 Left = 517
Top = 30 Top = 30
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 = 486 ExplicitLeft = 517
ExplicitTop = 30 ExplicitTop = 30
ExplicitWidth = 320 ExplicitWidth = 320
Width = 320 Width = 320
end end
inherited edtRE: TcxDBSpinEdit inherited edtRE: TcxDBSpinEdit
Left = 486 Left = 517
Top = 84 Top = 110
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 = 486 ExplicitLeft = 517
ExplicitTop = 84 ExplicitTop = 110
end end
inherited ImporteRE: TcxDBCurrencyEdit inherited ImporteRE: TcxDBCurrencyEdit
Left = 557 Left = 588
Top = 84 Top = 110
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 = 557 ExplicitLeft = 588
ExplicitTop = 84 ExplicitTop = 110
ExplicitWidth = 249 ExplicitWidth = 249
Width = 249 Width = 249
end end
@ -502,35 +507,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Width = 255 Width = 255
end end
inherited ePorte: TcxDBCurrencyEdit inherited ePorte: TcxDBCurrencyEdit
Top = 158
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 158
ExplicitWidth = 255
Width = 255
end
inherited eIVA: TcxDBLookupComboBox
Top = 57
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 57
ExplicitWidth = 117
Width = 117
end
inherited bTiposIVA: TButton
Left = 226
Top = 57
ExplicitLeft = 226
ExplicitTop = 57
end
inherited cbRecargoEquivalencia: TcxDBCheckBox
Top = 84 Top = 84
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
@ -538,65 +517,96 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitWidth = 255 ExplicitWidth = 255
Width = 255 Width = 255
end end
inherited eIVA: TcxDBLookupComboBox
Top = 111
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 111
ExplicitWidth = 117
Width = 117
end
inherited bTiposIVA: TButton
Left = 257
Top = 111
ExplicitLeft = 257
ExplicitTop = 111
end
inherited cbRecargoEquivalencia: TcxDBCheckBox
Top = 138
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 138
ExplicitWidth = 255
Width = 255
end
inherited edtRetencion: TcxDBSpinEdit inherited edtRetencion: TcxDBSpinEdit
Left = 550 Left = 517
Top = 209 Top = 184
DataBinding.DataField = 'RETENCION'
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 = 550 ExplicitLeft = 517
ExplicitTop = 209 ExplicitTop = 184
end end
inherited edtImporteRetencion: TcxDBCurrencyEdit inherited edtImporteRetencion: TcxDBCurrencyEdit
Left = 621 Left = 588
Top = 209 Top = 184
DataBinding.DataField = 'IMPORTE_RETENCION'
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 = 621 ExplicitLeft = 588
ExplicitTop = 209 ExplicitTop = 184
ExplicitWidth = 152 ExplicitWidth = 152
Width = 152 Width = 152
end end
inherited edtFechaRetencion: TcxDBDateEdit inherited edtFechaRetencion: TcxDBDateEdit
Top = 209 Top = 210
DataBinding.DataField = 'FECHA_RETENCION'
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 209 ExplicitTop = 210
ExplicitWidth = 150 ExplicitWidth = 150
Width = 150 Width = 150
end end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group1: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup
inherited dxLayoutControl1Group2: TdxLayoutGroup inherited dxLayoutControl1Group2: TdxLayoutGroup
inherited dxLayoutControl1Group7: TdxLayoutGroup
inherited dxLayoutControl1Item9: TdxLayoutItem
Visible = False
end
end
inherited dxLayoutControl1Item16: TdxLayoutItem inherited dxLayoutControl1Item16: TdxLayoutItem
Visible = False Visible = False
end end
inherited dxLayoutControl1Item10: TdxLayoutItem inherited dxLayoutControl1Item21: TdxLayoutItem
Visible = False Visible = True
end end
end end
inherited dxLayoutControl1Group5: TdxLayoutGroup inherited dxLayoutControl1Group5: TdxLayoutGroup
inherited dxLayoutControl1Group3: TdxLayoutGroup inherited dxLayoutControl1Group3: TdxLayoutGroup
inherited dxLayoutControl1Item14: TdxLayoutItem
Offsets.Bottom = 3
Offsets.Top = 3
end
inherited dxLayoutControl1Group8: TdxLayoutGroup inherited dxLayoutControl1Group8: TdxLayoutGroup
Visible = False Visible = False
inherited dxLayoutControl1Item7: TdxLayoutItem inherited dxLayoutControl1Item7: TdxLayoutItem
Visible = True Visible = True
end end
end end
end
end
end
inherited dxLayoutControl1Group12: TdxLayoutGroup
inherited dxLayoutControl1Item21: TdxLayoutItem
Visible = True
end
inherited dxLayoutControl1Group11: TdxLayoutGroup inherited dxLayoutControl1Group11: TdxLayoutGroup
Visible = True Visible = True
end end
@ -604,6 +614,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
end end
end end
end end
end
end
inherited EditorActionList: TActionList [5] inherited EditorActionList: TActionList [5]
Left = 8 Left = 8
Top = 144 Top = 144

2
Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm
View File

@ -819,7 +819,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 750 Width = 750
Height = 315 Height = 315
ExplicitWidth = 750 ExplicitWidth = 750
ExplicitHeight = 307 ExplicitHeight = 315
end end
end end
end end

128
Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm
View File

@ -1,32 +1,25 @@
inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
Width = 924
Height = 293 Height = 293
OnDestroy = CustomViewDestroy OnDestroy = CustomViewDestroy
OnShow = CustomViewShow OnShow = CustomViewShow
ExplicitWidth = 924
ExplicitHeight = 293 ExplicitHeight = 293
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 924 Height = 293
Height = 281
ExplicitWidth = 451 ExplicitWidth = 451
ExplicitHeight = 281 ExplicitHeight = 281
DesignSize = ( DesignSize = (
924 451
281) 293)
inherited Bevel1: TBevel inherited Bevel1: TBevel
Width = 73 Width = 73
ExplicitWidth = 73 ExplicitWidth = 73
end end
inherited Bevel3: TBevel inherited Bevel3: TBevel
Left = 531
Height = 122 Height = 122
ExplicitLeft = 531
ExplicitHeight = 122 ExplicitHeight = 122
end end
inherited Bevel4: TBevel inherited Bevel4: TBevel
Left = 643
Width = 192 Width = 192
ExplicitLeft = 643
ExplicitWidth = 192 ExplicitWidth = 192
end end
inherited ImporteDto: TcxDBCurrencyEdit inherited ImporteDto: TcxDBCurrencyEdit
@ -35,27 +28,29 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 87
Width = 87
end end
inherited ImporteIVA: TcxDBCurrencyEdit inherited ImporteIVA: TcxDBCurrencyEdit
Left = 714
DataBinding.DataField = '' DataBinding.DataField = ''
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 = ''
TabOrder = 12 TabOrder = 10
ExplicitLeft = 714 ExplicitWidth = 20
Width = 20
end end
inherited ImporteTotal: TcxDBCurrencyEdit inherited ImporteTotal: TcxDBCurrencyEdit
Left = 644
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 = ''
TabOrder = 15 TabOrder = 13
ExplicitLeft = 644 ExplicitWidth = 90
Width = 90
end end
inherited edtDescuento: TcxDBSpinEdit inherited edtDescuento: TcxDBSpinEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -65,46 +60,42 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
end end
inherited edtIVA: TcxDBSpinEdit inherited edtIVA: TcxDBSpinEdit
Left = 643 Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 9
end
inherited ImporteBase: TcxDBCurrencyEdit
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 8
ExplicitWidth = 91
Width = 91
end
inherited edtRE: TcxDBSpinEdit
DataBinding.DataField = ''
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 = ''
TabOrder = 11 TabOrder = 11
ExplicitLeft = 643
end
inherited ImporteBase: TcxDBCurrencyEdit
Left = 643
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 10
ExplicitLeft = 643
end
inherited edtRE: TcxDBSpinEdit
Left = 643
DataBinding.DataField = ''
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 13
ExplicitLeft = 643
end end
inherited ImporteRE: TcxDBCurrencyEdit inherited ImporteRE: TcxDBCurrencyEdit
Left = 714
DataBinding.DataField = '' DataBinding.DataField = ''
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 = ''
TabOrder = 14 TabOrder = 12
ExplicitLeft = 714 ExplicitWidth = 20
Width = 20
end end
inherited eImporteNeto: TcxDBCurrencyEdit inherited eImporteNeto: TcxDBCurrencyEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -112,6 +103,8 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 158
Width = 158
end end
inherited ePorte: TcxDBCurrencyEdit inherited ePorte: TcxDBCurrencyEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -119,6 +112,8 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 158
Width = 158
end end
inherited eIVA: TcxDBLookupComboBox inherited eIVA: TcxDBLookupComboBox
DataBinding.DataField = '' DataBinding.DataField = ''
@ -126,10 +121,8 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
end ExplicitWidth = 20
inherited bTiposIVA: TButton Width = 20
Left = 383
ExplicitLeft = 383
end end
inherited cbRecargoEquivalencia: TcxDBCheckBox inherited cbRecargoEquivalencia: TcxDBCheckBox
DataBinding.DataField = '' DataBinding.DataField = ''
@ -161,7 +154,7 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 8 TabOrder = 17
Height = 21 Height = 21
Width = 325 Width = 325
end end
@ -196,7 +189,7 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 9 TabOrder = 18
Height = 21 Height = 21
Width = 277 Width = 277
end end
@ -228,6 +221,35 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
TabOrder = 7 TabOrder = 7
Width = 277 Width = 277
end end
inherited edtRetencion: TcxDBSpinEdit
Top = 240
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 15
ExplicitTop = 240
end
inherited edtImporteRetencion: TcxDBCurrencyEdit
Top = 240
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 16
ExplicitTop = 240
end
inherited edtFechaRetencion: TcxDBDateEdit
Top = 240
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 14
ExplicitTop = 240
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group1: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup
inherited dxLayoutControl1Group2: TdxLayoutGroup inherited dxLayoutControl1Group2: TdxLayoutGroup
@ -254,16 +276,6 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
Control = cbBonificacion Control = cbBonificacion
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
object dxLayoutControl1Item17: TdxLayoutItem
Caption = 'Descripci'#243'n:'
Control = eDescripcionBonificacion
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item18: TdxLayoutItem
Caption = 'Importe:'
Control = eImporteBonificacion
ControlOptions.ShowBorder = False
end
end end
inherited dxLayoutControl1Group5: TdxLayoutGroup inherited dxLayoutControl1Group5: TdxLayoutGroup
inherited dxLayoutControl1Group3: TdxLayoutGroup inherited dxLayoutControl1Group3: TdxLayoutGroup

4
Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.pas
View File

@ -8,13 +8,11 @@ uses
uDADataTable, dxLayoutControl, cxCheckBox, cxDBEdit, StdCtrls, cxDropDownEdit, uDADataTable, dxLayoutControl, cxCheckBox, cxDBEdit, StdCtrls, cxDropDownEdit,
cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, cxMaskEdit, cxSpinEdit, cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, cxMaskEdit, cxSpinEdit,
cxContainer, cxEdit, cxTextEdit, cxCurrencyEdit, ExtCtrls, cxControls, cxContainer, cxEdit, cxTextEdit, cxCurrencyEdit, ExtCtrls, cxControls,
uBizPresupuestosCliente, uPresupuestosClienteController; uBizPresupuestosCliente, uPresupuestosClienteController, cxCalendar;
type type
TfrViewTotalesPresupuesto = class(TfrViewTotales) TfrViewTotalesPresupuesto = class(TfrViewTotales)
dxLayoutControl1Item17: TdxLayoutItem;
eDescripcionBonificacion: TcxDBTextEdit; eDescripcionBonificacion: TcxDBTextEdit;
dxLayoutControl1Item18: TdxLayoutItem;
eImporteBonificacion: TcxDBCurrencyEdit; eImporteBonificacion: TcxDBCurrencyEdit;
dxLayoutControl1Item19: TdxLayoutItem; dxLayoutControl1Item19: TdxLayoutItem;
cbBonificacion: TcxCheckBox; cbBonificacion: TcxCheckBox;

BIN
Source/Servidor/FactuGES_Server.RES
View File

Binary file not shown.

2
Source/Servidor/FactuGES_Server.dproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid> <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>

2
Source/Servidor/FactuGES_Server.rc
View File

@ -14,7 +14,7 @@ BEGIN
BEGIN BEGIN
VALUE "FileVersion", "1.6.2.0\0" VALUE "FileVersion", "1.6.2.0\0"
VALUE "ProductVersion", "1.6.2.0\0" VALUE "ProductVersion", "1.6.2.0\0"
VALUE "CompileDate", "jueves, 15 de enero de 2009 14:06\0" VALUE "CompileDate", "jueves, 15 de enero de 2009 14:12\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"