Campo SEPA, igual que bloqueado, para controlar a los clientes que han firmado el consentimiento SEPA, Campos GRUPO_CLIENTE (Marcas) que salga en la lista de cliente y TIPO_CLIENTE (Ocasional...) que también salga en lista de clientes

git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES2/trunk@199 b2cfbe5a-eba1-4a0c-8b32-7feea0a119f2

Build/Build.fbpInf

@@ -1,6 +1,6 @@
 <project ServerProjectName="">
   <watches/>
-  <collapsedNodes>{0F75D8EA-B6C2-4ECA-9E1E-45E235135301},{10527A84-0FB7-4007-9B23-9E5826133948},{154CD4CE-0F61-40F6-8CE6-CF525D3CFDCA},{282C2736-74F5-49C2-95D0-C1C4D359AEB2},{331AC851-CE2F-4986-9381-A257AB26B1AD},{3F8BEF26-5F4F-4B97-B1BC-118F36CBDD68},{4968AB21-B759-4F4A-9214-8792F67DA1E2},{4B038673-47F7-4436-BD07-D557FA62337E},{68D393D0-7234-4D5A-9D3A-A3FDC1593E55},{6C425F09-E04B-49EC-89E2-8C93D60E9055},{7251A871-CE6C-41D1-A404-735619825EAE},{816E4470-A0A2-4675-A270-7721426D4FD2},{856B4CEA-BF27-4696-8FFC-4507B6E29943},{A181C54F-9BE8-4404-9AB9-FEE8A9C3443D},{AD23CE23-8728-48FA-84FD-264E27BA8F46},{B70F0EA3-7874-42B0-BFB8-430D43AC2D61},{C662116C-EB3F-4161-A768-49D13B08EFE5},{CE990EA4-7660-4997-8CBF-6C6AA978753A},{E8E8671F-894B-4049-B4A6-905B57207637},{F2541E28-3C45-4A17-BEC5-185CBF9D2A90}</collapsedNodes>
+  <collapsedNodes>{0F75D8EA-B6C2-4ECA-9E1E-45E235135301},{10527A84-0FB7-4007-9B23-9E5826133948},{154CD4CE-0F61-40F6-8CE6-CF525D3CFDCA},{331AC851-CE2F-4986-9381-A257AB26B1AD},{3F8BEF26-5F4F-4B97-B1BC-118F36CBDD68},{4968AB21-B759-4F4A-9214-8792F67DA1E2},{4B038673-47F7-4436-BD07-D557FA62337E},{68D393D0-7234-4D5A-9D3A-A3FDC1593E55},{6C425F09-E04B-49EC-89E2-8C93D60E9055},{7251A871-CE6C-41D1-A404-735619825EAE},{789902B1-5E64-4FD9-80BF-6113B13BFE12},{856B4CEA-BF27-4696-8FFC-4507B6E29943},{A181C54F-9BE8-4404-9AB9-FEE8A9C3443D},{AD23CE23-8728-48FA-84FD-264E27BA8F46},{B70F0EA3-7874-42B0-BFB8-430D43AC2D61},{C662116C-EB3F-4161-A768-49D13B08EFE5},{CE990EA4-7660-4997-8CBF-6C6AA978753A},{E8E8671F-894B-4049-B4A6-905B57207637},{F2541E28-3C45-4A17-BEC5-185CBF9D2A90}</collapsedNodes>
   <breakpoints></breakpoints>
   <actions/>
   <propertysets/>
@@ -14,8 +14,8 @@
     <Notes>
       <![CDATA[]]>
     </Notes>
-    <LastBuildRun>00:00:01</LastBuildRun>
+    <LastBuildRun>00:04:03</LastBuildRun>
-    <LastBuildStart>30/08/2013 13:07:24</LastBuildStart>
+    <LastBuildStart>02/12/2013 13:45:23</LastBuildStart>
     <LastBuildState>True</LastBuildState>
   </properties>
 </project>

Database/scripts/factuges.sql

@@ -510,7 +510,8 @@ CREATE TABLE CLIENTES_DATOS (
     VENCIMIENTO_FACTURAS_2  SMALLINT,
     VENCIMIENTO_FACTURAS_3  SMALLINT,
     FELICITACION				  TIPO_BOOLEANO,
-    TIPO_CLIENTE            VARCHAR(255) COLLATE ES_ES
+    TIPO_CLIENTE            VARCHAR(255) COLLATE ES_ES,
+    SEPA                    TIPO_BOOLEANO DEFAULT 0 NOT NULL
 );
 
 CREATE TABLE CLIENTES_DTOS_PROVEEDORES (
@@ -1997,7 +1998,8 @@ CREATE VIEW V_CLIENTES(
     CODIGO_ASIGNADO,
     DESCUENTO,
     FELICITACION,
-    TIPO_CLIENTE)
+    TIPO_CLIENTE,
+    SEPA)
 AS
 SELECT
   V_CONTACTOS.ID,
@@ -2042,7 +2044,8 @@ SELECT
   CLIENTES_DATOS.CODIGO_ASIGNADO,
   CLIENTES_DATOS.DESCUENTO,
   CLIENTES_DATOS.FELICITACION,
-  CLIENTES_DATOS.TIPO_CLIENTE
+  CLIENTES_DATOS.TIPO_CLIENTE,
+  CLIENTES_DATOS.SEPA
 FROM
   V_CONTACTOS
   LEFT OUTER JOIN CLIENTES_DATOS ON (V_CONTACTOS.ID = CLIENTES_DATOS.ID_CLIENTE)

Source/ApplicationBase/uPlugins_Intf.pas

@@ -9,6 +9,7 @@ const
   MODULENAME_PEDIDOS_CLIENTE = 'PedidosCliente_plugin.bpl';
   MODULENAME_ALBARANES_CLIENTE = 'AlbaranesCliente_plugin.bpl';
   MODULENAME_FACTURAS_CLIENTE = 'FacturasCliente_plugin.bpl';
+  MODULENAME_FACTURAS_PROFORMA = 'FacturasProforma_plugin.bpl';
   MODULENAME_RECIBOS_CLIENTE = 'RecibosCliente_plugin.bpl';
 
   MODULENAME_PEDIDOS_PROVEEDOR = 'PedidosProveedor_plugin.bpl';
@@ -43,6 +44,12 @@ type
       const ANombreCliente : String = '');
   end;
 
+  IMCFacturasProforma = interface(IInterface)
+    ['{5B0F25E1-DAD9-42AD-9F8A-48756F910225}']
+    procedure VerFacturas(const ID_Cliente: Integer;
+      const ANombreCliente : String = '');
+  end;
+
   IMCRecibosCliente = interface(IInterface)
     ['{6535395A-1450-4E19-8031-F9CD3D062F6D}']
     procedure VerRecibos(const ID_Cliente: Integer;

Source/Cliente/uBootStrap.pas

@@ -39,6 +39,7 @@ begin
 
     LoadModule('RecibosCliente_plugin.bpl');
     LoadModule(MODULENAME_FACTURAS_CLIENTE);
+    LoadModule(MODULENAME_FACTURAS_PROFORMA);    
 
     LoadModule(MODULENAME_PEDIDOS_PROVEEDOR);
     LoadModule(MODULENAME_ALBARANES_PROVEEDOR);

Source/GUIBase/uViewTotales.dfm

@@ -1,9 +1,9 @@
 inherited frViewTotales: TfrViewTotales
-  Width = 451
+  Width = 772
-  Height = 252
+  Height = 368
   Align = alBottom
-  ExplicitWidth = 451
+  ExplicitWidth = 771
-  ExplicitHeight = 252
+  ExplicitHeight = 368
   object Bevel5: TBevel
     Left = 666
     Top = 109
@@ -15,8 +15,8 @@ inherited frViewTotales: TfrViewTotales
     AlignWithMargins = True
     Left = 0
     Top = 0
-    Width = 451
+    Width = 772
-    Height = 252
+    Height = 368
     Margins.Left = 0
     Margins.Top = 0
     Margins.Right = 0
@@ -26,22 +26,24 @@ inherited frViewTotales: TfrViewTotales
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
+    ExplicitWidth = 451
+    ExplicitHeight = 252
     object Bevel3: TBevel
-      Left = 305
+      Left = 394
       Top = 28
       Width = 3
       Height = 100
       Shape = bsRightLine
     end
     object Bevel4: TBevel
-      Left = 417
+      Left = 506
       Top = 70
       Width = 342
       Height = 9
       Shape = bsBottomLine
     end
     object Bevel1: TBevel
-      Left = 417
+      Left = 506
       Top = 186
       Width = 368
       Height = 9
@@ -90,7 +92,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 87
     end
     object ImporteIVA: TcxDBCurrencyEdit
-      Left = 488
+      Left = 577
       Top = 105
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_IVA'
@@ -125,7 +127,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 20
     end
     object ImporteTotal: TcxDBCurrencyEdit
-      Left = 418
+      Left = 507
       Top = 159
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_TOTAL'
@@ -195,7 +197,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 65
     end
     object edtIVA: TcxDBSpinEdit
-      Left = 417
+      Left = 506
       Top = 105
       AutoSize = False
       DataBinding.DataField = 'IVA'
@@ -236,7 +238,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 65
     end
     object ImporteBase: TcxDBCurrencyEdit
-      Left = 417
+      Left = 506
       Top = 28
       AutoSize = False
       DataBinding.DataField = 'BASE_IMPONIBLE'
@@ -271,7 +273,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 91
     end
     object edtRE: TcxDBSpinEdit
-      Left = 417
+      Left = 506
       Top = 132
       AutoSize = False
       DataBinding.DataField = 'RE'
@@ -312,7 +314,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 65
     end
     object ImporteRE: TcxDBCurrencyEdit
-      Left = 488
+      Left = 577
       Top = 132
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_RE'
@@ -450,7 +452,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 20
     end
     object bTiposIVA: TButton
-      Left = 157
+      Left = 246
       Top = 109
       Width = 132
       Height = 21
@@ -488,7 +490,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 221
     end
     object edtRetencion: TcxDBSpinEdit
-      Left = 417
+      Left = 506
       Top = 206
       AutoSize = False
       DataBinding.DataSource = DADataSource
@@ -527,7 +529,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 65
     end
     object edtImporteRetencion: TcxDBCurrencyEdit
-      Left = 488
+      Left = 577
       Top = 206
       AutoSize = False
       DataBinding.DataSource = DADataSource

Source/Modulos/Contactos/Data/uDataModuleClientes.dfm

@@ -286,6 +286,10 @@ inherited DataModuleClientes: TDataModuleClientes
         Name = 'TIPO_CLIENTE'
         DataType = datString
         Size = 255
+      end
+      item
+        Name = 'SEPA'
+        DataType = datSmallInt
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]

Source/Modulos/Contactos/Model/schContactosClient_Intf.pas

@@ -3,34 +3,34 @@ unit schContactosClient_Intf;
 interface
 
 uses
-  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
 
 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_Contactos = '{FC98FC9D-2174-484A-84DB-29A5FF522A49}';
+  RID_Contactos = '{FBD2AAD5-CF1A-4748-AB85-1C366E1895C6}';
-  RID_GruposCliente = '{FAE5A018-A73D-4F40-BC2B-D43431C80929}';
+  RID_GruposCliente = '{64DAFBB8-1672-4851-ABE6-92C49E8D4B57}';
-  RID_DatosBancarios = '{204762D1-0752-48E4-8D13-73A6E478ABC2}';
+  RID_DatosBancarios = '{2E0FD9E5-4DC4-4D5F-91FD-8A75BFB2C591}';
-  RID_Clientes = '{9BE4C879-165C-4D3F-9BBA-526B77860B3F}';
+  RID_Clientes = '{3F3959CA-7FFD-4204-84C6-EB72686D1339}';
-  RID_Proveedores = '{7B7762CE-6B42-4B50-A194-78BE5FFB71E5}';
+  RID_Proveedores = '{E13E8932-AD15-4517-BF6B-A35E99F15143}';
-  RID_Empleados = '{0B610962-07D1-4C7D-BC7B-65AC8824DDC4}';
+  RID_Empleados = '{5DEB85DB-8DFA-4F47-ABA8-073D22019702}';
-  RID_DireccionesContacto = '{68C042FD-68F6-440A-B10F-0314491B1100}';
+  RID_DireccionesContacto = '{703AD49B-BC88-40BF-A334-D8E36692A73F}';
-  RID_ClientesDescuentos = '{845D6324-B528-4907-923D-7A1E0517F59A}';
+  RID_ClientesDescuentos = '{4B4343F6-C4F9-4227-B5D5-732793C9E4FD}';
-  RID_GruposProveedor = '{B5573F10-E1CB-400B-8595-F5E7E6812CAE}';
+  RID_GruposProveedor = '{50BEB5B1-18D2-4964-80CA-A6348F1399CF}';
-  RID_GruposEmpleado = '{6EF2382C-65F9-4429-8EFE-7BBE4F35FEED}';
+  RID_GruposEmpleado = '{F38B7EB9-A2EF-4855-8477-74812BF2A5A4}';
-  RID_Contactos_Refresh = '{5A18AE89-0712-468F-A606-94C4B8BBF4DE}';
+  RID_Contactos_Refresh = '{D4220A4F-12DF-48CD-A3FE-719ED1F87AE2}';
-  RID_ContratosEmpleados = '{D4DDC2BA-74CF-4EBC-AEF9-476BDE3FDFE7}';
+  RID_ContratosEmpleados = '{E24AE0CB-F240-457B-BB39-24AC9127A589}';
-  RID_DescripcionesProveedores = '{8F5E1C48-6D57-4DBB-9621-EEEF38163532}';
+  RID_DescripcionesProveedores = '{D7A82072-1797-4B0A-BD79-0CC63702D713}';
-  RID_PersonalContacto = '{8CBD048B-EEF4-46F3-A027-B66E39125D87}';
+  RID_PersonalContacto = '{EAA43A4E-003C-46CC-B819-66F5841B103D}';
-  RID_Agentes_Comisiones = '{3FEA025A-89BF-4B2F-84DB-29BECC676846}';
+  RID_Agentes_Comisiones = '{88CEF29A-906A-4A8B-9096-E6E403B4D87D}';
-  RID_ListaAnosObjetivosAlb = '{67328F62-088C-4B54-A4EA-256CEAEE2D1A}';
+  RID_ListaAnosObjetivosAlb = '{FB89CCC3-56B0-43FC-91FA-358CC0874438}';
-  RID_Agentes = '{8F775E20-FF8D-4966-94D4-CAA4B3EDE612}';
+  RID_Agentes = '{4EE3484F-6FAA-49B9-973C-A48CE905A97C}';
-  RID_ClientesDescuentosArticulos = '{5A7F7F18-FFC7-4BBD-9632-0EF2C3A855C9}';
+  RID_ClientesDescuentosArticulos = '{DEED0FE2-E7BF-433F-80AA-6DB119277D32}';
-  RID_Agentes_Objetivos_albaranes = '{6C51A34C-790F-477E-8F90-341B0FE11746}';
+  RID_Agentes_Objetivos_albaranes = '{36E5577F-660B-474E-AFFA-C43D241CB818}';
-  RID_Agentes_Objetivos_facturas = '{F8E77A40-78F2-44F5-BA10-4DA0BF8FE0CE}';
+  RID_Agentes_Objetivos_facturas = '{97B80D0A-D948-4E06-A9DA-6ABBEE918407}';
-  RID_ListaAnosObjetivosFac = '{4A823B2D-CD57-404E-A7DD-587779C21C84}';
+  RID_ListaAnosObjetivosFac = '{928DF566-75F5-48D6-8711-36C9ECEAEE39}';
-  RID_TiposCliente = '{E6135AF1-7B14-4726-979D-7DDC74BFB4D2}';
+  RID_TiposCliente = '{EBFA5662-8619-447E-98AC-FB6C89A2E6E4}';
 
   { Data table names }
   nme_Contactos = 'Contactos';
@@ -180,6 +180,7 @@ const
   fld_ClientesDESCUENTO = 'DESCUENTO';
   fld_ClientesFELICITACION = 'FELICITACION';
   fld_ClientesTIPO_CLIENTE = 'TIPO_CLIENTE';
+  fld_ClientesSEPA = 'SEPA';
 
   { Clientes field indexes }
   idx_ClientesID = 0;
@@ -225,6 +226,7 @@ const
   idx_ClientesDESCUENTO = 40;
   idx_ClientesFELICITACION = 41;
   idx_ClientesTIPO_CLIENTE = 42;
+  idx_ClientesSEPA = 43;
 
   { Proveedores fields }
   fld_ProveedoresID = 'ID';
@@ -679,7 +681,7 @@ const
 type
   { IContactos }
   IContactos = interface(IDAStronglyTypedDataTable)
-  ['{DFDDB687-2921-467A-BB23-198E5B922F84}']
+  ['{1AD56C50-FF1F-4BE0-98F8-DE3D848998CC}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -824,7 +826,7 @@ type
   end;
 
   { TContactosDataTableRules }
-  TContactosDataTableRules = class(TIntfObjectDADataTableRules, IContactos)
+  TContactosDataTableRules = class(TDADataTableRules, IContactos)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -978,7 +980,7 @@ type
 
   { IGruposCliente }
   IGruposCliente = interface(IDAStronglyTypedDataTable)
-  ['{1AE838BB-826E-4CA2-AAA1-D6049D08A77B}']
+  ['{88033175-AF9C-486C-8368-9CACE26FEC08}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -998,7 +1000,7 @@ type
   end;
 
   { TGruposClienteDataTableRules }
-  TGruposClienteDataTableRules = class(TIntfObjectDADataTableRules, IGruposCliente)
+  TGruposClienteDataTableRules = class(TDADataTableRules, IGruposCliente)
   private
   protected
     { Property getters and setters }
@@ -1025,7 +1027,7 @@ type
 
   { IDatosBancarios }
   IDatosBancarios = interface(IDAStronglyTypedDataTable)
-  ['{AEB463FE-AD2E-442F-BAAB-D8AD664AC39D}']
+  ['{2EA42D35-6139-4E19-B604-7D184E77D6BE}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1087,7 +1089,7 @@ type
   end;
 
   { TDatosBancariosDataTableRules }
-  TDatosBancariosDataTableRules = class(TIntfObjectDADataTableRules, IDatosBancarios)
+  TDatosBancariosDataTableRules = class(TDADataTableRules, IDatosBancarios)
   private
   protected
     { Property getters and setters }
@@ -1156,7 +1158,7 @@ type
 
   { IClientes }
   IClientes = interface(IDAStronglyTypedDataTable)
-  ['{4F9EC316-7AC6-4C71-968A-5BAA61CAFCA4}']
+  ['{032412C7-385C-43AC-A778-915178DFA8C2}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1329,6 +1331,10 @@ type
     procedure SetTIPO_CLIENTEValue(const aValue: String);
     function GetTIPO_CLIENTEIsNull: Boolean;
     procedure SetTIPO_CLIENTEIsNull(const aValue: Boolean);
+    function GetSEPAValue: SmallInt;
+    procedure SetSEPAValue(const aValue: SmallInt);
+    function GetSEPAIsNull: Boolean;
+    procedure SetSEPAIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -1418,10 +1424,12 @@ type
     property FELICITACIONIsNull: Boolean read GetFELICITACIONIsNull write SetFELICITACIONIsNull;
     property TIPO_CLIENTE: String read GetTIPO_CLIENTEValue write SetTIPO_CLIENTEValue;
     property TIPO_CLIENTEIsNull: Boolean read GetTIPO_CLIENTEIsNull write SetTIPO_CLIENTEIsNull;
+    property SEPA: SmallInt read GetSEPAValue write SetSEPAValue;
+    property SEPAIsNull: Boolean read GetSEPAIsNull write SetSEPAIsNull;
   end;
 
   { TClientesDataTableRules }
-  TClientesDataTableRules = class(TIntfObjectDADataTableRules, IClientes)
+  TClientesDataTableRules = class(TDADataTableRules, IClientes)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -1598,6 +1606,10 @@ type
     procedure SetTIPO_CLIENTEValue(const aValue: String); virtual;
     function GetTIPO_CLIENTEIsNull: Boolean; virtual;
     procedure SetTIPO_CLIENTEIsNull(const aValue: Boolean); virtual;
+    function GetSEPAValue: SmallInt; virtual;
+    procedure SetSEPAValue(const aValue: SmallInt); virtual;
+    function GetSEPAIsNull: Boolean; virtual;
+    procedure SetSEPAIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -1686,6 +1698,8 @@ type
     property FELICITACIONIsNull: Boolean read GetFELICITACIONIsNull write SetFELICITACIONIsNull;
     property TIPO_CLIENTE: String read GetTIPO_CLIENTEValue write SetTIPO_CLIENTEValue;
     property TIPO_CLIENTEIsNull: Boolean read GetTIPO_CLIENTEIsNull write SetTIPO_CLIENTEIsNull;
+    property SEPA: SmallInt read GetSEPAValue write SetSEPAValue;
+    property SEPAIsNull: Boolean read GetSEPAIsNull write SetSEPAIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -1695,7 +1709,7 @@ type
 
   { IProveedores }
   IProveedores = interface(IDAStronglyTypedDataTable)
-  ['{62DCC209-287A-4380-8D4B-83913824D08F}']
+  ['{C0661B3D-7908-4A22-9C90-299A4A8214A7}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1936,7 +1950,7 @@ type
   end;
 
   { TProveedoresDataTableRules }
-  TProveedoresDataTableRules = class(TIntfObjectDADataTableRules, IProveedores)
+  TProveedoresDataTableRules = class(TDADataTableRules, IProveedores)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -2186,7 +2200,7 @@ type
 
   { IEmpleados }
   IEmpleados = interface(IDAStronglyTypedDataTable)
-  ['{A5050F92-4FC8-4B4F-BCFF-7BBA2CB4EDEE}']
+  ['{6C3AFA58-13CD-451A-8F67-583E41E567BB}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2393,7 +2407,7 @@ type
   end;
 
   { TEmpleadosDataTableRules }
-  TEmpleadosDataTableRules = class(TIntfObjectDADataTableRules, IEmpleados)
+  TEmpleadosDataTableRules = class(TDADataTableRules, IEmpleados)
   private
     f_NOTAS: IROStrings;
     f_FORMACION_BASE: IROStrings;
@@ -2617,7 +2631,7 @@ type
 
   { IDireccionesContacto }
   IDireccionesContacto = interface(IDAStronglyTypedDataTable)
-  ['{907598A0-83B2-4A54-A19D-82FF0656D8F8}']
+  ['{584BA328-3C52-4F73-9680-8E8879730929}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2720,7 +2734,7 @@ type
   end;
 
   { TDireccionesContactoDataTableRules }
-  TDireccionesContactoDataTableRules = class(TIntfObjectDADataTableRules, IDireccionesContacto)
+  TDireccionesContactoDataTableRules = class(TDADataTableRules, IDireccionesContacto)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -2832,7 +2846,7 @@ type
 
   { IClientesDescuentos }
   IClientesDescuentos = interface(IDAStronglyTypedDataTable)
-  ['{C7856FE7-0714-4949-B67D-882FFB8DC44E}']
+  ['{8FC11078-DE4A-4FBF-9741-934A72DC7963}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2870,7 +2884,7 @@ type
   end;
 
   { TClientesDescuentosDataTableRules }
-  TClientesDescuentosDataTableRules = class(TIntfObjectDADataTableRules, IClientesDescuentos)
+  TClientesDescuentosDataTableRules = class(TDADataTableRules, IClientesDescuentos)
   private
   protected
     { Property getters and setters }
@@ -2915,7 +2929,7 @@ type
 
   { IGruposProveedor }
   IGruposProveedor = interface(IDAStronglyTypedDataTable)
-  ['{3B8825BB-FF71-47C9-A232-E0931855228A}']
+  ['{B8B9E5C6-E8D8-40FC-A541-1CA958F216A7}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2935,7 +2949,7 @@ type
   end;
 
   { TGruposProveedorDataTableRules }
-  TGruposProveedorDataTableRules = class(TIntfObjectDADataTableRules, IGruposProveedor)
+  TGruposProveedorDataTableRules = class(TDADataTableRules, IGruposProveedor)
   private
   protected
     { Property getters and setters }
@@ -2962,7 +2976,7 @@ type
 
   { IGruposEmpleado }
   IGruposEmpleado = interface(IDAStronglyTypedDataTable)
-  ['{F6D330DB-5908-4E6C-9063-62CDA0A13EF7}']
+  ['{0DC9C834-D9D9-4AB1-A9C6-1EE5DA73A9B6}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2982,7 +2996,7 @@ type
   end;
 
   { TGruposEmpleadoDataTableRules }
-  TGruposEmpleadoDataTableRules = class(TIntfObjectDADataTableRules, IGruposEmpleado)
+  TGruposEmpleadoDataTableRules = class(TDADataTableRules, IGruposEmpleado)
   private
   protected
     { Property getters and setters }
@@ -3009,7 +3023,7 @@ type
 
   { IContactos_Refresh }
   IContactos_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{DA718CA5-E280-45E1-A143-299A9CCCE433}']
+  ['{E118F78A-B03F-4BC1-99E2-711BF84051E5}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -3142,7 +3156,7 @@ type
   end;
 
   { TContactos_RefreshDataTableRules }
-  TContactos_RefreshDataTableRules = class(TIntfObjectDADataTableRules, IContactos_Refresh)
+  TContactos_RefreshDataTableRules = class(TDADataTableRules, IContactos_Refresh)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -3284,7 +3298,7 @@ type
 
   { IContratosEmpleados }
   IContratosEmpleados = interface(IDAStronglyTypedDataTable)
-  ['{137AAE38-80D8-469E-AD22-9627330E7B2F}']
+  ['{8E2C915C-BF70-4136-8B6A-1684095B7BC0}']
     { Property getters and setters }
     function GetCONTRATOValue: String;
     procedure SetCONTRATOValue(const aValue: String);
@@ -3298,7 +3312,7 @@ type
   end;
 
   { TContratosEmpleadosDataTableRules }
-  TContratosEmpleadosDataTableRules = class(TIntfObjectDADataTableRules, IContratosEmpleados)
+  TContratosEmpleadosDataTableRules = class(TDADataTableRules, IContratosEmpleados)
   private
   protected
     { Property getters and setters }
@@ -3319,7 +3333,7 @@ type
 
   { IDescripcionesProveedores }
   IDescripcionesProveedores = interface(IDAStronglyTypedDataTable)
-  ['{8172171A-10E0-409A-8E0B-D5D9365ABB23}']
+  ['{4717E1AA-49F0-4492-9086-311919DB6829}']
     { Property getters and setters }
     function GetDESCRIPCION_PROVEEDORValue: String;
     procedure SetDESCRIPCION_PROVEEDORValue(const aValue: String);
@@ -3333,7 +3347,7 @@ type
   end;
 
   { TDescripcionesProveedoresDataTableRules }
-  TDescripcionesProveedoresDataTableRules = class(TIntfObjectDADataTableRules, IDescripcionesProveedores)
+  TDescripcionesProveedoresDataTableRules = class(TDADataTableRules, IDescripcionesProveedores)
   private
   protected
     { Property getters and setters }
@@ -3354,7 +3368,7 @@ type
 
   { IPersonalContacto }
   IPersonalContacto = interface(IDAStronglyTypedDataTable)
-  ['{02E89BFD-3160-4164-BF61-221FF595CB3A}']
+  ['{FD93D978-23A4-4927-9BA6-B940CCC50F79}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -3422,7 +3436,7 @@ type
   end;
 
   { TPersonalContactoDataTableRules }
-  TPersonalContactoDataTableRules = class(TIntfObjectDADataTableRules, IPersonalContacto)
+  TPersonalContactoDataTableRules = class(TDADataTableRules, IPersonalContacto)
   private
   protected
     { Property getters and setters }
@@ -3497,7 +3511,7 @@ type
 
   { IAgentes_Comisiones }
   IAgentes_Comisiones = interface(IDAStronglyTypedDataTable)
-  ['{B2B154B4-F8DA-46FB-A06F-5000849254F6}']
+  ['{76DECC2C-AB59-47F6-988B-62080DA3ED75}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -3535,7 +3549,7 @@ type
   end;
 
   { TAgentes_ComisionesDataTableRules }
-  TAgentes_ComisionesDataTableRules = class(TIntfObjectDADataTableRules, IAgentes_Comisiones)
+  TAgentes_ComisionesDataTableRules = class(TDADataTableRules, IAgentes_Comisiones)
   private
   protected
     { Property getters and setters }
@@ -3580,7 +3594,7 @@ type
 
   { IListaAnosObjetivosAlb }
   IListaAnosObjetivosAlb = interface(IDAStronglyTypedDataTable)
-  ['{53124C57-F091-4204-AD95-FB2195C92120}']
+  ['{D05374C6-E73E-4782-974E-CAEEDC99B4E6}']
     { Property getters and setters }
     function GetANOValue: SmallInt;
     procedure SetANOValue(const aValue: SmallInt);
@@ -3594,7 +3608,7 @@ type
   end;
 
   { TListaAnosObjetivosAlbDataTableRules }
-  TListaAnosObjetivosAlbDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosObjetivosAlb)
+  TListaAnosObjetivosAlbDataTableRules = class(TDADataTableRules, IListaAnosObjetivosAlb)
   private
   protected
     { Property getters and setters }
@@ -3615,7 +3629,7 @@ type
 
   { IAgentes }
   IAgentes = interface(IDAStronglyTypedDataTable)
-  ['{535CB005-A65B-46CB-9265-8D882CF9BC29}']
+  ['{B84D0431-CF66-4A7E-A111-D528F18DF697}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -3778,7 +3792,7 @@ type
   end;
 
   { TAgentesDataTableRules }
-  TAgentesDataTableRules = class(TIntfObjectDADataTableRules, IAgentes)
+  TAgentesDataTableRules = class(TDADataTableRules, IAgentes)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -3950,7 +3964,7 @@ type
 
   { IClientesDescuentosArticulos }
   IClientesDescuentosArticulos = interface(IDAStronglyTypedDataTable)
-  ['{BF0D2DCF-FE11-4DB2-8860-5234FD2EA0B4}']
+  ['{BFD9569E-95ED-4789-9A0E-B909E2EE092A}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -4012,7 +4026,7 @@ type
   end;
 
   { TClientesDescuentosArticulosDataTableRules }
-  TClientesDescuentosArticulosDataTableRules = class(TIntfObjectDADataTableRules, IClientesDescuentosArticulos)
+  TClientesDescuentosArticulosDataTableRules = class(TDADataTableRules, IClientesDescuentosArticulos)
   private
   protected
     { Property getters and setters }
@@ -4081,7 +4095,7 @@ type
 
   { IAgentes_Objetivos_albaranes }
   IAgentes_Objetivos_albaranes = interface(IDAStronglyTypedDataTable)
-  ['{A4F09DDA-8A26-4DA2-925F-EE02B2E6D290}']
+  ['{86C7C651-E96D-4EFD-91CD-C079A43A27A4}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -4131,7 +4145,7 @@ type
   end;
 
   { TAgentes_Objetivos_albaranesDataTableRules }
-  TAgentes_Objetivos_albaranesDataTableRules = class(TIntfObjectDADataTableRules, IAgentes_Objetivos_albaranes)
+  TAgentes_Objetivos_albaranesDataTableRules = class(TDADataTableRules, IAgentes_Objetivos_albaranes)
   private
   protected
     { Property getters and setters }
@@ -4188,7 +4202,7 @@ type
 
   { IAgentes_Objetivos_facturas }
   IAgentes_Objetivos_facturas = interface(IDAStronglyTypedDataTable)
-  ['{F0B134F6-AE87-4835-B443-997AD16988DB}']
+  ['{17DFBC0C-4204-4DC1-809F-C11A91125D98}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -4238,7 +4252,7 @@ type
   end;
 
   { TAgentes_Objetivos_facturasDataTableRules }
-  TAgentes_Objetivos_facturasDataTableRules = class(TIntfObjectDADataTableRules, IAgentes_Objetivos_facturas)
+  TAgentes_Objetivos_facturasDataTableRules = class(TDADataTableRules, IAgentes_Objetivos_facturas)
   private
   protected
     { Property getters and setters }
@@ -4295,7 +4309,7 @@ type
 
   { IListaAnosObjetivosFac }
   IListaAnosObjetivosFac = interface(IDAStronglyTypedDataTable)
-  ['{E2EB26D2-2409-4320-AF04-A0A4834E1D84}']
+  ['{AB67A2D7-D4FF-47E1-9EE1-493C4D3A2EAD}']
     { Property getters and setters }
     function GetANOValue: SmallInt;
     procedure SetANOValue(const aValue: SmallInt);
@@ -4309,7 +4323,7 @@ type
   end;
 
   { TListaAnosObjetivosFacDataTableRules }
-  TListaAnosObjetivosFacDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosObjetivosFac)
+  TListaAnosObjetivosFacDataTableRules = class(TDADataTableRules, IListaAnosObjetivosFac)
   private
   protected
     { Property getters and setters }
@@ -4330,7 +4344,7 @@ type
 
   { ITiposCliente }
   ITiposCliente = interface(IDAStronglyTypedDataTable)
-  ['{C44A4DE6-41B4-436D-9CA7-7165BD25595A}']
+  ['{517D7479-E97F-4BBE-BEA1-0980F1344B2C}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -4350,7 +4364,7 @@ type
   end;
 
   { TTiposClienteDataTableRules }
-  TTiposClienteDataTableRules = class(TIntfObjectDADataTableRules, ITiposCliente)
+  TTiposClienteDataTableRules = class(TDADataTableRules, ITiposCliente)
   private
   protected
     { Property getters and setters }
@@ -6057,6 +6071,27 @@ begin
     DataTable.Fields[idx_ClientesTIPO_CLIENTE].AsVariant := Null;
 end;
 
+function TClientesDataTableRules.GetSEPAValue: SmallInt;
+begin
+  result := DataTable.Fields[idx_ClientesSEPA].AsSmallInt;
+end;
+
+procedure TClientesDataTableRules.SetSEPAValue(const aValue: SmallInt);
+begin
+  DataTable.Fields[idx_ClientesSEPA].AsSmallInt := aValue;
+end;
+
+function TClientesDataTableRules.GetSEPAIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ClientesSEPA].IsNull;
+end;
+
+procedure TClientesDataTableRules.SetSEPAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ClientesSEPA].AsVariant := Null;
+end;
+
 
 { TProveedoresDataTableRules }
 constructor TProveedoresDataTableRules.Create(aDataTable: TDADataTable);

Source/Modulos/Contactos/Model/schContactosServer_Intf.pas

@@ -9,33 +9,33 @@ 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_ContactosDelta = '{0D14A3EF-8221-4271-BB6E-C28975FF9384}';
+  RID_ContactosDelta = '{79676E3A-28FD-48E7-A1FF-E754E103F801}';
-  RID_GruposClienteDelta = '{A90F7994-1ABF-4A46-8CD2-1397FA5FA695}';
+  RID_GruposClienteDelta = '{53603EC3-5239-471B-9478-3E20BC31F3D6}';
-  RID_DatosBancariosDelta = '{9137AF65-F02A-46E3-8E69-439A2138AEDA}';
+  RID_DatosBancariosDelta = '{1591F7B3-141B-49A9-B540-A8FEBED5226B}';
-  RID_ClientesDelta = '{AE74F38D-EC62-478C-9009-91DFA765C1BA}';
+  RID_ClientesDelta = '{05CD6380-6399-4281-8E9F-6732C67A63DE}';
-  RID_ProveedoresDelta = '{007E9A07-B1B7-449A-88D5-E230A1268906}';
+  RID_ProveedoresDelta = '{8E9CE42F-5FE9-4E9F-AE52-19B803809EA5}';
-  RID_EmpleadosDelta = '{E44640BF-985F-493D-9681-A58B1E9C5048}';
+  RID_EmpleadosDelta = '{D5D65099-1A31-4207-84AC-F4DA6A43592A}';
-  RID_DireccionesContactoDelta = '{CD29AE32-0F09-43B0-BD60-0BABB4F28F91}';
+  RID_DireccionesContactoDelta = '{0ED25D53-DE46-4E8A-9308-93B211FBF15B}';
-  RID_ClientesDescuentosDelta = '{95022EA1-5BE2-4708-BA5B-77536F57D331}';
+  RID_ClientesDescuentosDelta = '{C97901CD-8DD8-49FB-8BFB-7074517E322D}';
-  RID_GruposProveedorDelta = '{0ABA7E39-36B3-44E2-B3E1-8BFF6D38B7CA}';
+  RID_GruposProveedorDelta = '{9F6338E6-59A2-40C8-BC9D-23C178FC2160}';
-  RID_GruposEmpleadoDelta = '{6BD3D176-0D39-439D-8782-8F79DC7C2C90}';
+  RID_GruposEmpleadoDelta = '{78EEEB9B-70B4-4D54-8B5B-0C7237FCAB40}';
-  RID_Contactos_RefreshDelta = '{2FA063C0-9DCA-4BF6-A9A7-FD4D319ECF88}';
+  RID_Contactos_RefreshDelta = '{7AC13450-107B-4B2D-8284-9DA3F9723729}';
-  RID_ContratosEmpleadosDelta = '{D0F4C06F-1363-49E5-8094-158E6E33781A}';
+  RID_ContratosEmpleadosDelta = '{55C48082-E644-4561-88C8-A7825F0FA31F}';
-  RID_DescripcionesProveedoresDelta = '{30864B1C-279D-4203-95F3-38A1D42044E0}';
+  RID_DescripcionesProveedoresDelta = '{80E685C5-AB20-4EBE-B7D4-500C29E4312C}';
-  RID_PersonalContactoDelta = '{E60BCF43-0FAA-4EF1-BD68-0BC8328AE3A9}';
+  RID_PersonalContactoDelta = '{02EF5E3B-5A4E-4F52-B801-8999B48F9CBE}';
-  RID_Agentes_ComisionesDelta = '{A4522C74-DA90-4B25-9757-FC901C4297C0}';
+  RID_Agentes_ComisionesDelta = '{6FE9C733-D4D6-4375-ADD0-A78267946BED}';
-  RID_ListaAnosObjetivosAlbDelta = '{2D43A4A9-A60F-4847-90D8-506A9E438E8F}';
+  RID_ListaAnosObjetivosAlbDelta = '{10F3BE6F-702C-4D7D-A9DD-D07185F39A7F}';
-  RID_AgentesDelta = '{B0FC98F6-07E3-4186-ACF7-4525A8B771C7}';
+  RID_AgentesDelta = '{BEB2E149-7144-4704-B83C-1F534413A927}';
-  RID_ClientesDescuentosArticulosDelta = '{FC2F2307-6B92-4C15-BDC7-5A140CBF00F0}';
+  RID_ClientesDescuentosArticulosDelta = '{49A3CDFA-BD96-4B3E-BE40-B3E2E17E9958}';
-  RID_Agentes_Objetivos_albaranesDelta = '{BF428235-7C8E-4ABB-B20A-4CAD58BD98EC}';
+  RID_Agentes_Objetivos_albaranesDelta = '{59BCD74F-1F68-4931-87CD-D630E334C36A}';
-  RID_Agentes_Objetivos_facturasDelta = '{BC496438-46AC-4530-83E8-558F3ACDFB57}';
+  RID_Agentes_Objetivos_facturasDelta = '{6ABCD9E8-ACCD-4EE7-836E-C3D09BB71907}';
-  RID_ListaAnosObjetivosFacDelta = '{292DE1F7-DE87-44ED-AB50-050BC49C8CB1}';
+  RID_ListaAnosObjetivosFacDelta = '{DA75406A-C26B-473D-91D8-6864A41AF5EE}';
-  RID_TiposClienteDelta = '{FA885475-ECC3-45C8-BF6B-DBE4E19F6C00}';
+  RID_TiposClienteDelta = '{1FDEE269-2D12-4DDA-9AA9-D9BF6461CA29}';
 
 type
   { IContactosDelta }
   IContactosDelta = interface(IContactos)
-  ['{0D14A3EF-8221-4271-BB6E-C28975FF9384}']
+  ['{79676E3A-28FD-48E7-A1FF-E754E103F801}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -334,7 +334,7 @@ type
 
   { IGruposClienteDelta }
   IGruposClienteDelta = interface(IGruposCliente)
-  ['{A90F7994-1ABF-4A46-8CD2-1397FA5FA695}']
+  ['{53603EC3-5239-471B-9478-3E20BC31F3D6}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -380,7 +380,7 @@ type
 
   { IDatosBancariosDelta }
   IDatosBancariosDelta = interface(IDatosBancarios)
-  ['{9137AF65-F02A-46E3-8E69-439A2138AEDA}']
+  ['{1591F7B3-141B-49A9-B540-A8FEBED5226B}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -510,7 +510,7 @@ type
 
   { IClientesDelta }
   IClientesDelta = interface(IClientes)
-  ['{AE74F38D-EC62-478C-9009-91DFA765C1BA}']
+  ['{05CD6380-6399-4281-8E9F-6732C67A63DE}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -555,6 +555,7 @@ type
     function GetOldDESCUENTOValue : Float;
     function GetOldFELICITACIONValue : SmallInt;
     function GetOldTIPO_CLIENTEValue : String;
+    function GetOldSEPAValue : SmallInt;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -600,6 +601,7 @@ type
     property OldDESCUENTO : Float read GetOldDESCUENTOValue;
     property OldFELICITACION : SmallInt read GetOldFELICITACIONValue;
     property OldTIPO_CLIENTE : String read GetOldTIPO_CLIENTEValue;
+    property OldSEPA : SmallInt read GetOldSEPAValue;
   end;
 
   { TClientesBusinessProcessorRules }
@@ -866,6 +868,12 @@ type
     function GetOldTIPO_CLIENTEIsNull: Boolean; virtual;
     procedure SetTIPO_CLIENTEValue(const aValue: String); virtual;
     procedure SetTIPO_CLIENTEIsNull(const aValue: Boolean); virtual;
+    function GetSEPAValue: SmallInt; virtual;
+    function GetSEPAIsNull: Boolean; virtual;
+    function GetOldSEPAValue: SmallInt; virtual;
+    function GetOldSEPAIsNull: Boolean; virtual;
+    procedure SetSEPAValue(const aValue: SmallInt); virtual;
+    procedure SetSEPAIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -1040,6 +1048,10 @@ type
     property TIPO_CLIENTEIsNull : Boolean read GetTIPO_CLIENTEIsNull write SetTIPO_CLIENTEIsNull;
     property OldTIPO_CLIENTE : String read GetOldTIPO_CLIENTEValue;
     property OldTIPO_CLIENTEIsNull : Boolean read GetOldTIPO_CLIENTEIsNull;
+    property SEPA : SmallInt read GetSEPAValue write SetSEPAValue;
+    property SEPAIsNull : Boolean read GetSEPAIsNull write SetSEPAIsNull;
+    property OldSEPA : SmallInt read GetOldSEPAValue;
+    property OldSEPAIsNull : Boolean read GetOldSEPAIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -1049,7 +1061,7 @@ type
 
   { IProveedoresDelta }
   IProveedoresDelta = interface(IProveedores)
-  ['{007E9A07-B1B7-449A-88D5-E230A1268906}']
+  ['{8E9CE42F-5FE9-4E9F-AE52-19B803809EA5}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -1540,7 +1552,7 @@ type
 
   { IEmpleadosDelta }
   IEmpleadosDelta = interface(IEmpleados)
-  ['{E44640BF-985F-493D-9681-A58B1E9C5048}']
+  ['{D5D65099-1A31-4207-84AC-F4DA6A43592A}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -1975,7 +1987,7 @@ type
 
   { IDireccionesContactoDelta }
   IDireccionesContactoDelta = interface(IDireccionesContacto)
-  ['{CD29AE32-0F09-43B0-BD60-0BABB4F28F91}']
+  ['{0ED25D53-DE46-4E8A-9308-93B211FBF15B}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -2190,7 +2202,7 @@ type
 
   { IClientesDescuentosDelta }
   IClientesDescuentosDelta = interface(IClientesDescuentos)
-  ['{95022EA1-5BE2-4708-BA5B-77536F57D331}']
+  ['{C97901CD-8DD8-49FB-8BFB-7074517E322D}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CLIENTEValue : Integer;
@@ -2272,7 +2284,7 @@ type
 
   { IGruposProveedorDelta }
   IGruposProveedorDelta = interface(IGruposProveedor)
-  ['{0ABA7E39-36B3-44E2-B3E1-8BFF6D38B7CA}']
+  ['{9F6338E6-59A2-40C8-BC9D-23C178FC2160}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -2318,7 +2330,7 @@ type
 
   { IGruposEmpleadoDelta }
   IGruposEmpleadoDelta = interface(IGruposEmpleado)
-  ['{6BD3D176-0D39-439D-8782-8F79DC7C2C90}']
+  ['{78EEEB9B-70B4-4D54-8B5B-0C7237FCAB40}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -2364,7 +2376,7 @@ type
 
   { IContactos_RefreshDelta }
   IContactos_RefreshDelta = interface(IContactos_Refresh)
-  ['{2FA063C0-9DCA-4BF6-A9A7-FD4D319ECF88}']
+  ['{7AC13450-107B-4B2D-8284-9DA3F9723729}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldNIF_CIFValue : String;
@@ -2639,7 +2651,7 @@ type
 
   { IContratosEmpleadosDelta }
   IContratosEmpleadosDelta = interface(IContratosEmpleados)
-  ['{D0F4C06F-1363-49E5-8094-158E6E33781A}']
+  ['{55C48082-E644-4561-88C8-A7825F0FA31F}']
     { Property getters and setters }
     function GetOldCONTRATOValue : String;
 
@@ -2673,7 +2685,7 @@ type
 
   { IDescripcionesProveedoresDelta }
   IDescripcionesProveedoresDelta = interface(IDescripcionesProveedores)
-  ['{30864B1C-279D-4203-95F3-38A1D42044E0}']
+  ['{80E685C5-AB20-4EBE-B7D4-500C29E4312C}']
     { Property getters and setters }
     function GetOldDESCRIPCION_PROVEEDORValue : String;
 
@@ -2707,7 +2719,7 @@ type
 
   { IPersonalContactoDelta }
   IPersonalContactoDelta = interface(IPersonalContacto)
-  ['{E60BCF43-0FAA-4EF1-BD68-0BC8328AE3A9}']
+  ['{02EF5E3B-5A4E-4F52-B801-8999B48F9CBE}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -2849,7 +2861,7 @@ type
 
   { IAgentes_ComisionesDelta }
   IAgentes_ComisionesDelta = interface(IAgentes_Comisiones)
-  ['{A4522C74-DA90-4B25-9757-FC901C4297C0}']
+  ['{6FE9C733-D4D6-4375-ADD0-A78267946BED}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_AGENTEValue : Integer;
@@ -2931,7 +2943,7 @@ type
 
   { IListaAnosObjetivosAlbDelta }
   IListaAnosObjetivosAlbDelta = interface(IListaAnosObjetivosAlb)
-  ['{2D43A4A9-A60F-4847-90D8-506A9E438E8F}']
+  ['{10F3BE6F-702C-4D7D-A9DD-D07185F39A7F}']
     { Property getters and setters }
     function GetOldANOValue : SmallInt;
 
@@ -2965,7 +2977,7 @@ type
 
   { IAgentesDelta }
   IAgentesDelta = interface(IAgentes)
-  ['{B0FC98F6-07E3-4186-ACF7-4525A8B771C7}']
+  ['{BEB2E149-7144-4704-B83C-1F534413A927}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -3300,7 +3312,7 @@ type
 
   { IClientesDescuentosArticulosDelta }
   IClientesDescuentosArticulosDelta = interface(IClientesDescuentosArticulos)
-  ['{FC2F2307-6B92-4C15-BDC7-5A140CBF00F0}']
+  ['{49A3CDFA-BD96-4B3E-BE40-B3E2E17E9958}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CLIENTEValue : Integer;
@@ -3430,7 +3442,7 @@ type
 
   { IAgentes_Objetivos_albaranesDelta }
   IAgentes_Objetivos_albaranesDelta = interface(IAgentes_Objetivos_albaranes)
-  ['{BF428235-7C8E-4ABB-B20A-4CAD58BD98EC}']
+  ['{59BCD74F-1F68-4931-87CD-D630E334C36A}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_AGENTEValue : Integer;
@@ -3536,7 +3548,7 @@ type
 
   { IAgentes_Objetivos_facturasDelta }
   IAgentes_Objetivos_facturasDelta = interface(IAgentes_Objetivos_facturas)
-  ['{BC496438-46AC-4530-83E8-558F3ACDFB57}']
+  ['{6ABCD9E8-ACCD-4EE7-836E-C3D09BB71907}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_AGENTEValue : Integer;
@@ -3642,7 +3654,7 @@ type
 
   { IListaAnosObjetivosFacDelta }
   IListaAnosObjetivosFacDelta = interface(IListaAnosObjetivosFac)
-  ['{292DE1F7-DE87-44ED-AB50-050BC49C8CB1}']
+  ['{DA75406A-C26B-473D-91D8-6864A41AF5EE}']
     { Property getters and setters }
     function GetOldANOValue : SmallInt;
 
@@ -3676,7 +3688,7 @@ type
 
   { ITiposClienteDelta }
   ITiposClienteDelta = interface(ITiposCliente)
-  ['{FA885475-ECC3-45C8-BF6B-DBE4E19F6C00}']
+  ['{1FDEE269-2D12-4DDA-9AA9-D9BF6461CA29}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -6175,6 +6187,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesTIPO_CLIENTE] := Null;
 end;
 
+function TClientesBusinessProcessorRules.GetSEPAValue: SmallInt;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesSEPA];
+end;
+
+function TClientesBusinessProcessorRules.GetSEPAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesSEPA]);
+end;
+
+function TClientesBusinessProcessorRules.GetOldSEPAValue: SmallInt;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesSEPA];
+end;
+
+function TClientesBusinessProcessorRules.GetOldSEPAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesSEPA]);
+end;
+
+procedure TClientesBusinessProcessorRules.SetSEPAValue(const aValue: SmallInt);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesSEPA] := aValue;
+end;
+
+procedure TClientesBusinessProcessorRules.SetSEPAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesSEPA] := Null;
+end;
+
 
 { TProveedoresBusinessProcessorRules }
 constructor TProveedoresBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

Source/Modulos/Contactos/Model/uBizClientesServer.pas

@@ -100,6 +100,8 @@ begin
       ParamByName('VENCIMIENTO_FACTURAS_3').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_3];
       ParamByName('FELICITACION').Value := aChange.NewValueByName[fld_ClientesFELICITACION];
       ParamByName('EMAIL_ADMINISTRACION').Value := aChange.NewValueByName[fld_ClientesEMAIL_ADMINISTRACION];
+      ParamByName('TIPO_CLIENTE').Value := aChange.NewValueByName[fld_ClientesTIPO_CLIENTE];
+      ParamByName('SEPA').Value := aChange.NewValueByName[fld_ClientesSEPA];            
       Execute;
     end;
   finally
@@ -144,6 +146,8 @@ begin
       ParamByName('VENCIMIENTO_FACTURAS_3').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_3];
       ParamByName('FELICITACION').Value := aChange.NewValueByName[fld_ClientesFELICITACION];
       ParamByName('EMAIL_ADMINISTRACION').Value := aChange.NewValueByName[fld_ClientesEMAIL_ADMINISTRACION];
+      ParamByName('TIPO_CLIENTE').Value := aChange.NewValueByName[fld_ClientesTIPO_CLIENTE];
+      ParamByName('SEPA').Value := aChange.NewValueByName[fld_ClientesSEPA];            
       Execute;
     end;
   finally

Source/Modulos/Contactos/Model/uBizContactos.pas

@@ -74,6 +74,9 @@ type
     function GetBLOQUEADOValue: Integer;
     procedure SetBLOQUEADOValue(const aValue: Integer);
 
+    function GetSEPAValue: Integer;
+    procedure SetSEPAValue(const aValue: Integer);
+
     function GetMOTIVO_BLOQUEOValue: String;
     procedure SetMOTIVO_BLOQUEOValue(const aValue: String);
     
@@ -116,6 +119,7 @@ type
     property VENCIMIENTO_FACTURAS_2: Smallint read GetVENCIMIENTO_FACTURAS_2Value write SetVENCIMIENTO_FACTURAS_2Value;
     property VENCIMIENTO_FACTURAS_3: Smallint read GetVENCIMIENTO_FACTURAS_3Value write SetVENCIMIENTO_FACTURAS_3Value;
     property BLOQUEADO: Integer read GetBLOQUEADOValue write SetBLOQUEADOValue;
+    property SEPA: Integer read GetSEPAValue write SetSEPAValue;
     property MOTIVO_BLOQUEO: String read GetMOTIVO_BLOQUEOValue write SetMOTIVO_BLOQUEOValue;
     property RECARGO_EQUIVALENCIA: Integer read GetRECARGO_EQUIVALENCIAValue write SetRECARGO_EQUIVALENCIAValue;
     property REGIMEN_IVA: String read GetREGIMEN_IVAValue write SetREGIMEN_IVAValue;
@@ -329,6 +333,9 @@ type
     function GetBLOQUEADOValue: Integer;
     procedure SetBLOQUEADOValue(const aValue: Integer);
 
+    function GetSEPAValue: Integer;
+    procedure SetSEPAValue(const aValue: Integer);
+
     function GetMOTIVO_BLOQUEOValue: String;
     procedure SetMOTIVO_BLOQUEOValue(const aValue: String);
 
@@ -375,6 +382,7 @@ type
     property VENCIMIENTO_FACTURAS_2: Smallint read GetVENCIMIENTO_FACTURAS_2Value write SetVENCIMIENTO_FACTURAS_2Value;
     property VENCIMIENTO_FACTURAS_3: Smallint read GetVENCIMIENTO_FACTURAS_3Value write SetVENCIMIENTO_FACTURAS_3Value;
     property BLOQUEADO: Integer read GetBLOQUEADOValue write SetBLOQUEADOValue;
+    property SEPA: Integer read GetSEPAValue write SetSEPAValue;    
     property MOTIVO_BLOQUEO: String read GetMOTIVO_BLOQUEOValue write SetMOTIVO_BLOQUEOValue;
     property RECARGO_EQUIVALENCIA: Integer read GetRECARGO_EQUIVALENCIAValue write SetRECARGO_EQUIVALENCIAValue;
     property REGIMEN_IVA: String read GetREGIMEN_IVAValue write SetREGIMEN_IVAValue;
@@ -772,6 +780,11 @@ begin
   Result := DataTable.Fields[idx_ClientesREGIMEN_IVA].AsString;
 end;
 
+function TBizCliente.GetSEPAValue: Integer;
+begin
+  result := DataTable.Fields[idx_ClientesSEPA].AsInteger;
+end;
+
 function TBizCliente.GetTIENDA_WEBValue: Integer;
 begin
   result := DataTable.Fields[idx_ClientesTIENDA_WEB].AsInteger;
@@ -807,6 +820,11 @@ begin
   DataTable.Fields[idx_ClientesREGIMEN_IVA].AsString := aValue;
 end;
 
+procedure TBizCliente.SetSEPAValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_ClientesSEPA].AsInteger := aValue;
+end;
+
 procedure TBizCliente.SetTIENDA_WEBValue(const aValue: Integer);
 begin
   DataTable.Fields[idx_ClientesTIENDA_WEB].AsInteger := aValue;

Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm

@@ -563,6 +563,10 @@ object srvContactos: TsrvContactos
               item
                 DatasetField = 'TIPO_CLIENTE'
                 TableField = 'TIPO_CLIENTE'
+              end
+              item
+                DatasetField = 'SEPA'
+                TableField = 'SEPA'
               end>
           end>
         Name = 'Clientes'
@@ -799,6 +803,10 @@ object srvContactos: TsrvContactos
             Name = 'TIPO_CLIENTE'
             DataType = datString
             Size = 255
+          end
+          item
+            Name = 'SEPA'
+            DataType = datSmallInt
           end>
       end
       item
@@ -3658,6 +3666,11 @@ object srvContactos: TsrvContactos
             DataType = datString
             Size = 255
             Value = ''
+          end
+          item
+            Name = 'SEPA'
+            DataType = datSmallInt
+            Value = ''
           end>
         Statements = <
           item
@@ -3669,13 +3682,13 @@ object srvContactos: TsrvContactos
               'UEO, REGIMEN_IVA, ID_TIPO_IVA, ID_FORMA_PAGO,'#10'     TIENDA_WEB, C' +
               'ODIGO_ASIGNADO, DESCUENTO, RAPEL, ID_AGENTE, EMAIL_ADMINISTRACIO' +
               'N,'#10'     VENCIMIENTO_FACTURAS_1, VENCIMIENTO_FACTURAS_2, VENCIMIE' +
-              'NTO_FACTURAS_3,'#10'     FELICITACION, TIPO_CLIENTE)'#10'  VALUES'#10'    (:' +
+              'NTO_FACTURAS_3,'#10'     FELICITACION, TIPO_CLIENTE, SEPA)'#10'  VALUES'#10 +
-              'ID_CLIENTE, :GRUPO_CLIENTE, :RECARGO_EQUIVALENCIA, :NOMBRE_COMER' +
+              '    (:ID_CLIENTE, :GRUPO_CLIENTE, :RECARGO_EQUIVALENCIA, :NOMBRE' +
-              'CIAL,'#10'     :BLOQUEADO, :MOTIVO_BLOQUEO, :REGIMEN_IVA, :ID_TIPO_I' +
+              '_COMERCIAL,'#10'     :BLOQUEADO, :MOTIVO_BLOQUEO, :REGIMEN_IVA, :ID_' +
-              'VA, :ID_FORMA_PAGO,'#10'     :TIENDA_WEB, :CODIGO_ASIGNADO, :DESCUEN' +
+              'TIPO_IVA, :ID_FORMA_PAGO,'#10'     :TIENDA_WEB, :CODIGO_ASIGNADO, :D' +
-              'TO, :RAPEL, :ID_AGENTE, :EMAIL_ADMINISTRACION,'#10'     :VENCIMIENTO' +
+              'ESCUENTO, :RAPEL, :ID_AGENTE, :EMAIL_ADMINISTRACION,'#10'     :VENCI' +
-              '_FACTURAS_1, :VENCIMIENTO_FACTURAS_2, :VENCIMIENTO_FACTURAS_3,'#10' ' +
+              'MIENTO_FACTURAS_1, :VENCIMIENTO_FACTURAS_2, :VENCIMIENTO_FACTURA' +
-              '    :FELICITACION, :TIPO_CLIENTE)'#10'     '#10#10
+              'S_3,'#10'     :FELICITACION, :TIPO_CLIENTE, :SEPA)'#10'     '#10#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -3810,6 +3823,11 @@ object srvContactos: TsrvContactos
             Size = 255
             Value = ''
           end
+          item
+            Name = 'SEPA'
+            DataType = datSmallInt
+            Value = ''
+          end
           item
             Name = 'OLD_ID_CLIENTE'
             Value = ''
@@ -3831,7 +3849,8 @@ object srvContactos: TsrvContactos
               ' = :VENCIMIENTO_FACTURAS_1,'#10'    VENCIMIENTO_FACTURAS_2 = :VENCIM' +
               'IENTO_FACTURAS_2,'#10'    VENCIMIENTO_FACTURAS_3 = :VENCIMIENTO_FACT' +
               'URAS_3,'#10'    FELICITACION = :FELICITACION,'#10'    TIPO_CLIENTE = :TI' +
-              'PO_CLIENTE'#10'  WHERE'#10'    (ID_CLIENTE = :OLD_ID_CLIENTE)'#10
+              'PO_CLIENTE,'#10'    SEPA = :SEPA'#10'  WHERE'#10'    (ID_CLIENTE = :OLD_ID_C' +
+              'LIENTE)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>

Source/Modulos/Contactos/Views/uViewCliente.dfm

@@ -23,7 +23,7 @@ inherited frViewCliente: TfrViewCliente
       ExplicitLeft = 913
     end
     object Label1: TLabel [3]
-      Left = 533
+      Left = 552
       Top = 440
       Width = 269
       Height = 39
@@ -34,7 +34,7 @@ inherited frViewCliente: TfrViewCliente
       WordWrap = True
     end
     object Label2: TLabel [4]
-      Left = 533
+      Left = 552
       Top = 337
       Width = 271
       Height = 39
@@ -77,7 +77,7 @@ inherited frViewCliente: TfrViewCliente
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 10
+      TabOrder = 11
       ExplicitLeft = 132
       ExplicitTop = 404
       ExplicitWidth = 260
@@ -90,7 +90,7 @@ inherited frViewCliente: TfrViewCliente
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 11
+      TabOrder = 12
       ExplicitLeft = 132
       ExplicitTop = 431
       ExplicitWidth = 159
@@ -137,7 +137,7 @@ inherited frViewCliente: TfrViewCliente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 8
+      TabOrder = 9
       Width = 370
     end
     object cbGrupoCliente: TcxDBComboBox [10]
@@ -180,7 +180,7 @@ inherited frViewCliente: TfrViewCliente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 9
+      TabOrder = 10
       Width = 260
     end
     object eCodigoAsignado: TcxDBTextEdit [12]
@@ -210,25 +210,25 @@ inherited frViewCliente: TfrViewCliente
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 13
+      TabOrder = 14
       ExplicitLeft = 132
       ExplicitTop = 458
       ExplicitWidth = 260
       Width = 260
     end
     inherited eCodigoPostal: TcxDBTextEdit
-      Left = 438
+      Left = 457
       Top = 431
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 12
+      TabOrder = 13
-      ExplicitLeft = 438
+      ExplicitLeft = 457
       ExplicitTop = 431
     end
     object cbFelicitacion: TcxDBCheckBox [15]
-      Left = 533
+      Left = 552
       Top = 280
       Caption = 'Mandar felicitaci'#243'n navide'#241'a a este cliente'
       DataBinding.DataField = 'FELICITACION'
@@ -248,11 +248,11 @@ inherited frViewCliente: TfrViewCliente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 22
+      TabOrder = 23
       Width = 370
     end
     object cxDBCheckBox1: TcxDBCheckBox [16]
-      Left = 533
+      Left = 552
       Top = 485
       Caption = 'Permitir el acceso de este cliente a la tienda web'
       DataBinding.DataField = 'TIENDA_WEB'
@@ -273,7 +273,7 @@ inherited frViewCliente: TfrViewCliente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 24
+      TabOrder = 25
       Width = 274
     end
     object cbRapel: TcxDBCheckBox [17]
@@ -302,7 +302,7 @@ inherited frViewCliente: TfrViewCliente
       Width = 308
     end
     object eMailAdministracion: TcxDBHyperLinkEdit [18]
-      Left = 645
+      Left = 664
       Top = 382
       DataBinding.DataField = 'EMAIL_ADMINISTRACION'
       DataBinding.DataSource = dsContacto
@@ -320,7 +320,7 @@ inherited frViewCliente: TfrViewCliente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 23
+      TabOrder = 24
       Width = 133
     end
     inherited eObservaciones: TcxDBMemo
@@ -329,7 +329,7 @@ inherited frViewCliente: TfrViewCliente
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 25
+      TabOrder = 26
       ExplicitTop = 542
       ExplicitWidth = 733
       ExplicitHeight = 69
@@ -337,46 +337,46 @@ inherited frViewCliente: TfrViewCliente
       Width = 733
     end
     inherited eTlfParticular: TcxDBTextEdit
-      Left = 645
+      Left = 664
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 16
-      ExplicitLeft = 645
-      ExplicitWidth = 238
-      Width = 238
-    end
-    inherited eTlfTrabajo: TcxDBTextEdit
-      Left = 645
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 15
-      ExplicitLeft = 645
-      ExplicitWidth = 238
-      Width = 238
-    end
-    inherited eTlfMovil: TcxDBTextEdit
-      Left = 645
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 17
-      ExplicitLeft = 645
+      ExplicitLeft = 664
       ExplicitWidth = 238
       Width = 238
     end
-    inherited eFax: TcxDBTextEdit
+    inherited eTlfTrabajo: TcxDBTextEdit
-      Left = 645
+      Left = 664
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 16
+      ExplicitLeft = 664
+      ExplicitWidth = 238
+      Width = 238
+    end
+    inherited eTlfMovil: TcxDBTextEdit
+      Left = 664
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 18
-      ExplicitLeft = 645
+      ExplicitLeft = 664
+      ExplicitWidth = 238
+      Width = 238
+    end
+    inherited eFax: TcxDBTextEdit
+      Left = 664
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 19
+      ExplicitLeft = 664
       ExplicitWidth = 238
       Width = 238
     end
@@ -391,74 +391,41 @@ inherited frViewCliente: TfrViewCliente
       Width = 260
     end
     inherited eNIFCIF: TcxDBTextEdit
-      Left = 361
+      Left = 373
       Properties.OnValidate = eNIFCIFPropertiesValidate
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      ExplicitLeft = 361
+      ExplicitLeft = 373
       ExplicitWidth = 91
       Width = 91
     end
     inherited eMailTrabajo: TcxDBHyperLinkEdit
-      Left = 645
+      Left = 664
-      Properties.Prefix = 'mailto:'
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 19
-      ExplicitLeft = 645
-      ExplicitWidth = 209
-      Width = 209
-    end
-    inherited eMailParticular: TcxDBHyperLinkEdit
-      Left = 645
       Properties.Prefix = 'mailto:'
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 20
-      ExplicitLeft = 645
+      ExplicitLeft = 664
       ExplicitWidth = 209
       Width = 209
     end
-    inherited ePaginaWeb: TcxDBHyperLinkEdit
+    inherited eMailParticular: TcxDBHyperLinkEdit
-      Left = 645
+      Left = 664
+      Properties.Prefix = 'mailto:'
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 21
-      ExplicitLeft = 645
+      ExplicitLeft = 664
       ExplicitWidth = 209
       Width = 209
     end
-    inherited eReferencia: TcxDBTextEdit
+    object cbTipoCliente: TcxDBComboBox [28]
-      Left = 132
-      Enabled = True
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      ExplicitLeft = 132
-    end
-    inherited ePersonaContacto: TcxDBTextEdit
-      Left = 132
-      Top = 485
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 14
-      ExplicitLeft = 132
-      ExplicitTop = 485
-      ExplicitWidth = 260
-      Width = 260
-    end
-    object cbTipoCliente: TcxDBComboBox [31]
       Left = 132
       Top = 163
       DataBinding.DataField = 'TIPO_CLIENTE'
@@ -482,6 +449,64 @@ inherited frViewCliente: TfrViewCliente
       TabOrder = 6
       Width = 332
     end
+    inherited ePaginaWeb: TcxDBHyperLinkEdit
+      Left = 664
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 22
+      ExplicitLeft = 664
+      ExplicitWidth = 209
+      Width = 209
+    end
+    inherited eReferencia: TcxDBTextEdit
+      Left = 132
+      Enabled = True
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      ExplicitLeft = 132
+    end
+    inherited ePersonaContacto: TcxDBTextEdit
+      Left = 132
+      Top = 485
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 15
+      ExplicitLeft = 132
+      ExplicitTop = 485
+      ExplicitWidth = 260
+      Width = 260
+    end
+    object cbSEPA: TcxDBCheckBox [32]
+      Left = 22
+      Top = 217
+      Action = actBloqueoCliente
+      Caption = 'Este cliente ha aceptado SEPA'
+      DataBinding.DataField = 'SEPA'
+      DataBinding.DataSource = dsContacto
+      Properties.ImmediatePost = True
+      Properties.NullStyle = nssUnchecked
+      Properties.ValueChecked = 1
+      Properties.ValueUnchecked = 0
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 8
+      Width = 481
+    end
     inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
       AutoAligns = [aaHorizontal]
       AlignVert = avBottom
@@ -517,6 +542,11 @@ inherited frViewCliente: TfrViewCliente
               Control = cbRapel
               ControlOptions.ShowBorder = False
             end
+            object dxLayoutControlContactoItem31: TdxLayoutItem
+              ShowCaption = False
+              Control = cbSEPA
+              ControlOptions.ShowBorder = False
+            end
           end
           object dxLayoutControlContactoGroup18: TdxLayoutGroup [1]
             Caption = 'Bloqueo'

Source/Modulos/Contactos/Views/uViewCliente.pas

@@ -46,6 +46,8 @@ type
     actMandarCorreoAdministracion: TAction;
     dxLayoutControlContactoItem30: TdxLayoutItem;
     cbTipoCliente: TcxDBComboBox;
+    dxLayoutControlContactoItem31: TdxLayoutItem;
+    cbSEPA: TcxDBCheckBox;
 
     procedure cbGrupoClientePropertiesInitPopup(Sender: TObject);
     procedure cbGrupoClientePropertiesValidate(Sender: TObject;

Source/Modulos/Contactos/Views/uViewClientes.dfm

@@ -26,7 +26,20 @@ inherited frViewClientes: TfrViewClientes
       inherited cxGridViewICONO: TcxGridDBColumn
         OnGetCellHint = cxGridViewICONOGetCellHint
       end
-      object cxGridViewBLOQUEADO: TcxGridDBColumn [1]
+      object cxGridViewSEPA: TcxGridDBColumn [1]
+        DataBinding.FieldName = 'SEPA'
+        PropertiesClassName = 'TcxImageComboBoxProperties'
+        Properties.Images = GridPNGImageList
+        Properties.Items = <
+          item
+            Value = 0
+          end
+          item
+            ImageIndex = 7
+            Value = 1
+          end>
+      end
+      object cxGridViewBLOQUEADO: TcxGridDBColumn [2]
         DataBinding.FieldName = 'BLOQUEADO'
         PropertiesClassName = 'TcxImageComboBoxProperties'
         Properties.Images = GridPNGImageList
@@ -43,7 +56,7 @@ inherited frViewClientes: TfrViewClientes
         Options.HorzSizing = False
         Width = 22
       end
-      object cxGridViewFELICITACION: TcxGridDBColumn [2]
+      object cxGridViewFELICITACION: TcxGridDBColumn [3]
         Caption = 'Felicitaci'#243'n'
         DataBinding.FieldName = 'FELICITACION'
         PropertiesClassName = 'TcxImageComboBoxProperties'
@@ -66,7 +79,7 @@ inherited frViewClientes: TfrViewClientes
         VisibleForCustomization = False
         Width = 22
       end
-      object cxGridViewTiendaWeb: TcxGridDBColumn [3]
+      object cxGridViewTiendaWeb: TcxGridDBColumn [4]
         Caption = 'Acceso a tienda web'
         DataBinding.FieldName = 'TIENDA_WEB'
         PropertiesClassName = 'TcxImageComboBoxProperties'
@@ -85,7 +98,7 @@ inherited frViewClientes: TfrViewClientes
         Options.HorzSizing = False
         Width = 22
       end
-      object cxGridViewRAPEL: TcxGridDBColumn [4]
+      object cxGridViewRAPEL: TcxGridDBColumn [5]
         Caption = 'Rapel'
         DataBinding.FieldName = 'RAPEL'
         PropertiesClassName = 'TcxImageComboBoxProperties'
@@ -99,7 +112,7 @@ inherited frViewClientes: TfrViewClientes
             Value = 1
           end>
       end
-      object cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn [8]
+      object cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn [9]
         DataBinding.FieldName = 'NOMBRE_COMERCIAL'
         BestFitMaxWidth = 90
         Width = 164
@@ -109,6 +122,14 @@ inherited frViewClientes: TfrViewClientes
         DataBinding.FieldName = 'AGENTE'
         Visible = False
       end
+      object cxGridViewTIPO_CLIENTE: TcxGridDBColumn
+        Caption = 'Tipo Cliente'
+        DataBinding.FieldName = 'TIPO_CLIENTE'
+      end
+      object cxGridViewGRUPO_CLIENTE: TcxGridDBColumn
+        Caption = 'Marcas'
+        DataBinding.FieldName = 'GRUPO_CLIENTE'
+      end
     end
   end
   inherited frViewFiltroBase1: TfrViewFiltroBase
@@ -527,6 +548,31 @@ inherited frViewClientes: TfrViewClientes
           FE13D48C030000F232A0AC2AC1CAB80000000049454E44AE426082}
         Name = 'PngImage6'
         Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          610000000970485973000017120000171201679FD2520000022C4944415478DA
+          8DD25F4853511C07F0EFA12661412D945E963D047B305A46A0112D7A982DFB63
+          59467F26084122A82F1249206614D56089B12E444B5A391745A8AB5C917B10FF
+          405B206BA1953049BD4C66B61C0CC79A76DA39E4ED5EB7C8DFCBB987737F1F7E
+          BFDF3904A97015900623E8AD357E10FC89EB57064CF9DB773A223F66F97EA33A
+          0727CAD749E72C28A520A964772AB94475AE0E49A7154B484D553FADAB2F8256
+          9B85F97940147FE2E18309982D5AA200EEA756B6F96569408ECE04CDB80EBBAB
+          FF22D67B7AFE73344AF1E5531837AFBD83EB75199100F6C1905073332AF7F9B0
+          497B088157B51272ACA48B76F51CE755249314EF7DD3105A7D1C9100161A8D86
+          3E6F143920475815E2D4773024145AE4FF8E8E84F1D12FA2FE5221510C2513B2
+          617F82CFA1EC703704DB519EEC783482D5348E3667A912F817525845790BA653
+          DD58AF5E8B8ACA6DE879318AD6BB86746039121E73C3AF6AC7C9D23348240862
+          B145CC4522181A984C6F417E7D06C35630A4E0FC02ECED4F70C47896274F4ECC
+          F2161E3B0F2887B8FCEE59E4E56D96CE3C9E20C68333B0B779F1ACB35C798D72
+          C0DCA247763678CFF1F8825476203005BBED0DDCBDB5CA8794A90586C893FBFA
+          3E63F0ED341C9D07D39F72A62132E472D31ECCC5A2F8E08DA1C3F1122AE4C2D5
+          7B7A65007F81C54F69CDC5BD102C83305DD8857C9D1A36EB30EE08C56445C012
+          C256C16E4470EC1B5A6E0C2BAAF82FC0E2B6D94BFB3D5FB1A3680BB256252B1A
+          AFEA3BE4C06FF6482AF06E98E4770000000049454E44AE426082}
+        Name = 'PngImage7'
+        Background = clWindow
       end>
     Bitmap = {}
   end

Source/Modulos/Contactos/Views/uViewClientes.pas

@@ -31,6 +31,9 @@ type
     TBXSeparatorItem1: TTBXSeparatorItem;
     TBXItem2: TTBXItem;
     actAgentes: TAction;
+    cxGridViewSEPA: TcxGridDBColumn;
+    cxGridViewTIPO_CLIENTE: TcxGridDBColumn;
+    cxGridViewGRUPO_CLIENTE: TcxGridDBColumn;
     procedure cxGridViewICONOGetCellHint(Sender: TcxCustomGridTableItem;
       ARecord: TcxCustomGridRecord; ACellViewInfo: TcxGridTableDataCellViewInfo;
       const AMousePos: TPoint; var AHintText: TCaption;

Source/Modulos/Facturas proforma/Controller/FacturasProforma_controller.dproj

@@ -49,12 +49,12 @@
     <DelphiCompile Include="FacturasProforma_controller.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\Lib\ApplicationBase.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
-    <DCCReference Include="..\..\Lib\Articulos_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Articulos_controller.dcp" />
-    <DCCReference Include="..\..\Lib\Contactos_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" />
-    <DCCReference Include="..\..\Lib\FacturasProforma_data.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\FacturasProforma_data.dcp" />
-    <DCCReference Include="..\..\Lib\FacturasProforma_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\FacturasProforma_model.dcp" />
-    <DCCReference Include="..\..\Lib\FormasPago_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_controller.dcp" />
     <DCCReference Include="uArticulosFacturaProformaController.pas" />
     <DCCReference Include="uDetallesFacturaProformaController.pas" />
     <DCCReference Include="uFacturasProformaController.pas" />

Source/Modulos/Facturas proforma/Controller/uDetallesFacturaProformaController.pas

@@ -11,7 +11,6 @@ type
   ['{5DBAE3ED-D54F-4C62-AEBF-2BED29D91DD2}']
     procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; ACliente: IBizCliente; const ANuevaFila :Boolean = True; const ACantidad: Integer = 1); overload;
     procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; ACliente: IBizCliente);
-    procedure AnadirDetalleFacturaAsociadaAbono(ADetalles: IBizDetallesFacturaProforma; AReferencia: String; AFecha: String);
     procedure DesglosarPorteDetalles(ImportePorte: Currency; ADetalles: IDAStronglyTypedDataTable);
     function DarTotalPorteTotal(ADetalles: IDAStronglyTypedDataTable): Double;
   end;
@@ -37,9 +36,6 @@ type
     procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; ACliente: IBizCliente; const ANuevaFila :Boolean = True; const ACantidad: Integer = 1); overload;
     procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; ACliente: IBizCliente); overload;
 
-    //ABONOS
-    procedure AnadirDetalleFacturaAsociadaAbono(ADetalles: IBizDetallesFacturaProforma; AReferencia: String; AFecha: String);
-
     constructor Create; override;
     destructor Destroy; override;
   end;
@@ -94,29 +90,12 @@ begin
   end;
 end;
 
-procedure TDetallesFacturaProformaController.AnadirDetalleFacturaAsociadaAbono(ADetalles: IBizDetallesFacturaProforma; AReferencia: String; AFecha: String);
-begin
-  AnadirConceptoInicial(ADetalles, 'ABONO DE FACTURA ' + AReferencia + ' con fecha ' + AFecha);
-end;
 
 procedure TDetallesFacturaProformaController.AsignarController;
 begin
   FArticulosController := TArticulosFacturaProformaController.Create;
 end;
 
-{procedure TDetallesFacturaProformaController.AsignarDatos(ADetalles: IDAStronglyTypedDataTable; IDCabecera: Integer);
-begin
-  inherited;
-
-  with (ADetalles as IBizDetallesFacturaProforma) do
-  begin
-    Edit;
-//    ID := FDataModule.GetNextID(DataTable.LogicalName);
-    ID_FACTURA := IDCabecera;
-    Post
-  end;
-end;}
-
 function TDetallesFacturaProformaController.CalcularImporteTotalConcepto(DataTable: TDADataTable): Double;
 begin
   Result := CalcularLineaConcepto(DataTable);

Source/Modulos/Facturas proforma/Data/FacturasProforma_data.dproj

@@ -49,7 +49,7 @@
     <DelphiCompile Include="FacturasProforma_data.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="FacturasProforma_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\FacturasProforma_model.dcp" />
     <DCCReference Include="uDataModuleFacturasProforma.pas">
       <Form>DataModuleFacturasProforma</Form>
       <DesignClass>TDAClientDataModule</DesignClass>

Source/Modulos/Facturas proforma/Data/uDataModuleFacturasProforma.dfm

@@ -30,7 +30,9 @@ inherited DataModuleFacturasProforma: TDataModuleFacturasProforma
         Name = 'ID'
         DataType = datAutoInc
         GeneratorName = 'GEN_FACTURAS_PROFORMA_ID'
+        ServerAutoRefresh = True
         DictionaryEntry = 'FacturasProforma_ID'
+        InPrimaryKey = True
       end
       item
         Name = 'ID_EMPRESA'
@@ -247,6 +249,11 @@ inherited DataModuleFacturasProforma: TDataModuleFacturasProforma
         DisplayLabel = 'FacturasProforma_DATOS_BANCARIOS'
         DictionaryEntry = 'FacturasProforma_DATOS_BANCARIOS'
       end
+      item
+        Name = 'REFERENCIA_CLIENTE'
+        DataType = datString
+        Size = 255
+      end
       item
         Name = 'ID_PEDIDO'
         DataType = datInteger
@@ -279,10 +286,10 @@ inherited DataModuleFacturasProforma: TDataModuleFacturasProforma
       item
         Name = 'ID'
         DataType = datAutoInc
-        GeneratorName = 'GEN_FACTURAS_PROFORMA_DETALLES_ID'
+        GeneratorName = 'GEN_FACTURAS_PROFORMA_DET_ID'
-        LogChanges = False
+        ServerAutoRefresh = True
-        ReadOnly = True
+        DictionaryEntry = 'FacturasProforma_Detalles_ID'
-        ServerCalculated = True
+        InPrimaryKey = True
       end
       item
         Name = 'ID_FACTURA'

Source/Modulos/Facturas proforma/FacturasProforma_Group.groupproj

@@ -17,12 +17,10 @@
     <Projects Include="..\Contactos\Data\Contactos_data.dproj" />
     <Projects Include="..\Contactos\Model\Contactos_model.dproj" />
     <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
-    <Projects Include="..\Gestor de informes\Controller\GestorInformes_controller.dproj" />
-    <Projects Include="..\Gestor de informes\Data\GestorInformes_data.dproj" />
-    <Projects Include="..\Gestor de informes\Model\GestorInformes_model.dproj" />
     <Projects Include="Controller\FacturasProforma_controller.dproj" />
     <Projects Include="Data\FacturasProforma_data.dproj" />
     <Projects Include="Model\FacturasProforma_model.dproj" />
+    <Projects Include="Plugin\FacturasProforma_plugin.dproj" />
     <Projects Include="Views\FacturasProforma_view.dproj" />
   </ItemGroup>
   <ProjectExtensions>
@@ -130,33 +128,6 @@
   <Target Name="Articulos_view:Make">
     <MSBuild Projects="..\Articulos\Views\Articulos_view.dproj" Targets="Make" />
   </Target>
-  <Target Name="GestorInformes_model">
-    <MSBuild Projects="..\Gestor de informes\Model\GestorInformes_model.dproj" Targets="" />
-  </Target>
-  <Target Name="GestorInformes_model:Clean">
-    <MSBuild Projects="..\Gestor de informes\Model\GestorInformes_model.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="GestorInformes_model:Make">
-    <MSBuild Projects="..\Gestor de informes\Model\GestorInformes_model.dproj" Targets="Make" />
-  </Target>
-  <Target Name="GestorInformes_data">
-    <MSBuild Projects="..\Gestor de informes\Data\GestorInformes_data.dproj" Targets="" />
-  </Target>
-  <Target Name="GestorInformes_data:Clean">
-    <MSBuild Projects="..\Gestor de informes\Data\GestorInformes_data.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="GestorInformes_data:Make">
-    <MSBuild Projects="..\Gestor de informes\Data\GestorInformes_data.dproj" Targets="Make" />
-  </Target>
-  <Target Name="GestorInformes_controller">
-    <MSBuild Projects="..\Gestor de informes\Controller\GestorInformes_controller.dproj" Targets="" />
-  </Target>
-  <Target Name="GestorInformes_controller:Clean">
-    <MSBuild Projects="..\Gestor de informes\Controller\GestorInformes_controller.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="GestorInformes_controller:Make">
-    <MSBuild Projects="..\Gestor de informes\Controller\GestorInformes_controller.dproj" Targets="Make" />
-  </Target>
   <Target Name="FacturasProforma_model">
     <MSBuild Projects="Model\FacturasProforma_model.dproj" Targets="" />
   </Target>
@@ -184,6 +155,24 @@
   <Target Name="FacturasProforma_controller:Make">
     <MSBuild Projects="Controller\FacturasProforma_controller.dproj" Targets="Make" />
   </Target>
+  <Target Name="FacturasProforma_view">
+    <MSBuild Projects="Views\FacturasProforma_view.dproj" Targets="" />
+  </Target>
+  <Target Name="FacturasProforma_view:Clean">
+    <MSBuild Projects="Views\FacturasProforma_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FacturasProforma_view:Make">
+    <MSBuild Projects="Views\FacturasProforma_view.dproj" Targets="Make" />
+  </Target>
+  <Target Name="FacturasProforma_plugin">
+    <MSBuild Projects="Plugin\FacturasProforma_plugin.dproj" Targets="" />
+  </Target>
+  <Target Name="FacturasProforma_plugin:Clean">
+    <MSBuild Projects="Plugin\FacturasProforma_plugin.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FacturasProforma_plugin:Make">
+    <MSBuild Projects="Plugin\FacturasProforma_plugin.dproj" Targets="Make" />
+  </Target>
   <Target Name="FactuGES">
     <MSBuild Projects="..\..\Cliente\FactuGES.dproj" Targets="" />
   </Target>
@@ -202,23 +191,14 @@
   <Target Name="FactuGES_Server:Make">
     <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
   </Target>
-  <Target Name="FacturasProforma_view">
-    <MSBuild Projects="Views\FacturasProforma_view.dproj" Targets="" />
-  </Target>
-  <Target Name="FacturasProforma_view:Clean">
-    <MSBuild Projects="Views\FacturasProforma_view.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="FacturasProforma_view:Make">
-    <MSBuild Projects="Views\FacturasProforma_view.dproj" Targets="Make" />
-  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;GestorInformes_model;GestorInformes_data;GestorInformes_controller;FacturasProforma_model;FacturasProforma_data;FacturasProforma_controller;FactuGES;FactuGES_Server;FacturasProforma_view" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;FacturasProforma_model;FacturasProforma_data;FacturasProforma_controller;FacturasProforma_view;FacturasProforma_plugin;FactuGES;FactuGES_Server" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;GestorInformes_model:Clean;GestorInformes_data:Clean;GestorInformes_controller:Clean;FacturasProforma_model:Clean;FacturasProforma_data:Clean;FacturasProforma_controller:Clean;FactuGES:Clean;FactuGES_Server:Clean;FacturasProforma_view:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;FacturasProforma_model:Clean;FacturasProforma_data:Clean;FacturasProforma_controller:Clean;FacturasProforma_view:Clean;FacturasProforma_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;GestorInformes_model:Make;GestorInformes_data:Make;GestorInformes_controller:Make;FacturasProforma_model:Make;FacturasProforma_data:Make;FacturasProforma_controller:Make;FactuGES:Make;FactuGES_Server:Make;FacturasProforma_view:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;FacturasProforma_model:Make;FacturasProforma_data:Make;FacturasProforma_controller:Make;FacturasProforma_view:Make;FacturasProforma_plugin:Make;FactuGES:Make;FactuGES_Server:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>

Source/Modulos/Facturas proforma/Model/FacturasProforma_model.dproj

@@ -52,24 +52,24 @@
     <DelphiCompile Include="FacturasProforma_model.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="Data\adortl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
-    <DCCReference Include="Data\Base.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
-    <DCCReference Include="Data\Contactos_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
-    <DCCReference Include="Data\cxLibraryD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
-    <DCCReference Include="Data\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="Data\dbrtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
-    <DCCReference Include="Data\dsnap.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
-    <DCCReference Include="Data\dxCoreD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxCoreD11.dcp" />
-    <DCCReference Include="Data\dxGDIPlusD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
-    <DCCReference Include="Data\dxThemeD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
-    <DCCReference Include="Data\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="Data\rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
-    <DCCReference Include="Data\TiposIVA_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
     <DCCReference Include="Data\uIDataModuleFacturasProforma.pas" />
     <DCCReference Include="Data\uIDataModuleFacturasProformaReport.pas" />
-    <DCCReference Include="Data\vcl.dcp" />
-    <DCCReference Include="Data\vcldb.dcp" />
-    <DCCReference Include="Data\vclx.dcp" />
     <DCCReference Include="schFacturasProformaClient_Intf.pas" />
     <DCCReference Include="schFacturasProformaServer_Intf.pas" />
     <DCCReference Include="uBizDetallesFacturaProforma.pas" />

Source/Modulos/Facturas proforma/Model/schFacturasProformaClient_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 = '{DDF5317C-9065-43AC-B0CB-915F5FD3A062}';
+  RID_ListaAnosFacturas = '{FEEF09C4-67C8-4306-BC5D-E9B624ED4218}';
-  RID_FacturasProforma = '{85BC1F8F-4B69-4951-ACFB-D9D56114212E}';
+  RID_FacturasProforma = '{E96B0663-EB3C-45D1-8A6E-3A0178CC014A}';
-  RID_FacturasProforma_Detalles = '{A5610583-C2D4-4B7B-AC06-04716A9AA6CD}';
+  RID_FacturasProforma_Detalles = '{318BEE60-3B5B-4A8C-9A41-DFD51E23B35C}';
 
   { Data table names }
   nme_ListaAnosFacturas = 'ListaAnosFacturas';
@@ -60,6 +60,7 @@ const
   fld_FacturasProformaNUM_COPIAS = 'NUM_COPIAS';
   fld_FacturasProformaNUM_CORREOS = 'NUM_CORREOS';
   fld_FacturasProformaDATOS_BANCARIOS = 'DATOS_BANCARIOS';
+  fld_FacturasProformaREFERENCIA_CLIENTE = 'REFERENCIA_CLIENTE';
   fld_FacturasProformaID_PEDIDO = 'ID_PEDIDO';
   fld_FacturasProformaID_FACTURA_FINAL = 'ID_FACTURA_FINAL';
 
@@ -99,8 +100,9 @@ const
   idx_FacturasProformaNUM_COPIAS = 32;
   idx_FacturasProformaNUM_CORREOS = 33;
   idx_FacturasProformaDATOS_BANCARIOS = 34;
-  idx_FacturasProformaID_PEDIDO = 35;
+  idx_FacturasProformaREFERENCIA_CLIENTE = 35;
-  idx_FacturasProformaID_FACTURA_FINAL = 36;
+  idx_FacturasProformaID_PEDIDO = 36;
+  idx_FacturasProformaID_FACTURA_FINAL = 37;
 
   { FacturasProforma_Detalles fields }
   fld_FacturasProforma_DetallesID = 'ID';
@@ -139,7 +141,7 @@ const
 type
   { IListaAnosFacturas }
   IListaAnosFacturas = interface(IDAStronglyTypedDataTable)
-  ['{1046FD4E-10DD-4EA5-81EA-F74D0CA63809}']
+  ['{CBCFE754-67D7-40A8-B21A-4450E8EC413F}']
     { Property getters and setters }
     function GetANOValue: String;
     procedure SetANOValue(const aValue: String);
@@ -174,7 +176,7 @@ type
 
   { IFacturasProforma }
   IFacturasProforma = interface(IDAStronglyTypedDataTable)
-  ['{E3F5CD3D-BEB3-4FBE-8D1E-D949C4FDBF1D}']
+  ['{F8DFF550-5A11-49CC-976D-93AEECB72322}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -315,6 +317,10 @@ type
     procedure SetDATOS_BANCARIOSValue(const aValue: String);
     function GetDATOS_BANCARIOSIsNull: Boolean;
     procedure SetDATOS_BANCARIOSIsNull(const aValue: Boolean);
+    function GetREFERENCIA_CLIENTEValue: String;
+    procedure SetREFERENCIA_CLIENTEValue(const aValue: String);
+    function GetREFERENCIA_CLIENTEIsNull: Boolean;
+    procedure SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean);
     function GetID_PEDIDOValue: Integer;
     procedure SetID_PEDIDOValue(const aValue: Integer);
     function GetID_PEDIDOIsNull: Boolean;
@@ -396,6 +402,8 @@ type
     property NUM_CORREOSIsNull: Boolean read GetNUM_CORREOSIsNull write SetNUM_CORREOSIsNull;
     property DATOS_BANCARIOS: String read GetDATOS_BANCARIOSValue write SetDATOS_BANCARIOSValue;
     property DATOS_BANCARIOSIsNull: Boolean read GetDATOS_BANCARIOSIsNull write SetDATOS_BANCARIOSIsNull;
+    property REFERENCIA_CLIENTE: String read GetREFERENCIA_CLIENTEValue write SetREFERENCIA_CLIENTEValue;
+    property REFERENCIA_CLIENTEIsNull: Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull;
     property ID_PEDIDO: Integer read GetID_PEDIDOValue write SetID_PEDIDOValue;
     property ID_PEDIDOIsNull: Boolean read GetID_PEDIDOIsNull write SetID_PEDIDOIsNull;
     property ID_FACTURA_FINAL: Integer read GetID_FACTURA_FINALValue write SetID_FACTURA_FINALValue;
@@ -548,6 +556,10 @@ type
     procedure SetDATOS_BANCARIOSValue(const aValue: String); virtual;
     function GetDATOS_BANCARIOSIsNull: Boolean; virtual;
     procedure SetDATOS_BANCARIOSIsNull(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 GetID_PEDIDOValue: Integer; virtual;
     procedure SetID_PEDIDOValue(const aValue: Integer); virtual;
     function GetID_PEDIDOIsNull: Boolean; virtual;
@@ -628,6 +640,8 @@ type
     property NUM_CORREOSIsNull: Boolean read GetNUM_CORREOSIsNull write SetNUM_CORREOSIsNull;
     property DATOS_BANCARIOS: String read GetDATOS_BANCARIOSValue write SetDATOS_BANCARIOSValue;
     property DATOS_BANCARIOSIsNull: Boolean read GetDATOS_BANCARIOSIsNull write SetDATOS_BANCARIOSIsNull;
+    property REFERENCIA_CLIENTE: String read GetREFERENCIA_CLIENTEValue write SetREFERENCIA_CLIENTEValue;
+    property REFERENCIA_CLIENTEIsNull: Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull;
     property ID_PEDIDO: Integer read GetID_PEDIDOValue write SetID_PEDIDOValue;
     property ID_PEDIDOIsNull: Boolean read GetID_PEDIDOIsNull write SetID_PEDIDOIsNull;
     property ID_FACTURA_FINAL: Integer read GetID_FACTURA_FINALValue write SetID_FACTURA_FINALValue;
@@ -641,7 +655,7 @@ type
 
   { IFacturasProforma_Detalles }
   IFacturasProforma_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{F034CF38-F812-40CD-A475-F2E19A2DA211}']
+  ['{B411FAE4-15F3-4FFB-B84A-6E0BFDF91CE9}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1632,6 +1646,27 @@ begin
     DataTable.Fields[idx_FacturasProformaDATOS_BANCARIOS].AsVariant := Null;
 end;
 
+function TFacturasProformaDataTableRules.GetREFERENCIA_CLIENTEValue: String;
+begin
+  result := DataTable.Fields[idx_FacturasProformaREFERENCIA_CLIENTE].AsString;
+end;
+
+procedure TFacturasProformaDataTableRules.SetREFERENCIA_CLIENTEValue(const aValue: String);
+begin
+  DataTable.Fields[idx_FacturasProformaREFERENCIA_CLIENTE].AsString := aValue;
+end;
+
+function TFacturasProformaDataTableRules.GetREFERENCIA_CLIENTEIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasProformaREFERENCIA_CLIENTE].IsNull;
+end;
+
+procedure TFacturasProformaDataTableRules.SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasProformaREFERENCIA_CLIENTE].AsVariant := Null;
+end;
+
 function TFacturasProformaDataTableRules.GetID_PEDIDOValue: Integer;
 begin
   result := DataTable.Fields[idx_FacturasProformaID_PEDIDO].AsInteger;

Source/Modulos/Facturas proforma/Model/schFacturasProformaServer_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 = '{ABACB817-6763-4A88-8B1E-5AB9DB10C790}';
+  RID_ListaAnosFacturasDelta = '{1E0FB8B9-0971-4C08-9852-81F821095795}';
-  RID_FacturasProformaDelta = '{816D3941-8CF1-4491-AB51-33755DA5A8B0}';
+  RID_FacturasProformaDelta = '{8CCB35B8-FB46-40BB-8D1C-F22A11E81325}';
-  RID_FacturasProforma_DetallesDelta = '{A48F6A67-93C6-41E8-A234-B04189C7559D}';
+  RID_FacturasProforma_DetallesDelta = '{9C6DD5EA-A831-40AF-AAF2-792029C0567D}';
 
 type
   { IListaAnosFacturasDelta }
   IListaAnosFacturasDelta = interface(IListaAnosFacturas)
-  ['{ABACB817-6763-4A88-8B1E-5AB9DB10C790}']
+  ['{1E0FB8B9-0971-4C08-9852-81F821095795}']
     { Property getters and setters }
     function GetOldANOValue : String;
 
@@ -50,7 +50,7 @@ type
 
   { IFacturasProformaDelta }
   IFacturasProformaDelta = interface(IFacturasProforma)
-  ['{816D3941-8CF1-4491-AB51-33755DA5A8B0}']
+  ['{8CCB35B8-FB46-40BB-8D1C-F22A11E81325}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -87,6 +87,7 @@ type
     function GetOldNUM_COPIASValue : SmallInt;
     function GetOldNUM_CORREOSValue : SmallInt;
     function GetOldDATOS_BANCARIOSValue : String;
+    function GetOldREFERENCIA_CLIENTEValue : String;
     function GetOldID_PEDIDOValue : Integer;
     function GetOldID_FACTURA_FINALValue : Integer;
 
@@ -126,6 +127,7 @@ type
     property OldNUM_COPIAS : SmallInt read GetOldNUM_COPIASValue;
     property OldNUM_CORREOS : SmallInt read GetOldNUM_CORREOSValue;
     property OldDATOS_BANCARIOS : String read GetOldDATOS_BANCARIOSValue;
+    property OldREFERENCIA_CLIENTE : String read GetOldREFERENCIA_CLIENTEValue;
     property OldID_PEDIDO : Integer read GetOldID_PEDIDOValue;
     property OldID_FACTURA_FINAL : Integer read GetOldID_FACTURA_FINALValue;
   end;
@@ -346,6 +348,12 @@ type
     function GetOldDATOS_BANCARIOSIsNull: Boolean; virtual;
     procedure SetDATOS_BANCARIOSValue(const aValue: String); virtual;
     procedure SetDATOS_BANCARIOSIsNull(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 GetID_PEDIDOValue: Integer; virtual;
     function GetID_PEDIDOIsNull: Boolean; virtual;
     function GetOldID_PEDIDOValue: Integer; virtual;
@@ -500,6 +508,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 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 ID_PEDIDO : Integer read GetID_PEDIDOValue write SetID_PEDIDOValue;
     property ID_PEDIDOIsNull : Boolean read GetID_PEDIDOIsNull write SetID_PEDIDOIsNull;
     property OldID_PEDIDO : Integer read GetOldID_PEDIDOValue;
@@ -517,7 +529,7 @@ type
 
   { IFacturasProforma_DetallesDelta }
   IFacturasProforma_DetallesDelta = interface(IFacturasProforma_Detalles)
-  ['{A48F6A67-93C6-41E8-A234-B04189C7559D}']
+  ['{9C6DD5EA-A831-40AF-AAF2-792029C0567D}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_FACTURAValue : Integer;
@@ -1869,6 +1881,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProformaDATOS_BANCARIOS] := Null;
 end;
 
+function TFacturasProformaBusinessProcessorRules.GetREFERENCIA_CLIENTEValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProformaREFERENCIA_CLIENTE];
+end;
+
+function TFacturasProformaBusinessProcessorRules.GetREFERENCIA_CLIENTEIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProformaREFERENCIA_CLIENTE]);
+end;
+
+function TFacturasProformaBusinessProcessorRules.GetOldREFERENCIA_CLIENTEValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProformaREFERENCIA_CLIENTE];
+end;
+
+function TFacturasProformaBusinessProcessorRules.GetOldREFERENCIA_CLIENTEIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProformaREFERENCIA_CLIENTE]);
+end;
+
+procedure TFacturasProformaBusinessProcessorRules.SetREFERENCIA_CLIENTEValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProformaREFERENCIA_CLIENTE] := aValue;
+end;
+
+procedure TFacturasProformaBusinessProcessorRules.SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProformaREFERENCIA_CLIENTE] := Null;
+end;
+
 function TFacturasProformaBusinessProcessorRules.GetID_PEDIDOValue: Integer;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProformaID_PEDIDO];

Source/Modulos/Facturas proforma/Plugin/FacturasCliente_plugin.bdsproj

@@ -1,495 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
-	<PersonalityInfo>
-		<Option>
-			<Option Name="Personality">Delphi.Personality</Option>
-			<Option Name="ProjectType"></Option>
-			<Option Name="Version">1.0</Option>
-			<Option Name="GUID">{E7D762A1-3A15-46B2-BD5B-3821D13B8347}</Option>
-		</Option>
-	</PersonalityInfo>
-	<Delphi.Personality>
-		<Source>
-			<Source Name="MainSource">FacturasCliente_plugin.dpk</Source>
-		</Source>
-		<FileVersion>
-			<FileVersion Name="Version">7.0</FileVersion>
-		</FileVersion>
-		<Compiler>
-			<Compiler Name="A">8</Compiler>
-			<Compiler Name="B">0</Compiler>
-			<Compiler Name="C">1</Compiler>
-			<Compiler Name="D">1</Compiler>
-			<Compiler Name="E">0</Compiler>
-			<Compiler Name="F">0</Compiler>
-			<Compiler Name="G">1</Compiler>
-			<Compiler Name="H">1</Compiler>
-			<Compiler Name="I">1</Compiler>
-			<Compiler Name="J">0</Compiler>
-			<Compiler Name="K">0</Compiler>
-			<Compiler Name="L">1</Compiler>
-			<Compiler Name="M">0</Compiler>
-			<Compiler Name="N">1</Compiler>
-			<Compiler Name="O">1</Compiler>
-			<Compiler Name="P">1</Compiler>
-			<Compiler Name="Q">0</Compiler>
-			<Compiler Name="R">0</Compiler>
-			<Compiler Name="S">0</Compiler>
-			<Compiler Name="T">0</Compiler>
-			<Compiler Name="U">0</Compiler>
-			<Compiler Name="V">1</Compiler>
-			<Compiler Name="W">0</Compiler>
-			<Compiler Name="X">1</Compiler>
-			<Compiler Name="Y">1</Compiler>
-			<Compiler Name="Z">1</Compiler>
-			<Compiler Name="ShowHints">True</Compiler>
-			<Compiler Name="ShowWarnings">True</Compiler>
-			<Compiler Name="UnitAliases">WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;</Compiler>
-			<Compiler Name="NamespacePrefix"></Compiler>
-			<Compiler Name="GenerateDocumentation">False</Compiler>
-			<Compiler Name="DefaultNamespace"></Compiler>
-			<Compiler Name="SymbolDeprecated">True</Compiler>
-			<Compiler Name="SymbolLibrary">True</Compiler>
-			<Compiler Name="SymbolPlatform">True</Compiler>
-			<Compiler Name="SymbolExperimental">True</Compiler>
-			<Compiler Name="UnitLibrary">True</Compiler>
-			<Compiler Name="UnitPlatform">True</Compiler>
-			<Compiler Name="UnitDeprecated">True</Compiler>
-			<Compiler Name="UnitExperimental">True</Compiler>
-			<Compiler Name="HResultCompat">True</Compiler>
-			<Compiler Name="HidingMember">True</Compiler>
-			<Compiler Name="HiddenVirtual">True</Compiler>
-			<Compiler Name="Garbage">True</Compiler>
-			<Compiler Name="BoundsError">True</Compiler>
-			<Compiler Name="ZeroNilCompat">True</Compiler>
-			<Compiler Name="StringConstTruncated">True</Compiler>
-			<Compiler Name="ForLoopVarVarPar">True</Compiler>
-			<Compiler Name="TypedConstVarPar">True</Compiler>
-			<Compiler Name="AsgToTypedConst">True</Compiler>
-			<Compiler Name="CaseLabelRange">True</Compiler>
-			<Compiler Name="ForVariable">True</Compiler>
-			<Compiler Name="ConstructingAbstract">True</Compiler>
-			<Compiler Name="ComparisonFalse">True</Compiler>
-			<Compiler Name="ComparisonTrue">True</Compiler>
-			<Compiler Name="ComparingSignedUnsigned">True</Compiler>
-			<Compiler Name="CombiningSignedUnsigned">True</Compiler>
-			<Compiler Name="UnsupportedConstruct">True</Compiler>
-			<Compiler Name="FileOpen">True</Compiler>
-			<Compiler Name="FileOpenUnitSrc">True</Compiler>
-			<Compiler Name="BadGlobalSymbol">True</Compiler>
-			<Compiler Name="DuplicateConstructorDestructor">True</Compiler>
-			<Compiler Name="InvalidDirective">True</Compiler>
-			<Compiler Name="PackageNoLink">True</Compiler>
-			<Compiler Name="PackageThreadVar">True</Compiler>
-			<Compiler Name="ImplicitImport">True</Compiler>
-			<Compiler Name="HPPEMITIgnored">True</Compiler>
-			<Compiler Name="NoRetVal">True</Compiler>
-			<Compiler Name="UseBeforeDef">True</Compiler>
-			<Compiler Name="ForLoopVarUndef">True</Compiler>
-			<Compiler Name="UnitNameMismatch">True</Compiler>
-			<Compiler Name="NoCFGFileFound">True</Compiler>
-			<Compiler Name="ImplicitVariants">True</Compiler>
-			<Compiler Name="UnicodeToLocale">True</Compiler>
-			<Compiler Name="LocaleToUnicode">True</Compiler>
-			<Compiler Name="ImagebaseMultiple">True</Compiler>
-			<Compiler Name="SuspiciousTypecast">True</Compiler>
-			<Compiler Name="PrivatePropAccessor">True</Compiler>
-			<Compiler Name="UnsafeType">False</Compiler>
-			<Compiler Name="UnsafeCode">False</Compiler>
-			<Compiler Name="UnsafeCast">False</Compiler>
-			<Compiler Name="OptionTruncated">True</Compiler>
-			<Compiler Name="WideCharReduced">True</Compiler>
-			<Compiler Name="DuplicatesIgnored">True</Compiler>
-			<Compiler Name="UnitInitSeq">True</Compiler>
-			<Compiler Name="LocalPInvoke">True</Compiler>
-			<Compiler Name="MessageDirective">True</Compiler>
-			<Compiler Name="CodePage"></Compiler>
-		</Compiler>
-		<Linker>
-			<Linker Name="MapFile">3</Linker>
-			<Linker Name="OutputObjs">0</Linker>
-			<Linker Name="GenerateHpps">False</Linker>
-			<Linker Name="ConsoleApp">1</Linker>
-			<Linker Name="DebugInfo">False</Linker>
-			<Linker Name="RemoteSymbols">False</Linker>
-			<Linker Name="GenerateDRC">False</Linker>
-			<Linker Name="MinStackSize">16384</Linker>
-			<Linker Name="MaxStackSize">1048576</Linker>
-			<Linker Name="ImageBase">4194304</Linker>
-			<Linker Name="ExeDescription"></Linker>
-		</Linker>
-		<Directories>
-			<Directories Name="OutputDir"></Directories>
-			<Directories Name="UnitOutputDir">.\</Directories>
-			<Directories Name="PackageDLLOutputDir">..\..\..\..\Output\Debug\Cliente</Directories>
-			<Directories Name="PackageDCPOutputDir">..\..\Lib</Directories>
-			<Directories Name="SearchPath">..\..\..\Lib;..\..\Lib</Directories>
-			<Directories Name="Packages"></Directories>
-			<Directories Name="Conditionals"></Directories>
-			<Directories Name="DebugSourceDirs"></Directories>
-			<Directories Name="UsePackages">False</Directories>
-		</Directories>
-		<Parameters>
-			<Parameters Name="RunParams"></Parameters>
-			<Parameters Name="HostApplication"></Parameters>
-			<Parameters Name="Launcher"></Parameters>
-			<Parameters Name="UseLauncher">False</Parameters>
-			<Parameters Name="DebugCWD"></Parameters>
-			<Parameters Name="Debug Symbols Search Path"></Parameters>
-			<Parameters Name="LoadAllSymbols">True</Parameters>
-			<Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
-		</Parameters>
-		<Language>
-			<Language Name="ActiveLang"></Language>
-			<Language Name="ProjectLang">$00000000</Language>
-			<Language Name="RootDir"></Language>
-		</Language>
-		<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>  <Excluded_Packages>
-      <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
-      <Excluded_Packages Name="C:\Archivos de programa\EurekaLog 5\Delphi10\ExceptionExpert10.bpl">EurekaLog 5.1.9</Excluded_Packages>
-    </Excluded_Packages>
-  </Delphi.Personality>
-<!-- EurekaLog First Line
-[Exception Log]
-EurekaLog Version=519
-Activate=1
-Activate Handle=1
-Save Log File=1
-Foreground Tab=0
-Freeze Activate=0
-Freeze Timeout=0
-Freeze Message=The application seems to be frozen.
-SMTP From=eurekalog@email.com
-SMTP Host=
-SMTP Port=25
-SMTP UserID=
-SMTP Password=
-Append to Log=0
-Show TerminateBtn=1
-TerminateBtn Operation=1
-Errors Number=32
-Errors Terminate=3
-Email Address=
-Email Object=
-Email Send Options=0
-Output Path=
-Encrypt Password=
-AutoCloseDialogSecs=0
-WebSendMode=0
-SupportULR=
-HTMLLayout Count=15
-HTMLLine0="%3Chtml%3E"
-HTMLLine1="  %3Chead%3E"
-HTMLLine2="  %3C/head%3E"
-HTMLLine3="  %3Cbody TopMargin=10 LeftMargin=10%3E"
-HTMLLine4="    %3Ctable width="100%%" border="0"%3E"
-HTMLLine5="      %3Ctr%3E"
-HTMLLine6="        %3Ctd nowrap%3E"
-HTMLLine7="          %3Cfont face="Lucida Console, Courier" size="2"%3E"
-HTMLLine8="            %3C%%HTML_TAG%%%3E"
-HTMLLine9="          %3C/font%3E"
-HTMLLine10="        %3C/td%3E"
-HTMLLine11="      %3C/tr%3E"
-HTMLLine12="    %3C/table%3E"
-HTMLLine13="  %3C/body%3E"
-HTMLLine14="%3C/html%3E"
-AutoCrashOperation=1
-AutoCrashNumber=10
-AutoCrashMinutes=1
-WebURL=
-WebUserID=
-WebPassword=
-WebPort=0
-AttachedFiles=
-Count=0
-EMail Message Line Count=0
-loNoDuplicateErrors=0
-loAppendReproduceText=0
-loDeleteLogAtVersionChange=0
-loAddComputerNameInLogFileName=0
-loSaveModulesSection=1
-loSaveCPUSection=1
-soAppStartDate=1
-soAppName=1
-soAppVersionNumber=1
-soAppParameters=1
-soAppCompilationDate=1
-soExcDate=1
-soExcAddress=1
-soExcModule=1
-soExcType=1
-soExcMessage=1
-soActCtlsFormClass=1
-soActCtlsFormText=1
-soActCtlsControlClass=1
-soActCtlsControlText=1
-soCmpName=1
-soCmpUser=1
-soCmpTotalMemory=1
-soCmpFreeMemory=1
-soCmpTotalDisk=1
-soCmpFreeDisk=1
-soCmpSysUpTime=1
-soCmpProcessor=1
-soCmpDisplayMode=1
-soOSType=1
-soOSBuildN=1
-soOSUpdate=1
-soOSLanguage=1
-soNetIP=1
-soNetSubmask=1
-soNetGateway=1
-soNetDNS1=1
-soNetDNS2=1
-soNetDHCP=1
-sndShowSendDialog=1
-sndShowSuccessFailureMsg=0
-sndSendEntireLog=0
-sndSendXMLLogCopy=0
-sndSendScreenshot=0
-sndUseOnlyActiveWindow=0
-sndSendLastHTMLPage=1
-sndSendInSeparatedThread=0
-sndAddDateInFileName=0
-sndCompressAllFiles=0
-edoShowExceptionDialog=1
-edoSendEmailChecked=1
-edoAttachScreenshotChecked=1
-edoShowCopyToClipOption=1
-edoShowDetailsButton=1
-edoShowInDetailedMode=0
-edoShowInTopMostMode=0
-edoUseEurekaLogLookAndFeel=1
-csoShowDLLs=1
-csoShowBPLs=1
-csoShowBorlandThreads=1
-csoShowWindowsThreads=1
-csoShowProcedureOffset=0
-boActivateCrashDetection=0
-boPauseBorlandThreads=0
-boDoNotPauseMainThread=0
-boPauseWindowsThreads=0
-boUseMainModuleOptions=1
-boCopyLogInCaseOfError=1
-boSaveCompressedCopyInCaseOfError=0
-Count mtInformationMsgCaption=1
-mtInformationMsgCaption0="Information."
-Count mtQuestionMsgCaption=1
-mtQuestionMsgCaption0="Question."
-Count mtDialog_Caption=1
-mtDialog_Caption0="Error."
-Count mtDialog_ErrorMsgCaption=2
-mtDialog_ErrorMsgCaption0="An error has occurred during program execution."
-mtDialog_ErrorMsgCaption1="Please read the following information for further details."
-Count mtDialog_GeneralCaption=1
-mtDialog_GeneralCaption0="General"
-Count mtDialog_GeneralHeader=1
-mtDialog_GeneralHeader0="General Information"
-Count mtDialog_CallStackCaption=1
-mtDialog_CallStackCaption0="Call Stack"
-Count mtDialog_CallStackHeader=1
-mtDialog_CallStackHeader0="Call Stack Information"
-Count mtDialog_ModulesCaption=1
-mtDialog_ModulesCaption0="Modules"
-Count mtDialog_ModulesHeader=1
-mtDialog_ModulesHeader0="Modules Information"
-Count mtDialog_CPUCaption=1
-mtDialog_CPUCaption0="CPU"
-Count mtDialog_CPUHeader=1
-mtDialog_CPUHeader0="CPU Information"
-Count mtDialog_CustomDataCaption=1
-mtDialog_CustomDataCaption0="Other"
-Count mtDialog_CustomDataHeader=1
-mtDialog_CustomDataHeader0="Other Information"
-Count mtDialog_OKButtonCaption=1
-mtDialog_OKButtonCaption0="%26OK"
-Count mtDialog_TerminateButtonCaption=1
-mtDialog_TerminateButtonCaption0="%26Terminate"
-Count mtDialog_RestartButtonCaption=1
-mtDialog_RestartButtonCaption0="%26Restart"
-Count mtDialog_DetailsButtonCaption=1
-mtDialog_DetailsButtonCaption0="%26Details"
-Count mtDialog_SendMessage=1
-mtDialog_SendMessage0="%26Send this error via Internet"
-Count mtDialog_ScreenshotMessage=1
-mtDialog_ScreenshotMessage0="%26Attach a Screenshot image"
-Count mtDialog_CopyMessage=1
-mtDialog_CopyMessage0="%26Copy to Clipboard"
-Count mtDialog_SupportMessage=1
-mtDialog_SupportMessage0="Go to the Support Page"
-Count mtLog_AppHeader=1
-mtLog_AppHeader0="Application"
-Count mtLog_AppStartDate=1
-mtLog_AppStartDate0="Start Date"
-Count mtLog_AppName=1
-mtLog_AppName0="Name/Description"
-Count mtLog_AppVersionNumber=1
-mtLog_AppVersionNumber0="Version Number"
-Count mtLog_AppParameters=1
-mtLog_AppParameters0="Parameters"
-Count mtLog_AppCompilationDate=1
-mtLog_AppCompilationDate0="Compilation Date"
-Count mtLog_ExcHeader=1
-mtLog_ExcHeader0="Exception"
-Count mtLog_ExcDate=1
-mtLog_ExcDate0="Date"
-Count mtLog_ExcAddress=1
-mtLog_ExcAddress0="Address"
-Count mtLog_ExcModule=1
-mtLog_ExcModule0="Module"
-Count mtLog_ExcType=1
-mtLog_ExcType0="Type"
-Count mtLog_ExcMessage=1
-mtLog_ExcMessage0="Message"
-Count mtLog_ActCtrlsHeader=1
-mtLog_ActCtrlsHeader0="Active Controls"
-Count mtLog_ActCtrlsFormClass=1
-mtLog_ActCtrlsFormClass0="Form Class"
-Count mtLog_ActCtrlsFormText=1
-mtLog_ActCtrlsFormText0="Form Text"
-Count mtLog_ActCtrlsControlClass=1
-mtLog_ActCtrlsControlClass0="Control Class"
-Count mtLog_ActCtrlsControlText=1
-mtLog_ActCtrlsControlText0="Control Text"
-Count mtLog_CmpHeader=1
-mtLog_CmpHeader0="Computer"
-Count mtLog_CmpName=1
-mtLog_CmpName0="Name"
-Count mtLog_CmpUser=1
-mtLog_CmpUser0="User"
-Count mtLog_CmpTotalMemory=1
-mtLog_CmpTotalMemory0="Total Memory"
-Count mtLog_CmpFreeMemory=1
-mtLog_CmpFreeMemory0="Free Memory"
-Count mtLog_CmpTotalDisk=1
-mtLog_CmpTotalDisk0="Total Disk"
-Count mtLog_CmpFreeDisk=1
-mtLog_CmpFreeDisk0="Free Disk"
-Count mtLog_CmpSystemUpTime=1
-mtLog_CmpSystemUpTime0="System Up Time"
-Count mtLog_CmpProcessor=1
-mtLog_CmpProcessor0="Processor"
-Count mtLog_CmpDisplayMode=1
-mtLog_CmpDisplayMode0="Display Mode"
-Count mtLog_OSHeader=1
-mtLog_OSHeader0="Operating System"
-Count mtLog_OSType=1
-mtLog_OSType0="Type"
-Count mtLog_OSBuildN=1
-mtLog_OSBuildN0="Build #"
-Count mtLog_OSUpdate=1
-mtLog_OSUpdate0="Update"
-Count mtLog_OSLanguage=1
-mtLog_OSLanguage0="Language"
-Count mtLog_NetHeader=1
-mtLog_NetHeader0="Network"
-Count mtLog_NetIP=1
-mtLog_NetIP0="IP Address"
-Count mtLog_NetSubmask=1
-mtLog_NetSubmask0="Submask"
-Count mtLog_NetGateway=1
-mtLog_NetGateway0="Gateway"
-Count mtLog_NetDNS1=1
-mtLog_NetDNS10="DNS 1"
-Count mtLog_NetDNS2=1
-mtLog_NetDNS20="DNS 2"
-Count mtLog_NetDHCP=1
-mtLog_NetDHCP0="DHCP"
-Count mtLog_CustInfoHeader=1
-mtLog_CustInfoHeader0="Custom Information"
-Count mtCallStack_Address=1
-mtCallStack_Address0="Address"
-Count mtCallStack_Name=1
-mtCallStack_Name0="Module"
-Count mtCallStack_Unit=1
-mtCallStack_Unit0="Unit"
-Count mtCallStack_Class=1
-mtCallStack_Class0="Class"
-Count mtCallStack_Procedure=1
-mtCallStack_Procedure0="Procedure/Method"
-Count mtCallStack_Line=1
-mtCallStack_Line0="Line"
-Count mtCallStack_MainThread=1
-mtCallStack_MainThread0="Main"
-Count mtCallStack_ExceptionThread=1
-mtCallStack_ExceptionThread0="Exception Thread"
-Count mtCallStack_RunningThread=1
-mtCallStack_RunningThread0="Running Thread"
-Count mtCallStack_CallingThread=1
-mtCallStack_CallingThread0="Calling Thread"
-Count mtCallStack_ThreadID=1
-mtCallStack_ThreadID0="ID"
-Count mtCallStack_ThreadPriority=1
-mtCallStack_ThreadPriority0="Priority"
-Count mtCallStack_ThreadClass=1
-mtCallStack_ThreadClass0="Class"
-Count mtSendDialog_Caption=1
-mtSendDialog_Caption0="Send."
-Count mtSendDialog_Message=1
-mtSendDialog_Message0="Message"
-Count mtSendDialog_Resolving=1
-mtSendDialog_Resolving0="Resolving DNS..."
-Count mtSendDialog_Connecting=1
-mtSendDialog_Connecting0="Connecting with server..."
-Count mtSendDialog_Connected=1
-mtSendDialog_Connected0="Connected with server."
-Count mtSendDialog_Sending=1
-mtSendDialog_Sending0="Sending message..."
-Count mtReproduceDialog_Caption=1
-mtReproduceDialog_Caption0="Request"
-Count mtReproduceDialog_Request=1
-mtReproduceDialog_Request0="Please describe the steps to reproduce the error:"
-Count mtReproduceDialog_OKButtonCaption=1
-mtReproduceDialog_OKButtonCaption0="%26OK"
-Count mtModules_Handle=1
-mtModules_Handle0="Handle"
-Count mtModules_Name=1
-mtModules_Name0="Name"
-Count mtModules_Description=1
-mtModules_Description0="Description"
-Count mtModules_Version=1
-mtModules_Version0="Version"
-Count mtModules_Size=1
-mtModules_Size0="Size"
-Count mtModules_LastModified=1
-mtModules_LastModified0="Modified"
-Count mtModules_Path=1
-mtModules_Path0="Path"
-Count mtCPU_Registers=1
-mtCPU_Registers0="Registers"
-Count mtCPU_Stack=1
-mtCPU_Stack0="Stack"
-Count mtCPU_MemoryDump=1
-mtCPU_MemoryDump0="Memory Dump"
-Count mtSend_SuccessMsg=1
-mtSend_SuccessMsg0="The message was sent successfully."
-Count mtSend_FailureMsg=1
-mtSend_FailureMsg0="Sorry, sending the message didn't work."
-EurekaLog Last Line -->
-</BorlandProject>

Source/Modulos/Facturas proforma/Plugin/FacturasProforma_plugin.dproj

@@ -1,11 +1,11 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{e7d762a1-3a15-46b2-bd5b-3821d13b8347}</ProjectGuid>
-    <MainSource>FacturasCliente_plugin.dpk</MainSource>
+    <MainSource>FacturasProforma_plugin.dpk</MainSource>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-    <DCC_DependencyCheckOutputName>..\..\..\..\Output\Debug\Cliente\FacturasCliente_plugin.bpl</DCC_DependencyCheckOutputName>
+    <DCC_DependencyCheckOutputName>..\..\..\..\Output\Debug\Cliente\FacturasProforma_plugin.bpl</DCC_DependencyCheckOutputName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Version>7.0</Version>
@@ -41,39 +41,31 @@
     <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><Excluded_Packages>
+<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><Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
-      
       
       
       
       
       <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
       <Excluded_Packages Name="C:\Archivos de programa\EurekaLog 5\Delphi10\ExceptionExpert10.bpl">EurekaLog 5.1.9</Excluded_Packages>
-    </Excluded_Packages><Source><Source Name="MainSource">FacturasCliente_plugin.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+    </Excluded_Packages><Source><Source Name="MainSource">FacturasProforma_plugin.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
-    <DelphiCompile Include="FacturasCliente_plugin.dpk">
+    <DelphiCompile Include="FacturasProforma_plugin.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
+    <DCCReference Include="..\..\Lib\ApplicationBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\FacturasCliente_controller.dcp" />
+    <DCCReference Include="..\..\Lib\FacturasProforma_controller.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\FacturasCliente_view.dcp" />
+    <DCCReference Include="..\..\Lib\FacturasProforma_view.dcp" />
-    <DCCReference Include="uPluginFacturasCliente.pas">
+    <DCCReference Include="uPluginFacturasProforma.pas">
-      <Form>PluginFacturasCliente</Form>
+      <Form>PluginFacturasProforma</Form>
     </DCCReference>
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]
-EurekaLog Version=6006
+EurekaLog Version=6011
 Activate=1
 Activate Handle=1
 Save Log File=1
@@ -553,4 +545,4 @@ mtException_AntiFreeze0="The application seems to be frozen."
 Count mtInvalidEmailMsg=1
 mtInvalidEmailMsg0="Invalid email."
 TextsCollection=English
-EurekaLog Last Line -->
+EurekaLog Last Line -->

Source/Modulos/Facturas proforma/Plugin/FacturasProforma_plugin.drc

@@ -0,0 +1,17 @@
+/* VER185
+  Generated by the CodeGear Delphi Pascal Compiler
+  because -GD or --drc was supplied to the compiler.
+
+  This file contains compiler-generated resources that
+  were bound to the executable.
+  If this file is empty, then no compiler-generated
+  resources were bound to the produced executable.
+*/
+
+STRINGTABLE
+BEGIN
+END
+
+/* C:\Codigo\Source\Modulos\Facturas proforma\Plugin\uPluginFacturasProforma.dfm */
+/* C:\Codigo\Source\Modulos\Facturas proforma\Plugin\FacturasProforma_plugin.res */
+/* C:\Codigo\Source\Modulos\Facturas proforma\Plugin\FacturasProforma_plugin.drf */

Source/Modulos/Facturas proforma/Plugin/uPluginFacturasCliente.pas

@@ -1,97 +0,0 @@
-unit uPluginFacturasCliente;
-
-interface
-
-uses
-  uModuleController, uInterfaces, uHostManager, Menus, Classes, ActnList,
-  ImgList, Controls, PngImageList, uPlugins_Intf;
-
-type
-  TPluginFacturasCliente = class(TModuleController, IMCFacturasCliente)
-    actFacturasCliente: TAction;
-    ExtraImages: TPngImageList;
-    LargeImages: TPngImageList;
-    MainMenu: TMainMenu;
-    ModuleActionList: TActionList;
-    SmallImages: TPngImageList;
-    Ventas1: TMenuItem;
-    Facturasdecliente1: TMenuItem;
-    procedure actFacturasClienteExecute(Sender: TObject);
-  public
-    constructor Create(AOwner: TComponent); override;
-    destructor Destroy; override;
-    procedure VerFacturas(const ID_Cliente: Integer;
-      const ANombreCliente : String = '');    
-  end;
-
-implementation
-
-{$R *.dfm}
-
-uses
-  Forms, Dialogs, SysUtils, cxControls,
-  uFacturasClienteController, uBizFacturasCliente, uFacturasClienteViewRegister;
-
-function GetModule : TModuleController;
-begin
-  Result := TPluginFacturasCliente.Create(NIL);
-end;
-
-exports
-  GetModule name GET_MODULE_FUNC;
-
-procedure TPluginFacturasCliente.actFacturasClienteExecute(Sender: TObject);
-var
-  AFacturasClienteController : IFacturasClienteController;
-  AFacturasCliente : IBizFacturaCliente;
-
-begin
-  AFacturasClienteController := TFacturasClienteController.Create;
-  AFacturasCliente := (AFacturasClienteController.BuscarTodos as IBizFacturaCliente);
-  AFacturasClienteController.VerTodos(AFacturasCliente);
-end;
-
-constructor TPluginFacturasCliente.Create(AOwner: TComponent);
-begin
-  inherited;
-  ModuleName := MODULENAME_FACTURAS_CLIENTE;
-  uFacturasClienteViewRegister.RegisterViews;
-end;
-
-destructor TPluginFacturasCliente.Destroy;
-begin
-  uFacturasClienteViewRegister.UnregisterViews;
-  inherited;
-end;
-
-procedure TPluginFacturasCliente.VerFacturas(const ID_Cliente: Integer;
-  const ANombreCliente: String);
-var
-  AFacturasClienteController : IFacturasClienteController;
-  AFacturasCliente : IBizFacturaCliente;
-  AText : String;
-begin
-  AText := Format('Lista de facturas del cliente %s', [ANombreCliente]);
-  AFacturasClienteController := TFacturasClienteController.Create;
-  try
-    ShowHourglassCursor;
-    try
-      AFacturasCliente := AFacturasClienteController.BuscarTodos(ID_Cliente);      
-    finally
-      HideHourglassCursor;
-    end;
-    AFacturasClienteController.VerTodos(AFacturasCliente, True, AText);
-  finally
-    AFacturasCliente := NIL;
-    AFacturasClienteController := NIL;
-  end;
-end;
-
-
-initialization
-  RegisterModuleClass(TPluginFacturasCliente);
-
-finalization
-  UnRegisterModuleClass(TPluginFacturasCliente);
-
-end.

Source/Modulos/Facturas proforma/Plugin/uPluginFacturasProforma.dfm

@@ -1,9 +1,9 @@
-object PluginFacturasCliente: TPluginFacturasCliente
+object PluginFacturasProforma: TPluginFacturasProforma
   OldCreateOrder = True
-  DefaultAction = actFacturasCliente
+  DefaultAction = actFacturasProforma
   Description = 'Ventas'
   ModuleMenu = MainMenu
-  ModuleName = 'Facturas de cliente'
+  ModuleName = 'Facturas proforma'
   SmallImages = SmallImages
   LargeImages = LargeImages
   Author = 'Rodax Software'
@@ -44,11 +44,11 @@ object PluginFacturasCliente: TPluginFacturasCliente
     Images = LargeImages
     Left = 40
     Top = 72
-    object actFacturasCliente: TAction
+    object actFacturasProforma: TAction
       Category = 'Ventas'
-      Caption = 'Facturas de cliente'
+      Caption = 'Facturas proforma'
       ImageIndex = 0
-      OnExecute = actFacturasClienteExecute
+      OnExecute = actFacturasProformaExecute
     end
   end
   object MainMenu: TMainMenu
@@ -62,7 +62,7 @@ object PluginFacturasCliente: TPluginFacturasCliente
       ImageIndex = 0
       object Facturasdecliente1: TMenuItem
         Tag = 301
-        Action = actFacturasCliente
+        Action = actFacturasProforma
       end
     end
   end

Source/Modulos/Facturas proforma/Plugin/uPluginFacturasProforma.pas

@@ -0,0 +1,97 @@
+unit uPluginFacturasProforma;
+
+interface
+
+uses
+  uModuleController, uInterfaces, uHostManager, Menus, Classes, ActnList,
+  ImgList, Controls, PngImageList, uPlugins_Intf;
+
+type
+  TPluginFacturasProforma = class(TModuleController, IMCFacturasProforma)
+    actFacturasProforma: TAction;
+    ExtraImages: TPngImageList;
+    LargeImages: TPngImageList;
+    MainMenu: TMainMenu;
+    ModuleActionList: TActionList;
+    SmallImages: TPngImageList;
+    Ventas1: TMenuItem;
+    Facturasdecliente1: TMenuItem;
+    procedure actFacturasProformaExecute(Sender: TObject);
+  public
+    constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
+    procedure VerFacturas(const ID_Cliente: Integer;
+      const ANombreCliente : String = '');    
+  end;
+
+implementation
+
+{$R *.dfm}
+
+uses
+  Forms, Dialogs, SysUtils, cxControls,
+  uFacturasProformaController, uBizFacturasProforma, uFacturasProformaViewRegister;
+
+function GetModule : TModuleController;
+begin
+  Result := TPluginFacturasProforma.Create(NIL);
+end;
+
+exports
+  GetModule name GET_MODULE_FUNC;
+
+procedure TPluginFacturasProforma.actFacturasProformaExecute(Sender: TObject);
+var
+  AFacturasProformaController : IFacturasProformaController;
+  AFacturasProforma : IBizFacturaProforma;
+
+begin
+  AFacturasProformaController := TFacturasProformaController.Create;
+  AFacturasProforma := (AFacturasProformaController.BuscarTodos as IBizFacturaProforma);
+  AFacturasProformaController.VerTodos(AFacturasProforma);
+end;
+
+constructor TPluginFacturasProforma.Create(AOwner: TComponent);
+begin
+  inherited;
+  ModuleName := MODULENAME_FACTURAS_CLIENTE;
+  uFacturasProformaViewRegister.RegisterViews;
+end;
+
+destructor TPluginFacturasProforma.Destroy;
+begin
+  uFacturasProformaViewRegister.UnregisterViews;
+  inherited;
+end;
+
+procedure TPluginFacturasProforma.VerFacturas(const ID_Cliente: Integer;
+  const ANombreCliente: String);
+var
+  AFacturasProformaController : IFacturasProformaController;
+  AFacturasProforma : IBizFacturaProforma;
+  AText : String;
+begin
+  AText := Format('Lista de facturas proforma %s', [ANombreCliente]);
+  AFacturasProformaController := TFacturasProformaController.Create;
+  try
+    ShowHourglassCursor;
+    try
+      AFacturasProforma := AFacturasProformaController.BuscarTodos(ID_Cliente);      
+    finally
+      HideHourglassCursor;
+    end;
+    AFacturasProformaController.VerTodos(AFacturasProforma, True, AText);
+  finally
+    AFacturasProforma := NIL;
+    AFacturasProformaController := NIL;
+  end;
+end;
+
+
+initialization
+  RegisterModuleClass(TPluginFacturasProforma);
+
+finalization
+  UnRegisterModuleClass(TPluginFacturasProforma);
+
+end.

Source/Modulos/Facturas proforma/Servidor/srvFacturasProforma_Impl.dfm

@@ -195,6 +195,10 @@ object srvFacturasProforma: TsrvFacturasProforma
               item
                 DatasetField = 'ID_FACTURA_FINAL'
                 TableField = 'ID_FACTURA_FINAL'
+              end
+              item
+                DatasetField = 'REFERENCIA_CLIENTE'
+                TableField = 'REFERENCIA_CLIENTE'
               end>
           end>
         Name = 'FacturasProforma'
@@ -203,7 +207,9 @@ object srvFacturasProforma: TsrvFacturasProforma
             Name = 'ID'
             DataType = datAutoInc
             GeneratorName = 'GEN_FACTURAS_PROFORMA_ID'
+            ServerAutoRefresh = True
             DictionaryEntry = 'FacturasProforma_ID'
+            InPrimaryKey = True
           end
           item
             Name = 'ID_EMPRESA'
@@ -386,6 +392,11 @@ object srvFacturasProforma: TsrvFacturasProforma
             Size = 255
             DictionaryEntry = 'FacturasProforma_DATOS_BANCARIOS'
           end
+          item
+            Name = 'REFERENCIA_CLIENTE'
+            DataType = datString
+            Size = 255
+          end
           item
             Name = 'ID_PEDIDO'
             DataType = datInteger
@@ -486,10 +497,10 @@ object srvFacturasProforma: TsrvFacturasProforma
           item
             Name = 'ID'
             DataType = datAutoInc
-            GeneratorName = 'GEN_FACTURAS_PROFORMA_DETALLES_ID'
+            GeneratorName = 'GEN_FACTURAS_PROFORMA_DET_ID'
-            LogChanges = False
+            ServerAutoRefresh = True
-            ReadOnly = True
+            DictionaryEntry = 'FacturasProforma_Detalles_ID'
-            ServerCalculated = True
+            InPrimaryKey = True
           end
           item
             Name = 'ID_FACTURA'
@@ -593,7 +604,7 @@ object srvFacturasProforma: TsrvFacturasProforma
           item
             Name = 'ID'
             DataType = datAutoInc
-            GeneratorName = 'GEN_FACTURA_CLIENTE_DET_ID'
+            GeneratorName = 'GEN_FACTURAS_PROFORMA_DET_ID'
             Value = ''
           end
           item
@@ -1033,6 +1044,8 @@ object srvFacturasProforma: TsrvFacturasProforma
           end
           item
             Name = 'SITUACION'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
@@ -1181,14 +1194,18 @@ object srvFacturasProforma: TsrvFacturasProforma
           end
           item
             Name = 'REFERENCIA_CLIENTE'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'ID_PEDIDO'
+            DataType = datInteger
             Value = ''
           end
           item
             Name = 'ID_FACTURA_FINAL'
+            DataType = datInteger
             Value = ''
           end
           item
@@ -1287,302 +1304,6 @@ object srvFacturasProforma: TsrvFacturasProforma
   end
   object DataDictionary: TDADataDictionary
     Fields = <
-      item
-        Name = 'FacturasCliente_CLIENTE_FINAL'
-        DataType = datString
-        Size = 255
-        DisplayLabel = 'Cliente final'
-      end
-      item
-        Name = 'FacturasCliente_ID'
-        DataType = datAutoInc
-        GeneratorName = 'GEN_FACTURAS_CLIENTE_ID'
-        Required = True
-        DisplayLabel = 'ID'
-        ServerAutoRefresh = True
-      end
-      item
-        Name = 'FacturasCliente_ID_EMPRESA'
-        DataType = datInteger
-        DisplayLabel = 'ID_EMPRESA'
-      end
-      item
-        Name = 'FacturasCliente_FECHA_FACTURA'
-        DataType = datDateTime
-        DisplayLabel = 'Fecha de las factura'
-      end
-      item
-        Name = 'FacturasCliente_VENCIMIENTO'
-        DataType = datInteger
-        DisplayLabel = 'Vencimiento'
-      end
-      item
-        Name = 'FacturasCliente_SITUACION'
-        DataType = datString
-        Size = 255
-        DisplayLabel = 'Situaci'#243'n'
-      end
-      item
-        Name = 'FacturasCliente_BASE_IMPONIBLE'
-        DataType = datCurrency
-        DisplayLabel = 'Base imponible'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'FacturasCliente_IMPORTE_DESCUENTO'
-        DataType = datCurrency
-        DisplayLabel = 'Importe dto.'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'FacturasCliente_IMPORTE_IVA'
-        DataType = datCurrency
-        DisplayLabel = 'Importe IVA'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'FacturasCliente_IMPORTE_TOTAL'
-        DataType = datCurrency
-        DisplayLabel = 'Importe total'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'FacturasCliente_FORMA_PAGO'
-        DataType = datMemo
-        DisplayLabel = 'Forma de pago'
-      end
-      item
-        Name = 'FacturasCliente_ID_CLIENTE'
-        DataType = datInteger
-        DisplayLabel = 'ID_CLIENTE'
-      end
-      item
-        Name = 'FacturasCliente_NIF_CIF'
-        DataType = datString
-        Size = 15
-        DisplayLabel = 'NIF/CIF'
-      end
-      item
-        Name = 'FacturasCliente_CODIGO_POSTAL'
-        DataType = datString
-        Size = 10
-        DisplayLabel = 'C'#243'd. postal'
-      end
-      item
-        Name = 'FacturasCliente_FECHA_ALTA'
-        DataType = datDateTime
-        DisplayLabel = 'FECHA_ALTA'
-      end
-      item
-        Name = 'FacturasCliente_FECHA_MODIFICACION'
-        DataType = datDateTime
-        DisplayLabel = 'FECHA_MODIFICACION'
-      end
-      item
-        Name = 'FacturasCliente_OBSERVACIONES'
-        DataType = datMemo
-        DisplayLabel = 'Observaciones'
-      end
-      item
-        Name = 'FacturasCliente_NOMBRE'
-        DataType = datString
-        Size = 100
-        DisplayLabel = 'Cliente'
-      end
-      item
-        Name = 'FacturasCliente_CALLE'
-        DataType = datString
-        Size = 150
-        DisplayLabel = 'Direcci'#243'n'
-      end
-      item
-        Name = 'FacturasCliente_PROVINCIA'
-        DataType = datString
-        Size = 30
-        DisplayLabel = 'Provincia'
-      end
-      item
-        Name = 'FacturasCliente_POBLACION'
-        DataType = datString
-        Size = 150
-        DisplayLabel = 'Poblaci'#243'n'
-      end
-      item
-        Name = 'FacturasCliente_IVA'
-        DataType = datFloat
-        DisplayLabel = 'IVA'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'FacturasCliente_USUARIO'
-        DataType = datString
-        Size = 100
-        DisplayLabel = 'USUARIO'
-      end
-      item
-        Name = 'FacturasCliente_DESCUENTO'
-        DataType = datFloat
-        DisplayLabel = 'Dto.'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'FacturasCliente_Detalles_ID'
-        DataType = datAutoInc
-        GeneratorName = 'GEN_FACTURA_CLIENTE_DETALLES_ID'
-        Required = True
-        DisplayLabel = 'ID'
-        ServerAutoRefresh = True
-      end
-      item
-        Name = 'FacturasCliente_Detalles_ID_FACTURA'
-        DataType = datInteger
-        DisplayLabel = 'ID_FACTURA'
-      end
-      item
-        Name = 'FacturasCliente_Detalles_TIPO_DETALLE'
-        DataType = datString
-        Size = 25
-        DisplayLabel = 'Tipo detalle'
-      end
-      item
-        Name = 'FacturasCliente_Detalles_CONCEPTO'
-        DataType = datString
-        Size = 2000
-        DisplayLabel = 'Concepto'
-      end
-      item
-        Name = 'FacturasCliente_Detalles_IMPORTE_UNIDAD'
-        DataType = datCurrency
-        DisplayLabel = 'Importe unidad'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'FacturasCliente_Detalles_IMPORTE_TOTAL'
-        DataType = datCurrency
-        DisplayLabel = 'Importe total'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'FacturasCliente_Detalles_VISIBLE'
-        DataType = datInteger
-        DisplayLabel = #191'Visible?'
-      end
-      item
-        Name = 'FacturasCliente_Detalles_POSICION'
-        DataType = datInteger
-        DisplayLabel = 'Posici'#243'n'
-      end
-      item
-        Name = 'FacturasCliente_Detalles_CANTIDAD'
-        DataType = datFloat
-        DisplayLabel = 'Cantidad'
-      end
-      item
-        Name = 'FacturasCliente_FECHA_PAGADO'
-        DataType = datDateTime
-        DisplayLabel = 'Fecha de pago'
-      end
-      item
-        Name = 'FacturasCliente_FECHA_VENCIMIENTO'
-        DataType = datDateTime
-        DisplayLabel = 'Fecha de vencimiento'
-        ServerAutoRefresh = True
-      end
-      item
-        Name = 'FacturasCliente_RE'
-        DataType = datFloat
-        DisplayLabel = 'RE'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'FacturasCliente_IMPORTE_RE'
-        DataType = datCurrency
-        DisplayLabel = 'Importe RE'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'FacturasCliente_REFERENCIA'
-        DataType = datString
-        Size = 20
-        DisplayLabel = 'Referencia'
-        ServerAutoRefresh = True
-      end
-      item
-        Name = 'FacturasCliente_ID_FORMA_PAGO'
-        DataType = datInteger
-      end
-      item
-        Name = 'FacturasCliente_IMPORTE_NETO'
-        DataType = datCurrency
-        DisplayLabel = 'Importe neto'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'FacturasCliente_IMPORTE_PORTE'
-        DataType = datCurrency
-        DisplayLabel = 'Importe del porte'
-        Alignment = taRightJustify
-      end
-      item
-        Name = 'FacturasCliente_RECARGO_EQUIVALENCIA'
-        DataType = datSmallInt
-        DisplayLabel = #191'Con R.E.?'
-      end
-      item
-        Name = 'FacturasCliente_TIPO'
-        DataType = datString
-        Size = 1
-        DisplayLabel = 'Tipo'
-      end
-      item
-        Name = 'FacturasCliente_ID_TIPO_IVA'
-        DataType = datInteger
-        DisplayLabel = 'ID_TIPO_IVA'
-      end
-      item
-        Name = 'FacturasCliente_ID_COMISION_LIQUIDADA'
-        DataType = datInteger
-        DisplayLabel = 'ID_COMISION_LIQUIDADA'
-      end
-      item
-        Name = 'FacturasCliente_REFERENCIA_COMISION'
-        DataType = datString
-        Size = 255
-        DisplayLabel = 'REFERENCIA_COMISION'
-      end
-      item
-        Name = 'FacturasCliente_ID_AGENTE'
-        DataType = datInteger
-        DisplayLabel = 'ID_AGENTE'
-      end
-      item
-        Name = 'FacturasCliente_Detalles_ID_ARTICULO'
-        DataType = datInteger
-      end
-      item
-        Name = 'FacturasCliente_Detalles_DESCUENTO'
-        DataType = datFloat
-      end
-      item
-        Name = 'FacturasCliente_Detalles_IMPORTE_PORTE'
-        DataType = datCurrency
-      end
-      item
-        Name = 'FacturasCliente_Detalles_REFERENCIA'
-        DataType = datString
-        Size = 255
-      end
-      item
-        Name = 'FacturasCliente_Detalles_REFERENCIA_PROVEEDOR'
-        DataType = datString
-        Size = 255
-      end
-      item
-        Name = 'FacturasCliente_DATOS_BANCARIOS'
-        DataType = datString
-        Size = 255
-        DisplayLabel = 'Datos bancarios'
-      end
       item
         Name = 'FacturasProforma_ID'
         DataType = datAutoInc
@@ -1754,12 +1475,6 @@ object srvFacturasProforma: TsrvFacturasProforma
         DataType = datString
         Size = 255
       end
-      item
-        Name = 'FacturasProforma_Detalles_ID'
-        DataType = datAutoInc
-        GeneratorName = 'GEN_FACTURAS_PROFORMA_DETALLES_ID'
-        DisplayLabel = 'ID'
-      end
       item
         Name = 'FacturasProforma_Detalles_ID_FACTURA'
         DataType = datInteger
@@ -1810,6 +1525,13 @@ object srvFacturasProforma: TsrvFacturasProforma
         Name = 'FacturasProforma_Detalles_REFERENCIA_PROVEEDOR'
         DataType = datString
         Size = 255
+      end
+      item
+        Name = 'FacturasProforma_Detalles_ID'
+        DataType = datAutoInc
+        GeneratorName = 'GEN_FACTURAS_PROFORMA_DET_ID'
+        DisplayLabel = 'ID'
+        ServerAutoRefresh = True
       end>
     Left = 150
     Top = 22
@@ -1824,7 +1546,7 @@ object srvFacturasProforma: TsrvFacturasProforma
     DeleteCommandName = 'Delete_FacturasProforma'
     UpdateCommandName = 'Update_FacturasProforma'
     ReferencedDataset = 'FacturasProforma'
-    ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands]
+    ProcessorOptions = [poPrepareCommands]
     UpdateMode = updWhereKeyOnly
     Left = 248
     Top = 24
@@ -1835,7 +1557,7 @@ object srvFacturasProforma: TsrvFacturasProforma
     DeleteCommandName = 'Delete_FacturasProforma_Detalles'
     UpdateCommandName = 'Update_FacturasProforma_Detalles'
     ReferencedDataset = 'FacturasProforma_Detalles'
-    ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands]
+    ProcessorOptions = [poPrepareCommands]
     UpdateMode = updWhereKeyOnly
     Left = 248
     Top = 77

Source/Modulos/Facturas proforma/Views/FacturasProforma_view.dpk

@@ -29,7 +29,6 @@ requires
   GUIBase,
   ApplicationBase,
   Contactos_view,
-  Articulos_view,
   rtl,
   vcl,
   cxLibraryD11,
@@ -66,7 +65,8 @@ requires
   Jcl,
   JvCoreD11R,
   JvSystemD11R,
-  JvPageCompsD11R;
+  JvPageCompsD11R,
+  Articulos_view;
 
 contains
   uFacturasProformaViewRegister in 'uFacturasProformaViewRegister.pas',

Source/Modulos/Facturas proforma/Views/FacturasProforma_view.dproj

@@ -49,42 +49,48 @@
     <DelphiCompile Include="FacturasProforma_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="adortl.dcp" />
+    <DCCReference Include="..\..\Lib\adortl.dcp" />
-    <DCCReference Include="ApplicationBase.dcp" />
+    <DCCReference Include="..\..\Lib\ApplicationBase.dcp" />
-    <DCCReference Include="Articulos_view.dcp" />
+    <DCCReference Include="..\..\Lib\Articulos_view.dcp" />
-    <DCCReference Include="Base.dcp" />
+    <DCCReference Include="..\..\Lib\Base.dcp" />
-    <DCCReference Include="Contactos_view.dcp" />
+    <DCCReference Include="..\..\Lib\Contactos_view.dcp" />
-    <DCCReference Include="cxDataD11.dcp" />
+    <DCCReference Include="..\..\Lib\cxDataD11.dcp" />
-    <DCCReference Include="cxEditorsD11.dcp" />
+    <DCCReference Include="..\..\Lib\cxEditorsD11.dcp" />
-    <DCCReference Include="cxExportD11.dcp" />
+    <DCCReference Include="..\..\Lib\cxExportD11.dcp" />
-    <DCCReference Include="cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\..\Lib\cxExtEditorsD11.dcp" />
-    <DCCReference Include="cxGridD11.dcp" />
+    <DCCReference Include="..\..\Lib\cxGridD11.dcp" />
-    <DCCReference Include="cxLibraryD11.dcp" />
+    <DCCReference Include="..\..\Lib\cxLibraryD11.dcp" />
-    <DCCReference Include="cxPageControlD11.dcp" />
+    <DCCReference Include="..\..\Lib\cxPageControlD11.dcp" />
-    <DCCReference Include="DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\..\Lib\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="dbrtl.dcp" />
+    <DCCReference Include="..\..\Lib\dbrtl.dcp" />
-    <DCCReference Include="designide.dcp" />
+    <DCCReference Include="..\..\Lib\designide.dcp" />
-    <DCCReference Include="dsnap.dcp" />
+    <DCCReference Include="..\..\Lib\dsnap.dcp" />
-    <DCCReference Include="dxCoreD11.dcp" />
+    <DCCReference Include="..\..\Lib\dxCoreD11.dcp" />
-    <DCCReference Include="dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\..\Lib\dxGDIPlusD11.dcp" />
-    <DCCReference Include="dxThemeD11.dcp" />
+    <DCCReference Include="..\..\Lib\dxThemeD11.dcp" />
-    <DCCReference Include="FacturasProforma_controller.dcp" />
+    <DCCReference Include="..\..\Lib\FacturasProforma_controller.dcp" />
-    <DCCReference Include="FacturasProforma_model.dcp" />
+    <DCCReference Include="..\..\Lib\FacturasProforma_model.dcp" />
-    <DCCReference Include="GUIBase.dcp" />
+    <DCCReference Include="..\..\Lib\GUIBase.dcp" />
-    <DCCReference Include="GUISDK_D11R.dcp" />
+    <DCCReference Include="..\..\Lib\GUISDK_D11R.dcp" />
-    <DCCReference Include="Jcl.dcp" />
+    <DCCReference Include="..\..\Lib\Jcl.dcp" />
-    <DCCReference Include="JclVcl.dcp" />
+    <DCCReference Include="..\..\Lib\JclVcl.dcp" />
-    <DCCReference Include="JSDialog100.dcp" />
+    <DCCReference Include="..\..\Lib\JSDialog100.dcp" />
-    <DCCReference Include="JvCoreD11R.dcp" />
+    <DCCReference Include="..\..\Lib\JvCoreD11R.dcp" />
-    <DCCReference Include="JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\..\Lib\JvPageCompsD11R.dcp" />
-    <DCCReference Include="JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\..\Lib\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="JvSystemD11R.dcp" />
+    <DCCReference Include="..\..\Lib\JvSystemD11R.dcp" />
-    <DCCReference Include="PngComponentsD10.dcp" />
+    <DCCReference Include="..\..\Lib\PngComponentsD10.dcp" />
-    <DCCReference Include="PNG_D10.dcp" />
+    <DCCReference Include="..\..\Lib\PNG_D10.dcp" />
-    <DCCReference Include="RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\..\Lib\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="rtl.dcp" />
+    <DCCReference Include="..\..\Lib\rtl.dcp" />
-    <DCCReference Include="tb2k_d10.dcp" />
+    <DCCReference Include="..\..\Lib\tb2k_d10.dcp" />
-    <DCCReference Include="tbx_d10.dcp" />
+    <DCCReference Include="..\..\Lib\tbx_d10.dcp" />
+    <DCCReference Include="..\..\Lib\vcl.dcp" />
+    <DCCReference Include="..\..\Lib\vclactnband.dcp" />
+    <DCCReference Include="..\..\Lib\vcldb.dcp" />
+    <DCCReference Include="..\..\Lib\vcljpg.dcp" />
+    <DCCReference Include="..\..\Lib\vclx.dcp" />
+    <DCCReference Include="..\..\Lib\xmlrtl.dcp" />
     <DCCReference Include="uDialogListaFacturasProformaEnvioEMail.pas">
       <Form>fDialogListaFacturasProformaEnvioEMail</Form>
       <DesignClass>TForm</DesignClass>
@@ -98,7 +104,7 @@
       <DesignClass>TForm</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorElegirFacturasProforma.pas">
-      <Form>fEditorElegirFacturasProformal</Form>
+      <Form>fEditorElegirFacturasProforma</Form>
       <DesignClass>TForm</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorFacturaProforma.pas">
@@ -133,12 +139,6 @@
       <Form>frViewFacturasProforma</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
-    <DCCReference Include="vcl.dcp" />
-    <DCCReference Include="vclactnband.dcp" />
-    <DCCReference Include="vcldb.dcp" />
-    <DCCReference Include="vcljpg.dcp" />
-    <DCCReference Include="vclx.dcp" />
-    <DCCReference Include="xmlrtl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line

Source/Modulos/Facturas proforma/Views/uEditorFacturaProforma.dfm

@@ -118,12 +118,6 @@ inherited fEditorFacturaProforma: TfEditorFacturaProforma
           Height = 290
           ExplicitWidth = 809
           ExplicitHeight = 290
-          inherited Label1: TLabel
-            Left = 448
-            Width = 311
-            ExplicitLeft = 448
-            ExplicitWidth = 311
-          end
           inherited eReferencia: TcxDBTextEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
@@ -159,8 +153,8 @@ inherited fEditorFacturaProforma: TfEditorFacturaProforma
             Width = 269
           end
           inherited bFormasPago: TButton
-            Left = 266
+            Left = 275
-            ExplicitLeft = 266
+            ExplicitLeft = 275
           end
           inherited cbCuentaBancaria: TcxDBComboBox
             Style.LookAndFeel.SkinName = ''
@@ -170,21 +164,7 @@ inherited fEditorFacturaProforma: TfEditorFacturaProforma
             ExplicitWidth = 165
             Width = 165
           end
-          inherited cbClienteFinal: TcxDBTextEdit
+          inherited edtFechaVencimiento: TcxDBDateEdit
-            Left = 448
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 448
-            ExplicitWidth = 339
-            Width = 339
-          end
-          inherited bElegirClienteFinal: TButton
-            Left = 736
-            ExplicitLeft = 736
-          end
-          inherited edtFechaVemcimiento: TcxDBDateEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
@@ -193,12 +173,13 @@ inherited fEditorFacturaProforma: TfEditorFacturaProforma
             Width = 275
           end
           inherited frViewDatosYSeleccionClienteFacturaProforma1: TfrViewDatosYSeleccionClienteFacturaProforma
-            Left = 437
+            Left = 446
             Width = 467
-            ExplicitLeft = 437
+            ExplicitLeft = 446
             ExplicitWidth = 467
             inherited dxLayoutControl1: TdxLayoutControl
               Width = 467
+              ExplicitWidth = 467
               inherited edtlNombre: TcxDBTextEdit
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
@@ -208,22 +189,20 @@ inherited fEditorFacturaProforma: TfEditorFacturaProforma
                 Width = 224
               end
               inherited edtNIFCIF: TcxDBTextEdit
-                Left = 220
+                Left = 228
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
-                ExplicitLeft = 220
+                ExplicitLeft = 228
               end
               inherited Button3: TBitBtn
-                Left = 131
+                Left = 139
-                Top = 199
+                ExplicitLeft = 139
-                ExplicitLeft = 131
-                ExplicitTop = 199
               end
               inherited Button4: TButton
-                Left = 300
+                Left = 308
-                ExplicitLeft = 300
+                ExplicitLeft = 308
               end
               inherited edtDireccion: TcxMemo
                 Style.LookAndFeel.SkinName = ''
@@ -241,10 +220,6 @@ inherited fEditorFacturaProforma: TfEditorFacturaProforma
     object pagContenido: TTabSheet
       Caption = 'Contenido'
       ImageIndex = 1
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       inline frViewDetallesFacturaProforma1: TfrViewDetallesFacturaProforma
         Left = 0
         Top = 0
@@ -265,103 +240,108 @@ inherited fEditorFacturaProforma: TfEditorFacturaProforma
         ExplicitHeight = 290
         inherited ToolBar1: TToolBar
           Width = 809
-          Height = 46
+          Height = 51
           ExplicitWidth = 809
-          ExplicitHeight = 46
+          ExplicitHeight = 51
           inherited ToolButton3: TToolButton
             Wrap = False
           end
           inherited ToolButton4: TToolButton
             Left = 278
             Top = 0
-            Wrap = True
             ExplicitLeft = 278
             ExplicitTop = 0
           end
-          inherited ToolButton14: TToolButton
-            Left = 0
-            Wrap = False
-            ExplicitLeft = 0
-          end
           inherited FontName: TJvFontComboBox
-            Left = 65
+            Left = 334
-            Top = 22
+            Top = 0
-            ExplicitLeft = 65
+            ExplicitLeft = 334
-            ExplicitTop = 22
+            ExplicitTop = 0
+          end
+          inherited ToolButton14: TToolButton
+            Left = 479
+            Top = 0
+            ExplicitLeft = 479
+            ExplicitTop = 0
           end
           inherited FontSize: TEdit
-            Left = 210
+            Left = 544
-            Top = 22
+            Top = 0
             Width = 58
-            ExplicitLeft = 210
+            ExplicitLeft = 544
-            ExplicitTop = 22
+            ExplicitTop = 0
             ExplicitWidth = 58
           end
           inherited UpDown1: TUpDown
-            Left = 268
+            Left = 602
-            Top = 22
+            Top = 0
-            ExplicitLeft = 268
+            ExplicitLeft = 602
-            ExplicitTop = 22
+            ExplicitTop = 0
           end
           inherited ToolButton13: TToolButton
-            Left = 285
+            Left = 0
-            Top = 22
+            Top = 0
-            ExplicitLeft = 285
+            Wrap = True
-            ExplicitTop = 22
+            ExplicitLeft = 0
-          end
+            ExplicitTop = 0
-          inherited ToolButton6: TToolButton
+            ExplicitHeight = 27
-            Left = 293
-            Top = 22
-            ExplicitLeft = 293
-            ExplicitTop = 22
-          end
-          inherited ToolButton7: TToolButton
-            Left = 359
-            Top = 22
-            ExplicitLeft = 359
-            ExplicitTop = 22
-          end
-          inherited ToolButton8: TToolButton
-            Left = 426
-            Top = 22
-            ExplicitLeft = 426
-            ExplicitTop = 22
-          end
-          inherited ToolButton12: TToolButton
-            Left = 509
-            Top = 22
-            ExplicitLeft = 509
-            ExplicitTop = 22
-          end
-          inherited ToolButton9: TToolButton
-            Left = 517
-            Top = 22
-            ExplicitLeft = 517
-            ExplicitTop = 22
-          end
-          inherited ToolButton10: TToolButton
-            Left = 662
-            Top = 22
-            ExplicitLeft = 662
-            ExplicitTop = 22
           end
           inherited ToolButton11: TToolButton
-            Left = 787
+            Left = 0
-            Top = 22
+            Top = 27
-            ExplicitLeft = 787
+            ExplicitLeft = 0
-            ExplicitTop = 22
+            ExplicitTop = 27
+          end
+          inherited ToolButton12: TToolButton
+            Left = 141
+            Top = 27
+            Wrap = False
+            ExplicitLeft = 141
+            ExplicitTop = 27
+            ExplicitHeight = 22
+          end
+          inherited ToolButton9: TToolButton
+            Left = 149
+            Top = 27
+            ExplicitLeft = 149
+            ExplicitTop = 27
+          end
+          inherited ToolButton10: TToolButton
+            Left = 294
+            Top = 27
+            ExplicitLeft = 294
+            ExplicitTop = 27
+          end
+          inherited ToolButton6: TToolButton
+            Left = 419
+            Top = 27
+            ExplicitLeft = 419
+            ExplicitTop = 27
+          end
+          inherited ToolButton7: TToolButton
+            Left = 485
+            Top = 27
+            Wrap = False
+            ExplicitLeft = 485
+            ExplicitTop = 27
+          end
+          inherited ToolButton8: TToolButton
+            Left = 552
+            Top = 27
+            ExplicitLeft = 552
+            ExplicitTop = 27
           end
         end
         inherited cxGrid: TcxGrid
-          Top = 72
+          Top = 77
           Width = 809
-          Height = 218
+          Height = 213
           ExplicitTop = 77
           ExplicitWidth = 809
           ExplicitHeight = 213
         end
         inherited TBXDock1: TTBXDock
-          Top = 46
+          Top = 51
           Width = 809
           ExplicitTop = 51
           ExplicitWidth = 809
@@ -414,30 +394,30 @@ inherited fEditorFacturaProforma: TfEditorFacturaProforma
       ExplicitWidth = 823
       ExplicitHeight = 192
       inherited Bevel3: TBevel
-        Left = 411
+        Left = 365
-        Height = 122
+        Height = 100
-        ExplicitLeft = 411
+        ExplicitLeft = 365
-        ExplicitHeight = 122
+        ExplicitHeight = 100
       end
       inherited Bevel4: TBevel
-        Left = 523
+        Left = 477
         Top = 58
         Width = 192
-        ExplicitLeft = 523
+        ExplicitLeft = 477
         ExplicitTop = 58
         ExplicitWidth = 192
       end
       inherited Bevel1: TBevel
-        Left = 523
+        Left = 477
         Top = 162
         Width = 368
-        ExplicitLeft = 523
+        ExplicitLeft = 477
         ExplicitTop = 162
         ExplicitWidth = 368
       end
       inherited Bevel2: TBevel
-        Width = 368
+        Width = 264
-        ExplicitWidth = 368
+        ExplicitWidth = 264
       end
       inherited ImporteDto: TcxDBCurrencyEdit
         Enabled = False
@@ -450,27 +430,27 @@ inherited fEditorFacturaProforma: TfEditorFacturaProforma
         Width = 184
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 594
+        Left = 548
         Top = 81
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 594
+        ExplicitLeft = 548
         ExplicitTop = 81
         ExplicitWidth = 249
         Width = 249
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 524
+        Left = 478
         Top = 135
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 524
+        ExplicitLeft = 478
         ExplicitTop = 135
         ExplicitWidth = 319
         Width = 319
@@ -483,47 +463,47 @@ inherited fEditorFacturaProforma: TfEditorFacturaProforma
         StyleHot.LookAndFeel.SkinName = ''
       end
       inherited edtIVA: TcxDBSpinEdit
-        Left = 523
+        Left = 477
         Top = 81
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 523
+        ExplicitLeft = 477
         ExplicitTop = 81
       end
       inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 523
+        Left = 477
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 523
+        ExplicitLeft = 477
         ExplicitWidth = 320
         Width = 320
       end
       inherited edtRE: TcxDBSpinEdit
-        Left = 523
+        Left = 477
         Top = 108
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 523
+        ExplicitLeft = 477
         ExplicitTop = 108
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 594
+        Left = 548
         Top = 108
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 594
+        ExplicitLeft = 548
         ExplicitTop = 108
         ExplicitWidth = 249
         Width = 249
@@ -555,8 +535,8 @@ inherited fEditorFacturaProforma: TfEditorFacturaProforma
         Width = 117
       end
       inherited bTiposIVA: TButton
-        Left = 263
+        Left = 217
-        ExplicitLeft = 263
+        ExplicitLeft = 217
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox
         Style.LookAndFeel.SkinName = ''
@@ -567,34 +547,33 @@ inherited fEditorFacturaProforma: TfEditorFacturaProforma
         Width = 255
       end
       inherited edtRetencion: TcxDBSpinEdit
-        Left = 523
+        Left = 477
         Top = 182
-        DataBinding.DataField = 'RETENCION'
+        Enabled = False
         Properties.AssignedValues.MinValue = True
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 523
+        ExplicitLeft = 477
         ExplicitTop = 182
       end
       inherited edtImporteRetencion: TcxDBCurrencyEdit
-        Left = 594
+        Left = 548
         Top = 182
-        DataBinding.DataField = 'IMPORTE_RETENCION'
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 594
+        ExplicitLeft = 548
         ExplicitTop = 182
         ExplicitWidth = 152
         Width = 152
       end
       inherited edtFechaRetencion: TcxDBDateEdit
-        DataBinding.DataField = 'FECHA_RETENCION'
+        Enabled = False
         Style.LookAndFeel.SkinName = ''
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
@@ -613,6 +592,9 @@ inherited fEditorFacturaProforma: TfEditorFacturaProforma
             inherited dxLayoutControl1Item19: TdxLayoutItem
               Visible = False
             end
+            inherited dxLayoutControl1Item21: TdxLayoutItem
+              Enabled = False
+            end
           end
           inherited dxLayoutControl1Group5: TdxLayoutGroup
             inherited dxLayoutControl1Group3: TdxLayoutGroup
@@ -625,6 +607,12 @@ inherited fEditorFacturaProforma: TfEditorFacturaProforma
                   Visible = True
                 end
               end
+              inherited dxLayoutControl1Item10: TdxLayoutItem
+                Visible = False
+              end
+              inherited dxLayoutControl1Group11: TdxLayoutGroup
+                Enabled = False
+              end
             end
           end
         end

Source/Modulos/Facturas proforma/Views/uEditorFacturasProforma.dfm

@@ -39,20 +39,10 @@ inherited fEditorFacturasProforma: TfEditorFacturasProforma
     ExplicitWidth = 842
     inherited tbxMain: TTBXToolbar
       ExplicitWidth = 842
-      object TBXSubmenuItem2: TTBXSubmenuItem [0]
-        Caption = 'Nuevo'
-        DisplayMode = nbdmImageAndText
-        ImageIndex = 22
-        Images = SmallImages
-        object TBXItem39: TTBXItem
-          Action = actNuevaFactura
-          Caption = 'Nueva factura...'
-        end
-      end
       inherited TBXItem2: TTBXItem
-        Visible = False
+        Action = actNuevaFactura
       end
-      object TBXItem40: TTBXItem [14]
+      object TBXItem40: TTBXItem [13]
         Action = actEnviarEMail
         DisplayMode = nbdmImageAndText
       end
@@ -97,11 +87,14 @@ inherited fEditorFacturasProforma: TfEditorFacturasProforma
     ParentFont = False
     TabOrder = 3
     ReadOnly = False
-    ExplicitLeft = 177
+    ExplicitTop = 102
-    ExplicitTop = 248
+    ExplicitWidth = 842
+    ExplicitHeight = 545
     inherited cxGrid: TcxGrid
       Width = 842
       Height = 417
+      ExplicitWidth = 842
+      ExplicitHeight = 417
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.FooterSummaryItems = <
           item
@@ -116,9 +109,12 @@ inherited fEditorFacturasProforma: TfEditorFacturasProforma
     end
     inherited frViewFiltroBase1: TfrViewFiltroBase
       Width = 842
+      ExplicitWidth = 842
       inherited TBXDockablePanel1: TTBXDockablePanel
+        ExplicitWidth = 842
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 842
+          ExplicitWidth = 842
           inherited txtFiltroTodo: TcxTextEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
@@ -150,18 +146,24 @@ inherited fEditorFacturasProforma: TfEditorFacturasProforma
         end
         inherited TBXAlignmentPanel1: TTBXAlignmentPanel
           Width = 842
+          ExplicitWidth = 842
           inherited tbxBotones: TTBXToolbar
             Width = 832
+            ExplicitWidth = 832
           end
         end
       end
     end
     inherited pnlAgrupaciones: TTBXDockablePanel
       Top = 519
+      ExplicitTop = 519
+      ExplicitWidth = 842
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 842
+        ExplicitWidth = 842
         inherited TBXToolbar1: TTBXToolbar
           Width = 832
+          ExplicitWidth = 832
         end
       end
     end
@@ -201,7 +203,7 @@ inherited fEditorFacturasProforma: TfEditorFacturasProforma
     end
     object actNuevaFactura: TAction
       Category = 'Archivo'
-      Caption = 'Factura'
+      Caption = 'Nuevo'
       ImageIndex = 23
       OnExecute = actNuevaFacturaExecute
     end
@@ -1755,6 +1757,8 @@ inherited fEditorFacturasProforma: TfEditorFacturasProforma
   end
   inherited dsDataTable: TDADataSource [9]
   end
+  inherited StatusBarImages: TPngImageList [10]
+  end
   inherited GridPopupMenu: TPopupMenu
     inherited N2: TMenuItem
       Visible = False

Source/Modulos/Facturas proforma/Views/uEditorFacturasProforma.pas

@@ -28,9 +28,7 @@ type
     JsListaFacturasGeneradas: TJSDialog;
     JsPrevisualizarDialog: TJSDialog;
     JsImprimirDialog: TJSDialog;
-    TBXSubmenuItem2: TTBXSubmenuItem;
     actNuevaFactura: TAction;
-    TBXItem39: TTBXItem;
     JsNuevoAbonoDialog: TJSDialog;
     JsListaFacturasNoEliminadas: TJSDialog;
     actEnviarEMail: TAction;

Source/Modulos/Facturas proforma/Views/uViewDatosYSeleccionClienteFacturaProforma.dfm

@@ -1,13 +1,13 @@
 inherited frViewDatosYSeleccionClienteFacturaProforma: TfrViewDatosYSeleccionClienteFacturaProforma
-  Width = 467
+  Width = 609
-  Height = 234
+  Height = 272
-  ExplicitWidth = 467
+  ExplicitWidth = 609
-  ExplicitHeight = 234
+  ExplicitHeight = 272
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 467
+    Width = 609
-    Height = 234
+    Height = 272
     Margins.Left = 0
     Margins.Top = 0
     Margins.Right = 0
@@ -17,9 +17,11 @@ inherited frViewDatosYSeleccionClienteFacturaProforma: TfrViewDatosYSeleccionCli
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
+    ExplicitWidth = 467
+    ExplicitHeight = 234
     DesignSize = (
-      467
+      609
-      234)
+      272)
     object edtlNombre: TcxDBTextEdit
       Left = 62
       Top = 41
@@ -48,7 +50,7 @@ inherited frViewDatosYSeleccionClienteFacturaProforma: TfrViewDatosYSeleccionCli
       Width = 224
     end
     object edtNIFCIF: TcxDBTextEdit
-      Left = 354
+      Left = 496
       Top = 41
       Anchors = [akLeft, akTop, akRight]
       AutoSize = False
@@ -163,8 +165,8 @@ inherited frViewDatosYSeleccionClienteFacturaProforma: TfrViewDatosYSeleccionCli
         FF00FF00FF00006000000060000000600000FF00FF00FF00FF00}
     end
     object Button3: TBitBtn
-      Left = 265
+      Left = 407
-      Top = 199
+      Top = 135
       Width = 192
       Height = 25
       Action = actVerContacto
@@ -207,7 +209,7 @@ inherited frViewDatosYSeleccionClienteFacturaProforma: TfrViewDatosYSeleccionCli
         FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00}
     end
     object Button4: TButton
-      Left = 434
+      Left = 576
       Top = 68
       Width = 23
       Height = 25
@@ -261,7 +263,6 @@ inherited frViewDatosYSeleccionClienteFacturaProforma: TfrViewDatosYSeleccionCli
       end
       object dxLayoutControl1Group2: TdxLayoutGroup
         AutoAligns = [aaHorizontal]
-        AlignVert = avClient
         ShowCaption = False
         Hidden = True
         ShowBorder = False

Source/Modulos/Facturas proforma/Views/uViewDetallesFacturaProforma.dfm

@@ -1,63 +1,40 @@
 inherited frViewDetallesFacturaProforma: TfrViewDetallesFacturaProforma
   inherited ToolBar1: TToolBar
-    Height = 95
-    ExplicitHeight = 95
     inherited FontName: TJvFontComboBox [4]
-      Left = 56
       Top = 22
-      ExplicitLeft = 56
       ExplicitTop = 22
     end
-    inherited ToolButton14: TToolButton [5]
+    inherited FontSize: TEdit [6]
-      Left = 201
+      Left = 210
-      Wrap = False
-      ExplicitLeft = 201
-    end
-    inherited FontSize: TEdit
-      Left = 266
       Top = 22
-      ExplicitLeft = 266
+      ExplicitLeft = 210
       ExplicitTop = 22
     end
-    inherited UpDown1: TUpDown
+    inherited UpDown1: TUpDown [7]
-      Left = 308
+      Left = 252
       Top = 22
-      ExplicitLeft = 308
+      ExplicitLeft = 252
       ExplicitTop = 22
     end
-    inherited ToolButton13: TToolButton
+    inherited ToolButton13: TToolButton [8]
-      Left = 325
+      Left = 269
-      Top = 22
+      ExplicitLeft = 269
-      ExplicitLeft = 325
-      ExplicitTop = 22
     end
     inherited ToolButton11: TToolButton [9]
-      Left = 333
+      Left = 277
       Top = 22
-      ExplicitLeft = 333
+      ExplicitLeft = 277
       ExplicitTop = 22
     end
     inherited ToolButton12: TToolButton [10]
-      Left = 0
-      Top = 22
-      Wrap = True
-      ExplicitLeft = 0
-      ExplicitTop = 22
-      ExplicitHeight = 27
     end
     inherited ToolButton9: TToolButton [11]
-      Left = 0
       Top = 49
-      ExplicitLeft = 0
       ExplicitTop = 49
     end
     inherited ToolButton10: TToolButton [12]
-      Left = 145
-      Top = 49
-      ExplicitLeft = 145
-      ExplicitTop = 49
     end
-    inherited ToolButton6: TToolButton [13]
+    inherited ToolButton6: TToolButton
       Left = 270
       Top = 49
       ExplicitLeft = 270
@@ -65,23 +42,15 @@ inherited frViewDetallesFacturaProforma: TfrViewDetallesFacturaProforma
     end
     inherited ToolButton7: TToolButton [14]
       Left = 336
-      Top = 49
-      Wrap = True
       ExplicitLeft = 336
-      ExplicitTop = 49
     end
     inherited ToolButton8: TToolButton [15]
       Left = 0
-      Top = 71
       ExplicitLeft = 0
-      ExplicitTop = 71
     end
   end
   inherited cxGrid: TcxGrid
-    Top = 121
+    ExplicitTop = 121
-    Height = 183
-    ExplicitTop = 99
-    ExplicitHeight = 205
     inherited cxGridView: TcxGridDBTableView
       inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn
         Visible = True
@@ -89,8 +58,6 @@ inherited frViewDetallesFacturaProforma: TfrViewDetallesFacturaProforma
     end
   end
   inherited TBXDock1: TTBXDock
-    Top = 95
-    ExplicitTop = 68
     inherited TBXToolbar1: TTBXToolbar
       object TBXItem18: TTBXItem [0]
         Action = actAnadirArticulos

Source/Modulos/Facturas proforma/Views/uViewFacturaProforma.dfm

@@ -1,6 +1,6 @@
 inherited frViewFacturaProforma: TfrViewFacturaProforma
-  Width = 451
+  Width = 992
-  Height = 304
+  Height = 644
   Align = alClient
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
@@ -9,27 +9,19 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 451
+    Width = 992
-    Height = 304
+    Height = 644
     Align = alClient
     ParentBackground = True
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
     LookAndFeel = dxLayoutOfficeLookAndFeel1
+    ExplicitWidth = 451
+    ExplicitHeight = 304
     DesignSize = (
-      451
+      992
-      304)
+      644)
-    object Label1: TLabel
-      Left = 354
-      Top = 295
-      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
@@ -82,7 +74,7 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
     end
     object memObservaciones: TcxDBMemo
       Left = 22
-      Top = 387
+      Top = 246
       Anchors = [akLeft, akTop, akRight, akBottom]
       DataBinding.DataField = 'OBSERVACIONES'
       DataBinding.DataSource = DADataSource
@@ -98,7 +90,7 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 9
+      TabOrder = 7
       Height = 345
       Width = 355
     end
@@ -140,7 +132,7 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
       Width = 269
     end
     object bFormasPago: TButton
-      Left = 172
+      Left = 416
       Top = 103
       Width = 132
       Height = 23
@@ -170,43 +162,7 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
       TabOrder = 5
       Width = 165
     end
-    object cbClienteFinal: TcxDBTextEdit
+    object edtFechaVencimiento: TcxDBDateEdit
-      Left = 354
-      Top = 329
-      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 = 410
-      Top = 327
-      Width = 23
-      Height = 25
-      Action = actElegirClienteFinal
-      TabOrder = 8
-    end
-    object edtFechaVemcimiento: TcxDBDateEdit
       Left = 146
       Top = 132
       Anchors = [akLeft, akTop, akRight]
@@ -233,10 +189,10 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
       Width = 275
     end
     inline frViewDatosYSeleccionClienteFacturaProforma1: TfrViewDatosYSeleccionClienteFacturaProforma
-      Left = 343
+      Left = 587
       Top = 36
-      Width = 467
+      Width = 387
-      Height = 234
+      Height = 180
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
       Font.Height = -11
@@ -245,9 +201,17 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
       ParentFont = False
       TabOrder = 6
       ReadOnly = False
-      ExplicitLeft = 343
+      ExplicitLeft = 587
       ExplicitTop = 36
+      ExplicitWidth = 387
+      ExplicitHeight = 180
       inherited dxLayoutControl1: TdxLayoutControl
+        Width = 387
+        Height = 180
+        ExplicitWidth = 101
+        DesignSize = (
+          387
+          180)
         inherited edtlNombre: TcxDBTextEdit
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
@@ -257,22 +221,20 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
           Width = 224
         end
         inherited edtNIFCIF: TcxDBTextEdit
-          Left = 171
+          Left = 270
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 171
+          ExplicitLeft = 270
         end
         inherited Button3: TBitBtn
-          Left = 82
+          Left = 181
-          Top = 182
+          ExplicitLeft = 181
-          ExplicitLeft = 82
-          ExplicitTop = 182
         end
         inherited Button4: TButton
-          Left = 251
+          Left = 350
-          ExplicitLeft = 251
+          ExplicitLeft = 350
         end
         inherited edtDireccion: TcxMemo
           Style.LookAndFeel.SkinName = ''
@@ -289,12 +251,13 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
       Hidden = True
       ShowBorder = False
       object dxLayoutControl1Group9: TdxLayoutGroup
+        AutoAligns = [aaHorizontal]
         ShowCaption = False
         Hidden = True
         LayoutDirection = ldHorizontal
         ShowBorder = False
         object dxLayoutControl1Group1: TdxLayoutGroup
-          AutoAligns = [aaVertical]
+          AutoAligns = []
           AlignHorz = ahClient
           Caption = 'Datos de la factura'
           object dxLayoutControl1Item1: TdxLayoutItem
@@ -338,7 +301,7 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
               object ledtFechaVencimiento: TdxLayoutItem
                 Caption = 'Fecha de vencimiento:'
                 Visible = False
-                Control = edtFechaVemcimiento
+                Control = edtFechaVencimiento
                 ControlOptions.ShowBorder = False
               end
             end
@@ -353,7 +316,6 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
         object dxLayoutControl1Group2: TdxLayoutGroup
           AutoAligns = []
           AlignHorz = ahClient
-          AlignVert = avClient
           Caption = 'Datos del cliente'
           object dxLayoutControl1Item6: TdxLayoutItem
             Caption = 'frViewDatosYSeleccionClienteFacturaCliente1'
@@ -362,40 +324,11 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
             ControlOptions.ShowBorder = False
           end
           object dxLayoutControl1Item11: TdxLayoutItem
+            AutoAligns = [aaHorizontal]
             Control = frViewDatosYSeleccionClienteFacturaProforma1
             ControlOptions.AutoColor = True
             ControlOptions.ShowBorder = False
           end
-          object dxLayoutControl1Group7: TdxLayoutGroup
-            Caption = 'Cliente final'
-            Visible = False
-            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
       object dxLayoutControl1Group5: TdxLayoutGroup
@@ -438,10 +371,5 @@ inherited frViewFacturaProforma: TfrViewFacturaProforma
   object ActionList1: TActionList
     Left = 16
     Top = 96
-    object actElegirClienteFinal: TAction
-      Caption = '...'
-      OnExecute = actElegirClienteFinalExecute
-      OnUpdate = actElegirClienteFinalUpdate
-    end
   end
 end

Source/Modulos/Facturas proforma/Views/uViewFacturaProforma.pas

@@ -49,29 +49,18 @@ type
     bFormasPago: TButton;
     dxLayoutControl1Item3: TdxLayoutItem;
     cbCuentaBancaria: TcxDBComboBox;
-    dxLayoutControl1Item7: TdxLayoutItem;
-    Label1: TLabel;
-    dxLayoutControl1Item8: TdxLayoutItem;
-    cbClienteFinal: TcxDBTextEdit;
-    dxLayoutControl1Item9: TdxLayoutItem;
-    bElegirClienteFinal: TButton;
-    dxLayoutControl1Group7: TdxLayoutGroup;
-    dxLayoutControl1Group8: TdxLayoutGroup;
     ActionList1: TActionList;
-    actElegirClienteFinal: TAction;
     dxLayoutControl1Group9: TdxLayoutGroup;
     dxLayoutControl1Group6: TdxLayoutGroup;
     dxLayoutControl1Group4: TdxLayoutGroup;
     ledtFechaVencimiento: TdxLayoutItem;
-    edtFechaVemcimiento: TcxDBDateEdit;
+    edtFechaVencimiento: TcxDBDateEdit;
     dxLayoutControl1Group3: TdxLayoutGroup;
     dxLayoutControl1Item11: TdxLayoutItem;
     frViewDatosYSeleccionClienteFacturaProforma1: TfrViewDatosYSeleccionClienteFacturaProforma;
     procedure bFormasPagoClick(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure CustomViewCreate(Sender: TObject);
-    procedure actElegirClienteFinalExecute(Sender: TObject);
-    procedure actElegirClienteFinalUpdate(Sender: TObject);
     procedure edtFechaVemcimientoPropertiesEditValueChanged(Sender: TObject);
   protected
     FFactura : IBizFacturaProforma;
@@ -103,38 +92,6 @@ uses
 
 { TfrViewFacturaProforma }
 
-procedure TfrViewFacturaProforma.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 TfrViewFacturaProforma.actElegirClienteFinalUpdate(Sender: TObject);
-begin
-  inherited;
-  (Sender as TAction).Enabled := (not ReadOnly);
-end;
-
 procedure TfrViewFacturaProforma.bFormasPagoClick(Sender: TObject);
 begin
   inherited;

Source/Modulos/Facturas proforma/Views/uViewFacturasProforma.dfm

@@ -56,6 +56,7 @@ inherited frViewFacturasProforma: TfrViewFacturasProforma
         OnCustomDrawHeader = cxGridViewNUM_CORREOSCustomDrawHeader
       end
       object cxGridViewREFERENCIA: TcxGridDBColumn
+        Caption = 'Referencia'
         DataBinding.FieldName = 'REFERENCIA'
         PropertiesClassName = 'TcxTextEditProperties'
         SortIndex = 0
@@ -63,6 +64,7 @@ inherited frViewFacturasProforma: TfrViewFacturasProforma
         Width = 69
       end
       object cxGridViewSITUACION: TcxGridDBColumn
+        Caption = 'Situaci'#243'n'
         DataBinding.FieldName = 'SITUACION'
         Width = 32
       end
@@ -80,30 +82,37 @@ inherited frViewFacturasProforma: TfrViewFacturasProforma
         VisibleForCustomization = False
       end
       object cxGridViewNIF_CIF: TcxGridDBColumn
+        Caption = 'NIF/CIF'
         DataBinding.FieldName = 'NIF_CIF'
         Visible = False
       end
       object cxGridViewNOMBRE: TcxGridDBColumn
+        Caption = 'Cliente'
         DataBinding.FieldName = 'NOMBRE'
         Width = 181
       end
       object cxGridViewCALLE: TcxGridDBColumn
+        Caption = 'Calle'
         DataBinding.FieldName = 'CALLE'
         Visible = False
       end
       object cxGridViewCODIGO_POSTAL: TcxGridDBColumn
+        Caption = 'C'#243'digo Postal'
         DataBinding.FieldName = 'CODIGO_POSTAL'
         Visible = False
       end
       object cxGridViewPOBLACION: TcxGridDBColumn
+        Caption = 'Poblaci'#243'n'
         DataBinding.FieldName = 'POBLACION'
         Visible = False
       end
       object cxGridViewPROVINCIA: TcxGridDBColumn
+        Caption = 'Provincia'
         DataBinding.FieldName = 'PROVINCIA'
         Visible = False
       end
       object cxGridViewBASE_IMPONIBLE: TcxGridDBColumn
+        Caption = 'Base Imponible'
         DataBinding.FieldName = 'BASE_IMPONIBLE'
         PropertiesClassName = 'TcxCurrencyEditProperties'
         Visible = False
@@ -111,12 +120,14 @@ inherited frViewFacturasProforma: TfrViewFacturasProforma
         HeaderAlignmentHorz = taRightJustify
       end
       object cxGridViewDESCUENTO: TcxGridDBColumn
+        Caption = 'Dto'
         DataBinding.FieldName = 'DESCUENTO'
         Visible = False
         FooterAlignmentHorz = taRightJustify
         HeaderAlignmentHorz = taRightJustify
       end
       object cxGridViewIMPORTE_DESCUENTO: TcxGridDBColumn
+        Caption = 'Imp. Dto.'
         DataBinding.FieldName = 'IMPORTE_DESCUENTO'
         PropertiesClassName = 'TcxCurrencyEditProperties'
         Visible = False
@@ -130,6 +141,7 @@ inherited frViewFacturasProforma: TfrViewFacturasProforma
         HeaderAlignmentHorz = taRightJustify
       end
       object cxGridViewIMPORTE_IVA: TcxGridDBColumn
+        Caption = 'Imp. IVA'
         DataBinding.FieldName = 'IMPORTE_IVA'
         PropertiesClassName = 'TcxCurrencyEditProperties'
         Visible = False
@@ -142,6 +154,7 @@ inherited frViewFacturasProforma: TfrViewFacturasProforma
         Properties.DisplayFormat = ',0.00 %;-,0.00 %'
       end
       object cxGridViewIMPORTE_RE: TcxGridDBColumn
+        Caption = 'Imp. RE'
         DataBinding.FieldName = 'IMPORTE_RE'
       end
       object cxGridViewIMPORTE_TOTAL: TcxGridDBColumn

Source/Modulos/Informe margen por articulo/Data/InfMargenArticulo_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Data\uDataModuleInfMargenArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Data\InfMargenArticulo_data.res */
-/* c:\temp\dtf169D.tmp */
+/* c:\temp\dtf2FC.tmp */

Source/Modulos/Informe margen por articulo/Model/InfMargenArticulo_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Model\InfMargenArticulo_model.res */
-/* c:\temp\dtf169B.tmp */
+/* c:\temp\dtf2FA.tmp */

Source/Modulos/Informe margen por articulo/Views/InfMargenArticulo_view.drc

@@ -16,4 +16,4 @@ END
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Views\uViewInfMargenArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Views\uEditorInfMargenArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Views\InfMargenArticulo_view.res */
-/* c:\temp\dtf16A1.tmp */
+/* c:\temp\dtf300.tmp */

Source/Modulos/Informe ventas por articulo/Data/InfVentasArticulo_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Data\uDataModuleInfVentasArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Data\InfVentasArticulo_data.res */
-/* c:\temp\dtf1693.tmp */
+/* c:\temp\dtf2F2.tmp */

Source/Modulos/Informe ventas por articulo/Model/InfVentasArticulo_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Model\InfVentasArticulo_model.res */
-/* c:\temp\dtf1691.tmp */
+/* c:\temp\dtf2F0.tmp */

Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.drc

@@ -19,4 +19,4 @@ END
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Views\uViewInfVentasAlbArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Views\uEditorInfVentasAlbArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Views\InfVentasArticulo_view.res */
-/* c:\temp\dtf1697.tmp */
+/* c:\temp\dtf2F6.tmp */

Source/Modulos/Informes base/Controller/InformesBase_controller.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Informes base\Controller\InformesBase_controller.res */
-/* c:\temp\dtf1687.tmp */
+/* c:\temp\dtf2E6.tmp */

Source/Modulos/Informes base/Data/Informes_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Informes base\Data\uDataModuleInformes.dfm */
 /* C:\Codigo\Source\Modulos\Informes base\Data\Informes_data.res */
-/* c:\temp\dtf1683.tmp */
+/* c:\temp\dtf2E0.tmp */

Source/Modulos/Informes base/Model/Informes_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Informes base\Model\Informes_model.res */
-/* c:\temp\dtf1681.tmp */
+/* c:\temp\dtf2DE.tmp */

Source/Modulos/Informes base/Views/Informes_view.drc

@@ -15,4 +15,4 @@ END
 /* C:\Codigo\Source\Modulos\Informes base\Views\uViewInformes.dfm */
 /* C:\Codigo\Source\Modulos\Informes base\Views\uEditorInformes.dfm */
 /* C:\Codigo\Source\Modulos\Informes base\Views\Informes_view.res */
-/* c:\temp\dtf168B.tmp */
+/* c:\temp\dtf2EA.tmp */

Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Controller\PedidosCliente_controller.RES */
-/* c:\temp\dtf1715.tmp */
+/* c:\temp\dtf37A.tmp */

Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Data\uDataModulePedidosCliente.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Data\PedidosCliente_data.RES */
-/* c:\temp\dtf16C5.tmp */
+/* c:\temp\dtf324.tmp */

Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Model\PedidosCliente_model.RES */
-/* c:\temp\dtf16C3.tmp */
+/* c:\temp\dtf322.tmp */

Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Plugin\uPluginPedidosCliente.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Plugin\PedidosCliente_plugin.RES */
-/* c:\temp\dtf172F.tmp */
+/* c:\temp\dtf394.tmp */

Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc

@@ -26,4 +26,4 @@ END
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\uEditorElegirArticulosPedidoCliente.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\uEditorDireccionEntregaPedidoCliente.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\PedidosCliente_view.RES */
-/* c:\temp\dtf172D.tmp */
+/* c:\temp\dtf392.tmp */

Source/Modulos/ProcesoPresupuestoCliente/Controller/ProcesoPresupuestosCliente_controller.drc

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo\Source\Modulos\ProcesoPresupuestoCliente\Controller\ProcesoPresupuestosCliente_controller.res */
+/* C:\Codigo\Source\Modulos\ProcesoPresupuestoCliente\Controller\ProcesoPresupuestosCliente_controller.RES */
-/* c:\temp\dtf175F.tmp */
+/* c:\temp\dtf3C8.tmp */

Source/Modulos/ProcesoPresupuestoCliente/Plugin/ProcesoPresupuestosCliente_plugin.drc

@@ -13,5 +13,5 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\ProcesoPresupuestoCliente\Plugin\uPluginProcesoPresupuestosCliente.dfm */
-/* C:\Codigo\Source\Modulos\ProcesoPresupuestoCliente\Plugin\ProcesoPresupuestosCliente_plugin.res */
+/* C:\Codigo\Source\Modulos\ProcesoPresupuestoCliente\Plugin\ProcesoPresupuestosCliente_plugin.RES */
-/* c:\temp\dtf1763.tmp */
+/* c:\temp\dtf3CC.tmp */

Source/Modulos/ProcesoPresupuestoCliente/Views/ProcesoPresupuestosCliente_view.drc

@@ -14,5 +14,5 @@ END
 
 /* C:\Codigo\Source\Modulos\ProcesoPresupuestoCliente\Views\uViewProcesoPresupuestosCliente.dfm */
 /* C:\Codigo\Source\Modulos\ProcesoPresupuestoCliente\Views\uEditorProcesoPresupuestosCliente.dfm */
-/* C:\Codigo\Source\Modulos\ProcesoPresupuestoCliente\Views\ProcesoPresupuestosCliente_view.res */
+/* C:\Codigo\Source\Modulos\ProcesoPresupuestoCliente\Views\ProcesoPresupuestosCliente_view.RES */
-/* c:\temp\dtf1761.tmp */
+/* c:\temp\dtf3CA.tmp */

Source/Modulos/Tienda web/Data/TiendaWeb_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Tienda web\Data\uDataModuleTiendaWeb.dfm */
 /* C:\Codigo\Source\Modulos\Tienda web\Data\TiendaWeb_data.res */
-/* c:\temp\dtf16DB.tmp */
+/* c:\temp\dtf340.tmp */

Source/Servidor/FactuGES_Server.dpr

@@ -162,12 +162,12 @@ uses
   schUsuariosServer_Intf in '..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas',
   schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
   schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas',
-  schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
+  srvFacturasProforma_Impl in '..\Modulos\Facturas proforma\Servidor\srvFacturasProforma_Impl.pas' {srvFacturasProforma: TDataAbstractService},
-  schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas',
+  uBizFacturasProformaServer in '..\Modulos\Facturas proforma\Model\uBizFacturasProformaServer.pas',
   schFacturasProformaClient_Intf in '..\Modulos\Facturas proforma\Model\schFacturasProformaClient_Intf.pas',
   schFacturasProformaServer_Intf in '..\Modulos\Facturas proforma\Model\schFacturasProformaServer_Intf.pas',
-  srvFacturasProforma_Impl in '..\Modulos\Facturas proforma\Servidor\srvFacturasProforma_Impl.pas' {srvFacturasProforma: TDataAbstractService},
+  schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
-  uBizFacturasProformaServer in '..\Modulos\Facturas proforma\Model\uBizFacturasProformaServer.pas';
+  schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas';
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}

Source/Servidor/FactuGES_Server.dproj

@@ -37,6 +37,14 @@
     <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">4</VersionInfo><VersionInfo Name="MinorVer">3</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"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.3.3.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">4.3.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 05 de septiembre de 2013 18:20</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
+      
+      
+      
+      
+      
+      
+      
+      
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
   </ProjectExtensions>

Source/Servidor/FactuGES_Server.rc

@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "4.3.3.0\0"
               VALUE "ProductVersion", "4.3.3.0\0"
-              VALUE "CompileDate", "lunes, 02 de diciembre de 2013 13:45\0"
+              VALUE "CompileDate", "miércoles, 04 de diciembre de 2013 17:44\0"
          END
     END
     BLOCK "VarFileInfo"