From 4ecbf9930ed2ad0a275c6918f062cd79ffadc5d6 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Tue, 22 Jun 2010 15:12:36 +0000
Subject: [PATCH] Ticket #393 -> Mostrar la caja contable en la lista de
 recibos de cliente.

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@520 f4e31baf-9722-1c47-927c-6f952f962d4b
---
 .../Controller/uPagosClienteController.pas    |  33 +++---
 .../Data/uDataModuleRecibosCliente.dfm        |  17 ++-
 .../Model/schRecibosClienteClient_Intf.pas    |  53 +++++++--
 .../Model/schRecibosClienteServer_Intf.pas    |  59 ++++++++--
 .../Servidor/srvRecibosCliente_Impl.dfm       |  63 ++++++++---
 .../Views/uEditorReciboCliente.dfm            | 106 +-----------------
 .../Views/uEditorReciboCliente.pas            |  18 +--
 .../Views/uViewPagosCliente.dfm               |   1 +
 .../Views/uViewRecibosCliente.dfm             |  47 ++++----
 .../Views/uViewRecibosCliente.pas             |   1 +
 .../Views/uEditorReciboProveedor.dfm          |  99 +---------------
 Source/Servidor/FactuGES_Server.dpr           |   6 +-
 Source/Servidor/FactuGES_Server.rc            |  10 +-
 13 files changed, 206 insertions(+), 307 deletions(-)

diff --git a/Source/Modulos/Recibos de cliente/Controller/uPagosClienteController.pas b/Source/Modulos/Recibos de cliente/Controller/uPagosClienteController.pas
index af5e93b8..61da0ecf 100644
--- a/Source/Modulos/Recibos de cliente/Controller/uPagosClienteController.pas	
+++ b/Source/Modulos/Recibos de cliente/Controller/uPagosClienteController.pas	
@@ -68,25 +68,28 @@ function TPagosClienteController.Anadir(APagosCliente: IBizPagosCliente; Const F
 una devolución devolvemos false}
 begin
   APagosCliente.Append;
-  if Length(Fecha) = 0 then
-     APagosCliente.FECHA_PAGO := Date
-  else
-     APagosCliente.FECHA_PAGO := StrToDate(Fecha);
+  try
+    if Length(Fecha) = 0 then
+       APagosCliente.FECHA_PAGO := Date
+    else
+       APagosCliente.FECHA_PAGO := StrToDate(Fecha);
 
-  if (APagosCliente.DataTable.RecordCount = 0)
-  or ((APagosCliente.DataTable.RecordCount mod 2) = 0) then
-    APagosCliente.TIPO := CTE_PAGO
-  else
-    APagosCliente.TIPO := CTE_DEVOLUCION;
+    if (APagosCliente.DataTable.RecordCount = 0)
+    or ((APagosCliente.DataTable.RecordCount mod 2) = 0) then
+      APagosCliente.TIPO := CTE_PAGO
+    else
+      APagosCliente.TIPO := CTE_DEVOLUCION;
 
-  APagosCliente.IGNORAR_CONTABILIDAD := IgnorarContabilidad;
-  APagosCliente.CUENTA := IntToStr(IdSubCuenta);
+    APagosCliente.IGNORAR_CONTABILIDAD := IgnorarContabilidad;
+    APagosCliente.CUENTA := IntToStr(IdSubCuenta);
 
-  APagosCliente.ESTADO_EJERCICIO := AppFactuGES.EjercicioActivo.ESTADO;
-  APagosCliente.ASIENTO_PUNTEADO := -1;
+    APagosCliente.ESTADO_EJERCICIO := AppFactuGES.EjercicioActivo.ESTADO;
+    APagosCliente.ASIENTO_PUNTEADO := -1;
 
-  Result := (APagosCliente.TIPO = CTE_PAGO);
-  APagosCliente.Post;
+    Result := (APagosCliente.TIPO = CTE_PAGO);
+  finally
+    APagosCliente.Post;
+  end;
 end;
 
 procedure TPagosClienteController.AsignarDataModule;
diff --git a/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.dfm
index 59936623..a20d58fe 100644
--- a/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.dfm	
+++ b/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.dfm	
@@ -10,12 +10,12 @@ inherited DataModuleRecibosCliente: TDataModuleRecibosCliente
     Top = 24
   end
   object rda_RecibosCliente: TDARemoteDataAdapter
+    DataStreamer = Bin2DataStreamer
     GetSchemaCall.RemoteService = RORemoteService
     GetDataCall.RemoteService = RORemoteService
     UpdateDataCall.RemoteService = RORemoteService
     GetScriptsCall.RemoteService = RORemoteService
     RemoteService = RORemoteService
-    DataStreamer = Bin2DataStreamer
     Left = 59
     Top = 151
   end
@@ -141,8 +141,6 @@ inherited DataModuleRecibosCliente: TDataModuleRecibosCliente
     MasterSource = ds_RecibosCliente
     MasterFields = 'ID'
     DetailFields = 'ID_RECIBO'
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'PagosCliente'
     IndexDefs = <>
     Left = 288
@@ -383,12 +381,17 @@ inherited DataModuleRecibosCliente: TDataModuleRecibosCliente
         DisplayLabel = 'RecibosCliente_TIENDA'
         ServerAutoRefresh = True
         DictionaryEntry = 'RecibosCliente_TIENDA'
+      end
+      item
+        Name = 'CUENTA_CONTABLE'
+        DataType = datString
+        Size = 255
+        ReadOnly = True
+        ServerAutoRefresh = True
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteDataAdapter = rda_RecibosCliente
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'RecibosCliente'
     IndexDefs = <>
     Left = 168
@@ -580,8 +583,6 @@ inherited DataModuleRecibosCliente: TDataModuleRecibosCliente
     MasterSource = ds_RecibosCliente
     MasterFields = 'ID'
     DetailFields = 'ID_RECIBO_COMPENSADO'
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'RecibosCompensadosCli'
     IndexDefs = <>
     Left = 416
@@ -604,8 +605,6 @@ inherited DataModuleRecibosCliente: TDataModuleRecibosCliente
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteDataAdapter = rda_RecibosCliente
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'ListaAnosRecibos'
     IndexDefs = <>
     Left = 176
diff --git a/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas b/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas
index 9ad7d109..988b801a 100644
--- a/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas	
+++ b/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas	
@@ -3,16 +3,16 @@ unit schRecibosClienteClient_Intf;
 interface
 
 uses
-  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_ListaAnosRecibos = '{A4BD1210-5CBF-4C09-A950-5AF7715B5F66}';
-  RID_RecibosCliente = '{3AECC812-56FF-44BB-82FB-4C9B64C9A01D}';
-  RID_PagosCliente = '{6C5A18AF-C970-40C4-B34F-84AE2A6D3AE9}';
-  RID_RecibosCompensadosCli = '{8C5D4976-0E53-4B19-A977-9BC2C95291EE}';
+  RID_ListaAnosRecibos = '{D4594CA2-99F7-4973-98CA-227B633D3DF1}';
+  RID_RecibosCliente = '{92D5B2CF-0050-4455-B710-94F03852A421}';
+  RID_PagosCliente = '{9657C9BE-7AB9-49D3-B87F-8C46DF5652B1}';
+  RID_RecibosCompensadosCli = '{8A8B0D8F-8F3C-47CC-A23B-3E040D662224}';
 
   { Data table names }
   nme_ListaAnosRecibos = 'ListaAnosRecibos';
@@ -63,6 +63,7 @@ const
   fld_RecibosClienteUSUARIO = 'USUARIO';
   fld_RecibosClienteID_TIENDA = 'ID_TIENDA';
   fld_RecibosClienteTIENDA = 'TIENDA';
+  fld_RecibosClienteCUENTA_CONTABLE = 'CUENTA_CONTABLE';
 
   { RecibosCliente field indexes }
   idx_RecibosClienteID = 0;
@@ -101,6 +102,7 @@ const
   idx_RecibosClienteUSUARIO = 33;
   idx_RecibosClienteID_TIENDA = 34;
   idx_RecibosClienteTIENDA = 35;
+  idx_RecibosClienteCUENTA_CONTABLE = 36;
 
   { PagosCliente fields }
   fld_PagosClienteID = 'ID';
@@ -221,7 +223,7 @@ const
 type
   { IListaAnosRecibos }
   IListaAnosRecibos = interface(IDAStronglyTypedDataTable)
-  ['{CE2FC543-F272-4EA2-9037-E30A840F8203}']
+  ['{89684F4E-822E-4DFF-8F1F-9F7F8FC6CF69}']
     { Property getters and setters }
     function GetANOValue: String;
     procedure SetANOValue(const aValue: String);
@@ -256,7 +258,7 @@ type
 
   { IRecibosCliente }
   IRecibosCliente = interface(IDAStronglyTypedDataTable)
-  ['{A2D953EF-CA61-4ADD-821E-78B3B8732A3B}']
+  ['{378F80AE-758E-4936-87BD-BE5C9B4B2D8D}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -402,6 +404,10 @@ type
     procedure SetTIENDAValue(const aValue: String);
     function GetTIENDAIsNull: Boolean;
     procedure SetTIENDAIsNull(const aValue: Boolean);
+    function GetCUENTA_CONTABLEValue: String;
+    procedure SetCUENTA_CONTABLEValue(const aValue: String);
+    function GetCUENTA_CONTABLEIsNull: Boolean;
+    procedure SetCUENTA_CONTABLEIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -477,6 +483,8 @@ type
     property ID_TIENDAIsNull: Boolean read GetID_TIENDAIsNull write SetID_TIENDAIsNull;
     property TIENDA: String read GetTIENDAValue write SetTIENDAValue;
     property TIENDAIsNull: Boolean read GetTIENDAIsNull write SetTIENDAIsNull;
+    property CUENTA_CONTABLE: String read GetCUENTA_CONTABLEValue write SetCUENTA_CONTABLEValue;
+    property CUENTA_CONTABLEIsNull: Boolean read GetCUENTA_CONTABLEIsNull write SetCUENTA_CONTABLEIsNull;
   end;
 
   { TRecibosClienteDataTableRules }
@@ -628,6 +636,10 @@ type
     procedure SetTIENDAValue(const aValue: String); virtual;
     function GetTIENDAIsNull: Boolean; virtual;
     procedure SetTIENDAIsNull(const aValue: Boolean); virtual;
+    function GetCUENTA_CONTABLEValue: String; virtual;
+    procedure SetCUENTA_CONTABLEValue(const aValue: String); virtual;
+    function GetCUENTA_CONTABLEIsNull: Boolean; virtual;
+    procedure SetCUENTA_CONTABLEIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -702,6 +714,8 @@ type
     property ID_TIENDAIsNull: Boolean read GetID_TIENDAIsNull write SetID_TIENDAIsNull;
     property TIENDA: String read GetTIENDAValue write SetTIENDAValue;
     property TIENDAIsNull: Boolean read GetTIENDAIsNull write SetTIENDAIsNull;
+    property CUENTA_CONTABLE: String read GetCUENTA_CONTABLEValue write SetCUENTA_CONTABLEValue;
+    property CUENTA_CONTABLEIsNull: Boolean read GetCUENTA_CONTABLEIsNull write SetCUENTA_CONTABLEIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -711,7 +725,7 @@ type
 
   { IPagosCliente }
   IPagosCliente = interface(IDAStronglyTypedDataTable)
-  ['{50F7365A-2441-42A9-9738-EC5594AFE4F9}']
+  ['{9BF1B3A2-CF9D-48CF-A83B-007A8E2E6EC8}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -950,7 +964,7 @@ type
 
   { IRecibosCompensadosCli }
   IRecibosCompensadosCli = interface(IDAStronglyTypedDataTable)
-  ['{C7CF1A51-A951-435B-B7BB-78AD988872D7}']
+  ['{9E161737-BD9D-4B88-9D1C-406B79CAB392}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2207,6 +2221,27 @@ begin
     DataTable.Fields[idx_RecibosClienteTIENDA].AsVariant := Null;
 end;
 
+function TRecibosClienteDataTableRules.GetCUENTA_CONTABLEValue: String;
+begin
+  result := DataTable.Fields[idx_RecibosClienteCUENTA_CONTABLE].AsString;
+end;
+
+procedure TRecibosClienteDataTableRules.SetCUENTA_CONTABLEValue(const aValue: String);
+begin
+  DataTable.Fields[idx_RecibosClienteCUENTA_CONTABLE].AsString := aValue;
+end;
+
+function TRecibosClienteDataTableRules.GetCUENTA_CONTABLEIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_RecibosClienteCUENTA_CONTABLE].IsNull;
+end;
+
+procedure TRecibosClienteDataTableRules.SetCUENTA_CONTABLEIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_RecibosClienteCUENTA_CONTABLE].AsVariant := Null;
+end;
+
 
 { TPagosClienteDataTableRules }
 constructor TPagosClienteDataTableRules.Create(aDataTable: TDADataTable);
diff --git a/Source/Modulos/Recibos de cliente/Model/schRecibosClienteServer_Intf.pas b/Source/Modulos/Recibos de cliente/Model/schRecibosClienteServer_Intf.pas
index dbe4a278..b4781591 100644
--- a/Source/Modulos/Recibos de cliente/Model/schRecibosClienteServer_Intf.pas	
+++ b/Source/Modulos/Recibos de cliente/Model/schRecibosClienteServer_Intf.pas	
@@ -9,15 +9,15 @@ 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_ListaAnosRecibosDelta = '{8FC2C837-6926-4F14-B052-06BF6AB3BF38}';
-  RID_RecibosClienteDelta = '{1C641E43-0B1A-4136-AAA2-0F6B13C52F34}';
-  RID_PagosClienteDelta = '{3F9F91B7-5517-4927-919B-EE09DD7EDB9A}';
-  RID_RecibosCompensadosCliDelta = '{60B42F56-C470-481C-8665-D924F758ABE4}';
+  RID_ListaAnosRecibosDelta = '{A9C64564-057C-47BC-BE2A-C75A7AEEA9F4}';
+  RID_RecibosClienteDelta = '{51C4E379-5E80-49A6-B12B-DC533DE395F6}';
+  RID_PagosClienteDelta = '{C1E13437-5B6F-4631-BBB1-B6E0B0DC9917}';
+  RID_RecibosCompensadosCliDelta = '{7CD54669-7326-496F-B849-C800EE0404F2}';
 
 type
   { IListaAnosRecibosDelta }
   IListaAnosRecibosDelta = interface(IListaAnosRecibos)
-  ['{8FC2C837-6926-4F14-B052-06BF6AB3BF38}']
+  ['{A9C64564-057C-47BC-BE2A-C75A7AEEA9F4}']
     { Property getters and setters }
     function GetOldANOValue : String;
 
@@ -51,7 +51,7 @@ type
 
   { IRecibosClienteDelta }
   IRecibosClienteDelta = interface(IRecibosCliente)
-  ['{1C641E43-0B1A-4136-AAA2-0F6B13C52F34}']
+  ['{51C4E379-5E80-49A6-B12B-DC533DE395F6}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_RECIBO_COMPENSADOValue : Integer;
@@ -89,6 +89,7 @@ type
     function GetOldUSUARIOValue : String;
     function GetOldID_TIENDAValue : Integer;
     function GetOldTIENDAValue : String;
+    function GetOldCUENTA_CONTABLEValue : String;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -127,6 +128,7 @@ type
     property OldUSUARIO : String read GetOldUSUARIOValue;
     property OldID_TIENDA : Integer read GetOldID_TIENDAValue;
     property OldTIENDA : String read GetOldTIENDAValue;
+    property OldCUENTA_CONTABLE : String read GetOldCUENTA_CONTABLEValue;
   end;
 
   { TRecibosClienteBusinessProcessorRules }
@@ -350,6 +352,12 @@ type
     function GetOldTIENDAIsNull: Boolean; virtual;
     procedure SetTIENDAValue(const aValue: String); virtual;
     procedure SetTIENDAIsNull(const aValue: Boolean); virtual;
+    function GetCUENTA_CONTABLEValue: String; virtual;
+    function GetCUENTA_CONTABLEIsNull: Boolean; virtual;
+    function GetOldCUENTA_CONTABLEValue: String; virtual;
+    function GetOldCUENTA_CONTABLEIsNull: Boolean; virtual;
+    procedure SetCUENTA_CONTABLEValue(const aValue: String); virtual;
+    procedure SetCUENTA_CONTABLEIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -496,6 +504,10 @@ type
     property TIENDAIsNull : Boolean read GetTIENDAIsNull write SetTIENDAIsNull;
     property OldTIENDA : String read GetOldTIENDAValue;
     property OldTIENDAIsNull : Boolean read GetOldTIENDAIsNull;
+    property CUENTA_CONTABLE : String read GetCUENTA_CONTABLEValue write SetCUENTA_CONTABLEValue;
+    property CUENTA_CONTABLEIsNull : Boolean read GetCUENTA_CONTABLEIsNull write SetCUENTA_CONTABLEIsNull;
+    property OldCUENTA_CONTABLE : String read GetOldCUENTA_CONTABLEValue;
+    property OldCUENTA_CONTABLEIsNull : Boolean read GetOldCUENTA_CONTABLEIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -505,7 +517,7 @@ type
 
   { IPagosClienteDelta }
   IPagosClienteDelta = interface(IPagosCliente)
-  ['{3F9F91B7-5517-4927-919B-EE09DD7EDB9A}']
+  ['{C1E13437-5B6F-4631-BBB1-B6E0B0DC9917}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_RECIBOValue : Integer;
@@ -743,7 +755,7 @@ type
 
   { IRecibosCompensadosCliDelta }
   IRecibosCompensadosCliDelta = interface(IRecibosCompensadosCli)
-  ['{60B42F56-C470-481C-8665-D924F758ABE4}']
+  ['{7CD54669-7326-496F-B849-C800EE0404F2}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_RECIBO_COMPENSADOValue : Integer;
@@ -2370,6 +2382,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosClienteTIENDA] := Null;
 end;
 
+function TRecibosClienteBusinessProcessorRules.GetCUENTA_CONTABLEValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosClienteCUENTA_CONTABLE];
+end;
+
+function TRecibosClienteBusinessProcessorRules.GetCUENTA_CONTABLEIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosClienteCUENTA_CONTABLE]);
+end;
+
+function TRecibosClienteBusinessProcessorRules.GetOldCUENTA_CONTABLEValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_RecibosClienteCUENTA_CONTABLE];
+end;
+
+function TRecibosClienteBusinessProcessorRules.GetOldCUENTA_CONTABLEIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_RecibosClienteCUENTA_CONTABLE]);
+end;
+
+procedure TRecibosClienteBusinessProcessorRules.SetCUENTA_CONTABLEValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosClienteCUENTA_CONTABLE] := aValue;
+end;
+
+procedure TRecibosClienteBusinessProcessorRules.SetCUENTA_CONTABLEIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosClienteCUENTA_CONTABLE] := Null;
+end;
+
 
 { TPagosClienteBusinessProcessorRules }
 constructor TPagosClienteBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
diff --git a/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.dfm b/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.dfm
index e37e32a3..519c4f05 100644
--- a/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.dfm	
+++ b/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.dfm	
@@ -39,6 +39,7 @@ object srvRecibosCliente: TsrvRecibosCliente
             DataType = datString
             Size = 255
           end>
+        ReadOnly = True
       end
       item
         Params = <>
@@ -46,7 +47,15 @@ object srvRecibosCliente: TsrvRecibosCliente
           item
             Connection = 'IBX'
             TargetTable = 'V_RECIBOS_CLIENTE'
-            StatementType = stAutoSQL
+            SQL = 
+              'select v_recibos_cliente.*, cont_subcuentas.descripcion as CUENT' +
+              'A_CONTABLE'#10'from v_recibos_cliente'#10'    left outer join pagos_clie' +
+              'nte pag on'#10'        (pag.id_recibo = v_recibos_cliente.id)'#10'    le' +
+              'ft outer join pagos_cliente pag2 on'#10'        ((pag2.id_recibo = p' +
+              'ag.id_recibo) and (pag2.id > pag.id))'#10'    left outer join cont_s' +
+              'ubcuentas on'#10'        (cont_subcuentas.id = pag.cuenta)'#10'where (pa' +
+              'g2.id is null) and {Where}'#10
+            StatementType = stSQL
             ColumnMappings = <
               item
                 DatasetField = 'ID'
@@ -191,6 +200,11 @@ object srvRecibosCliente: TsrvRecibosCliente
               item
                 DatasetField = 'PROVINCIA'
                 TableField = 'PROVINCIA'
+              end
+              item
+                DatasetField = 'CUENTA_CONTABLE'
+                TableField = '<unknown>'
+                SQLOrigin = 'CUENTA_CONTABLE'
               end>
           end>
         Name = 'RecibosCliente'
@@ -402,6 +416,13 @@ object srvRecibosCliente: TsrvRecibosCliente
             Size = 255
             ServerAutoRefresh = True
             DictionaryEntry = 'RecibosCliente_TIENDA'
+          end
+          item
+            Name = 'CUENTA_CONTABLE'
+            DataType = datString
+            Size = 255
+            LogChanges = False
+            ReadOnly = True
           end>
       end
       item
@@ -1054,11 +1075,12 @@ object srvRecibosCliente: TsrvRecibosCliente
               'INSERT'#10'  INTO RECIBOS_CLIENTE'#10'    (ID, ID_EMPRESA, ID_CLIENTE, I' +
               'D_FACTURA, REFERENCIA, FECHA_EMISION, FECHA_VENCIMIENTO, DESCRIP' +
               'CION, OBSERVACIONES,'#10'    IMPORTE, OTROS_GASTOS, USUARIO, ID_TIEN' +
-              'DA, NOMBRE, NIF_CIF, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL)' +
-              #10'  VALUES'#10'    (:ID, :ID_EMPRESA, :ID_CLIENTE, :ID_FACTURA, :REFE' +
-              'RENCIA, :FECHA_EMISION, :FECHA_VENCIMIENTO, :DESCRIPCION, :OBSER' +
-              'VACIONES,'#10'    :IMPORTE, :OTROS_GASTOS, :USUARIO, :ID_TIENDA, :NO' +
-              'MBRE, :NIF_CIF, :CALLE, :POBLACION, :PROVINCIA, :CODIGO_POSTAL)'#10
+              'DA, NOMBRE, NIF_CIF, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL,' +
+              #10'    FECHA_ALTA)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, :ID_CLIENTE, :I' +
+              'D_FACTURA, :REFERENCIA, :FECHA_EMISION, :FECHA_VENCIMIENTO, :DES' +
+              'CRIPCION, :OBSERVACIONES,'#10'    :IMPORTE, :OTROS_GASTOS, :USUARIO,' +
+              ' :ID_TIENDA, :NOMBRE, :NIF_CIF, :CALLE, :POBLACION, :PROVINCIA, ' +
+              ':CODIGO_POSTAL,'#10'    current_timestamp)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1161,7 +1183,7 @@ object srvRecibosCliente: TsrvRecibosCliente
             Connection = 'IBX'
             TargetTable = 'RECIBOS_CLIENTE'
             SQL = 
-              'UPDATE Recibos_CLIENTE'#10'  SET '#10'    ID_REMESA = :ID_REMESA,'#10'    ID' +
+              'UPDATE RECIBOS_CLIENTE'#10'  SET '#10'    ID_REMESA = :ID_REMESA,'#10'    ID' +
               '_EMPRESA = :ID_EMPRESA,'#10'    ID_CLIENTE = :ID_CLIENTE,'#10'    FECHA_' +
               'EMISION = :FECHA_EMISION,'#10'    FECHA_VENCIMIENTO = :FECHA_VENCIMI' +
               'ENTO,'#10'    DESCRIPCION = :DESCRIPCION,'#10'    OBSERVACIONES = :OBSER' +
@@ -1169,7 +1191,8 @@ object srvRecibosCliente: TsrvRecibosCliente
               'OS,'#10'    USUARIO = :USUARIO,'#10'    ID_TIENDA = :ID_TIENDA,'#10'    NOMB' +
               'RE = :NOMBRE,'#10'    NIF_CIF = :NIF_CIF,'#10'    CALLE = :CALLE,'#10'    PO' +
               'BLACION = :POBLACION,'#10'    PROVINCIA = :PROVINCIA,'#10'    CODIGO_POS' +
-              'TAL = :CODIGO_POSTAL'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
+              'TAL = :CODIGO_POSTAL,'#10'    FECHA_MODIFICACION = CURRENT_TIMESTAMP' +
+              #10'  WHERE'#10'    (ID = :OLD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1230,9 +1253,9 @@ object srvRecibosCliente: TsrvRecibosCliente
             SQL = 
               'INSERT'#10'  INTO PAGOS_CLIENTE'#10'    (ID, ID_RECIBO, TIPO, FECHA_PAGO' +
               ', TITULAR, ENTIDAD, '#10'     SUCURSAL, DC, CUENTA, USUARIO, IGNORAR' +
-              '_CONTABILIDAD)'#10'  VALUES'#10'    (:ID, :ID_RECIBO, :TIPO, :FECHA_PAGO' +
-              ', :TITULAR, :ENTIDAD, '#10'     :SUCURSAL, :DC, :CUENTA, :USUARIO, :' +
-              'IGNORAR_CONTABILIDAD)'#10
+              '_CONTABILIDAD,'#10'     FECHA_ALTA)'#10'  VALUES'#10'    (:ID, :ID_RECIBO, :' +
+              'TIPO, :FECHA_PAGO, :TITULAR, :ENTIDAD, '#10'     :SUCURSAL, :DC, :CU' +
+              'ENTA, :USUARIO, :IGNORAR_CONTABILIDAD,'#10'     CURRENT_TIMESTAMP)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1311,7 +1334,8 @@ object srvRecibosCliente: TsrvRecibosCliente
               'ECIBO, '#10'    TIPO = :TIPO, '#10'    FECHA_PAGO = :FECHA_PAGO, '#10'    TI' +
               'TULAR = :TITULAR, '#10'    ENTIDAD = :ENTIDAD, '#10'    SUCURSAL = :SUCU' +
               'RSAL, '#10'    DC = :DC, '#10'    CUENTA = :CUENTA,'#10'    IGNORAR_CONTABIL' +
-              'IDAD = :IGNORAR_CONTABILIDAD'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
+              'IDAD = :IGNORAR_CONTABILIDAD,'#10'    FECHA_MODIFICACION = CURRENT_T' +
+              'IMESTAMP'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1332,8 +1356,9 @@ object srvRecibosCliente: TsrvRecibosCliente
             Connection = 'IBX'
             TargetTable = 'RECIBOS_CLIENTE'
             SQL = 
-              'UPDATE RECIBOS_CLIENTE'#10'SET ID_RECIBO_COMPENSADO = :ID_RECIBO_COM' +
-              'PENSADO'#10'WHERE (ID = :ID)'
+              'UPDATE RECIBOS_CLIENTE SET'#10'       ID_RECIBO_COMPENSADO = :ID_REC' +
+              'IBO_COMPENSADO,'#10'       FECHA_MODIFICACION = CURRENT_TIMESTAMP'#10'WH' +
+              'ERE (ID = :ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1350,8 +1375,9 @@ object srvRecibosCliente: TsrvRecibosCliente
             Connection = 'IBX'
             TargetTable = 'RECIBOS_CLIENTE'
             SQL = 
-              'UPDATE RECIBOS_CLIENTE'#10'SET ID_RECIBO_COMPENSADO = Null'#10'WHERE (ID' +
-              ' = :OLD_ID)'
+              'UPDATE RECIBOS_CLIENTE SET'#10'       ID_RECIBO_COMPENSADO = NULL,'#10' ' +
+              '      FECHA_MODIFICACION = CURRENT_TIMESTAMP'#10'WHERE (ID = :OLD_ID' +
+              ')'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1372,8 +1398,9 @@ object srvRecibosCliente: TsrvRecibosCliente
             Connection = 'IBX'
             TargetTable = 'RECIBOS_CLIENTE'
             SQL = 
-              'UPDATE RECIBOS_CLIENTE'#10'SET ID_RECIBO_COMPENSADO = :ID_RECIBO_COM' +
-              'PENSADO'#10'WHERE (ID = :OLD_ID)'
+              'UPDATE RECIBOS_CLIENTE SET'#10'       ID_RECIBO_COMPENSADO = :ID_REC' +
+              'IBO_COMPENSADO,'#10'       FECHA_MODIFICACION = CURRENT_TIMESTAMP'#10'WH' +
+              'ERE (ID = :OLD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm
index ba490b4c..f3b33c6d 100644
--- a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm	
+++ b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm	
@@ -95,102 +95,58 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
             871
             303)
           inherited eReferencia: TcxDBTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 201
             Width = 201
           end
           inherited eSituacion: TcxDBTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 201
             Width = 201
           end
           inherited edtFechaVencimiento: TcxDBDateEdit
             Left = 326
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 326
             ExplicitWidth = 67
             Width = 67
           end
           inherited eFechaEmision: TcxDBTextEdit
             Left = 588
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 588
             ExplicitWidth = 286
             Width = 286
           end
           inherited eImporteTotal: TcxDBCurrencyEdit
             Left = 588
-            Style.LookAndFeel.SkinName = ''
             Style.IsFontAssigned = True
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 588
             ExplicitWidth = 286
             Width = 286
           end
           inherited eNombreCliente: TcxDBTextEdit
             Left = 588
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 588
             ExplicitWidth = 286
             Width = 286
           end
           inherited eNifCif: TcxDBTextEdit
             Left = 588
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 588
             ExplicitWidth = 286
             Width = 286
           end
           inherited eRemesa: TcxDBTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 201
             Width = 201
           end
           inherited edtFechaEmision: TcxDBDateEdit
             DataBinding.DataField = 'FECHA_EMISION'
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 62
             Width = 62
           end
           inherited rRefReciboCompensado: TcxDBTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 201
             Width = 201
           end
           inherited eDescripcion: TcxDBTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 201
             Width = 201
           end
@@ -201,10 +157,6 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
               Width = 201
               ExplicitWidth = 201
               inherited cbTienda: TcxComboBox
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 181
                 Width = 181
               end
@@ -224,56 +176,32 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
               end
               inherited edtlNombre: TcxDBTextEdit
                 DataBinding.DataSource = frViewReciboCliente1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 271
                 Width = 271
               end
               inherited edtNIFCIF: TcxDBTextEdit
                 DataBinding.DataSource = frViewReciboCliente1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 271
                 Width = 271
               end
               inherited edtCalle: TcxDBTextEdit
                 DataBinding.DataSource = frViewReciboCliente1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 271
                 Width = 271
               end
               inherited edtPoblacion: TcxDBTextEdit
                 DataBinding.DataSource = frViewReciboCliente1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 153
                 Width = 153
               end
               inherited edtProvincia: TcxDBTextEdit
                 DataBinding.DataSource = frViewReciboCliente1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 271
                 Width = 271
               end
               inherited edtCodigoPostal: TcxDBTextEdit
                 Left = 228
                 DataBinding.DataSource = frViewReciboCliente1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitLeft = 228
               end
               inherited Button3: TBitBtn
@@ -281,10 +209,6 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
                 ExplicitLeft = 118
               end
               inherited cxDBTextEdit1: TcxDBTextEdit
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 271
                 Width = 271
               end
@@ -297,6 +221,8 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
             ExplicitHeight = 150
             inherited memObservaciones: TcxDBMemo
               DataBinding.DataSource = frViewReciboCliente1.DADataSource
+              ExplicitWidth = 462
+              ExplicitHeight = 126
               Height = 150
               Width = 521
             end
@@ -389,7 +315,7 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
           Width = 871
           Height = 278
           ExplicitWidth = 871
-          ExplicitHeight = 308
+          ExplicitHeight = 278
           inherited cxGridView: TcxGridDBTableView
             DataController.Summary.FooterSummaryItems = <
               item
@@ -403,18 +329,6 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
         inherited ToolBar1: TToolBar
           Width = 871
           ExplicitWidth = 871
-          inherited ToolButton1: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton4: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton2: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton7: TToolButton
-            ExplicitWidth = 113
-          end
           inherited ToolButton3: TToolButton
             ExplicitWidth = 98
           end
@@ -447,25 +361,11 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
       inherited eImporte: TcxDBCurrencyEdit
         DataBinding.DataSource = dsDataTable
         Properties.OnEditValueChanged = frViewReciboCliImportes1eImportePropertiesEditValueChanged
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitWidth = 150
-        Width = 150
       end
       inherited eOtrosGastos: TcxDBCurrencyEdit
         DataBinding.DataSource = dsDataTable
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
       end
       inherited eImporteTotalRecibo: TcxCurrencyEdit
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitWidth = 366
         Width = 366
       end
diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas
index a0fabb87..e9cb632a 100644
--- a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas	
+++ b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas	
@@ -161,8 +161,7 @@ begin
     (Application.MessageBox(PChar('Este recibo está remesado en la remesa de referencia ' + Recibo.REFERENCIA_REMESA + '.' + #10#13 + 'Si añade una devolución, el recibo quedará libre y podrá ser incluido en otra remesa diferente.' + #10#13 + '¿Desea continuar?'), 'Atención', MB_YESNO) = IDYES) then
   begin
     with TfEditorFechaPago.Create(Nil) do
-    begin
-
+    try
       //En el caso de que el cliente del recibo no tenga aignada subcuenta contable el pago no podrá contabilizarse
       if (Recibo.Cliente.SubCuentas.ID < 1) then
       begin
@@ -175,14 +174,9 @@ begin
         AFechaPago := DateToStr(FechaPago);
         AIgnorarContabilidad := IgnorarContabilidad;
         ASubCuenta := IdSubcuenta;
-        Release;
       end
-      else
-      begin
-        //Operación cancelada
-        Release;
-        exit;
-      end;
+    finally
+      Release;
     end;
   end;
 
@@ -194,7 +188,7 @@ begin
   else
      HabilitarRecibo;
 
-  frViewPagosCliente1.ListaPagosClienteDBTableView1.DataController.GotoLast;   
+  frViewPagosCliente1.ListaPagosClienteDBTableView1.DataController.GotoLast;
 end;
 
 procedure TfEditorReciboCliente.frViewPagosCliente1actAnadirUpdate(Sender: TObject);
@@ -251,7 +245,7 @@ begin
   inherited;
 
   with TfEditorFechaPago.Create(Nil) do
-  begin
+  try
     FechaPago := Recibo.Pagos.FECHA_PAGO;
     IgnorarContabilidad := Recibo.Pagos.IGNORAR_CONTABILIDAD;
     if IgnorarContabilidad = 0 then
@@ -285,7 +279,7 @@ begin
       if not SoloLectura then
          FController.ModificarPago(Recibo, AFechaPago, AIgnorarContabilidad, ASubCuenta);
     end;
-
+  finally
     Release;
   end;
 
diff --git a/Source/Modulos/Recibos de cliente/Views/uViewPagosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewPagosCliente.dfm
index a71f4c51..8b1a3640 100644
--- a/Source/Modulos/Recibos de cliente/Views/uViewPagosCliente.dfm	
+++ b/Source/Modulos/Recibos de cliente/Views/uViewPagosCliente.dfm	
@@ -158,6 +158,7 @@ inherited frViewPagosCliente: TfrViewPagosCliente
         object ListaPagosClienteDBTableView1CUENTA: TcxGridDBColumn
           DataBinding.FieldName = 'CUENTA'
           Visible = False
+          VisibleForCustomization = False
         end
       end
       object ListaPagosClienteLevel1: TcxGridLevel
diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm
index dc55b253..833d6c42 100644
--- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm	
+++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm	
@@ -1,11 +1,11 @@
 inherited frViewRecibosCliente: TfrViewRecibosCliente
-  Width = 531
-  Height = 387
-  ExplicitWidth = 531
-  ExplicitHeight = 387
+  Width = 686
+  Height = 445
+  ExplicitWidth = 686
+  ExplicitHeight = 445
   inherited cxGrid: TcxGrid
-    Width = 531
-    Height = 259
+    Width = 686
+    Height = 317
     RootLevelOptions.DetailTabsPosition = dtpTop
     OnActiveTabChanged = cxGridActiveTabChanged
     ExplicitWidth = 531
@@ -193,6 +193,11 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
         DataBinding.FieldName = 'CODIGO_POSTAL'
         Visible = False
       end
+      object cxGridViewCUENTA_CONTABLE: TcxGridDBColumn
+        Caption = 'Cuenta contable'
+        DataBinding.FieldName = 'CUENTA_CONTABLE'
+        PropertiesClassName = 'TcxTextEditProperties'
+      end
     end
     inherited cxGridLevel: TcxGridLevel
       Caption = 'Todos'
@@ -208,60 +213,48 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
     end
   end
   inherited frViewFiltroBase1: TfrViewFiltroBase
-    Width = 531
+    Width = 686
     ExplicitWidth = 531
     inherited TBXDockablePanel1: TTBXDockablePanel
       ExplicitWidth = 531
       inherited dxLayoutControl1: TdxLayoutControl
-        Width = 531
+        Width = 686
         ExplicitWidth = 531
         inherited txtFiltroTodo: TcxTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 434
           Width = 434
         end
         inherited edtFechaIniFiltro: TcxDateEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 183
           Width = 183
         end
         inherited edtFechaFinFiltro: TcxDateEdit
-          Left = 287
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 287
+          Left = 367
+          ExplicitLeft = 367
           ExplicitWidth = 234
           Width = 234
         end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-        Width = 531
+        Width = 686
         ExplicitWidth = 531
         inherited tbxBotones: TTBXToolbar
-          Width = 521
+          Width = 676
           ExplicitWidth = 521
         end
       end
     end
   end
   inherited pnlAgrupaciones: TTBXDockablePanel
-    Top = 361
+    Top = 419
     Visible = True
     ExplicitTop = 361
     ExplicitWidth = 531
     inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-      Width = 531
+      Width = 686
       ExplicitWidth = 531
       inherited TBXToolbar1: TTBXToolbar
-        Width = 521
+        Width = 676
         ExplicitWidth = 521
         object TBXSeparatorItem1: TTBXSeparatorItem
         end
diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas
index e3eb0cfe..0bcca75d 100644
--- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas	
+++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas	
@@ -57,6 +57,7 @@ type
     cxGridViewPOBLACION: TcxGridDBColumn;
     cxGridViewPROVINCIA: TcxGridDBColumn;
     cxGridViewCODIGO_POSTAL: TcxGridDBColumn;
+    cxGridViewCUENTA_CONTABLE: TcxGridDBColumn;
     procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
       ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
       out AStyle: TcxStyle);
diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorReciboProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uEditorReciboProveedor.dfm
index 28fe3682..aa0533de 100644
--- a/Source/Modulos/Recibos de proveedor/Views/uEditorReciboProveedor.dfm	
+++ b/Source/Modulos/Recibos de proveedor/Views/uEditorReciboProveedor.dfm	
@@ -61,6 +61,7 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
   inherited pgPaginas: TPageControl
     Width = 685
     Height = 323
+    ActivePage = pagPagos
     ExplicitWidth = 685
     ExplicitHeight = 323
     inherited pagGeneral: TTabSheet
@@ -93,101 +94,57 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
             677
             295)
           inherited eReferencia: TcxDBTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 112
             Width = 112
           end
           inherited eSituacion: TcxDBTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 112
             Width = 112
           end
           inherited edtFechaVencimiento: TcxDBDateEdit
             Left = 228
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 228
             ExplicitWidth = 20
             Width = 20
           end
           inherited eFechaEmision: TcxDBTextEdit
             Left = 384
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 384
             ExplicitWidth = 255
             Width = 255
           end
           inherited eImporteTotal: TcxDBCurrencyEdit
             Left = 384
-            Style.LookAndFeel.SkinName = ''
             Style.IsFontAssigned = True
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 384
             ExplicitWidth = 255
             Width = 255
           end
           inherited eNombreCliente: TcxDBTextEdit
             Left = 384
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 384
             ExplicitWidth = 255
             Width = 255
           end
           inherited eRemesa: TcxDBTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 112
             Width = 112
           end
           inherited edtFechaEmision: TcxDBDateEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 20
             Width = 20
           end
           inherited eReferenciaProveedor: TcxDBTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 112
             Width = 112
           end
           inherited rReferenciaFacturaProv: TcxDBTextEdit
             Left = 384
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 384
             ExplicitWidth = 255
             Width = 255
           end
           inherited rRefReciboCompensado: TcxDBTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 112
             Width = 112
           end
@@ -198,29 +155,17 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
               Width = 112
               ExplicitWidth = 112
               inherited cbTienda: TcxComboBox
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 92
                 Width = 92
               end
             end
           end
           inherited eDescripcion: TcxDBTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 112
             Width = 112
           end
           inherited eNifCif: TcxDBTextEdit
             Left = 384
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 384
             ExplicitWidth = 255
             Width = 255
@@ -239,56 +184,32 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
               end
               inherited edtlNombre: TcxDBTextEdit
                 DataBinding.DataSource = frViewReciboProveedor1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 283
                 Width = 283
               end
               inherited edtNIFCIF: TcxDBTextEdit
                 DataBinding.DataSource = frViewReciboProveedor1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 283
                 Width = 283
               end
               inherited edtCalle: TcxDBTextEdit
                 DataBinding.DataSource = frViewReciboProveedor1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 283
                 Width = 283
               end
               inherited edtPoblacion: TcxDBTextEdit
                 DataBinding.DataSource = frViewReciboProveedor1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 165
                 Width = 165
               end
               inherited edtProvincia: TcxDBTextEdit
                 DataBinding.DataSource = frViewReciboProveedor1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 283
                 Width = 283
               end
               inherited edtCodigoPostal: TcxDBTextEdit
                 Left = 282
                 DataBinding.DataSource = frViewReciboProveedor1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitLeft = 282
               end
               inherited Button3: TBitBtn
@@ -296,10 +217,6 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
                 ExplicitLeft = 166
               end
               inherited cxDBTextEdit1: TcxDBTextEdit
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 283
                 Width = 283
               end
@@ -312,8 +229,6 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
             ExplicitHeight = 150
             inherited memObservaciones: TcxDBMemo
               DataBinding.DataSource = frViewReciboProveedor1.DADataSource
-              ExplicitWidth = 226
-              ExplicitHeight = 129
               Height = 150
               Width = 521
             end
@@ -467,25 +382,13 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
       inherited eImporte: TcxDBCurrencyEdit
         DataBinding.DataSource = dsDataTable
         Properties.OnEditValueChanged = frViewReciboProvImportes1eImportePropertiesEditValueChanged
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitWidth = 150
         Width = 150
       end
       inherited eOtrosGastos: TcxDBCurrencyEdit
         DataBinding.DataSource = dsDataTable
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
       end
       inherited eImporteTotalRecibo: TcxCurrencyEdit
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitWidth = 315
         Width = 315
       end
diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr
index dcf94a9e..28202484 100644
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@@ -112,8 +112,6 @@ uses
   schRemesasClienteServer_Intf in '..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas',
   schContabilidadClient_Intf in '..\Modulos\Contabilidad\Model\schContabilidadClient_Intf.pas',
   schContabilidadServer_Intf in '..\Modulos\Contabilidad\Model\schContabilidadServer_Intf.pas',
-  schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas',
-  schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas',
   schRecibosProveedorClient_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas',
   schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas',
   schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
@@ -136,7 +134,9 @@ uses
   schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas',
   schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas',
   schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas',
-  schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas';
+  schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas',
+  schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas',
+  schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas';
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index a6966cd7..40ebd21f 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 2,4,3,0
-PRODUCTVERSION 2,4,3,0
+FILEVERSION 2,4,4,0
+PRODUCTVERSION 2,4,4,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.4.3.0\0"
+              VALUE "FileVersion", "2.4.4.0\0"
               VALUE "ProductName", "FactuGES (Servidor)\0"
-              VALUE "ProductVersion", "2.4.3.0\0"
-              VALUE "CompileDate", "jueves, 17 de junio de 2010 13:21\0"
+              VALUE "ProductVersion", "2.4.4.0\0"
+              VALUE "CompileDate", "lunes, 21 de junio de 2010 10:29\0"
          END
     END
     BLOCK "VarFileInfo"