diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 48f0f7b1..aa3d20ab 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -58,55 +58,55 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
TForm
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 6d872093..d6fbef80 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -53,7 +53,7 @@
Delphi.Personality
VCLApplication
-FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2410FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.4.1.0FactuGESFactuGES2.4.1.0FactuGES.dprFalse
+FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2420FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.4.2.0FactuGESFactuGES2.4.2.0FactuGES.dprFalse
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index 305f2305..bea33fa7 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico"
1 VERSIONINFO
-FILEVERSION 2,4,0,0
-PRODUCTVERSION 2,4,0,0
+FILEVERSION 2,4,2,0
+PRODUCTVERSION 2,4,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", "2.4.0.0\0"
+ VALUE "FileVersion", "2.4.2.0\0"
VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0"
- VALUE "ProductVersion", "2.4.0.0\0"
+ VALUE "ProductVersion", "2.4.2.0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj
index f44e3be7..958a997a 100644
--- a/Source/GUIBase/GUIBase.dproj
+++ b/Source/GUIBase/GUIBase.dproj
@@ -58,34 +58,34 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/GUIBase/uViewTotales.dfm b/Source/GUIBase/uViewTotales.dfm
index 85995939..7bf77e4a 100644
--- a/Source/GUIBase/uViewTotales.dfm
+++ b/Source/GUIBase/uViewTotales.dfm
@@ -1,14 +1,14 @@
inherited frViewTotales: TfrViewTotales
- Width = 698
- Height = 214
+ Width = 788
+ Height = 224
Align = alBottom
- ExplicitWidth = 698
- ExplicitHeight = 214
+ ExplicitWidth = 451
+ ExplicitHeight = 224
object dxLayoutControl1: TdxLayoutControl
AlignWithMargins = True
Left = 0
Top = 0
- Width = 698
+ Width = 788
Height = 217
Margins.Left = 0
Margins.Top = 0
@@ -21,14 +21,14 @@ inherited frViewTotales: TfrViewTotales
AutoContentSizes = [acsWidth, acsHeight]
ExplicitWidth = 451
object Bevel3: TBevel
- Left = 346
+ Left = 389
Top = 28
Width = 3
Height = 122
Shape = bsRightLine
end
object Bevel4: TBevel
- Left = 458
+ Left = 501
Top = 70
Width = 210
Height = 9
@@ -55,22 +55,18 @@ inherited frViewTotales: TfrViewTotales
Style.Font.Style = []
Style.HotTrack = False
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.TextColor = clWindowText
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 2
Height = 21
Width = 93
end
object ImporteIVA: TcxDBCurrencyEdit
- Left = 529
+ Left = 572
Top = 105
AutoSize = False
DataBinding.DataField = 'IMPORTE_IVA'
@@ -90,22 +86,18 @@ inherited frViewTotales: TfrViewTotales
Style.Font.Style = []
Style.HotTrack = False
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.TextColor = clWindowText
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 9
Height = 21
Width = 137
end
object ImporteTotal: TcxDBCurrencyEdit
- Left = 459
+ Left = 502
Top = 159
AutoSize = False
DataBinding.DataField = 'IMPORTE_TOTAL'
@@ -125,17 +117,13 @@ inherited frViewTotales: TfrViewTotales
Style.Font.Style = []
Style.HotTrack = False
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.TextColor = clActiveCaption
Style.TextStyle = [fsBold]
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 12
Height = 21
Width = 137
@@ -160,22 +148,18 @@ inherited frViewTotales: TfrViewTotales
Style.Font.Style = []
Style.HotTrack = False
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.TextColor = clWindowText
Style.ButtonStyle = bts3D
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 1
Height = 21
Width = 65
end
object edtIVA: TcxDBSpinEdit
- Left = 458
+ Left = 501
Top = 105
AutoSize = False
DataBinding.DataField = 'IVA'
@@ -197,26 +181,22 @@ inherited frViewTotales: TfrViewTotales
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.TextColor = clWindowText
Style.ButtonStyle = bts3D
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 8
Height = 21
Width = 65
end
object ImporteBase: TcxDBCurrencyEdit
- Left = 458
+ Left = 501
Top = 28
AutoSize = False
DataBinding.DataField = 'BASE_IMPONIBLE'
@@ -235,22 +215,18 @@ inherited frViewTotales: TfrViewTotales
Style.Font.Style = [fsBold]
Style.HotTrack = False
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.TextColor = clWindowText
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 7
Height = 21
Width = 92
end
object edtRE: TcxDBSpinEdit
- Left = 458
+ Left = 501
Top = 132
AutoSize = False
DataBinding.DataField = 'RE'
@@ -272,26 +248,22 @@ inherited frViewTotales: TfrViewTotales
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.TextColor = clWindowText
Style.ButtonStyle = bts3D
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 10
Height = 21
Width = 65
end
object ImporteRE: TcxDBCurrencyEdit
- Left = 529
+ Left = 572
Top = 132
AutoSize = False
DataBinding.DataField = 'IMPORTE_RE'
@@ -311,16 +283,12 @@ inherited frViewTotales: TfrViewTotales
Style.Font.Style = []
Style.HotTrack = False
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.TextColor = clWindowText
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 11
Height = 21
Width = 56
@@ -346,16 +314,12 @@ inherited frViewTotales: TfrViewTotales
Style.Font.Style = [fsBold]
Style.HotTrack = False
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.TextColor = clWindowText
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 0
Height = 21
Width = 147
@@ -380,16 +344,12 @@ inherited frViewTotales: TfrViewTotales
Style.Font.Style = []
Style.HotTrack = False
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.TextColor = clWindowText
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 3
Height = 21
Width = 147
@@ -415,23 +375,19 @@ inherited frViewTotales: TfrViewTotales
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.ButtonStyle = bts3D
Style.PopupBorderStyle = epbsFrame3D
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 4
Width = 81
end
object bTiposIVA: TButton
- Left = 198
+ Left = 241
Top = 109
Width = 132
Height = 21
@@ -455,16 +411,12 @@ inherited frViewTotales: TfrViewTotales
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 6
Width = 219
end
@@ -628,7 +580,6 @@ inherited frViewTotales: TfrViewTotales
AlignHorz = ahClient
Caption = 'Importe de RE:'
ShowCaption = False
- Visible = False
Control = ImporteRE
ControlOptions.ShowBorder = False
end
diff --git a/Source/Informes/InfContratoCliente.fr3 b/Source/Informes/InfContratoCliente.fr3
index 5d88d872..aef0bfb9 100644
--- a/Source/Informes/InfContratoCliente.fr3
+++ b/Source/Informes/InfContratoCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -35,25 +35,24 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/InfPresupuestoCliente.fr3 b/Source/Informes/InfPresupuestoCliente.fr3
index 93781363..161aca14 100644
--- a/Source/Informes/InfPresupuestoCliente.fr3
+++ b/Source/Informes/InfPresupuestoCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -11,22 +11,22 @@
-
+
-
+
-
+
-
+
@@ -34,32 +34,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
diff --git a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas
index 5ec5987a..845a062d 100644
--- a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas
+++ b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas
@@ -3,7 +3,7 @@ unit schAlbaranesClienteClient_Intf;
interface
uses
- Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
+ Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
const
{ Data table rules ids
@@ -165,7 +165,7 @@ type
end;
{ TListaAnosAlbaranesDataTableRules }
- TListaAnosAlbaranesDataTableRules = class(TDADataTableRules, IListaAnosAlbaranes)
+ TListaAnosAlbaranesDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosAlbaranes)
private
protected
{ Property getters and setters }
@@ -456,7 +456,7 @@ type
end;
{ TAlbaranesClienteDataTableRules }
- TAlbaranesClienteDataTableRules = class(TDADataTableRules, IAlbaranesCliente)
+ TAlbaranesClienteDataTableRules = class(TIntfObjectDADataTableRules, IAlbaranesCliente)
private
f_OBSERVACIONES: IROStrings;
f_INCIDENCIAS: IROStrings;
@@ -829,7 +829,7 @@ type
end;
{ TAlbaranesCliente_DetallesDataTableRules }
- TAlbaranesCliente_DetallesDataTableRules = class(TDADataTableRules, IAlbaranesCliente_Detalles)
+ TAlbaranesCliente_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IAlbaranesCliente_Detalles)
private
protected
{ Property getters and setters }
diff --git a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm
index e6444c5d..e0a54a61 100644
--- a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm
+++ b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm
@@ -12,7 +12,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
inherited JvNavPanelHeader: TJvNavPanelHeader
Width = 845
Caption = 'Nuevo contrato de cliente'
- ExplicitWidth = 848
+ ExplicitWidth = 845
inherited Image1: TImage
Left = 818
Picture.Data = {
@@ -127,7 +127,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
end
inherited TBXDock: TTBXDock
Width = 845
- ExplicitWidth = 848
+ ExplicitWidth = 845
inherited tbxMain: TTBXToolbar
ExplicitWidth = 488
inherited TBXItem2: TTBXItem
@@ -168,29 +168,25 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
item
Width = 200
end>
- ExplicitTop = 657
- ExplicitWidth = 848
+ ExplicitTop = 576
+ ExplicitWidth = 845
end
inherited pgPaginas: TPageControl
Width = 839
Height = 270
- ActivePage = pagInicidencias
TabOrder = 1
OnChanging = pgPaginasChanging
- ExplicitTop = 109
- ExplicitWidth = 842
- ExplicitHeight = 351
+ ExplicitWidth = 839
+ ExplicitHeight = 270
inherited pagGeneral: TTabSheet
ExplicitLeft = 4
ExplicitTop = 24
- ExplicitWidth = 834
- ExplicitHeight = 323
+ ExplicitWidth = 831
+ ExplicitHeight = 242
end
object pagContenido: TTabSheet
Caption = 'Contenido'
ImageIndex = 1
- ExplicitWidth = 834
- ExplicitHeight = 323
inline frViewDetallesContratoCliente1: TfrViewDetallesContratoCliente
Left = 0
Top = 0
@@ -207,12 +203,12 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
ParentFont = False
TabOrder = 0
ReadOnly = False
- ExplicitWidth = 834
- ExplicitHeight = 323
+ ExplicitWidth = 831
+ ExplicitHeight = 242
inherited ToolBar1: TToolBar
Width = 831
Height = 24
- ExplicitWidth = 834
+ ExplicitWidth = 831
ExplicitHeight = 24
inherited ToolButton14: TToolButton
Wrap = False
@@ -314,8 +310,6 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
object pagInicidencias: TTabSheet
Caption = 'Incidencias'
ImageIndex = 2
- ExplicitWidth = 834
- ExplicitHeight = 323
inline frViewIncidenciasCli: TfrViewIncidencias
Left = 0
Top = 0
@@ -330,22 +324,25 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
ParentFont = False
TabOrder = 0
ReadOnly = False
- ExplicitWidth = 834
- ExplicitHeight = 323
+ ExplicitWidth = 831
+ ExplicitHeight = 242
inherited pnlSup: TPanel
Width = 831
- ExplicitWidth = 834
+ ExplicitWidth = 831
+ inherited eIncidenciaActiva: TcxDBCheckBox
+ ExplicitHeight = 21
+ end
end
inherited GroupBox1: TGroupBox
Width = 831
Height = 214
- ExplicitWidth = 834
- ExplicitHeight = 295
+ ExplicitWidth = 831
+ ExplicitHeight = 214
inherited eIncidencias: TcxDBMemo
- ExplicitWidth = 811
- ExplicitHeight = 292
- Height = 211
- Width = 808
+ ExplicitWidth = 827
+ ExplicitHeight = 197
+ Height = 197
+ Width = 827
end
end
end
@@ -353,8 +350,6 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
object pagDocumentos: TTabSheet
Caption = 'Documentos'
ImageIndex = 5
- ExplicitWidth = 834
- ExplicitHeight = 323
inline frViewDocumentosContratoCliente1: TfrViewDocumentosContratoCliente
Left = 0
Top = 0
@@ -369,8 +364,8 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
ParentFont = False
TabOrder = 0
ReadOnly = False
- ExplicitWidth = 834
- ExplicitHeight = 323
+ ExplicitWidth = 831
+ ExplicitHeight = 242
inherited TBXDock: TTBXDock
Width = 831
ExplicitWidth = 834
@@ -390,7 +385,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
end
inherited PnlComentario: TPanel
Width = 845
- ExplicitWidth = 848
+ ExplicitWidth = 845
inherited lbComentario: TLabel
Width = 835
Height = 25
@@ -410,12 +405,12 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
ParentFont = False
TabOrder = 5
ReadOnly = False
- ExplicitTop = 463
- ExplicitWidth = 848
+ ExplicitTop = 382
+ ExplicitWidth = 845
ExplicitHeight = 194
inherited dxLayoutControl1: TdxLayoutControl
Width = 845
- ExplicitWidth = 848
+ ExplicitWidth = 845
inherited Bevel3: TBevel
Left = 416
Height = 122
@@ -429,108 +424,64 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
ExplicitWidth = 210
end
inherited ImporteDto: TcxDBCurrencyEdit
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 93
Width = 93
end
inherited ImporteIVA: TcxDBCurrencyEdit
Left = 599
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 599
ExplicitWidth = 137
Width = 137
end
inherited ImporteTotal: TcxDBCurrencyEdit
Left = 529
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 529
ExplicitWidth = 137
Width = 137
end
inherited edtDescuento: TcxDBSpinEdit
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
end
inherited edtIVA: TcxDBSpinEdit
Left = 528
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 528
end
inherited ImporteBase: TcxDBCurrencyEdit
Left = 528
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 528
ExplicitWidth = 92
Width = 92
end
inherited edtRE: TcxDBSpinEdit
Left = 528
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 528
end
inherited ImporteRE: TcxDBCurrencyEdit
Left = 599
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 599
ExplicitWidth = 56
Width = 56
end
inherited eImporteNeto: TcxDBCurrencyEdit
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 147
Width = 147
end
inherited ePorte: TcxDBCurrencyEdit
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 147
Width = 147
end
inherited eIVA: TcxDBLookupComboBox
Properties.OnValidate = frViewTotales1eIVAPropertiesValidate
Style.Color = clInfoBk
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 81
Width = 81
end
@@ -540,10 +491,6 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
ExplicitLeft = 268
end
inherited cbRecargoEquivalencia: TcxDBCheckBox
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 219
Width = 219
end
@@ -551,9 +498,6 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
inherited dxLayoutControl1Group1: TdxLayoutGroup
inherited dxLayoutControl1Group2: TdxLayoutGroup
inherited dxLayoutControl1Group7: TdxLayoutGroup
- inherited dxLayoutControl1Group10: TdxLayoutGroup
- Visible = False
- end
inherited dxLayoutControl1Item9: TdxLayoutItem
Visible = False
end
diff --git a/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.dfm b/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.dfm
index 288dc0e4..d940f6c9 100644
--- a/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.dfm
+++ b/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.dfm
@@ -1047,6 +1047,21 @@ object srvPresupuestosCliente: TsrvPresupuestosCliente
DataType = datCurrency
Value = ''
end
+ item
+ Name = 'RECARGO_EQUIVALENCIA'
+ DataType = datSmallInt
+ Value = ''
+ end
+ item
+ Name = 'RE'
+ DataType = datFloat
+ Value = ''
+ end
+ item
+ Name = 'IMPORTE_RE'
+ DataType = datCurrency
+ Value = ''
+ end
item
Name = 'ID_TIPO_IVA'
DataType = datInteger
@@ -1114,11 +1129,13 @@ object srvPresupuestosCliente: TsrvPresupuestosCliente
' = :USUARIO, '#10' IMPORTE_NETO = :IMPORTE_NETO, '#10' IMPORTE_POR' +
'TE = :IMPORTE_PORTE, '#10' DESCUENTO = :DESCUENTO, '#10' IMPORTE_D' +
'ESCUENTO = :IMPORTE_DESCUENTO, '#10' BASE_IMPONIBLE = :BASE_IMPON' +
- 'IBLE, '#10' ID_TIPO_IVA = :ID_TIPO_IVA,'#10' IVA = :IVA, '#10' IMPO' +
- 'RTE_IVA = :IMPORTE_IVA, '#10' IMPORTE_TOTAL = :IMPORTE_TOTAL, '#10' ' +
- ' ID_FORMA_PAGO = :ID_FORMA_PAGO,'#10' ID_TIENDA = :ID_TIENDA,'#10' ' +
- ' ID_VENDEDOR = :ID_VENDEDOR,'#10' ID_CONTRATO = :ID_CONTRATO,'#10' ' +
- ' NO_VALORADO = :NO_VALORADO'#10' WHERE'#10' (ID = :OLD_ID)'#10#10
+ 'IBLE, '#10' RECARGO_EQUIVALENCIA = :RECARGO_EQUIVALENCIA,'#10' RE ' +
+ '= :RE,'#10' IMPORTE_RE = :IMPORTE_RE,'#10' ID_TIPO_IVA = :ID_TIPO_' +
+ 'IVA,'#10' IVA = :IVA, '#10' IMPORTE_IVA = :IMPORTE_IVA, '#10' IMPOR' +
+ 'TE_TOTAL = :IMPORTE_TOTAL, '#10' ID_FORMA_PAGO = :ID_FORMA_PAGO,'#10 +
+ ' ID_TIENDA = :ID_TIENDA,'#10' ID_VENDEDOR = :ID_VENDEDOR,'#10' ' +
+ 'ID_CONTRATO = :ID_CONTRATO,'#10' NO_VALORADO = :NO_VALORADO'#10' WHE' +
+ 'RE'#10' (ID = :OLD_ID)'#10#10
StatementType = stSQL
ColumnMappings = <>
end>
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm
index dd4cbd72..08dffe45 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm
+++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm
@@ -5,6 +5,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ClientHeight = 676
ClientWidth = 848
OnClose = CustomEditorClose
+ ExplicitTop = -147
ExplicitWidth = 856
ExplicitHeight = 710
PixelsPerInch = 96
@@ -161,11 +162,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object TBXItem34: TTBXItem
Action = actEnviarPorEMail
end
- object TBXItem7: TTBXItem
- Caption = 'Generar certificado'
- Hint = 'Generar certificado de trabajos'
- ImageIndex = 21
- end
end
end
end
@@ -176,8 +172,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
item
Width = 200
end>
- ExplicitLeft = 8
- ExplicitTop = 660
+ ExplicitTop = 657
ExplicitWidth = 848
end
inherited pgPaginas: TPageControl
@@ -414,151 +409,141 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ParentFont = False
TabOrder = 5
ReadOnly = False
- ExplicitTop = 448
+ ExplicitTop = 429
ExplicitWidth = 848
ExplicitHeight = 228
inherited dxLayoutControl1: TdxLayoutControl
Width = 848
+ LookAndFeel = dxLayoutOfficeLookAndFeel1
ExplicitWidth = 848
inherited Bevel3: TBevel
- Left = 417
+ Left = 352
+ Top = 57
Height = 122
- ExplicitLeft = 417
+ ExplicitLeft = 352
+ ExplicitTop = 57
ExplicitHeight = 122
end
inherited Bevel4: TBevel
- Left = 529
- Width = 210
- ExplicitLeft = 529
- ExplicitWidth = 210
+ Left = 464
+ Top = 88
+ Width = 342
+ ExplicitLeft = 464
+ ExplicitTop = 88
+ ExplicitWidth = 342
end
inherited ImporteDto: TcxDBCurrencyEdit
- Style.LookAndFeel.SkinName = ''
+ Top = 84
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
+ ExplicitTop = 84
ExplicitWidth = 93
Width = 93
end
inherited ImporteIVA: TcxDBCurrencyEdit
- Left = 600
- Style.LookAndFeel.SkinName = ''
+ Left = 535
+ Top = 108
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 600
+ ExplicitLeft = 535
+ ExplicitTop = 108
ExplicitWidth = 137
Width = 137
end
inherited ImporteTotal: TcxDBCurrencyEdit
- Left = 530
- Style.LookAndFeel.SkinName = ''
+ Left = 465
+ Top = 162
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 530
+ ExplicitLeft = 465
+ ExplicitTop = 162
ExplicitWidth = 137
Width = 137
end
inherited edtDescuento: TcxDBSpinEdit
- Style.LookAndFeel.SkinName = ''
+ Top = 84
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
+ ExplicitTop = 84
end
inherited edtIVA: TcxDBSpinEdit
- Left = 529
- Style.LookAndFeel.SkinName = ''
+ Left = 464
+ Top = 108
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 529
+ ExplicitLeft = 464
+ ExplicitTop = 108
end
inherited ImporteBase: TcxDBCurrencyEdit
- Left = 529
- Style.LookAndFeel.SkinName = ''
+ Left = 464
+ Top = 57
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 529
+ ExplicitLeft = 464
+ ExplicitTop = 57
ExplicitWidth = 92
Width = 92
end
inherited edtRE: TcxDBSpinEdit
- Left = 529
- Style.LookAndFeel.SkinName = ''
+ Left = 464
+ Top = 135
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 529
+ ExplicitLeft = 464
+ ExplicitTop = 135
end
inherited ImporteRE: TcxDBCurrencyEdit
- Left = 600
- Style.LookAndFeel.SkinName = ''
+ Left = 535
+ Top = 135
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 600
+ ExplicitLeft = 535
+ ExplicitTop = 135
ExplicitWidth = 56
Width = 56
end
inherited eImporteNeto: TcxDBCurrencyEdit
- Style.LookAndFeel.SkinName = ''
+ Top = 57
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
+ ExplicitTop = 57
ExplicitWidth = 147
Width = 147
end
inherited ePorte: TcxDBCurrencyEdit
- Style.LookAndFeel.SkinName = ''
+ Top = 111
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
+ ExplicitTop = 111
ExplicitWidth = 147
Width = 147
end
inherited eIVA: TcxDBLookupComboBox
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
+ Top = 138
+ ExplicitTop = 138
ExplicitWidth = 81
Width = 81
end
inherited bTiposIVA: TButton
- Left = 269
- ExplicitLeft = 269
+ Left = 204
+ Top = 138
+ OnClick = frViewTotales1bTiposIVAClick
+ ExplicitLeft = 204
+ ExplicitTop = 138
end
inherited cbRecargoEquivalencia: TcxDBCheckBox
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
+ Top = 165
+ ExplicitTop = 165
ExplicitWidth = 219
Width = 219
end
inherited cbValorado: TcxDBCheckBox
- Left = 436
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 436
- ExplicitWidth = 207
- Width = 207
+ Left = 11
+ Top = 11
+ ExplicitLeft = 11
+ ExplicitTop = 11
+ ExplicitWidth = 455
+ Width = 455
end
end
+ inherited DADataSource: TDADataSource
+ Left = 40
+ Top = 40
+ end
+ inherited dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList
+ Left = 72
+ Top = 40
+ end
end
inherited SmallImages: TPngImageList
PngImages = <
@@ -1927,8 +1912,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
inherited JvAppRegistryStorage: TJvAppRegistryStorage [11]
end
inherited StatusBarImages: TPngImageList
- Left = 16
- Top = 408
+ Left = 384
+ Top = 168
end
object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList
Left = 336
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas
index ef899372..73a29342 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas
+++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas
@@ -19,7 +19,8 @@ uses
uDAInterfaces, cxRichEdit, cxDBRichEdit, JvGIF, cxPC,
uViewDocumentos,
uViewDocumentosPresupuestoCliente, uViewDatosYSeleccionClientePresupuesto,
- cxLabel, uBizTiposIVA, uTiposIVAController, uViewTotalesPresupuesto;
+ cxLabel, uBizTiposIVA, uTiposIVAController, uViewTotalesPresupuesto, DBCtrls,
+ cxGraphics, cxMaskEdit, cxDropDownEdit;
type
TfEditorPresupuestoCliente = class(TfEditorDBItem, IEditorPresupuestoCliente)
@@ -29,7 +30,6 @@ type
dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList;
dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel;
TBXSubmenuItem2: TTBXSubmenuItem;
- TBXItem7: TTBXItem;
TBXSeparatorItem6: TTBXSeparatorItem;
TBXItem33: TTBXItem;
actEnviarPorEMail: TAction;
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm
index 49a6820d..c65550ce 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm
+++ b/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm
@@ -1,140 +1,119 @@
inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
- Width = 728
Height = 247
- ExplicitWidth = 714
ExplicitHeight = 247
inherited dxLayoutControl1: TdxLayoutControl
- Width = 728
- Height = 209
+ Height = 233
ExplicitWidth = 451
- ExplicitHeight = 209
+ ExplicitHeight = 233
inherited Bevel3: TBevel
- Left = 380
- ExplicitLeft = 380
+ Top = 55
+ Height = 122
+ ExplicitTop = 55
+ ExplicitHeight = 122
end
inherited Bevel4: TBevel
- Left = 492
Top = 86
- ExplicitLeft = 492
+ Width = 210
ExplicitTop = 86
+ ExplicitWidth = 210
end
inherited ImporteDto: TcxDBCurrencyEdit
- Style.LookAndFeel.SkinName = ''
+ Top = 82
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
+ TabOrder = 3
+ ExplicitTop = 82
+ ExplicitWidth = 93
+ Width = 93
end
inherited ImporteIVA: TcxDBCurrencyEdit
- Left = 563
Top = 106
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 10
- ExplicitLeft = 563
ExplicitTop = 106
+ ExplicitWidth = 137
+ Width = 137
end
inherited ImporteTotal: TcxDBCurrencyEdit
- Left = 493
Top = 160
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 13
- ExplicitLeft = 493
ExplicitTop = 160
+ ExplicitWidth = 137
+ Width = 137
end
inherited edtDescuento: TcxDBSpinEdit
- Style.LookAndFeel.SkinName = ''
+ Top = 82
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
+ TabOrder = 2
+ ExplicitTop = 82
end
inherited edtIVA: TcxDBSpinEdit
- Left = 492
Top = 106
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 9
- ExplicitLeft = 492
ExplicitTop = 106
end
inherited ImporteBase: TcxDBCurrencyEdit
- Left = 492
- Style.LookAndFeel.SkinName = ''
+ Top = 55
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 492
+ TabOrder = 8
+ ExplicitTop = 55
+ ExplicitWidth = 92
+ Width = 92
end
inherited edtRE: TcxDBSpinEdit
- Left = 492
Top = 133
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 11
- ExplicitLeft = 492
ExplicitTop = 133
end
inherited ImporteRE: TcxDBCurrencyEdit
- Left = 563
Top = 133
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 12
- ExplicitLeft = 563
ExplicitTop = 133
+ ExplicitWidth = 56
+ Width = 56
end
inherited eImporteNeto: TcxDBCurrencyEdit
- Style.LookAndFeel.SkinName = ''
+ Top = 55
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
+ TabOrder = 1
+ ExplicitTop = 55
+ ExplicitWidth = 147
+ Width = 147
end
inherited ePorte: TcxDBCurrencyEdit
- Style.LookAndFeel.SkinName = ''
+ Top = 109
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
+ TabOrder = 4
+ ExplicitTop = 109
+ ExplicitWidth = 147
+ Width = 147
end
inherited eIVA: TcxDBLookupComboBox
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
+ Top = 136
+ TabOrder = 5
+ ExplicitTop = 136
+ ExplicitWidth = 81
+ Width = 81
end
inherited bTiposIVA: TButton
- Left = 232
- ExplicitLeft = 232
+ Top = 136
+ TabOrder = 6
+ ExplicitTop = 136
end
inherited cbRecargoEquivalencia: TcxDBCheckBox
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
+ Top = 163
+ TabOrder = 7
+ ExplicitTop = 163
+ ExplicitWidth = 219
+ Width = 219
end
object cbValorado: TcxDBCheckBox [15]
- Left = 399
- Top = 55
- Caption = ' Presupuesto no valorado'
+ Left = 10
+ Top = 10
+ Caption = ' Imprimir el presupuesto sin importes.'
DataBinding.DataField = 'NO_VALORADO'
DataBinding.DataSource = DADataSource
Properties.DisplayChecked = '1'
@@ -148,29 +127,32 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 8
+ TabOrder = 0
Width = 207
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
+ object cxValorado: TdxLayoutItem [0]
+ ShowCaption = False
+ Control = cbValorado
+ ControlOptions.ShowBorder = False
+ end
inherited dxLayoutControl1Group1: TdxLayoutGroup
+ inherited dxLayoutControl1Group2: TdxLayoutGroup
+ inherited dxLayoutControl1Group7: TdxLayoutGroup
+ inherited dxLayoutControl1Item9: TdxLayoutItem
+ Visible = False
+ end
+ end
+ end
inherited dxLayoutControl1Group5: TdxLayoutGroup
inherited dxLayoutControl1Group3: TdxLayoutGroup
inherited dxLayoutControl1Group11: TdxLayoutGroup
- object cxValorado: TdxLayoutItem [1]
- ShowCaption = False
- Control = cbValorado
- ControlOptions.ShowBorder = False
- end
inherited dxLayoutControl1Item14: TdxLayoutItem
Offsets.Bottom = 0
Offsets.Top = 4
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index eed8405a..5fea0585 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -1,302 +1,296 @@
-
+
-
- {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}
- FactuGES_Server.dpr
- Debug
- AnyCPU
- DCC32
- ..\..\Output\Debug\Servidor\FactuGES_Server.exe
-
-
- 7.0
- False
- False
- 0
- 3
- ..\..\Output\Release\Servidor
- RELEASE
-
-
- 7.0
- 3
- ..\..\Output\Debug\Servidor
- DEBUG;
- True
-
-
- Delphi.Personality
-
-
-FalseTrueFalseTrueFalse2410FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.4.1.0FactuGES (Servidor)2.4.1.0miércoles, 16 de diciembre de 2009 12:51
-
-
-
-
-
-
- Express Cross Platform Library by Developer Express Inc.
- ExpressPrinting System by Developer Express Inc.
- RemObjects Data Abstract - CoreLabs SDAC Driver
- FactuGES_Server.dpr
-
-
-
-
- MainSource
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDARemoteService
-
-
-
- TRORemoteDataModule
-
-
-
-
-
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDARemoteService
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDARemoteService
-
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
- TDataModule
-
-
-
- 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
+
+
+ 7.0
+ False
+ False
+ 0
+ 3
+ ..\..\Output\Release\Servidor
+ RELEASE
+
+
+ 7.0
+ 3
+ ..\..\Output\Debug\Servidor
+ DEBUG;
+ True
+
+
+ Delphi.Personality
+
+
+ FalseTrueFalseTrueFalse2420FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.4.2.0FactuGES (Servidor)2.4.2.0jueves, 14 de enero de 2010 17:18
+ Express Cross Platform Library by Developer Express Inc.
+ ExpressPrinting System by Developer Express Inc.
+ RemObjects Data Abstract - CoreLabs SDAC Driver
+ FactuGES_Server.dpr
+
+
+
+
+ MainSource
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDARemoteService
+
+
+
+ TRORemoteDataModule
+
+
+
+
+
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+ TFrame
+
+
+
+ TFrame
+
+
+
+ TForm
+
+
+
+ TFrame
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+ TDataModule
+
+
+
+
+
+
+
+
+
+
+
+
+