diff --git a/Build/Build.fbl6 b/Build/Build.fbl6
index 39352ce..1d3d4ff 100644
Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ
diff --git a/Source/Base/Base.res b/Source/Base/Base.res
index 1641339..8b251f3 100644
Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 53c75bd..7b608a9 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -51,7 +51,7 @@
Delphi.Personality
VCLApplication
-FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2700FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.7.0.0FactuGESFactuGES2.7.0.0
+FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2710FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.7.1.0FactuGESFactuGES2.7.1.0
File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found
FactuGES.dprFalse
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index c7f5045..cb69b53 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/Informes/1/InfFacturaCliente.fr3 b/Source/Informes/1/InfFacturaCliente.fr3
index 8866a10..250a81b 100644
--- a/Source/Informes/1/InfFacturaCliente.fr3
+++ b/Source/Informes/1/InfFacturaCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -12,12 +12,12 @@
-
-
+
+
-
-
-
+
+
+
@@ -33,9 +33,9 @@
-
+
@@ -72,7 +72,7 @@
-
+
diff --git a/Source/Informes/2/InfFacturaCliente.fr3 b/Source/Informes/2/InfFacturaCliente.fr3
index 1ea8e9c..1a12397 100644
--- a/Source/Informes/2/InfFacturaCliente.fr3
+++ b/Source/Informes/2/InfFacturaCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -17,9 +17,9 @@
-
-
-
+
+
+
diff --git a/Source/Informes/3/InfFacturaCliente.fr3 b/Source/Informes/3/InfFacturaCliente.fr3
index fdca094..b0da9ee 100644
--- a/Source/Informes/3/InfFacturaCliente.fr3
+++ b/Source/Informes/3/InfFacturaCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -17,9 +17,9 @@
-
-
-
+
+
+
diff --git a/Source/Informes/4/InfFacturaCliente.fr3 b/Source/Informes/4/InfFacturaCliente.fr3
index 5d08132..b75fe07 100644
--- a/Source/Informes/4/InfFacturaCliente.fr3
+++ b/Source/Informes/4/InfFacturaCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -15,9 +15,9 @@
-
-
-
+
+
+
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm
index 0312e69..286b4d8 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm
@@ -1,24 +1,37 @@
inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente
- Width = 783
- inherited ToolBar1: TToolBar
- Width = 783
- end
inherited cxGrid: TcxGrid
- Width = 783
inherited cxGridView: TcxGridDBTableView
- inherited cxGridViewDESCRIPCION: TcxGridDBColumn
+ inherited cxGridViewVALORADO: TcxGridDBColumn [4]
+ Visible = True
+ end
+ inherited cxGridViewVISIBLE: TcxGridDBColumn [5]
+ Visible = True
+ end
+ inherited cxGridViewREFERENCIA: TcxGridDBColumn [6]
+ end
+ inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn [7]
+ end
+ inherited cxGridViewDESCRIPCION: TcxGridDBColumn [8]
OnGetPropertiesForEdit = cxGridViewDESCRIPCIONGetPropertiesForEdit
end
- inherited cxGridViewIMPORTENETO: TcxGridDBColumn
+ inherited cxGridViewCANTIDAD: TcxGridDBColumn [9]
+ end
+ inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn [10]
+ end
+ inherited cxGridViewDESCUENTO: TcxGridDBColumn [11]
+ end
+ inherited cxGridViewIMPORTENETO: TcxGridDBColumn [12]
Visible = False
VisibleForCustomization = False
end
+ inherited cxGridViewIMPORTEPORTE: TcxGridDBColumn [13]
+ end
+ inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn [14]
+ end
end
end
inherited TBXDock1: TTBXDock
- Width = 783
inherited TBXToolbar1: TTBXToolbar
- ExplicitWidth = 735
object TBXSeparatorItem6: TTBXSeparatorItem
end
object TBXItem14: TTBXItem
diff --git a/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas b/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas
index 41e4a51..73667e6 100644
--- a/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas
+++ b/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas
@@ -3,7 +3,7 @@ unit schRecibosClienteClient_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
@@ -259,7 +259,7 @@ type
end;
{ TListaAnosRecibosDataTableRules }
- TListaAnosRecibosDataTableRules = class(TDADataTableRules, IListaAnosRecibos)
+ TListaAnosRecibosDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosRecibos)
private
protected
{ Property getters and setters }
@@ -546,7 +546,7 @@ type
end;
{ TRecibosClienteDataTableRules }
- TRecibosClienteDataTableRules = class(TDADataTableRules, IRecibosCliente)
+ TRecibosClienteDataTableRules = class(TIntfObjectDADataTableRules, IRecibosCliente)
private
protected
{ Property getters and setters }
@@ -935,7 +935,7 @@ type
end;
{ TPagosClienteDataTableRules }
- TPagosClienteDataTableRules = class(TDADataTableRules, IPagosCliente)
+ TPagosClienteDataTableRules = class(TIntfObjectDADataTableRules, IPagosCliente)
private
protected
{ Property getters and setters }
@@ -1312,7 +1312,7 @@ type
end;
{ TRecibosCompensadosCliDataTableRules }
- TRecibosCompensadosCliDataTableRules = class(TDADataTableRules, IRecibosCompensadosCli)
+ TRecibosCompensadosCliDataTableRules = class(TIntfObjectDADataTableRules, IRecibosCompensadosCli)
private
protected
{ Property getters and setters }
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index a44cd05..2d505b1 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -1,310 +1,309 @@
-
+
-
- {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
-
-
-FalseTrueFalseTrueFalse2700FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.7.0.0FactuGES (Servidor)2.7.0.0jueves, 17 de noviembre de 2016 18:06
-
- File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found
- 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
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- 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
+
+
+ FalseTrueFalseTrueFalse2710FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.7.1.0FactuGES (Servidor)2.7.1.0jueves, 23 de marzo de 2017 13:09
+ File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found
+ 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
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+ TFrame
+
+
+
+ TFrame
+
+
+
+ TForm
+
+
+
+ TFrame
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+ TDataModule
+
+
+
+
+
+
+
+
+
+
+
+
+