diff --git a/Source/ApplicationBase/ApplicationBase.res b/Source/ApplicationBase/ApplicationBase.res
index 1641339f..8b251f31 100644
Binary files a/Source/ApplicationBase/ApplicationBase.res and b/Source/ApplicationBase/ApplicationBase.res differ
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 50c04110..763193c9 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -58,47 +58,47 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Contactos\adortl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\cxIntl6D11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\cxIntlPrintSys3D11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dclIndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\designide.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dsnap.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\GUISDK_D11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\IndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\IndyProtocols.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\IndySystem.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Jcl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JclVcl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JSDialog100.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvCmpD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvCoreD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvMMD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvNetD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvSystemD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\pckMD5.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\PluginSDK_D10R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\PNG_D10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\TB2k_D10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\tbx_d10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\VclSmp.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\vclx.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\xmlrtl.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\adortl.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\cxIntl6D11.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\cxIntlPrintSys3D11.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\dclIndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\designide.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\dsnap.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\GUISDK_D11.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\IndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\IndyProtocols.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\IndySystem.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\Jcl.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\JclVcl.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\JSDialog100.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\JvCmpD11R.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\JvDlgsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\JvMMD11R.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\JvNetD11R.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\JvSystemD11R.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\pckMD5.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\PluginSDK_D10R.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\PNG_D10.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\TB2k_D10.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\tbx_d10.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\vclactnband.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\vcljpg.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\VclSmp.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\vclx.dcp" />
+    <DCCReference Include="..\Modulos\Recibos de cliente\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
diff --git a/Source/Base/Base.res b/Source/Base/Base.res
index 1641339f..8b251f31 100644
Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ
diff --git a/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas b/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas
index c69c8283..8b9f1b74 100644
--- a/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas	
+++ b/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas	
@@ -33,6 +33,9 @@ uses
 type
   IRecibosClienteController = interface(IObservador)
   ['{CBC8BDB8-FBE0-4D54-B2F1-A9330E8339EB}']
+    function GetClienteController: IClientesController;
+    procedure SetClienteController(const Value: IClientesController);
+    property ClienteController: IClientesController read GetClienteController write SetClienteController;
 
     function GetPagosController: IPagosClienteController;
     procedure SetPagosController(const Value: IPagosClienteController);
@@ -90,6 +93,9 @@ type
     FPagosController : IPagosClienteController;
     FClienteController : IClientesController;
 
+    function GetClienteController: IClientesController;
+    procedure SetClienteController(const Value: IClientesController);
+
     function GetPagosController: IPagosClienteController;
     procedure SetPagosController(const Value: IPagosClienteController);
 
@@ -100,6 +106,7 @@ type
     function DarNuevaReferencia(ID_FACTURA : Integer; REFERENCIA: String): String;
 
   public
+    property ClienteController: IClientesController read GetClienteController write SetClienteController;
     property PagosController: IPagosClienteController read GetPagosController write SetPagosController;
     constructor Create; override;
     destructor Destroy; override;
@@ -654,11 +661,21 @@ begin
   AReciboCliente._Cliente := (FClienteController.Buscar(AReciboCliente.ID_Cliente) as IBizCliente);
 end;
 
+function TRecibosClienteController.GetClienteController: IClientesController;
+begin
+  Result := FClienteController;
+end;
+
 function TRecibosClienteController.GetPagosController: IPagosClienteController;
 begin
   Result := FPagosController;
 end;
 
+procedure TRecibosClienteController.SetClienteController(const Value: IClientesController);
+begin
+  FClienteController := Value;
+end;
+
 procedure TRecibosClienteController.SetPagosController(const Value: IPagosClienteController);
 begin
   FPagosController := Value;
diff --git a/Source/Modulos/Recibos de cliente/Data/RecibosCliente_data.res b/Source/Modulos/Recibos de cliente/Data/RecibosCliente_data.res
index 1641339f..8b251f31 100644
Binary files a/Source/Modulos/Recibos de cliente/Data/RecibosCliente_data.res and b/Source/Modulos/Recibos de cliente/Data/RecibosCliente_data.res differ
diff --git a/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas b/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas
index 4c2ab6f7..0e01b47e 100644
--- a/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas	
+++ b/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas	
@@ -3,7 +3,7 @@ unit schRecibosClienteClient_Intf;
 interface
 
 uses
-  Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
@@ -365,7 +365,7 @@ type
   end;
 
   { TRecibosClienteDataTableRules }
-  TRecibosClienteDataTableRules = class(TDADataTableRules, IRecibosCliente)
+  TRecibosClienteDataTableRules = class(TIntfObjectDADataTableRules, IRecibosCliente)
   private
   protected
     { Property getters and setters }
@@ -646,7 +646,7 @@ type
   end;
 
   { TPagosClienteDataTableRules }
-  TPagosClienteDataTableRules = class(TDADataTableRules, IPagosCliente)
+  TPagosClienteDataTableRules = class(TIntfObjectDADataTableRules, IPagosCliente)
   private
   protected
     { Property getters and setters }
@@ -921,7 +921,7 @@ type
   end;
 
   { TRecibosCompensadosCliDataTableRules }
-  TRecibosCompensadosCliDataTableRules = class(TDADataTableRules, IRecibosCompensadosCli)
+  TRecibosCompensadosCliDataTableRules = class(TIntfObjectDADataTableRules, IRecibosCompensadosCli)
   private
   protected
     { Property getters and setters }
diff --git a/Source/Modulos/Recibos de cliente/Model/uBizRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Model/uBizRecibosCliente.pas
index fe2aef48..a9589f20 100644
--- a/Source/Modulos/Recibos de cliente/Model/uBizRecibosCliente.pas	
+++ b/Source/Modulos/Recibos de cliente/Model/uBizRecibosCliente.pas	
@@ -27,7 +27,7 @@ interface
 
 uses
   uDAInterfaces, uDADataTable, uDBSelectionListUtils, schRecibosClienteClient_Intf,
-  uBizPagosCliente, uBizRecibosCliCompensados, uBizContactos;
+  uBizContactos, uBizPagosCliente, uBizRecibosCliCompensados;
 
 const
   BIZ_CLIENT_IBIZRECIBOSCLIENTE = 'Client.IBizRecibosCliente';
@@ -41,10 +41,12 @@ type
   IBizRecibosCliente = interface(IRecibosCliente)
   ['{93758493-260C-450D-9018-E5339C2E09B2}']
     function EsNuevo : Boolean;
+    function ConFactura : Boolean;
 
-    // No se puede cambiar el cliente por que depende de la factura
+    // En Acana se puede cambiar el cliente por que un recibo puede corresponder o no a una factura
+    procedure SetCliente(AValue : IBizCliente);
     function GetCliente : IBizCliente;
-    property Cliente : IBizCliente read GetCliente;
+    property Cliente : IBizCliente read GetCliente write SetCliente;
 
     // Esta propidad es para que el controlador pueda acceder directamente
     // a la propiedad Cliente
@@ -70,15 +72,14 @@ type
     FCliente : IBizCliente;
     FSeleccionableInterface : ISeleccionable;
 
-    // No se puede cambiar el cliente por que depende de la factura
+    // En Acana se puede cambiar el cliente por que un recibo puede corresponder o no a una factura
+    procedure SetCliente(AValue : IBizCliente);
     function GetCliente : IBizCliente;
-    property Cliente : IBizCliente read GetCliente;
 
     // Esta propidad es para que el controlador pueda acceder directamente
     // a la propiedad Cliente
     procedure _SetCliente(AValue : IBizCliente);
     function _GetCliente : IBizCliente;
-    property _Cliente : IBizCliente read _GetCliente write _SetCliente;
 
     procedure SetPagos(AValue : IBizPagosCliente);
     function GetPagos : IBizPagosCliente;
@@ -91,6 +92,9 @@ type
     procedure SetID_REMESAValue(const aValue: Integer); override;
 
   public
+    property Cliente : IBizCliente read GetCliente write SetCliente;
+    property _Cliente : IBizCliente read _GetCliente write _SetCliente;
+
     property RecibosCompensados: IBizRecibosCompensadosCli read GetRecibosCompensados write SetRecibosCompensados;
     property Pagos : IBizPagosCliente read GetPagos write SetPagos;
     property SeleccionableInterface : ISeleccionable	read FSeleccionableInterface
@@ -99,6 +103,7 @@ type
 
     procedure IniciarValoresIBizRecibosClienteNuevo;
     function EsNuevo : Boolean;
+    function ConFactura : Boolean;
 
     constructor Create(aDataTable: TDADataTable); override;
     destructor Destroy; override;
@@ -109,7 +114,7 @@ implementation
 { TBizRecibosCliente }
 
 uses
-  SysUtils, uDataTableUtils, schContactosClient_Intf, uFactuGES_App, uBizEmpresasTiendas;
+  SysUtils, DB, uDataTableUtils, schContactosClient_Intf, uFactuGES_App, uBizEmpresasTiendas;
 
  function TBizRecibosCliente.GetCliente: IBizCliente;
 begin
@@ -131,6 +136,37 @@ begin
   result := Trim(DataTable.Fields[idx_RecibosClienteSITUACION].AsString);
 end;
 
+procedure TBizRecibosCliente.SetCliente(AValue: IBizCliente);
+var
+  bEnEdicion : Boolean;
+begin
+  FCliente := AValue;
+
+  bEnEdicion := (DataTable.State in dsEditModes);
+  if not bEnEdicion then
+    Edit;
+
+  if Assigned(FCliente) then
+  begin
+    if not FCliente.DataTable.Active then
+      FCliente.DataTable.Active := True;
+
+    ID_CLIENTE := FCliente.ID;
+    NOMBRE_CLIENTE := FCliente.NOMBRE;
+    NIF_CIF_CLIENTE := FCliente.NIF_CIF;
+
+{    CALLE := FCliente.CALLE;
+    CODIGO_POSTAL := FCliente.CODIGO_POSTAL;
+    PROVINCIA := FCliente.PROVINCIA;
+    POBLACION := FCliente.POBLACION;
+}
+    Post;
+
+    if bEnEdicion then
+      Edit;
+  end
+end;
+
 procedure TBizRecibosCliente.SetID_REMESAValue(const aValue: Integer);
 begin
   if (aValue = 0) then
@@ -165,6 +201,11 @@ begin
   FCliente := AValue;
 end;
 
+function TBizRecibosCliente.ConFactura: Boolean;
+begin
+  Result := ID_FACTURAIsNull;
+end;
+
 constructor TBizRecibosCliente.Create(aDataTable: TDADataTable);
 begin
   inherited;
diff --git a/Source/Modulos/Recibos de cliente/RecibosCliente_Group.groupproj b/Source/Modulos/Recibos de cliente/RecibosCliente_Group.groupproj
index 679e108f..f091d5f5 100644
--- a/Source/Modulos/Recibos de cliente/RecibosCliente_Group.groupproj	
+++ b/Source/Modulos/Recibos de cliente/RecibosCliente_Group.groupproj	
@@ -9,8 +9,10 @@
     <Projects Include="..\..\Cliente\FactuGES.dproj" />
     <Projects Include="..\..\GUIBase\GUIBase.dproj" />
     <Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
+    <Projects Include="..\Articulos\Views\Articulos_view.dproj" />
     <Projects Include="..\Contabilidad\Controller\Contabilidad_controller.dproj" />
     <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
+    <Projects Include="..\Facturas de cliente\Views\FacturasCliente_view.dproj" />
     <Projects Include="Controller\RecibosCliente_controller.dproj" />
     <Projects Include="Data\RecibosCliente_data.dproj" />
     <Projects Include="Model\RecibosCliente_model.dproj" />
@@ -50,6 +52,15 @@
   <Target Name="ApplicationBase:Make">
     <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="Make" />
   </Target>
+  <Target Name="Contactos_view">
+    <MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="" />
+  </Target>
+  <Target Name="Contactos_view:Clean">
+    <MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Contactos_view:Make">
+    <MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="Make" />
+  </Target>
   <Target Name="RecibosCliente_model">
     <MSBuild Projects="Model\RecibosCliente_model.dproj" Targets="" />
   </Target>
@@ -113,15 +124,6 @@
   <Target Name="FactuGES_Server:Make">
     <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
   </Target>
-  <Target Name="Contactos_view">
-    <MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="" />
-  </Target>
-  <Target Name="Contactos_view:Clean">
-    <MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="Contactos_view:Make">
-    <MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="Make" />
-  </Target>
   <Target Name="Contabilidad_controller">
     <MSBuild Projects="..\Contabilidad\Controller\Contabilidad_controller.dproj" Targets="" />
   </Target>
@@ -131,14 +133,32 @@
   <Target Name="Contabilidad_controller:Make">
     <MSBuild Projects="..\Contabilidad\Controller\Contabilidad_controller.dproj" Targets="Make" />
   </Target>
+  <Target Name="FacturasCliente_view">
+    <MSBuild Projects="..\Facturas de cliente\Views\FacturasCliente_view.dproj" Targets="" />
+  </Target>
+  <Target Name="FacturasCliente_view:Clean">
+    <MSBuild Projects="..\Facturas de cliente\Views\FacturasCliente_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FacturasCliente_view:Make">
+    <MSBuild Projects="..\Facturas de cliente\Views\FacturasCliente_view.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Articulos_view">
+    <MSBuild Projects="..\Articulos\Views\Articulos_view.dproj" Targets="" />
+  </Target>
+  <Target Name="Articulos_view:Clean">
+    <MSBuild Projects="..\Articulos\Views\Articulos_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Articulos_view:Make">
+    <MSBuild Projects="..\Articulos\Views\Articulos_view.dproj" Targets="Make" />
+  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;RecibosCliente_model;RecibosCliente_data;RecibosCliente_controller;RecibosCliente_view;RecibosCliente_plugin;FactuGES;FactuGES_Server;Contactos_view;Contabilidad_controller" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;RecibosCliente_model;RecibosCliente_data;RecibosCliente_controller;RecibosCliente_view;RecibosCliente_plugin;FactuGES;FactuGES_Server;Contabilidad_controller;FacturasCliente_view;Articulos_view" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;RecibosCliente_model:Clean;RecibosCliente_data:Clean;RecibosCliente_controller:Clean;RecibosCliente_view:Clean;RecibosCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;Contactos_view:Clean;Contabilidad_controller:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;RecibosCliente_model:Clean;RecibosCliente_data:Clean;RecibosCliente_controller:Clean;RecibosCliente_view:Clean;RecibosCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;Contabilidad_controller:Clean;FacturasCliente_view:Clean;Articulos_view:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;RecibosCliente_model:Make;RecibosCliente_data:Make;RecibosCliente_controller:Make;RecibosCliente_view:Make;RecibosCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;Contactos_view:Make;Contabilidad_controller:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;RecibosCliente_model:Make;RecibosCliente_data:Make;RecibosCliente_controller:Make;RecibosCliente_view:Make;RecibosCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;Contabilidad_controller:Make;FacturasCliente_view:Make;Articulos_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/Recibos de cliente/Servidor/srvRecibosCliente_Impl.pas b/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.pas
index e69ca88a..2df687de 100644
--- a/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.pas	
+++ b/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.pas	
@@ -42,7 +42,8 @@ implementation
 uses
   Dialogs,
   {Generated:} FactuGES_Invk, uDataModuleServer, uDatabaseUtils,
-  schRecibosClienteClient_Intf, uRestriccionesUsuarioUtils, uBizPagosClienteServer,
+  schRecibosClienteClient_Intf, uRestriccionesUsuarioUtils, uBizRecibosClienteServer,
+  uBizPagosClienteServer,
   uRptRecibosCliente_Server;
 
 
@@ -69,7 +70,8 @@ end;
 procedure TsrvRecibosCliente.DARemoteServiceCreate(Sender: TObject);
 begin
   SessionManager := dmServer.SessionManager;
-  bpPagosCliente.BusinessRulesID := BIZ_SERVER_PAGOS_CLIENTE;  
+  bpRecibosCliente.BusinessRulesID := BIZ_SERVER_RECIBOS_CLIENTE;
+  bpPagosCliente.BusinessRulesID := BIZ_SERVER_PAGOS_CLIENTE;
 end;
 
 procedure TsrvRecibosCliente.DataAbstractServiceBeforeAcquireConnection(aSender: TObject; var aConnectionName: string);
diff --git a/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.dpk b/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.dpk
index f33b777c..38309315 100644
--- a/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.dpk	
+++ b/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.dpk	
@@ -28,7 +28,8 @@ requires
   GUIBase,
   RecibosCliente_model,
   RecibosCliente_controller,
-  JvGlobusD11R;
+  JvGlobusD11R,
+  Contactos_view;
 
 contains
   uRecibosClienteViewRegister in 'uRecibosClienteViewRegister.pas',
diff --git a/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.dproj b/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.dproj
index f2a24e19..fd1f8cb0 100644
--- a/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.dproj	
+++ b/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.dproj	
@@ -39,91 +39,60 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject xmlns=""> <Delphi.Personality>   <Parameters>
-      <Parameters Name="UseLauncher">False</Parameters>
-      <Parameters Name="LoadAllSymbols">True</Parameters>
-      <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
-    </Parameters>
-    <Package_Options>
-      <Package_Options Name="ImplicitBuild">True</Package_Options>
-      <Package_Options Name="DesigntimeOnly">False</Package_Options>
-      <Package_Options Name="RuntimeOnly">False</Package_Options>
-    </Package_Options>
-    <VersionInfo>
-      <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
-      <VersionInfo Name="AutoIncBuild">False</VersionInfo>
-      <VersionInfo Name="MajorVer">1</VersionInfo>
-      <VersionInfo Name="MinorVer">0</VersionInfo>
-      <VersionInfo Name="Release">0</VersionInfo>
-      <VersionInfo Name="Build">0</VersionInfo>
-      <VersionInfo Name="Debug">False</VersionInfo>
-      <VersionInfo Name="PreRelease">False</VersionInfo>
-      <VersionInfo Name="Special">False</VersionInfo>
-      <VersionInfo Name="Private">False</VersionInfo>
-      <VersionInfo Name="DLL">False</VersionInfo>
-      <VersionInfo Name="Locale">3082</VersionInfo>
-      <VersionInfo Name="CodePage">1252</VersionInfo>
-    </VersionInfo>
-    <VersionInfoKeys>
-      <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
-      <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
-      <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
-      <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
-      <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
-      <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
-      <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
-      <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
-      <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
-      <VersionInfoKeys Name="Comments"></VersionInfoKeys>
-    </VersionInfoKeys>
-    <Source>
-      <Source Name="MainSource">RecibosCliente_view.dpk</Source>
-    </Source>
-  </Delphi.Personality> </BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">RecibosCliente_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
     <DelphiCompile Include="RecibosCliente_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="GUIBase.dcp" />
-    <DCCReference Include="JvGlobusD11R.dcp" />
-    <DCCReference Include="RecibosCliente_controller.dcp" />
-    <DCCReference Include="RecibosCliente_model.dcp" />
+    <DCCReference Include="..\..\Lib\Contactos_view.dcp" />
+    <DCCReference Include="..\..\Lib\GUIBase.dcp" />
+    <DCCReference Include="..\..\Lib\JvGlobusD11R.dcp" />
+    <DCCReference Include="..\..\Lib\RecibosCliente_controller.dcp" />
+    <DCCReference Include="..\..\Lib\RecibosCliente_model.dcp" />
     <DCCReference Include="uEditorElegirRecibosCliente.pas">
       <Form>fEditorElegirRecibosCliente</Form>
+      <DesignClass>TfEditorElegirRecibosCliente</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorFechaPago.pas">
       <Form>fEditorFechaPago</Form>
     </DCCReference>
     <DCCReference Include="uEditorReciboCliente.pas">
       <Form>fEditorReciboCliente</Form>
+      <DesignClass>TfEditorReciboCliente</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorReciboClienteReport.pas">
       <Form>fEditorReciboClienteReport</Form>
+      <DesignClass>TfEditorReciboClienteReport</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorRecibosCliente.pas">
       <Form>fEditorRecibosCliente</Form>
+      <DesignClass>TfEditorRecibosCliente</DesignClass>
     </DCCReference>
     <DCCReference Include="uRecibosClienteViewRegister.pas" />
     <DCCReference Include="uViewPagosCliente.pas">
       <Form>frViewPagosCliente</Form>
+      <DesignClass>TFrame</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewReciboCliente.pas">
       <Form>frViewReciboCliente</Form>
+      <DesignClass>TFrame</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewReciboCliImportes.pas">
       <Form>frViewReciboCliImportes</Form>
+      <DesignClass>TFrame</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewRecibosCliCompensados.pas">
       <Form>frViewRecibosCliCompensados</Form>
+      <DesignClass>TFrame</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewRecibosCliente.pas">
       <Form>frViewRecibosCliente</Form>
+      <DesignClass>TFrame</DesignClass>
     </DCCReference>
   </ItemGroup>
 </Project>
-
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006
diff --git a/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.rc b/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.rc
index e69de29b..153736af 100644
--- a/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.rc	
+++ b/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.rc	
@@ -0,0 +1,22 @@
+1 VERSIONINFO
+FILEVERSION 1,0,0,0
+PRODUCTVERSION 1,0,0,0
+FILEFLAGSMASK 0x3FL
+FILEFLAGS 0x00L
+FILEOS 0x40004L
+FILETYPE 0x1L
+FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+         BLOCK "0C0A04E4"
+         BEGIN
+              VALUE "FileVersion", "1.0.0.0\0"
+              VALUE "ProductVersion", "1.0.0.0\0"
+         END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+         VALUE "Translation", 0x0C0A, 1252
+    END
+END
diff --git a/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.res b/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.res
index 36f26e23..8b251f31 100644
Binary files a/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.res and b/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.res differ
diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm
index 182cd840..302fda56 100644
--- a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm	
+++ b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm	
@@ -51,6 +51,8 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
   inherited pgPaginas: TPageControl
     Width = 685
     Height = 329
+    ExplicitLeft = 3
+    ExplicitTop = 79
     ExplicitWidth = 685
     ExplicitHeight = 329
     inherited pagGeneral: TTabSheet
@@ -83,18 +85,26 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
             677
             335)
           inherited eReferencia: TcxDBTextEdit
+            Top = -112
+            ExplicitTop = -112
             ExplicitWidth = 217
             Width = 217
           end
           inherited eSituacion: TcxDBTextEdit
+            Top = -31
+            ExplicitTop = -31
             ExplicitWidth = 217
             Width = 217
           end
           inherited edtFechaVencimiento: TcxDBDateEdit
+            Top = -58
+            ExplicitTop = -58
             ExplicitWidth = 217
             Width = 217
           end
           inherited memObservaciones: TcxDBMemo
+            Top = 98
+            ExplicitTop = 98
             ExplicitWidth = 293
             ExplicitHeight = 44
             Height = 44
@@ -102,72 +112,135 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
           end
           inherited eFechaEmision: TcxDBTextEdit
             Left = 441
+            Top = -112
             ExplicitLeft = 441
+            ExplicitTop = -112
             ExplicitWidth = 253
             Width = 253
           end
           inherited eFormaPago: TcxDBTextEdit
             Left = 441
+            Top = -85
             ExplicitLeft = 441
+            ExplicitTop = -85
             ExplicitWidth = 253
             Width = 253
           end
           inherited eImporteTotal: TcxDBCurrencyEdit
             Left = 441
+            Top = -58
             Style.IsFontAssigned = True
             ExplicitLeft = 441
+            ExplicitTop = -58
             ExplicitWidth = 253
             Width = 253
           end
           inherited eNombreCliente: TcxDBTextEdit
             Left = 441
+            Top = 25
             ExplicitLeft = 441
+            ExplicitTop = 25
             ExplicitWidth = 286
             Width = 286
           end
           inherited eNifCif: TcxDBTextEdit
             Left = 441
+            Top = -2
             ExplicitLeft = 441
+            ExplicitTop = -2
             ExplicitWidth = 286
             Width = 286
           end
           inherited eEntidad: TcxDBTextEdit
             Left = 441
+            Top = 52
             ExplicitLeft = 441
+            ExplicitTop = 52
             ExplicitWidth = 84
             Width = 84
           end
           inherited eSucursal: TcxDBTextEdit
-            Left = 540
-            ExplicitLeft = 540
+            Left = 531
+            Top = 52
+            ExplicitLeft = 531
+            ExplicitTop = 52
             ExplicitWidth = 81
             Width = 81
           end
           inherited eDC: TcxDBTextEdit
-            Left = 618
-            ExplicitLeft = 618
+            Left = 602
+            Top = 52
+            ExplicitLeft = 602
+            ExplicitTop = 52
             ExplicitWidth = 37
             Width = 37
           end
           inherited eCuenta: TcxDBTextEdit
             Left = 441
+            Top = 79
             ExplicitLeft = 441
+            ExplicitTop = 79
             ExplicitWidth = 286
             Width = 286
           end
           inherited eRemesa: TcxDBTextEdit
+            Top = -4
+            ExplicitTop = -4
             ExplicitWidth = 217
             Width = 217
           end
           inherited edtFechaEmision: TcxDBDateEdit
+            Top = -85
             DataBinding.DataField = 'FECHA_EMISION'
+            ExplicitTop = -85
             ExplicitWidth = 217
             Width = 217
           end
           inherited rRefReciboCompensado: TcxDBTextEdit
+            Top = 47
+            ExplicitTop = 47
             ExplicitWidth = 191
             Width = 191
           end
+          inherited frViewClienteRecibo: TfrViewDatosYSeleccionCliente
+            Left = 365
+            Top = 130
+            Width = 350
+            ExplicitLeft = 365
+            ExplicitTop = 130
+            ExplicitWidth = 350
+            inherited dxLayoutControl1: TdxLayoutControl
+              Width = 350
+              inherited edtlNombre: TcxDBTextEdit
+                ExplicitWidth = 224
+                Width = 224
+              end
+              inherited edtNIFCIF: TcxDBTextEdit
+                ExplicitWidth = 562
+                Width = 562
+              end
+              inherited edtCalle: TcxDBTextEdit
+                ExplicitWidth = 562
+                Width = 562
+              end
+              inherited edtPoblacion: TcxDBTextEdit
+                ExplicitWidth = 177
+                Width = 177
+              end
+              inherited edtProvincia: TcxDBTextEdit
+                ExplicitWidth = 327
+                Width = 327
+              end
+              inherited edtCodigoPostal: TcxDBTextEdit
+                Left = 192
+                ExplicitLeft = 192
+              end
+              inherited Button3: TBitBtn
+                Left = 82
+                ExplicitLeft = 82
+              end
+            end
+          end
         end
       end
     end
@@ -269,19 +342,7 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
         end
         inherited ToolBar1: TToolBar
           Width = 677
-          ExplicitWidth = 683
-          inherited ToolButton1: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton4: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton2: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton7: TToolButton
-            ExplicitWidth = 113
-          end
+          ExplicitWidth = 677
           inherited ToolButton3: TToolButton
             ExplicitWidth = 98
           end
diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas
index 8d8ae369..281c38b6 100644
--- a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas	
+++ b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas	
@@ -63,6 +63,7 @@ type
     procedure GuardarInterno; override;
 
     procedure PonerTitulos(const ATitulo: string = ''); override;
+    procedure OnClienteChanged(Sender: TObject);
 
   public
     property Recibo: IBizRecibosCliente read GetRecibo write SetRecibo;
@@ -280,6 +281,11 @@ begin
   frViewPagosCliente1.ListaPagosCliente.ActiveView.StoreToRegistry(JvAppRegistryStorage.Root);
 end;
 
+procedure TfEditorReciboCliente.OnClienteChanged(Sender: TObject);
+begin
+  FRecibo.Cliente := frViewReciboCliente1.frViewClienteRecibo.Cliente;
+end;
+
 procedure TfEditorReciboCliente.PonerTitulos(const ATitulo: string);
 var
   FTitulo : String;
@@ -312,7 +318,7 @@ begin
   FController := Value;
   if Assigned(FController) then
      frViewRecibosCliCompensados1.Controller := FController;
-//    (ViewRecibo as IViewReciboCliente).Controller := (FController as IRecibosClienteController);
+    (ViewRecibo as IViewReciboCliente).Controller := (FController as IRecibosClienteController);
 end;
 
 procedure TfEditorReciboCliente.SetRecibo(const Value: IBizRecibosCliente);
@@ -323,6 +329,8 @@ begin
   if Assigned(FViewRecibo) and Assigned(Recibo) then
   begin
     FViewRecibo.Recibo := Recibo;
+    frViewReciboCliente1.frViewClienteRecibo.Cliente := FRecibo.Cliente;
+    frViewReciboCliente1.frViewClienteRecibo.OnClienteChanged := OnClienteChanged;
     frViewPagosCliente1.Pagos := Recibo.Pagos;
     frViewRecibosCliCompensados1.ReciboCliente := FRecibo;
 
diff --git a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm
index a7bb7656..8a291c0a 100644
--- a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm	
+++ b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm	
@@ -1,22 +1,23 @@
 inherited frViewReciboCliente: TfrViewReciboCliente
-  Width = 690
-  Height = 307
-  ExplicitWidth = 690
-  ExplicitHeight = 307
+  Width = 899
+  Height = 509
+  ExplicitWidth = 899
+  ExplicitHeight = 509
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 690
-    Height = 307
+    Width = 899
+    Height = 509
     Align = alClient
     ParentBackground = True
     TabOrder = 0
     AutoContentSizes = [acsWidth, acsHeight]
     LookAndFeel = dxLayoutOfficeLookAndFeel1
-    ExplicitHeight = 259
+    ExplicitWidth = 690
+    ExplicitHeight = 307
     DesignSize = (
-      690
-      307)
+      899
+      509)
     object eReferencia: TcxDBTextEdit
       Left = 120
       Top = 30
@@ -272,7 +273,7 @@ inherited frViewReciboCliente: TfrViewReciboCliente
       Width = 90
     end
     object eSucursal: TcxDBTextEdit
-      Left = 554
+      Left = 674
       Top = 194
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'SUCURSAL_CLIENTE'
@@ -298,7 +299,7 @@ inherited frViewReciboCliente: TfrViewReciboCliente
       Width = 75
     end
     object eDC: TcxDBTextEdit
-      Left = 635
+      Left = 844
       Top = 194
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'DC_CLIENTE'
@@ -426,6 +427,52 @@ inherited frViewReciboCliente: TfrViewReciboCliente
       TabOrder = 5
       Width = 191
     end
+    inline frViewClienteRecibo: TfrViewDatosYSeleccionCliente
+      Left = 364
+      Top = 281
+      Width = 350
+      Height = 212
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = []
+      ParentFont = False
+      TabOrder = 16
+      ReadOnly = False
+      ExplicitLeft = 364
+      ExplicitTop = 281
+      inherited dxLayoutControl1: TdxLayoutControl
+        inherited edtlNombre: TcxDBTextEdit
+          ExplicitWidth = 224
+          Width = 224
+        end
+        inherited edtNIFCIF: TcxDBTextEdit
+          ExplicitWidth = 562
+          Width = 562
+        end
+        inherited edtCalle: TcxDBTextEdit
+          ExplicitWidth = 562
+          Width = 562
+        end
+        inherited edtPoblacion: TcxDBTextEdit
+          ExplicitWidth = 177
+          Width = 177
+        end
+        inherited edtProvincia: TcxDBTextEdit
+          ExplicitWidth = 327
+          Width = 327
+        end
+        inherited edtCodigoPostal: TcxDBTextEdit
+          Left = 421
+          ExplicitLeft = 421
+        end
+        inherited Button3: TBitBtn
+          Left = 311
+          ExplicitLeft = 311
+        end
+      end
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -497,7 +544,7 @@ inherited frViewReciboCliente: TfrViewReciboCliente
         Caption = 'New Group'
         ShowCaption = False
         ShowBorder = False
-        object dxLayoutControl1Group5: TdxLayoutGroup
+        object dxLayoutControlFactura: TdxLayoutGroup
           Caption = 'Datos de la factura'
           object dxLayoutControl1Item7: TdxLayoutItem
             AutoAligns = [aaVertical]
@@ -519,7 +566,7 @@ inherited frViewReciboCliente: TfrViewReciboCliente
             ControlOptions.ShowBorder = False
           end
         end
-        object dxLayoutControl1Group6: TdxLayoutGroup
+        object dxLayoutControlCliente: TdxLayoutGroup
           AutoAligns = [aaHorizontal]
           AlignVert = avClient
           Caption = 'Datos del cliente'
@@ -574,6 +621,14 @@ inherited frViewReciboCliente: TfrViewReciboCliente
             end
           end
         end
+        object dxLayoutControlClienteModif: TdxLayoutGroup
+          Caption = 'Datos del cliente'
+          object dxLayoutControl1Item6: TdxLayoutItem
+            Control = frViewClienteRecibo
+            ControlOptions.AutoColor = True
+            ControlOptions.ShowBorder = False
+          end
+        end
       end
     end
   end
diff --git a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.pas b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.pas
index 0bba6e79..6badf44d 100644
--- a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.pas	
+++ b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.pas	
@@ -7,11 +7,15 @@ uses
   Dialogs, uViewBase, uBizRecibosCliente, DB, uDADataTable, dxLayoutControl,
   cxControls, cxCurrencyEdit, cxDBEdit, cxMemo, cxMaskEdit, cxDropDownEdit,
   cxCalendar, cxContainer, cxEdit, cxTextEdit, dxLayoutLookAndFeels, ExtCtrls,
-  uDAInterfaces;
+  uDAInterfaces, uCustomView, uViewDatosYSeleccionCliente, uRecibosClienteController;
 
 type
   IViewReciboCliente = interface(IViewBase)
   ['{5DDA0CF0-1A57-492E-B7AE-614E6A7236B5}']
+    function GetController : IRecibosClienteController;
+    procedure SetController (const Value : IRecibosClienteController);
+    property Controller : IRecibosClienteController read GetController  write SetController;
+
     function GetRecibo: IBizRecibosCliente;
     procedure SetRecibo(const Value: IBizRecibosCliente);
     property Recibo: IBizRecibosCliente read GetRecibo write SetRecibo;
@@ -37,7 +41,7 @@ type
     eFormaPago: TcxDBTextEdit;
     dxLayoutControl1Item9: TdxLayoutItem;
     eImporteTotal: TcxDBCurrencyEdit;
-    dxLayoutControl1Group5: TdxLayoutGroup;
+    dxLayoutControlFactura: TdxLayoutGroup;
     dxLayoutControl1Item10: TdxLayoutItem;
     eNombreCliente: TcxDBTextEdit;
     dxLayoutControl1Item11: TdxLayoutItem;
@@ -50,7 +54,7 @@ type
     eDC: TcxDBTextEdit;
     dxLayoutControl1Item15: TdxLayoutItem;
     eCuenta: TcxDBTextEdit;
-    dxLayoutControl1Group6: TdxLayoutGroup;
+    dxLayoutControlCliente: TdxLayoutGroup;
     dxLayoutControl1Group8: TdxLayoutGroup;
     dxLayoutControl1Item16: TdxLayoutItem;
     eRemesa: TcxDBTextEdit;
@@ -65,12 +69,20 @@ type
     rRefReciboCompensado: TcxDBTextEdit;
     dxLayoutControl1Group2: TdxLayoutGroup;
     dxLayoutControl1Group3: TdxLayoutGroup;
+    dxLayoutControl1Item6: TdxLayoutItem;
+    frViewClienteRecibo: TfrViewDatosYSeleccionCliente;
+    dxLayoutControlClienteModif: TdxLayoutGroup;
   private
     FRecibo : IBizRecibosCliente;
+    FController : IRecibosClienteController;
     function GetRecibo: IBizRecibosCliente;
     procedure SetRecibo(const Value: IBizRecibosCliente);
+    function GetController : IRecibosClienteController;
+    procedure SetController (const Value : IRecibosClienteController);
+
   public
     property Recibo: IBizRecibosCliente read GetRecibo write SetRecibo;
+    property Controller : IRecibosClienteController read GetController  write SetController;
   end;
 
 var
@@ -82,16 +94,44 @@ implementation
 
 { TfrViewReciboCliente }
 
+function TfrViewReciboCliente.GetController: IRecibosClienteController;
+begin
+  Result := FController;
+end;
+
 function TfrViewReciboCliente.GetRecibo: IBizRecibosCliente;
 begin
   Result := FRecibo;
 end;
 
+procedure TfrViewReciboCliente.SetController(
+  const Value: IRecibosClienteController);
+begin
+  FController := Value;
+
+  if Assigned(FController) then
+     frViewClienteRecibo.Controller := FController.ClienteController;
+end;
+
 procedure TfrViewReciboCliente.SetRecibo(const Value: IBizRecibosCliente);
 begin
   FRecibo := Value;
+
+  //Por defecto 
+  dxLayoutControlFactura.Visible := true;
+  dxLayoutControlCliente.Visible := true;
+  dxLayoutControlClienteModif.Visible := false;
+
   if Assigned(FRecibo) then
-    DADataSource.DataTable := FRecibo.DataTable
+  begin
+    DADataSource.DataTable := FRecibo.DataTable;
+    if FRecibo.ConFactura then
+    begin
+       dxLayoutControlFactura.Visible := false;
+       dxLayoutControlCliente.Visible := false;
+       dxLayoutControlClienteModif.Visible := true;
+    end;
+  end
   else
     DADataSource.DataTable := NIL;
 end;
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 149f2ab6..263981b4 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr
index 6b8c98f6..3d429bc9 100644
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@@ -114,7 +114,8 @@ uses
   schUsuariosClient_Intf in '..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas',
   schUsuariosServer_Intf in '..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas',
   schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
-  schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas';
+  schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas',
+  uBizRecibosClienteServer in '..\Modulos\Recibos de cliente\Model\uBizRecibosClienteServer.pas';
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 6f4702f8..13243bb1 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -157,6 +157,7 @@
 		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas"/>
 		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas"/>
 		<DCCReference Include="..\Modulos\Recibos de cliente\Model\uBizPagosClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\uBizRecibosClienteServer.pas"/>
 		<DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
 			<Form>RptRecibosCliente</Form>
 			<DesignClass>TDataModule</DesignClass>
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index b7d75fa3..603f10d9 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "1.0.0.0\0"
               VALUE "ProductVersion", "1.0.0.0\0"
-              VALUE "CompileDate", "sábado, 23 de febrero de 2008 13:45\0"
+              VALUE "CompileDate", "lunes, 25 de febrero de 2008 19:48\0"
          END
     END
     BLOCK "VarFileInfo"