Versión 2.6.3

Tareas #722: Repasar formas de pago porque falla al cogerlas
Tareas #750: Poder facturar varios albaranes en una misma factura
Tareas #958: El informe resumen de recibos de graden no sale bien cuando son varias páginas
Tareas #1205: Que se guarde en albaran de cliente el contrato del que parte si parte.
Tareas #1209: Meter en el campo cliente final tambien el facturas de cliente
Tareas #1262: Revisar forma de pago de factura para que salga la descripción de la forma de pago al igual que en presupuestos y contratos
Tareas #1272: En la lista de facturas añadir referencia del cliente
Tareas #1273: Cuando generas una factura a partir de un contrato, te avisara de alguna forma si ya tiene factura asociada para no facturarlo dos veces

git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@85 93f398dd-4eb6-7a46-baf6-13f46f578da2

Database/scripts/factuges.sql

@@ -1741,7 +1741,7 @@ SELECT
   ALBARANES_CLIENTE.ID_ALMACEN,
   ALMACENES.NOMBRE AS NOMBRE_ALMACEN,
   ALBARANES_CLIENTE.ID_PEDIDO,
-  PEDIDOS_CLIENTE.REFERENCIA AS REF_PEDIDO,
+  CONTRATOS_CLIENTE.REFERENCIA AS REF_PEDIDO,
   ALBARANES_CLIENTE.ID_FACTURA,
   FACTURAS_CLIENTE.REFERENCIA AS REF_FACTURA,
   ALBARANES_CLIENTE.ID_DIRECCION,
@@ -1778,14 +1778,13 @@ FROM
   ALBARANES_CLIENTE
   INNER JOIN CONTACTOS ON (CONTACTOS.ID = ALBARANES_CLIENTE.ID_CLIENTE)
   INNER JOIN V_ALB_CLI_SITUACION ON (V_ALB_CLI_SITUACION.ID = ALBARANES_CLIENTE.ID)
-  LEFT OUTER JOIN PEDIDOS_CLIENTE ON (PEDIDOS_CLIENTE.ID = ALBARANES_CLIENTE.ID_PEDIDO)
+  LEFT OUTER JOIN CONTRATOS_CLIENTE ON (CONTRATOS_CLIENTE.ID = ALBARANES_CLIENTE.ID_PEDIDO)
   LEFT OUTER JOIN FACTURAS_CLIENTE ON (FACTURAS_CLIENTE.ID = ALBARANES_CLIENTE.ID_FACTURA)  
   LEFT OUTER JOIN ALMACENES ON (ALMACENES.ID = ALBARANES_CLIENTE.ID_ALMACEN)
   LEFT OUTER JOIN EMPRESAS_TIENDAS ON (EMPRESAS_TIENDAS.ID = ALBARANES_CLIENTE.ID_TIENDA)
 ;
 
 
-
 /* View: V_ALBARANES_PROVEEDOR */
 CREATE VIEW V_ALBARANES_PROVEEDOR(
     ID,
@@ -2769,6 +2768,7 @@ CREATE VIEW V_FACTURAS_CLIENTE(
     ASIENTO_PUNTEADO,
     ID_CONTRATO,
     REF_CONTRATO,
+    REF_CLI_CONTRATO,
     SIN_COMISION)
 AS
 SELECT FACTURAS_CLIENTE.ID,
@@ -2778,7 +2778,10 @@ SELECT FACTURAS_CLIENTE.ID,
   FACTURAS_CLIENTE.ID_COMISION_LIQUIDADA,
   FACTURAS_CLIENTE.FECHA_FACTURA,
   FACTURAS_CLIENTE.FECHA_VENCIMIENTO,  
-  TRIM(V_FAC_CLI_SITUACION.SITUACION),
+  case
+  when V_FAC_CLI_SITUACION.SITUACION is null then FACTURAS_CLIENTE.SITUACION
+  else  TRIM(V_FAC_CLI_SITUACION.SITUACION)
+  end as situacion,
   FACTURAS_CLIENTE.BASE_IMPONIBLE,
   FACTURAS_CLIENTE.DESCUENTO,
   FACTURAS_CLIENTE.IMPORTE_DESCUENTO,
@@ -2819,6 +2822,7 @@ SELECT FACTURAS_CLIENTE.ID,
   V_CONT_FAC_CLI_VENTAS.ASIENTO_PUNTEADO,
   FACTURAS_CLIENTE.ID_CONTRATO,
   CONTRATOS_CLIENTE.REFERENCIA,
+  CONTRATOS_CLIENTE.REFERENCIA_CLIENTE,
   FACTURAS_CLIENTE.SIN_COMISION
 
   FROM V_FAC_CLI_SITUACION

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,54 +58,54 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Contactos\adortl.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\adortl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\cxDataD11.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\cxDataD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\cxEditorsD11.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\cxGridD11.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\cxGridD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\cxLibraryD11.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\cxPageControlD11.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\cxPageControlD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dbrtl.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dclIndyCore.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\dclIndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\designide.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\designide.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dsnap.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\dsnap.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dxPSCoreD11.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dxThemeD11.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\dxThemeD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\GUISDK_D11R.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\GUISDK_D11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\IndyCore.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\IndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\IndyProtocols.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\IndyProtocols.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\IndySystem.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\IndySystem.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Jcl.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\Jcl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JclVcl.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\JclVcl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JSDialog100.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\JSDialog100.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvCmpD11R.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\JvCmpD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvCoreD11R.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\JvCoreD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvDlgsD11R.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvMMD11R.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\JvMMD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvNetD11R.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\JvNetD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvSystemD11R.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\JvSystemD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\pckMD5.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\pckMD5.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\PluginSDK_D11R.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\PluginSDK_D11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\PngComponentsD10.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\PNG_D10.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\PNG_D10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\rtl.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\TB2k_D10.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\TB2k_D10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\tbx_d10.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\tbx_d10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\vcl.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\vclactnband.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\vcldb.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\vcljpg.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\VclSmp.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\VclSmp.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\vclx.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\vclx.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\xmlrtl.dcp" />
+    <DCCReference Include="..\..\Resources\Iconos\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>

Source/Cliente/FactuGES.dproj

@@ -51,7 +51,8 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">2</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.6.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">3</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.6.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
       
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>

Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj

@@ -15,6 +15,7 @@
     <Projects Include="..\Facturas de cliente\Controller\FacturasCliente_controller.dproj" />
     <Projects Include="..\Facturas de cliente\Views\FacturasCliente_view.dproj" />
     <Projects Include="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" />
+    <Projects Include="..\Relaciones\Contratos de cliente - Albaranes de cliente\ConCli_AlbCli_relation.dproj" />
     <Projects Include="..\Relaciones\Contratos de cliente - Facturas de cliente\ConCli_FacCli_relation.dproj" />
     <Projects Include="Controller\AlbaranesCliente_controller.dproj" />
     <Projects Include="Data\AlbaranesCliente_data.dproj" />
@@ -181,14 +182,23 @@
   <Target Name="ConCli_FacCli_relation:Make">
     <MSBuild Projects="..\Relaciones\Contratos de cliente - Facturas de cliente\ConCli_FacCli_relation.dproj" Targets="Make" />
   </Target>
+  <Target Name="ConCli_AlbCli_relation">
+    <MSBuild Projects="..\Relaciones\Contratos de cliente - Albaranes de cliente\ConCli_AlbCli_relation.dproj" Targets="" />
+  </Target>
+  <Target Name="ConCli_AlbCli_relation:Clean">
+    <MSBuild Projects="..\Relaciones\Contratos de cliente - Albaranes de cliente\ConCli_AlbCli_relation.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="ConCli_AlbCli_relation:Make">
+    <MSBuild Projects="..\Relaciones\Contratos de cliente - Albaranes de cliente\ConCli_AlbCli_relation.dproj" Targets="Make" />
+  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_view;AlbaranesCliente_model;AlbaranesCliente_data;AlbaranesCliente_controller;FacturasCliente_controller;AlbCli_FacCli_relation;AlbaranesCliente_view;AlbaranesCliente_plugin;FactuGES;FactuGES_Server;FacturasCliente_view;ContratosCliente_view;ConCli_FacCli_relation" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_view;AlbaranesCliente_model;AlbaranesCliente_data;AlbaranesCliente_controller;FacturasCliente_controller;AlbCli_FacCli_relation;AlbaranesCliente_view;AlbaranesCliente_plugin;FactuGES;FactuGES_Server;FacturasCliente_view;ContratosCliente_view;ConCli_FacCli_relation;ConCli_AlbCli_relation" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_view:Clean;AlbaranesCliente_model:Clean;AlbaranesCliente_data:Clean;AlbaranesCliente_controller:Clean;FacturasCliente_controller:Clean;AlbCli_FacCli_relation:Clean;AlbaranesCliente_view:Clean;AlbaranesCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;FacturasCliente_view:Clean;ContratosCliente_view:Clean;ConCli_FacCli_relation:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_view:Clean;AlbaranesCliente_model:Clean;AlbaranesCliente_data:Clean;AlbaranesCliente_controller:Clean;FacturasCliente_controller:Clean;AlbCli_FacCli_relation:Clean;AlbaranesCliente_view:Clean;AlbaranesCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;FacturasCliente_view:Clean;ContratosCliente_view:Clean;ConCli_FacCli_relation:Clean;ConCli_AlbCli_relation:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_view:Make;AlbaranesCliente_model:Make;AlbaranesCliente_data:Make;AlbaranesCliente_controller:Make;FacturasCliente_controller:Make;AlbCli_FacCli_relation:Make;AlbaranesCliente_view:Make;AlbaranesCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;FacturasCliente_view:Make;ContratosCliente_view:Make;ConCli_FacCli_relation:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_view:Make;AlbaranesCliente_model:Make;AlbaranesCliente_data:Make;AlbaranesCliente_controller:Make;FacturasCliente_controller:Make;AlbCli_FacCli_relation:Make;AlbaranesCliente_view:Make;AlbaranesCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;FacturasCliente_view:Make;ContratosCliente_view:Make;ConCli_FacCli_relation:Make;ConCli_AlbCli_relation:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>

Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas

@@ -9,9 +9,9 @@ const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_ListaAnosAlbaranes = '{F1405E5E-2557-4222-8709-EE2F6A0D9542}';
+  RID_ListaAnosAlbaranes = '{341C2DAC-F578-4289-BEC6-A22088E12DDA}';
-  RID_AlbaranesCliente = '{69D16F16-C561-4FB5-B0A6-57197A742A38}';
+  RID_AlbaranesCliente = '{9E0606CC-EF63-4EDA-B7FA-D41CC8803129}';
-  RID_AlbaranesCliente_Detalles = '{F249E060-7F8D-4515-A8ED-9B547A282F9F}';
+  RID_AlbaranesCliente_Detalles = '{4D6277E1-50CF-4276-9A60-C66040C70E0E}';
 
   { Data table names }
   nme_ListaAnosAlbaranes = 'ListaAnosAlbaranes';
@@ -153,7 +153,7 @@ const
 type
   { IListaAnosAlbaranes }
   IListaAnosAlbaranes = interface(IDAStronglyTypedDataTable)
-  ['{FE187003-4E59-47D2-88C1-8E70EF5C1015}']
+  ['{18882089-8287-47C7-9C5D-931786CE7191}']
     { Property getters and setters }
     function GetANOValue: String;
     procedure SetANOValue(const aValue: String);
@@ -188,7 +188,7 @@ type
 
   { IAlbaranesCliente }
   IAlbaranesCliente = interface(IDAStronglyTypedDataTable)
-  ['{9D28E73E-56C6-4D73-835B-96C1171AD3AC}']
+  ['{79507D33-A636-472C-B17E-D017E6D4FCAE}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -739,7 +739,7 @@ type
 
   { IAlbaranesCliente_Detalles }
   IAlbaranesCliente_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{43704339-3297-4D9C-ABA1-A9B1FD3529C7}']
+  ['{E5EA0F49-1453-4D24-9E59-0EDC0AEC18F7}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);

Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas

@@ -9,14 +9,14 @@ const
   { Delta rules ids 
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_ListaAnosAlbaranesDelta = '{8A8F5396-5B0A-4D9F-8F0B-F06E0F97799B}';
+  RID_ListaAnosAlbaranesDelta = '{A83C6728-0F72-4994-B6BD-27A86E154F6A}';
-  RID_AlbaranesClienteDelta = '{CD300F28-DA65-4511-905E-17534DE499F2}';
+  RID_AlbaranesClienteDelta = '{07D97148-0DFB-49CD-B447-24C9143ECA30}';
-  RID_AlbaranesCliente_DetallesDelta = '{FD279313-BC40-4AD8-8370-E05FB59C733D}';
+  RID_AlbaranesCliente_DetallesDelta = '{D45C143D-1990-46DF-80F3-DE6AC699561E}';
 
 type
   { IListaAnosAlbaranesDelta }
   IListaAnosAlbaranesDelta = interface(IListaAnosAlbaranes)
-  ['{8A8F5396-5B0A-4D9F-8F0B-F06E0F97799B}']
+  ['{A83C6728-0F72-4994-B6BD-27A86E154F6A}']
     { Property getters and setters }
     function GetOldANOValue : String;
 
@@ -50,7 +50,7 @@ type
 
   { IAlbaranesClienteDelta }
   IAlbaranesClienteDelta = interface(IAlbaranesCliente)
-  ['{CD300F28-DA65-4511-905E-17534DE499F2}']
+  ['{07D97148-0DFB-49CD-B447-24C9143ECA30}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -602,7 +602,7 @@ type
 
   { IAlbaranesCliente_DetallesDelta }
   IAlbaranesCliente_DetallesDelta = interface(IAlbaranesCliente_Detalles)
-  ['{FD279313-BC40-4AD8-8370-E05FB59C733D}']
+  ['{D45C143D-1990-46DF-80F3-DE6AC699561E}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_ALBARANValue : Integer;

Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm

@@ -94,10 +94,9 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
         Width = 119
       end
       object cxGridViewREF_PEDIDO: TcxGridDBColumn
+        Caption = 'Ref. Contrato'
         DataBinding.FieldName = 'REF_PEDIDO'
-        Visible = False
         BestFitMaxWidth = 45
-        VisibleForCustomization = False
         Width = 39
       end
       object cxGridViewFECHA_PREVISTA_ENVIO: TcxGridDBColumn

Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj

@@ -49,50 +49,57 @@
     <DelphiCompile Include="ContratosCliente_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="adortl.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\adortl.dcp" />
-    <DCCReference Include="Articulos_view.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\Articulos_view.dcp" />
-    <DCCReference Include="Base.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\Base.dcp" />
-    <DCCReference Include="ConCli_AlbCli_relation.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\ConCli_AlbCli_relation.dcp" />
-    <DCCReference Include="ConCli_FacCli_relation.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\ConCli_FacCli_relation.dcp" />
-    <DCCReference Include="ContratosCliente_controller.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\ContratosCliente_controller.dcp" />
-    <DCCReference Include="ContratosCliente_model.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\ContratosCliente_model.dcp" />
-    <DCCReference Include="cxDataD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\cxDataD11.dcp" />
-    <DCCReference Include="cxEditorsD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\cxEditorsD11.dcp" />
-    <DCCReference Include="cxExportD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\cxExportD11.dcp" />
-    <DCCReference Include="cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\cxExtEditorsD11.dcp" />
-    <DCCReference Include="cxGridD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\cxGridD11.dcp" />
-    <DCCReference Include="cxLibraryD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\cxLibraryD11.dcp" />
-    <DCCReference Include="cxPageControlD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\cxPageControlD11.dcp" />
-    <DCCReference Include="DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="dbrtl.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\dbrtl.dcp" />
-    <DCCReference Include="dclcxLibraryD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\dclcxLibraryD11.dcp" />
-    <DCCReference Include="dcldxCoreD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\dcldxCoreD11.dcp" />
-    <DCCReference Include="designide.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\designide.dcp" />
-    <DCCReference Include="dsnap.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\dsnap.dcp" />
-    <DCCReference Include="dxComnD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\dxComnD11.dcp" />
-    <DCCReference Include="dxCoreD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\dxCoreD11.dcp" />
-    <DCCReference Include="dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\dxGDIPlusD11.dcp" />
-    <DCCReference Include="dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\dxLayoutControlD11.dcp" />
-    <DCCReference Include="dxPSCoreD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\dxPSCoreD11.dcp" />
-    <DCCReference Include="dxPScxCommonD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\dxPScxCommonD11.dcp" />
-    <DCCReference Include="dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="dxPSLnksD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\dxPSLnksD11.dcp" />
-    <DCCReference Include="dxThemeD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\dxThemeD11.dcp" />
-    <DCCReference Include="GestorInformes_controller.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\GestorInformes_controller.dcp" />
-    <DCCReference Include="GUIBase.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\GUIBase.dcp" />
-    <DCCReference Include="GUISDK_D11R.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\GUISDK_D11R.dcp" />
-    <DCCReference Include="Jcl.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\Jcl.dcp" />
-    <DCCReference Include="JclVcl.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\JclVcl.dcp" />
-    <DCCReference Include="JvCoreD11R.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\JvCoreD11R.dcp" />
-    <DCCReference Include="JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\JvPageCompsD11R.dcp" />
-    <DCCReference Include="JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="JvSystemD11R.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\JvSystemD11R.dcp" />
-    <DCCReference Include="PngComponentsD10.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\PngComponentsD10.dcp" />
-    <DCCReference Include="PNG_D10.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\PNG_D10.dcp" />
-    <DCCReference Include="RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="rtl.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\rtl.dcp" />
-    <DCCReference Include="tb2k_d10.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\tb2k_d10.dcp" />
-    <DCCReference Include="tbx_d10.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\tbx_d10.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\vcl.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\vclactnband.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\vcldb.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\vcljpg.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\vclshlctrls.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\vclx.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\xmlrtl.dcp" />
     <DCCReference Include="uContratosClienteViewRegister.pas" />
     <DCCReference Include="uDialogOpcionesImpresionContratosCliente.pas">
       <Form>fDialogOpcionesImpresionContratosCliente</Form>
@@ -154,13 +161,6 @@
       <Form>frViewElegirArticulosContratosCliente</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
-    <DCCReference Include="vcl.dcp" />
-    <DCCReference Include="vclactnband.dcp" />
-    <DCCReference Include="vcldb.dcp" />
-    <DCCReference Include="vcljpg.dcp" />
-    <DCCReference Include="vclshlctrls.dcp" />
-    <DCCReference Include="vclx.dcp" />
-    <DCCReference Include="xmlrtl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line

Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.pas

@@ -274,9 +274,12 @@ end;
 procedure TfEditorContratosCliente.actGenerarFacturaExecute(Sender: TObject);
 begin
   inherited;
+  if (Length(Contratos.FACTURA_ASOCIADA) = 0) or (Application.MessageBox('El contrato ya tiene asociada al menos una factura. ¿Desea continuar?', 'Atención', MB_YESNO) = IDYES) then
+  begin
    GenerarFacturaCli(Contratos.ID);
    actRefrescar.Execute;
   end;
+end;
 
 procedure TfEditorContratosCliente.actGenerarFacturaUpdate(Sender: TObject);
 begin

Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm

@@ -143,17 +143,26 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
         DataType = datInteger
         DictionaryEntry = 'FacturasCliente_ID_CLIENTE'
       end
+      item
+        Name = 'REFERENCIA_CLIENTE'
+        DataType = datString
+        Size = 255
+      end
       item
         Name = 'NOMBRE_CLIENTE'
         DataType = datString
         Size = 255
+        DisplayLabel = 'FacturasCliente_NOMBRE_CLIENTE'
         ServerAutoRefresh = True
+        DictionaryEntry = 'FacturasCliente_NOMBRE_CLIENTE'
       end
       item
         Name = 'NOMBRE_COMERCIAL_CLIENTE'
         DataType = datString
         Size = 255
+        DisplayLabel = 'FacturasCliente_NOMBRE_COMERCIAL_CLIENTE'
         ServerAutoRefresh = True
+        DictionaryEntry = 'FacturasCliente_NOMBRE_COMERCIAL_CLIENTE'
       end
       item
         Name = 'NIF_CIF'
@@ -172,6 +181,8 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
       item
         Name = 'ID_DIRECCION'
         DataType = datInteger
+        DisplayLabel = 'FacturasCliente_ID_DIRECCION'
+        DictionaryEntry = 'FacturasCliente_ID_DIRECCION'
       end
       item
         Name = 'CALLE'
@@ -268,48 +279,73 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
       item
         Name = 'ID_TIENDA'
         DataType = datInteger
+        DisplayLabel = 'FacturasCliente_ID_TIENDA'
         ServerAutoRefresh = True
+        DictionaryEntry = 'FacturasCliente_ID_TIENDA'
       end
       item
         Name = 'TIENDA'
         DataType = datString
         Size = 255
+        DisplayLabel = 'FacturasCliente_TIENDA'
         ServerAutoRefresh = True
+        DictionaryEntry = 'FacturasCliente_TIENDA'
       end
       item
         Name = 'ID_SUBCUENTA'
         DataType = datInteger
+        DisplayLabel = 'FacturasCliente_ID_SUBCUENTA'
+        DictionaryEntry = 'FacturasCliente_ID_SUBCUENTA'
       end
       item
         Name = 'SUBCUENTA'
         DataType = datString
         Size = 255
+        DisplayLabel = 'FacturasCliente_SUBCUENTA'
+        DictionaryEntry = 'FacturasCliente_SUBCUENTA'
       end
       item
         Name = 'ID_EJERCICIO'
         DataType = datInteger
+        DisplayLabel = 'FacturasCliente_ID_EJERCICIO'
+        DictionaryEntry = 'FacturasCliente_ID_EJERCICIO'
       end
       item
         Name = 'ESTADO_EJERCICIO'
         DataType = datString
         Size = 255
+        DisplayLabel = 'FacturasCliente_ESTADO_EJERCICIO'
+        DictionaryEntry = 'FacturasCliente_ESTADO_EJERCICIO'
       end
       item
         Name = 'ASIENTO_PUNTEADO'
         DataType = datSmallInt
+        DisplayLabel = 'FacturasCliente_ASIENTO_PUNTEADO'
+        DictionaryEntry = 'FacturasCliente_ASIENTO_PUNTEADO'
       end
       item
         Name = 'ID_CONTRATO'
         DataType = datInteger
+        DisplayLabel = 'FacturasCliente_ID_CONTRATO'
+        DictionaryEntry = 'FacturasCliente_ID_CONTRATO'
       end
       item
         Name = 'REF_CONTRATO'
         DataType = datString
         Size = 255
+        DisplayLabel = 'FacturasCliente_REF_CONTRATO'
+        DictionaryEntry = 'FacturasCliente_REF_CONTRATO'
+      end
+      item
+        Name = 'REF_CLI_CONTRATO'
+        DataType = datString
+        Size = 255
       end
       item
         Name = 'SIN_COMISION'
         DataType = datSmallInt
+        DisplayLabel = 'FacturasCliente_SIN_COMISION'
+        DictionaryEntry = 'FacturasCliente_SIN_COMISION'
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]

Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas

@@ -9,9 +9,9 @@ const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_ListaAnosFacturas = '{91A70F51-8A2E-4CB1-8479-E2046491B559}';
+  RID_ListaAnosFacturas = '{C9E93D4F-3A5E-4C8E-8305-B2AAB8E41C83}';
-  RID_FacturasCliente = '{55BFE5E8-07E7-482A-AA41-C238E7001A5F}';
+  RID_FacturasCliente = '{240D687B-A424-48A6-87C4-B55E1910A62F}';
-  RID_FacturasCliente_Detalles = '{E1D3C102-25EF-4055-A994-D132F6D878A4}';
+  RID_FacturasCliente_Detalles = '{103A3F35-8D1F-4517-AFFF-023722C59B2A}';
 
   { Data table names }
   nme_ListaAnosFacturas = 'ListaAnosFacturas';
@@ -43,6 +43,7 @@ const
   fld_FacturasClienteIMPORTE_TOTAL = 'IMPORTE_TOTAL';
   fld_FacturasClienteOBSERVACIONES = 'OBSERVACIONES';
   fld_FacturasClienteID_CLIENTE = 'ID_CLIENTE';
+  fld_FacturasClienteREFERENCIA_CLIENTE = 'REFERENCIA_CLIENTE';
   fld_FacturasClienteNOMBRE_CLIENTE = 'NOMBRE_CLIENTE';
   fld_FacturasClienteNOMBRE_COMERCIAL_CLIENTE = 'NOMBRE_COMERCIAL_CLIENTE';
   fld_FacturasClienteNIF_CIF = 'NIF_CIF';
@@ -72,6 +73,7 @@ const
   fld_FacturasClienteASIENTO_PUNTEADO = 'ASIENTO_PUNTEADO';
   fld_FacturasClienteID_CONTRATO = 'ID_CONTRATO';
   fld_FacturasClienteREF_CONTRATO = 'REF_CONTRATO';
+  fld_FacturasClienteREF_CLI_CONTRATO = 'REF_CLI_CONTRATO';
   fld_FacturasClienteSIN_COMISION = 'SIN_COMISION';
 
   { FacturasCliente field indexes }
@@ -93,36 +95,38 @@ const
   idx_FacturasClienteIMPORTE_TOTAL = 15;
   idx_FacturasClienteOBSERVACIONES = 16;
   idx_FacturasClienteID_CLIENTE = 17;
-  idx_FacturasClienteNOMBRE_CLIENTE = 18;
+  idx_FacturasClienteREFERENCIA_CLIENTE = 18;
-  idx_FacturasClienteNOMBRE_COMERCIAL_CLIENTE = 19;
+  idx_FacturasClienteNOMBRE_CLIENTE = 19;
-  idx_FacturasClienteNIF_CIF = 20;
+  idx_FacturasClienteNOMBRE_COMERCIAL_CLIENTE = 20;
-  idx_FacturasClienteNOMBRE = 21;
+  idx_FacturasClienteNIF_CIF = 21;
-  idx_FacturasClienteID_DIRECCION = 22;
+  idx_FacturasClienteNOMBRE = 22;
-  idx_FacturasClienteCALLE = 23;
+  idx_FacturasClienteID_DIRECCION = 23;
-  idx_FacturasClientePOBLACION = 24;
+  idx_FacturasClienteCALLE = 24;
-  idx_FacturasClientePROVINCIA = 25;
+  idx_FacturasClientePOBLACION = 25;
-  idx_FacturasClienteCODIGO_POSTAL = 26;
+  idx_FacturasClientePROVINCIA = 26;
-  idx_FacturasClienteFECHA_ALTA = 27;
+  idx_FacturasClienteCODIGO_POSTAL = 27;
-  idx_FacturasClienteFECHA_MODIFICACION = 28;
+  idx_FacturasClienteFECHA_ALTA = 28;
-  idx_FacturasClienteUSUARIO = 29;
+  idx_FacturasClienteFECHA_MODIFICACION = 29;
-  idx_FacturasClienteID_FORMA_PAGO = 30;
+  idx_FacturasClienteUSUARIO = 30;
-  idx_FacturasClienteRECARGO_EQUIVALENCIA = 31;
+  idx_FacturasClienteID_FORMA_PAGO = 31;
-  idx_FacturasClienteID_TIPO_IVA = 32;
+  idx_FacturasClienteRECARGO_EQUIVALENCIA = 32;
-  idx_FacturasClienteIMPORTE_NETO = 33;
+  idx_FacturasClienteID_TIPO_IVA = 33;
-  idx_FacturasClienteIMPORTE_PORTE = 34;
+  idx_FacturasClienteIMPORTE_NETO = 34;
-  idx_FacturasClienteID_AGENTE = 35;
+  idx_FacturasClienteIMPORTE_PORTE = 35;
-  idx_FacturasClienteREFERENCIA_COMISION = 36;
+  idx_FacturasClienteID_AGENTE = 36;
-  idx_FacturasClienteIGNORAR_CONTABILIDAD = 37;
+  idx_FacturasClienteREFERENCIA_COMISION = 37;
-  idx_FacturasClienteID_TIENDA = 38;
+  idx_FacturasClienteIGNORAR_CONTABILIDAD = 38;
-  idx_FacturasClienteTIENDA = 39;
+  idx_FacturasClienteID_TIENDA = 39;
-  idx_FacturasClienteID_SUBCUENTA = 40;
+  idx_FacturasClienteTIENDA = 40;
-  idx_FacturasClienteSUBCUENTA = 41;
+  idx_FacturasClienteID_SUBCUENTA = 41;
-  idx_FacturasClienteID_EJERCICIO = 42;
+  idx_FacturasClienteSUBCUENTA = 42;
-  idx_FacturasClienteESTADO_EJERCICIO = 43;
+  idx_FacturasClienteID_EJERCICIO = 43;
-  idx_FacturasClienteASIENTO_PUNTEADO = 44;
+  idx_FacturasClienteESTADO_EJERCICIO = 44;
-  idx_FacturasClienteID_CONTRATO = 45;
+  idx_FacturasClienteASIENTO_PUNTEADO = 45;
-  idx_FacturasClienteREF_CONTRATO = 46;
+  idx_FacturasClienteID_CONTRATO = 46;
-  idx_FacturasClienteSIN_COMISION = 47;
+  idx_FacturasClienteREF_CONTRATO = 47;
+  idx_FacturasClienteREF_CLI_CONTRATO = 48;
+  idx_FacturasClienteSIN_COMISION = 49;
 
   { FacturasCliente_Detalles fields }
   fld_FacturasCliente_DetallesID = 'ID';
@@ -161,7 +165,7 @@ const
 type
   { IListaAnosFacturas }
   IListaAnosFacturas = interface(IDAStronglyTypedDataTable)
-  ['{4AB5D62E-B82F-4BDB-9A93-666C9A99B100}']
+  ['{05716F30-A380-4511-8D1C-1CB66CE89B74}']
     { Property getters and setters }
     function GetANOValue: String;
     procedure SetANOValue(const aValue: String);
@@ -196,7 +200,7 @@ type
 
   { IFacturasCliente }
   IFacturasCliente = interface(IDAStronglyTypedDataTable)
-  ['{7E9BD79C-6590-4919-8E6C-CDC0A7F19DB5}']
+  ['{FFCE2216-A516-4FFC-B701-559E5CA69879}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -269,6 +273,10 @@ type
     procedure SetID_CLIENTEValue(const aValue: Integer);
     function GetID_CLIENTEIsNull: Boolean;
     procedure SetID_CLIENTEIsNull(const aValue: Boolean);
+    function GetREFERENCIA_CLIENTEValue: String;
+    procedure SetREFERENCIA_CLIENTEValue(const aValue: String);
+    function GetREFERENCIA_CLIENTEIsNull: Boolean;
+    procedure SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean);
     function GetNOMBRE_CLIENTEValue: String;
     procedure SetNOMBRE_CLIENTEValue(const aValue: String);
     function GetNOMBRE_CLIENTEIsNull: Boolean;
@@ -385,6 +393,10 @@ type
     procedure SetREF_CONTRATOValue(const aValue: String);
     function GetREF_CONTRATOIsNull: Boolean;
     procedure SetREF_CONTRATOIsNull(const aValue: Boolean);
+    function GetREF_CLI_CONTRATOValue: String;
+    procedure SetREF_CLI_CONTRATOValue(const aValue: String);
+    function GetREF_CLI_CONTRATOIsNull: Boolean;
+    procedure SetREF_CLI_CONTRATOIsNull(const aValue: Boolean);
     function GetSIN_COMISIONValue: SmallInt;
     procedure SetSIN_COMISIONValue(const aValue: SmallInt);
     function GetSIN_COMISIONIsNull: Boolean;
@@ -428,6 +440,8 @@ type
     property OBSERVACIONESIsNull: Boolean read GetOBSERVACIONESIsNull write SetOBSERVACIONESIsNull;
     property ID_CLIENTE: Integer read GetID_CLIENTEValue write SetID_CLIENTEValue;
     property ID_CLIENTEIsNull: Boolean read GetID_CLIENTEIsNull write SetID_CLIENTEIsNull;
+    property REFERENCIA_CLIENTE: String read GetREFERENCIA_CLIENTEValue write SetREFERENCIA_CLIENTEValue;
+    property REFERENCIA_CLIENTEIsNull: Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull;
     property NOMBRE_CLIENTE: String read GetNOMBRE_CLIENTEValue write SetNOMBRE_CLIENTEValue;
     property NOMBRE_CLIENTEIsNull: Boolean read GetNOMBRE_CLIENTEIsNull write SetNOMBRE_CLIENTEIsNull;
     property NOMBRE_COMERCIAL_CLIENTE: String read GetNOMBRE_COMERCIAL_CLIENTEValue write SetNOMBRE_COMERCIAL_CLIENTEValue;
@@ -486,6 +500,8 @@ type
     property ID_CONTRATOIsNull: Boolean read GetID_CONTRATOIsNull write SetID_CONTRATOIsNull;
     property REF_CONTRATO: String read GetREF_CONTRATOValue write SetREF_CONTRATOValue;
     property REF_CONTRATOIsNull: Boolean read GetREF_CONTRATOIsNull write SetREF_CONTRATOIsNull;
+    property REF_CLI_CONTRATO: String read GetREF_CLI_CONTRATOValue write SetREF_CLI_CONTRATOValue;
+    property REF_CLI_CONTRATOIsNull: Boolean read GetREF_CLI_CONTRATOIsNull write SetREF_CLI_CONTRATOIsNull;
     property SIN_COMISION: SmallInt read GetSIN_COMISIONValue write SetSIN_COMISIONValue;
     property SIN_COMISIONIsNull: Boolean read GetSIN_COMISIONIsNull write SetSIN_COMISIONIsNull;
   end;
@@ -568,6 +584,10 @@ type
     procedure SetID_CLIENTEValue(const aValue: Integer); virtual;
     function GetID_CLIENTEIsNull: Boolean; virtual;
     procedure SetID_CLIENTEIsNull(const aValue: Boolean); virtual;
+    function GetREFERENCIA_CLIENTEValue: String; virtual;
+    procedure SetREFERENCIA_CLIENTEValue(const aValue: String); virtual;
+    function GetREFERENCIA_CLIENTEIsNull: Boolean; virtual;
+    procedure SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean); virtual;
     function GetNOMBRE_CLIENTEValue: String; virtual;
     procedure SetNOMBRE_CLIENTEValue(const aValue: String); virtual;
     function GetNOMBRE_CLIENTEIsNull: Boolean; virtual;
@@ -684,6 +704,10 @@ type
     procedure SetREF_CONTRATOValue(const aValue: String); virtual;
     function GetREF_CONTRATOIsNull: Boolean; virtual;
     procedure SetREF_CONTRATOIsNull(const aValue: Boolean); virtual;
+    function GetREF_CLI_CONTRATOValue: String; virtual;
+    procedure SetREF_CLI_CONTRATOValue(const aValue: String); virtual;
+    function GetREF_CLI_CONTRATOIsNull: Boolean; virtual;
+    procedure SetREF_CLI_CONTRATOIsNull(const aValue: Boolean); virtual;
     function GetSIN_COMISIONValue: SmallInt; virtual;
     procedure SetSIN_COMISIONValue(const aValue: SmallInt); virtual;
     function GetSIN_COMISIONIsNull: Boolean; virtual;
@@ -726,6 +750,8 @@ type
     property OBSERVACIONESIsNull: Boolean read GetOBSERVACIONESIsNull write SetOBSERVACIONESIsNull;
     property ID_CLIENTE: Integer read GetID_CLIENTEValue write SetID_CLIENTEValue;
     property ID_CLIENTEIsNull: Boolean read GetID_CLIENTEIsNull write SetID_CLIENTEIsNull;
+    property REFERENCIA_CLIENTE: String read GetREFERENCIA_CLIENTEValue write SetREFERENCIA_CLIENTEValue;
+    property REFERENCIA_CLIENTEIsNull: Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull;
     property NOMBRE_CLIENTE: String read GetNOMBRE_CLIENTEValue write SetNOMBRE_CLIENTEValue;
     property NOMBRE_CLIENTEIsNull: Boolean read GetNOMBRE_CLIENTEIsNull write SetNOMBRE_CLIENTEIsNull;
     property NOMBRE_COMERCIAL_CLIENTE: String read GetNOMBRE_COMERCIAL_CLIENTEValue write SetNOMBRE_COMERCIAL_CLIENTEValue;
@@ -784,6 +810,8 @@ type
     property ID_CONTRATOIsNull: Boolean read GetID_CONTRATOIsNull write SetID_CONTRATOIsNull;
     property REF_CONTRATO: String read GetREF_CONTRATOValue write SetREF_CONTRATOValue;
     property REF_CONTRATOIsNull: Boolean read GetREF_CONTRATOIsNull write SetREF_CONTRATOIsNull;
+    property REF_CLI_CONTRATO: String read GetREF_CLI_CONTRATOValue write SetREF_CLI_CONTRATOValue;
+    property REF_CLI_CONTRATOIsNull: Boolean read GetREF_CLI_CONTRATOIsNull write SetREF_CLI_CONTRATOIsNull;
     property SIN_COMISION: SmallInt read GetSIN_COMISIONValue write SetSIN_COMISIONValue;
     property SIN_COMISIONIsNull: Boolean read GetSIN_COMISIONIsNull write SetSIN_COMISIONIsNull;
 
@@ -795,7 +823,7 @@ type
 
   { IFacturasCliente_Detalles }
   IFacturasCliente_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{14C55748-5968-4AEC-B4E9-33F1E1B63B13}']
+  ['{2B6FCA91-CF89-45F3-B606-258098698EBE}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1429,6 +1457,27 @@ begin
     DataTable.Fields[idx_FacturasClienteID_CLIENTE].AsVariant := Null;
 end;
 
+function TFacturasClienteDataTableRules.GetREFERENCIA_CLIENTEValue: String;
+begin
+  result := DataTable.Fields[idx_FacturasClienteREFERENCIA_CLIENTE].AsString;
+end;
+
+procedure TFacturasClienteDataTableRules.SetREFERENCIA_CLIENTEValue(const aValue: String);
+begin
+  DataTable.Fields[idx_FacturasClienteREFERENCIA_CLIENTE].AsString := aValue;
+end;
+
+function TFacturasClienteDataTableRules.GetREFERENCIA_CLIENTEIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasClienteREFERENCIA_CLIENTE].IsNull;
+end;
+
+procedure TFacturasClienteDataTableRules.SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasClienteREFERENCIA_CLIENTE].AsVariant := Null;
+end;
+
 function TFacturasClienteDataTableRules.GetNOMBRE_CLIENTEValue: String;
 begin
   result := DataTable.Fields[idx_FacturasClienteNOMBRE_CLIENTE].AsString;
@@ -2038,6 +2087,27 @@ begin
     DataTable.Fields[idx_FacturasClienteREF_CONTRATO].AsVariant := Null;
 end;
 
+function TFacturasClienteDataTableRules.GetREF_CLI_CONTRATOValue: String;
+begin
+  result := DataTable.Fields[idx_FacturasClienteREF_CLI_CONTRATO].AsString;
+end;
+
+procedure TFacturasClienteDataTableRules.SetREF_CLI_CONTRATOValue(const aValue: String);
+begin
+  DataTable.Fields[idx_FacturasClienteREF_CLI_CONTRATO].AsString := aValue;
+end;
+
+function TFacturasClienteDataTableRules.GetREF_CLI_CONTRATOIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasClienteREF_CLI_CONTRATO].IsNull;
+end;
+
+procedure TFacturasClienteDataTableRules.SetREF_CLI_CONTRATOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasClienteREF_CLI_CONTRATO].AsVariant := Null;
+end;
+
 function TFacturasClienteDataTableRules.GetSIN_COMISIONValue: SmallInt;
 begin
   result := DataTable.Fields[idx_FacturasClienteSIN_COMISION].AsSmallInt;

Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas

@@ -9,14 +9,14 @@ const
   { Delta rules ids 
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_ListaAnosFacturasDelta = '{003C9415-1DB8-4D83-8F20-A3262A54C43C}';
+  RID_ListaAnosFacturasDelta = '{42E63B9E-C30F-4EC7-94CA-5E04DD371267}';
-  RID_FacturasClienteDelta = '{5EFA5DD8-59BA-41B4-BBCE-2DC0B4EC5877}';
+  RID_FacturasClienteDelta = '{5001B597-C42F-43E3-8F12-76971C88F8E8}';
-  RID_FacturasCliente_DetallesDelta = '{B41B5FE7-AA18-4D3F-8153-8E1B50331FF6}';
+  RID_FacturasCliente_DetallesDelta = '{E16AF380-A076-4EDB-9CB4-5446DBF8C9AE}';
 
 type
   { IListaAnosFacturasDelta }
   IListaAnosFacturasDelta = interface(IListaAnosFacturas)
-  ['{003C9415-1DB8-4D83-8F20-A3262A54C43C}']
+  ['{42E63B9E-C30F-4EC7-94CA-5E04DD371267}']
     { Property getters and setters }
     function GetOldANOValue : String;
 
@@ -50,7 +50,7 @@ type
 
   { IFacturasClienteDelta }
   IFacturasClienteDelta = interface(IFacturasCliente)
-  ['{5EFA5DD8-59BA-41B4-BBCE-2DC0B4EC5877}']
+  ['{5001B597-C42F-43E3-8F12-76971C88F8E8}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -70,6 +70,7 @@ type
     function GetOldIMPORTE_TOTALValue : Currency;
     function GetOldOBSERVACIONESValue : IROStrings;
     function GetOldID_CLIENTEValue : Integer;
+    function GetOldREFERENCIA_CLIENTEValue : String;
     function GetOldNOMBRE_CLIENTEValue : String;
     function GetOldNOMBRE_COMERCIAL_CLIENTEValue : String;
     function GetOldNIF_CIFValue : String;
@@ -99,6 +100,7 @@ type
     function GetOldASIENTO_PUNTEADOValue : SmallInt;
     function GetOldID_CONTRATOValue : Integer;
     function GetOldREF_CONTRATOValue : String;
+    function GetOldREF_CLI_CONTRATOValue : String;
     function GetOldSIN_COMISIONValue : SmallInt;
 
     { Properties }
@@ -120,6 +122,7 @@ type
     property OldIMPORTE_TOTAL : Currency read GetOldIMPORTE_TOTALValue;
     property OldOBSERVACIONES : IROStrings read GetOldOBSERVACIONESValue;
     property OldID_CLIENTE : Integer read GetOldID_CLIENTEValue;
+    property OldREFERENCIA_CLIENTE : String read GetOldREFERENCIA_CLIENTEValue;
     property OldNOMBRE_CLIENTE : String read GetOldNOMBRE_CLIENTEValue;
     property OldNOMBRE_COMERCIAL_CLIENTE : String read GetOldNOMBRE_COMERCIAL_CLIENTEValue;
     property OldNIF_CIF : String read GetOldNIF_CIFValue;
@@ -149,6 +152,7 @@ type
     property OldASIENTO_PUNTEADO : SmallInt read GetOldASIENTO_PUNTEADOValue;
     property OldID_CONTRATO : Integer read GetOldID_CONTRATOValue;
     property OldREF_CONTRATO : String read GetOldREF_CONTRATOValue;
+    property OldREF_CLI_CONTRATO : String read GetOldREF_CLI_CONTRATOValue;
     property OldSIN_COMISION : SmallInt read GetOldSIN_COMISIONValue;
   end;
 
@@ -266,6 +270,12 @@ type
     function GetOldID_CLIENTEIsNull: Boolean; virtual;
     procedure SetID_CLIENTEValue(const aValue: Integer); virtual;
     procedure SetID_CLIENTEIsNull(const aValue: Boolean); virtual;
+    function GetREFERENCIA_CLIENTEValue: String; virtual;
+    function GetREFERENCIA_CLIENTEIsNull: Boolean; virtual;
+    function GetOldREFERENCIA_CLIENTEValue: String; virtual;
+    function GetOldREFERENCIA_CLIENTEIsNull: Boolean; virtual;
+    procedure SetREFERENCIA_CLIENTEValue(const aValue: String); virtual;
+    procedure SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean); virtual;
     function GetNOMBRE_CLIENTEValue: String; virtual;
     function GetNOMBRE_CLIENTEIsNull: Boolean; virtual;
     function GetOldNOMBRE_CLIENTEValue: String; virtual;
@@ -440,6 +450,12 @@ type
     function GetOldREF_CONTRATOIsNull: Boolean; virtual;
     procedure SetREF_CONTRATOValue(const aValue: String); virtual;
     procedure SetREF_CONTRATOIsNull(const aValue: Boolean); virtual;
+    function GetREF_CLI_CONTRATOValue: String; virtual;
+    function GetREF_CLI_CONTRATOIsNull: Boolean; virtual;
+    function GetOldREF_CLI_CONTRATOValue: String; virtual;
+    function GetOldREF_CLI_CONTRATOIsNull: Boolean; virtual;
+    procedure SetREF_CLI_CONTRATOValue(const aValue: String); virtual;
+    procedure SetREF_CLI_CONTRATOIsNull(const aValue: Boolean); virtual;
     function GetSIN_COMISIONValue: SmallInt; virtual;
     function GetSIN_COMISIONIsNull: Boolean; virtual;
     function GetOldSIN_COMISIONValue: SmallInt; virtual;
@@ -520,6 +536,10 @@ type
     property ID_CLIENTEIsNull : Boolean read GetID_CLIENTEIsNull write SetID_CLIENTEIsNull;
     property OldID_CLIENTE : Integer read GetOldID_CLIENTEValue;
     property OldID_CLIENTEIsNull : Boolean read GetOldID_CLIENTEIsNull;
+    property REFERENCIA_CLIENTE : String read GetREFERENCIA_CLIENTEValue write SetREFERENCIA_CLIENTEValue;
+    property REFERENCIA_CLIENTEIsNull : Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull;
+    property OldREFERENCIA_CLIENTE : String read GetOldREFERENCIA_CLIENTEValue;
+    property OldREFERENCIA_CLIENTEIsNull : Boolean read GetOldREFERENCIA_CLIENTEIsNull;
     property NOMBRE_CLIENTE : String read GetNOMBRE_CLIENTEValue write SetNOMBRE_CLIENTEValue;
     property NOMBRE_CLIENTEIsNull : Boolean read GetNOMBRE_CLIENTEIsNull write SetNOMBRE_CLIENTEIsNull;
     property OldNOMBRE_CLIENTE : String read GetOldNOMBRE_CLIENTEValue;
@@ -636,6 +656,10 @@ type
     property REF_CONTRATOIsNull : Boolean read GetREF_CONTRATOIsNull write SetREF_CONTRATOIsNull;
     property OldREF_CONTRATO : String read GetOldREF_CONTRATOValue;
     property OldREF_CONTRATOIsNull : Boolean read GetOldREF_CONTRATOIsNull;
+    property REF_CLI_CONTRATO : String read GetREF_CLI_CONTRATOValue write SetREF_CLI_CONTRATOValue;
+    property REF_CLI_CONTRATOIsNull : Boolean read GetREF_CLI_CONTRATOIsNull write SetREF_CLI_CONTRATOIsNull;
+    property OldREF_CLI_CONTRATO : String read GetOldREF_CLI_CONTRATOValue;
+    property OldREF_CLI_CONTRATOIsNull : Boolean read GetOldREF_CLI_CONTRATOIsNull;
     property SIN_COMISION : SmallInt read GetSIN_COMISIONValue write SetSIN_COMISIONValue;
     property SIN_COMISIONIsNull : Boolean read GetSIN_COMISIONIsNull write SetSIN_COMISIONIsNull;
     property OldSIN_COMISION : SmallInt read GetOldSIN_COMISIONValue;
@@ -649,7 +673,7 @@ type
 
   { IFacturasCliente_DetallesDelta }
   IFacturasCliente_DetallesDelta = interface(IFacturasCliente_Detalles)
-  ['{B41B5FE7-AA18-4D3F-8153-8E1B50331FF6}']
+  ['{E16AF380-A076-4EDB-9CB4-5446DBF8C9AE}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_FACTURAValue : Integer;
@@ -1474,6 +1498,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteID_CLIENTE] := Null;
 end;
 
+function TFacturasClienteBusinessProcessorRules.GetREFERENCIA_CLIENTEValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteREFERENCIA_CLIENTE];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetREFERENCIA_CLIENTEIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteREFERENCIA_CLIENTE]);
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldREFERENCIA_CLIENTEValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteREFERENCIA_CLIENTE];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldREFERENCIA_CLIENTEIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteREFERENCIA_CLIENTE]);
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetREFERENCIA_CLIENTEValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteREFERENCIA_CLIENTE] := aValue;
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteREFERENCIA_CLIENTE] := Null;
+end;
+
 function TFacturasClienteBusinessProcessorRules.GetNOMBRE_CLIENTEValue: String;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteNOMBRE_CLIENTE];
@@ -2373,6 +2428,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteREF_CONTRATO] := Null;
 end;
 
+function TFacturasClienteBusinessProcessorRules.GetREF_CLI_CONTRATOValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteREF_CLI_CONTRATO];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetREF_CLI_CONTRATOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteREF_CLI_CONTRATO]);
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldREF_CLI_CONTRATOValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteREF_CLI_CONTRATO];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldREF_CLI_CONTRATOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteREF_CLI_CONTRATO]);
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetREF_CLI_CONTRATOValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteREF_CLI_CONTRATO] := aValue;
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetREF_CLI_CONTRATOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteREF_CLI_CONTRATO] := Null;
+end;
+
 function TFacturasClienteBusinessProcessorRules.GetSIN_COMISIONValue: SmallInt;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteSIN_COMISION];

Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm

@@ -239,6 +239,14 @@ object srvFacturasCliente: TsrvFacturasCliente
               item
                 DatasetField = 'SIN_COMISION'
                 TableField = 'SIN_COMISION'
+              end
+              item
+                DatasetField = 'REFERENCIA_CLIENTE'
+                TableField = 'REFERENCIA_CLIENTE'
+              end
+              item
+                DatasetField = 'REF_CLI_CONTRATO'
+                TableField = 'REF_CLI_CONTRATO'
               end>
           end>
         Name = 'FacturasCliente'
@@ -339,6 +347,11 @@ object srvFacturasCliente: TsrvFacturasCliente
             DataType = datInteger
             DictionaryEntry = 'FacturasCliente_ID_CLIENTE'
           end
+          item
+            Name = 'REFERENCIA_CLIENTE'
+            DataType = datString
+            Size = 255
+          end
           item
             Name = 'NOMBRE_CLIENTE'
             DataType = datString
@@ -502,6 +515,11 @@ object srvFacturasCliente: TsrvFacturasCliente
             Size = 255
             DictionaryEntry = 'FacturasCliente_REF_CONTRATO'
           end
+          item
+            Name = 'REF_CLI_CONTRATO'
+            DataType = datString
+            Size = 255
+          end
           item
             Name = 'SIN_COMISION'
             DataType = datSmallInt

Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm

@@ -1,6 +1,6 @@
 inherited frViewFacturaCliente: TfrViewFacturaCliente
-  Width = 870
+  Width = 867
-  Height = 396
+  Height = 490
   Align = alClient
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
@@ -9,8 +9,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 870
+    Width = 867
-    Height = 396
+    Height = 490
     Align = alClient
     ParentBackground = True
     TabOrder = 0
@@ -20,8 +20,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
     ExplicitWidth = 451
     ExplicitHeight = 304
     DesignSize = (
-      870
+      867
-      396)
+      490)
     object eReferencia: TcxDBTextEdit
       Left = 135
       Top = 30
@@ -97,7 +97,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       Width = 78
     end
     object bFormasPago: TButton
-      Left = 301
+      Left = 300
       Top = 135
       Width = 132
       Height = 23
@@ -107,7 +107,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
     end
     inline frViewTienda1: TfrViewTienda
       Left = 22
-      Top = 215
+      Top = 269
       Width = 351
       Height = 48
       Enabled = False
@@ -117,10 +117,10 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 6
+      TabOrder = 8
       ReadOnly = False
       ExplicitLeft = 22
-      ExplicitTop = 215
+      ExplicitTop = 269
       ExplicitWidth = 351
       ExplicitHeight = 48
       inherited dxLayoutControl1: TdxLayoutControl
@@ -132,10 +132,15 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
           ExplicitWidth = 399
           Width = 399
         end
+        inherited dxLayoutControl1Group_Root: TdxLayoutGroup
+          inherited dxLayoutControl1Item1: TdxLayoutItem
+            Visible = False
+          end
+        end
       end
     end
     inline frViewClienteFactura1: TfrViewClienteFactura
-      Left = 461
+      Left = 460
       Top = 30
       Width = 398
       Height = 265
@@ -145,9 +150,9 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 8
+      TabOrder = 10
       ReadOnly = False
-      ExplicitLeft = 461
+      ExplicitLeft = 460
       ExplicitTop = 30
       ExplicitWidth = 398
       ExplicitHeight = 265
@@ -177,12 +182,12 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
           Width = 276
         end
         inherited edtCodigoPostal: TcxDBTextEdit
-          Left = 295
+          Left = 293
-          ExplicitLeft = 295
+          ExplicitLeft = 293
         end
         inherited Button3: TBitBtn
-          Left = 185
+          Left = 183
-          ExplicitLeft = 185
+          ExplicitLeft = 183
         end
         inherited cxDBTextEdit1: TcxDBTextEdit
           ExplicitWidth = 283
@@ -217,7 +222,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
     end
     inline frViewObservaciones1: TfrViewObservaciones
       Left = 22
-      Top = 344
+      Top = 398
       Width = 521
       Height = 20
       Font.Charset = DEFAULT_CHARSET
@@ -226,10 +231,10 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 9
+      TabOrder = 11
       ReadOnly = False
       ExplicitLeft = 22
-      ExplicitTop = 344
+      ExplicitTop = 398
       ExplicitHeight = 20
       inherited memObservaciones: TcxDBMemo
         DataBinding.DataField = 'OBSERVACIONES'
@@ -240,7 +245,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
     end
     object cbRecargoEquivalencia: TcxDBCheckBox
       Left = 22
-      Top = 293
+      Top = 347
       Caption = '  No acogida a comisiones'
       DataBinding.DataField = 'SIN_COMISION'
       DataBinding.DataSource = DADataSource
@@ -266,7 +271,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 7
+      TabOrder = 9
       Width = 158
     end
     object edtSituacion: TcxDBComboBox
@@ -283,6 +288,52 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       TabOrder = 2
       Width = 121
     end
+    object edtRefContrato: TcxDBTextEdit
+      Left = 135
+      Top = 215
+      Anchors = [akLeft, akTop, akRight]
+      AutoSize = False
+      DataBinding.DataField = 'REF_CONTRATO'
+      DataBinding.DataSource = DADataSource
+      Enabled = False
+      ParentFont = False
+      Properties.ReadOnly = True
+      Properties.UseLeftAlignmentOnEditing = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.TextColor = clWindowText
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 6
+      Height = 21
+      Width = 294
+    end
+    object edtRefClienteContrato: TcxDBTextEdit
+      Left = 135
+      Top = 242
+      Anchors = [akLeft, akTop, akRight]
+      AutoSize = False
+      DataBinding.DataField = 'REF_CLI_CONTRATO'
+      DataBinding.DataSource = DADataSource
+      Enabled = False
+      ParentFont = False
+      Properties.ReadOnly = True
+      Properties.UseLeftAlignmentOnEditing = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.TextColor = clWindowText
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 7
+      Height = 21
+      Width = 294
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -346,9 +397,18 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
           end
           object dxLayoutControl1Group4: TdxLayoutGroup
             AutoAligns = [aaVertical]
-            Caption = 'La factura pertenece a la tienda'
+            Caption = 'Contrato asociado'
             Enabled = False
-            Visible = False
+            object dxLayoutControl1Item8: TdxLayoutItem
+              Caption = 'Ref. Contrato:'
+              Control = edtRefContrato
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Item9: TdxLayoutItem
+              Caption = 'Ref. Cliente Contrato:'
+              Control = edtRefClienteContrato
+              ControlOptions.ShowBorder = False
+            end
             object dxLayoutControl1Item3: TdxLayoutItem
               Caption = 'New Item'
               ShowCaption = False

Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas

@@ -60,6 +60,10 @@ type
     dxLayoutControl1Group9: TdxLayoutGroup;
     edtSituacion: TcxDBComboBox;
     ledtSituacion: TdxLayoutItem;
+    dxLayoutControl1Item8: TdxLayoutItem;
+    edtRefContrato: TcxDBTextEdit;
+    dxLayoutControl1Item9: TdxLayoutItem;
+    edtRefClienteContrato: TcxDBTextEdit;
     procedure bFormasPagoClick(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure CustomViewCreate(Sender: TObject);

Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm

@@ -157,7 +157,11 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
         Caption = 'Contrato'
         DataBinding.FieldName = 'REF_CONTRATO'
       end
-      object cxGridViewColumn1: TcxGridDBColumn
+      object cxGridViewREF_CLI_CONTRATO: TcxGridDBColumn
+        Caption = 'Ref. Cliente contrato'
+        DataBinding.FieldName = 'REF_CLI_CONTRATO'
+      end
+      object cxGridViewFECHA_VENCIMIENTO: TcxGridDBColumn
         DataBinding.FieldName = 'FECHA_VENCIMIENTO'
       end
     end

Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas

@@ -61,7 +61,8 @@ type
     cxGridViewIMPORTE_RE: TcxGridDBColumn;
     cxGridViewRE: TcxGridDBColumn;
     cxGridViewREF_CONTRATO: TcxGridDBColumn;
-    cxGridViewColumn1: TcxGridDBColumn;
+    cxGridViewFECHA_VENCIMIENTO: TcxGridDBColumn;
+    cxGridViewREF_CLI_CONTRATO: TcxGridDBColumn;
     procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
       ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
       out AStyle: TcxStyle);

Source/Modulos/Formas de pago/Views/uEditorFormasPago.dfm

@@ -101,7 +101,6 @@ object fEditorFormasPago: TfEditorFormasPago
             Expanded = False
             FieldName = 'DESCRIPCION'
             Title.Caption = 'Descripci'#243'n'
-            Width = -1
             Visible = False
           end>
       end

Source/Modulos/Formas de pago/Views/uEditorFormasPago.pas

@@ -106,7 +106,7 @@ end;
 
 procedure TfEditorFormasPago.actEliminarExecute(Sender: TObject);
 begin
-  if (ShowConfirmMessage('Borrar forma de pago', '¿Está seguro que desea borrar esta forma de pago?') = IDYES) then
+  if (ShowConfirmMessage('Borrar forma de pago, esta forma de pago puede estar asociada a presupuestos, contratos y facturas.', '¿Está seguro que desea borrar esta forma de pago?') = IDYES) then
     FController.Eliminar(FFormasPago)
 end;
 

Source/Modulos/Tipos de IVA/Views/TiposIVA_view.dproj

@@ -40,31 +40,32 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <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="ImplicitBuild">True</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 Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">TiposIVA_view.dpk</Source></Source></Delphi.Personality></BorlandProject></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="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 Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">TiposIVA_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
     <DelphiCompile Include="TiposIVA_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
+    <DCCReference Include="..\ApplicationBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="..\Base.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
+    <DCCReference Include="..\GUIBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="..\rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_controller.dcp" />
+    <DCCReference Include="..\TiposIVA_controller.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_data.dcp" />
+    <DCCReference Include="..\TiposIVA_data.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_model.dcp" />
+    <DCCReference Include="..\TiposIVA_model.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="..\vcl.dcp" />
     <DCCReference Include="uEditorTipoIVA.pas">
       <Form>fEditorTipoIVA</Form>
+      <DesignClass>TfEditorTipoIVA</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorTiposIVA.pas">
       <Form>fEditorTiposIVA</Form>
+      <DesignClass>TfEditorTiposIVA</DesignClass>
     </DCCReference>
     <DCCReference Include="uTiposIVAViewRegister.pas" />
   </ItemGroup>
 </Project>
-
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006

Source/Modulos/Tipos de IVA/Views/uEditorTipoIVA.pas

@@ -31,7 +31,7 @@ uses
   uBizTiposIVA, uTiposIVAController, 
   uDADataTable, uIEditorTipoIVA, ActnList, ExtCtrls, JvExControls, JvComponent,
   JvEnterTab, cxControls, cxContainer, cxEdit, cxTextEdit, cxMaskEdit,
-  cxSpinEdit, cxDBEdit;
+  cxSpinEdit, cxDBEdit, uDAInterfaces;
 
 type
   TfEditorTipoIVA = class(TForm, IEditorTipoIVA)

Source/Modulos/Tipos de IVA/Views/uEditorTiposIVA.dfm

@@ -44,10 +44,6 @@ object fEditorTiposIVA: TfEditorTiposIVA
     TabOrder = 0
     object TabSheet1: TTabSheet
       Caption = 'Tipos de IVA'
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object Label1: TLabel
         Left = 6
         Top = 12

Source/Modulos/Tipos de IVA/Views/uEditorTiposIVA.pas

@@ -106,7 +106,7 @@ end;
 
 procedure TfEditorTiposIVA.actEliminarExecute(Sender: TObject);
 begin
-  if (ShowConfirmMessage('¿Desea borrar este tipo de IVA?', '') = IDYES) then
+  if (ShowConfirmMessage('Borrar tipo de IVA, este tipo de IVA puede estar asociado a presupuestos, contratos y facturas. ¿Desea borrar este tipo de IVA?', '') = IDYES) then
     FController.Eliminar(FTiposIVA)
 end;
 

Source/Servidor/FactuGES_Server.dpr

@@ -132,16 +132,16 @@ uses
   schRemesasClienteServer_Intf in '..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas',
   schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas',
   schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas',
-  schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas',
-  schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas',
-  schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
-  schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas',
   schFormasPagoClient_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas',
   schFormasPagoServer_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas',
   schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas',
   schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas',
   schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
-  schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas';
+  schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas',
+  schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas',
+  schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas',
+  schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
+  schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas';
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}

Source/Servidor/FactuGES_Server.dproj

@@ -28,7 +28,7 @@
 		<Borland.Personality>Delphi.Personality</Borland.Personality>
 		<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">6</VersionInfo><VersionInfo Name="Release">2</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.6.2.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.6.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 25 de septiembre de 2013 10:02</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+			<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">6</VersionInfo><VersionInfo Name="Release">3</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.6.3.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.6.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 08 de octubre de 2013 18:53</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
 						<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
 					</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
 	</ProjectExtensions>