Ticket #134 -> Añadir en facturas el campo de cliente final

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@630 0c75b7a4-871f-7646-8a2f-f78d34cc349f

Build/Installer.fbp5

@@ -1413,7 +1413,7 @@ updateclient_path
                   <Property name="NodeCollapsed" type="Boolean">False</Property>
                   <Property name="PauseInterval" type="Cardinal">0</Property>
                   <Property name="RetryPauseInterval" type="Cardinal">1000</Property>
-                  <Property name="SuppressStatusMessages" type="Boolean">False</Property>
+                  <Property name="SuppressStatusMessages" type="Boolean">True</Property>
                   <Property name="TerminateOnTimeout" type="Boolean">True</Property>
                   <Property name="TimeoutLength" type="Cardinal">2</Property>
                   <CustomProperty MultiValue="0" name="TheVariable" type="ptString">_aux_xml_document</CustomProperty>
@@ -1468,7 +1468,7 @@ updateclient_path
                   <Property name="NodeCollapsed" type="Boolean">False</Property>
                   <Property name="PauseInterval" type="Cardinal">0</Property>
                   <Property name="RetryPauseInterval" type="Cardinal">1000</Property>
-                  <Property name="SuppressStatusMessages" type="Boolean">False</Property>
+                  <Property name="SuppressStatusMessages" type="Boolean">True</Property>
                   <Property name="TerminateOnTimeout" type="Boolean">True</Property>
                   <Property name="TimeoutLength" type="Cardinal">2</Property>
                   <CustomProperty MultiValue="0" name="TheVariable" type="ptString">_aux_xml_document</CustomProperty>

Database/scripts/factuges.sql

@@ -734,7 +734,8 @@ CREATE TABLE FACTURAS_CLIENTE (
     ID_TIPO_IVA            TIPO_ID,
     RECARGO_EQUIVALENCIA   TIPO_BOOLEANO,
     ID_COMISION_LIQUIDADA  TIPO_ID,
-    DATOS_BANCARIOS        VARCHAR(255)
+    DATOS_BANCARIOS        VARCHAR(255),
+	CLIENTE_FINAL          VARCHAR(255)
 );
 
 CREATE TABLE FACTURAS_CLIENTE_DETALLES (
@@ -2071,6 +2072,7 @@ CREATE VIEW V_FACTURAS_CLIENTE(
     PROVINCIA,
     CODIGO_POSTAL,
     DATOS_BANCARIOS,
+	CLIENTE_FINAL,
     FECHA_ALTA,
     FECHA_MODIFICACION,
     USUARIO,
@@ -2106,6 +2108,7 @@ SELECT FACTURAS_CLIENTE.ID,
   FACTURAS_CLIENTE.PROVINCIA,
   FACTURAS_CLIENTE.CODIGO_POSTAL,
   FACTURAS_CLIENTE.DATOS_BANCARIOS,
+  FACTURAS_CLIENTE.CLIENTE_FINAL,
   FACTURAS_CLIENTE.FECHA_ALTA,
   FACTURAS_CLIENTE.FECHA_MODIFICACION,
   FACTURAS_CLIENTE.USUARIO,

Source/Base/Base.dproj

@@ -53,58 +53,58 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\adortl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxDataD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxExportD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxGridD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxIntl6D11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxIntlPrintSys3D11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\cxPageControlD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dclIndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\designide.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dsnap.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxPSCoreD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\dxThemeD11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\GUISDK_D11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\IndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\IndyProtocols.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\IndySystem.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Jcl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JclVcl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JSDialog100.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvCmpD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvDlgsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvMMD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvNetD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\JvSystemD11R.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\pckMD5.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\PNG_D10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\RemObjects_Indy_D11.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\TB2k_D10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\tbx_d10.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vclactnband.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vcljpg.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\VclSmp.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\vclx.dcp" />
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-    <DCCReference Include="C:\GUISDK\Packages\adortl.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\cxDataD11.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\cxEditorsD11.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\cxExportD11.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\cxExtEditorsD11.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\cxGridD11.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\cxIntl6D11.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\cxIntlPrintSys3D11.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\cxLibraryD11.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\cxPageControlD11.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\dbrtl.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\dclIndyCore.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\designide.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\dsnap.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\dxGDIPlusD11.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\dxPSCoreD11.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\dxThemeD11.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\GUISDK_D11.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\IndyCore.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\IndyProtocols.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\IndySystem.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\Jcl.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\JclVcl.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\JSDialog100.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\JvCmpD11R.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\JvCoreD11R.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\JvCtrlsD11R.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\JvDlgsD11R.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\JvMMD11R.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\JvNetD11R.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\JvPageCompsD11R.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\JvSystemD11R.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\pckMD5.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\pckUCDataConnector.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\pckUserControl_RT.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\PngComponentsD10.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\PNG_D10.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\RemObjects_Indy_D11.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\rtl.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\TB2k_D10.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\tbx_d10.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\vcl.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\vclactnband.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\vcldb.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\vcljpg.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\VclSmp.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\vclx.dcp" />
-    <DCCReference Include="C:\GUISDK\Packages\xmlrtl.dcp" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
       <DesignClass>TForm</DesignClass>

Source/Cliente/FactuGES.dproj

@@ -54,7 +54,7 @@
     <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">1</VersionInfo><VersionInfo Name="MinorVer">3</VersionInfo><VersionInfo Name="Release">4</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">1.3.4.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">1.3.4.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">1</VersionInfo><VersionInfo Name="MinorVer">3</VersionInfo><VersionInfo Name="Release">5</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">1.3.5.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">1.3.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       
       

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

@@ -186,6 +186,13 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
         DisplayLabel = 'Datos bancarios'
         DictionaryEntry = 'FacturasCliente_DATOS_BANCARIOS'
       end
+      item
+        Name = 'CLIENTE_FINAL'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Cliente final'
+        DictionaryEntry = 'FacturasCliente_CLIENTE_FINAL'
+      end
       item
         Name = 'FECHA_ALTA'
         DataType = datDateTime

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

@@ -9,8 +9,8 @@ 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_FacturasCliente = '{4E42B55F-F2F8-410E-BCE0-62687554F3C8}';
+  RID_FacturasCliente = '{905E4452-EC9B-42D6-B7D5-34DD181D5334}';
-  RID_FacturasCliente_Detalles = '{A0F7CFA0-6C55-4A53-A777-C282018410A6}';
+  RID_FacturasCliente_Detalles = '{76206BC3-9926-4361-A2A2-23CD55C558FD}';
 
   { Data table names }
   nme_FacturasCliente = 'FacturasCliente';
@@ -41,6 +41,7 @@ const
   fld_FacturasClientePROVINCIA = 'PROVINCIA';
   fld_FacturasClienteCODIGO_POSTAL = 'CODIGO_POSTAL';
   fld_FacturasClienteDATOS_BANCARIOS = 'DATOS_BANCARIOS';
+  fld_FacturasClienteCLIENTE_FINAL = 'CLIENTE_FINAL';
   fld_FacturasClienteFECHA_ALTA = 'FECHA_ALTA';
   fld_FacturasClienteFECHA_MODIFICACION = 'FECHA_MODIFICACION';
   fld_FacturasClienteUSUARIO = 'USUARIO';
@@ -77,16 +78,17 @@ const
   idx_FacturasClientePROVINCIA = 21;
   idx_FacturasClienteCODIGO_POSTAL = 22;
   idx_FacturasClienteDATOS_BANCARIOS = 23;
-  idx_FacturasClienteFECHA_ALTA = 24;
+  idx_FacturasClienteCLIENTE_FINAL = 24;
-  idx_FacturasClienteFECHA_MODIFICACION = 25;
+  idx_FacturasClienteFECHA_ALTA = 25;
-  idx_FacturasClienteUSUARIO = 26;
+  idx_FacturasClienteFECHA_MODIFICACION = 26;
-  idx_FacturasClienteID_FORMA_PAGO = 27;
+  idx_FacturasClienteUSUARIO = 27;
-  idx_FacturasClienteRECARGO_EQUIVALENCIA = 28;
+  idx_FacturasClienteID_FORMA_PAGO = 28;
-  idx_FacturasClienteID_TIPO_IVA = 29;
+  idx_FacturasClienteRECARGO_EQUIVALENCIA = 29;
-  idx_FacturasClienteIMPORTE_NETO = 30;
+  idx_FacturasClienteID_TIPO_IVA = 30;
-  idx_FacturasClienteIMPORTE_PORTE = 31;
+  idx_FacturasClienteIMPORTE_NETO = 31;
-  idx_FacturasClienteID_AGENTE = 32;
+  idx_FacturasClienteIMPORTE_PORTE = 32;
-  idx_FacturasClienteREFERENCIA_COMISION = 33;
+  idx_FacturasClienteID_AGENTE = 33;
+  idx_FacturasClienteREFERENCIA_COMISION = 34;
 
   { FacturasCliente_Detalles fields }
   fld_FacturasCliente_DetallesID = 'ID';
@@ -125,7 +127,7 @@ const
 type
   { IFacturasCliente }
   IFacturasCliente = interface(IDAStronglyTypedDataTable)
-  ['{ED9B9F34-C0EB-4988-B293-1D0482D48E72}']
+  ['{A8586B84-68BF-45F1-8B9D-31CE5E7D3E9C}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -222,6 +224,10 @@ type
     procedure SetDATOS_BANCARIOSValue(const aValue: String);
     function GetDATOS_BANCARIOSIsNull: Boolean;
     procedure SetDATOS_BANCARIOSIsNull(const aValue: Boolean);
+    function GetCLIENTE_FINALValue: String;
+    procedure SetCLIENTE_FINALValue(const aValue: String);
+    function GetCLIENTE_FINALIsNull: Boolean;
+    procedure SetCLIENTE_FINALIsNull(const aValue: Boolean);
     function GetFECHA_ALTAValue: DateTime;
     procedure SetFECHA_ALTAValue(const aValue: DateTime);
     function GetFECHA_ALTAIsNull: Boolean;
@@ -313,6 +319,8 @@ type
     property CODIGO_POSTALIsNull: Boolean read GetCODIGO_POSTALIsNull write SetCODIGO_POSTALIsNull;
     property DATOS_BANCARIOS: String read GetDATOS_BANCARIOSValue write SetDATOS_BANCARIOSValue;
     property DATOS_BANCARIOSIsNull: Boolean read GetDATOS_BANCARIOSIsNull write SetDATOS_BANCARIOSIsNull;
+    property CLIENTE_FINAL: String read GetCLIENTE_FINALValue write SetCLIENTE_FINALValue;
+    property CLIENTE_FINALIsNull: Boolean read GetCLIENTE_FINALIsNull write SetCLIENTE_FINALIsNull;
     property FECHA_ALTA: DateTime read GetFECHA_ALTAValue write SetFECHA_ALTAValue;
     property FECHA_ALTAIsNull: Boolean read GetFECHA_ALTAIsNull write SetFECHA_ALTAIsNull;
     property FECHA_MODIFICACION: DateTime read GetFECHA_MODIFICACIONValue write SetFECHA_MODIFICACIONValue;
@@ -437,6 +445,10 @@ type
     procedure SetDATOS_BANCARIOSValue(const aValue: String); virtual;
     function GetDATOS_BANCARIOSIsNull: Boolean; virtual;
     procedure SetDATOS_BANCARIOSIsNull(const aValue: Boolean); virtual;
+    function GetCLIENTE_FINALValue: String; virtual;
+    procedure SetCLIENTE_FINALValue(const aValue: String); virtual;
+    function GetCLIENTE_FINALIsNull: Boolean; virtual;
+    procedure SetCLIENTE_FINALIsNull(const aValue: Boolean); virtual;
     function GetFECHA_ALTAValue: DateTime; virtual;
     procedure SetFECHA_ALTAValue(const aValue: DateTime); virtual;
     function GetFECHA_ALTAIsNull: Boolean; virtual;
@@ -527,6 +539,8 @@ type
     property CODIGO_POSTALIsNull: Boolean read GetCODIGO_POSTALIsNull write SetCODIGO_POSTALIsNull;
     property DATOS_BANCARIOS: String read GetDATOS_BANCARIOSValue write SetDATOS_BANCARIOSValue;
     property DATOS_BANCARIOSIsNull: Boolean read GetDATOS_BANCARIOSIsNull write SetDATOS_BANCARIOSIsNull;
+    property CLIENTE_FINAL: String read GetCLIENTE_FINALValue write SetCLIENTE_FINALValue;
+    property CLIENTE_FINALIsNull: Boolean read GetCLIENTE_FINALIsNull write SetCLIENTE_FINALIsNull;
     property FECHA_ALTA: DateTime read GetFECHA_ALTAValue write SetFECHA_ALTAValue;
     property FECHA_ALTAIsNull: Boolean read GetFECHA_ALTAIsNull write SetFECHA_ALTAIsNull;
     property FECHA_MODIFICACION: DateTime read GetFECHA_MODIFICACIONValue write SetFECHA_MODIFICACIONValue;
@@ -556,7 +570,7 @@ type
 
   { IFacturasCliente_Detalles }
   IFacturasCliente_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{164E9DC0-C0D9-4ABB-A06C-B3731839929F}']
+  ['{304C4E66-6E40-44E9-8AC0-E82711020403}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1283,6 +1297,27 @@ begin
     DataTable.Fields[idx_FacturasClienteDATOS_BANCARIOS].AsVariant := Null;
 end;
 
+function TFacturasClienteDataTableRules.GetCLIENTE_FINALValue: String;
+begin
+  result := DataTable.Fields[idx_FacturasClienteCLIENTE_FINAL].AsString;
+end;
+
+procedure TFacturasClienteDataTableRules.SetCLIENTE_FINALValue(const aValue: String);
+begin
+  DataTable.Fields[idx_FacturasClienteCLIENTE_FINAL].AsString := aValue;
+end;
+
+function TFacturasClienteDataTableRules.GetCLIENTE_FINALIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasClienteCLIENTE_FINAL].IsNull;
+end;
+
+procedure TFacturasClienteDataTableRules.SetCLIENTE_FINALIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasClienteCLIENTE_FINAL].AsVariant := Null;
+end;
+
 function TFacturasClienteDataTableRules.GetFECHA_ALTAValue: DateTime;
 begin
   result := DataTable.Fields[idx_FacturasClienteFECHA_ALTA].AsDateTime;

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

@@ -9,13 +9,13 @@ 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_FacturasClienteDelta = '{DF1FD699-5232-4833-B096-A6497A86329D}';
+  RID_FacturasClienteDelta = '{E6D0EAB3-B50E-445C-8F6D-111617271847}';
-  RID_FacturasCliente_DetallesDelta = '{F24D2321-3AF8-4E72-BC06-4F35B3F688BF}';
+  RID_FacturasCliente_DetallesDelta = '{DE5E67CA-CF82-423B-8D29-7708BEFF1F3E}';
 
 type
   { IFacturasClienteDelta }
   IFacturasClienteDelta = interface(IFacturasCliente)
-  ['{DF1FD699-5232-4833-B096-A6497A86329D}']
+  ['{E6D0EAB3-B50E-445C-8F6D-111617271847}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -41,6 +41,7 @@ type
     function GetOldPROVINCIAValue : String;
     function GetOldCODIGO_POSTALValue : String;
     function GetOldDATOS_BANCARIOSValue : String;
+    function GetOldCLIENTE_FINALValue : String;
     function GetOldFECHA_ALTAValue : DateTime;
     function GetOldFECHA_MODIFICACIONValue : DateTime;
     function GetOldUSUARIOValue : String;
@@ -77,6 +78,7 @@ type
     property OldPROVINCIA : String read GetOldPROVINCIAValue;
     property OldCODIGO_POSTAL : String read GetOldCODIGO_POSTALValue;
     property OldDATOS_BANCARIOS : String read GetOldDATOS_BANCARIOSValue;
+    property OldCLIENTE_FINAL : String read GetOldCLIENTE_FINALValue;
     property OldFECHA_ALTA : DateTime read GetOldFECHA_ALTAValue;
     property OldFECHA_MODIFICACION : DateTime read GetOldFECHA_MODIFICACIONValue;
     property OldUSUARIO : String read GetOldUSUARIOValue;
@@ -239,6 +241,12 @@ type
     function GetOldDATOS_BANCARIOSIsNull: Boolean; virtual;
     procedure SetDATOS_BANCARIOSValue(const aValue: String); virtual;
     procedure SetDATOS_BANCARIOSIsNull(const aValue: Boolean); virtual;
+    function GetCLIENTE_FINALValue: String; virtual;
+    function GetCLIENTE_FINALIsNull: Boolean; virtual;
+    function GetOldCLIENTE_FINALValue: String; virtual;
+    function GetOldCLIENTE_FINALIsNull: Boolean; virtual;
+    procedure SetCLIENTE_FINALValue(const aValue: String); virtual;
+    procedure SetCLIENTE_FINALIsNull(const aValue: Boolean); virtual;
     function GetFECHA_ALTAValue: DateTime; virtual;
     function GetFECHA_ALTAIsNull: Boolean; virtual;
     function GetOldFECHA_ALTAValue: DateTime; virtual;
@@ -397,6 +405,10 @@ type
     property DATOS_BANCARIOSIsNull : Boolean read GetDATOS_BANCARIOSIsNull write SetDATOS_BANCARIOSIsNull;
     property OldDATOS_BANCARIOS : String read GetOldDATOS_BANCARIOSValue;
     property OldDATOS_BANCARIOSIsNull : Boolean read GetOldDATOS_BANCARIOSIsNull;
+    property CLIENTE_FINAL : String read GetCLIENTE_FINALValue write SetCLIENTE_FINALValue;
+    property CLIENTE_FINALIsNull : Boolean read GetCLIENTE_FINALIsNull write SetCLIENTE_FINALIsNull;
+    property OldCLIENTE_FINAL : String read GetOldCLIENTE_FINALValue;
+    property OldCLIENTE_FINALIsNull : Boolean read GetOldCLIENTE_FINALIsNull;
     property FECHA_ALTA : DateTime read GetFECHA_ALTAValue write SetFECHA_ALTAValue;
     property FECHA_ALTAIsNull : Boolean read GetFECHA_ALTAIsNull write SetFECHA_ALTAIsNull;
     property OldFECHA_ALTA : DateTime read GetOldFECHA_ALTAValue;
@@ -446,7 +458,7 @@ type
 
   { IFacturasCliente_DetallesDelta }
   IFacturasCliente_DetallesDelta = interface(IFacturasCliente_Detalles)
-  ['{F24D2321-3AF8-4E72-BC06-4F35B3F688BF}']
+  ['{DE5E67CA-CF82-423B-8D29-7708BEFF1F3E}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_FACTURAValue : Integer;
@@ -1414,6 +1426,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteDATOS_BANCARIOS] := Null;
 end;
 
+function TFacturasClienteBusinessProcessorRules.GetCLIENTE_FINALValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteCLIENTE_FINAL];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetCLIENTE_FINALIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteCLIENTE_FINAL]);
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldCLIENTE_FINALValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteCLIENTE_FINAL];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldCLIENTE_FINALIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteCLIENTE_FINAL]);
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetCLIENTE_FINALValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteCLIENTE_FINAL] := aValue;
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetCLIENTE_FINALIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteCLIENTE_FINAL] := Null;
+end;
+
 function TFacturasClienteBusinessProcessorRules.GetFECHA_ALTAValue: DateTime;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteFECHA_ALTA];

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

@@ -157,6 +157,10 @@ object srvFacturasCliente: TsrvFacturasCliente
               item
                 DatasetField = 'DATOS_BANCARIOS'
                 TableField = 'DATOS_BANCARIOS'
+              end
+              item
+                DatasetField = 'CLIENTE_FINAL'
+                TableField = 'CLIENTE_FINAL'
               end>
           end>
         Name = 'FacturasCliente'
@@ -294,6 +298,12 @@ object srvFacturasCliente: TsrvFacturasCliente
             Size = 255
             DictionaryEntry = 'FacturasCliente_DATOS_BANCARIOS'
           end
+          item
+            Name = 'CLIENTE_FINAL'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'FacturasCliente_CLIENTE_FINAL'
+          end
           item
             Name = 'FECHA_ALTA'
             DataType = datDateTime
@@ -722,13 +732,6 @@ object srvFacturasCliente: TsrvFacturasCliente
       end
       item
         Params = <
-          item
-            Name = 'DATOS_BANCARIOS'
-            DataType = datString
-            Size = 255
-            Value = ''
-            ParamType = daptInput
-          end
           item
             Name = 'ID'
             DataType = datAutoInc
@@ -737,173 +740,119 @@ object srvFacturasCliente: TsrvFacturasCliente
           end
           item
             Name = 'ID_EMPRESA'
-            DataType = datInteger
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'REFERENCIA'
-            DataType = datString
-            Size = 255
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'FECHA_FACTURA'
-            DataType = datDateTime
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'BASE_IMPONIBLE'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'DESCUENTO'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'IMPORTE_DESCUENTO'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'IVA'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'IMPORTE_IVA'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'RE'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'IMPORTE_RE'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'IMPORTE_TOTAL'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'OBSERVACIONES'
-            DataType = datMemo
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'ID_CLIENTE'
-            DataType = datInteger
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'NIF_CIF'
-            DataType = datString
-            Size = 15
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'NOMBRE'
-            DataType = datString
-            Size = 255
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'CALLE'
-            DataType = datString
-            Size = 255
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'POBLACION'
-            DataType = datString
-            Size = 255
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'PROVINCIA'
-            DataType = datString
-            Size = 255
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'CODIGO_POSTAL'
-            DataType = datString
-            Size = 10
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'FECHA_ALTA'
-            DataType = datDateTime
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'FECHA_MODIFICACION'
-            DataType = datDateTime
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'USUARIO'
-            DataType = datString
-            Size = 20
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'ID_FORMA_PAGO'
-            DataType = datInteger
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'RECARGO_EQUIVALENCIA'
-            DataType = datInteger
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'ID_TIPO_IVA'
-            DataType = datInteger
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'IMPORTE_NETO'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'IMPORTE_PORTE'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
+          end
+          item
+            Name = 'DATOS_BANCARIOS'
+            Value = ''
+          end
+          item
+            Name = 'CLIENTE_FINAL'
+            Value = ''
           end>
         Statements = <
           item
@@ -918,16 +867,16 @@ object srvFacturasCliente: TsrvFacturasCliente
               'NIF_CIF,'#10'    NOMBRE,'#10'    CALLE,'#10'    POBLACION,'#10'    PROVINCIA,'#10'  ' +
               '  CODIGO_POSTAL,'#10'    FECHA_ALTA,'#10'    FECHA_MODIFICACION,'#10'    USU' +
               'ARIO,'#10'    ID_FORMA_PAGO,'#10'    RECARGO_EQUIVALENCIA,'#10'    ID_TIPO_I' +
-              'VA,'#10'    IMPORTE_NETO,'#10'    IMPORTE_PORTE,'#10'    DATOS_BANCARIOS)'#10'  ' +
+              'VA,'#10'    IMPORTE_NETO,'#10'    IMPORTE_PORTE,'#10'    DATOS_BANCARIOS,'#10'  ' +
-              'VALUES ('#10'    :ID,'#10'    :ID_EMPRESA,'#10'    :REFERENCIA,'#10'    :FECHA_F' +
+              '  CLIENTE_FINAL)'#10'  VALUES ('#10'    :ID,'#10'    :ID_EMPRESA,'#10'    :REFER' +
-              'ACTURA,'#10'    :BASE_IMPONIBLE,'#10'    :DESCUENTO,'#10'    :IMPORTE_DESCUE' +
+              'ENCIA,'#10'    :FECHA_FACTURA,'#10'    :BASE_IMPONIBLE,'#10'    :DESCUENTO,'#10 +
-              'NTO,'#10'    :IVA,'#10'    :IMPORTE_IVA,'#10'    :RE,'#10'    :IMPORTE_RE,'#10'    :' +
+              '    :IMPORTE_DESCUENTO,'#10'    :IVA,'#10'    :IMPORTE_IVA,'#10'    :RE,'#10'   ' +
-              'IMPORTE_TOTAL,'#10'    :OBSERVACIONES,'#10'    :ID_CLIENTE,'#10'    :NIF_CIF' +
+              ' :IMPORTE_RE,'#10'    :IMPORTE_TOTAL,'#10'    :OBSERVACIONES,'#10'    :ID_CL' +
-              ','#10'    :NOMBRE,'#10'    :CALLE,'#10'    :POBLACION,'#10'    :PROVINCIA,'#10'    :' +
+              'IENTE,'#10'    :NIF_CIF,'#10'    :NOMBRE,'#10'    :CALLE,'#10'    :POBLACION,'#10'  ' +
-              'CODIGO_POSTAL,'#10'    :FECHA_ALTA,'#10'    :FECHA_MODIFICACION,'#10'    :US' +
+              '  :PROVINCIA,'#10'    :CODIGO_POSTAL,'#10'    :FECHA_ALTA,'#10'    :FECHA_MO' +
-              'UARIO,'#10'    :ID_FORMA_PAGO,'#10'    :RECARGO_EQUIVALENCIA,'#10'    :ID_TI' +
+              'DIFICACION,'#10'    :USUARIO,'#10'    :ID_FORMA_PAGO,'#10'    :RECARGO_EQUIV' +
-              'PO_IVA,'#10'    :IMPORTE_NETO,'#10'    :IMPORTE_PORTE,'#10'    :DATOS_BANCAR' +
+              'ALENCIA,'#10'    :ID_TIPO_IVA,'#10'    :IMPORTE_NETO,'#10'    :IMPORTE_PORTE' +
-              'IOS);'#10
+              ','#10'    :DATOS_BANCARIOS,'#10'    :CLIENTE_FINAL);'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -935,188 +884,125 @@ object srvFacturasCliente: TsrvFacturasCliente
       end
       item
         Params = <
-          item
-            Name = 'DATOS_BANCARIOS'
-            DataType = datString
-            Size = 255
-            Value = ''
-            ParamType = daptInput
-          end
           item
             Name = 'ID_EMPRESA'
-            DataType = datInteger
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'REFERENCIA'
-            DataType = datString
-            Size = 255
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'FECHA_FACTURA'
-            DataType = datDateTime
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'BASE_IMPONIBLE'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'DESCUENTO'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'IMPORTE_DESCUENTO'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'IVA'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'IMPORTE_IVA'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'RE'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'IMPORTE_RE'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'IMPORTE_TOTAL'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'OBSERVACIONES'
-            DataType = datMemo
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'ID_CLIENTE'
-            DataType = datInteger
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'NIF_CIF'
-            DataType = datString
-            Size = 15
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'NOMBRE'
-            DataType = datString
-            Size = 255
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'CALLE'
-            DataType = datString
-            Size = 255
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'POBLACION'
-            DataType = datString
-            Size = 255
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'PROVINCIA'
-            DataType = datString
-            Size = 255
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'CODIGO_POSTAL'
-            DataType = datString
-            Size = 10
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'FECHA_ALTA'
-            DataType = datDateTime
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'FECHA_MODIFICACION'
-            DataType = datDateTime
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'USUARIO'
-            DataType = datString
-            Size = 20
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'ID_FORMA_PAGO'
-            DataType = datInteger
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'RECARGO_EQUIVALENCIA'
-            DataType = datInteger
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'ID_TIPO_IVA'
-            DataType = datInteger
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'IMPORTE_NETO'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'IMPORTE_PORTE'
-            DataType = datFloat
             Value = ''
-            ParamType = daptInput
+          end
+          item
+            Name = 'DATOS_BANCARIOS'
+            Value = ''
+          end
+          item
+            Name = 'CLIENTE_FINAL'
+            Value = ''
           end
           item
             Name = 'OLD_ID'
-            DataType = datInteger
             Value = ''
-            ParamType = daptInput
           end>
         Statements = <
           item
@@ -1137,7 +1023,8 @@ object srvFacturasCliente: TsrvFacturasCliente
               'O = :ID_FORMA_PAGO,'#10'    RECARGO_EQUIVALENCIA = :RECARGO_EQUIVALE' +
               'NCIA,'#10'    ID_TIPO_IVA = :ID_TIPO_IVA,'#10'    IMPORTE_NETO = :IMPORT' +
               'E_NETO,'#10'    IMPORTE_PORTE = :IMPORTE_PORTE,'#10'    DATOS_BANCARIOS ' +
-              '= :DATOS_BANCARIOS'#10'  WHERE'#10'  (ID = :OLD_ID);'#10
+              '= :DATOS_BANCARIOS,'#10'    CLIENTE_FINAL = :CLIENTE_FINAL'#10'  WHERE'#10' ' +
+              ' (ID = :OLD_ID);'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1206,6 +1093,12 @@ object srvFacturasCliente: TsrvFacturasCliente
   end
   object DataDictionary: TDADataDictionary
     Fields = <
+      item
+        Name = 'FacturasCliente_CLIENTE_FINAL'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Cliente final'
+      end
       item
         Name = 'FacturasCliente_ID'
         DataType = datAutoInc

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

@@ -37,6 +37,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
         454E44AE426082}
       ExplicitLeft = 742
     end
+    inherited lblDesbloquear: TcxLabel
+      Left = 687
+      ExplicitLeft = 499
+    end
   end
   inherited TBXDock: TTBXDock
     Width = 812
@@ -115,6 +119,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
           DesignSize = (
             798
             316)
+          inherited Label1: TLabel
+            Left = 439
+            Width = 311
+            ExplicitLeft = 439
+            ExplicitWidth = 311
+          end
           inherited eReferencia: TcxDBTextEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
@@ -142,9 +152,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             Width = 445
           end
           inherited frViewClienteFactura: TfrViewDatosYSeleccionCliente
-            Left = 485
+            Left = 428
             Width = 298
-            ExplicitLeft = 485
+            ExplicitLeft = 428
             ExplicitWidth = 298
             inherited dxLayoutControl1: TdxLayoutControl
               Width = 298
@@ -196,17 +206,17 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
                 Width = 224
               end
               inherited edtCodigoPostal: TcxDBTextEdit
-                Left = 199
+                Left = 239
                 DataBinding.DataSource = frViewFacturaCliente1.DADataSource
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
-                ExplicitLeft = 199
+                ExplicitLeft = 239
               end
               inherited Button3: TBitBtn
-                Left = 89
+                Left = 129
-                ExplicitLeft = 89
+                ExplicitLeft = 129
               end
             end
           end
@@ -219,8 +229,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             Width = 205
           end
           inherited bFormasPago: TButton
-            Left = 325
+            Left = 268
-            ExplicitLeft = 325
+            ExplicitLeft = 268
           end
           inherited cbCuentaBancaria: TcxDBComboBox
             Style.LookAndFeel.SkinName = ''
@@ -230,6 +240,20 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             ExplicitWidth = 343
             Width = 343
           end
+          inherited cbClienteFinal: TcxDBTextEdit
+            Left = 439
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 439
+            ExplicitWidth = 339
+            Width = 339
+          end
+          inherited bElegirClienteFinal: TButton
+            Left = 725
+            ExplicitLeft = 725
+          end
         end
       end
     end
@@ -268,13 +292,14 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             ExplicitLeft = 278
             ExplicitTop = 0
           end
-          inherited ToolButton14: TToolButton [4]
+          inherited ToolButton14: TToolButton
             Left = 334
             Top = 0
+            Wrap = False
             ExplicitLeft = 334
             ExplicitTop = 0
           end
-          inherited FontName: TJvFontComboBox [5]
+          inherited FontName: TJvFontComboBox
             Left = 399
             Top = 0
             ExplicitLeft = 399
@@ -283,18 +308,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
           inherited FontSize: TEdit
             Left = 544
             Top = 0
-            Width = 136
+            Width = 152
             ExplicitLeft = 544
             ExplicitTop = 0
-            ExplicitWidth = 136
+            ExplicitWidth = 152
           end
-          inherited UpDown1: TUpDown
+          inherited ToolButton13: TToolButton [7]
-            Left = 680
-            Top = 0
-            ExplicitLeft = 680
-            ExplicitTop = 0
-          end
-          inherited ToolButton13: TToolButton
             Left = 0
             Top = 0
             Wrap = True
@@ -302,47 +321,52 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             ExplicitTop = 0
             ExplicitHeight = 27
           end
-          inherited ToolButton6: TToolButton [9]
+          inherited UpDown1: TUpDown [8]
             Left = 0
             Top = 27
             ExplicitLeft = 0
             ExplicitTop = 27
           end
-          inherited ToolButton7: TToolButton [10]
+          inherited ToolButton6: TToolButton
-            Left = 66
+            Left = 17
             Top = 27
-            ExplicitLeft = 66
+            ExplicitLeft = 17
             ExplicitTop = 27
           end
-          inherited ToolButton8: TToolButton [11]
+          inherited ToolButton7: TToolButton
-            Left = 133
+            Left = 83
             Top = 27
-            ExplicitLeft = 133
+            ExplicitLeft = 83
             ExplicitTop = 27
           end
-          inherited ToolButton12: TToolButton [12]
+          inherited ToolButton8: TToolButton
-            Left = 216
+            Left = 150
             Top = 27
-            ExplicitLeft = 216
+            ExplicitLeft = 150
-            ExplicitTop = 27
-            ExplicitHeight = 22
-          end
-          inherited ToolButton9: TToolButton [13]
-            Left = 224
-            Top = 27
-            ExplicitLeft = 224
             ExplicitTop = 27
           end
-          inherited ToolButton10: TToolButton [14]
+          inherited ToolButton12: TToolButton
-            Left = 369
+            Left = 233
             Top = 27
-            ExplicitLeft = 369
+            ExplicitLeft = 233
             ExplicitTop = 27
           end
-          inherited ToolButton11: TToolButton [15]
+          inherited ToolButton9: TToolButton
-            Left = 494
+            Left = 241
             Top = 27
-            ExplicitLeft = 494
+            ExplicitLeft = 241
+            ExplicitTop = 27
+          end
+          inherited ToolButton10: TToolButton
+            Left = 386
+            Top = 27
+            ExplicitLeft = 386
+            ExplicitTop = 27
+          end
+          inherited ToolButton11: TToolButton
+            Left = 511
+            Top = 27
+            ExplicitLeft = 511
             ExplicitTop = 27
           end
         end
@@ -351,14 +375,14 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
           Width = 798
           Height = 239
           ExplicitTop = 77
-          ExplicitWidth = 815
+          ExplicitWidth = 798
           ExplicitHeight = 239
         end
         inherited TBXDock1: TTBXDock
           Top = 51
           Width = 798
           ExplicitTop = 51
-          ExplicitWidth = 815
+          ExplicitWidth = 798
           inherited TBXToolbar1: TTBXToolbar
             ExplicitWidth = 702
           end

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

@@ -17,7 +17,7 @@ uses
   uViewDetallesFacturaCliente, dxLayoutLookAndFeels, JvExComCtrls, JvStatusBar,
   uViewDetallesDTO, uViewDetallesArticulos, uTiposIVAController, uDAInterfaces,
   cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit, Grids, DBGrids,
-  uViewDetallesArticulosParaVenta;
+  uViewDetallesArticulosParaVenta, cxLabel;
 
 
 type

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

@@ -1,6 +1,6 @@
 inherited frViewFacturaCliente: TfrViewFacturaCliente
-  Width = 451
+  Width = 828
-  Height = 304
+  Height = 525
   Align = alClient
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
@@ -9,17 +9,29 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 451
+    Width = 828
-    Height = 304
+    Height = 525
     Align = alClient
     ParentBackground = True
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
     LookAndFeel = dxLayoutOfficeLookAndFeel1
+    ExplicitWidth = 451
+    ExplicitHeight = 304
     DesignSize = (
-      451
+      828
-      304)
+      525)
+    object Label1: TLabel
+      Left = 421
+      Top = 270
+      Width = 311
+      Height = 26
+      Caption = 
+        'Opcionalmente, puede escribir el nombre del cliente final de est' +
+        'e presupuesto o elegirlo de la lista de clientes.'
+      WordWrap = True
+    end
     object eReferencia: TcxDBTextEdit
       Left = 124
       Top = 30
@@ -89,13 +101,13 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 5
-      Height = 124
+      Height = 345
-      Width = 267
+      Width = 355
     end
     inline frViewClienteFactura: TfrViewDatosYSeleccionCliente
-      Left = 317
+      Left = 410
       Top = 30
-      Width = 112
+      Width = 294
       Height = 215
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
@@ -105,12 +117,12 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       ParentFont = False
       TabOrder = 6
       ReadOnly = False
-      ExplicitLeft = 317
+      ExplicitLeft = 410
       ExplicitTop = 30
-      ExplicitWidth = 112
+      ExplicitWidth = 294
       ExplicitHeight = 215
       inherited dxLayoutControl1: TdxLayoutControl
-        Width = 112
+        Width = 294
         Height = 215
         ExplicitWidth = 112
         ExplicitHeight = 215
@@ -160,17 +172,17 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
           Width = 210
         end
         inherited edtCodigoPostal: TcxDBTextEdit
-          Left = 192
+          Left = 304
           DataBinding.DataSource = DADataSource
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 192
+          ExplicitLeft = 304
         end
         inherited Button3: TBitBtn
-          Left = 82
+          Left = 194
-          ExplicitLeft = 82
+          ExplicitLeft = 194
         end
       end
     end
@@ -211,7 +223,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       Width = 27
     end
     object bFormasPago: TButton
-      Left = 157
+      Left = 250
       Top = 84
       Width = 132
       Height = 23
@@ -240,6 +252,42 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       TabOrder = 4
       Width = 165
     end
+    object cbClienteFinal: TcxDBTextEdit
+      Left = 421
+      Top = 304
+      Anchors = [akLeft, akTop, akRight]
+      DataBinding.DataField = 'CLIENTE_FINAL'
+      DataBinding.DataSource = DADataSource
+      Properties.ReadOnly = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Color = clWindow
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.Color = clMenuBar
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleDisabled.TextColor = clWindowText
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 7
+      Width = 339
+    end
+    object bElegirClienteFinal: TButton
+      Left = 772
+      Top = 302
+      Width = 23
+      Height = 25
+      Action = actElegirClienteFinal
+      TabOrder = 8
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -323,6 +371,35 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
           ControlOptions.AutoColor = True
           ControlOptions.ShowBorder = False
         end
+        object dxLayoutControl1Group7: TdxLayoutGroup
+          Caption = 'Cliente final'
+          object dxLayoutControl1Item7: TdxLayoutItem
+            ShowCaption = False
+            Control = Label1
+            ControlOptions.AutoColor = True
+            ControlOptions.ShowBorder = False
+          end
+          object dxLayoutControl1Group8: TdxLayoutGroup
+            ShowCaption = False
+            Hidden = True
+            LayoutDirection = ldHorizontal
+            ShowBorder = False
+            object dxLayoutControl1Item8: TdxLayoutItem
+              AutoAligns = []
+              AlignHorz = ahClient
+              AlignVert = avCenter
+              Control = cbClienteFinal
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Item9: TdxLayoutItem
+              AutoAligns = [aaVertical]
+              AlignHorz = ahRight
+              ShowCaption = False
+              Control = bElegirClienteFinal
+              ControlOptions.ShowBorder = False
+            end
+          end
+        end
       end
     end
   end
@@ -347,4 +424,13 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
     Left = 16
     Top = 24
   end
+  object ActionList1: TActionList
+    Left = 16
+    Top = 96
+    object actElegirClienteFinal: TAction
+      Caption = '...'
+      OnExecute = actElegirClienteFinalExecute
+      OnUpdate = actElegirClienteFinalUpdate
+    end
+  end
 end

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

@@ -9,7 +9,8 @@ uses
   cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit, dxLayoutControl,
   cxMemo, cxMaskEdit, cxDropDownEdit, cxCalendar, cxSpinEdit, StdCtrls, Mask,
   DBCtrls, cxGraphics, dxLayoutLookAndFeels, cxLookupEdit, cxDBLookupEdit,
-  cxDBLookupComboBox, uFormasPagoController, uDAInterfaces, uBizFormasPago;
+  cxDBLookupComboBox, uFormasPagoController, uDAInterfaces, uBizFormasPago,
+  ActnList;
 
 type
   IViewFacturaCliente = interface(IViewBase)
@@ -46,9 +47,21 @@ type
     dxLayoutControl1Item3: TdxLayoutItem;
     cbCuentaBancaria: TcxDBComboBox;
     dxLayoutControl1Group4: TdxLayoutGroup;
+    dxLayoutControl1Item7: TdxLayoutItem;
+    Label1: TLabel;
+    dxLayoutControl1Item8: TdxLayoutItem;
+    cbClienteFinal: TcxDBTextEdit;
+    dxLayoutControl1Item9: TdxLayoutItem;
+    bElegirClienteFinal: TButton;
+    dxLayoutControl1Group7: TdxLayoutGroup;
+    dxLayoutControl1Group8: TdxLayoutGroup;
+    ActionList1: TActionList;
+    actElegirClienteFinal: TAction;
     procedure bFormasPagoClick(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure CustomViewCreate(Sender: TObject);
+    procedure actElegirClienteFinalExecute(Sender: TObject);
+    procedure actElegirClienteFinalUpdate(Sender: TObject);
   protected
     FFactura : IBizFacturaCliente;
     FFormasPago : IBizFormaPago;
@@ -65,12 +78,44 @@ implementation
 
 uses
   uDataModuleContactos, schFacturasClienteClient_Intf, uFactuGES_App,
-  uEmpresasController;
+  uEmpresasController, uClientesController, uBizContactos, uBizDireccionesContacto;
 
 {$R *.dfm}
 
 { TfrViewFacturaCliente }
 
+procedure TfrViewFacturaCliente.actElegirClienteFinalExecute(Sender: TObject);
+var
+  ACliente : IBizCliente;
+  AClienteController : IClientesController;
+begin
+  inherited;
+  AClienteController := TClientesController.Create;
+  try
+    ACliente := (AClienteController.ElegirContacto(AClienteController.BuscarTodos,
+      'Elija el cliente final de esta factura', False) as IBizCliente);
+    if Assigned(ACliente) then
+    begin
+      ShowHourglassCursor;
+      try
+        FFactura.Edit;
+        FFactura.CLIENTE_FINAL := ACliente.NOMBRE;
+      finally
+        HideHourglassCursor;
+      end;
+    end;
+  finally
+    ACliente := NIL;
+    AClienteController := NIL;
+  end;
+end;
+
+procedure TfrViewFacturaCliente.actElegirClienteFinalUpdate(Sender: TObject);
+begin
+  inherited;
+  (Sender as TAction).Enabled := (not ReadOnly);
+end;
+
 procedure TfrViewFacturaCliente.bFormasPagoClick(Sender: TObject);
 begin
   inherited;

Source/Servidor/FactuGES_Server.dproj

@@ -35,7 +35,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 Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">3</VersionInfo><VersionInfo Name="Release">4</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.3.4.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.3.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 19 de septiembre de 2008 17:48</VersionInfoKeys></VersionInfoKeys><Excluded_Packages/><Source><Source Name="MainSource">FactuGES_Server.dpr</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 Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">3</VersionInfo><VersionInfo Name="Release">5</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.3.5.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.3.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 26 de septiembre de 2008 14:47</VersionInfoKeys></VersionInfoKeys><Excluded_Packages/><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
 	</ProjectExtensions>
 	<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
 	<ItemGroup>
@@ -143,7 +143,6 @@
 		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas"/>
 		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas"/>
 		<DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas"/>
-		<DCCReference Include="..\Modulos\Formas de pago\Servidor\srvUnidadesMedida_Impl.pas"/>
 		<DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
 			<Form>srvGestorDocumentos</Form>
 			<DesignClass>TDataAbstractService</DesignClass>

Source/Servidor/FactuGES_Server.rc

@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 1,3,4,0
+FILEVERSION 1,3,5,0
-PRODUCTVERSION 1,3,4,0
+PRODUCTVERSION 1,3,5,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -12,9 +12,9 @@ BEGIN
     BEGIN
          BLOCK "0C0A04E4"
          BEGIN
-              VALUE "FileVersion", "1.3.4.0\0"
+              VALUE "FileVersion", "1.3.5.0\0"
-              VALUE "ProductVersion", "1.3.4.0\0"
+              VALUE "ProductVersion", "1.3.5.0\0"
-              VALUE "CompileDate", "jueves, 25 de septiembre de 2008 18:49\0"
+              VALUE "CompileDate", "viernes, 26 de septiembre de 2008 15:25\0"
          END
     END
     BLOCK "VarFileInfo"