diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm
index 65719ad8..6f6771fe 100644
--- a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm	
@@ -1,6 +1,7 @@
 object RptAlbaranesCliente: TRptAlbaranesCliente
   OldCreateOrder = True
   OnCreate = DataModuleCreate
+  OnDestroy = DataModuleDestroy
   Height = 471
   Width = 448
   object DADSCabecera: TDADataSource
diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas
index 8ac4a355..96197419 100644
--- a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas	
+++ b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas	
@@ -62,6 +62,7 @@ type
     schReport: TDASchema;
     DABin2DataStreamer1: TDABin2DataStreamer;
     procedure DataModuleCreate(Sender: TObject);
+    procedure DataModuleDestroy(Sender: TObject);
   private
     FConnection: IDAConnection;
     //Genera cada uno de los albaranes a imprimir
@@ -99,7 +100,16 @@ begin
   frxReport.EngineOptions.NewSilentMode := simReThrow;
 
   frxDBCabecera.DataSource := DADSCabecera;
+  frxDBCabecera.CloseDataSource := False;
+
   frxDBDetalles.DataSource := DADSDetalles;
+  frxDBDetalles.CloseDataSource := False;
+end;
+
+procedure TRptAlbaranesCliente.DataModuleDestroy(Sender: TObject);
+begin
+    tbl_Cabecera.Active := False;
+    tbl_Detalles.Active := False;
 end;
 
 function TRptAlbaranesCliente.GenerarAlbaran(const AListaID : TIntegerArray): Binary;
@@ -161,10 +171,10 @@ begin
 end;
 
 function TRptAlbaranesCliente.GenerarEtiquetas(const AID: Integer; withRefCliente: Boolean): Binary;
-var
+{var
   dsMaster: IDADataset;
   dsDetail: IDADataset;
-  AStream: TMemoryStream;
+  AStream: TMemoryStream;}
 begin
 {
   AStream := TMemoryStream.Create;
diff --git a/Source/Modulos/Albaranes de proveedor/Reports/uRptAlbaranesProveedor_Server.dfm b/Source/Modulos/Albaranes de proveedor/Reports/uRptAlbaranesProveedor_Server.dfm
index e385896f..584f9592 100644
--- a/Source/Modulos/Albaranes de proveedor/Reports/uRptAlbaranesProveedor_Server.dfm	
+++ b/Source/Modulos/Albaranes de proveedor/Reports/uRptAlbaranesProveedor_Server.dfm	
@@ -1,6 +1,7 @@
 object RptAlbaranesProveedor: TRptAlbaranesProveedor
   OldCreateOrder = True
   OnCreate = DataModuleCreate
+  OnDestroy = DataModuleDestroy
   Height = 471
   Width = 448
   object DADSCabecera: TDADataSource
diff --git a/Source/Modulos/Albaranes de proveedor/Reports/uRptAlbaranesProveedor_Server.pas b/Source/Modulos/Albaranes de proveedor/Reports/uRptAlbaranesProveedor_Server.pas
index b0ce3b48..f1ad0548 100644
--- a/Source/Modulos/Albaranes de proveedor/Reports/uRptAlbaranesProveedor_Server.pas	
+++ b/Source/Modulos/Albaranes de proveedor/Reports/uRptAlbaranesProveedor_Server.pas	
@@ -45,6 +45,7 @@ type
     DABin2DataStreamer1: TDABin2DataStreamer;
     schReport: TDASchema;
     procedure DataModuleCreate(Sender: TObject);
+    procedure DataModuleDestroy(Sender: TObject);
   private
     FConnection: IDAConnection;
     //Genera cada uno de los albaranes a imprimir
@@ -79,7 +80,16 @@ begin
   frxReport.EngineOptions.NewSilentMode := simReThrow;
 
   frxDBCabecera.DataSource := DADSCabecera;
+  frxDBCabecera.CloseDataSource := False;
+
   frxDBDetalles.DataSource := DADSDetalles;
+  frxDBDetalles.CloseDataSource := False;
+end;
+
+procedure TRptAlbaranesProveedor.DataModuleDestroy(Sender: TObject);
+begin
+    tbl_Cabecera.Active := False;
+    tbl_Detalles.Active := False;
 end;
 
 function TRptAlbaranesProveedor.GenerarAlbaran(const AListaID : TIntegerArray): Binary;
diff --git a/Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.dfm b/Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.dfm
index bac90c90..5b7c5b8f 100644
--- a/Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.dfm
+++ b/Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.dfm
@@ -1,6 +1,7 @@
 object RptEtiquetasContacto: TRptEtiquetasContacto
   OldCreateOrder = True
   OnCreate = DataModuleCreate
+  OnDestroy = DataModuleDestroy
   Height = 405
   Width = 447
   object DADataCabecera: TDADataSource
@@ -418,7 +419,7 @@ object RptEtiquetasContacto: TRptEtiquetasContacto
   end
   object frxDBCabecera: TfrxDBDataset
     UserName = 'frxDBCabecera'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADataCabecera
     Left = 264
     Top = 16
diff --git a/Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.pas b/Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.pas
index a41f84e5..b87711d1 100644
--- a/Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.pas
+++ b/Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.pas
@@ -27,6 +27,7 @@ type
     DataDictionary: TDADataDictionary;
     Bin2DataStreamer: TDABin2DataStreamer;
     procedure DataModuleCreate(Sender: TObject);
+    procedure DataModuleDestroy(Sender: TObject);
   private
     FConnection: IDAConnection;
   public
@@ -55,6 +56,14 @@ begin
   schReport.ConnectionManager := dmServer.ConnectionManager;
   FConnection := dmServer.DarNuevaConexion;
   frxReport.EngineOptions.NewSilentMode := simReThrow;
+
+  frxDBCabecera.DataSource := DADataCabecera;
+  frxDBCabecera.CloseDataSource := False;
+end;
+
+procedure TRptEtiquetasContacto.DataModuleDestroy(Sender: TObject);
+begin
+  tbl_Contactos.Active := False;
 end;
 
 function TRptEtiquetasContacto.GenerarInforme(const ListaID: TIntegerArray): Binary;
diff --git a/Source/Modulos/Contactos/Reports/uRptFichasEmpleado_Server.dfm b/Source/Modulos/Contactos/Reports/uRptFichasEmpleado_Server.dfm
index be6100e4..bbb7aa88 100644
--- a/Source/Modulos/Contactos/Reports/uRptFichasEmpleado_Server.dfm
+++ b/Source/Modulos/Contactos/Reports/uRptFichasEmpleado_Server.dfm
@@ -1,6 +1,7 @@
 object RptFichasEmpleado: TRptFichasEmpleado
   OldCreateOrder = True
   OnCreate = DataModuleCreate
+  OnDestroy = DataModuleDestroy
   Height = 405
   Width = 447
   object DADataCabecera: TDADataSource
@@ -661,7 +662,7 @@ object RptFichasEmpleado: TRptFichasEmpleado
   end
   object frxDBCabecera: TfrxDBDataset
     UserName = 'frxDBCabecera'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADataCabecera
     Left = 264
     Top = 16
diff --git a/Source/Modulos/Contactos/Reports/uRptFichasEmpleado_Server.pas b/Source/Modulos/Contactos/Reports/uRptFichasEmpleado_Server.pas
index c31278ff..d0ea260a 100644
--- a/Source/Modulos/Contactos/Reports/uRptFichasEmpleado_Server.pas
+++ b/Source/Modulos/Contactos/Reports/uRptFichasEmpleado_Server.pas
@@ -27,6 +27,7 @@ type
     frxReport: TfrxReport;
     Bin2DataStreamer: TDABin2DataStreamer;
     procedure DataModuleCreate(Sender: TObject);
+    procedure DataModuleDestroy(Sender: TObject);
   private
     FConnection: IDAConnection;
     //Genera cada uno de los albaranes a imprimir
@@ -57,6 +58,14 @@ begin
   schReport.ConnectionManager := dmServer.ConnectionManager;
   FConnection := dmServer.DarNuevaConexion;
   frxReport.EngineOptions.NewSilentMode := simReThrow;
+
+  frxDBCabecera.DataSource := DADataCabecera;
+  frxDBCabecera.CloseDataSource := False;
+end;
+
+procedure TRptFichasEmpleado.DataModuleDestroy(Sender: TObject);
+begin
+  tbl_FichaEmpleado.Active := False;
 end;
 
 function TRptFichasEmpleado.GenerarFicha(const ListaID: TIntegerArray): Binary;
diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm
index 95343fd7..1572be55 100644
--- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm	
+++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm	
@@ -1103,14 +1103,14 @@ object RptFacturasCliente: TRptFacturasCliente
   end
   object frxDBCabecera: TfrxDBDataset
     UserName = 'frxDBCabecera'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSCabecera
     Left = 264
     Top = 16
   end
   object frxDBDetalles: TfrxDBDataset
     UserName = 'frxDBDetalles'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSDetalles
     Left = 344
     Top = 16
@@ -1722,7 +1722,7 @@ object RptFacturasCliente: TRptFacturasCliente
   end
   object frxDBVencimientos: TfrxDBDataset
     UserName = 'frxDBVencimientos'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSVencimientos
     Left = 440
     Top = 16
@@ -1899,14 +1899,14 @@ object RptFacturasCliente: TRptFacturasCliente
   end
   object frxDBInformeListadoFacturas: TfrxDBDataset
     UserName = 'frxDBInformeListadoFacturas'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSInformeListadoFacturas
     Left = 576
     Top = 16
   end
   object frxDBInformeListadoFacturasPendientes: TfrxDBDataset
     UserName = 'frxDBInformeListadoFacturasPendientes'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSInformeListadoFacturasPendientes
     Left = 792
     Top = 16
diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas
index e6547622..cf64cace 100644
--- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas	
+++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas	
@@ -153,12 +153,21 @@ begin
   FListaNombresClientes := TStringList.Create;
 
   frxDBCabecera.DataSource := DADSCabecera;
+  frxDBCabecera.CloseDataSource := False;
+
   frxDBDetalles.DataSource := DADSDetalles;
+  frxDBDetalles.CloseDataSource := False;
+
   frxDBVencimientos.DataSource := DADSVencimientos;
+  frxDBVencimientos.CloseDataSource := False;
 end;
 
 procedure TRptFacturasCliente.DataModuleDestroy(Sender: TObject);
 begin
+  tbl_Cabecera.Active := False;
+  tbl_Detalles.Active := False;
+  tbl_Vencimientos.Active := False;
+
   FreeANDNIL(FListaNombresClientes);
 end;
 
diff --git a/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm b/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm
index 64893be7..cc41b218 100644
--- a/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm	
+++ b/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm	
@@ -1131,548 +1131,6 @@ object RptFacturasProveedor: TRptFacturasProveedor
     Left = 62
     Top = 142
   end
-  object frxDBCabecera: TfrxDBDataset
-    UserName = 'frxDBCabecera'
-    CloseDataSource = True
-    DataSource = DADSCabecera
-    Left = 264
-    Top = 16
-  end
-  object frxDBDetalles: TfrxDBDataset
-    UserName = 'frxDBDetalles'
-    CloseDataSource = True
-    DataSource = DADSDetalles
-    Left = 344
-    Top = 16
-  end
-  object IBDatabase1: TIBDatabase
-    DatabaseName = 'C:\Codigo Tecsitel\Output\Debug\Database\FACTUGES.FDB'
-    Params.Strings = (
-      'user_name=sysdba'
-      'password=masterkey'
-      'lc_ctype=ISO8859_1')
-    LoginPrompt = False
-    DefaultTransaction = IBTransaction1
-    Left = 48
-    Top = 296
-  end
-  object IBTransaction1: TIBTransaction
-    Left = 48
-    Top = 352
-  end
-  object DataSource1: TDataSource
-    DataSet = cabecera
-    Left = 216
-    Top = 296
-  end
-  object DataSource2: TDataSource
-    DataSet = detalles
-    Left = 216
-    Top = 352
-  end
-  object cabecera: TIBQuery
-    Database = IBDatabase1
-    Transaction = IBTransaction1
-    SQL.Strings = (
-      'select'
-      '   v_facturas_cliente.id, v_facturas_cliente.id_empresa,'
-      '   v_facturas_cliente.referencia, v_facturas_cliente.tipo,'
-      
-        '   v_facturas_cliente.fecha_factura, v_facturas_cliente.base_imp' +
-        'onible,'
-      '   v_facturas_cliente.situacion, v_facturas_cliente.descuento,'
-      '   v_facturas_cliente.importe_descuento, v_facturas_cliente.iva,'
-      '   v_facturas_cliente.importe_iva, v_facturas_cliente.re,'
-      
-        '   v_facturas_cliente.importe_re, v_facturas_cliente.importe_tot' +
-        'al,'
-      '   v_facturas_cliente.observaciones, v_facturas_cliente.nif_cif,'
-      '   v_facturas_cliente.id_cliente, v_facturas_cliente.nombre,'
-      '   v_facturas_cliente.calle, v_facturas_cliente.provincia,'
-      
-        '   v_facturas_cliente.poblacion, v_facturas_cliente.codigo_posta' +
-        'l,'
-      
-        '   v_facturas_cliente.recargo_equivalencia, v_facturas_cliente.i' +
-        'mporte_neto,'
-      
-        '   v_facturas_cliente.importe_porte, formas_pago.descripcion as ' +
-        'FORMA_PAGO,'
-      '   v_facturas_cliente.DATOS_BANCARIOS'
-      'from v_facturas_cliente'
-      
-        '   left outer join formas_pago on (formas_pago.id = v_facturas_c' +
-        'liente.id_forma_pago)'
-      'WHERE V_FACTURAS_CLIENTE.ID = 2')
-    Left = 136
-    Top = 296
-    object cabeceraID: TIntegerField
-      FieldName = 'ID'
-      Origin = '"V_FACTURAS_CLIENTE"."ID"'
-    end
-    object cabeceraID_EMPRESA: TIntegerField
-      FieldName = 'ID_EMPRESA'
-      Origin = '"V_FACTURAS_CLIENTE"."ID_EMPRESA"'
-    end
-    object cabeceraREFERENCIA: TIBStringField
-      FieldName = 'REFERENCIA'
-      Origin = '"V_FACTURAS_CLIENTE"."REFERENCIA"'
-      Size = 255
-    end
-    object cabeceraTIPO: TIBStringField
-      FieldKind = fkInternalCalc
-      FieldName = 'TIPO'
-      Origin = '"V_FACTURAS_CLIENTE"."TIPO"'
-      ProviderFlags = []
-      ReadOnly = True
-      FixedChar = True
-      Size = 1
-    end
-    object cabeceraFECHA_FACTURA: TDateField
-      FieldName = 'FECHA_FACTURA'
-      Origin = '"V_FACTURAS_CLIENTE"."FECHA_FACTURA"'
-    end
-    object cabeceraBASE_IMPONIBLE: TIBBCDField
-      FieldName = 'BASE_IMPONIBLE'
-      Origin = '"V_FACTURAS_CLIENTE"."BASE_IMPONIBLE"'
-      Precision = 18
-      Size = 2
-    end
-    object cabeceraSITUACION: TIBStringField
-      FieldKind = fkInternalCalc
-      FieldName = 'SITUACION'
-      Origin = '"V_FACTURAS_CLIENTE"."SITUACION"'
-      ProviderFlags = []
-      ReadOnly = True
-      FixedChar = True
-      Size = 19
-    end
-    object cabeceraDESCUENTO: TFloatField
-      FieldName = 'DESCUENTO'
-      Origin = '"V_FACTURAS_CLIENTE"."DESCUENTO"'
-    end
-    object cabeceraIMPORTE_DESCUENTO: TIBBCDField
-      FieldName = 'IMPORTE_DESCUENTO'
-      Origin = '"V_FACTURAS_CLIENTE"."IMPORTE_DESCUENTO"'
-      Precision = 18
-      Size = 2
-    end
-    object cabeceraIVA: TFloatField
-      FieldName = 'IVA'
-      Origin = '"V_FACTURAS_CLIENTE"."IVA"'
-    end
-    object cabeceraIMPORTE_IVA: TIBBCDField
-      FieldName = 'IMPORTE_IVA'
-      Origin = '"V_FACTURAS_CLIENTE"."IMPORTE_IVA"'
-      Precision = 18
-      Size = 2
-    end
-    object cabeceraRE: TFloatField
-      FieldName = 'RE'
-      Origin = '"V_FACTURAS_CLIENTE"."RE"'
-    end
-    object cabeceraIMPORTE_RE: TIBBCDField
-      FieldName = 'IMPORTE_RE'
-      Origin = '"V_FACTURAS_CLIENTE"."IMPORTE_RE"'
-      Precision = 18
-      Size = 2
-    end
-    object cabeceraIMPORTE_TOTAL: TIBBCDField
-      FieldName = 'IMPORTE_TOTAL'
-      Origin = '"V_FACTURAS_CLIENTE"."IMPORTE_TOTAL"'
-      Precision = 18
-      Size = 2
-    end
-    object cabeceraOBSERVACIONES: TMemoField
-      FieldName = 'OBSERVACIONES'
-      Origin = '"V_FACTURAS_CLIENTE"."OBSERVACIONES"'
-      ProviderFlags = [pfInUpdate]
-      BlobType = ftMemo
-      Size = 8
-    end
-    object cabeceraNIF_CIF: TIBStringField
-      FieldName = 'NIF_CIF'
-      Origin = '"V_FACTURAS_CLIENTE"."NIF_CIF"'
-      Size = 15
-    end
-    object cabeceraID_CLIENTE: TIntegerField
-      FieldName = 'ID_CLIENTE'
-      Origin = '"V_FACTURAS_CLIENTE"."ID_CLIENTE"'
-    end
-    object cabeceraNOMBRE: TIBStringField
-      FieldName = 'NOMBRE'
-      Origin = '"V_FACTURAS_CLIENTE"."NOMBRE"'
-      Size = 255
-    end
-    object cabeceraCALLE: TIBStringField
-      FieldName = 'CALLE'
-      Origin = '"V_FACTURAS_CLIENTE"."CALLE"'
-      Size = 255
-    end
-    object cabeceraPROVINCIA: TIBStringField
-      FieldName = 'PROVINCIA'
-      Origin = '"V_FACTURAS_CLIENTE"."PROVINCIA"'
-      Size = 255
-    end
-    object cabeceraPOBLACION: TIBStringField
-      FieldName = 'POBLACION'
-      Origin = '"V_FACTURAS_CLIENTE"."POBLACION"'
-      Size = 255
-    end
-    object cabeceraCODIGO_POSTAL: TIBStringField
-      FieldName = 'CODIGO_POSTAL'
-      Origin = '"V_FACTURAS_CLIENTE"."CODIGO_POSTAL"'
-      Size = 10
-    end
-    object cabeceraRECARGO_EQUIVALENCIA: TSmallintField
-      FieldName = 'RECARGO_EQUIVALENCIA'
-      Origin = '"V_FACTURAS_CLIENTE"."RECARGO_EQUIVALENCIA"'
-    end
-    object cabeceraIMPORTE_NETO: TIBBCDField
-      FieldName = 'IMPORTE_NETO'
-      Origin = '"V_FACTURAS_CLIENTE"."IMPORTE_NETO"'
-      Precision = 18
-      Size = 2
-    end
-    object cabeceraIMPORTE_PORTE: TIBBCDField
-      FieldName = 'IMPORTE_PORTE'
-      Origin = '"V_FACTURAS_CLIENTE"."IMPORTE_PORTE"'
-      Precision = 18
-      Size = 2
-    end
-    object cabeceraFORMA_PAGO: TIBStringField
-      FieldName = 'FORMA_PAGO'
-      Origin = '"FORMAS_PAGO"."DESCRIPCION"'
-      Size = 255
-    end
-    object cabeceraDATOS_BANCARIOS: TIBStringField
-      FieldName = 'DATOS_BANCARIOS'
-      Origin = '"V_FACTURAS_CLIENTE"."DATOS_BANCARIOS"'
-      Size = 255
-    end
-  end
-  object detalles: TIBQuery
-    Database = IBDatabase1
-    Transaction = IBTransaction1
-    SQL.Strings = (
-      'SELECT'
-      
-        '    DET.ID, DET.ID_FACTURA, DET.POSICION, DET.TIPO_DETALLE, ARTI' +
-        'CULOS.REFERENCIA,'
-      
-        '    DET.CONCEPTO, DET.CANTIDAD, DET.IMPORTE_UNIDAD, DET.DESCUENT' +
-        'O,'
-      '    DET.IMPORTE_TOTAL, DET.VISIBLE'
-      'FROM FACTURAS_CLIENTE_DETALLES DET'
-      'LEFT OUTER JOIN ARTICULOS ON (ARTICULOS.ID = DET.ID_ARTICULO)'
-      'WHERE DET.ID_FACTURA = 2 AND DET.VISIBLE = 1 '
-      'ORDER BY DET.ID_FACTURA, DET.POSICION;')
-    Left = 136
-    Top = 352
-    object detallesID: TIntegerField
-      FieldName = 'ID'
-      Origin = '"FACTURAS_CLIENTE_DETALLES"."ID"'
-      ProviderFlags = [pfInUpdate, pfInWhere, pfInKey]
-      Required = True
-    end
-    object detallesID_FACTURA: TIntegerField
-      FieldName = 'ID_FACTURA'
-      Origin = '"FACTURAS_CLIENTE_DETALLES"."ID_FACTURA"'
-      Required = True
-    end
-    object detallesPOSICION: TIntegerField
-      FieldName = 'POSICION'
-      Origin = '"FACTURAS_CLIENTE_DETALLES"."POSICION"'
-    end
-    object detallesTIPO_DETALLE: TIBStringField
-      FieldName = 'TIPO_DETALLE'
-      Origin = '"FACTURAS_CLIENTE_DETALLES"."TIPO_DETALLE"'
-      Size = 10
-    end
-    object detallesCONCEPTO: TIBStringField
-      FieldName = 'CONCEPTO'
-      Origin = '"FACTURAS_CLIENTE_DETALLES"."CONCEPTO"'
-      Size = 2000
-    end
-    object detallesCANTIDAD: TIntegerField
-      FieldName = 'CANTIDAD'
-      Origin = '"FACTURAS_CLIENTE_DETALLES"."CANTIDAD"'
-    end
-    object detallesIMPORTE_UNIDAD: TIBBCDField
-      FieldName = 'IMPORTE_UNIDAD'
-      Origin = '"FACTURAS_CLIENTE_DETALLES"."IMPORTE_UNIDAD"'
-      Precision = 18
-      Size = 2
-    end
-    object detallesDESCUENTO: TFloatField
-      FieldName = 'DESCUENTO'
-      Origin = '"FACTURAS_CLIENTE_DETALLES"."DESCUENTO"'
-    end
-    object detallesIMPORTE_TOTAL: TIBBCDField
-      FieldName = 'IMPORTE_TOTAL'
-      Origin = '"FACTURAS_CLIENTE_DETALLES"."IMPORTE_TOTAL"'
-      Precision = 18
-      Size = 2
-    end
-    object detallesVISIBLE: TSmallintField
-      FieldName = 'VISIBLE'
-      Origin = '"FACTURAS_CLIENTE_DETALLES"."VISIBLE"'
-    end
-    object detallesREFERENCIA: TIBStringField
-      FieldName = 'REFERENCIA'
-      Origin = '"ARTICULOS"."REFERENCIA"'
-      Size = 255
-    end
-  end
-  object DADSCabecera: TDADataSource
-    DataSet = tbl_Cabecera.Dataset
-    DataTable = tbl_Cabecera
-    Left = 264
-    Top = 72
-  end
-  object DADSDetalles: TDADataSource
-    DataSet = tbl_Detalles.Dataset
-    DataTable = tbl_Detalles
-    Left = 344
-    Top = 72
-  end
-  object tbl_Detalles: TDAMemDataTable
-    RemoteUpdatesOptions = []
-    Fields = <
-      item
-        Name = 'ID'
-        DataType = datInteger
-        InPrimaryKey = True
-      end
-      item
-        Name = 'ID_FACTURA'
-        DataType = datInteger
-      end
-      item
-        Name = 'POSICION'
-        DataType = datInteger
-      end
-      item
-        Name = 'TIPO_DETALLE'
-        DataType = datString
-        Size = 25
-      end
-      item
-        Name = 'REFERENCIA'
-        DataType = datString
-        Size = 255
-      end
-      item
-        Name = 'CONCEPTO'
-        DataType = datString
-        Size = 2000
-      end
-      item
-        Name = 'CANTIDAD'
-        DataType = datFloat
-      end
-      item
-        Name = 'UNIDAD_MEDIDA'
-        DataType = datString
-        Size = 255
-      end
-      item
-        Name = 'IMPORTE_UNIDAD'
-        DataType = datCurrency
-      end
-      item
-        Name = 'DESCUENTO'
-        DataType = datFloat
-      end
-      item
-        Name = 'IMPORTE_TOTAL'
-        DataType = datCurrency
-      end
-      item
-        Name = 'VISIBLE'
-        DataType = datSmallInt
-      end>
-    Params = <
-      item
-        Name = 'ID_FACTURA'
-        DataType = datInteger
-        Value = '2'
-        ParamType = daptInput
-      end>
-    MasterParamsMappings.Strings = (
-      'ID_FACTURA=ID')
-    LogChanges = False
-    StreamingOptions = [soDisableEventsWhileStreaming]
-    RemoteFetchEnabled = False
-    LocalSchema = schReport
-    LocalDataStreamer = Bin2DataStreamer
-    DetailFields = 'ID_FACTURA'
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
-    LogicalName = 'InformeFacturasProveedor_Detalles'
-    IndexDefs = <>
-    Left = 344
-    Top = 128
-  end
-  object tbl_Cabecera: TDAMemDataTable
-    RemoteUpdatesOptions = []
-    Fields = <
-      item
-        Name = 'ID'
-        DataType = datInteger
-        DictionaryEntry = 'FacturasCliente_ID'
-        InPrimaryKey = True
-      end
-      item
-        Name = 'ID_EMPRESA'
-        DataType = datInteger
-        DictionaryEntry = 'FacturasCliente_ID_EMPRESA'
-      end
-      item
-        Name = 'REFERENCIA'
-        DataType = datString
-        Size = 255
-        DictionaryEntry = 'FacturasCliente_REFERENCIA'
-      end
-      item
-        Name = 'TIPO'
-        DataType = datString
-        Size = 1
-      end
-      item
-        Name = 'FECHA_FACTURA'
-        DataType = datDateTime
-        DictionaryEntry = 'FacturasCliente_FECHA_FACTURA'
-      end
-      item
-        Name = 'BASE_IMPONIBLE'
-        DataType = datCurrency
-        DictionaryEntry = 'FacturasCliente_BASE_IMPONIBLE'
-      end
-      item
-        Name = 'SITUACION'
-        DataType = datString
-        Size = 19
-      end
-      item
-        Name = 'DESCUENTO'
-        DataType = datFloat
-        DictionaryEntry = 'FacturasCliente_DESCUENTO'
-      end
-      item
-        Name = 'IMPORTE_DESCUENTO'
-        DataType = datCurrency
-        DictionaryEntry = 'FacturasCliente_IMPORTE_DESCUENTO'
-      end
-      item
-        Name = 'IVA'
-        DataType = datFloat
-        DictionaryEntry = 'FacturasCliente_IVA'
-      end
-      item
-        Name = 'IMPORTE_IVA'
-        DataType = datCurrency
-        DictionaryEntry = 'FacturasCliente_IMPORTE_IVA'
-      end
-      item
-        Name = 'RE'
-        DataType = datFloat
-      end
-      item
-        Name = 'IMPORTE_RE'
-        DataType = datCurrency
-      end
-      item
-        Name = 'IMPORTE_TOTAL'
-        DataType = datCurrency
-        DictionaryEntry = 'FacturasCliente_IMPORTE_TOTAL'
-      end
-      item
-        Name = 'OBSERVACIONES'
-        DataType = datMemo
-        DictionaryEntry = 'FacturasCliente_OBSERVACIONES'
-      end
-      item
-        Name = 'NIF_CIF'
-        DataType = datString
-        Size = 15
-        DictionaryEntry = 'FacturasCliente_NIF_CIF'
-      end
-      item
-        Name = 'ID_PROVEEDOR'
-        DataType = datInteger
-      end
-      item
-        Name = 'NOMBRE'
-        DataType = datString
-        Size = 255
-        DictionaryEntry = 'FacturasCliente_NOMBRE'
-      end
-      item
-        Name = 'CALLE'
-        DataType = datString
-        Size = 255
-        DictionaryEntry = 'FacturasCliente_CALLE'
-      end
-      item
-        Name = 'PROVINCIA'
-        DataType = datString
-        Size = 255
-        DictionaryEntry = 'FacturasCliente_PROVINCIA'
-      end
-      item
-        Name = 'POBLACION'
-        DataType = datString
-        Size = 255
-        DictionaryEntry = 'FacturasCliente_POBLACION'
-      end
-      item
-        Name = 'CODIGO_POSTAL'
-        DataType = datString
-        Size = 10
-        DictionaryEntry = 'FacturasCliente_CODIGO_POSTAL'
-      end
-      item
-        Name = 'RECARGO_EQUIVALENCIA'
-        DataType = datSmallInt
-      end
-      item
-        Name = 'IMPORTE_NETO'
-        DataType = datCurrency
-      end
-      item
-        Name = 'IMPORTE_PORTE'
-        DataType = datCurrency
-      end
-      item
-        Name = 'FORMA_PAGO'
-        DataType = datString
-        Size = 255
-      end
-      item
-        Name = 'DATOS_BANCARIOS'
-        DataType = datString
-        Size = 255
-      end>
-    Params = <
-      item
-        Name = 'ID'
-        DataType = datInteger
-        Value = '1'
-        ParamType = daptInput
-      end>
-    LogChanges = False
-    StreamingOptions = [soDisableEventsWhileStreaming]
-    RemoteFetchEnabled = False
-    LocalSchema = schReport
-    LocalDataStreamer = Bin2DataStreamer
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
-    LogicalName = 'InformeFacturasProveedor'
-    IndexDefs = <>
-    Left = 264
-    Top = 128
-  end
   object frxCheckBoxObject1: TfrxCheckBoxObject
     Left = 296
     Top = 288
@@ -1774,38 +1232,6 @@ object RptFacturasProveedor: TRptFacturasProveedor
     Left = 153
     Top = 16
   end
-  object vencimientos: TIBQuery
-    Database = IBDatabase1
-    Transaction = IBTransaction1
-    SQL.Strings = (
-      'SELECT'
-      
-        '    V_RECIBOS_CLIENTE.FECHA_VENCIMIENTO, V_RECIBOS_CLIENTE.IMPOR' +
-        'TE_TOTAL'
-      'FROM V_RECIBOS_CLIENTE'
-      'WHERE V_RECIBOS_CLIENTE.ID_FACTURA = 2'
-      'ORDER BY V_RECIBOS_CLIENTE.FECHA_VENCIMIENTO')
-    Left = 136
-    Top = 408
-    object vencimientosFECHA_VENCIMIENTO: TDateField
-      FieldName = 'FECHA_VENCIMIENTO'
-      Origin = '"V_RECIBOS_CLIENTE"."FECHA_VENCIMIENTO"'
-    end
-    object vencimientosIMPORTE_TOTAL: TIBBCDField
-      FieldKind = fkInternalCalc
-      FieldName = 'IMPORTE_TOTAL'
-      Origin = '"V_RECIBOS_CLIENTE"."IMPORTE_TOTAL"'
-      ProviderFlags = []
-      ReadOnly = True
-      Precision = 18
-      Size = 2
-    end
-  end
-  object DataSource3: TDataSource
-    DataSet = vencimientos
-    Left = 216
-    Top = 408
-  end
   object frxPDFExport1: TfrxPDFExport
     ShowDialog = False
     UseFileCache = True
@@ -1905,7 +1331,7 @@ object RptFacturasProveedor: TRptFacturasProveedor
   end
   object frxDBInformeListadoFacturas: TfrxDBDataset
     UserName = 'frxDBInformeListadoFacturas'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSInformeListadoFacturas
     Left = 576
     Top = 16
@@ -2000,7 +1426,7 @@ object RptFacturasProveedor: TRptFacturasProveedor
   end
   object frxDBInformeListadoFacturasPendientes: TfrxDBDataset
     UserName = 'frxDBInformeListadoFacturasPendientes'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSInformeListadoFacturasPendientes
     Left = 768
     Top = 16
@@ -2013,14 +1439,14 @@ object RptFacturasProveedor: TRptFacturasProveedor
   end
   object frxDBInformeListadoFacturasPendResumen: TfrxDBDataset
     UserName = 'frxDBInformeListadoFacturasPendResumen'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSInformeListadoFacturasPendResumen
     Left = 768
     Top = 208
   end
   object frxDBInformeListadoFacturasResumen: TfrxDBDataset
     UserName = 'frxDBInformeListadoFacturasResumen'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSInformeListadoFacturasResumen
     Left = 576
     Top = 216
diff --git a/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.pas b/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.pas
index 965f995b..ad6ffa6a 100644
--- a/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.pas	
+++ b/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.pas	
@@ -13,19 +13,7 @@ uses
 
 type
   TRptFacturasProveedor = class(TDataModule)
-    frxDBCabecera: TfrxDBDataset;
-    frxDBDetalles: TfrxDBDataset;
     DataDictionary: TDADataDictionary;
-    IBDatabase1: TIBDatabase;
-    IBTransaction1: TIBTransaction;
-    DataSource1: TDataSource;
-    DataSource2: TDataSource;
-    cabecera: TIBQuery;
-    detalles: TIBQuery;
-    DADSCabecera: TDADataSource;
-    DADSDetalles: TDADataSource;
-    tbl_Detalles: TDAMemDataTable;
-    tbl_Cabecera: TDAMemDataTable;
     frxCheckBoxObject1: TfrxCheckBoxObject;
     frxChartObject1: TfrxChartObject;
     frxGradientObject1: TfrxGradientObject;
@@ -34,48 +22,6 @@ type
     frxBarCodeObject1: TfrxBarCodeObject;
     frxRichObject1: TfrxRichObject;
     frxReport: TfrxReport;
-    cabeceraID: TIntegerField;
-    cabeceraID_EMPRESA: TIntegerField;
-    cabeceraREFERENCIA: TIBStringField;
-    cabeceraTIPO: TIBStringField;
-    cabeceraFECHA_FACTURA: TDateField;
-    cabeceraBASE_IMPONIBLE: TIBBCDField;
-    cabeceraSITUACION: TIBStringField;
-    cabeceraDESCUENTO: TFloatField;
-    cabeceraIMPORTE_DESCUENTO: TIBBCDField;
-    cabeceraIVA: TFloatField;
-    cabeceraIMPORTE_IVA: TIBBCDField;
-    cabeceraRE: TFloatField;
-    cabeceraIMPORTE_RE: TIBBCDField;
-    cabeceraIMPORTE_TOTAL: TIBBCDField;
-    cabeceraOBSERVACIONES: TMemoField;
-    cabeceraNIF_CIF: TIBStringField;
-    cabeceraID_CLIENTE: TIntegerField;
-    cabeceraNOMBRE: TIBStringField;
-    cabeceraCALLE: TIBStringField;
-    cabeceraPROVINCIA: TIBStringField;
-    cabeceraPOBLACION: TIBStringField;
-    cabeceraCODIGO_POSTAL: TIBStringField;
-    cabeceraRECARGO_EQUIVALENCIA: TSmallintField;
-    cabeceraIMPORTE_NETO: TIBBCDField;
-    cabeceraIMPORTE_PORTE: TIBBCDField;
-    cabeceraFORMA_PAGO: TIBStringField;
-    detallesID: TIntegerField;
-    detallesID_FACTURA: TIntegerField;
-    detallesPOSICION: TIntegerField;
-    detallesTIPO_DETALLE: TIBStringField;
-    detallesCONCEPTO: TIBStringField;
-    detallesCANTIDAD: TIntegerField;
-    detallesIMPORTE_UNIDAD: TIBBCDField;
-    detallesDESCUENTO: TFloatField;
-    detallesIMPORTE_TOTAL: TIBBCDField;
-    detallesVISIBLE: TSmallintField;
-    detallesREFERENCIA: TIBStringField;
-    vencimientos: TIBQuery;
-    DataSource3: TDataSource;
-    cabeceraDATOS_BANCARIOS: TIBStringField;
-    vencimientosFECHA_VENCIMIENTO: TDateField;
-    vencimientosIMPORTE_TOTAL: TIBBCDField;
     frxPDFExport1: TfrxPDFExport;
     tbl_InformeListadoFacturas: TDAMemDataTable;
     DADSInformeListadoFacturas: TDADataSource;
@@ -145,9 +91,6 @@ begin
   FConnection := dmServer.DarNuevaConexion;
   frxReport.EngineOptions.NewSilentMode := simReThrow;
 
-  frxDBCabecera.DataSource := DADSCabecera;
-  frxDBDetalles.DataSource := DADSDetalles;
-
   FListaNombresProveedores := TStringList.Create;  
 end;
 
diff --git a/Source/Modulos/Obras/Servidor/srvObras_Impl.dfm b/Source/Modulos/Obras/Servidor/srvObras_Impl.dfm
index 6dbad51c..8e6f64b1 100644
--- a/Source/Modulos/Obras/Servidor/srvObras_Impl.dfm
+++ b/Source/Modulos/Obras/Servidor/srvObras_Impl.dfm
@@ -1,37 +1,13 @@
 object srvObras: TsrvObras
   OldCreateOrder = True
   OnCreate = DARemoteServiceCreate
-  OnDestroy = DataAbstractServiceDestroy
   RequiresSession = True
   SessionManager = dmServer.SessionManager
-  OnActivate = DataAbstractServiceActivate
-  OnDeactivate = DataAbstractServiceDeactivate
   ConnectionName = 'IBX'
   ServiceSchema = schObras
   ServiceDataStreamer = Bin2DataStreamer
   AllowWhereSQL = True
   ExportedDataTables = <>
-  AfterAcquireConnection = DataAbstractServiceAfterAcquireConnection
-  BeforeReleaseConnection = DataAbstractServiceBeforeReleaseConnection
-  AfterReleaseConnection = DataAbstractServiceAfterReleaseConnection
-  OnAcquireConnectionFailure = DataAbstractServiceAcquireConnectionFailure
-  BeforeProcessDeltas = DataAbstractServiceBeforeProcessDeltas
-  AfterProcessDeltas = DataAbstractServiceAfterProcessDeltas
-  OnProcessDeltasError = DataAbstractServiceProcessDeltasError
-  BeforeGetDatasetSchema = DataAbstractServiceBeforeGetDatasetSchema
-  BeforeGetDatasetData = DataAbstractServiceBeforeGetDatasetData
-  AfterGetDatasetSchema = DataAbstractServiceAfterGetDatasetSchema
-  AfterGetDatasetData = DataAbstractServiceAfterGetDatasetData
-  OnBusinessProcessorAutoCreated = DataAbstractServiceBusinessProcessorAutoCreated
-  BeforeExecuteCommand = DataAbstractServiceBeforeExecuteCommand
-  AfterExecuteCommand = DataAbstractServiceAfterExecuteCommand
-  OnGetSchemaAsXMLEvent = DataAbstractServiceGetSchemaAsXMLEvent
-  ValidateDatasetAccess = DataAbstractServiceValidateDatasetAccess
-  ValidateCommandExecution = DataAbstractServiceValidateCommandExecution
-  ValidateDirectSQLAccess = DataAbstractServiceValidateDirectSQLAccess
-  OnUpdateDataBeginTransaction = DataAbstractServiceUpdateDataBeginTransaction
-  OnUpdateDataCommitTransaction = DataAbstractServiceUpdateDataCommitTransaction
-  OnUpdateDataRollBackTransaction = DataAbstractServiceUpdateDataRollBackTransaction
   Height = 220
   Width = 370
   object Diagrams: TDADiagrams
diff --git a/Source/Modulos/Obras/Servidor/srvObras_Impl.pas b/Source/Modulos/Obras/Servidor/srvObras_Impl.pas
index c293a2b2..c89b58e5 100644
--- a/Source/Modulos/Obras/Servidor/srvObras_Impl.pas
+++ b/Source/Modulos/Obras/Servidor/srvObras_Impl.pas
@@ -29,75 +29,11 @@ type
     bpObrasEjecucionesPedidosProv: TDABusinessProcessor;
     schObras: TDASchema;
     DataDictionary: TDADataDictionary;
-    procedure DataAbstractServiceAfterAcquireConnection(aSender: TObject;
-      const aConnectionName: string;
-      const aAcquiredConnection: IDAConnection);
-    procedure DataAbstractServiceAfterExecuteCommand(aSender: TObject;
-      const aCommand: IDASQLCommand; aRowsAffacted: Integer);
-    procedure DataAbstractServiceAfterGetDatasetSchema(aSender: TObject;
-      const aDataset: IDADataset);
-    procedure DataAbstractServiceAfterProcessDeltas(aSender: TObject;
-      aDeltaStructs: TDADeltaStructList);
-    procedure DataAbstractServiceAfterReleaseConnection(aSender: TObject;
-      const aConnectionName: string);
-    procedure DataAbstractServiceBeforeExecuteCommand(aSender: TObject;
-      const aCommand: IDASQLCommand);
-    procedure DataAbstractServiceBeforeGetDatasetData(aSender: TObject;
-      const aDataset: IDADataset; const aIncludeSchema: Boolean;
-      const aMaxRecords: Integer);
-    procedure DataAbstractServiceBeforeGetDatasetSchema(aSender: TObject;
-      const aDataset: IDADataset);
-    procedure DataAbstractServiceBeforeProcessDeltas(aSender: TObject;
-      aDeltaStructs: TDADeltaStructList);
-    procedure DataAbstractServiceBeforeReleaseConnection(aSender: TObject;
-      const aConnectionName: string;
-      const aAcquiredConnection: IDAConnection);
-    procedure DataAbstractServiceGetSchemaAsXMLEvent(aSender: TObject;
-      var aSchemaXML: string);
-    procedure DataAbstractServiceProcessDeltasError(aSender: TObject;
-      aDeltaStructs: TDADeltaStructList; aError: Exception;
-      var aDoRaise: Boolean);
-    procedure DataAbstractServiceUpdateDataBeginTransaction(
-      Sender: TObject; var aUseDefaultTransactionLogic: Boolean);
-    procedure DataAbstractServiceUpdateDataCommitTransaction(
-      Sender: TObject; var aUseDefaultTransactionLogic: Boolean);
-    procedure DataAbstractServiceUpdateDataRollBackTransaction(
-      Sender: TObject; var aUseDefaultTransactionLogic: Boolean);
-    procedure DataAbstractServiceValidateCommandExecution(Sender: TObject;
-      const aConnection: IDAConnection; const aDatasetName: string;
-      const aParamNames: array of string;
-      const aParamValues: array of Variant; aSchema: TDASchema;
-      var Allowed: Boolean);
-    procedure DataAbstractServiceValidateDatasetAccess(Sender: TObject;
-      const aConnection: IDAConnection; const aDatasetName: string;
-      const aParamNames: array of string;
-      const aParamValues: array of Variant; aSchema: TDASchema;
-      var Allowed: Boolean);
-    procedure DataAbstractServiceValidateDirectSQLAccess(Sender: TObject;
-      const aConnection: IDAConnection; const aSQLText: string;
-      const aParamNames: array of string;
-      const aParamValues: array of Variant; var Allowed: Boolean);
-    procedure DataAbstractServiceAcquireConnectionFailure(aSender: TObject;
-      const aConnectionName: string; aError: Exception);
-    procedure DataAbstractServiceDestroy(Sender: TObject);
-    procedure DataAbstractServiceActivate(const aClientID: TGUID;
-      aSession: TROSession; const aMessage: IROMessage);
-    procedure DataAbstractServiceDeactivate(const aClientID: TGUID;
-      aSession: TROSession);
-    procedure DataAbstractServiceBusinessProcessorAutoCreated(
-      aSender: TRORemoteDataModule;
-      BusinessProcessor: TDABusinessProcessor);
-
     procedure DataAbstractServiceBeforeAcquireConnection(aSender: TObject;
       var aConnectionName: string);
     procedure DARemoteServiceAfterGetDatasetData(const Dataset: IDADataset;
       const IncludeSchema: Boolean; const MaxRecords: Integer);
     procedure DARemoteServiceCreate(Sender: TObject);
-    procedure DataAbstractServiceAfterGetDatasetData(aSender: TObject;
-      const aDataset: IDADataset; const aIncludeSchema: Boolean;
-      const aMaxRecords: Integer);
-  private
-    procedure Log(Astr: string);
   protected
     function DarListaObras(const IDEmpresa: Integer): Binary;
   end;
@@ -131,10 +67,6 @@ end;
 
 procedure TsrvObras.DARemoteServiceCreate(Sender: TObject);
 begin
-//  Log('***Create***');
-//  Log('************');
-//  Log('');
-
   SessionManager := dmServer.SessionManager;
   bpObras.BusinessRulesID := BIZ_SERVER_OBRA;
 end;
@@ -144,267 +76,9 @@ procedure TsrvObras.DataAbstractServiceBeforeAcquireConnection(
 begin
   inherited;
   ConnectionName := dmServer.ConnectionName;
-
-//  Log('***BeforeAcquireConnection***');
-//  Log('aConnectionName:'#9 + aConnectionName);
-//  Log('************************');
-//  Log('');
 end;
 
 
-procedure TsrvObras.DataAbstractServiceAfterAcquireConnection(
-  aSender: TObject; const aConnectionName: string;
-  const aAcquiredConnection: IDAConnection);
-begin
-  inherited;
-//  Log('***AfterAcquireConnection***');
-//  Log('ConnectionName:'#9 + aConnectionName);
-//  Log('aAcquiredConnection.Name:'#9 + aAcquiredConnection.Name);
-//  Log('aAcquiredConnection.ConnectionString:'#9 + aAcquiredConnection.ConnectionString);
-//  Log('****************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceAfterExecuteCommand(
-  aSender: TObject; const aCommand: IDASQLCommand; aRowsAffacted: Integer);
-begin
-  inherited;
-//  Log('***AfterExecuteCommand***');
-//  Log('aCommand.Name:'#9 + aCommand.Name);
-//  Log('aCommand.SQL:'#9 + aCommand.SQL);
-//  Log('aRowsAffacted:'#9 + IntToStr(aRowsAffacted));
-//  Log('*************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceAfterGetDatasetData(
-  aSender: TObject; const aDataset: IDADataset;
-  const aIncludeSchema: Boolean; const aMaxRecords: Integer);
-begin
-  inherited;
-//  Log('***AfterGetDatasetData***');
-//  Log('aDataset.Name:'#9 + aDataset.Name);
-//  Log('aDataset.SQL:'#9 + aDataset.SQL);
-//  Log('aIncludeSchema:'#9 + BoolStr[aIncludeSchema]);
-//  Log('aMaxRecords:'#9 + IntToStr(aMaxRecords));
-//  Log('*************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceAfterGetDatasetSchema(
-  aSender: TObject; const aDataset: IDADataset);
-begin
-  inherited;
-//  Log('***AfterGetDatasetSchema***');
-//  Log('aDataset.Name:'#9 + aDataset.Name);
-//  Log('aDataset.SQL:'#9 + aDataset.SQL);
-//  Log('***************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceAfterProcessDeltas(
-  aSender: TObject; aDeltaStructs: TDADeltaStructList);
-begin
-  inherited;
-//  Log('***AfterProcessDeltas***');
-//  Log('aDeltaStructs.Count:'#9 + IntToStr(aDeltaStructs.Count));
-//  Log('************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceAfterReleaseConnection(
-  aSender: TObject; const aConnectionName: string);
-begin
-  inherited;
-//  Log('***AfterReleaseConnection***');
-//  Log('aConnectionName:'#9 + aConnectionName);
-//  Log('****************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceBeforeExecuteCommand(
-  aSender: TObject; const aCommand: IDASQLCommand);
-begin
-  inherited;
-//  Log('***BeforeExecuteCommand***');
-//  Log('aCommand.Name:'#9 + aCommand.Name);
-//  Log('aCommand.SQL:'#9 + aCommand.SQL);
-//  Log('************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceBeforeGetDatasetData(
-  aSender: TObject; const aDataset: IDADataset;
-  const aIncludeSchema: Boolean; const aMaxRecords: Integer);
-begin
-  inherited;
-//  Log('***BeforeGetDatasetData***');
-//  Log('aDataset.Name:'#9 + aDataset.Name);
-//  Log('aDataset.SQL:'#9 + aDataset.SQL);
-//  Log('aIncludeSchema:'#9 + BoolStr[aIncludeSchema]);
-//  Log('aMaxRecords:'#9 + IntToStr(aMaxRecords));
-//  Log('*************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceBeforeGetDatasetSchema(
-  aSender: TObject; const aDataset: IDADataset);
-begin
-  inherited;
-//  Log('***BeforeGetDatasetSchema***');
-//  Log('aDataset.Name:'#9 + aDataset.Name);
-//  Log('aDataset.SQL:'#9 + aDataset.SQL);
-//  Log('****************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceBeforeProcessDeltas(
-  aSender: TObject; aDeltaStructs: TDADeltaStructList);
-begin
-  inherited;
-//  Log('***BeforeProcessDeltas***');
-//  Log('aDeltaStructs.Count:'#9 + IntToStr(aDeltaStructs.Count));
-//  Log('*************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceBeforeReleaseConnection(
-  aSender: TObject; const aConnectionName: string;
-  const aAcquiredConnection: IDAConnection);
-begin
-  inherited;
-//  Log('***BeforeReleaseConnection***');
-//  Log('aConnectionName:'#9 + aConnectionName);
-//  Log('aAcquiredConnection.Name:'#9 + aAcquiredConnection.Name);
-//  Log('aAcquiredConnection.ConnectionString:'#9 + aAcquiredConnection.ConnectionString);
-//  Log('*****************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceGetSchemaAsXMLEvent(
-  aSender: TObject; var aSchemaXML: string);
-begin
-  inherited;
-//  Log('***GetSchemaAsXMLEvent***');
-//  Log('Length(aSchemaXML):'#9 + intTostr(Length(aSchemaXML)));
-//  Log('*************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceProcessDeltasError(
-  aSender: TObject; aDeltaStructs: TDADeltaStructList; aError: Exception;
-  var aDoRaise: Boolean);
-begin
-  inherited;
-//  Log('***ProcessDeltasError***');
-//  Log('aDeltaStructs.Count:'#9 + IntToStr(aDeltaStructs.Count));
-//  Log('aError.ClassName:'#9 + aError.ClassName);
-//  Log('aError.Message:'#9 + aError.Message);
-//  Log('aDoRaise:'#9 + BoolStr[aDoRaise]);
-//  Log('*************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceUpdateDataBeginTransaction(
-  Sender: TObject; var aUseDefaultTransactionLogic: Boolean);
-begin
-  inherited;
-//  Log('***UpdateDataBeginTransaction***');
-//  Log('aUseDefaultTransactionLogic:'#9 + BoolStr[aUseDefaultTransactionLogic]);
-//  Log('********************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceUpdateDataCommitTransaction(
-  Sender: TObject; var aUseDefaultTransactionLogic: Boolean);
-begin
-  inherited;
-//  Log('***UpdateDataCommitTransaction***');
-//  Log('aUseDefaultTransactionLogic:'#9 + BoolStr[aUseDefaultTransactionLogic]);
-//  Log('*********************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceUpdateDataRollBackTransaction(
-  Sender: TObject; var aUseDefaultTransactionLogic: Boolean);
-begin
-  inherited;
-//  Log('***UpdateDataRollBackTransaction***');
-//  Log('aUseDefaultTransactionLogic:'#9 + BoolStr[aUseDefaultTransactionLogic]);
-//  Log('***********************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceValidateCommandExecution(
-  Sender: TObject; const aConnection: IDAConnection;
-  const aDatasetName: string; const aParamNames: array of string;
-  const aParamValues: array of Variant; aSchema: TDASchema;
-  var Allowed: Boolean);
-var
-  i: integer;
-  SQLCommand: TDASQLCommand;
-begin
-  inherited;
-//  Log('***ValidateCommandExecution***');
-//  Log('aConnection.Name:'#9 + aConnection.Name);
-//  Log('aDatasetName:'#9 + aDatasetName);
-//  SQLCommand := aSchema.Commands.SQLCommandByName(aDatasetName);
-//  if (SQLCommand <> nil) and (SQLCommand.Statements.Count > 0) then
-//    Log('Command SQL:'#9 + SQLCommand.Statements[0].SQL);
-//  Log('ParamCount:'#9 + intToStr(1 + ord(High(aParamNames)) - ord(Low(aParamNames))));
-//  for i := Low(aParamNames) to High(aParamNames) do
-//    Log(#9 + aParamNames[i] + ' = ' + VarToStr(aParamValues[i]));
-//  Log('aSchema.Name:'#9 + aSchema.Name);
-//  Log('Allowed:'#9 + BoolStr[Allowed]);
-//  Log('******************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceValidateDatasetAccess(
-  Sender: TObject; const aConnection: IDAConnection;
-  const aDatasetName: string; const aParamNames: array of string;
-  const aParamValues: array of Variant; aSchema: TDASchema;
-  var Allowed: Boolean);
-var
-  i: integer;
-begin
-  inherited;
-//  Log('***ValidateDatasetAccess***');
-//  Log('aConnection.Name:'#9 + aConnection.Name);
-//  Log('aDatasetName:'#9 + aDatasetName);
-//  Log('ParamCount:'#9 + intToStr(1 + ord(High(aParamNames)) - ord(Low(aParamNames))));
-//  for i := Low(aParamNames) to High(aParamNames) do
-//    Log(#9 + aParamNames[i] + ' = ' + VarToStr(aParamValues[i]));
-//  Log('aSchema.Name:'#9 + aSchema.Name);
-//  Log('Allowed:'#9 + BoolStr[Allowed]);
-//  Log('***************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceValidateDirectSQLAccess(
-  Sender: TObject; const aConnection: IDAConnection;
-  const aSQLText: string; const aParamNames: array of string;
-  const aParamValues: array of Variant; var Allowed: Boolean);
-var
-  i: integer;
-begin
-  inherited;
-//  Log('***ValidateDirectSQLAccess***');
-//  Log('aConnection.Name:'#9 + aConnection.Name);
-//  Log('aSQLText:'#9 + aSQLText);
-//  Log('ParamCount:'#9 + intToStr(1 + ord(High(aParamNames)) - ord(Low(aParamNames))));
-//  for i := Low(aParamNames) to High(aParamNames) do
-//    Log(#9 + aParamNames[i] + ' = ' + VarToStr(aParamValues[i]));
-//  Log('Allowed:'#9 + BoolStr[Allowed]);
-//  Log('***************************');
-//  Log('');
-end;
-
-procedure TsrvObras.Log(Astr: string);
-begin
-  dmServer.EscribirLog(Astr)
-end;
-
 function TsrvObras.DarListaObras(const IDEmpresa: Integer): Binary;
 var
   ASchema : TDASchema;
@@ -441,56 +115,6 @@ begin
   end;
 end;
 
-procedure TsrvObras.DataAbstractServiceAcquireConnectionFailure(
-  aSender: TObject; const aConnectionName: string; aError: Exception);
-begin
-  inherited;
-//  Log('***AcquireConnectionFailure***');
-//  Log('aConnectionName:'#9 + aConnectionName);
-//  Log('aError.ClassName:'#9 + aError.ClassName);
-//  Log('aError.Message:'#9 + aError.Message);
-//  Log('******************************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceDestroy(
-  Sender: TObject);
-begin
-//  Log('***Destroy***');
-//  Log('*************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceActivate(
-  const aClientID: TGUID; aSession: TROSession;
-  const aMessage: IROMessage);
-begin
-//  Log('***Activate***');
-//  Log('aClientID:'#9 + GUIDToString(aClientID));
-//  //  Log('aSession:'#9 + aSession.ClassName);
-//  //  Log('aError.Message:'#9 + aError.Message);
-//  Log('**************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceDeactivate(
-  const aClientID: TGUID; aSession: TROSession);
-begin
-//  Log('***Deactivate***');
-//  Log('aClientID:'#9 + GUIDToString(aClientID));
-//  Log('****************');
-//  Log('');
-end;
-
-procedure TsrvObras.DataAbstractServiceBusinessProcessorAutoCreated(
-  aSender: TRORemoteDataModule; BusinessProcessor: TDABusinessProcessor);
-begin
-//  Log('***BusinessProcessorAutoCreated***');
-//  Log('****************');
-//  Log('');
-end;
-
-
 initialization
   TROClassFactory.Create('srvObras', Create_srvObras, TsrvObras_Invoker);
 
diff --git a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm
index 24e33fb0..9510b9a1 100644
--- a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm	
@@ -1040,7 +1040,7 @@ object RptPedidosProveedor: TRptPedidosProveedor
   end
   object frxDBInformeListadoPedidos: TfrxDBDataset
     UserName = 'frxDBInformeListadoPedidos'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSInformeListadoPedidos
     Left = 600
     Top = 24
@@ -1117,7 +1117,7 @@ object RptPedidosProveedor: TRptPedidosProveedor
   end
   object frxDBInformeListadoPedidosResumen: TfrxDBDataset
     UserName = 'frxDBInformeListadoPedidosResumen'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSInformeListadoPedidosResumen
     Left = 600
     Top = 208
diff --git a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.pas b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.pas
index eee4960b..51745a30 100644
--- a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.pas	
@@ -133,11 +133,17 @@ begin
   FListaNombresProveedores := TStringList.Create;
 
   frxDBCabecera.DataSource := DADSCabecera;
+  frxDBCabecera.CloseDataSource := False;
+
   frxDBDetalles.DataSource := DADSDetalles;
+  frxDBDetalles.CloseDataSource := False;
 end;
 
 procedure TRptPedidosProveedor.DataModuleDestroy(Sender: TObject);
 begin
+  tbl_Cabecera.Active := False;
+  tbl_Detalles.Active := False;
+
   FreeANDNIL(FListaNombresProveedores);
 end;
 
diff --git a/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.dfm b/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.dfm
index 891a949c..dfd8944d 100644
--- a/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.dfm	
+++ b/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.dfm	
@@ -930,14 +930,14 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
   end
   object frxDBCabecera: TfrxDBDataset
     UserName = 'frxDBCabecera'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSCabecera
     Left = 264
     Top = 16
   end
   object frxDBDetalles: TfrxDBDataset
     UserName = 'frxDBDetalles'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSDetalles
     Left = 440
     Top = 16
@@ -1084,98 +1084,6 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
     Left = 264
     Top = 128
   end
-  object tbl_Detalles: TDAMemDataTable
-    RemoteUpdatesOptions = []
-    Fields = <
-      item
-        Name = 'ID'
-        DataType = datInteger
-        InPrimaryKey = True
-      end
-      item
-        Name = 'ID_PRESUPUESTO'
-        DataType = datInteger
-      end
-      item
-        Name = 'POSICION'
-        DataType = datInteger
-      end
-      item
-        Name = 'TIPO_DETALLE'
-        DataType = datString
-        Size = 25
-      end
-      item
-        Name = 'ID_CAPITULO'
-        DataType = datInteger
-      end
-      item
-        Name = 'ID_ARTICULO'
-        DataType = datInteger
-      end
-      item
-        Name = 'REFERENCIA'
-        DataType = datString
-        Size = 255
-      end
-      item
-        Name = 'CONCEPTO'
-        DataType = datString
-        Size = 2000
-      end
-      item
-        Name = 'CANTIDAD'
-        DataType = datFloat
-      end
-      item
-        Name = 'UNIDAD_MEDIDA'
-        DataType = datString
-        Size = 255
-      end
-      item
-        Name = 'IMPORTE_UNIDAD'
-        DataType = datCurrency
-      end
-      item
-        Name = 'DESCUENTO'
-        DataType = datFloat
-      end
-      item
-        Name = 'IMPORTE_PORTE'
-        DataType = datCurrency
-      end
-      item
-        Name = 'IMPORTE_TOTAL'
-        DataType = datCurrency
-      end
-      item
-        Name = 'VISIBLE'
-        DataType = datSmallInt
-      end>
-    Params = <
-      item
-        Name = 'ID_PRESUPUESTO'
-        Value = '32'
-        ParamType = daptInput
-      end>
-    MasterMappingMode = mmWhere
-    MasterParamsMappings.Strings = (
-      'ID_PRESUPUESTO=ID_PRESUPUESTO')
-    LogChanges = False
-    StreamingOptions = [soDisableEventsWhileStreaming]
-    RemoteFetchEnabled = False
-    LocalSchema = schReport
-    LocalDataStreamer = DABin2DataStreamer1
-    MasterSource = DADSCapitulos
-    MasterFields = 'ID'
-    DetailFields = 'ID_CAPITULO'
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
-    LogicalName = 'Informe_Capitulos_Detalles'
-    IndexDefs = <>
-    Left = 440
-    Top = 128
-  end
   object IBDatabase1: TIBDatabase
     DatabaseName = 'C:\Codigo Tecsitel\Output\Debug\Database\FACTUGES_PRODUCCION.FDB'
     Params.Strings = (
@@ -1277,14 +1185,14 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
   end
   object frxDBCapitulos: TfrxDBDataset
     UserName = 'frxDBCapitulos'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSCapitulos
     Left = 352
     Top = 16
   end
   object frxDBResumen: TfrxDBDataset
     UserName = 'frxDBResumen'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSResumen
     Left = 520
     Top = 16
@@ -1519,7 +1427,7 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
     LocalSchema = schReport
     LocalDataStreamer = DABin2DataStreamer1
     DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
+    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates, moAllInOneFetch]
     LogicalName = 'Informe_Capitulos'
     IndexDefs = <>
     Left = 352
@@ -1585,32 +1493,6 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
     Left = 520
     Top = 128
   end
-  object DAMemDataTable1: TDAMemDataTable
-    RemoteUpdatesOptions = []
-    Fields = <>
-    Params = <>
-    StreamingOptions = [soDisableEventsWhileStreaming]
-    RemoteFetchEnabled = False
-    ReadOnly = True
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
-    IndexDefs = <>
-    Left = 264
-    Top = 192
-  end
-  object DAMemDataTable2: TDAMemDataTable
-    RemoteUpdatesOptions = []
-    Fields = <>
-    Params = <>
-    StreamingOptions = [soDisableEventsWhileStreaming]
-    RemoteFetchEnabled = False
-    ReadOnly = True
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
-    IndexDefs = <>
-    Left = 360
-    Top = 192
-  end
   object frxPDFExport1: TfrxPDFExport
     ShowDialog = False
     UseFileCache = True
@@ -1739,4 +1621,96 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
     Left = 680
     Top = 304
   end
+  object tbl_Detalles: TDAMemDataTable
+    RemoteUpdatesOptions = []
+    Fields = <
+      item
+        Name = 'ID'
+        DataType = datInteger
+        InPrimaryKey = True
+      end
+      item
+        Name = 'ID_PRESUPUESTO'
+        DataType = datInteger
+      end
+      item
+        Name = 'POSICION'
+        DataType = datInteger
+      end
+      item
+        Name = 'TIPO_DETALLE'
+        DataType = datString
+        Size = 25
+      end
+      item
+        Name = 'ID_CAPITULO'
+        DataType = datInteger
+      end
+      item
+        Name = 'ID_ARTICULO'
+        DataType = datInteger
+      end
+      item
+        Name = 'REFERENCIA'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'CONCEPTO'
+        DataType = datString
+        Size = 2000
+      end
+      item
+        Name = 'CANTIDAD'
+        DataType = datFloat
+      end
+      item
+        Name = 'UNIDAD_MEDIDA'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'IMPORTE_UNIDAD'
+        DataType = datCurrency
+      end
+      item
+        Name = 'DESCUENTO'
+        DataType = datFloat
+      end
+      item
+        Name = 'IMPORTE_PORTE'
+        DataType = datCurrency
+      end
+      item
+        Name = 'IMPORTE_TOTAL'
+        DataType = datCurrency
+      end
+      item
+        Name = 'VISIBLE'
+        DataType = datSmallInt
+      end>
+    Params = <
+      item
+        Name = 'ID_PRESUPUESTO'
+        Value = '32'
+        ParamType = daptInput
+      end>
+    MasterMappingMode = mmWhere
+    MasterParamsMappings.Strings = (
+      'ID_PRESUPUESTO=ID')
+    LogChanges = False
+    StreamingOptions = [soDisableEventsWhileStreaming]
+    RemoteFetchEnabled = False
+    LocalSchema = schReport
+    LocalDataStreamer = DABin2DataStreamer1
+    MasterSource = DADSCapitulos
+    MasterFields = 'ID'
+    DetailFields = 'ID_CAPITULO'
+    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
+    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates, moAllInOneFetch]
+    LogicalName = 'Informe_Capitulos_Detalles'
+    IndexDefs = <>
+    Left = 440
+    Top = 128
+  end
 end
diff --git a/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.pas b/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.pas
index b93aacbf..0b161237 100644
--- a/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.pas	
+++ b/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.pas	
@@ -22,7 +22,6 @@ type
     frxDBCabecera: TfrxDBDataset;
     frxDBDetalles: TfrxDBDataset;
     tbl_Cabecera: TDAMemDataTable;
-    tbl_Detalles: TDAMemDataTable;
     frxReport: TfrxReport;
     IBDatabase1: TIBDatabase;
     IBTransaction1: TIBTransaction;
@@ -73,8 +72,6 @@ type
     tbl_Capitulos: TDAMemDataTable;
     DADSResumen: TDADataSource;
     tbl_Resumen: TDAMemDataTable;
-    DAMemDataTable1: TDAMemDataTable;
-    DAMemDataTable2: TDAMemDataTable;
     frxPDFExport1: TfrxPDFExport;
     DADSInformeListadoPresupuestos: TDADataSource;
     tbl_InformeListadoPresupuestos: TDAMemDataTable;
@@ -84,6 +81,7 @@ type
     tbl_InformeListadoPresupuestosResumen: TDAMemDataTable;
     schReport: TDASchema;
     DataDictionary: TDADataDictionary;
+    tbl_Detalles: TDAMemDataTable;
     procedure DataModuleCreate(Sender: TObject);
     procedure DataModuleDestroy(Sender: TObject);
   private
@@ -135,9 +133,16 @@ begin
   frxReport.EngineOptions.NewSilentMode := simReThrow;
 
   frxDBCabecera.DataSource := DADSCabecera;
+  frxDBCabecera.CloseDataSource := False;
+
   frxDBCapitulos.DataSource := DADSCapitulos;
+  frxDBCapitulos.CloseDataSource := False;
+
   frxDBDetalles.DataSource := DADSDetalles;
+  frxDBDetalles.CloseDataSource := False;
+
   frxDBResumen.DataSource := DADSResumen;
+  frxDBResumen.CloseDataSource := False;
 
   FListaNombresClientes := TStringList.Create;
 
@@ -146,6 +151,7 @@ begin
     MasterSource := DADSCapitulos;
     MasterFields := 'ID';
     DetailFields := 'ID_CAPITULO';
+    MasterMappingMode := mmWhere;
   end;
 end;
 
@@ -405,6 +411,11 @@ end;
 
 procedure TRptPresupuestosCliente.DataModuleDestroy(Sender: TObject);
 begin
+  tbl_Cabecera.Active := False;
+  tbl_Capitulos.Active := False;
+  tbl_Detalles.Active := False;
+  tbl_Resumen.Active := False;
+
   FreeANDNIL(FListaNombresClientes);
 end;
 
@@ -516,6 +527,9 @@ begin
     tbl_Detalles.ParamByName('ID_PRESUPUESTO').AsInteger := AID;
     tbl_Resumen.ParamByName('ID_PRESUPUESTO').AsInteger := AID;
 
+    // Se asignan los parametros en este orden para que funcionen
+    // dentro de las relaciones maestro-detalle (capítulos y conceptos).
+
     tbl_Cabecera.Active := True;
     tbl_Capitulos.Active := True;
     tbl_Detalles.Active := True;
diff --git a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm
index 6efb3b58..d0144255 100644
--- a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm	
+++ b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm	
@@ -1252,7 +1252,7 @@ object RptRecibosCliente: TRptRecibosCliente
   end
   object frxDBCompensados: TfrxDBDataset
     UserName = 'frxDBCompensados'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADataCompensados
     Left = 360
     Top = 16
@@ -1366,7 +1366,7 @@ object RptRecibosCliente: TRptRecibosCliente
   end
   object frxDBInformeListadoRecibos: TfrxDBDataset
     UserName = 'frxDBInformeListadoRecibos'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSInformeListadoRecibos
     Left = 496
     Top = 16
@@ -1377,7 +1377,7 @@ object RptRecibosCliente: TRptRecibosCliente
   end
   object frxDBInformeListadoRecibosResumen: TfrxDBDataset
     UserName = 'frxDBInformeListadoRecibosResumen'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSInformeListadoRecibosResumen
     Left = 504
     Top = 192
@@ -1404,7 +1404,7 @@ object RptRecibosCliente: TRptRecibosCliente
   end
   object frxDBInformeListadoRecibosPendientes: TfrxDBDataset
     UserName = 'frxDBInformeListadoRecibosPendientes'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSInformeListadoRecibosPendientes
     Left = 704
     Top = 16
@@ -1491,7 +1491,7 @@ object RptRecibosCliente: TRptRecibosCliente
   end
   object frxDBInformeListadoRecibosPendResumen: TfrxDBDataset
     UserName = 'frxDBInformeListadoRecibosPendResumen'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSInformeListadoRecibosPendResumen
     Left = 704
     Top = 192
diff --git a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.pas b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.pas
index 7fed244d..e4455689 100644
--- a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.pas	
+++ b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.pas	
@@ -104,7 +104,10 @@ begin
   FListaNombresClientes := TStringList.Create;
 
   frxDBCabecera.DataSource := DADataCabecera;
+  frxDBCabecera.CloseDataSource := False;
+
   frxDBCompensados.DataSource := DADataCompensados;
+  frxDBCompensados.CloseDataSource := False;
 end;
 
 function TRptRecibosCliente.GenerarRecibo(const ListaID: TIntegerArray): Binary;
@@ -394,6 +397,9 @@ end;
 
 procedure TRptRecibosCliente.DataModuleDestroy(Sender: TObject);
 begin
+  tbl_Cabecera.Active := False;
+  tbl_Compensados.Active := False;
+
   FreeANDNIL(FListaNombresClientes);
 end;
 
diff --git a/Source/Modulos/Recibos de proveedor/Reports/uRptRecibosProveedor_Server.dfm b/Source/Modulos/Recibos de proveedor/Reports/uRptRecibosProveedor_Server.dfm
index 3d15945f..052c3152 100644
--- a/Source/Modulos/Recibos de proveedor/Reports/uRptRecibosProveedor_Server.dfm	
+++ b/Source/Modulos/Recibos de proveedor/Reports/uRptRecibosProveedor_Server.dfm	
@@ -1191,7 +1191,7 @@ object RptRecibosProveedor: TRptRecibosProveedor
   end
   object frxDBCompensados: TfrxDBDataset
     UserName = 'frxDBCompensados'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADataCompensados
     Left = 360
     Top = 16
@@ -1305,7 +1305,7 @@ object RptRecibosProveedor: TRptRecibosProveedor
   end
   object frxDBInformeListadoRecibos: TfrxDBDataset
     UserName = 'frxDBInformeListadoRecibos'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSInformeListadoRecibos
     Left = 496
     Top = 16
@@ -1332,7 +1332,7 @@ object RptRecibosProveedor: TRptRecibosProveedor
   end
   object frxDBInformeListadoRecibosResumen: TfrxDBDataset
     UserName = 'frxDBInformeListadoRecibosResumen'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSInformeListadoRecibosResumen
     Left = 504
     Top = 192
@@ -1343,7 +1343,7 @@ object RptRecibosProveedor: TRptRecibosProveedor
   end
   object frxDBInformeListadoRecibosPendientes: TfrxDBDataset
     UserName = 'frxDBInformeListadoRecibosPendientes'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSInformeListadoRecibosPendientes
     Left = 704
     Top = 16
@@ -1430,7 +1430,7 @@ object RptRecibosProveedor: TRptRecibosProveedor
   end
   object frxDBInformeListadoRecibosPendResumen: TfrxDBDataset
     UserName = 'frxDBInformeListadoRecibosPendResumen'
-    CloseDataSource = True
+    CloseDataSource = False
     DataSource = DADSInformeListadoRecibosPendResumen
     Left = 704
     Top = 192
diff --git a/Source/Modulos/Recibos de proveedor/Reports/uRptRecibosProveedor_Server.pas b/Source/Modulos/Recibos de proveedor/Reports/uRptRecibosProveedor_Server.pas
index 4058db5d..684ee0c1 100644
--- a/Source/Modulos/Recibos de proveedor/Reports/uRptRecibosProveedor_Server.pas	
+++ b/Source/Modulos/Recibos de proveedor/Reports/uRptRecibosProveedor_Server.pas	
@@ -98,11 +98,17 @@ begin
   FListaNombresProveedores := TStringList.Create;
   
   frxDBCabecera.DataSource := DADataCabecera;
+  frxDBCabecera.CloseDataSource := False;
+
   frxDBCompensados.DataSource := DADataCompensados;
+  frxDBCompensados.CloseDataSource := False;
 end;
 
 procedure TRptRecibosProveedor.DataModuleDestroy(Sender: TObject);
 begin
+  tbl_Cabecera.Active := False;
+  tbl_Compensados.Active := False;
+
   FreeANDNIL(FListaNombresProveedores);
 end;
 
diff --git a/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.dfm b/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.dfm
index 473219d0..8f55673a 100644
--- a/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.dfm	
+++ b/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.dfm	
@@ -1,6 +1,7 @@
 object RptRemesasCliente: TRptRemesasCliente
   OldCreateOrder = True
   OnCreate = DataModuleCreate
+  OnDestroy = DataModuleDestroy
   Height = 405
   Width = 447
   object DADataCabecera: TDADataSource
diff --git a/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.pas b/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.pas
index 63f1d422..80facb9b 100644
--- a/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.pas	
+++ b/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.pas	
@@ -29,6 +29,7 @@ type
     schReport: TDASchema;
     DataDictionary: TDADataDictionary;
     procedure DataModuleCreate(Sender: TObject);
+    procedure DataModuleDestroy(Sender: TObject);
   private
     FConnection: IDAConnection;
     procedure GenerarRemesa(const ID : Integer); overload;
@@ -58,7 +59,13 @@ procedure TRptRemesasCliente.DataModuleCreate(Sender: TObject);
 begin
   schReport.ConnectionManager := dmServer.ConnectionManager;
   FConnection := dmServer.DarNuevaConexion;
-  frxReport.EngineOptions.NewSilentMode := simReThrow;  
+  frxReport.EngineOptions.NewSilentMode := simReThrow;
+
+  frxDBCabecera.DataSource := DADataCabecera;
+  frxDBCabecera.CloseDataSource := False;
+
+  frxDBCompensados.DataSource := DADataCompensados;
+  frxDBCompensados.CloseDataSource := False;
 end;
 
 function TRptRemesasCliente.GenerarRemesa(const ID: String): Binary;
@@ -85,6 +92,12 @@ begin
   end;
 end;
 
+procedure TRptRemesasCliente.DataModuleDestroy(Sender: TObject);
+begin
+  tbl_Cabecera.Active := False;
+  tbl_Detalles.Active := False;
+end;
+
 procedure TRptRemesasCliente.GenerarRemesa(const ID: Integer);
 var
   AStream: TMemoryStream;
diff --git a/Source/Modulos/Remesas de proveedor/Reports/uRptRemesasProveedor_Server.dfm b/Source/Modulos/Remesas de proveedor/Reports/uRptRemesasProveedor_Server.dfm
index c2fb74d8..b3083780 100644
--- a/Source/Modulos/Remesas de proveedor/Reports/uRptRemesasProveedor_Server.dfm	
+++ b/Source/Modulos/Remesas de proveedor/Reports/uRptRemesasProveedor_Server.dfm	
@@ -1,6 +1,7 @@
 object RptRemesasProveedor: TRptRemesasProveedor
   OldCreateOrder = True
   OnCreate = DataModuleCreate
+  OnDestroy = DataModuleDestroy
   Height = 405
   Width = 447
   object DADataCabecera: TDADataSource
diff --git a/Source/Modulos/Remesas de proveedor/Reports/uRptRemesasProveedor_Server.pas b/Source/Modulos/Remesas de proveedor/Reports/uRptRemesasProveedor_Server.pas
index 3293a4f8..7f2ef555 100644
--- a/Source/Modulos/Remesas de proveedor/Reports/uRptRemesasProveedor_Server.pas	
+++ b/Source/Modulos/Remesas de proveedor/Reports/uRptRemesasProveedor_Server.pas	
@@ -29,6 +29,7 @@ type
     DataDictionary: TDADataDictionary;
     frxReport: TfrxReport;
     procedure DataModuleCreate(Sender: TObject);
+    procedure DataModuleDestroy(Sender: TObject);
   private
     FConnection: IDAConnection;
     procedure GenerarRemesa(const ID : Integer); overload;
@@ -58,7 +59,13 @@ procedure TRptRemesasProveedor.DataModuleCreate(Sender: TObject);
 begin
   schReport.ConnectionManager := dmServer.ConnectionManager;
   FConnection := dmServer.DarNuevaConexion;
-  frxReport.EngineOptions.NewSilentMode := simReThrow;  
+  frxReport.EngineOptions.NewSilentMode := simReThrow;
+
+  frxDBCabecera.DataSource := DADataCabecera;
+  frxDBCabecera.CloseDataSource := False;
+
+  frxDBCompensados.DataSource := DADataCompensados;
+  frxDBCompensados.CloseDataSource := False;
 end;
 
 function TRptRemesasProveedor.GenerarRemesa(const ID: String): Binary;
@@ -85,6 +92,12 @@ begin
   end;
 end;
 
+procedure TRptRemesasProveedor.DataModuleDestroy(Sender: TObject);
+begin
+  tbl_Cabecera.Active := False;
+  tbl_Detalles.Active := False;
+end;
+
 procedure TRptRemesasProveedor.GenerarRemesa(const ID: Integer);
 var
   AStream: TMemoryStream;