diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index a0c3f238..95ba1f77 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -44,13 +44,6 @@
Package
FalseTrueFalseLibreria base de FactuGESFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0
-
-
-
-
-
-
-
VCL for the Web Design Package for CodeGear RAD Studio
CodeGear WebSnap Components
CodeGear SOAP Components
@@ -65,55 +58,55 @@
MainSource
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
TForm
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index 17d3a4cb..305f2305 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,3,9,0
-PRODUCTVERSION 2,3,9,0
+FILEVERSION 2,4,0,0
+PRODUCTVERSION 2,4,0,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.3.9.0\0"
+ VALUE "FileVersion", "2.4.0.0\0"
VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0"
- VALUE "ProductVersion", "2.3.9.0\0"
+ VALUE "ProductVersion", "2.4.0.0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index e7b0bc0b..7e638f7b 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/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas
index 7210e2fa..3b197d31 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/Model/schContratosClienteClient_Intf.pas b/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas
index 25d922a4..9f33b9e2 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
@@ -221,7 +221,7 @@ type
end;
{ TValoresDataTableRules }
- TValoresDataTableRules = class(TDADataTableRules, IValores)
+ TValoresDataTableRules = class(TIntfObjectDADataTableRules, IValores)
private
protected
{ Property getters and setters }
@@ -280,7 +280,7 @@ type
end;
{ TPropiedadesDataTableRules }
- TPropiedadesDataTableRules = class(TDADataTableRules, IPropiedades)
+ TPropiedadesDataTableRules = class(TIntfObjectDADataTableRules, IPropiedades)
private
protected
{ Property getters and setters }
@@ -327,7 +327,7 @@ type
end;
{ TListaAnosContratosDataTableRules }
- TListaAnosContratosDataTableRules = class(TDADataTableRules, IListaAnosContratos)
+ TListaAnosContratosDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosContratos)
private
protected
{ Property getters and setters }
@@ -616,7 +616,7 @@ type
end;
{ TContratosClienteDataTableRules }
- TContratosClienteDataTableRules = class(TDADataTableRules, IContratosCliente)
+ TContratosClienteDataTableRules = class(TIntfObjectDADataTableRules, IContratosCliente)
private
f_FORMA_PAGO: IROStrings;
f_PLAZO_ENTREGA: IROStrings;
@@ -946,7 +946,7 @@ type
end;
{ TTiposCapitulosDataTableRules }
- TTiposCapitulosDataTableRules = class(TDADataTableRules, ITiposCapitulos)
+ TTiposCapitulosDataTableRules = class(TIntfObjectDADataTableRules, ITiposCapitulos)
private
protected
{ Property getters and setters }
@@ -1095,7 +1095,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/Relaciones/Contratos de cliente - Facturas de cliente/uGenerarFacturasCliUtils.pas b/Source/Modulos/Relaciones/Contratos de cliente - Facturas de cliente/uGenerarFacturasCliUtils.pas
index 318b5973..b93f893a 100644
--- a/Source/Modulos/Relaciones/Contratos de cliente - Facturas de cliente/uGenerarFacturasCliUtils.pas
+++ b/Source/Modulos/Relaciones/Contratos de cliente - Facturas de cliente/uGenerarFacturasCliUtils.pas
@@ -116,7 +116,10 @@ begin
ADetalles.Edit;
ADetalles.REFERENCIA := AArticulos.REFERENCIA;
ADetalles.ID_ARTICULO := AArticulos.ID_ARTICULO;
- if (AArticulos.TIPO_ARTICULO = TIPO_CAPITULO_C)
+ if ((AArticulos.TIPO_ARTICULO = TIPO_CAPITULO_C)
+ or (AArticulos.TIPO_ARTICULO = TIPO_CAPITULO_AF)
+ or (AArticulos.TIPO_ARTICULO = TIPO_CAPITULO_AI)
+ or (AArticulos.TIPO_ARTICULO = TIPO_CAPITULO_B))
and (AArticulos.TIPO_DETALLE = TIPO_DETALLE_CONCEPTO) then
//Usamos el campo referencia para lamacenar la descripcion de la propiedad
//ya que hemos usado ID_ARTICULO para almacenar el id de la propiedad.
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 162fe901..fe428657 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -29,9 +29,6 @@
FalseTrueFalseTrueFalse2400FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.4.0.0FactuGES (Servidor)2.4.0.0miércoles, 25 de noviembre de 2009 15:56
-
-
-
Express Cross Platform Library by Developer Express Inc.
ExpressPrinting System by Developer Express Inc.
RemObjects Data Abstract - CoreLabs SDAC Driver
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 315e99f8..c540d1df 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico"
1 VERSIONINFO
-FILEVERSION 2,3,9,0
-PRODUCTVERSION 2,3,9,0
+FILEVERSION 2,4,0,0
+PRODUCTVERSION 2,4,0,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.3.9.0\0"
+ VALUE "FileVersion", "2.4.0.0\0"
VALUE "ProductName", "FactuGES (Servidor)\0"
- VALUE "ProductVersion", "2.3.9.0\0"
- VALUE "CompileDate", "miércoles, 25 de noviembre de 2009 15:56\0"
+ VALUE "ProductVersion", "2.4.0.0\0"
+ VALUE "CompileDate", "miércoles, 09 de diciembre de 2009 16:01\0"
END
END
BLOCK "VarFileInfo"