diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 07bcde00..d03ddc0b 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -54,57 +54,57 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Base/Base.res b/Source/Base/Base.res
index 8b251f31..1641339f 100644
Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index 03124ef2..4ba61680 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico"
1 VERSIONINFO
-FILEVERSION 1,6,1,0
-PRODUCTVERSION 1,6,1,0
+FILEVERSION 1,6,2,0
+PRODUCTVERSION 1,6,2,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4"
BEGIN
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 "ProductName", "FactuGES\0"
- VALUE "ProductVersion", "1.6.1.0\0"
+ VALUE "ProductVersion", "1.6.2.0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index 82607d81..de03ef67 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj
index 56f8b55d..e150b26a 100644
--- a/Source/GUIBase/GUIBase.dproj
+++ b/Source/GUIBase/GUIBase.dproj
@@ -59,30 +59,30 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res
index 8b251f31..1641339f 100644
Binary files a/Source/GUIBase/GUIBase.res and b/Source/GUIBase/GUIBase.res differ
diff --git a/Source/GUIBase/uViewTotales.dfm b/Source/GUIBase/uViewTotales.dfm
index e4894343..45ab651b 100644
--- a/Source/GUIBase/uViewTotales.dfm
+++ b/Source/GUIBase/uViewTotales.dfm
@@ -1,9 +1,9 @@
inherited frViewTotales: TfrViewTotales
- Width = 949
- Height = 261
+ Width = 966
+ Height = 252
Align = alBottom
- ExplicitWidth = 949
- ExplicitHeight = 261
+ ExplicitWidth = 966
+ ExplicitHeight = 252
object Bevel5: TBevel
Left = 666
Top = 109
@@ -15,8 +15,8 @@ inherited frViewTotales: TfrViewTotales
AlignWithMargins = True
Left = 0
Top = 0
- Width = 949
- Height = 261
+ Width = 966
+ Height = 252
Margins.Left = 0
Margins.Top = 0
Margins.Right = 0
@@ -26,36 +26,41 @@ inherited frViewTotales: TfrViewTotales
TabOrder = 0
TabStop = False
AutoContentSizes = [acsWidth, acsHeight]
- ExplicitWidth = 451
- ExplicitHeight = 257
- object Bevel1: TBevel
- Left = 131
- Top = 109
- Width = 73
- Height = 9
- Shape = bsBottomLine
- end
+ ExplicitHeight = 265
object Bevel3: TBevel
- Left = 499
+ Left = 490
Top = 28
Width = 3
- Height = 122
+ Height = 100
Shape = bsRightLine
end
object Bevel4: TBevel
- Left = 611
- Top = 109
- Width = 192
+ Left = 602
+ Top = 70
+ 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
Shape = bsBottomLine
end
object ImporteDto: TcxDBCurrencyEdit
Left = 202
- Top = 129
+ Top = 55
AutoSize = False
DataBinding.DataField = 'IMPORTE_DESCUENTO'
DataBinding.DataSource = DADataSource
- Enabled = False
ParentFont = False
Properties.Alignment.Horz = taRightJustify
Properties.DisplayFormat = '-,0.00 '#8364';,0.00 '#8364
@@ -81,13 +86,13 @@ inherited frViewTotales: TfrViewTotales
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 5
+ TabOrder = 2
Height = 21
Width = 87
end
object ImporteIVA: TcxDBCurrencyEdit
- Left = 682
- Top = 55
+ Left = 673
+ Top = 105
AutoSize = False
DataBinding.DataField = 'IMPORTE_IVA'
DataBinding.DataSource = DADataSource
@@ -116,13 +121,13 @@ inherited frViewTotales: TfrViewTotales
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 9
+ TabOrder = 10
Height = 21
Width = 20
end
object ImporteTotal: TcxDBCurrencyEdit
- Left = 612
- Top = 129
+ Left = 603
+ Top = 159
AutoSize = False
DataBinding.DataField = 'IMPORTE_TOTAL'
DataBinding.DataSource = DADataSource
@@ -152,13 +157,13 @@ inherited frViewTotales: TfrViewTotales
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 12
+ TabOrder = 13
Height = 21
Width = 90
end
object edtDescuento: TcxDBSpinEdit
Left = 131
- Top = 129
+ Top = 55
AutoSize = False
DataBinding.DataField = 'DESCUENTO'
DataBinding.DataSource = DADataSource
@@ -186,13 +191,13 @@ inherited frViewTotales: TfrViewTotales
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 4
+ TabOrder = 1
Height = 21
Width = 65
end
object edtIVA: TcxDBSpinEdit
- Left = 611
- Top = 55
+ Left = 602
+ Top = 105
AutoSize = False
DataBinding.DataField = 'IVA'
DataBinding.DataSource = DADataSource
@@ -227,12 +232,12 @@ inherited frViewTotales: TfrViewTotales
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 8
+ TabOrder = 9
Height = 21
Width = 65
end
object ImporteBase: TcxDBCurrencyEdit
- Left = 611
+ Left = 602
Top = 28
AutoSize = False
DataBinding.DataField = 'BASE_IMPONIBLE'
@@ -262,13 +267,13 @@ inherited frViewTotales: TfrViewTotales
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 7
+ TabOrder = 8
Height = 21
Width = 91
end
object edtRE: TcxDBSpinEdit
- Left = 611
- Top = 82
+ Left = 602
+ Top = 132
AutoSize = False
DataBinding.DataField = 'RE'
DataBinding.DataSource = DADataSource
@@ -303,13 +308,13 @@ inherited frViewTotales: TfrViewTotales
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 10
+ TabOrder = 11
Height = 21
Width = 65
end
object ImporteRE: TcxDBCurrencyEdit
- Left = 682
- Top = 82
+ Left = 673
+ Top = 132
AutoSize = False
DataBinding.DataField = 'IMPORTE_RE'
DataBinding.DataSource = DADataSource
@@ -338,7 +343,7 @@ inherited frViewTotales: TfrViewTotales
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 11
+ TabOrder = 12
Height = 21
Width = 20
end
@@ -378,7 +383,7 @@ inherited frViewTotales: TfrViewTotales
end
object ePorte: TcxDBCurrencyEdit
Left = 131
- Top = 156
+ Top = 82
AutoSize = False
DataBinding.DataField = 'IMPORTE_PORTE'
DataBinding.DataSource = DADataSource
@@ -406,13 +411,13 @@ inherited frViewTotales: TfrViewTotales
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 6
+ TabOrder = 3
Height = 21
Width = 158
end
object eIVA: TcxDBLookupComboBox
Left = 131
- Top = 55
+ Top = 109
DataBinding.DataField = 'ID_TIPO_IVA'
DataBinding.DataSource = DADataSource
Properties.ImmediatePost = True
@@ -442,20 +447,20 @@ inherited frViewTotales: TfrViewTotales
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 1
+ TabOrder = 4
Width = 20
end
object bTiposIVA: TButton
- Left = 351
- Top = 55
+ Left = 342
+ Top = 109
Width = 132
Height = 21
Caption = 'Ver los tipos de IVA...'
- TabOrder = 2
+ TabOrder = 5
end
object cbRecargoEquivalencia: TcxDBCheckBox
Left = 131
- Top = 82
+ Top = 136
Caption = 'Aplicar recargo de equivalencia'
DataBinding.DataField = 'RECARGO_EQUIVALENCIA'
DataBinding.DataSource = DADataSource
@@ -480,14 +485,13 @@ inherited frViewTotales: TfrViewTotales
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 3
+ TabOrder = 6
Width = 221
end
object edtRetencion: TcxDBSpinEdit
- Left = 676
- Top = 218
+ Left = 602
+ Top = 206
AutoSize = False
- DataBinding.DataField = 'RETENCION'
DataBinding.DataSource = DADataSource
ParentFont = False
Properties.Alignment.Horz = taRightJustify
@@ -524,10 +528,9 @@ inherited frViewTotales: TfrViewTotales
Width = 65
end
object edtImporteRetencion: TcxDBCurrencyEdit
- Left = 747
- Top = 218
+ Left = 673
+ Top = 206
AutoSize = False
- DataBinding.DataField = 'IMPORTE_RETENCION'
DataBinding.DataSource = DADataSource
Enabled = False
ParentFont = False
@@ -560,8 +563,7 @@ inherited frViewTotales: TfrViewTotales
end
object edtFechaRetencion: TcxDBDateEdit
Left = 131
- Top = 218
- DataBinding.DataField = 'FECHA_RETENCION'
+ Top = 208
DataBinding.DataSource = DADataSource
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
@@ -580,7 +582,7 @@ inherited frViewTotales: TfrViewTotales
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 13
+ TabOrder = 7
Width = 280
end
object dxLayoutControl1Group_Root: TdxLayoutGroup
@@ -589,7 +591,6 @@ inherited frViewTotales: TfrViewTotales
ShowBorder = False
object dxLayoutControl1Group1: TdxLayoutGroup
AutoAligns = [aaHorizontal]
- AlignVert = avClient
Caption = 'Importes totales'
LayoutDirection = ldHorizontal
object dxLayoutControl1Group2: TdxLayoutGroup
@@ -605,6 +606,38 @@ inherited frViewTotales: TfrViewTotales
Control = eImporteNeto
ControlOptions.ShowBorder = False
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
ShowCaption = False
Hidden = True
@@ -630,36 +663,16 @@ inherited frViewTotales: TfrViewTotales
Control = cbRecargoEquivalencia
ControlOptions.ShowBorder = False
end
- object dxLayoutControl1Item10: TdxLayoutItem
+ object dxLayoutControl1Item19: TdxLayoutItem
Caption = ' '
- Control = Bevel1
+ Offsets.Top = 25
+ Control = Bevel2
ControlOptions.ShowBorder = False
end
- object dxLayoutControl1Group7: 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
+ object dxLayoutControl1Item21: TdxLayoutItem
+ Caption = 'Fecha vto. retenci'#243'n:'
+ Visible = False
+ Control = edtFechaRetencion
ControlOptions.ShowBorder = False
end
end
@@ -693,6 +706,15 @@ inherited frViewTotales: TfrViewTotales
Control = ImporteBase
ControlOptions.ShowBorder = False
end
+ object dxLayoutControl1Item14: TdxLayoutItem
+ AutoAligns = [aaVertical]
+ AlignHorz = ahClient
+ Caption = ' '
+ Offsets.Bottom = 15
+ Offsets.Top = 15
+ Control = Bevel4
+ ControlOptions.ShowBorder = False
+ end
object dxLayoutControl1Group9: TdxLayoutGroup
ShowCaption = False
Hidden = True
@@ -736,13 +758,6 @@ inherited frViewTotales: TfrViewTotales
ControlOptions.ShowBorder = False
end
end
- object dxLayoutControl1Item14: TdxLayoutItem
- AutoAligns = [aaVertical]
- AlignHorz = ahClient
- Caption = ' '
- Control = Bevel4
- ControlOptions.ShowBorder = False
- end
object dxLayoutControl1Item3: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
@@ -751,35 +766,31 @@ inherited frViewTotales: TfrViewTotales
Control = ImporteTotal
ControlOptions.ShowBorder = False
end
- end
- end
- end
- object dxLayoutControl1Group12: TdxLayoutGroup
- LayoutDirection = ldHorizontal
- object dxLayoutControl1Item21: TdxLayoutItem
- Caption = 'Fecha vto. retenci'#243'n:'
- Visible = False
- Control = edtFechaRetencion
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Group11: TdxLayoutGroup
- AutoAligns = [aaVertical]
- AlignHorz = ahRight
- ShowCaption = False
- Visible = False
- Hidden = True
- LayoutDirection = ldHorizontal
- ShowBorder = False
- object dxLayoutControl1Item17: TdxLayoutItem
- Caption = 'Retenci'#243'n (%):'
- Control = edtRetencion
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Item18: TdxLayoutItem
- AutoAligns = [aaVertical]
- AlignHorz = ahClient
- Control = edtImporteRetencion
- ControlOptions.ShowBorder = False
+ object dxLayoutControl1Item10: TdxLayoutItem
+ Caption = ' '
+ Control = Bevel1
+ ControlOptions.ShowBorder = False
+ end
+ object dxLayoutControl1Group11: TdxLayoutGroup
+ AutoAligns = [aaVertical]
+ AlignHorz = ahClient
+ ShowCaption = False
+ Visible = False
+ Hidden = True
+ LayoutDirection = ldHorizontal
+ ShowBorder = False
+ object dxLayoutControl1Item17: TdxLayoutItem
+ Caption = 'Retenci'#243'n (%):'
+ Control = edtRetencion
+ ControlOptions.ShowBorder = False
+ end
+ object dxLayoutControl1Item18: TdxLayoutItem
+ AutoAligns = [aaVertical]
+ AlignHorz = ahClient
+ Control = edtImporteRetencion
+ ControlOptions.ShowBorder = False
+ end
+ end
end
end
end
diff --git a/Source/GUIBase/uViewTotales.pas b/Source/GUIBase/uViewTotales.pas
index 1be7908c..d4363d9d 100644
--- a/Source/GUIBase/uViewTotales.pas
+++ b/Source/GUIBase/uViewTotales.pas
@@ -39,8 +39,6 @@ type
dxLayoutControl1Item9: TdxLayoutItem;
ePorte: TcxDBCurrencyEdit;
dxLayoutControl1Group2: TdxLayoutGroup;
- Bevel1: TBevel;
- dxLayoutControl1Item10: TdxLayoutItem;
dxLayoutControl1Group7: TdxLayoutGroup;
Bevel3: TBevel;
dxLayoutControl1Item13: TdxLayoutItem;
@@ -67,7 +65,11 @@ type
dxLayoutControl1Group11: TdxLayoutGroup;
dxLayoutControl1Item21: TdxLayoutItem;
edtFechaRetencion: TcxDBDateEdit;
- dxLayoutControl1Group12: TdxLayoutGroup;
+ dxLayoutControl1Group10: TdxLayoutGroup;
+ dxLayoutControl1Item10: TdxLayoutItem;
+ Bevel1: TBevel;
+ dxLayoutControl1Item19: TdxLayoutItem;
+ Bevel2: TBevel;
public
{ Public declarations }
end;
diff --git a/Source/Informes/1/FacturaCliente.rdx b/Source/Informes/1/FacturaCliente.rdx
index 4f2266a5..2f6ace81 100644
Binary files a/Source/Informes/1/FacturaCliente.rdx and b/Source/Informes/1/FacturaCliente.rdx differ
diff --git a/Source/Informes/1/InfFacturaCliente.fr3 b/Source/Informes/1/InfFacturaCliente.fr3
index 6870a97e..5e2a9e92 100644
--- a/Source/Informes/1/InfFacturaCliente.fr3
+++ b/Source/Informes/1/InfFacturaCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -7,8 +7,8 @@
-
-
+
+
@@ -23,7 +23,7 @@
-
+
@@ -33,28 +33,28 @@
-
-
-
-
+
+
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas
index 82fbc83a..20c4e673 100644
--- a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas
+++ b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas
@@ -41,7 +41,7 @@ type
TBizFacturaCliente = class(TFacturasClienteDataTableRules, IBizFacturaCliente, ISeleccionable)
private
FSeleccionableInterface : ISeleccionable;
- procedure CalcularDescuento;
+// procedure CalcularDescuento;
procedure CalcularIVA;
procedure CalcularRE;
procedure CalcularRetencion;
@@ -141,12 +141,12 @@ begin
BASE_IMPONIBLE := IMPORTE_NETO - IMPORTE_DESCUENTO + IMPORTE_PORTE;
end;
-procedure TBizFacturaCliente.CalcularDescuento;
+{procedure TBizFacturaCliente.CalcularDescuento;
begin
if not Self.DataTable.Editing then
Edit;
- IMPORTE_DESCUENTO := (DESCUENTO / 100) * BASE_IMPONIBLE;
-end;
+ IMPORTE_DESCUENTO := (DESCUENTO / 100) * IMPORTE_NETO;
+end;}
procedure TBizFacturaCliente.CalcularImporteTotal;
begin
@@ -171,21 +171,21 @@ procedure TBizFacturaCliente.CalcularIVA;
begin
if not Self.DataTable.Editing then
Edit;
- IMPORTE_IVA := (IVA / 100) * (BASE_IMPONIBLE - IMPORTE_DESCUENTO);
+ IMPORTE_IVA := (IVA / 100) * BASE_IMPONIBLE;
end;
procedure TBizFacturaCliente.CalcularRE;
begin
if not Self.DataTable.Editing then
Edit;
- IMPORTE_RE := (RE / 100) * (BASE_IMPONIBLE - IMPORTE_DESCUENTO);
+ IMPORTE_RE := (RE / 100) * BASE_IMPONIBLE;
end;
procedure TBizFacturaCliente.CalcularRetencion;
begin
if not Self.DataTable.Editing then
Edit;
- IMPORTE_RETENCION := (RETENCION / 100) * (BASE_IMPONIBLE - IMPORTE_DESCUENTO);
+ IMPORTE_RETENCION := (RETENCION / 100) * BASE_IMPONIBLE;
end;
constructor TBizFacturaCliente.Create(aDataTable: TDADataTable);
diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.dfm
index 3b8dc82f..45bc8917 100644
--- a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.dfm
@@ -31,10 +31,11 @@ object RptWordFacturaCliente: TRptWordFacturaCliente
'acturas_cliente.poblacion, v_facturas_cliente.codigo_postal,'#10' ' +
'v_facturas_cliente.recargo_equivalencia, v_facturas_cliente.impo' +
'rte_neto,'#10' v_facturas_cliente.importe_porte, formas_pago.descr' +
- 'ipcion as FORMA_PAGO,'#10' v_facturas_cliente.datos_bancarios'#10'from' +
- ' v_facturas_cliente'#10' left outer join formas_pago on (formas_pa' +
- 'go.id = v_facturas_cliente.id_forma_pago)'#10'WHERE V_FACTURAS_CLIEN' +
- 'TE.ID = :ID'#10
+ 'ipcion as FORMA_PAGO,'#10' v_facturas_cliente.datos_bancarios, v_f' +
+ 'acturas_cliente.fecha_vencimiento,'#10' v_facturas_cliente.retenci' +
+ 'on, v_facturas_cliente.importe_retencion'#10'from v_facturas_cliente' +
+ #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
ColumnMappings = <
item
@@ -144,6 +145,18 @@ object RptWordFacturaCliente: TRptWordFacturaCliente
item
DatasetField = '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>
Name = 'Informe_Cabecera'
@@ -268,6 +281,18 @@ object RptWordFacturaCliente: TRptWordFacturaCliente
Name = 'DATOS_BANCARIOS'
DataType = datString
Size = 255
+ end
+ item
+ Name = 'FECHA_VENCIMIENTO'
+ DataType = datDateTime
+ end
+ item
+ Name = 'RETENCION'
+ DataType = datFloat
+ end
+ item
+ Name = 'IMPORTE_RETENCION'
+ DataType = datCurrency
end>
ReadOnly = True
end
@@ -595,6 +620,18 @@ object RptWordFacturaCliente: TRptWordFacturaCliente
Name = 'DATOS_BANCARIOS'
DataType = datString
Size = 255
+ end
+ item
+ Name = 'FECHA_VENCIMIENTO'
+ DataType = datDateTime
+ end
+ item
+ Name = 'RETENCION'
+ DataType = datFloat
+ end
+ item
+ Name = 'IMPORTE_RETENCION'
+ DataType = datCurrency
end>
Params = <
item
diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas
index 780057d8..b0e89716 100644
--- a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas
+++ b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas
@@ -212,13 +212,16 @@ begin
ReplaceBookmark('CodigoFacturaCab', FieldByName('REFERENCIA').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 := '';
while not tbl_Vencimientos.eof do
begin
Cadena := Cadena + tbl_Vencimientos.FieldByName('FECHA_VENCIMIENTO').AsString + ' ';
tbl_Vencimientos.Next;
end;
+}
ReplaceBookmark('VencimientoCab', Cadena);
ReplaceBookmark('FormaPagoCab', FieldByName('FORMA_PAGO').AsString);
@@ -232,8 +235,8 @@ begin
FieldByName('CODIGO_POSTAL').AsString + ' ' +
FieldByName('POBLACION').AsString + ' ' + FieldByName('PROVINCIA').AsString);
- ReplaceBookmark('BaseImponible', FormatFloat(DISPLAY_EUROS2, FieldByName('BASE_IMPONIBLE').AsFloat));
- ImporteAux := FieldByName('BASE_IMPONIBLE').AsFloat - FieldByName('IMPORTE_DESCUENTO').AsFloat;
+ ReplaceBookmark('BaseImponible', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_NETO').AsFloat));
+ ImporteAux := FieldByName('BASE_IMPONIBLE').AsFloat; // - FieldByName('IMPORTE_DESCUENTO').AsFloat;
ReplaceBookmark('BaseImponible2', FormatFloat(DISPLAY_EUROS2, ImporteAux));
if (FieldByName('DESCUENTO').AsInteger = 0) then
@@ -254,6 +257,18 @@ begin
ReplaceBookmark('ImporteIVA', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_IVA').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;
if not EsCadenaVacia(Texto) then
begin
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
index 5c87a90f..ff8f674d 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
@@ -86,20 +86,20 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
end
inherited pgPaginas: TPageControl
Width = 806
- Height = 277
+ Height = 312
OnChanging = pgPaginasChanging
ExplicitWidth = 806
- ExplicitHeight = 318
+ ExplicitHeight = 277
inherited pagGeneral: TTabSheet
ExplicitLeft = 4
ExplicitTop = 24
ExplicitWidth = 798
- ExplicitHeight = 290
+ ExplicitHeight = 249
inline frViewFacturaCliente1: TfrViewFacturaCliente
Left = 0
Top = 0
Width = 798
- Height = 249
+ Height = 284
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -110,15 +110,15 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
TabOrder = 0
ReadOnly = False
ExplicitWidth = 798
- ExplicitHeight = 290
+ ExplicitHeight = 249
inherited dxLayoutControl1: TdxLayoutControl
Width = 798
- Height = 249
+ Height = 284
ExplicitWidth = 798
- ExplicitHeight = 290
+ ExplicitHeight = 249
DesignSize = (
798
- 249)
+ 284)
inherited Label1: TLabel
Left = 378
Width = 311
@@ -240,12 +240,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
object pagContenido: TTabSheet
Caption = 'Contenido'
ImageIndex = 1
- ExplicitHeight = 290
+ ExplicitHeight = 249
inline frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente
Left = 0
Top = 0
Width = 798
- Height = 249
+ Height = 284
Align = alClient
BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET
@@ -258,72 +258,69 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
TabOrder = 0
ReadOnly = False
ExplicitWidth = 798
- ExplicitHeight = 290
+ ExplicitHeight = 249
inherited ToolBar1: TToolBar
Width = 798
Height = 73
ExplicitWidth = 798
ExplicitHeight = 73
- inherited ToolButton2: TToolButton
- Wrap = False
- ExplicitLeft = 231
+ inherited FontName: TJvFontComboBox [8]
+ Left = 65
+ ExplicitLeft = 65
end
- inherited ToolButton4: TToolButton
- Left = 345
- Top = 0
- ExplicitLeft = 345
- ExplicitTop = 0
+ inherited ToolButton10: TToolButton [9]
+ Left = 210
+ ExplicitLeft = 210
end
- inherited ToolButton14: TToolButton
- Left = 401
- Top = 0
- Wrap = True
- ExplicitLeft = 401
- ExplicitTop = 0
+ inherited FontSize: TEdit [10]
+ Left = 335
+ Top = 49
+ Width = 248
+ ExplicitLeft = 335
+ ExplicitTop = 49
+ ExplicitWidth = 248
end
- inherited FontSize: TEdit
- Left = 0
- Width = 200
- ExplicitLeft = 0
- ExplicitWidth = 200
+ inherited UpDown1: TUpDown [11]
+ Left = 583
+ Top = 49
+ ExplicitLeft = 583
+ ExplicitTop = 49
end
- inherited UpDown1: TUpDown
- Left = 216
- ExplicitLeft = 216
- end
- inherited FontName: TJvFontComboBox
- Left = 233
- ExplicitLeft = 233
- end
- inherited ToolButton13: TToolButton
- Left = 378
- ExplicitLeft = 378
+ inherited ToolButton8: TToolButton [12]
+ Left = 600
+ Top = 49
+ ExplicitLeft = 600
+ ExplicitTop = 49
end
inherited ToolButton6: TToolButton
- Left = 386
- ExplicitLeft = 386
- end
- inherited ToolButton9: TToolButton
- Wrap = False
- end
- inherited ToolButton10: TToolButton
- Left = 369
+ Left = 683
Top = 49
- ExplicitLeft = 369
+ ExplicitLeft = 683
ExplicitTop = 49
end
+ inherited ToolButton11: TToolButton [14]
+ Left = 749
+ Top = 49
+ ExplicitLeft = 749
+ ExplicitTop = 49
+ end
+ inherited ToolButton7: TToolButton [15]
+ Left = 890
+ ExplicitLeft = 890
+ end
end
inherited cxGrid: TcxGrid
Top = 99
Width = 798
- Height = 150
+ Height = 185
ExplicitTop = 99
ExplicitWidth = 798
- ExplicitHeight = 191
+ ExplicitHeight = 150
end
inherited TBXDock1: TTBXDock
Top = 73
Width = 798
+ ExplicitTop = 73
ExplicitWidth = 798
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 798
@@ -353,9 +350,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
end
inline frViewTotales1: TfrViewTotales [4]
Left = 0
- Top = 359
+ Top = 394
Width = 812
- Height = 230
+ Height = 195
Align = alBottom
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -365,128 +362,136 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ParentFont = False
TabOrder = 4
ReadOnly = False
- ExplicitTop = 359
+ ExplicitTop = 394
ExplicitWidth = 812
- ExplicitHeight = 230
+ ExplicitHeight = 195
inherited dxLayoutControl1: TdxLayoutControl
Width = 812
- Height = 230
+ Height = 195
LookAndFeel = frViewFacturaCliente1.dxLayoutOfficeLookAndFeel1
ExplicitWidth = 812
- ExplicitHeight = 189
- inherited Bevel1: TBevel
- Top = 111
- Width = 73
- ExplicitTop = 111
- ExplicitWidth = 73
- end
+ ExplicitHeight = 230
inherited Bevel3: TBevel
- Left = 374
+ Left = 405
Top = 30
Height = 122
- ExplicitLeft = 374
+ ExplicitLeft = 405
ExplicitTop = 30
ExplicitHeight = 122
end
inherited Bevel4: TBevel
- Left = 486
- Top = 111
+ Left = 517
+ Top = 60
Width = 192
- ExplicitLeft = 486
- ExplicitTop = 111
+ ExplicitLeft = 517
+ ExplicitTop = 60
ExplicitWidth = 192
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
- Top = 131
+ Top = 57
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitTop = 131
+ ExplicitTop = 57
ExplicitWidth = 184
Width = 184
end
inherited ImporteIVA: TcxDBCurrencyEdit
- Left = 557
- Top = 57
+ Left = 588
+ Top = 83
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 557
- ExplicitTop = 57
+ ExplicitLeft = 588
+ ExplicitTop = 83
ExplicitWidth = 249
Width = 249
end
inherited ImporteTotal: TcxDBCurrencyEdit
- Left = 487
- Top = 131
+ Left = 518
+ Top = 137
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 487
- ExplicitTop = 131
+ ExplicitLeft = 518
+ ExplicitTop = 137
ExplicitWidth = 319
Width = 319
end
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
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 486
ExplicitTop = 57
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
- Left = 486
+ Left = 517
Top = 30
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 486
+ ExplicitLeft = 517
ExplicitTop = 30
ExplicitWidth = 320
Width = 320
end
inherited edtRE: TcxDBSpinEdit
- Left = 486
- Top = 84
+ Left = 517
+ Top = 110
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 486
- ExplicitTop = 84
+ ExplicitLeft = 517
+ ExplicitTop = 110
end
inherited ImporteRE: TcxDBCurrencyEdit
- Left = 557
- Top = 84
+ Left = 588
+ Top = 110
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 557
- ExplicitTop = 84
+ ExplicitLeft = 588
+ ExplicitTop = 110
ExplicitWidth = 249
Width = 249
end
@@ -502,35 +507,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Width = 255
end
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
Style.LookAndFeel.SkinName = ''
+ Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
@@ -538,69 +517,102 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitWidth = 255
Width = 255
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
- Left = 550
- Top = 209
+ Left = 517
+ Top = 184
+ DataBinding.DataField = 'RETENCION'
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 550
- ExplicitTop = 209
+ ExplicitLeft = 517
+ ExplicitTop = 184
end
inherited edtImporteRetencion: TcxDBCurrencyEdit
- Left = 621
- Top = 209
+ Left = 588
+ Top = 184
+ DataBinding.DataField = 'IMPORTE_RETENCION'
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 621
- ExplicitTop = 209
+ ExplicitLeft = 588
+ ExplicitTop = 184
ExplicitWidth = 152
Width = 152
end
inherited edtFechaRetencion: TcxDBDateEdit
- Top = 209
+ Top = 210
+ DataBinding.DataField = 'FECHA_RETENCION'
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitTop = 209
+ ExplicitTop = 210
ExplicitWidth = 150
Width = 150
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group1: TdxLayoutGroup
inherited dxLayoutControl1Group2: TdxLayoutGroup
+ inherited dxLayoutControl1Group7: TdxLayoutGroup
+ inherited dxLayoutControl1Item9: TdxLayoutItem
+ Visible = False
+ end
+ end
inherited dxLayoutControl1Item16: TdxLayoutItem
Visible = False
end
- inherited dxLayoutControl1Item10: TdxLayoutItem
- Visible = False
+ inherited dxLayoutControl1Item21: TdxLayoutItem
+ Visible = True
end
end
inherited dxLayoutControl1Group5: TdxLayoutGroup
inherited dxLayoutControl1Group3: TdxLayoutGroup
+ inherited dxLayoutControl1Item14: TdxLayoutItem
+ Offsets.Bottom = 3
+ Offsets.Top = 3
+ end
inherited dxLayoutControl1Group8: TdxLayoutGroup
Visible = False
inherited dxLayoutControl1Item7: TdxLayoutItem
Visible = True
end
end
+ inherited dxLayoutControl1Group11: TdxLayoutGroup
+ Visible = True
+ end
end
end
end
- inherited dxLayoutControl1Group12: TdxLayoutGroup
- inherited dxLayoutControl1Item21: TdxLayoutItem
- Visible = True
- end
- inherited dxLayoutControl1Group11: TdxLayoutGroup
- Visible = True
- end
- end
end
end
end
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm
index fdaedabf..b9ed2cc5 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm
+++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm
@@ -819,7 +819,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 750
Height = 315
ExplicitWidth = 750
- ExplicitHeight = 307
+ ExplicitHeight = 315
end
end
end
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm
index e314201a..d9974ba0 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm
+++ b/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm
@@ -1,32 +1,25 @@
inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
- Width = 924
Height = 293
OnDestroy = CustomViewDestroy
OnShow = CustomViewShow
- ExplicitWidth = 924
ExplicitHeight = 293
inherited dxLayoutControl1: TdxLayoutControl
- Width = 924
- Height = 281
+ Height = 293
ExplicitWidth = 451
ExplicitHeight = 281
DesignSize = (
- 924
- 281)
+ 451
+ 293)
inherited Bevel1: TBevel
Width = 73
ExplicitWidth = 73
end
inherited Bevel3: TBevel
- Left = 531
Height = 122
- ExplicitLeft = 531
ExplicitHeight = 122
end
inherited Bevel4: TBevel
- Left = 643
Width = 192
- ExplicitLeft = 643
ExplicitWidth = 192
end
inherited ImporteDto: TcxDBCurrencyEdit
@@ -35,27 +28,29 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
+ ExplicitWidth = 87
+ Width = 87
end
inherited ImporteIVA: TcxDBCurrencyEdit
- Left = 714
DataBinding.DataField = ''
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 12
- ExplicitLeft = 714
+ TabOrder = 10
+ ExplicitWidth = 20
+ Width = 20
end
inherited ImporteTotal: TcxDBCurrencyEdit
- Left = 644
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 15
- ExplicitLeft = 644
+ TabOrder = 13
+ ExplicitWidth = 90
+ Width = 90
end
inherited edtDescuento: TcxDBSpinEdit
Style.LookAndFeel.SkinName = ''
@@ -65,46 +60,42 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
StyleHot.LookAndFeel.SkinName = ''
end
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.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
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
inherited ImporteRE: TcxDBCurrencyEdit
- Left = 714
DataBinding.DataField = ''
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 14
- ExplicitLeft = 714
+ TabOrder = 12
+ ExplicitWidth = 20
+ Width = 20
end
inherited eImporteNeto: TcxDBCurrencyEdit
Style.LookAndFeel.SkinName = ''
@@ -112,6 +103,8 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
+ ExplicitWidth = 158
+ Width = 158
end
inherited ePorte: TcxDBCurrencyEdit
Style.LookAndFeel.SkinName = ''
@@ -119,6 +112,8 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
+ ExplicitWidth = 158
+ Width = 158
end
inherited eIVA: TcxDBLookupComboBox
DataBinding.DataField = ''
@@ -126,10 +121,8 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- end
- inherited bTiposIVA: TButton
- Left = 383
- ExplicitLeft = 383
+ ExplicitWidth = 20
+ Width = 20
end
inherited cbRecargoEquivalencia: TcxDBCheckBox
DataBinding.DataField = ''
@@ -161,7 +154,7 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 8
+ TabOrder = 17
Height = 21
Width = 325
end
@@ -196,7 +189,7 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 9
+ TabOrder = 18
Height = 21
Width = 277
end
@@ -228,6 +221,35 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
TabOrder = 7
Width = 277
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 dxLayoutControl1Group1: TdxLayoutGroup
inherited dxLayoutControl1Group2: TdxLayoutGroup
@@ -254,16 +276,6 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
Control = cbBonificacion
ControlOptions.ShowBorder = False
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
inherited dxLayoutControl1Group5: TdxLayoutGroup
inherited dxLayoutControl1Group3: TdxLayoutGroup
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.pas b/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.pas
index 8b1d7ab6..8a12ab1b 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.pas
+++ b/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.pas
@@ -8,13 +8,11 @@ uses
uDADataTable, dxLayoutControl, cxCheckBox, cxDBEdit, StdCtrls, cxDropDownEdit,
cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, cxMaskEdit, cxSpinEdit,
cxContainer, cxEdit, cxTextEdit, cxCurrencyEdit, ExtCtrls, cxControls,
- uBizPresupuestosCliente, uPresupuestosClienteController;
+ uBizPresupuestosCliente, uPresupuestosClienteController, cxCalendar;
type
TfrViewTotalesPresupuesto = class(TfrViewTotales)
- dxLayoutControl1Item17: TdxLayoutItem;
eDescripcionBonificacion: TcxDBTextEdit;
- dxLayoutControl1Item18: TdxLayoutItem;
eImporteBonificacion: TcxDBCurrencyEdit;
dxLayoutControl1Item19: TdxLayoutItem;
cbBonificacion: TcxCheckBox;
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 42780c59..fe0af8c1 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index cb072198..1097c82e 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -1,323 +1,323 @@
-
+
-
- {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}
- FactuGES_Server.dpr
- Debug
- AnyCPU
- DCC32
- ..\..\Output\Debug\Servidor\FactuGES_Server.exe
- vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100
-
-
- 7.0
- False
- False
- 0
- 3
- ..\..\Output\Release\Servidor
- RELEASE
-
-
- 7.0
- 3
- ..\..\Output\Debug\Servidor
- DEBUG;
- True
- True
- True
- $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
- $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
- $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
- $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
-
-
- Delphi.Personality
-
-
- FalseTrueFalse/standaloneTrueFalse1620FalseFalseFalseFalseFalse308212521.6.2.01.6.2.0viernes, 09 de enero de 2009 18:39FactuGES_Server.dpr
-
-
-
-
- MainSource
-
-
-
-
-
-
- TDARemoteService
-
-
-
- TDataModule
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDARemoteService
-
-
-
-
-
-
- TDARemoteService
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDARemoteService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
- TDataAbstractService
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
- TFrame
-
-
-
- TFrame
-
-
-
- TForm
-
-
-
- TFrame
-
-
-
- TDARemoteService
-
-
-
-
-
-
- TDataModule
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}
+ FactuGES_Server.dpr
+ Debug
+ AnyCPU
+ DCC32
+ ..\..\Output\Debug\Servidor\FactuGES_Server.exe
+ vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100
+
+
+ 7.0
+ False
+ False
+ 0
+ 3
+ ..\..\Output\Release\Servidor
+ RELEASE
+
+
+ 7.0
+ 3
+ ..\..\Output\Debug\Servidor
+ DEBUG;
+ True
+ True
+ True
+ $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+ $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+ $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+ $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+
+
+ Delphi.Personality
+
+
+FalseTrueFalse/standaloneTrueFalse1620FalseFalseFalseFalseFalse308212521.6.2.01.6.2.0viernes, 09 de enero de 2009 18:39FactuGES_Server.dpr
+
+
+
+
+ MainSource
+
+
+
+
+
+
+ TDARemoteService
+
+
+
+ TDataModule
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDARemoteService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+ TDataAbstractService
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+ TFrame
+
+
+
+ TFrame
+
+
+
+ TForm
+
+
+
+ TFrame
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+ TDataModule
+
+
+
+
+
+
+
+
+
+
+
+
+
+