diff --git a/Source/Base/Base.res b/Source/Base/Base.res
index 1641339f..8b251f31 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 9fa27b3d..61af4aa8 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -52,7 +52,7 @@
Delphi.Personality
VCLApplication
-FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2590FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.5.9.0FactuGESFactuGES2.5.9.0
+FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2600FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.6.0.0FactuGESFactuGES2.6.0.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 ceae5191..d878bdaa 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res
index 1641339f..8b251f31 100644
Binary files a/Source/GUIBase/GUIBase.res and b/Source/GUIBase/GUIBase.res differ
diff --git a/Source/GUIBase/uEditorBase.dfm b/Source/GUIBase/uEditorBase.dfm
index 977dce27..6cfc9bec 100644
--- a/Source/GUIBase/uEditorBase.dfm
+++ b/Source/GUIBase/uEditorBase.dfm
@@ -1663,7 +1663,6 @@ object fEditorBase: TfEditorBase
object JvFormStorage: TJvFormStorage
AppStorage = JvAppRegistryStorage
AppStoragePath = 'fEditorBase\'
- Options = []
VersionCheck = fpvcNocheck
StoredValues = <>
Left = 392
diff --git a/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas b/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas
index 7eb8c620..d5da66a2 100644
--- a/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas
+++ b/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas
@@ -3,7 +3,7 @@ unit schContratosClienteClient_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
@@ -261,7 +261,7 @@ type
end;
{ TValoresDataTableRules }
- TValoresDataTableRules = class(TDADataTableRules, IValores)
+ TValoresDataTableRules = class(TIntfObjectDADataTableRules, IValores)
private
protected
{ Property getters and setters }
@@ -320,7 +320,7 @@ type
end;
{ TPropiedadesDataTableRules }
- TPropiedadesDataTableRules = class(TDADataTableRules, IPropiedades)
+ TPropiedadesDataTableRules = class(TIntfObjectDADataTableRules, IPropiedades)
private
protected
{ Property getters and setters }
@@ -367,7 +367,7 @@ type
end;
{ TListaAnosContratosDataTableRules }
- TListaAnosContratosDataTableRules = class(TDADataTableRules, IListaAnosContratos)
+ TListaAnosContratosDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosContratos)
private
protected
{ Property getters and setters }
@@ -462,7 +462,7 @@ type
end;
{ TContratosClienteBeneficiosDataTableRules }
- TContratosClienteBeneficiosDataTableRules = class(TDADataTableRules, IContratosClienteBeneficios)
+ TContratosClienteBeneficiosDataTableRules = class(TIntfObjectDADataTableRules, IContratosClienteBeneficios)
private
protected
{ Property getters and setters }
@@ -833,7 +833,7 @@ type
end;
{ TContratosClienteDataTableRules }
- TContratosClienteDataTableRules = class(TDADataTableRules, IContratosCliente)
+ TContratosClienteDataTableRules = class(TIntfObjectDADataTableRules, IContratosCliente)
private
f_FORMA_PAGO: IROStrings;
f_PLAZO_ENTREGA: IROStrings;
@@ -1189,7 +1189,7 @@ type
end;
{ TTiposCapitulosDataTableRules }
- TTiposCapitulosDataTableRules = class(TDADataTableRules, ITiposCapitulos)
+ TTiposCapitulosDataTableRules = class(TIntfObjectDADataTableRules, ITiposCapitulos)
private
protected
{ Property getters and setters }
@@ -1350,7 +1350,7 @@ type
end;
{ TContratosCliente_DetallesDataTableRules }
- TContratosCliente_DetallesDataTableRules = class(TDADataTableRules, IContratosCliente_Detalles)
+ TContratosCliente_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IContratosCliente_Detalles)
private
protected
{ Property getters and setters }
diff --git a/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.RES b/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.RES
index 1641339f..8b251f31 100644
Binary files a/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.RES and b/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.RES differ
diff --git a/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteClient_Intf.pas b/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteClient_Intf.pas
index af41f618..fe630239 100644
--- a/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteClient_Intf.pas
+++ b/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteClient_Intf.pas
@@ -3,7 +3,7 @@ unit schPresupuestosClienteClient_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
@@ -263,7 +263,7 @@ type
end;
{ TValoresDataTableRules }
- TValoresDataTableRules = class(TDADataTableRules, IValores)
+ TValoresDataTableRules = class(TIntfObjectDADataTableRules, IValores)
private
protected
{ Property getters and setters }
@@ -340,7 +340,7 @@ type
end;
{ TPropiedadesDataTableRules }
- TPropiedadesDataTableRules = class(TDADataTableRules, IPropiedades)
+ TPropiedadesDataTableRules = class(TIntfObjectDADataTableRules, IPropiedades)
private
protected
{ Property getters and setters }
@@ -381,7 +381,7 @@ type
end;
{ TListaAnosPresupuestosDataTableRules }
- TListaAnosPresupuestosDataTableRules = class(TDADataTableRules, IListaAnosPresupuestos)
+ TListaAnosPresupuestosDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosPresupuestos)
private
protected
{ Property getters and setters }
@@ -663,7 +663,7 @@ type
end;
{ TPresupuestosClienteDataTableRules }
- TPresupuestosClienteDataTableRules = class(TDADataTableRules, IPresupuestosCliente)
+ TPresupuestosClienteDataTableRules = class(TIntfObjectDADataTableRules, IPresupuestosCliente)
private
f_FORMA_PAGO: IROStrings;
f_PLAZO_ENTREGA: IROStrings;
@@ -1015,7 +1015,7 @@ type
end;
{ TCapitulosPresupuestoDataTableRules }
- TCapitulosPresupuestoDataTableRules = class(TDADataTableRules, ICapitulosPresupuesto)
+ TCapitulosPresupuestoDataTableRules = class(TIntfObjectDADataTableRules, ICapitulosPresupuesto)
private
protected
{ Property getters and setters }
@@ -1206,7 +1206,7 @@ type
end;
{ TPresupuestosCliente_DetallesDataTableRules }
- TPresupuestosCliente_DetallesDataTableRules = class(TDADataTableRules, IPresupuestosCliente_Detalles)
+ TPresupuestosCliente_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IPresupuestosCliente_Detalles)
private
protected
{ Property getters and setters }
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 34a12acb..167ced69 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -28,8 +28,7 @@
Delphi.Personality
-FalseTrueFalseTrueFalse2590FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.5.9.0FactuGES (Servidor)2.5.9.0lunes, 17 de noviembre de 2014 15:57
-
+FalseTrueFalseTrueFalse2600FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.6.0.0FactuGES (Servidor)2.6.0.0lunes, 24 de noviembre de 2014 12:51
File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found
FactuGES_Server.dpr
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 9556f023..ef46c1fa 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -16,7 +16,7 @@ BEGIN
VALUE "FileVersion", "2.5.9.0\0"
VALUE "ProductName", "FactuGES (Servidor)\0"
VALUE "ProductVersion", "2.5.9.0\0"
- VALUE "CompileDate", "martes, 18 de noviembre de 2014 16:40\0"
+ VALUE "CompileDate", "lunes, 24 de noviembre de 2014 12:51\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res
index 2aeace19..66faece4 100644
Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ