Se arregla el controller de generar factura a partir de los contratos para que las propiedades salgan en la factura.

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@482 f4e31baf-9722-1c47-927c-6f952f962d4b

Source/Base/Base.dproj

@@ -44,13 +44,6 @@
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">Libreria base de FactuGES</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
       <Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
@@ -65,55 +58,55 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="..\Modulos\Contratos de cliente\adortl.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\cxDataD11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\cxEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\cxGridD11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\cxPageControlD11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\dclIndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\designide.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\dsnap.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\dxPSCoreD11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\dxThemeD11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\GUISDK_D11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\IndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\IndyProtocols.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\IndySystem.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\Jcl.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\JclVcl.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\JSDialog100.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\JvCmpD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\JvDlgsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\JvMMD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\JvNetD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\JvSystemD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\pckMD5.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\PluginSDK_D11R.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\PNG_D10.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\TB2k_D10.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\tbx_d10.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\vclactnband.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\vcljpg.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\VclSmp.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\vclx.dcp" />
+    <DCCReference Include="..\Modulos\Contratos de cliente\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxGridD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dclIndyCore.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\IndyCore.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\IndyProtocols.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\IndySystem.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JSDialog100.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCmpD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvDlgsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvNetD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\pckMD5.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\pckUCDataConnector.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\pckUserControl_RT.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\TB2k_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
       <DesignClass>TForm</DesignClass>

Source/Cliente/FactuGES.rc

@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 2,3,9,0
+FILEVERSION 2,4,0,0
-PRODUCTVERSION 2,3,9,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"

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 }

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 }

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. 

Source/Servidor/FactuGES_Server.dproj

@@ -29,9 +29,6 @@
     <Borland.ProjectType />
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.4.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.4.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 25 de noviembre de 2009 15:56</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
-      
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\cxLibraryD11.bpl">Express Cross Platform Library by Developer Express Inc.</Excluded_Packages>
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\DataAbstract_SDACDriver_D11.bpl">RemObjects Data Abstract - CoreLabs SDAC Driver</Excluded_Packages>

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
+FILEVERSION 2,4,0,0
-PRODUCTVERSION 2,3,9,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 "ProductVersion", "2.4.0.0\0"
-              VALUE "CompileDate", "miércoles, 25 de noviembre de 2009 15:56\0"
+              VALUE "CompileDate", "miércoles, 09 de diciembre de 2009 16:01\0"
          END
     END
     BLOCK "VarFileInfo"