diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql
index 2fef9805..8a90eddc 100644
--- a/Database/scripts/factuges.sql
+++ b/Database/scripts/factuges.sql
@@ -730,6 +730,7 @@ CREATE TABLE FACTURAS_CLIENTE (
     ID_CLIENTE             TIPO_ID,
     NIF_CIF                VARCHAR(15),
     NOMBRE                 VARCHAR(255),
+	ID_DIRECCION		   TIPO_ID,
     CALLE                  VARCHAR(255),
     POBLACION              VARCHAR(255),
     PROVINCIA              VARCHAR(255),
@@ -2081,42 +2082,43 @@ GROUP BY ID_FACTURA
 
 /* View: V_FACTURAS_CLIENTE */
 CREATE VIEW V_FACTURAS_CLIENTE(
-    ID,
-    ID_EMPRESA,
-    REFERENCIA,
-    TIPO,
-    ID_COMISION_LIQUIDADA,
-    FECHA_FACTURA,
-    SITUACION,
-    BASE_IMPONIBLE,
-    DESCUENTO,
-    IMPORTE_DESCUENTO,
-    IVA,
-    IMPORTE_IVA,
-    RE,
-    IMPORTE_RE,
-    IMPORTE_TOTAL,
-    OBSERVACIONES,
-    ID_CLIENTE,
-    NIF_CIF,
-    NOMBRE,
-    CALLE,
-    POBLACION,
-    PROVINCIA,
-    CODIGO_POSTAL,
-    DATOS_BANCARIOS,
+	ID,
+	ID_EMPRESA,
+	REFERENCIA,
+	TIPO,
+	ID_COMISION_LIQUIDADA,
+	FECHA_FACTURA,
+	SITUACION,
+	BASE_IMPONIBLE,
+	DESCUENTO,
+	IMPORTE_DESCUENTO,
+	IVA,
+	IMPORTE_IVA,
+	RE,
+	IMPORTE_RE,
+	IMPORTE_TOTAL,
+	OBSERVACIONES,
+	ID_CLIENTE,
+	NIF_CIF,
+	NOMBRE,
+	ID_DIRECCION,
+	CALLE,
+	POBLACION,
+	PROVINCIA,
+	CODIGO_POSTAL,
+	DATOS_BANCARIOS,
 	CLIENTE_FINAL,
-    FECHA_ALTA,
-    FECHA_MODIFICACION,
-    USUARIO,
-    ID_FORMA_PAGO,
-    RECARGO_EQUIVALENCIA,
-    ID_TIPO_IVA,
-    IMPORTE_NETO,
-    IMPORTE_PORTE,
-    ID_AGENTE,
-    REFERENCIA_COMISION)
-AS
+	FECHA_ALTA,
+	FECHA_MODIFICACION,
+	USUARIO,
+	ID_FORMA_PAGO,
+	RECARGO_EQUIVALENCIA,
+	ID_TIPO_IVA,
+	IMPORTE_NETO,
+	IMPORTE_PORTE,
+	ID_AGENTE,
+	REFERENCIA_COMISION)
+ AS 
 SELECT FACTURAS_CLIENTE.ID,
   FACTURAS_CLIENTE.ID_EMPRESA,
   FACTURAS_CLIENTE.REFERENCIA,
@@ -2136,6 +2138,7 @@ SELECT FACTURAS_CLIENTE.ID,
   FACTURAS_CLIENTE.ID_CLIENTE,
   FACTURAS_CLIENTE.NIF_CIF,
   FACTURAS_CLIENTE.NOMBRE,
+  FACTURAS_CLIENTE.ID_DIRECCION,
   FACTURAS_CLIENTE.CALLE,
   FACTURAS_CLIENTE.POBLACION,
   FACTURAS_CLIENTE.PROVINCIA,
@@ -2158,11 +2161,10 @@ SELECT FACTURAS_CLIENTE.ID,
   LEFT JOIN COMISIONES_LIQUIDADAS
   ON (COMISIONES_LIQUIDADAS.ID = FACTURAS_CLIENTE.ID_COMISION_LIQUIDADA)
   LEFT JOIN CLIENTES_DATOS
-  ON (CLIENTES_DATOS.ID_CLIENTE = FACTURAS_CLIENTE.ID_CLIENTE)
+  ON (CLIENTES_DATOS.ID_CLIENTE = FACTURAS_CLIENTE.ID_CLIENTE);
 ;
 
 
-
 /* View: V_FACTURAS_PROVEEDOR */
 CREATE VIEW V_FACTURAS_PROVEEDOR(
     ID,
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 832e442b..20b5c514 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -53,58 +53,58 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\adortl.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\cxDataD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\cxExportD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\cxGridD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\cxIntl6D11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\cxIntlPrintSys3D11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\cxPageControlD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\dclIndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\designide.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\dsnap.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\dxThemeD11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\GUISDK_D11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\IndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\IndyProtocols.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\IndySystem.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Jcl.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JclVcl.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JSDialog100.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvCmpD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvCoreD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvMMD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvNetD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvSystemD11R.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\pckMD5.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\PNG_D10.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\RemObjects_Indy_D11.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\TB2k_D10.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\tbx_d10.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\VclSmp.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\vclx.dcp" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxGridD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxIntl6D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxIntlPrintSys3D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dclIndyCore.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\IndyCore.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\IndyProtocols.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\IndySystem.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JSDialog100.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCmpD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvDlgsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvNetD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\pckMD5.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\pckUCDataConnector.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\pckUserControl_RT.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Indy_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\TB2k_D10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
       <DesignClass>TForm</DesignClass>
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 22391745..8d49b2b8 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -45,7 +45,7 @@
     <DCC_ResourcePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ResourcePath>
     <DCC_ObjPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ObjPath>
     <DCC_IncludePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_IncludePath>
-    <DCC_Define>DEBUG;EUREKALOG;EUREKALOG_VER6</DCC_Define>
+    <DCC_Define>DEBUG;</DCC_Define>
     <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
     <DCC_DebugVN>True</DCC_DebugVN>
     <DCC_SymbolReferenceInfo>2</DCC_SymbolReferenceInfo>
@@ -55,6 +55,30 @@
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">3</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.4.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.4.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD10.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\PluginSDK_D10R.bpl">PluginSDK for Delphi 10 (Runtime)</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
@@ -84,7 +108,7 @@
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6011
-Activate=1
+Activate=0
 Activate Handle=1
 Save Log File=1
 Foreground Tab=0
diff --git a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm
index 00d69a57..5236d6cd 100644
--- a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm	
+++ b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm	
@@ -151,6 +151,10 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
         DisplayLabel = 'Cliente'
         DictionaryEntry = 'FacturasCliente_NOMBRE'
       end
+      item
+        Name = 'ID_DIRECCION'
+        DataType = datInteger
+      end
       item
         Name = 'CALLE'
         DataType = datString
diff --git a/Source/Modulos/Facturas de cliente/FacturasCliente_Group.groupproj b/Source/Modulos/Facturas de cliente/FacturasCliente_Group.groupproj
index e4aae64f..3c2db4f2 100644
--- a/Source/Modulos/Facturas de cliente/FacturasCliente_Group.groupproj	
+++ b/Source/Modulos/Facturas de cliente/FacturasCliente_Group.groupproj	
@@ -25,6 +25,7 @@
     <Projects Include="..\Gestor de informes\Plugin\GestorInformes_plugin.dproj" />
     <Projects Include="..\Gestor de informes\Views\GestorInformes_view.dproj" />
     <Projects Include="..\Presupuestos de cliente\Controller\PresupuestosCliente_controller.dproj" />
+    <Projects Include="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" />
     <Projects Include="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" />
     <Projects Include="..\Relaciones\Presupuestos de cliente - Facturas de cliente\PreCli_FacCli_relation.dproj" />
     <Projects Include="Controller\FacturasCliente_controller.dproj" />
@@ -291,14 +292,23 @@
   <Target Name="FactuGES_Server:Make">
     <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
   </Target>
+  <Target Name="PresupuestosCliente_view">
+    <MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="" />
+  </Target>
+  <Target Name="PresupuestosCliente_view:Clean">
+    <MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="PresupuestosCliente_view:Make">
+    <MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_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;FacturasCliente_model;FacturasCliente_data;FacturasCliente_controller;PreCli_FacCli_relation;AlbCli_FacCli_relation;FacturasCliente_view;FacturasCliente_plugin;AlbaranesCliente_view;PresupuestosCliente_controller;GestorInformes_view;AlbaranesCliente_controller;GestorInformes_plugin;FactuGES;FactuGES_Server" />
+    <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;FacturasCliente_model;FacturasCliente_data;FacturasCliente_controller;PreCli_FacCli_relation;AlbCli_FacCli_relation;FacturasCliente_view;FacturasCliente_plugin;AlbaranesCliente_view;PresupuestosCliente_controller;GestorInformes_view;AlbaranesCliente_controller;GestorInformes_plugin;FactuGES;FactuGES_Server;PresupuestosCliente_view" />
   </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;FacturasCliente_model:Clean;FacturasCliente_data:Clean;FacturasCliente_controller:Clean;PreCli_FacCli_relation:Clean;AlbCli_FacCli_relation:Clean;FacturasCliente_view:Clean;FacturasCliente_plugin:Clean;AlbaranesCliente_view:Clean;PresupuestosCliente_controller:Clean;GestorInformes_view:Clean;AlbaranesCliente_controller:Clean;GestorInformes_plugin:Clean;FactuGES:Clean;FactuGES_Server: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;FacturasCliente_model:Clean;FacturasCliente_data:Clean;FacturasCliente_controller:Clean;PreCli_FacCli_relation:Clean;AlbCli_FacCli_relation:Clean;FacturasCliente_view:Clean;FacturasCliente_plugin:Clean;AlbaranesCliente_view:Clean;PresupuestosCliente_controller:Clean;GestorInformes_view:Clean;AlbaranesCliente_controller:Clean;GestorInformes_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;PresupuestosCliente_view: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;FacturasCliente_model:Make;FacturasCliente_data:Make;FacturasCliente_controller:Make;PreCli_FacCli_relation:Make;AlbCli_FacCli_relation:Make;FacturasCliente_view:Make;FacturasCliente_plugin:Make;AlbaranesCliente_view:Make;PresupuestosCliente_controller:Make;GestorInformes_view:Make;AlbaranesCliente_controller:Make;GestorInformes_plugin:Make;FactuGES:Make;FactuGES_Server: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;FacturasCliente_model:Make;FacturasCliente_data:Make;FacturasCliente_controller:Make;PreCli_FacCli_relation:Make;AlbCli_FacCli_relation:Make;FacturasCliente_view:Make;FacturasCliente_plugin:Make;AlbaranesCliente_view:Make;PresupuestosCliente_controller:Make;GestorInformes_view:Make;AlbaranesCliente_controller:Make;GestorInformes_plugin:Make;FactuGES:Make;FactuGES_Server:Make;PresupuestosCliente_view:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>
\ No newline at end of file
diff --git a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas
index d2398143..b191e5bf 100644
--- a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas	
+++ b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas	
@@ -9,8 +9,8 @@ const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_FacturasCliente = '{1C884472-B874-4186-BBC7-C1DC0C04DE9B}';
-  RID_FacturasCliente_Detalles = '{8B69432D-CC1E-49F2-8234-A4AD3BEAC334}';
+  RID_FacturasCliente = '{AAD3829C-018F-45F7-B05F-44C9F3765E1D}';
+  RID_FacturasCliente_Detalles = '{9C153EDF-C5B3-4A2A-960C-9719E16B36E2}';
 
   { Data table names }
   nme_FacturasCliente = 'FacturasCliente';
@@ -36,6 +36,7 @@ const
   fld_FacturasClienteID_CLIENTE = 'ID_CLIENTE';
   fld_FacturasClienteNIF_CIF = 'NIF_CIF';
   fld_FacturasClienteNOMBRE = 'NOMBRE';
+  fld_FacturasClienteID_DIRECCION = 'ID_DIRECCION';
   fld_FacturasClienteCALLE = 'CALLE';
   fld_FacturasClientePOBLACION = 'POBLACION';
   fld_FacturasClientePROVINCIA = 'PROVINCIA';
@@ -73,22 +74,23 @@ const
   idx_FacturasClienteID_CLIENTE = 16;
   idx_FacturasClienteNIF_CIF = 17;
   idx_FacturasClienteNOMBRE = 18;
-  idx_FacturasClienteCALLE = 19;
-  idx_FacturasClientePOBLACION = 20;
-  idx_FacturasClientePROVINCIA = 21;
-  idx_FacturasClienteCODIGO_POSTAL = 22;
-  idx_FacturasClienteDATOS_BANCARIOS = 23;
-  idx_FacturasClienteCLIENTE_FINAL = 24;
-  idx_FacturasClienteFECHA_ALTA = 25;
-  idx_FacturasClienteFECHA_MODIFICACION = 26;
-  idx_FacturasClienteUSUARIO = 27;
-  idx_FacturasClienteID_FORMA_PAGO = 28;
-  idx_FacturasClienteRECARGO_EQUIVALENCIA = 29;
-  idx_FacturasClienteID_TIPO_IVA = 30;
-  idx_FacturasClienteIMPORTE_NETO = 31;
-  idx_FacturasClienteIMPORTE_PORTE = 32;
-  idx_FacturasClienteID_AGENTE = 33;
-  idx_FacturasClienteREFERENCIA_COMISION = 34;
+  idx_FacturasClienteID_DIRECCION = 19;
+  idx_FacturasClienteCALLE = 20;
+  idx_FacturasClientePOBLACION = 21;
+  idx_FacturasClientePROVINCIA = 22;
+  idx_FacturasClienteCODIGO_POSTAL = 23;
+  idx_FacturasClienteDATOS_BANCARIOS = 24;
+  idx_FacturasClienteCLIENTE_FINAL = 25;
+  idx_FacturasClienteFECHA_ALTA = 26;
+  idx_FacturasClienteFECHA_MODIFICACION = 27;
+  idx_FacturasClienteUSUARIO = 28;
+  idx_FacturasClienteID_FORMA_PAGO = 29;
+  idx_FacturasClienteRECARGO_EQUIVALENCIA = 30;
+  idx_FacturasClienteID_TIPO_IVA = 31;
+  idx_FacturasClienteIMPORTE_NETO = 32;
+  idx_FacturasClienteIMPORTE_PORTE = 33;
+  idx_FacturasClienteID_AGENTE = 34;
+  idx_FacturasClienteREFERENCIA_COMISION = 35;
 
   { FacturasCliente_Detalles fields }
   fld_FacturasCliente_DetallesID = 'ID';
@@ -127,7 +129,7 @@ const
 type
   { IFacturasCliente }
   IFacturasCliente = interface(IDAStronglyTypedDataTable)
-  ['{22224DB8-4B36-4F97-B348-93B12C05C36B}']
+  ['{795D27FE-3D8E-4107-80CF-B7D21B781D7B}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -204,6 +206,10 @@ type
     procedure SetNOMBREValue(const aValue: String);
     function GetNOMBREIsNull: Boolean;
     procedure SetNOMBREIsNull(const aValue: Boolean);
+    function GetID_DIRECCIONValue: Integer;
+    procedure SetID_DIRECCIONValue(const aValue: Integer);
+    function GetID_DIRECCIONIsNull: Boolean;
+    procedure SetID_DIRECCIONIsNull(const aValue: Boolean);
     function GetCALLEValue: String;
     procedure SetCALLEValue(const aValue: String);
     function GetCALLEIsNull: Boolean;
@@ -309,6 +315,8 @@ type
     property NIF_CIFIsNull: Boolean read GetNIF_CIFIsNull write SetNIF_CIFIsNull;
     property NOMBRE: String read GetNOMBREValue write SetNOMBREValue;
     property NOMBREIsNull: Boolean read GetNOMBREIsNull write SetNOMBREIsNull;
+    property ID_DIRECCION: Integer read GetID_DIRECCIONValue write SetID_DIRECCIONValue;
+    property ID_DIRECCIONIsNull: Boolean read GetID_DIRECCIONIsNull write SetID_DIRECCIONIsNull;
     property CALLE: String read GetCALLEValue write SetCALLEValue;
     property CALLEIsNull: Boolean read GetCALLEIsNull write SetCALLEIsNull;
     property POBLACION: String read GetPOBLACIONValue write SetPOBLACIONValue;
@@ -425,6 +433,10 @@ type
     procedure SetNOMBREValue(const aValue: String); virtual;
     function GetNOMBREIsNull: Boolean; virtual;
     procedure SetNOMBREIsNull(const aValue: Boolean); virtual;
+    function GetID_DIRECCIONValue: Integer; virtual;
+    procedure SetID_DIRECCIONValue(const aValue: Integer); virtual;
+    function GetID_DIRECCIONIsNull: Boolean; virtual;
+    procedure SetID_DIRECCIONIsNull(const aValue: Boolean); virtual;
     function GetCALLEValue: String; virtual;
     procedure SetCALLEValue(const aValue: String); virtual;
     function GetCALLEIsNull: Boolean; virtual;
@@ -529,6 +541,8 @@ type
     property NIF_CIFIsNull: Boolean read GetNIF_CIFIsNull write SetNIF_CIFIsNull;
     property NOMBRE: String read GetNOMBREValue write SetNOMBREValue;
     property NOMBREIsNull: Boolean read GetNOMBREIsNull write SetNOMBREIsNull;
+    property ID_DIRECCION: Integer read GetID_DIRECCIONValue write SetID_DIRECCIONValue;
+    property ID_DIRECCIONIsNull: Boolean read GetID_DIRECCIONIsNull write SetID_DIRECCIONIsNull;
     property CALLE: String read GetCALLEValue write SetCALLEValue;
     property CALLEIsNull: Boolean read GetCALLEIsNull write SetCALLEIsNull;
     property POBLACION: String read GetPOBLACIONValue write SetPOBLACIONValue;
@@ -570,7 +584,7 @@ type
 
   { IFacturasCliente_Detalles }
   IFacturasCliente_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{14D94787-B209-42D9-A661-0E777F387D67}']
+  ['{B6EB9F06-15CD-4E96-B620-4AC3D546A907}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1192,6 +1206,27 @@ begin
     DataTable.Fields[idx_FacturasClienteNOMBRE].AsVariant := Null;
 end;
 
+function TFacturasClienteDataTableRules.GetID_DIRECCIONValue: Integer;
+begin
+  result := DataTable.Fields[idx_FacturasClienteID_DIRECCION].AsInteger;
+end;
+
+procedure TFacturasClienteDataTableRules.SetID_DIRECCIONValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_FacturasClienteID_DIRECCION].AsInteger := aValue;
+end;
+
+function TFacturasClienteDataTableRules.GetID_DIRECCIONIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasClienteID_DIRECCION].IsNull;
+end;
+
+procedure TFacturasClienteDataTableRules.SetID_DIRECCIONIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasClienteID_DIRECCION].AsVariant := Null;
+end;
+
 function TFacturasClienteDataTableRules.GetCALLEValue: String;
 begin
   result := DataTable.Fields[idx_FacturasClienteCALLE].AsString;
diff --git a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas
index feed4459..d19fe351 100644
--- a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas	
+++ b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas	
@@ -9,13 +9,13 @@ const
   { Delta rules ids 
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_FacturasClienteDelta = '{B409FE0D-EC7D-4D72-B893-D8B6A5B8A7C0}';
-  RID_FacturasCliente_DetallesDelta = '{2DB7CADF-7D32-4620-9DA6-966DD9521C8C}';
+  RID_FacturasClienteDelta = '{DBF89ADF-3FF2-4A40-9543-09F93862C1E8}';
+  RID_FacturasCliente_DetallesDelta = '{59EC1836-B8BD-4243-8A4E-CB96C079CDF6}';
 
 type
   { IFacturasClienteDelta }
   IFacturasClienteDelta = interface(IFacturasCliente)
-  ['{B409FE0D-EC7D-4D72-B893-D8B6A5B8A7C0}']
+  ['{DBF89ADF-3FF2-4A40-9543-09F93862C1E8}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -36,6 +36,7 @@ type
     function GetOldID_CLIENTEValue : Integer;
     function GetOldNIF_CIFValue : String;
     function GetOldNOMBREValue : String;
+    function GetOldID_DIRECCIONValue : Integer;
     function GetOldCALLEValue : String;
     function GetOldPOBLACIONValue : String;
     function GetOldPROVINCIAValue : String;
@@ -73,6 +74,7 @@ type
     property OldID_CLIENTE : Integer read GetOldID_CLIENTEValue;
     property OldNIF_CIF : String read GetOldNIF_CIFValue;
     property OldNOMBRE : String read GetOldNOMBREValue;
+    property OldID_DIRECCION : Integer read GetOldID_DIRECCIONValue;
     property OldCALLE : String read GetOldCALLEValue;
     property OldPOBLACION : String read GetOldPOBLACIONValue;
     property OldPROVINCIA : String read GetOldPROVINCIAValue;
@@ -211,6 +213,12 @@ type
     function GetOldNOMBREIsNull: Boolean; virtual;
     procedure SetNOMBREValue(const aValue: String); virtual;
     procedure SetNOMBREIsNull(const aValue: Boolean); virtual;
+    function GetID_DIRECCIONValue: Integer; virtual;
+    function GetID_DIRECCIONIsNull: Boolean; virtual;
+    function GetOldID_DIRECCIONValue: Integer; virtual;
+    function GetOldID_DIRECCIONIsNull: Boolean; virtual;
+    procedure SetID_DIRECCIONValue(const aValue: Integer); virtual;
+    procedure SetID_DIRECCIONIsNull(const aValue: Boolean); virtual;
     function GetCALLEValue: String; virtual;
     function GetCALLEIsNull: Boolean; virtual;
     function GetOldCALLEValue: String; virtual;
@@ -385,6 +393,10 @@ type
     property NOMBREIsNull : Boolean read GetNOMBREIsNull write SetNOMBREIsNull;
     property OldNOMBRE : String read GetOldNOMBREValue;
     property OldNOMBREIsNull : Boolean read GetOldNOMBREIsNull;
+    property ID_DIRECCION : Integer read GetID_DIRECCIONValue write SetID_DIRECCIONValue;
+    property ID_DIRECCIONIsNull : Boolean read GetID_DIRECCIONIsNull write SetID_DIRECCIONIsNull;
+    property OldID_DIRECCION : Integer read GetOldID_DIRECCIONValue;
+    property OldID_DIRECCIONIsNull : Boolean read GetOldID_DIRECCIONIsNull;
     property CALLE : String read GetCALLEValue write SetCALLEValue;
     property CALLEIsNull : Boolean read GetCALLEIsNull write SetCALLEIsNull;
     property OldCALLE : String read GetOldCALLEValue;
@@ -458,7 +470,7 @@ type
 
   { IFacturasCliente_DetallesDelta }
   IFacturasCliente_DetallesDelta = interface(IFacturasCliente_Detalles)
-  ['{2DB7CADF-7D32-4620-9DA6-966DD9521C8C}']
+  ['{59EC1836-B8BD-4243-8A4E-CB96C079CDF6}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_FACTURAValue : Integer;
@@ -1271,6 +1283,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteNOMBRE] := Null;
 end;
 
+function TFacturasClienteBusinessProcessorRules.GetID_DIRECCIONValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteID_DIRECCION];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetID_DIRECCIONIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteID_DIRECCION]);
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldID_DIRECCIONValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteID_DIRECCION];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldID_DIRECCIONIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteID_DIRECCION]);
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetID_DIRECCIONValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteID_DIRECCION] := aValue;
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetID_DIRECCIONIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteID_DIRECCION] := Null;
+end;
+
 function TFacturasClienteBusinessProcessorRules.GetCALLEValue: String;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteCALLE];
diff --git a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm
index 8da7ffbc..a7785601 100644
--- a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm	
+++ b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm	
@@ -161,6 +161,10 @@ object srvFacturasCliente: TsrvFacturasCliente
               item
                 DatasetField = 'CLIENTE_FINAL'
                 TableField = 'CLIENTE_FINAL'
+              end
+              item
+                DatasetField = 'ID_DIRECCION'
+                TableField = 'ID_DIRECCION'
               end>
           end>
         Name = 'FacturasCliente'
@@ -268,6 +272,10 @@ object srvFacturasCliente: TsrvFacturasCliente
             Size = 100
             DictionaryEntry = 'FacturasCliente_NOMBRE'
           end
+          item
+            Name = 'ID_DIRECCION'
+            DataType = datInteger
+          end
           item
             Name = 'CALLE'
             DataType = datString
@@ -864,19 +872,20 @@ object srvFacturasCliente: TsrvFacturasCliente
               'ENCIA,'#10'    FECHA_FACTURA,'#10'    BASE_IMPONIBLE,'#10'    DESCUENTO,'#10'   ' +
               ' IMPORTE_DESCUENTO,'#10'    IVA,'#10'    IMPORTE_IVA,'#10'    RE,'#10'    IMPORT' +
               'E_RE,'#10'    IMPORTE_TOTAL,'#10'    OBSERVACIONES,'#10'    ID_CLIENTE,'#10'    ' +
-              'NIF_CIF,'#10'    NOMBRE,'#10'    CALLE,'#10'    POBLACION,'#10'    PROVINCIA,'#10'  ' +
-              '  CODIGO_POSTAL,'#10'    FECHA_ALTA,'#10'    FECHA_MODIFICACION,'#10'    USU' +
-              'ARIO,'#10'    ID_FORMA_PAGO,'#10'    RECARGO_EQUIVALENCIA,'#10'    ID_TIPO_I' +
-              'VA,'#10'    IMPORTE_NETO,'#10'    IMPORTE_PORTE,'#10'    DATOS_BANCARIOS,'#10'  ' +
-              '  CLIENTE_FINAL)'#10'  VALUES ('#10'    :ID,'#10'    :ID_EMPRESA,'#10'    :REFER' +
-              'ENCIA,'#10'    :FECHA_FACTURA,'#10'    :BASE_IMPONIBLE,'#10'    :DESCUENTO,'#10 +
-              '    :IMPORTE_DESCUENTO,'#10'    :IVA,'#10'    :IMPORTE_IVA,'#10'    :RE,'#10'   ' +
-              ' :IMPORTE_RE,'#10'    :IMPORTE_TOTAL,'#10'    :OBSERVACIONES,'#10'    :ID_CL' +
-              'IENTE,'#10'    :NIF_CIF,'#10'    :NOMBRE,'#10'    :CALLE,'#10'    :POBLACION,'#10'  ' +
-              '  :PROVINCIA,'#10'    :CODIGO_POSTAL,'#10'    :FECHA_ALTA,'#10'    :FECHA_MO' +
-              'DIFICACION,'#10'    :USUARIO,'#10'    :ID_FORMA_PAGO,'#10'    :RECARGO_EQUIV' +
-              'ALENCIA,'#10'    :ID_TIPO_IVA,'#10'    :IMPORTE_NETO,'#10'    :IMPORTE_PORTE' +
-              ','#10'    :DATOS_BANCARIOS,'#10'    :CLIENTE_FINAL);'#10
+              'NIF_CIF,'#10'    NOMBRE,'#10'    ID_DIRECCION,'#10'    CALLE,'#10'    POBLACION,' +
+              #10'    PROVINCIA,'#10'    CODIGO_POSTAL,'#10'    FECHA_ALTA,'#10'    FECHA_MOD' +
+              'IFICACION,'#10'    USUARIO,'#10'    ID_FORMA_PAGO,'#10'    RECARGO_EQUIVALEN' +
+              'CIA,'#10'    ID_TIPO_IVA,'#10'    IMPORTE_NETO,'#10'    IMPORTE_PORTE,'#10'    D' +
+              'ATOS_BANCARIOS,'#10'    CLIENTE_FINAL)'#10'  VALUES ('#10'    :ID,'#10'    :ID_E' +
+              'MPRESA,'#10'    :REFERENCIA,'#10'    :FECHA_FACTURA,'#10'    :BASE_IMPONIBLE' +
+              ','#10'    :DESCUENTO,'#10'    :IMPORTE_DESCUENTO,'#10'    :IVA,'#10'    :IMPORTE' +
+              '_IVA,'#10'    :RE,'#10'    :IMPORTE_RE,'#10'    :IMPORTE_TOTAL,'#10'    :OBSERVA' +
+              'CIONES,'#10'    :ID_CLIENTE,'#10'    :NIF_CIF,'#10'    :NOMBRE,'#10'    :ID_DIRE' +
+              'CCION,'#10'    :CALLE,'#10'    :POBLACION,'#10'    :PROVINCIA,'#10'    :CODIGO_P' +
+              'OSTAL,'#10'    :FECHA_ALTA,'#10'    :FECHA_MODIFICACION,'#10'    :USUARIO,'#10' ' +
+              '   :ID_FORMA_PAGO,'#10'    :RECARGO_EQUIVALENCIA,'#10'    :ID_TIPO_IVA,'#10 +
+              '    :IMPORTE_NETO,'#10'    :IMPORTE_PORTE,'#10'    :DATOS_BANCARIOS,'#10'   ' +
+              ' :CLIENTE_FINAL);'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -944,6 +953,10 @@ object srvFacturasCliente: TsrvFacturasCliente
             Name = 'NOMBRE'
             Value = ''
           end
+          item
+            Name = 'ID_DIRECCION'
+            Value = ''
+          end
           item
             Name = 'CALLE'
             Value = ''
@@ -1016,15 +1029,15 @@ object srvFacturasCliente: TsrvFacturasCliente
               'IMPORTE_IVA = :IMPORTE_IVA,'#10'    RE = :RE,'#10'    IMPORTE_RE = :IMPO' +
               'RTE_RE,'#10'    IMPORTE_TOTAL = :IMPORTE_TOTAL,'#10'    OBSERVACIONES = ' +
               ':OBSERVACIONES,'#10'    ID_CLIENTE = :ID_CLIENTE,'#10'    NIF_CIF = :NIF' +
-              '_CIF,'#10'    NOMBRE = :NOMBRE,'#10'    CALLE = :CALLE,'#10'    POBLACION = ' +
-              ':POBLACION,'#10'    PROVINCIA = :PROVINCIA,'#10'    CODIGO_POSTAL = :COD' +
-              'IGO_POSTAL,'#10'    FECHA_ALTA = :FECHA_ALTA,'#10'    FECHA_MODIFICACION' +
-              ' = :FECHA_MODIFICACION,'#10'    USUARIO = :USUARIO,'#10'    ID_FORMA_PAG' +
-              'O = :ID_FORMA_PAGO,'#10'    RECARGO_EQUIVALENCIA = :RECARGO_EQUIVALE' +
-              'NCIA,'#10'    ID_TIPO_IVA = :ID_TIPO_IVA,'#10'    IMPORTE_NETO = :IMPORT' +
-              'E_NETO,'#10'    IMPORTE_PORTE = :IMPORTE_PORTE,'#10'    DATOS_BANCARIOS ' +
-              '= :DATOS_BANCARIOS,'#10'    CLIENTE_FINAL = :CLIENTE_FINAL'#10'  WHERE'#10' ' +
-              ' (ID = :OLD_ID);'#10
+              '_CIF,'#10'    NOMBRE = :NOMBRE,'#10'    ID_DIRECCION = :ID_DIRECCION,'#10'  ' +
+              '  CALLE = :CALLE,'#10'    POBLACION = :POBLACION,'#10'    PROVINCIA = :P' +
+              'ROVINCIA,'#10'    CODIGO_POSTAL = :CODIGO_POSTAL,'#10'    FECHA_ALTA = :' +
+              'FECHA_ALTA,'#10'    FECHA_MODIFICACION = :FECHA_MODIFICACION,'#10'    US' +
+              'UARIO = :USUARIO,'#10'    ID_FORMA_PAGO = :ID_FORMA_PAGO,'#10'    RECARG' +
+              'O_EQUIVALENCIA = :RECARGO_EQUIVALENCIA,'#10'    ID_TIPO_IVA = :ID_TI' +
+              'PO_IVA,'#10'    IMPORTE_NETO = :IMPORTE_NETO,'#10'    IMPORTE_PORTE = :I' +
+              'MPORTE_PORTE,'#10'    DATOS_BANCARIOS = :DATOS_BANCARIOS,'#10'    CLIENT' +
+              'E_FINAL = :CLIENTE_FINAL'#10'  WHERE'#10'  (ID = :OLD_ID);'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
diff --git a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dpk b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dpk
index 221487bb..713ab979 100644
--- a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dpk	
+++ b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dpk	
@@ -25,33 +25,15 @@ package FacturasCliente_view;
 {$IMPLICITBUILD OFF}
 
 requires
+  Base,
   GUIBase,
+  ApplicationBase,
   FacturasCliente_model,
   FacturasCliente_controller,
   Contactos_view,
   Articulos_view,
   AlbCli_FacCli_relation,
   PreCli_FacCli_relation,
-  vcl,
-  rtl,
-  PNG_D10,
-  PngComponentsD10,
-  vclactnband,
-  vclx,
-  tb2k_d10,
-  tbx_d10,
-  JvCoreD11R,
-  vcldb,
-  dbrtl,
-  vcljpg,
-  Jcl,
-  JclVcl,
-  JvSystemD11R,
-  JvStdCtrlsD11R,
-  JvPageCompsD11R,
-  frx11,
-  fs11,
-  frxe11,
   GestorInformes_controller;
 
 contains
@@ -64,7 +46,7 @@ contains
   uEditorFacturasClienteReport in 'uEditorFacturasClienteReport.pas' {fEditorFacturasClientePreview},
   uEditorElegirArticulosFacturaCliente in 'uEditorElegirArticulosFacturaCliente.pas' {fEditorElegirArticulosFacturaCliente: TForm},
   uViewElegirArticulosFacturasCliente in 'uViewElegirArticulosFacturasCliente.pas' {frViewElegirArticulosFacturasCliente: TFrame},
-  uEditorElegirFacturasCliente in 'uEditorElegirFacturasCliente.pas' {fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente};
-
+  uEditorElegirFacturasCliente in 'uEditorElegirFacturasCliente.pas' {fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente},
+  uViewDatosYSeleccionClienteFacturaCliente in 'uViewDatosYSeleccionClienteFacturaCliente.pas' {frViewDatosYSeleccionClienteFacturaCliente: TFrame};
 
 end.
diff --git a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj
index a418a028..7df21db5 100644
--- a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj	
+++ b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj	
@@ -49,42 +49,16 @@
     <DelphiCompile Include="FacturasCliente_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\AlbCli_FacCli_relation.dcp" />
-    <DCCReference Include="..\Articulos_view.dcp" />
-    <DCCReference Include="..\Contactos_view.dcp" />
-    <DCCReference Include="..\dbrtl.dcp" />
-    <DCCReference Include="..\FacturasCliente_controller.dcp" />
-    <DCCReference Include="..\FacturasCliente_model.dcp" />
-    <DCCReference Include="..\frx11.dcp" />
-    <DCCReference Include="..\frxe11.dcp" />
-    <DCCReference Include="..\fs11.dcp" />
-    <DCCReference Include="..\GestorInformes_controller.dcp" />
-    <DCCReference Include="..\GUIBase.dcp" />
-    <DCCReference Include="..\Jcl.dcp" />
-    <DCCReference Include="..\JclVcl.dcp" />
-    <DCCReference Include="..\JvCoreD11R.dcp" />
-    <DCCReference Include="..\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\JvSystemD11R.dcp" />
-    <DCCReference Include="..\PngComponentsD10.dcp" />
-    <DCCReference Include="..\PNG_D10.dcp" />
-    <DCCReference Include="..\PreCli_FacCli_relation.dcp" />
-    <DCCReference Include="..\rtl.dcp" />
-    <DCCReference Include="..\tb2k_d10.dcp" />
-    <DCCReference Include="..\tbx_d10.dcp" />
-    <DCCReference Include="..\vcl.dcp" />
-    <DCCReference Include="..\vclactnband.dcp" />
-    <DCCReference Include="..\vcldb.dcp" />
-    <DCCReference Include="..\vcljpg.dcp" />
-    <DCCReference Include="..\vclx.dcp" />
-    <DCCReference Include="uEditorElegirArticulosFacturaCliente.pas">
-      <Form>fEditorElegirArticulosFacturaCliente</Form>
-      <DesignClass>TForm</DesignClass>
-    </DCCReference>
-    <DCCReference Include="uEditorElegirFacturasCliente.pas">
-      <Form>fEditorElegirFacturasCliente</Form>
-      <DesignClass>TfEditorElegirFacturasCliente</DesignClass>
-    </DCCReference>
+    <DCCReference Include="C:\Documents and Settings\Usuario\AlbCli_FacCli_relation.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Articulos_view.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_view.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\FacturasCliente_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\FacturasCliente_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\GestorInformes_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PreCli_FacCli_relation.dcp" />
     <DCCReference Include="uEditorElegirArticulosFacturaCliente.pas">
       <Form>fEditorElegirArticulosFacturaCliente</Form>
       <DesignClass>TForm</DesignClass>
@@ -105,6 +79,10 @@
       <Form>fEditorFacturasClientePreview</Form>
     </DCCReference>
     <DCCReference Include="uFacturasClienteViewRegister.pas" />
+    <DCCReference Include="uViewDatosYSeleccionClienteFacturaCliente.pas">
+      <Form>fruViewDatosYSeleccionClienteFacturaCliente</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
     <DCCReference Include="uViewDetallesFacturaCliente.pas">
       <Form>frViewDetallesFacturaCliente</Form>
       <DesignClass>TFrame</DesignClass>
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
index 2fffa83d..4990489a 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm	
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm	
@@ -39,7 +39,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
     end
     inherited lblDesbloquear: TcxLabel
       Left = 687
-      ExplicitLeft = 499
+      ExplicitLeft = 687
     end
   end
   inherited TBXDock: TTBXDock
@@ -120,9 +120,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             798
             316)
           inherited Label1: TLabel
-            Left = 439
+            Left = 351
             Width = 311
-            ExplicitLeft = 439
+            ExplicitLeft = 351
             ExplicitWidth = 311
           end
           inherited eReferencia: TcxDBTextEdit
@@ -130,38 +130,69 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitWidth = 343
-            Width = 343
+            ExplicitWidth = 249
+            Width = 249
           end
           inherited edtFecha: TcxDBDateEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitWidth = 343
-            Width = 343
+            ExplicitWidth = 249
+            Width = 249
           end
           inherited memObservaciones: TcxDBMemo
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitWidth = 445
+            ExplicitWidth = 351
             ExplicitHeight = 136
             Height = 136
-            Width = 445
+            Width = 351
           end
-          inherited frViewClienteFactura: TfrViewDatosYSeleccionCliente
-            Left = 428
-            Width = 298
-            ExplicitLeft = 428
-            ExplicitWidth = 298
+          inherited cbFormaPago: TcxDBLookupComboBox
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 111
+            Width = 111
+          end
+          inherited bFormasPago: TButton
+            Left = 180
+            ExplicitLeft = 180
+          end
+          inherited cbCuentaBancaria: TcxDBComboBox
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 249
+            Width = 249
+          end
+          inherited cbClienteFinal: TcxDBTextEdit
+            Left = 351
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 351
+            ExplicitWidth = 339
+            Width = 339
+          end
+          inherited bElegirClienteFinal: TButton
+            Left = 725
+            ExplicitLeft = 725
+          end
+          inherited frViewDatosYSeleccionClienteFacturaCliente1: TfrViewDatosYSeleccionClienteFacturaCliente
+            Left = 340
+            Width = 505
+            ExplicitLeft = 340
+            ExplicitWidth = 505
             inherited dxLayoutControl1: TdxLayoutControl
-              Width = 298
-              ExplicitWidth = 298
+              Width = 505
               inherited edtlNombre: TcxDBTextEdit
-                DataBinding.DataSource = frViewFacturaCliente1.DADataSource
-                Properties.OnChange = frViewClienteFacturaedtlNombrePropertiesChange
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
@@ -170,90 +201,31 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
                 Width = 224
               end
               inherited edtNIFCIF: TcxDBTextEdit
-                DataBinding.DataSource = frViewFacturaCliente1.DADataSource
+                Left = 306
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
-                ExplicitWidth = 224
-                Width = 224
-              end
-              inherited edtCalle: TcxDBTextEdit
-                DataBinding.DataSource = frViewFacturaCliente1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
-                ExplicitWidth = 224
-                Width = 224
-              end
-              inherited edtPoblacion: TcxDBTextEdit
-                DataBinding.DataSource = frViewFacturaCliente1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
-                ExplicitWidth = 106
-                Width = 106
-              end
-              inherited edtProvincia: TcxDBTextEdit
-                DataBinding.DataSource = frViewFacturaCliente1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
-                ExplicitWidth = 224
-                Width = 224
-              end
-              inherited edtCodigoPostal: TcxDBTextEdit
-                Left = 239
-                DataBinding.DataSource = frViewFacturaCliente1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
-                ExplicitLeft = 239
+                ExplicitLeft = 306
               end
               inherited Button3: TBitBtn
-                Left = 129
-                ExplicitLeft = 129
+                Left = 217
+                ExplicitLeft = 217
+              end
+              inherited edtDireccion: TcxTextEdit
+                Style.LookAndFeel.SkinName = ''
+                StyleDisabled.LookAndFeel.SkinName = ''
+                StyleFocused.LookAndFeel.SkinName = ''
+                StyleHot.LookAndFeel.SkinName = ''
+                ExplicitWidth = 121
+                Width = 121
+              end
+              inherited Button4: TButton
+                Left = 386
+                ExplicitLeft = 386
               end
             end
           end
-          inherited cbFormaPago: TcxDBLookupComboBox
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-            ExplicitWidth = 205
-            Width = 205
-          end
-          inherited bFormasPago: TButton
-            Left = 268
-            ExplicitLeft = 268
-          end
-          inherited cbCuentaBancaria: TcxDBComboBox
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-            ExplicitWidth = 343
-            Width = 343
-          end
-          inherited cbClienteFinal: TcxDBTextEdit
-            Left = 439
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 439
-            ExplicitWidth = 339
-            Width = 339
-          end
-          inherited bElegirClienteFinal: TButton
-            Left = 725
-            ExplicitLeft = 725
-          end
         end
       end
     end
@@ -280,28 +252,27 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
         ExplicitHeight = 316
         inherited ToolBar1: TToolBar
           Width = 798
-          Height = 51
+          Height = 46
           ExplicitWidth = 798
-          ExplicitHeight = 51
+          ExplicitHeight = 46
           inherited ToolButton3: TToolButton
             Wrap = False
           end
           inherited ToolButton4: TToolButton
             Left = 278
             Top = 0
+            Wrap = True
             ExplicitLeft = 278
             ExplicitTop = 0
           end
           inherited ToolButton14: TToolButton
-            Left = 334
-            Top = 0
+            Left = 0
             Wrap = False
-            ExplicitLeft = 334
-            ExplicitTop = 0
+            ExplicitLeft = 0
           end
           inherited FontName: TJvFontComboBox
-            Left = 399
-            Top = 0
+            Left = 65
+            Top = 22
             ExplicitLeft = 399
             ExplicitTop = 0
           end
@@ -313,7 +284,13 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             ExplicitTop = 0
             ExplicitWidth = 152
           end
-          inherited ToolButton13: TToolButton [7]
+          inherited UpDown1: TUpDown
+            Left = 696
+            Top = 0
+            ExplicitLeft = 696
+            ExplicitTop = 0
+          end
+          inherited ToolButton13: TToolButton
             Left = 0
             Top = 0
             Wrap = True
@@ -321,52 +298,46 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             ExplicitTop = 0
             ExplicitHeight = 27
           end
-          inherited UpDown1: TUpDown [8]
+          inherited ToolButton6: TToolButton
             Left = 0
             Top = 27
             ExplicitLeft = 0
             ExplicitTop = 27
           end
-          inherited ToolButton6: TToolButton
-            Left = 17
-            Top = 27
-            ExplicitLeft = 17
-            ExplicitTop = 27
-          end
           inherited ToolButton7: TToolButton
-            Left = 83
+            Left = 66
             Top = 27
-            ExplicitLeft = 83
+            ExplicitLeft = 66
             ExplicitTop = 27
           end
           inherited ToolButton8: TToolButton
-            Left = 150
+            Left = 133
             Top = 27
-            ExplicitLeft = 150
+            ExplicitLeft = 133
             ExplicitTop = 27
           end
           inherited ToolButton12: TToolButton
-            Left = 233
+            Left = 216
             Top = 27
-            ExplicitLeft = 233
+            ExplicitLeft = 216
             ExplicitTop = 27
           end
           inherited ToolButton9: TToolButton
-            Left = 241
+            Left = 224
             Top = 27
-            ExplicitLeft = 241
+            ExplicitLeft = 224
             ExplicitTop = 27
           end
           inherited ToolButton10: TToolButton
-            Left = 386
+            Left = 369
             Top = 27
-            ExplicitLeft = 386
+            ExplicitLeft = 369
             ExplicitTop = 27
           end
           inherited ToolButton11: TToolButton
-            Left = 511
+            Left = 494
             Top = 27
-            ExplicitLeft = 511
+            ExplicitLeft = 494
             ExplicitTop = 27
           end
         end
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas
index 5c5dce73..1e1ba9cf 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas	
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas	
@@ -313,10 +313,8 @@ begin
 end;
 
 procedure TfEditorFacturaCliente.OnClienteChanged(Sender: TObject);
-var
-  FDetallesController : IDetallesFacturaClienteController;
 begin
-  FFactura.Cliente := frViewFacturaCliente1.frViewClienteFactura.Cliente;
+  FFactura.Cliente := ViewFacturaCliente.ViewClienteFactura.Cliente;
 
   if not (FFactura.DataTable.State in dsEditModes) then
      FFactura.DataTable.Edit;
@@ -396,10 +394,7 @@ begin
   FController := Value;
 
   if Assigned(FController) then
-  begin
-     frViewFacturaCliente1.frViewClienteFactura.Controller := Controller.ClienteController;
-     frViewDetallesFacturaCliente1.Controller := Controller.DetallesController;
-  end;
+    frViewDetallesFacturaCliente1.Controller := Controller.DetallesController;
 end;
 
 procedure TfEditorFacturaCliente.SetFactura(const Value: IBizFacturaCliente);
@@ -417,17 +412,18 @@ begin
 
     if Assigned(FViewFactura) then
     begin
-      frViewFacturaCliente1.frViewClienteFactura.Cliente := FFactura.Cliente;
-      frViewFacturaCliente1.frViewClienteFactura.OnClienteChanged := OnClienteChanged;
-
-      FViewFactura.Factura := FFactura;
-      frViewDetallesFacturaCliente1.Detalles := FFactura.Detalles;
-      frViewDetallesFacturaCliente1.Factura := FFactura; //Para poder sacar los descuento del articulos segun el cliente seleccionado
+      ViewFacturaCliente.ViewClienteFactura.OnClienteChanged := NIL;
+      try
+        FViewFactura.Factura := FFactura;
+        frViewDetallesFacturaCliente1.Detalles := FFactura.Detalles;
+        frViewDetallesFacturaCliente1.Factura := FFactura; //Para poder sacar los descuento del articulos segun el cliente seleccionado
+      finally
+        ViewFacturaCliente.ViewClienteFactura.OnClienteChanged := OnClienteChanged;
+      end;
     end;
   end
   else begin
-    frViewFacturaCliente1.frViewClienteFactura.OnClienteChanged := NIL;
-    frViewFacturaCliente1.frViewClienteFactura.Cliente := NIL;
+    ViewFacturaCliente.ViewClienteFactura.OnClienteChanged := NIL;
     dsDataTable.DataTable := NIL;
     frViewTotales1.DADataSource.DataTable := NIL;
     frViewTotales1.dsTiposIVA.DataTable := NIL;
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.dfm
new file mode 100644
index 00000000..b7df5373
--- /dev/null
+++ b/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.dfm	
@@ -0,0 +1,435 @@
+inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClienteFacturaCliente
+  Width = 505
+  Height = 138
+  ExplicitWidth = 505
+  ExplicitHeight = 138
+  object dxLayoutControl1: TdxLayoutControl
+    Left = 0
+    Top = 0
+    Width = 505
+    Height = 138
+    Margins.Left = 0
+    Margins.Top = 0
+    Margins.Right = 0
+    Margins.Bottom = 0
+    Align = alClient
+    ParentBackground = True
+    TabOrder = 0
+    TabStop = False
+    AutoContentSizes = [acsWidth, acsHeight]
+    DesignSize = (
+      505
+      138)
+    object edtlNombre: TcxDBTextEdit
+      Left = 58
+      Top = 41
+      Anchors = [akLeft, akTop, akRight]
+      AutoSize = False
+      DataBinding.DataField = 'NOMBRE'
+      DataBinding.DataSource = dsCliente
+      Enabled = False
+      ParentFont = False
+      Properties.ReadOnly = True
+      Properties.UseLeftAlignmentOnEditing = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleDisabled.TextColor = clWindowText
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 2
+      Height = 21
+      Width = 224
+    end
+    object edtNIFCIF: TcxDBTextEdit
+      Left = 392
+      Top = 41
+      Anchors = [akLeft, akTop, akRight]
+      AutoSize = False
+      DataBinding.DataField = 'NIF_CIF'
+      DataBinding.DataSource = dsCliente
+      Enabled = False
+      ParentFont = False
+      Properties.ReadOnly = True
+      Properties.UseLeftAlignmentOnEditing = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleDisabled.TextColor = clWindowText
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 3
+      Height = 21
+      Width = 103
+    end
+    object Button1: TBitBtn
+      Left = 10
+      Top = 10
+      Width = 115
+      Height = 25
+      Action = actElegirContacto
+      Caption = 'Elegir un cliente'
+      TabOrder = 0
+      Glyph.Data = {
+        36040000424D3604000000000000360000002800000010000000100000000100
+        2000000000000004000000000000000000000000000000000000FF00FF00FF00
+        FF00FF00FF00EB00EB00C507C600AB13AD00A119A2009F19A000A215A400AA10
+        AC00B608B800CE00CE00EF00EF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00B426B000526840004A823400478F310043962F0042992F0043972F004690
+        3100488533004B7237005A405100D201D200FF00FF00FF00FF00FF00FF00FF00
+        FF0062654E004F81350047903100409C2E003AA62C0038AA2B0039A72B003E9E
+        2D00459230004D84340056753800A0189F00FF00FF00FF00FF00FF00FF00FF00
+        FF005F6B4C004B89330042992F0039A82B0032B428002EBB260031B6270037AB
+        2A00409C2E00498C3200527B3600B015B100FF00FF00FF00FF00FF00FF00FF00
+        FF0090488700488D32003E9E2D0035AF290035B631007ACB7B002DBF280033B2
+        28003DA12D0047903100576A4800EC01EC00FF00FF00FF00FF00FF00FF00FF00
+        FF00F008F1005F7351003E9F2D0034B0290080AC8100D2D3D30081BB820032B2
+        28003DA22D004A863A00C519C500FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00EE09EF007861730036923E00598CAE00498CBB004A81A6002B70
+        3A00606D5900D613D600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00FF00FF00EA0CF400608CD00054A2D80053A1D6004F9DD300488B
+        C2009D11AC00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00FF00FF008C67DE005CA9DD005CA9DD005AA7DC0056A4D900519F
+        D400565FAB00EA00EA00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00EC0DF60060A7DE0063B0E30063B0E30061AEE1005CA9DD0056A4
+        D9004E94CC00C105C600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00C532ED0066B2E5006BB7E9006BB7E90067B3E60061AEE1005AA7
+        DC00539FD500A817BE00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00BA3AE7004989B1004A85AC005895BD0068B2E30064B0E4005CA9
+        DE0053A0D400AA1BC300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00CA23E8005098C400539AC7004E93BE00437DA2005190BA005198
+        C6003C79A000BE08C300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00F804FC006995D40062ACDA005DA6D3005299C6004284AD003C7F
+        A900535AA100F300F300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00FF00FF00C140ED0071BAEA0068B2E00059A1CF004990BC004378
+        AA00C315D600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00FF00FF00FF00FF00C83EF000808BDF00668BCC007C60C700D116
+        E400FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00}
+    end
+    object Button2: TBitBtn
+      Left = 131
+      Top = 10
+      Width = 143
+      Height = 25
+      Action = actAnadirContacto
+      Caption = 'Dar de alta un cliente'
+      TabOrder = 1
+      Glyph.Data = {
+        36040000424D3604000000000000360000002800000010000000100000000100
+        2000000000000004000000000000000000000000000000000000FF00FF00FF00
+        FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00D5BFB1006947
+        3100694731006947310069473100694731006947310069473100694731006947
+        3100694731006947310069473100694731006947310069473100D5BFB100F6F2
+        EF00B7A29300B7A29300B7A29300B7A29300B7A29300B7A29300B7A29300B7A2
+        9300B7A29300B7A29300B7A29300B7A29300B7A2930069473100D5BFB1002A80
+        1E00136F0D00136F0D00136F0D00136F0D00136F0D00136F0D002A801E00E3D5
+        CE00E0D1C900DFCFC600DCCBC100DBC9BF00B7A2930069473100D5BFB10059A8
+        5100448B2F003CA02C0032A4260032A526003D9E2C00438D2E00136F0D00E7DB
+        D500A1745C00A1745C00A1745C00A1745C00B7A2930069473100D5BFB10080BC
+        790042952E0031A62600369B3200369E320032A727003E952C00136F0D00EAE0
+        DA00E7DBD500E4D7D000E2D3CB00DFCFC600B7A2930069473100D5BFB100CFE8
+        CD004CA741002D942F0071AB90006FA68E0030923100136F0D00EFE8E300EDE4
+        DF00A1745C00A1745C00A1745C00A1745C00B7A2930069473100D5BFB100FFFF
+        FF00B9DDC2004F9DA000559BC8004E96C2004E8E8F00A8C2AA00F2ECE800EFE8
+        E300EDE4DF00EAE0DA00E7DBD500E4D7D000B7A2930069473100D5BFB100FFFF
+        FF00A5CDE8005DAADD005CA9DD0057A4D900519ACC00A0BACA00F5F0ED00F2EC
+        E800EFE8E300EDE4DF00EAE0DA00E7DBD500B7A2930069473100D5BFB100ECF6
+        FA006CB9DF0065B2E50065B1E5005FACDF0056A2D700689EBE00F7F4F100F5F0
+        ED00F2ECE800006000000060000000600000B7A2930069473100D5BFB100E9F6
+        FA005BB0D5005CA6D50065AFDF0062AFE20058A4D8003285A700FAF8F600F7F4
+        F100F7A073000060000033CB510000600000B7A2930069473100D5BFB100F4FA
+        FC0078C0DD0056A0CD00569DCA00539CCA00448DBB003285A700FDFCFB000060
+        0000006000000060000040D86500006000000060000000600000D5BFB100FFFF
+        FF00CEEAF40062B5DE005DA7D5004B92BE003285A700C6DCE600FFFFFF000060
+        000060F898005AF28F004DE57A0040D865003AD25C0000600000D5BFB100FFFF
+        FF00FFFFFF00CEEAF400A5CDE800A5CDE800CEEAF400FFFFFF00FFFFFF000060
+        000000600000006000005AF28F00006000000060000000600000D5BFB100D5BF
+        B100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BF
+        B100D5BFB1000060000060F8980000600000D5BFB100D5BFB100FF00FF00FF00
+        FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00006000000060000000600000FF00FF00FF00FF00}
+    end
+    object Button3: TBitBtn
+      Left = 303
+      Top = 99
+      Width = 192
+      Height = 25
+      Action = actVerContacto
+      Caption = 'Ver ficha completa del cliente...'
+      TabOrder = 6
+      Glyph.Data = {
+        36040000424D3604000000000000360000002800000010000000100000000100
+        2000000000000004000000000000000000000000000000000000FF00FF00FF00
+        FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00D5BFB1006947
+        3100694731006947310069473100694731006947310069473100694731006947
+        3100694731006947310069473100694731006947310069473100D5BFB100F6F2
+        EF00B7A29300B7A29300B7A29300B7A29300B7A29300B7A29300B7A29300B7A2
+        9300B7A29300B7A29300B7A29300B7A29300B7A2930069473100D5BFB1002A80
+        1E00136F0D00136F0D00136F0D00136F0D00136F0D00136F0D002A801E00E3D5
+        CE00E0D1C900DFCFC600DCCBC100DBC9BF00B7A2930069473100D5BFB10059A8
+        5100448B2F003CA02C0032A4260032A526003D9E2C00438D2E00136F0D00E7DB
+        D500A1745C00A1745C00A1745C00A1745C00B7A2930069473100D5BFB10080BC
+        790042952E0031A62600369B3200369E320032A727003E952C00136F0D00EAE0
+        DA00E7DBD500E4D7D000E2D3CB00DFCFC600B7A2930069473100D5BFB100CFE8
+        CD004CA741002D942F0071AB90006FA68E0030923100136F0D00EFE8E300EDE4
+        DF00A1745C00A1745C00A1745C00A1745C00B7A2930069473100D5BFB100FFFF
+        FF00B9DDC2004F9DA000559BC8004E96C2004E8E8F00A8C2AA00F2ECE800EFE8
+        E300EDE4DF00EAE0DA00E7DBD500E4D7D000B7A2930069473100D5BFB100FFFF
+        FF00A5CDE8005DAADD005CA9DD0057A4D900519ACC00A0BACA00F5F0ED00F2EC
+        E800EFE8E300EDE4DF00EAE0DA00E7DBD500B7A2930069473100D5BFB100ECF6
+        FA006CB9DF0065B2E50065B1E5005FACDF0056A2D700689EBE00F7F4F100F5F0
+        ED00F2ECE800EFE8E300EDE4DF00EAE0DA00B7A2930069473100D5BFB100E9F6
+        FA005BB0D5005CA6D50065AFDF0062AFE20058A4D8003285A700FAF8F600F7F4
+        F100F7A07300F7A07300F7A07300F7A07300B7A2930069473100D5BFB100F4FA
+        FC0078C0DD0056A0CD00569DCA00539CCA00448DBB003285A700FDFCFB00FAF8
+        F600F7F4F100F5F0ED00F2ECE800EFE8E300B7A2930069473100D5BFB100FFFF
+        FF00CEEAF40062B5DE005DA7D5004B92BE003285A700C6DCE600FFFFFF00FDFC
+        FB00F7A07300F7A07300F7A07300F7A07300B7A2930069473100D5BFB100FFFF
+        FF00FFFFFF00CEEAF400A5CDE800A5CDE800CEEAF400FFFFFF00FFFFFF00FFFF
+        FF00FEFEFD00FCFAF900F9F6F400F6F2EF00F3EEEA0069473100D5BFB100D5BF
+        B100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BF
+        B100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100FF00FF00FF00
+        FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00}
+    end
+    object edtDireccion: TcxTextEdit
+      Left = 58
+      Top = 70
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      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 = 4
+      Width = 121
+    end
+    object Button4: TButton
+      Left = 472
+      Top = 68
+      Width = 23
+      Height = 25
+      Action = actElegirDireccion
+      TabOrder = 5
+    end
+    object dxLayoutControl1Group_Root: TdxLayoutGroup
+      ShowCaption = False
+      Hidden = True
+      ShowBorder = False
+      object dxLayoutControl1Group1: TdxLayoutGroup
+        ShowCaption = False
+        Hidden = True
+        LayoutDirection = ldHorizontal
+        ShowBorder = False
+        object dxLayoutControl1Item7: TdxLayoutItem
+          Caption = 'Button1'
+          ShowCaption = False
+          Control = Button1
+          ControlOptions.ShowBorder = False
+        end
+        object dxLayoutControl1Item8: TdxLayoutItem
+          Caption = 'Button2'
+          ShowCaption = False
+          Control = Button2
+          ControlOptions.ShowBorder = False
+        end
+      end
+      object dxLayoutControl1Group2: TdxLayoutGroup
+        ShowCaption = False
+        Hidden = True
+        ShowBorder = False
+        object dxLayoutControl1Group4: TdxLayoutGroup
+          ShowCaption = False
+          Hidden = True
+          LayoutDirection = ldHorizontal
+          ShowBorder = False
+          object dxLayoutControl1Item1: TdxLayoutItem
+            AutoAligns = [aaVertical]
+            AlignHorz = ahClient
+            Caption = 'Nombre:'
+            Control = edtlNombre
+            ControlOptions.ShowBorder = False
+          end
+          object dxLayoutControl1Item2: TdxLayoutItem
+            AutoAligns = [aaVertical]
+            AlignHorz = ahRight
+            Caption = 'NIF/CIF:'
+            Control = edtNIFCIF
+            ControlOptions.ShowBorder = False
+          end
+        end
+        object dxLayoutControl1Group3: TdxLayoutGroup
+          ShowCaption = False
+          Hidden = True
+          LayoutDirection = ldHorizontal
+          ShowBorder = False
+          object dxLayoutControl1Item4: TdxLayoutItem
+            AutoAligns = []
+            AlignHorz = ahClient
+            AlignVert = avCenter
+            Caption = 'Direcci'#243'n'
+            Control = edtDireccion
+            ControlOptions.ShowBorder = False
+          end
+          object dxLayoutControl1Item5: TdxLayoutItem
+            AutoAligns = [aaVertical]
+            AlignHorz = ahRight
+            Caption = 'Button4'
+            ShowCaption = False
+            Control = Button4
+            ControlOptions.ShowBorder = False
+          end
+        end
+      end
+      object dxLayoutControl1Item9: TdxLayoutItem
+        AutoAligns = [aaVertical]
+        AlignHorz = ahRight
+        Caption = 'Button3'
+        ShowCaption = False
+        Control = Button3
+        ControlOptions.ShowBorder = False
+      end
+    end
+  end
+  object dsCliente: TDADataSource
+    Left = 400
+    Top = 8
+  end
+  object ActionList1: TActionList
+    Images = PngImageList
+    Left = 368
+    Top = 8
+    object actElegirContacto: TAction
+      Caption = 'Elegir un cliente'
+      ImageIndex = 1
+      OnExecute = actElegirContactoExecute
+    end
+    object actAnadirContacto: TAction
+      Caption = 'Dar de alta un cliente'
+      ImageIndex = 0
+      OnExecute = actAnadirContactoExecute
+    end
+    object actVerContacto: TAction
+      Caption = 'Ver ficha completa del cliente...'
+      ImageIndex = 2
+      OnExecute = actVerContactoExecute
+      OnUpdate = actVerContactoUpdate
+    end
+    object actElegirDireccion: TAction
+      Caption = '...'
+      OnExecute = actElegirDireccionExecute
+      OnUpdate = actElegirDireccionUpdate
+    end
+  end
+  object PngImageList: TPngImageList
+    PngImages = <
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          610000000970485973000017120000171201679FD252000002224944415478DA
+          95935D48936114C77FCB36584A6064161515DEA441108B240293E8A682246805
+          DEA45020F40196505D081242DE94512B8C20169937056914D52E726B6083B114
+          D44CD3D51A216BB6656B5FEF677B5FF31D23033DF070CE03CFFFF73F1CCE6362
+          29D1806AD44E4C5A32F5F58FAA8BD5D73DD8465757034D4D4EFA4E8C62000ED7
+          56E997647490DFE131BD2ED9584971D98EB9478D2603D279B39EE6733DC6DD00
+          68E2EF7E07E95F2291688C48629ABDC71DACABD8AD0334E7B420104D24F4A3D5
+          DDD707E60087F66C2234D0CECF2F41643987556566676799C9C4387AD18FF964
+          91E178EA522DF73ADC851D1CA85ECD27D77948995861B552844C2A9962303441
+          DD051FA22473E5095C735B3972DAC6D3DB016EED7BC9FD47CFE601E57CF3B661
+          C966D1E62C880299549A696915B6639D4892A243D6B6AC349C0B00DA0C22EF7B
+          484EBDCA015424512491125036D751B1CBAE8BB5330F12459937EF860A01DEA0
+          8BA0FB0E5B154BAE832C810CACDF594F4DD5C17FC45AF6FA87F3800D95022DFD
+          ADC47E84682CDF8F222A3C9CF1303915E6C3E5495DDC7AE379C14E546F5F9307
+          F8E4C7BC187F4BA6344E49D24C6E8A24AD12E65809A1895102CD6386B3F8B793
+          C0F0C73CC0196927188E2297651096A7D096D4922D6659DCC2E7AF43F8CE8C70
+          F5AEEBFF1D9CF5D889C7230BAE6F696939BDF6D7BAABACA87A567279647C320F
+          A8B16DA1BBD7B3A47FA5850168EB702C596C6CA2AA2EFA332E187F0080F1503E
+          182A98A90000000049454E44AE426082}
+        Name = 'PngImage0'
+        Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          61000000097048597300000AC400000AC401666D82D4000002A94944415478DA
+          7D925D48536118C79FF3B5AF36DD66B639CB924243225010BC49BA914004CDE8
+          E32228B482EA4689A22289C8CBA28B32B1061688902912D28D16991F6062B2DC
+          45921FB954669BF39C9D6DE7EC9CF3EEBC9D2D8C2CB7079E9BF779FEBFF7F922
+          30C69034822060D3665F5F3A0B90B8C672FCAEC07AD8E35DF0DFBFE3F64EC05F
+          F647F72FC0DB75AED1E1B43D138438C9B26108B11C0443BC30ECF959D731303F
+          9411D0D35C612C2ADBEF3319F5B992AC402412037F9003A4C8E05F17679BDA3E
+          976BA9D1F4807B95552E877D90222910250556023170E66481D900F0CD17C0AD
+          5DDE63F3CBFC505AC0685B6DE34654762B88009B350B8AF658815011C8521C04
+          518487DD530D9D83BECEB480C98EDA13F9798E5E9A61526F098440D1CA572409
+          24298EEFBA271B7BC756D203FA5A8FE49516EDF3313A5D8AA0AAAAD6BF929A01
+          CFC7505DCBBBAAD590349C710BD3EEFA57D916D3A954920648249255283031B3
+          3A7BE1D164A5F61CCC0878D15C917FA8C43165D6334E558B25DBD80847E51BCF
+          A79B3E7D65DB33AEF1E04D570EE5723DB513C4C966E9006101ED0662043C6697
+          30B7DB3021CE6D5C5EEA58FAB22DE0F0ADBD36D25E38A6E6E2126413E00CAA81
+          FAE27AE85FEB876EF10D30DC0E2083542432F3E3F8E2CBC5F7FF01CA5A8E3E21
+          6CC6AB8A264636110C7A80EADC2AE88B0E004474C0B026A035C76BF2B2A7ED43
+          29E671680BA0FC76B50F5BC902641501658B90304BA0EA11100A05544C0774D8
+          0834A7396B04DFE8C8E9B58FC19EAD80EB358B84852E44D9F1DF62930C9856B5
+          6320801419A0A27AA079430AB4303E722530EE6FDF3A838B15E729B3E50195C3
+          D855B34A247F074A8BA91A40A2808C91803955E6E70233F36F3D0D58C6DEEDD6
+          B8D35040179B9DA602305266AC028925A4A0B822A090C20BAB09BF96F35D736E
+          53F70B90E997F07974AFDF0000000049454E44AE426082}
+        Name = 'PngImage1'
+        Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          610000000970485973000017120000171201679FD252000001EC4944415478DA
+          A5934B6813511486BF541B88CD26620DA262A51BDB8520158308D5852055B01B
+          A3E8CEBD2E7CE063512852D09D2E82E04604AB1B5D4451B059D8A6010D84D842
+          5B6B6B1A8D414A4C9B18EB4C27F3F466D41943ED4233309C3BDC39DFFFDF9F7B
+          3C9665D1C8E379323CD510C1061C3DD0697F48C531BEE7A7EDB57F6B072DADBB
+          9C1F4DE154D74D34DD70DE43272FB9805AF3975484E56F1A856289C2D23CFB4F
+          44D8D4BE17DD30B932A8D629B7358D70F7C1D39F8023FBB6917B35C0D78F590C
+          43EC5A06954A8505A5C4B1CB2947F14F07D158D205F48436F03E761E640FEB7C
+          3ED660204B3263B9597A2F24ED866B8F59DD414F28C8E7443FDE6A55A883AAA9
+          28F232F3FA7ABA8EDFAC53FEBD1E1A4DBB805A0685370F91E65E0880084BD358
+          9255CCB65EDAF784571E413378F97ABC1E90C8C6C88EDC6687E9150EAAA415D8
+          BCFB14DD9D875734D76A2235E102B674A85C1CEEA3B498E374F020A666727F21
+          4E662ECFDBAB19BBB9EFD6B3BA0C423B37BA80A4F188E733A32881327EA91991
+          22924FA7B9E427373B45FADCB4A3ACFD72929E78E702EE1506C8E68B18AD0AEA
+          5A595C2F44A02D3495BD7CF8344EF2CC24D7EFC4567770361EA65C2EFCF5AA06
+          0241A2E1215BD5302DBB9AA24ECE645C4077D77606A3F17F9E0307D07F23F2FF
+          C3D4E838FF008E7263BE13CA147C0000000049454E44AE426082}
+        Name = 'PngImage2'
+        Background = clWindow
+      end>
+    Left = 304
+    Top = 8
+    Bitmap = {}
+  end
+  object dsFactura: TDADataSource
+    Left = 336
+    Top = 8
+  end
+end
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.pas
new file mode 100644
index 00000000..32647063
--- /dev/null
+++ b/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.pas	
@@ -0,0 +1,400 @@
+unit uViewDatosYSeleccionClienteFacturaCliente;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, uViewBase, StdCtrls, cxControls, cxContainer, cxEdit, cxLabel,
+  cxDBLabel, ExtCtrls, DB, uDADataTable, uBizContactos,
+  ComCtrls, ToolWin, ActnList, ImgList, PngImageList, cxTextEdit, cxDBEdit,
+  pngimage, JvExControls, JvComponent, JvButton, JvTransparentButton, Mask,
+  DBCtrls, uClientesController, dxLayoutControl, Buttons, uDAInterfaces,
+  cxMaskEdit, cxButtonEdit, uBizFacturasCliente, uBizDireccionesContacto,
+  uDireccionesContactoController, Menus, cxLookAndFeelPainters, cxButtons;
+
+type
+  IViewDatosYSeleccionClienteFacturaCliente = interface(IViewBase)
+    ['{0336F03C-3349-4368-BF63-D03E6F741069}']
+    function GetFactura: IBizFacturaCliente;
+    procedure SetFactura(const Value: IBizFacturaCliente);
+    property Factura: IBizFacturaCliente read GetFactura write SetFactura;
+
+    function GetCliente: IBizCliente;
+    procedure SetCliente(Value: IBizCliente);
+    property Cliente: IBizCliente read GetCliente write SetCliente;
+
+{    function GetID_Cliente: integer;
+    procedure SetID_Cliente(const Value: integer);
+    property ID_Cliente: integer read GetID_Cliente write SetID_Cliente;}
+
+    function GetOnClienteChanged : TNotifyEvent;
+    procedure SetOnClienteChanged (const Value : TNotifyEvent);
+    property OnClienteChanged : TNotifyEvent read GetOnClienteChanged
+      write SetOnClienteChanged;
+
+    procedure ElegirDireccionCliente;
+    procedure ElegirCliente;
+    procedure VerFichaCliente;
+    procedure AnadirNuevoCliente;
+    procedure RefrescarDireccion;
+  end;
+
+  TfrViewDatosYSeleccionClienteFacturaCliente = class(TfrViewBase, IViewDatosYSeleccionClienteFacturaCliente)
+    dsCliente: TDADataSource;
+    ActionList1: TActionList;
+    actElegirContacto: TAction;
+    actAnadirContacto: TAction;
+    actVerContacto: TAction;
+    PngImageList: TPngImageList;
+    dxLayoutControl1Group_Root: TdxLayoutGroup;
+    dxLayoutControl1: TdxLayoutControl;
+    dxLayoutControl1Item1: TdxLayoutItem;
+    edtlNombre: TcxDBTextEdit;
+    dxLayoutControl1Item2: TdxLayoutItem;
+    edtNIFCIF: TcxDBTextEdit;
+    Button1: TBitBtn;
+    dxLayoutControl1Item7: TdxLayoutItem;
+    Button2: TBitBtn;
+    dxLayoutControl1Item8: TdxLayoutItem;
+    Button3: TBitBtn;
+    dxLayoutControl1Item9: TdxLayoutItem;
+    dxLayoutControl1Group1: TdxLayoutGroup;
+    dxLayoutControl1Group2: TdxLayoutGroup;
+    dsFactura: TDADataSource;
+    actElegirDireccion: TAction;
+    dxLayoutControl1Group4: TdxLayoutGroup;
+    dxLayoutControl1Item4: TdxLayoutItem;
+    edtDireccion: TcxTextEdit;
+    Button4: TButton;
+    dxLayoutControl1Item5: TdxLayoutItem;
+    dxLayoutControl1Group3: TdxLayoutGroup;
+    procedure actElegirContactoExecute(Sender: TObject);
+    procedure actAnadirContactoExecute(Sender: TObject);
+    procedure actVerContactoUpdate(Sender: TObject);
+    procedure edtDireccionPropertiesButtonClick(Sender: TObject;
+      AButtonIndex: Integer);
+    procedure actVerContactoExecute(Sender: TObject);
+    procedure actElegirDireccionUpdate(Sender: TObject);
+    procedure actElegirDireccionExecute(Sender: TObject);
+    procedure actElegirPersonaContactoUpdate(Sender: TObject);
+
+  private
+    FOnClienteChanged : TNotifyEvent;
+    FMsgElegirCliente: String;
+    function GetMsgElegirCliente: String;
+    procedure SetMsgElegirCliente(const Value: String);
+
+  protected
+    FClientesController : IClientesController;
+    FDireccionesController : IDireccionesContactoController;
+    FFactura : IBizFacturaCliente;
+    FCliente : IBizCliente;
+    FDireccion : IBizDireccionesContacto;
+    function GetCliente: IBizCliente; virtual;
+    procedure SetCliente(Value: IBizCliente); virtual;
+    function GetOnClienteChanged : TNotifyEvent;
+    procedure SetOnClienteChanged (const Value : TNotifyEvent);
+    procedure SetReadOnly(Value: Boolean); override;
+    function GetID_Cliente: integer; virtual;
+    procedure SetID_Cliente(const Value: integer); virtual;
+    function GetFactura: IBizFacturaCliente;
+    procedure SetFactura(const Value: IBizFacturaCliente);
+    procedure EscribirTextoDireccion;
+    procedure CopiarDireccionAFactura;
+    procedure LimpiarDireccionDeFactura;
+  public
+    constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
+    procedure ElegirDireccionCliente;
+    procedure ElegirCliente;
+    procedure VerFichaCliente;
+    procedure AnadirNuevoCliente;
+    procedure RefrescarDireccion;
+    property Factura: IBizFacturaCliente read GetFactura write SetFactura;
+    property Cliente: IBizCliente read GetCliente write SetCliente;
+    property OnClienteChanged : TNotifyEvent read GetOnClienteChanged write SetOnClienteChanged;
+    property ID_Cliente: integer read GetID_Cliente write SetID_Cliente;
+  end;
+
+implementation
+
+{$R *.dfm}
+
+uses
+  uDataModuleClientes, Math, uCustomView, uBizContactosPersonal, uDialogUtils;
+
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.actElegirContactoExecute(Sender: TObject);
+begin
+  ElegirCliente;
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.actElegirDireccionExecute(
+  Sender: TObject);
+begin
+  inherited;
+  ElegirDireccionCliente;
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.actElegirDireccionUpdate(
+  Sender: TObject);
+begin
+  inherited;
+  (Sender as TAction).Enabled := Assigned(FCliente.Direcciones) and
+      (FCliente.Direcciones.Active) and (FCliente.Direcciones.RecordCount > 0);
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.actElegirPersonaContactoUpdate(
+  Sender: TObject);
+begin
+  inherited;
+  (Sender as TAction).Enabled := Assigned(FCliente.Personal) and
+      (FCliente.Personal.Active) and (FCliente.Personal.RecordCount > 0);
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.actAnadirContactoExecute(
+  Sender: TObject);
+begin
+  AnadirNuevoCliente;
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.actVerContactoExecute(
+  Sender: TObject);
+begin
+  inherited;
+  VerFichaCliente;
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.actVerContactoUpdate(Sender: TObject);
+begin
+  inherited;
+  (Sender as TAction).Enabled := (Length(edtlNombre.Text) > 0);
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.AnadirNuevoCliente;
+var
+  ACliente : IBizCliente;
+begin
+  inherited;
+  ACliente := (FClientesController.Nuevo as IBizCliente);
+  FClientesController.Ver(ACliente);
+  Self.Cliente := ACliente;
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.CopiarDireccionAFactura;
+begin
+  FFactura.Edit;
+  FFactura.ID_DIRECCION := FDireccion.ID;
+  FFactura.CALLE := FDireccion.CALLE;
+  FFactura.POBLACION := FDireccion.POBLACION;
+  FFactura.CODIGO_POSTAL := FDireccion.CODIGO_POSTAL;
+  FFactura.PROVINCIA := FDireccion.PROVINCIA;
+
+  FFactura.IMPORTE_PORTE := FDireccion.PORTE;
+end;
+
+constructor TfrViewDatosYSeleccionClienteFacturaCliente.Create(AOwner: TComponent);
+begin
+  inherited;
+  FMsgElegirCliente := 'Elija el cliente al que se le realizará la factura.';
+  FClientesController := TClientesController.Create;
+  FDireccionesController := TDireccionesContactoController.Create;
+
+  edtlNombre.Enabled := False;
+  edtNIFCIF.Enabled := False;
+  edtDireccion.Enabled := False;
+end;
+
+destructor TfrViewDatosYSeleccionClienteFacturaCliente.Destroy;
+begin
+  FClientesController := NIL;
+  FDireccionesController := NIL;
+  inherited;
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.edtDireccionPropertiesButtonClick(
+  Sender: TObject; AButtonIndex: Integer);
+begin
+  inherited;
+  ElegirDireccionCliente;
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.ElegirCliente;
+var
+  ACliente : IBizCliente;
+begin
+  inherited;
+  ACliente := (FClientesController.ElegirContacto(FClientesController.BuscarTodos, FMsgElegirCliente, False) as IBizCliente);
+
+  if Assigned(ACliente) then
+    Self.Cliente := ACliente;
+  ACliente := Nil;
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.ElegirDireccionCliente;
+var
+  ADireccion : IBizDireccionesContacto;
+begin
+  inherited;
+  ADireccion := FClientesController.ElegirDireccionEntrega(FCliente, ' ');
+
+  if Assigned(ADireccion) then
+  begin
+    FDireccion := ADireccion;
+    FFactura.Edit;
+
+    if FDireccion.IDIsNull then
+      LimpiarDireccionDeFactura
+    else
+      CopiarDireccionAFactura;
+
+    EscribirTextoDireccion;
+  end;
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.EscribirTextoDireccion;
+var
+  ACadena : String;
+begin
+  ACadena := '';
+
+  if Assigned(FDireccion) then
+    ACadena := Format('%s %s %s %s',
+      [FFactura.CALLE, FFactura.POBLACION,
+      FFactura.CODIGO_POSTAL, FFactura.PROVINCIA]);
+
+  edtDireccion.Text := ACadena;
+end;
+
+function TfrViewDatosYSeleccionClienteFacturaCliente.GetCliente: IBizCliente;
+begin
+  Result := FCliente;
+end;
+
+function TfrViewDatosYSeleccionClienteFacturaCliente.GetID_Cliente: integer;
+begin
+  Result := -1;
+  if Assigned(FCliente) then
+    Result := FCliente.ID;
+end;
+
+function TfrViewDatosYSeleccionClienteFacturaCliente.GetMsgElegirCliente: String;
+begin
+  //
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.SetCliente(Value: IBizCliente);
+begin
+  FCliente := Value;
+  if Assigned(FCliente) then
+  begin
+    dsCliente.DataTable := FCliente.DataTable;
+
+    if not FCliente.DataTable.Active then
+      FCliente.DataTable.Active := True;
+  end
+  else begin
+    dsCliente.DataTable := NIL;
+    FCliente := NIL;
+    FDireccion := NIL;
+  end;
+
+  if Assigned(FOnClienteChanged) then
+    FOnClienteChanged(Self);
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.SetID_Cliente(const Value: integer);
+begin
+  Self.Cliente := IBizCliente(FClientesController.Buscar(Value));
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.SetMsgElegirCliente(
+  const Value: String);
+begin
+  //
+end;
+
+function TfrViewDatosYSeleccionClienteFacturaCliente.GetOnClienteChanged: TNotifyEvent;
+begin
+  Result := FOnClienteChanged;
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.LimpiarDireccionDeFactura;
+begin
+  FFactura.Edit;
+  FFactura.ClearField('ID_DIRECCION');
+  FFactura.ClearField('CALLE');
+  FFactura.ClearField('POBLACION');
+  FFactura.ClearField('CODIGO_POSTAL');
+  FFactura.ClearField('PROVINCIA');
+  FFactura.ClearField('IMPORTE_PORTE');
+end;
+
+function TfrViewDatosYSeleccionClienteFacturaCliente.GetFactura: IBizFacturaCliente;
+begin
+  Result := FFactura;
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.RefrescarDireccion;
+begin
+  FDireccion := FDireccionesController.Nuevo;
+
+  if (not FFactura.ID_DIRECCIONIsNull) and
+    (FDireccionesController.Localizar(FCliente.Direcciones, FFactura.ID_DIRECCION)) then
+      FDireccionesController.CopiarDireccion(FCliente.Direcciones, FDireccion)
+  else
+    FDireccionesController.CopiarDireccionFiscal(FCliente, FDireccion);
+
+  EscribirTextoDireccion;
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.SetOnClienteChanged(
+  const Value: TNotifyEvent);
+begin
+  FOnClienteChanged := Value;
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.SetFactura(
+  const Value: IBizFacturaCliente);
+begin
+  FFactura := Value;
+  if Assigned(FFactura) then
+  begin
+    dsFactura.DataTable := FFactura.DataTable;
+
+    FCliente := FFactura.Cliente;
+    dsCliente.DataTable := FCliente.DataTable;
+
+    if not FCliente.DataTable.Active then
+      FCliente.DataTable.Active := True;
+
+    RefrescarDireccion;
+  end
+  else begin
+    dsFactura.DataTable := NIL;
+    FCliente := NIL;
+    FDireccion := NIL;
+  end;
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.SetReadOnly(Value: Boolean);
+begin
+  inherited;
+
+  if (csLoading in Self.ComponentState) then
+    Exit;
+
+  actAnadirContacto.Enabled := not ReadOnly;
+  actElegirContacto.Enabled := not ReadOnly;
+end;
+
+procedure TfrViewDatosYSeleccionClienteFacturaCliente.VerFichaCliente;
+begin
+  if not Assigned(Cliente) then
+    ShowErrorMessage('No se ha indicado un cliente', 'La factura no tiene ningún cliente asociado a mostrar.')
+  else begin
+    FClientesController.Ver(Cliente);
+  end;
+end;
+
+end.
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm
index f9979d07..776fd811 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm	
+++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm	
@@ -1,6 +1,6 @@
 inherited frViewFacturaCliente: TfrViewFacturaCliente
-  Width = 828
-  Height = 525
+  Width = 862
+  Height = 390
   Align = alClient
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
@@ -9,8 +9,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 828
-    Height = 525
+    Width = 862
+    Height = 390
     Align = alClient
     ParentBackground = True
     TabOrder = 0
@@ -20,11 +20,11 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
     ExplicitWidth = 451
     ExplicitHeight = 304
     DesignSize = (
-      828
-      525)
+      862
+      390)
     object Label1: TLabel
-      Left = 421
-      Top = 270
+      Left = 458
+      Top = 193
       Width = 311
       Height = 26
       Caption = 
@@ -80,11 +80,11 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 1
-      Width = 165
+      Width = 293
     end
     object memObservaciones: TcxDBMemo
       Left = 22
-      Top = 164
+      Top = 285
       Anchors = [akLeft, akTop, akRight, akBottom]
       DataBinding.DataField = 'OBSERVACIONES'
       DataBinding.DataSource = DADataSource
@@ -100,92 +100,10 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 5
+      TabOrder = 8
       Height = 345
       Width = 355
     end
-    inline frViewClienteFactura: TfrViewDatosYSeleccionCliente
-      Left = 410
-      Top = 30
-      Width = 294
-      Height = 215
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -11
-      Font.Name = 'Tahoma'
-      Font.Style = []
-      ParentFont = False
-      TabOrder = 6
-      ReadOnly = False
-      ExplicitLeft = 410
-      ExplicitTop = 30
-      ExplicitWidth = 294
-      ExplicitHeight = 215
-      inherited dxLayoutControl1: TdxLayoutControl
-        Width = 294
-        Height = 215
-        ExplicitWidth = 112
-        ExplicitHeight = 215
-        inherited edtlNombre: TcxDBTextEdit
-          DataBinding.DataSource = DADataSource
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 210
-          Width = 210
-        end
-        inherited edtNIFCIF: TcxDBTextEdit
-          DataBinding.DataSource = DADataSource
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 210
-          Width = 210
-        end
-        inherited edtCalle: TcxDBTextEdit
-          DataBinding.DataSource = DADataSource
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 210
-          Width = 210
-        end
-        inherited edtPoblacion: TcxDBTextEdit
-          DataBinding.DataSource = DADataSource
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 92
-          Width = 92
-        end
-        inherited edtProvincia: TcxDBTextEdit
-          DataBinding.DataSource = DADataSource
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 210
-          Width = 210
-        end
-        inherited edtCodigoPostal: TcxDBTextEdit
-          Left = 304
-          DataBinding.DataSource = DADataSource
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 304
-        end
-        inherited Button3: TBitBtn
-          Left = 194
-          ExplicitLeft = 194
-        end
-      end
-    end
     object cbFormaPago: TcxDBLookupComboBox
       Left = 124
       Top = 84
@@ -220,10 +138,10 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 2
-      Width = 27
+      Width = 269
     end
     object bFormasPago: TButton
-      Left = 250
+      Left = 287
       Top = 84
       Width = 132
       Height = 23
@@ -253,8 +171,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       Width = 165
     end
     object cbClienteFinal: TcxDBTextEdit
-      Left = 421
-      Top = 304
+      Left = 458
+      Top = 227
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'CLIENTE_FINAL'
       DataBinding.DataSource = DADataSource
@@ -277,27 +195,87 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 7
+      TabOrder = 6
       Width = 339
     end
     object bElegirClienteFinal: TButton
-      Left = 772
-      Top = 302
+      Left = 806
+      Top = 225
       Width = 23
       Height = 25
       Action = actElegirClienteFinal
-      TabOrder = 8
+      TabOrder = 7
+    end
+    inline frViewDatosYSeleccionClienteFacturaCliente1: TfrViewDatosYSeleccionClienteFacturaCliente
+      Left = 447
+      Top = 30
+      Width = 505
+      Height = 138
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = []
+      ParentFont = False
+      TabOrder = 5
+      ReadOnly = False
+      ExplicitLeft = 447
+      ExplicitTop = 30
+      inherited dxLayoutControl1: TdxLayoutControl
+        inherited edtlNombre: TcxDBTextEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitWidth = 224
+          Width = 224
+        end
+        inherited edtNIFCIF: TcxDBTextEdit
+          Left = 280
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitLeft = 280
+        end
+        inherited Button3: TBitBtn
+          Left = 191
+          ExplicitLeft = 191
+        end
+        inherited edtDireccion: TcxTextEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitWidth = 121
+          Width = 121
+        end
+        inherited Button4: TButton
+          Left = 360
+          ExplicitLeft = 360
+        end
+      end
+      inherited ActionList1: TActionList
+        Left = 120
+        Top = 48
+      end
+      inherited PngImageList: TPngImageList
+        Left = 48
+        Top = 48
+      end
+      inherited dsFactura: TDADataSource
+        Left = 80
+        Top = 48
+      end
     end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
-      LayoutDirection = ldHorizontal
       ShowBorder = False
-      object dxLayoutControl1Group6: TdxLayoutGroup
-        AutoAligns = [aaVertical]
-        AlignHorz = ahClient
+      object dxLayoutControl1Group9: TdxLayoutGroup
         ShowCaption = False
         Hidden = True
+        LayoutDirection = ldHorizontal
         ShowBorder = False
         object dxLayoutControl1Group1: TdxLayoutGroup
           AutoAligns = [aaVertical]
@@ -346,61 +324,63 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
             end
           end
         end
-        object dxLayoutControl1Group5: TdxLayoutGroup
+        object dxLayoutControl1Group2: TdxLayoutGroup
           AutoAligns = []
           AlignHorz = ahClient
           AlignVert = avClient
-          Caption = 'Descripci'#243'n'
-          LayoutDirection = ldHorizontal
-          object dxLayoutControl1Item5: TdxLayoutItem
-            AutoAligns = []
-            AlignHorz = ahClient
-            AlignVert = avClient
-            Control = memObservaciones
-            ControlOptions.ShowBorder = False
-          end
-        end
-      end
-      object dxLayoutControl1Group2: TdxLayoutGroup
-        AutoAligns = []
-        AlignHorz = ahClient
-        AlignVert = avClient
-        Caption = 'Datos del cliente'
-        object dxLayoutControl1Item6: TdxLayoutItem
-          Control = frViewClienteFactura
-          ControlOptions.AutoColor = True
-          ControlOptions.ShowBorder = False
-        end
-        object dxLayoutControl1Group7: TdxLayoutGroup
-          Caption = 'Cliente final'
-          object dxLayoutControl1Item7: TdxLayoutItem
+          Caption = 'Datos del cliente'
+          object dxLayoutControl1Item6: TdxLayoutItem
+            Caption = 'frViewDatosYSeleccionClienteFacturaCliente1'
             ShowCaption = False
-            Control = Label1
+            Control = frViewDatosYSeleccionClienteFacturaCliente1
             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
+          object dxLayoutControl1Group7: TdxLayoutGroup
+            Caption = 'Cliente final'
+            object dxLayoutControl1Item7: TdxLayoutItem
+              ShowCaption = False
+              Control = Label1
+              ControlOptions.AutoColor = True
               ControlOptions.ShowBorder = False
             end
-            object dxLayoutControl1Item9: TdxLayoutItem
-              AutoAligns = [aaVertical]
-              AlignHorz = ahRight
+            object dxLayoutControl1Group8: TdxLayoutGroup
               ShowCaption = False
-              Control = bElegirClienteFinal
-              ControlOptions.ShowBorder = 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
+        AutoAligns = []
+        AlignHorz = ahClient
+        AlignVert = avClient
+        Caption = 'Descripci'#243'n'
+        LayoutDirection = ldHorizontal
+        object dxLayoutControl1Item5: TdxLayoutItem
+          AutoAligns = []
+          AlignHorz = ahClient
+          AlignVert = avClient
+          Control = memObservaciones
+          ControlOptions.ShowBorder = False
+        end
+      end
     end
   end
   object DADataSource: TDADataSource
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas
index ccb1809f..035bc3c7 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas	
+++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas	
@@ -5,12 +5,12 @@ interface
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, uViewBase, DB, uDADataTable, uCustomView,
-  uViewDatosYSeleccionCliente, uBizFacturasCliente,
+  uBizFacturasCliente,
   cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit, dxLayoutControl,
   cxMemo, cxMaskEdit, cxDropDownEdit, cxCalendar, cxSpinEdit, StdCtrls, Mask,
   DBCtrls, cxGraphics, dxLayoutLookAndFeels, cxLookupEdit, cxDBLookupEdit,
   cxDBLookupComboBox, uFormasPagoController, uDAInterfaces, uBizFormasPago,
-  ActnList;
+  ActnList, uViewDatosYSeleccionClienteFacturaCliente;
 
 type
   IViewFacturaCliente = interface(IViewBase)
@@ -18,6 +18,9 @@ type
     function GetFactura: IBizFacturaCliente;
     procedure SetFactura(const Value: IBizFacturaCliente);
     property Factura: IBizFacturaCliente read GetFactura write SetFactura;
+
+    function GetViewClienteFactura: IViewDatosYSeleccionClienteFacturaCliente;
+    property ViewClienteFactura: IViewDatosYSeleccionClienteFacturaCliente read GetViewClienteFactura;
   end;
 
   TfrViewFacturaCliente = class(TfrViewBase, IViewFacturaCliente)
@@ -34,7 +37,6 @@ type
     memObservaciones: TcxDBMemo;
     dxLayoutControl1Group5: TdxLayoutGroup;
     dxLayoutControl1Item6: TdxLayoutItem;
-    frViewClienteFactura: TfrViewDatosYSeleccionCliente;
     dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList;
     dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel;
     dsFormaPago: TDADataSource;
@@ -43,7 +45,6 @@ type
     dxLayoutControl1Item10: TdxLayoutItem;
     bFormasPago: TButton;
     dxLayoutControl1Group3: TdxLayoutGroup;
-    dxLayoutControl1Group6: TdxLayoutGroup;
     dxLayoutControl1Item3: TdxLayoutItem;
     cbCuentaBancaria: TcxDBComboBox;
     dxLayoutControl1Group4: TdxLayoutGroup;
@@ -57,6 +58,8 @@ type
     dxLayoutControl1Group8: TdxLayoutGroup;
     ActionList1: TActionList;
     actElegirClienteFinal: TAction;
+    frViewDatosYSeleccionClienteFacturaCliente1: TfrViewDatosYSeleccionClienteFacturaCliente;
+    dxLayoutControl1Group9: TdxLayoutGroup;
     procedure bFormasPagoClick(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure CustomViewCreate(Sender: TObject);
@@ -66,11 +69,15 @@ type
     FFactura : IBizFacturaCliente;
     FFormasPago : IBizFormaPago;
     FFormasPagoController : IFormasPagoController;
+    FViewClienteFactura : IViewDatosYSeleccionClienteFacturaCliente;
     function GetFactura: IBizFacturaCliente;
     procedure SetFactura(const Value: IBizFacturaCliente);
     procedure RellenarCuentasBancarias;
+
+    function GetViewClienteFactura: IViewDatosYSeleccionClienteFacturaCliente;
   public
     property Factura: IBizFacturaCliente read GetFactura write SetFactura;
+    property ViewClienteFactura: IViewDatosYSeleccionClienteFacturaCliente read GetViewClienteFactura;
   end;
 
 
@@ -128,6 +135,7 @@ begin
   inherited;
   FFormasPago := Nil;
   FFormasPagoController := TFormasPagoController.Create;
+  FViewClienteFactura := frViewDatosYSeleccionClienteFacturaCliente1;
 end;
 
 procedure TfrViewFacturaCliente.CustomViewDestroy(Sender: TObject);
@@ -135,6 +143,7 @@ begin
   inherited;
   FFormasPago := Nil;
   FFormasPagoController := NIL;
+  FViewClienteFactura := NIL;
 end;
 
 function TfrViewFacturaCliente.GetFactura: IBizFacturaCliente;
@@ -142,6 +151,11 @@ begin
   Result := FFactura;
 end;
 
+function TfrViewFacturaCliente.GetViewClienteFactura: IViewDatosYSeleccionClienteFacturaCliente;
+begin
+  Result := FViewClienteFactura;
+end;
+
 procedure TfrViewFacturaCliente.RellenarCuentasBancarias;
 var
   AController : IEmpresasController;
@@ -188,10 +202,14 @@ var
 begin
   FFactura := Value;
   RellenarCuentasBancarias;
+
   if Assigned(FFactura) then
   begin
     DADataSource.DataTable := FFactura.DataTable;
 
+    frViewDatosYSeleccionClienteFacturaCliente1.Factura := FFactura;
+    frViewDatosYSeleccionClienteFacturaCliente1.Cliente := FFactura.Cliente;
+
     FFormasPago := FFormasPagoController.BuscarTodos;
     dsFormaPago.DataTable := FFormasPago.DataTable;
     dsFormaPago.DataTable.Active := True;
@@ -204,12 +222,13 @@ begin
     end
     else
       ACadena := 'Elija el cliente al que se le realizará la factura.';
-    frViewClienteFactura.MsgElegirCliente := ACadena;
+    //ViewDatosYSeleccionClienteFacturaCliente1.MsgElegirCliente := ACadena;
   end
   else begin
     DADataSource.DataTable := NIL;
     dsFormaPago.DataTable := NIL;
-    frViewClienteFactura.Cliente := NIL
+    frViewDatosYSeleccionClienteFacturaCliente1.Factura := NIL;
+    frViewDatosYSeleccionClienteFacturaCliente1.Cliente := NIL;
   end;
 end;
 
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index a1774b31..701b1cd3 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 18f6574a..0a3d5b44 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "1.4.3.0\0"
               VALUE "ProductVersion", "1.4.3.0\0"
-              VALUE "CompileDate", "miércoles, 05 de noviembre de 2008 20:14\0"
+              VALUE "CompileDate", "jueves, 06 de noviembre de 2008 11:20\0"
          END
     END
     BLOCK "VarFileInfo"