Se adapta el envio de correos automático a todos los módulos

git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES/trunk@299 c93665c3-c93d-084d-9b98-7d5f4a9c3376

Database/VISTAS.SQL

@@ -352,7 +352,8 @@ CREATE VIEW V_ALBARANES_PROVEEDOR(
     FECHA_MODIFICACION,
     USUARIO,
     ID_FORMA_PAGO,
-    NUM_COPIAS)
+    NUM_COPIAS,
+    NUM_CORREOS)
 AS
 SELECT
   ALBARANES_PROVEEDOR.ID,
@@ -395,7 +396,8 @@ SELECT
   ALBARANES_PROVEEDOR.FECHA_MODIFICACION,
   ALBARANES_PROVEEDOR.USUARIO,
   ALBARANES_PROVEEDOR.ID_FORMA_PAGO,
-  IMPRESIONES.NUM_COPIAS
+  IMPRESIONES.NUM_COPIAS,
+  REGISTRO_CORREOS.NUM_CORREOS
 FROM
   ALBARANES_PROVEEDOR
   INNER JOIN CONTACTOS ON (CONTACTOS.ID = ALBARANES_PROVEEDOR.ID_PROVEEDOR)
@@ -404,7 +406,11 @@ FROM
   LEFT OUTER JOIN PEDIDOS_PROVEEDOR ON (PEDIDOS_PROVEEDOR.ID = ALBARANES_PROVEEDOR.ID_PEDIDO)
   LEFT OUTER JOIN FACTURAS_PROVEEDOR ON (FACTURAS_PROVEEDOR.ID = ALBARANES_PROVEEDOR.ID_FACTURA)
   LEFT OUTER JOIN ALMACENES ON (ALMACENES.ID = ALBARANES_PROVEEDOR.ID_ALMACEN)
-  LEFT JOIN IMPRESIONES ON ((IMPRESIONES.ID_TABLA = ALBARANES_PROVEEDOR.ID) AND (IMPRESIONES.TABLA = 'ALBARANESPROVEEDOR'));
+  LEFT JOIN IMPRESIONES
+  ON ((IMPRESIONES.ID_TABLA = ALBARANES_PROVEEDOR.ID) AND (IMPRESIONES.TABLA = 'ALBARANESPROVEEDOR'))
+  LEFT JOIN REGISTRO_CORREOS
+  ON ((REGISTRO_CORREOS.ID_TABLA = ALBARANES_PROVEEDOR.ID) AND (REGISTRO_CORREOS.TABLA = 'ALBARANESPROVEEDOR'))
+;
 
 
 CREATE VIEW V_AGENTES(
@@ -609,37 +615,38 @@ group by ID_RECIBO_COMPENSADO;
 
 
 CREATE VIEW V_RECIBOS_CLIENTE(
-ID,
+    ID,
-ID_RECIBO_COMPENSADO,
+    ID_RECIBO_COMPENSADO,
-REFERENCIA_REC_COMPENSADO,
+    REFERENCIA_REC_COMPENSADO,
-REFERENCIA,
+    REFERENCIA,
-SITUACION,
+    SITUACION,
-ID_FACTURA,
+    ID_FACTURA,
-ID_REMESA,
+    ID_REMESA,
-REFERENCIA_REMESA,
+    REFERENCIA_REMESA,
-FECHA_EMISION,
+    FECHA_EMISION,
-FECHA_VENCIMIENTO,
+    FECHA_VENCIMIENTO,
-DESCRIPCION,
+    DESCRIPCION,
-OBSERVACIONES,
+    OBSERVACIONES,
-IMPORTE,
+    IMPORTE,
-OTROS_GASTOS,
+    OTROS_GASTOS,
-IMPORTE_TOTAL,
+    IMPORTE_TOTAL,
-FECHA_FACTURA,
+    FECHA_FACTURA,
-FORMA_PAGO_FACTURA,
+    FORMA_PAGO_FACTURA,
-IMPORTE_FACTURA,
+    IMPORTE_FACTURA,
-ID_EMPRESA,
+    ID_EMPRESA,
-ID_CLIENTE,
+    ID_CLIENTE,
-NOMBRE_CLIENTE,
+    NOMBRE_CLIENTE,
-NIF_CIF_CLIENTE,
+    NIF_CIF_CLIENTE,
-ENTIDAD_CLIENTE,
+    ENTIDAD_CLIENTE,
-SUCURSAL_CLIENTE,
+    SUCURSAL_CLIENTE,
-DC_CLIENTE,
+    DC_CLIENTE,
-CUENTA_CLIENTE,
+    CUENTA_CLIENTE,
-FECHA_ALTA,
+    FECHA_ALTA,
-FECHA_MODIFICACION,
+    FECHA_MODIFICACION,
-USUARIO,
+    USUARIO,
-NUM_COPIAS)
+    NUM_COPIAS,
- AS 
+    NUM_CORREOS)
+AS
 SELECT RECIBOS_CLIENTE.ID,
        RECIBOS_CLIENTE.ID_RECIBO_COMPENSADO,
        RECIBO_COMPENSADO1.REFERENCIA,
@@ -664,7 +671,8 @@ SELECT RECIBOS_CLIENTE.ID,
        RECIBOS_CLIENTE.FECHA_ALTA,
        RECIBOS_CLIENTE.FECHA_MODIFICACION,
        RECIBOS_CLIENTE.USUARIO,
-       IMPRESIONES.NUM_COPIAS
+       IMPRESIONES.NUM_COPIAS,
+       REGISTRO_CORREOS.NUM_CORREOS
 
 FROM RECIBOS_CLIENTE
 LEFT JOIN V_REC_CLI_SITUACION
@@ -685,7 +693,11 @@ LEFT JOIN RECIBOS_CLIENTE RECIBO_COMPENSADO1
 ON (RECIBO_COMPENSADO1.ID = RECIBOS_CLIENTE.ID_RECIBO_COMPENSADO)
 LEFT JOIN V_REC_CLI_SITUACION RECIBO_COMPENSADO2
 ON (RECIBO_COMPENSADO2.ID_RECIBO = RECIBOS_CLIENTE.ID_RECIBO_COMPENSADO)
-LEFT JOIN IMPRESIONES ON ((IMPRESIONES.ID_TABLA = RECIBOS_CLIENTE.ID) AND (IMPRESIONES.TABLA = 'RECIBOSCLIENTE'));
+LEFT JOIN IMPRESIONES
+ON ((IMPRESIONES.ID_TABLA = RECIBOS_CLIENTE.ID) AND (IMPRESIONES.TABLA = 'RECIBOSCLIENTE'))
+LEFT JOIN REGISTRO_CORREOS
+ON ((REGISTRO_CORREOS.ID_TABLA = RECIBOS_CLIENTE.ID) AND (REGISTRO_CORREOS.TABLA = 'RECIBOSCLIENTE'))
+;
 
 
 
@@ -809,39 +821,40 @@ GROUP BY ID_FACTURA;
 
 
 CREATE VIEW V_FACTURAS_PROVEEDOR(
-ID,
+    ID,
-ID_EMPRESA,
+    ID_EMPRESA,
-REFERENCIA,
+    REFERENCIA,
-TIPO,
+    TIPO,
-REFERENCIA_PROVEEDOR,
+    REFERENCIA_PROVEEDOR,
-FECHA_FACTURA,
+    FECHA_FACTURA,
-SITUACION,
+    SITUACION,
-BASE_IMPONIBLE,
+    BASE_IMPONIBLE,
-DESCUENTO,
+    DESCUENTO,
-IMPORTE_DESCUENTO,
+    IMPORTE_DESCUENTO,
-IVA,
+    IVA,
-IMPORTE_IVA,
+    IMPORTE_IVA,
-RE,
+    RE,
-IMPORTE_RE,
+    IMPORTE_RE,
-IMPORTE_TOTAL,
+    IMPORTE_TOTAL,
-OBSERVACIONES,
+    OBSERVACIONES,
-ID_PROVEEDOR,
+    ID_PROVEEDOR,
-NIF_CIF,
+    NIF_CIF,
-NOMBRE,
+    NOMBRE,
-CALLE,
+    CALLE,
-POBLACION,
+    POBLACION,
-PROVINCIA,
+    PROVINCIA,
-CODIGO_POSTAL,
+    CODIGO_POSTAL,
-FECHA_ALTA,
+    FECHA_ALTA,
-FECHA_MODIFICACION,
+    FECHA_MODIFICACION,
-USUARIO,
+    USUARIO,
-ID_FORMA_PAGO,
+    ID_FORMA_PAGO,
-RECARGO_EQUIVALENCIA,
+    RECARGO_EQUIVALENCIA,
-ID_TIPO_IVA,
+    ID_TIPO_IVA,
-IMPORTE_NETO,
+    IMPORTE_NETO,
-IMPORTE_PORTE,
+    IMPORTE_PORTE,
-NUM_COPIAS)
+    NUM_COPIAS,
- AS 
+    NUM_CORREOS)
+AS
 SELECT FACTURAS_PROVEEDOR.ID,
   FACTURAS_PROVEEDOR.ID_EMPRESA,
   FACTURAS_PROVEEDOR.REFERENCIA,
@@ -873,15 +886,18 @@ SELECT FACTURAS_PROVEEDOR.ID,
   FACTURAS_PROVEEDOR.ID_TIPO_IVA,
   FACTURAS_PROVEEDOR.IMPORTE_NETO,
   FACTURAS_PROVEEDOR.IMPORTE_PORTE,
-  IMPRESIONES.NUM_COPIAS
+  IMPRESIONES.NUM_COPIAS,
+  REGISTRO_CORREOS.NUM_CORREOS
   FROM V_FAC_PRO_SITUACION
   LEFT JOIN FACTURAS_PROVEEDOR
   ON (FACTURAS_PROVEEDOR.ID = V_FAC_PRO_SITUACION.ID_FACTURA)
   LEFT JOIN PROVEEDORES_DATOS
   ON (PROVEEDORES_DATOS.ID_PROVEEDOR = FACTURAS_PROVEEDOR.ID_PROVEEDOR)
   LEFT JOIN IMPRESIONES
-  ON ((IMPRESIONES.ID_TABLA = FACTURAS_PROVEEDOR.ID) AND (IMPRESIONES.TABLA = 'FACTURASPROVEEDOR'));
+  ON ((IMPRESIONES.ID_TABLA = FACTURAS_PROVEEDOR.ID) AND (IMPRESIONES.TABLA = 'FACTURASPROVEEDOR'))
-
+  LEFT JOIN REGISTRO_CORREOS
+  ON ((REGISTRO_CORREOS.ID_TABLA = FACTURAS_PROVEEDOR.ID) AND (REGISTRO_CORREOS.TABLA = 'FACTURASPROVEEDOR'))
+;
 
 
 CREATE VIEW V_FACTURAS_CLIENTE(
@@ -1071,7 +1087,8 @@ CREATE VIEW V_ALBARANES_CLIENTE(
     FECHA_RECEPCION,
     ID_AGENTE,
     AGENTE,
-    NUM_COPIAS)
+    NUM_COPIAS,
+    NUM_CORREOS)
 AS
 SELECT
   ALBARANES_CLIENTE.ID,
@@ -1119,7 +1136,8 @@ SELECT
   ALBARANES_CLIENTE.FECHA_RECEPCION,
   CLIENTES_DATOS.ID_AGENTE,
   AGENTES.NOMBRE,
-  IMPRESIONES.NUM_COPIAS
+  IMPRESIONES.NUM_COPIAS,
+  REGISTRO_CORREOS.NUM_CORREOS
 
 FROM
   ALBARANES_CLIENTE
@@ -1132,7 +1150,10 @@ FROM
   LEFT OUTER JOIN PEDIDOS_CLIENTE ON (PEDIDOS_CLIENTE.ID = ALBARANES_CLIENTE.ID_PEDIDO)
   LEFT OUTER JOIN FACTURAS_CLIENTE ON (FACTURAS_CLIENTE.ID = ALBARANES_CLIENTE.ID_FACTURA)
   LEFT OUTER JOIN ALMACENES ON (ALMACENES.ID = ALBARANES_CLIENTE.ID_ALMACEN)
-  LEFT JOIN IMPRESIONES ON ((IMPRESIONES.ID_TABLA = ALBARANES_CLIENTE.ID) AND (IMPRESIONES.TABLA = 'ALBARANESCLIENTE'))
+  LEFT JOIN IMPRESIONES
+  ON ((IMPRESIONES.ID_TABLA = ALBARANES_CLIENTE.ID) AND (IMPRESIONES.TABLA = 'ALBARANESCLIENTE'))
+  LEFT JOIN REGISTRO_CORREOS
+  ON ((REGISTRO_CORREOS.ID_TABLA = ALBARANES_CLIENTE.ID) AND (REGISTRO_CORREOS.TABLA = 'ALBARANESCLIENTE'))
 ;
 
 
@@ -1703,39 +1724,40 @@ group by id_pedido
 
 
 CREATE VIEW V_PEDIDOS_CLIENTE(
-ID,
+    ID,
-ID_EMPRESA,
+    ID_EMPRESA,
-ID_CLIENTE,
+    ID_CLIENTE,
-NOMBRE,
+    NOMBRE,
-REFERENCIA,
+    REFERENCIA,
-REFERENCIA_CLIENTE,
+    REFERENCIA_CLIENTE,
-SITUACION,
+    SITUACION,
-FECHA_PEDIDO,
+    FECHA_PEDIDO,
-CALLE,
+    CALLE,
-CODIGO_POSTAL,
+    CODIGO_POSTAL,
-POBLACION,
+    POBLACION,
-PROVINCIA,
+    PROVINCIA,
-PERSONA_CONTACTO,
+    PERSONA_CONTACTO,
-TELEFONO,
+    TELEFONO,
-OBSERVACIONES,
+    OBSERVACIONES,
-INCIDENCIAS,
+    INCIDENCIAS,
-INCIDENCIAS_ACTIVAS,
+    INCIDENCIAS_ACTIVAS,
-FECHA_ALTA,
+    FECHA_ALTA,
-FECHA_MODIFICACION,
+    FECHA_MODIFICACION,
-USUARIO,
+    USUARIO,
-IMPORTE_NETO,
+    IMPORTE_NETO,
-IMPORTE_PORTE,
+    IMPORTE_PORTE,
-DESCUENTO,
+    DESCUENTO,
-IMPORTE_DESCUENTO,
+    IMPORTE_DESCUENTO,
-BASE_IMPONIBLE,
+    BASE_IMPONIBLE,
-IVA,
+    IVA,
-IMPORTE_IVA,
+    IMPORTE_IVA,
-IMPORTE_TOTAL,
+    IMPORTE_TOTAL,
-ID_FORMA_PAGO,
+    ID_FORMA_PAGO,
-REF_TIENDA_WEB,
+    REF_TIENDA_WEB,
-FECHA_PREVISTA_ENVIO,
+    FECHA_PREVISTA_ENVIO,
-NUM_COPIAS)
+    NUM_COPIAS,
- AS 
+    NUM_CORREOS)
+AS
 SELECT
   PEDIDOS_CLIENTE.ID,
   PEDIDOS_CLIENTE.ID_EMPRESA,
@@ -1768,52 +1790,58 @@ SELECT
   PEDIDOS_CLIENTE.ID_FORMA_PAGO,
   PEDIDOS_CLIENTE.REF_TIENDA_WEB,
   PEDIDOS_CLIENTE.FECHA_PREVISTA_ENVIO,
-  IMPRESIONES.NUM_COPIAS
+  IMPRESIONES.NUM_COPIAS,
+  REGISTRO_CORREOS.NUM_CORREOS
 FROM
   V_PED_CLI_SITUACION
   INNER JOIN PEDIDOS_CLIENTE ON (PEDIDOS_CLIENTE.ID = V_PED_CLI_SITUACION.ID_PEDIDO)
   INNER JOIN V_CLIENTES ON (PEDIDOS_CLIENTE.ID_CLIENTE = V_CLIENTES.ID)
-  LEFT JOIN IMPRESIONES ON ((IMPRESIONES.ID_TABLA = PEDIDOS_CLIENTE.ID) AND (IMPRESIONES.TABLA = 'PEDIDOSCLIENTE'));
+  LEFT JOIN IMPRESIONES
+  ON ((IMPRESIONES.ID_TABLA = PEDIDOS_CLIENTE.ID) AND (IMPRESIONES.TABLA = 'PEDIDOSCLIENTE'))
+  LEFT JOIN REGISTRO_CORREOS
+  ON ((REGISTRO_CORREOS.ID_TABLA = PEDIDOS_CLIENTE.ID) AND (REGISTRO_CORREOS.TABLA = 'PEDIDOSCLIENTE'))
+;
 
 
 CREATE VIEW V_PEDIDOS_PROVEEDOR(
-ID,
+    ID,
-ID_EMPRESA,
+    ID_EMPRESA,
-ID_PROVEEDOR,
+    ID_PROVEEDOR,
-NOMBRE,
+    NOMBRE,
-REFERENCIA,
+    REFERENCIA,
-SITUACION,
+    SITUACION,
-FECHA_ENVIO,
+    FECHA_ENVIO,
-FECHA_PEDIDO,
+    FECHA_PEDIDO,
-FECHA_CONFIRMACION,
+    FECHA_CONFIRMACION,
-FECHA_ENTREGA,
+    FECHA_ENTREGA,
-ID_ALMACEN,
+    ID_ALMACEN,
-NOMBRE_ALMACEN,
+    NOMBRE_ALMACEN,
-OBSERVACIONES,
+    OBSERVACIONES,
-IMPORTE_TOTAL,
+    IMPORTE_TOTAL,
-INCIDENCIAS,
+    INCIDENCIAS,
-INCIDENCIAS_ACTIVAS,
+    INCIDENCIAS_ACTIVAS,
-CALLE,
+    CALLE,
-POBLACION,
+    POBLACION,
-PROVINCIA,
+    PROVINCIA,
-CODIGO_POSTAL,
+    CODIGO_POSTAL,
-PERSONA_CONTACTO,
+    PERSONA_CONTACTO,
-TELEFONO,
+    TELEFONO,
-FECHA_ALTA,
+    FECHA_ALTA,
-FECHA_MODIFICACION,
+    FECHA_MODIFICACION,
-USUARIO,
+    USUARIO,
-ID_PEDIDO_CLIENTE,
+    ID_PEDIDO_CLIENTE,
-REF_PED_CLIENTE,
+    REF_PED_CLIENTE,
-IMPORTE_NETO,
+    IMPORTE_NETO,
-IMPORTE_PORTE,
+    IMPORTE_PORTE,
-DESCUENTO,
+    DESCUENTO,
-IMPORTE_DESCUENTO,
+    IMPORTE_DESCUENTO,
-BASE_IMPONIBLE,
+    BASE_IMPONIBLE,
-IVA,
+    IVA,
-IMPORTE_IVA,
+    IMPORTE_IVA,
-ID_FORMA_PAGO,
+    ID_FORMA_PAGO,
-NUM_COPIAS)
+    NUM_COPIAS,
- AS 
+    NUM_CORREOS)
+AS
 SELECT
   PEDIDOS_PROVEEDOR.ID,
   PEDIDOS_PROVEEDOR.ID_EMPRESA,
@@ -1850,15 +1878,19 @@ SELECT
   PEDIDOS_PROVEEDOR.IVA,
   PEDIDOS_PROVEEDOR.IMPORTE_IVA,
   PEDIDOS_PROVEEDOR.ID_FORMA_PAGO,
-  IMPRESIONES.NUM_COPIAS
+  IMPRESIONES.NUM_COPIAS,
+  REGISTRO_CORREOS.NUM_CORREOS
 FROM
   PEDIDOS_PROVEEDOR
   INNER JOIN V_PROVEEDORES ON (PEDIDOS_PROVEEDOR.ID_PROVEEDOR = V_PROVEEDORES.ID)
   INNER JOIN V_PED_PROV_SITUACION ON (V_PED_PROV_SITUACION.ID_PEDIDO = PEDIDOS_PROVEEDOR.ID)
   LEFT OUTER JOIN ALMACENES ON (ALMACENES.ID = PEDIDOS_PROVEEDOR.ID_ALMACEN)
   LEFT OUTER JOIN PEDIDOS_CLIENTE ON (PEDIDOS_CLIENTE.ID = PEDIDOS_PROVEEDOR.ID_PEDIDO_CLIENTE)
-  LEFT JOIN IMPRESIONES ON ((IMPRESIONES.ID_TABLA = PEDIDOS_PROVEEDOR.ID) AND (IMPRESIONES.TABLA = 'PEDIDOSPROVEEDOR'));
+  LEFT JOIN IMPRESIONES
-
+  ON ((IMPRESIONES.ID_TABLA = PEDIDOS_PROVEEDOR.ID) AND (IMPRESIONES.TABLA = 'PEDIDOSPROVEEDOR'))
+  LEFT JOIN REGISTRO_CORREOS
+  ON ((REGISTRO_CORREOS.ID_TABLA = PEDIDOS_PROVEEDOR.ID) AND (REGISTRO_CORREOS.TABLA = 'PEDIDOSPROVEEDOR'))
+;
 
 
 CREATE VIEW V_PED_CLI_ART_PEND_PEDIR_PROV(

Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.bdsgroup

@@ -23,10 +23,7 @@
       <Projects Name="AlbCli_FacCli_relation.bpl">..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.bdsproj</Projects>
       <Projects Name="AlbaranesCliente_view.bpl">Views\AlbaranesCliente_view.bdsproj</Projects>
       <Projects Name="AlbaranesCliente_plugin.bpl">Plugin\AlbaranesCliente_plugin.bdsproj</Projects>
-      <Projects Name="FacturasCliente_view.bpl">..\Facturas de cliente\Views\FacturasCliente_view.bdsproj</Projects>
+      <Projects Name="Targets">DataAbstract_D10.bpl Base.bpl ControllerBase.bpl GUIBase.bpl Contactos_view.bpl Articulos_view.bpl AlbaranesCliente_model.bpl AlbaranesCliente_data.bpl AlbaranesCliente_controller.bpl FacturasCliente_controller.bpl PedCli_AlbCli_relation.bpl AlbCli_FacCli_relation.bpl AlbaranesCliente_view.bpl AlbaranesCliente_plugin.bpl</Projects>
-      <Projects Name="FactuGES_Server.exe">..\..\Servidor\FactuGES_Server.bdsproj</Projects>
-      <Projects Name="FactuGES.exe">..\..\Cliente\FactuGES.bdsproj</Projects>
-      <Projects Name="Targets">DataAbstract_D10.bpl Base.bpl ControllerBase.bpl GUIBase.bpl Contactos_view.bpl Articulos_view.bpl AlbaranesCliente_model.bpl AlbaranesCliente_data.bpl AlbaranesCliente_controller.bpl FacturasCliente_controller.bpl PedCli_AlbCli_relation.bpl AlbCli_FacCli_relation.bpl AlbaranesCliente_view.bpl AlbaranesCliente_plugin.bpl FacturasCliente_view.bpl FactuGES_Server.exe FactuGES.exe</Projects>
     </Projects>
     <Dependencies/>
   </Default.Personality>

Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas

@@ -96,6 +96,7 @@ type
     procedure FiltrarEmpresa(AAlbaran: IBizAlbaranCliente);
     function _Vacio : IBizAlbaranCliente;
     function ValidarAlbaran(AAlbaran: IBizAlbaranCliente): Boolean;
+    procedure _AnadirMarcaEnvioCorreo(AAlbaran: IBizAlbaranCliente);
 
   public
     property ClienteController: IClientesController read GetClienteController write SetClienteController;
@@ -171,7 +172,7 @@ uses
   schContactosClient_Intf, uAlbaranesClienteReportController, uControllerDetallesBase, 
   uPedidosClienteController, uBizPedidosCliente, uBizDetallesPedidoCliente,
   schPedidosClienteClient_Intf, uDialogUtils, Windows, Forms, Dialogs, uGUIBase,
-
+  uDataModuleRegistroCorreos,
   uIDialogListaAlbaranesCliEnvioEMail, uSistemaFunc, uStringsUtils, uDialogElegirEMail, uEMailUtils;
 
 
@@ -663,6 +664,37 @@ begin
   end;
 end;
 
+procedure TAlbaranesClienteController._AnadirMarcaEnvioCorreo(AAlbaran: IBizAlbaranCliente);
+var
+  ASoloLectura : Boolean;
+begin
+  if not Assigned(AAlbaran) then
+    raise Exception.Create ('Albaran no asignado (_AnadirMarcaEnvioCorreo)');
+
+  if AAlbaran.DataTable.Active then
+     AAlbaran.DataTable.Active := True;
+
+  if AnadirMarcaEnvioCorreo(nme_AlbaranesCliente, AAlbaran.ID) then
+  begin
+    DesconectarTabla(AAlbaran.DataTable);
+    try
+      ASoloLectura := AAlbaran.DataTable.ReadOnly;
+      if ASoloLectura then
+        SetDataTableReadOnly(AAlbaran.DataTable, False);
+      try
+        AAlbaran.Edit;
+        AAlbaran.NUM_CORREOS := AAlbaran.NUM_CORREOS + 1;
+        AAlbaran.Post;
+      finally
+        if ASoloLectura then
+          SetDataTableReadOnly(AAlbaran.DataTable, True);
+      end;
+    finally
+      ConectarTabla(AAlbaran.DataTable);
+    end;
+  end;
+end;
+
 function TAlbaranesClienteController._Vacio: IBizAlbaranCliente;
 begin
   Result := Buscar(ID_NULO);
@@ -813,7 +845,7 @@ begin
     AReportController.ExportToPDF(AAlbaran.ID, AFicheroTMP);
     Result := EnviarEMailMAPI(AAsunto, ATextoEMail, AFicheroTMP, '', '', AAlbaran.Cliente.NOMBRE, AEMail, AEnviarDirectamente);
     if Result then
-//      _AnadirMarcaEnvioCorreo(AAlbaran);
+       _AnadirMarcaEnvioCorreo(AAlbaran);
   finally
     SysUtils.DeleteFile(AFicheroTMP);
     AReportController := NIL;

Source/Modulos/Albaranes de cliente/Data/AlbaranesCliente_data.bdsproj

@@ -172,7 +172,7 @@
 			<VersionInfoKeys Name="Comments"></VersionInfoKeys>
 		</VersionInfoKeys>
 	</Delphi.Personality>
-<!-- EurekaLog First Line
+	<!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=519
 Activate=1

Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm

@@ -680,6 +680,17 @@ object DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente
         Calculated = False
         Lookup = False
         LookupCache = False
+      end
+      item
+        Name = 'NUM_CORREOS'
+        DataType = datInteger
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
       end>
     Params = <>
     MasterMappingMode = mmDataRequest

Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas

@@ -9,11 +9,11 @@ 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_DarReferencia = '{EB3008DB-9520-42B6-8860-4AAD682CA8B5}';
+  RID_DarReferencia = '{7910182F-C750-477D-95BF-08F2A32DBBC9}';
-  RID_AlbaranesCliente = '{21D36B32-4BCE-485C-A44A-9A72CC73A57E}';
+  RID_AlbaranesCliente = '{8E92D862-BB47-4D2E-B022-9AE333F45CFB}';
-  RID_AlbaranesCliente_Detalles = '{493A3E1F-36BC-42B1-B149-2CFFAE856399}';
+  RID_AlbaranesCliente_Detalles = '{4789ECDF-65FC-4F74-A7FD-70CE7881AE7F}';
-  RID_AlbaranesCliente_Detalles_Refresh = '{DED95756-45A8-43C5-A74D-314BCED7EEE4}';
+  RID_AlbaranesCliente_Detalles_Refresh = '{64EE6606-7337-4ED8-A39A-726558E9C79F}';
-  RID_AlbaranesCliente_Refresh = '{4A56E94D-34D5-424F-8CDB-8FDF86479EA6}';
+  RID_AlbaranesCliente_Refresh = '{CBA10CA3-9CE3-4197-8B89-A71F88321C1D}';
 
   { Data table names }
   nme_DarReferencia = 'DarReferencia';
@@ -75,6 +75,7 @@ const
   fld_AlbaranesClienteREFERENCIA_ALB_DEV = 'REFERENCIA_ALB_DEV';
   fld_AlbaranesClienteID_FAC_ALB_DEV = 'ID_FAC_ALB_DEV';
   fld_AlbaranesClienteREFERENCIA_FAC_ALB_DEV = 'REFERENCIA_FAC_ALB_DEV';
+  fld_AlbaranesClienteNUM_CORREOS = 'NUM_CORREOS';
 
   { AlbaranesCliente field indexes }
   idx_AlbaranesClienteID = 0;
@@ -123,6 +124,7 @@ const
   idx_AlbaranesClienteREFERENCIA_ALB_DEV = 43;
   idx_AlbaranesClienteID_FAC_ALB_DEV = 44;
   idx_AlbaranesClienteREFERENCIA_FAC_ALB_DEV = 45;
+  idx_AlbaranesClienteNUM_CORREOS = 46;
 
   { AlbaranesCliente_Detalles fields }
   fld_AlbaranesCliente_DetallesID = 'ID';
@@ -239,6 +241,7 @@ const
   fld_AlbaranesCliente_RefreshREFERENCIA_ALB_DEV = 'REFERENCIA_ALB_DEV';
   fld_AlbaranesCliente_RefreshID_FAC_ALB_DEV = 'ID_FAC_ALB_DEV';
   fld_AlbaranesCliente_RefreshREFERENCIA_FAC_ALB_DEV = 'REFERENCIA_FAC_ALB_DEV';
+  fld_AlbaranesCliente_RefreshNUM_CORREOS = 'NUM_CORREOS';
 
   { AlbaranesCliente_Refresh field indexes }
   idx_AlbaranesCliente_RefreshID = 0;
@@ -287,11 +290,12 @@ const
   idx_AlbaranesCliente_RefreshREFERENCIA_ALB_DEV = 43;
   idx_AlbaranesCliente_RefreshID_FAC_ALB_DEV = 44;
   idx_AlbaranesCliente_RefreshREFERENCIA_FAC_ALB_DEV = 45;
+  idx_AlbaranesCliente_RefreshNUM_CORREOS = 46;
 
 type
   { IDarReferencia }
   IDarReferencia = interface(IDAStronglyTypedDataTable)
-  ['{0EBA0952-DA21-4716-941F-6B43CC6545CF}']
+  ['{B26C0C4F-CE5F-493E-A95B-CF00900E04AA}']
     { Property getters and setters }
     function GetVALORValue: String;
     procedure SetVALORValue(const aValue: String);
@@ -320,7 +324,7 @@ type
 
   { IAlbaranesCliente }
   IAlbaranesCliente = interface(IDAStronglyTypedDataTable)
-  ['{BDCF155C-E6B4-4D9F-874B-75667EBCB8AF}']
+  ['{BBC4A28E-F0DC-478F-9BC2-080337DC7917}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -414,6 +418,8 @@ type
     procedure SetID_FAC_ALB_DEVValue(const aValue: Integer);
     function GetREFERENCIA_FAC_ALB_DEVValue: String;
     procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String);
+    function GetNUM_CORREOSValue: Integer;
+    procedure SetNUM_CORREOSValue(const aValue: Integer);
 
 
     { Properties }
@@ -463,6 +469,7 @@ type
     property REFERENCIA_ALB_DEV: String read GetREFERENCIA_ALB_DEVValue write SetREFERENCIA_ALB_DEVValue;
     property ID_FAC_ALB_DEV: Integer read GetID_FAC_ALB_DEVValue write SetID_FAC_ALB_DEVValue;
     property REFERENCIA_FAC_ALB_DEV: String read GetREFERENCIA_FAC_ALB_DEVValue write SetREFERENCIA_FAC_ALB_DEVValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
   end;
 
   { TAlbaranesClienteDataTableRules }
@@ -562,6 +569,8 @@ type
     procedure SetID_FAC_ALB_DEVValue(const aValue: Integer); virtual;
     function GetREFERENCIA_FAC_ALB_DEVValue: String; virtual;
     procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -610,6 +619,7 @@ type
     property REFERENCIA_ALB_DEV: String read GetREFERENCIA_ALB_DEVValue write SetREFERENCIA_ALB_DEVValue;
     property ID_FAC_ALB_DEV: Integer read GetID_FAC_ALB_DEVValue write SetID_FAC_ALB_DEVValue;
     property REFERENCIA_FAC_ALB_DEV: String read GetREFERENCIA_FAC_ALB_DEVValue write SetREFERENCIA_FAC_ALB_DEVValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -619,7 +629,7 @@ type
 
   { IAlbaranesCliente_Detalles }
   IAlbaranesCliente_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{0BA1E8DD-4911-4C91-BE56-A5E014DC032E}']
+  ['{BF1D2AA9-5A6E-422D-8D86-CAF9E9B8EF00}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -732,7 +742,7 @@ type
 
   { IAlbaranesCliente_Detalles_Refresh }
   IAlbaranesCliente_Detalles_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{26DDDA1E-6A88-4840-AE9A-6B169D04C411}']
+  ['{7F822116-DE0E-47B2-99E8-6D3D0BDEA474}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -845,7 +855,7 @@ type
 
   { IAlbaranesCliente_Refresh }
   IAlbaranesCliente_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{FE5577F8-543C-4BA4-B52F-BCB1B0D1BF46}']
+  ['{7A245E1D-D2E0-4024-BF66-4682E328B476}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -939,6 +949,8 @@ type
     procedure SetID_FAC_ALB_DEVValue(const aValue: Integer);
     function GetREFERENCIA_FAC_ALB_DEVValue: String;
     procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String);
+    function GetNUM_CORREOSValue: Integer;
+    procedure SetNUM_CORREOSValue(const aValue: Integer);
 
 
     { Properties }
@@ -988,6 +1000,7 @@ type
     property REFERENCIA_ALB_DEV: String read GetREFERENCIA_ALB_DEVValue write SetREFERENCIA_ALB_DEVValue;
     property ID_FAC_ALB_DEV: Integer read GetID_FAC_ALB_DEVValue write SetID_FAC_ALB_DEVValue;
     property REFERENCIA_FAC_ALB_DEV: String read GetREFERENCIA_FAC_ALB_DEVValue write SetREFERENCIA_FAC_ALB_DEVValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
   end;
 
   { TAlbaranesCliente_RefreshDataTableRules }
@@ -1087,6 +1100,8 @@ type
     procedure SetID_FAC_ALB_DEVValue(const aValue: Integer); virtual;
     function GetREFERENCIA_FAC_ALB_DEVValue: String; virtual;
     procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -1135,6 +1150,7 @@ type
     property REFERENCIA_ALB_DEV: String read GetREFERENCIA_ALB_DEVValue write SetREFERENCIA_ALB_DEVValue;
     property ID_FAC_ALB_DEV: Integer read GetID_FAC_ALB_DEVValue write SetID_FAC_ALB_DEVValue;
     property REFERENCIA_FAC_ALB_DEV: String read GetREFERENCIA_FAC_ALB_DEVValue write SetREFERENCIA_FAC_ALB_DEVValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -1641,6 +1657,16 @@ begin
   DataTable.Fields[idx_AlbaranesClienteREFERENCIA_FAC_ALB_DEV].AsString := aValue;
 end;
 
+function TAlbaranesClienteDataTableRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := DataTable.Fields[idx_AlbaranesClienteNUM_CORREOS].AsInteger;
+end;
+
+procedure TAlbaranesClienteDataTableRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_AlbaranesClienteNUM_CORREOS].AsInteger := aValue;
+end;
+
 
 { TAlbaranesCliente_DetallesDataTableRules }
 constructor TAlbaranesCliente_DetallesDataTableRules.Create(aDataTable: TDADataTable);
@@ -2439,6 +2465,16 @@ begin
   DataTable.Fields[idx_AlbaranesCliente_RefreshREFERENCIA_FAC_ALB_DEV].AsString := aValue;
 end;
 
+function TAlbaranesCliente_RefreshDataTableRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := DataTable.Fields[idx_AlbaranesCliente_RefreshNUM_CORREOS].AsInteger;
+end;
+
+procedure TAlbaranesCliente_RefreshDataTableRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_AlbaranesCliente_RefreshNUM_CORREOS].AsInteger := aValue;
+end;
+
 
 initialization
   RegisterDataTableRules(RID_DarReferencia, TDarReferenciaDataTableRules);

Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas

@@ -9,16 +9,16 @@ 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_DarReferenciaDelta = '{686A4397-FE20-45D3-9CED-8AF55D9542EB}';
+  RID_DarReferenciaDelta = '{DD15293A-3280-426D-9927-112CDD3205BC}';
-  RID_AlbaranesClienteDelta = '{51F248ED-D277-4C06-BAC6-810A28646B1B}';
+  RID_AlbaranesClienteDelta = '{E62B1307-F6FC-424A-9975-21616BE7FDB2}';
-  RID_AlbaranesCliente_DetallesDelta = '{CC2B288D-936A-40AC-8691-DC28A6515213}';
+  RID_AlbaranesCliente_DetallesDelta = '{703B8F12-1E88-4317-8E66-66F53506A042}';
-  RID_AlbaranesCliente_Detalles_RefreshDelta = '{8D8BE999-438B-4A1F-9BFE-D9215AFFE426}';
+  RID_AlbaranesCliente_Detalles_RefreshDelta = '{76996524-4884-49A1-B1AA-8A141E887553}';
-  RID_AlbaranesCliente_RefreshDelta = '{EF94943F-4DE8-49C6-920D-635E8E5783DD}';
+  RID_AlbaranesCliente_RefreshDelta = '{3728694F-04C7-4B85-95C0-E03375F3DE53}';
 
 type
   { IDarReferenciaDelta }
   IDarReferenciaDelta = interface(IDarReferencia)
-  ['{686A4397-FE20-45D3-9CED-8AF55D9542EB}']
+  ['{DD15293A-3280-426D-9927-112CDD3205BC}']
     { Property getters and setters }
     function GetOldVALORValue : String;
 
@@ -47,7 +47,7 @@ type
 
   { IAlbaranesClienteDelta }
   IAlbaranesClienteDelta = interface(IAlbaranesCliente)
-  ['{51F248ED-D277-4C06-BAC6-810A28646B1B}']
+  ['{E62B1307-F6FC-424A-9975-21616BE7FDB2}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -95,6 +95,7 @@ type
     function GetOldREFERENCIA_ALB_DEVValue : String;
     function GetOldID_FAC_ALB_DEVValue : Integer;
     function GetOldREFERENCIA_FAC_ALB_DEVValue : String;
+    function GetOldNUM_CORREOSValue : Integer;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -143,6 +144,7 @@ type
     property OldREFERENCIA_ALB_DEV : String read GetOldREFERENCIA_ALB_DEVValue;
     property OldID_FAC_ALB_DEV : Integer read GetOldID_FAC_ALB_DEVValue;
     property OldREFERENCIA_FAC_ALB_DEV : String read GetOldREFERENCIA_FAC_ALB_DEVValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
   end;
 
   { TAlbaranesClienteBusinessProcessorRules }
@@ -288,6 +290,9 @@ type
     function GetREFERENCIA_FAC_ALB_DEVValue: String; virtual;
     function GetOldREFERENCIA_FAC_ALB_DEVValue: String; virtual;
     procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    function GetOldNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -382,6 +387,8 @@ type
     property OldID_FAC_ALB_DEV : Integer read GetOldID_FAC_ALB_DEVValue;
     property REFERENCIA_FAC_ALB_DEV : String read GetREFERENCIA_FAC_ALB_DEVValue write SetREFERENCIA_FAC_ALB_DEVValue;
     property OldREFERENCIA_FAC_ALB_DEV : String read GetOldREFERENCIA_FAC_ALB_DEVValue;
+    property NUM_CORREOS : Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -391,7 +398,7 @@ type
 
   { IAlbaranesCliente_DetallesDelta }
   IAlbaranesCliente_DetallesDelta = interface(IAlbaranesCliente_Detalles)
-  ['{CC2B288D-936A-40AC-8691-DC28A6515213}']
+  ['{703B8F12-1E88-4317-8E66-66F53506A042}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_ALBARANValue : Integer;
@@ -518,7 +525,7 @@ type
 
   { IAlbaranesCliente_Detalles_RefreshDelta }
   IAlbaranesCliente_Detalles_RefreshDelta = interface(IAlbaranesCliente_Detalles_Refresh)
-  ['{8D8BE999-438B-4A1F-9BFE-D9215AFFE426}']
+  ['{76996524-4884-49A1-B1AA-8A141E887553}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_ALBARANValue : Integer;
@@ -645,7 +652,7 @@ type
 
   { IAlbaranesCliente_RefreshDelta }
   IAlbaranesCliente_RefreshDelta = interface(IAlbaranesCliente_Refresh)
-  ['{EF94943F-4DE8-49C6-920D-635E8E5783DD}']
+  ['{3728694F-04C7-4B85-95C0-E03375F3DE53}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -693,6 +700,7 @@ type
     function GetOldREFERENCIA_ALB_DEVValue : String;
     function GetOldID_FAC_ALB_DEVValue : Integer;
     function GetOldREFERENCIA_FAC_ALB_DEVValue : String;
+    function GetOldNUM_CORREOSValue : Integer;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -741,6 +749,7 @@ type
     property OldREFERENCIA_ALB_DEV : String read GetOldREFERENCIA_ALB_DEVValue;
     property OldID_FAC_ALB_DEV : Integer read GetOldID_FAC_ALB_DEVValue;
     property OldREFERENCIA_FAC_ALB_DEV : String read GetOldREFERENCIA_FAC_ALB_DEVValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
   end;
 
   { TAlbaranesCliente_RefreshBusinessProcessorRules }
@@ -886,6 +895,9 @@ type
     function GetREFERENCIA_FAC_ALB_DEVValue: String; virtual;
     function GetOldREFERENCIA_FAC_ALB_DEVValue: String; virtual;
     procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    function GetOldNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -980,6 +992,8 @@ type
     property OldID_FAC_ALB_DEV : Integer read GetOldID_FAC_ALB_DEVValue;
     property REFERENCIA_FAC_ALB_DEV : String read GetREFERENCIA_FAC_ALB_DEVValue write SetREFERENCIA_FAC_ALB_DEVValue;
     property OldREFERENCIA_FAC_ALB_DEV : String read GetOldREFERENCIA_FAC_ALB_DEVValue;
+    property NUM_CORREOS : Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -1724,6 +1738,21 @@ begin
   BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteREFERENCIA_FAC_ALB_DEV] := aValue;
 end;
 
+function TAlbaranesClienteBusinessProcessorRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteNUM_CORREOS];
+end;
+
+function TAlbaranesClienteBusinessProcessorRules.GetOldNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesClienteNUM_CORREOS];
+end;
+
+procedure TAlbaranesClienteBusinessProcessorRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteNUM_CORREOS] := aValue;
+end;
+
 
 { TAlbaranesCliente_DetallesBusinessProcessorRules }
 constructor TAlbaranesCliente_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
@@ -2904,6 +2933,21 @@ begin
   BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesCliente_RefreshREFERENCIA_FAC_ALB_DEV] := aValue;
 end;
 
+function TAlbaranesCliente_RefreshBusinessProcessorRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesCliente_RefreshNUM_CORREOS];
+end;
+
+function TAlbaranesCliente_RefreshBusinessProcessorRules.GetOldNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesCliente_RefreshNUM_CORREOS];
+end;
+
+procedure TAlbaranesCliente_RefreshBusinessProcessorRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesCliente_RefreshNUM_CORREOS] := aValue;
+end;
+
 
 initialization
   RegisterBusinessProcessorRules(RID_DarReferenciaDelta, TDarReferenciaBusinessProcessorRules);

Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm

@@ -80,7 +80,8 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
               'HA_ALTA,'#10'    FECHA_MODIFICACION, USUARIO, ID_FORMA_PAGO, FECHA_P' +
               'REVISTA_ENVIO, FECHA_ENVIO,'#10'    FECHA_RECEPCION, ID_AGENTE, AGEN' +
               'TE, NUM_COPIAS, ID_ALBARAN_DEV, REFERENCIA_ALB_DEV,'#10'    ID_FAC_A' +
-              'LB_DEV, REFERENCIA_FAC_ALB_DEV'#10'  FROM'#10'    V_ALBARANES_CLIENTE'
+              'LB_DEV, REFERENCIA_FAC_ALB_DEV, NUM_CORREOS'#10'  FROM'#10'    V_ALBARAN' +
+              'ES_CLIENTE'
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -266,6 +267,10 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
               item
                 DatasetField = 'REFERENCIA_FAC_ALB_DEV'
                 TableField = 'REFERENCIA_FAC_ALB_DEV'
+              end
+              item
+                DatasetField = 'NUM_CORREOS'
+                TableField = 'NUM_CORREOS'
               end>
           end>
         Name = 'AlbaranesCliente'
@@ -747,6 +752,17 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
             Calculated = False
             Lookup = False
             LookupCache = False
+          end
+          item
+            Name = 'NUM_CORREOS'
+            DataType = datInteger
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
           end>
         BusinessRulesClient.ScriptLanguage = rslPascalScript
         BusinessRulesServer.ScriptLanguage = rslPascalScript
@@ -1275,8 +1291,8 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
               'HA_ALTA,'#10'    FECHA_MODIFICACION, USUARIO, ID_FORMA_PAGO, FECHA_P' +
               'REVISTA_ENVIO, FECHA_ENVIO,'#10'    FECHA_RECEPCION, ID_AGENTE, AGEN' +
               'TE, NUM_COPIAS, ID_ALBARAN_DEV, REFERENCIA_ALB_DEV,'#10'    ID_FAC_A' +
-              'LB_DEV, REFERENCIA_FAC_ALB_DEV'#10'  FROM'#10'    V_ALBARANES_CLIENTE'#10'  ' +
+              'LB_DEV, REFERENCIA_FAC_ALB_DEV, NUM_CORREOS'#10'  FROM'#10'    V_ALBARAN' +
-              'WHERE V_ALBARANES_CLIENTE.ID = :ID'
+              'ES_CLIENTE'#10'  WHERE V_ALBARANES_CLIENTE.ID = :ID'
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -1462,6 +1478,10 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
               item
                 DatasetField = 'REFERENCIA_FAC_ALB_DEV'
                 TableField = 'REFERENCIA_FAC_ALB_DEV'
+              end
+              item
+                DatasetField = 'NUM_CORREOS'
+                TableField = 'NUM_CORREOS'
               end>
           end>
         Name = 'AlbaranesCliente_Refresh'
@@ -1949,6 +1969,17 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
             Calculated = False
             Lookup = False
             LookupCache = False
+          end
+          item
+            Name = 'NUM_CORREOS'
+            DataType = datInteger
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
           end>
         BusinessRulesClient.ScriptLanguage = rslPascalScript
         BusinessRulesServer.ScriptLanguage = rslPascalScript

Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm

@@ -40,13 +40,27 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
       OptionsView.GroupFooters = gfAlwaysVisible
       object cxGridViewNUM_COPIAS: TcxGridDBColumn
         DataBinding.FieldName = 'NUM_COPIAS'
-        OnCustomDrawCell = cxGridViewNUM_COPIASCustomDrawCell
         MinWidth = 30
         Options.HorzSizing = False
         VisibleForCustomization = False
         Width = 30
+        OnCustomDrawHeader = cxGridViewNUM_COPIASCustomDrawHeader
         IsCaptionAssigned = True
       end
+      object cxGridViewNUM_CORREOS: TcxGridDBColumn
+        DataBinding.FieldName = 'NUM_CORREOS'
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.Alignment.Horz = taCenter
+        BestFitMaxWidth = 25
+        MinWidth = 25
+        Options.Editing = False
+        Options.HorzSizing = False
+        Options.Moving = False
+        Options.ShowCaption = False
+        VisibleForCustomization = False
+        Width = 25
+        OnCustomDrawHeader = cxGridViewNUM_CORREOSCustomDrawHeader
+      end
       object cxGridViewINCIDENCIAS_ACTIVAS: TcxGridDBColumn
         Caption = 'Incidencias'
         DataBinding.FieldName = 'INCIDENCIAS_ACTIVAS'
@@ -294,6 +308,92 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
       OnUpdate = actAgentesUpdate
     end
   end
+  inherited PngImageList10: TPngImageList
+    PngImages = <
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D4948445200000010000000100804000000B5FA37
+          EA000000097048597300000B1300000B1301009A9C180000031B694343505068
+          6F746F73686F70204943432070726F66696C65000078DA6360609EE0E8E2E4CA
+          24C0C050505452E41EE418191119A5C07E9E818D819981818181812131B9B8C0
+          3120C087818181212F3F2F9501153032307CBBC6C0C8C0C0C07059D7D1C5C995
+          8134C09A5C5054C2C0C070808181C12825B538998181E10B0303437A79494109
+          0303630C03038348527641090303630103038348764890330303630B0303134F
+          496A450903030383737E416551667A468982A1A5A5A582634A7E52AA42706571
+          496A6EB182675E727E51417E5162496A0A030303D40E060606065E97FC1205F7
+          C4CC3C05435355062A8388C82805080B113E083104482E2D2A83072503830083
+          16831F4325C32A86078CD28C518CF3189F32193235305D62D6606E64BECB62C3
+          328F9599359BF52A9B13DB267615F6991C021C9D9CAC9CCD5CCC5C6DDCDCDC13
+          79A47896F21AF31EE20BE67BC65F2D2024B05AD04DF09150A3B0A2F061917451
+          5ED1AD6271E29CE25B25522485258F4A5548EB4A3F9199231B2A27287756BE47
+          C1479157F182D214E528152595D7AA5BD51AD5FD346435DE6AEED39AA89DAA63
+          AD2BA4FB4AEF88FE7C831AC328234B6349E3DF26F74C0F9BAD30EFB7A8B04CB4
+          F2B1B6B051B515B163B1FB6AFFDCE1B6E305A763CE7B5DB6BAAE775BE9BED463
+          91E742AF05DE0B7D16FB2EF35BE5BF3E606BE0DEA063C1E7436E853E0BFB12C1
+          142918A5146D1CE3161B159717DF92303B7173D2D9E4E7A94C6972E936195199
+          5559B3B2F7E4DCCB63CA572FF0292C2E9A5D7CB8E46D9944B94B4561E5BCAAB3
+          D57F6BF5EAE2EB27351C6BFCDD6CD092DE3AAFED7A8760A777577BF7E15E863E
+          FBFEBA09FB26FE9FEC38A575EA89E9BC338267CE9AF5688ED6DC9279FB16702D
+          0C5BB478F1C7A50ECB262C7FB8D27855EBEA9B6B75D735ADBFB9D16053C7E607
+          5BADB64DDDFE61A7EFAE557B38F6A6EF3B7E40FD60E7A1D747FC8E6E3E2E7EA2
+          F6E493D3DE67B69C933DDF7EE1D3A5B8CBA7AE5A5C5B7643F466EBADAF77D2EF
+          DEBCEFF3E0C023D3C7AB9F2A3E9BF942F065D76BE637756F7FBE2FFDF0E953C1
+          E7775FF3BEBDFB91FFF3C3EFE23FDFFE55FDFF0F002E0C1D8BA03C0931000001
+          2D4944415478DA63FCCF801F3092AC20EFFFFF870C070A0EA82CF88F4D41EEFF
+          7C063E20BD80E1F0C1CD0E680AEAFEBF67C8679060F8C8F0986119C3858F8704
+          501494FECF60A867980B94FECCB08A61FBC7A2050105480A4AFE973188319C67
+          E863286238C2B099C139B06203921B20D2207082A10B688630C31F8660C7E803
+          700515FF8BC00A5E333C6778C6F0936111832EC3A58FEB106EE8FAFF8521186C
+          C21786870C6B80D2AF800EDDC28864851BC33E86FF0C3A0C3F18B603A59F30FC
+          62F8C0B019A2C055E08F81C8FEC90C8C0C5719B6315C6330014BFF072A809A00
+          22BC13A4E67B336803832891419CE137D01D5C0C2F034F6D802B6060F049F837
+          4190DF111840BF19FE7FFC9170062809F5268838C8A8CEC8CE129DF5A5E5F79F
+          1FA97F375FFA0112C51A1798000002C5780121B7DDC80000000049454E44AE42
+          6082}
+        Name = 'PngImage0'
+        Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D4948445200000010000000100804000000B5FA37
+          EA000000097048597300000B1300000B1301009A9C180000031B694343505068
+          6F746F73686F70204943432070726F66696C65000078DA6360609EE0E8E2E4CA
+          24C0C050505452E41EE418191119A5C07E9E818D819981818181812131B9B8C0
+          3120C087818181212F3F2F9501153032307CBBC6C0C8C0C0C07059D7D1C5C995
+          8134C09A5C5054C2C0C070808181C12825B538998181E10B0303437A79494109
+          0303630C03038348527641090303630103038348764890330303630B0303134F
+          496A450903030383737E416551667A468982A1A5A5A582634A7E52AA42706571
+          496A6EB182675E727E51417E5162496A0A030303D40E060606065E97FC1205F7
+          C4CC3C05435355062A8388C82805080B113E083104482E2D2A83072503830083
+          16831F4325C32A86078CD28C518CF3189F32193235305D62D6606E64BECB62C3
+          328F9599359BF52A9B13DB267615F6991C021C9D9CAC9CCD5CCC5C6DDCDCDC13
+          79A47896F21AF31EE20BE67BC65F2D2024B05AD04DF09150A3B0A2F061917451
+          5ED1AD6271E29CE25B25522485258F4A5548EB4A3F9199231B2A27287756BE47
+          C1479157F182D214E528152595D7AA5BD51AD5FD346435DE6AEED39AA89DAA63
+          AD2BA4FB4AEF88FE7C831AC328234B6349E3DF26F74C0F9BAD30EFB7A8B04CB4
+          F2B1B6B051B515B163B1FB6AFFDCE1B6E305A763CE7B5DB6BAAE775BE9BED463
+          91E742AF05DE0B7D16FB2EF35BE5BF3E606BE0DEA063C1E7436E853E0BFB12C1
+          142918A5146D1CE3161B159717DF92303B7173D2D9E4E7A94C6972E936195199
+          5559B3B2F7E4DCCB63CA572FF0292C2E9A5D7CB8E46D9944B94B4561E5BCAAB3
+          D57F6BF5EAE2EB27351C6BFCDD6CD092DE3AAFED7A8760A777577BF7E15E863E
+          FBFEBA09FB26FE9FEC38A575EA89E9BC338267CE9AF5688ED6DC9279FB16702D
+          0C5BB478F1C7A50ECB262C7FB8D27855EBEA9B6B75D735ADBFB9D16053C7E607
+          5BADB64DDDFE61A7EFAE557B38F6A6EF3B7E40FD60E7A1D747FC8E6E3E2E7EA2
+          F6E493D3DE67B69C933DDF7EE1D3A5B8CBA7AE5A5C5B7643F466EBADAF77D2EF
+          DEBCEFF3E0C023D3C7AB9F2A3E9BF942F065D76BE637756F7FBE2FFDF0E953C1
+          E7775FF3BEBDFB91FFF3C3EFE23FDFFE55FDFF0F002E0C1D8BA03C0931000000
+          C14944415478DABDD13F0BC14118C0F1EF6D06B1B1FEDE80FABD082619E49D78
+          0B769B49190C8A41C9885226857E06938588FC1D0CFE0E8F27830E6592ABE7BA
+          EE3EF7DC3D7746F8DECCDF404D2E0886B3C64D7B34D2C60215199320A4CB270E
+          ACE952626483A2387494843932D311E499D8A02071A63488E9414D1C069499DB
+          2027294DDC66C79E2D11FA9A656D83AC44A9E3E2D75B780C59D27B05190912C0
+          A7BB17CCD928FB00AD4781272DCFC78AABCEBD00F37C98F787FB0049B7EAFDF6
+          2FEEC02251018239FFBF0000000049454E44AE426082}
+        Name = 'PngImage1'
+        Background = clWindow
+      end>
+    Bitmap = {}
+  end
   inherited dxPrintStyleManager1: TdxPrintStyleManager
     inherited dxPrintStyleManager1Style1: TdxPSPrintStyle
       BuiltInStyle = True

Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas

@@ -12,7 +12,8 @@ uses
   uDADataTable, cxGridLevel, cxClasses, cxControls, cxGridCustomView, Classes,
   cxGrid,
   uBizAlbaranesCliente, cxCurrencyEdit, Forms, uViewFiltroBase, ComCtrls, Tabs,
-  cxPC, ActnList, TB2Item, TBX, TB2Dock, TB2Toolbar, TBXDkPanels, dxPgsDlg;
+  cxPC, ActnList, TB2Item, TBX, TB2Dock, TB2Toolbar, TBXDkPanels, dxPgsDlg,
+  cxTextEdit;
 
 type
   IViewAlbaranesCliente = interface(IViewGrid)
@@ -62,6 +63,7 @@ type
     actAgentes: TAction;
     cxGridViewAGENTE: TcxGridDBColumn;
     cxGridViewNUM_COPIAS: TcxGridDBColumn;
+    cxGridViewNUM_CORREOS: TcxGridDBColumn;
     procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel:
             TcxGridLevel);
     procedure cxGridViewCODIGOCustomDrawCell(Sender: TcxCustomGridTableView;
@@ -79,8 +81,11 @@ type
       Y: Integer);
     procedure actAgentesExecute(Sender: TObject);
     procedure actAgentesUpdate(Sender: TObject);
-    procedure cxGridViewNUM_COPIASCustomDrawCell(Sender: TcxCustomGridTableView;
+    procedure cxGridViewNUM_CORREOSCustomDrawHeader(Sender: TcxGridTableView;
-      ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
+      ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo;
+      var ADone: Boolean);
+    procedure cxGridViewNUM_COPIASCustomDrawHeader(Sender: TcxGridTableView;
+      ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo;
       var ADone: Boolean);
 
   private
@@ -275,21 +280,46 @@ begin
   end;
 end;
 
-procedure TfrViewAlbaranesCliente.cxGridViewNUM_COPIASCustomDrawCell(
+procedure TfrViewAlbaranesCliente.cxGridViewNUM_COPIASCustomDrawHeader(
-  Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
+  Sender: TcxGridTableView; ACanvas: TcxCanvas;
-  AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+  AViewInfo: TcxGridColumnHeaderViewInfo; var ADone: Boolean);
 var
   R : TRect;
 begin
   inherited;
-  if (AViewInfo.GridRecord.DisplayTexts[cxGridViewNUM_COPIAS.Index] <> '') then
+  with AViewInfo do
   begin
+    LookAndFeelPainter.DrawHeader(ACanvas, Bounds, TextAreaBounds, Neighbors,
+      Borders, ButtonState, AlignmentHorz, AlignmentVert, MultiLine,
+      False, '', Params.Font, Params.TextColor, Params.Color);
+
     R := AViewInfo.ContentBounds;
     ACanvas.FillRect(R);
-    ACanvas.DrawImage(PngImageList, R.Left, R.Top, 4);
+    ACanvas.DrawImage(PngImageList10, R.Left + 2, R.Top, 0);
-    ACanvas.DrawTexT(AViewInfo.GridRecord.DisplayTexts[cxGridViewNUM_COPIAS.Index], R, cxAlignCenter or cxAlignVCenter);
-    ADone := True;
   end;
+
+  ADone := True;
+end;
+
+procedure TfrViewAlbaranesCliente.cxGridViewNUM_CORREOSCustomDrawHeader(
+  Sender: TcxGridTableView; ACanvas: TcxCanvas;
+  AViewInfo: TcxGridColumnHeaderViewInfo; var ADone: Boolean);
+var
+  R : TRect;
+begin
+  inherited;
+  with AViewInfo do
+  begin
+    LookAndFeelPainter.DrawHeader(ACanvas, Bounds, TextAreaBounds, Neighbors,
+      Borders, ButtonState, AlignmentHorz, AlignmentVert, MultiLine,
+      False, '', Params.Font, Params.TextColor, Params.Color);
+
+    R := AViewInfo.ContentBounds;
+    ACanvas.FillRect(R);
+    ACanvas.DrawImage(PngImageList10, R.Left + 2, R.Top, 1);
+  end;
+
+  ADone := True;
 end;
 
 procedure TfrViewAlbaranesCliente.cxGridViewStylesGetContentStyle(Sender:

Source/Modulos/Albaranes de proveedor/AlbaranesProveedor_Group.bdsgroup

@@ -23,14 +23,7 @@
       <Projects Name="AlbaranesProveedor_plugin.bpl">Plugin\AlbaranesProveedor_plugin.bdsproj</Projects>
       <Projects Name="PedProv_AlbProv_relation.bpl">..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.bdsproj</Projects>
       <Projects Name="FactuGES.exe">..\..\Cliente\FactuGES.bdsproj</Projects>
-      <Projects Name="FactuGES_Server.exe">..\..\Servidor\FactuGES_Server.bdsproj</Projects>
+      <Projects Name="Targets">DataAbstract_D10.bpl Base.bpl ControllerBase.bpl GUIBase.bpl Contactos_view.bpl Articulos_controller.bpl Articulos_view.bpl AlbaranesProveedor_model.bpl AlbaranesProveedor_data.bpl AlbaranesProveedor_controller.bpl AlbaranesProveedor_view.bpl AlbaranesProveedor_plugin.bpl PedProv_AlbProv_relation.bpl FactuGES.exe</Projects>
-      <Projects Name="PedidosProveedor_controller.bpl">..\Pedidos a proveedor\Controller\PedidosProveedor_controller.bdsproj</Projects>
-      <Projects Name="AlbProv_FacProv_relation.bpl">..\Relaciones\Albaranes de proveedor - Facturas de proveedor\AlbProv_FacProv_relation.bdsproj</Projects>
-      <Projects Name="FacturasProveedor_controller.bpl">..\Facturas de proveedor\Controller\FacturasProveedor_controller.bdsproj</Projects>
-      <Projects Name="Inventario_controller.bpl">..\Inventario\Controller\Inventario_controller.bdsproj</Projects>
-      <Projects Name="PedidosCliente_controller.bpl">..\Pedidos de cliente\Controller\PedidosCliente_controller.bdsproj</Projects>
-      <Projects Name="AlbaranesCliente_view.bpl">..\Albaranes de cliente\Views\AlbaranesCliente_view.bdsproj</Projects>
-      <Projects Name="Targets">DataAbstract_D10.bpl Base.bpl ControllerBase.bpl GUIBase.bpl Contactos_view.bpl Articulos_controller.bpl Articulos_view.bpl AlbaranesProveedor_model.bpl AlbaranesProveedor_data.bpl AlbaranesProveedor_controller.bpl AlbaranesProveedor_view.bpl AlbaranesProveedor_plugin.bpl PedProv_AlbProv_relation.bpl FactuGES.exe FactuGES_Server.exe PedidosProveedor_controller.bpl AlbProv_FacProv_relation.bpl FacturasProveedor_controller.bpl Inventario_controller.bpl PedidosCliente_controller.bpl AlbaranesCliente_view.bpl</Projects>
     </Projects>
     <Dependencies/>
   </Default.Personality>

Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas

@@ -89,6 +89,7 @@ type
     procedure FiltrarEmpresa(AAlbaran: IBizAlbaranProveedor);
     function _Vacio : IBizAlbaranProveedor;
     function ValidarAlbaran(AAlbaran: IBizAlbaranProveedor): Boolean;
+    procedure _AnadirMarcaEnvioCorreo(AAlbaran: IBizAlbaranProveedor);    
 
   public
     property ProveedorController: IProveedoresController read GetProveedorController write SetProveedorController;
@@ -153,7 +154,7 @@ uses
   uBizPedidosProveedor, uPedidosProveedorController, schInventarioClient_Intf,
   uArticulosController, uBizArticulos, uControllerDetallesBase, Classes,
   schArticulosClient_Intf, uControllerDetallesArticulos, Variants, uDialogUtils,
-  uIEditorAlbaranDevProveedor, uAlbaranesProveedorReportController,
+  uIEditorAlbaranDevProveedor, uAlbaranesProveedorReportController, uDataModuleRegistroCorreos,
   uIDialogListaAlbaranesProvEnvioEMail, uSistemaFunc, uStringsUtils, uDialogElegirEMail, uEMailUtils;
 
 
@@ -753,6 +754,37 @@ begin
   end;
 end;
 
+procedure TAlbaranesProveedorController._AnadirMarcaEnvioCorreo(AAlbaran: IBizAlbaranProveedor);
+var
+  ASoloLectura : Boolean;
+begin
+  if not Assigned(AAlbaran) then
+    raise Exception.Create ('Albaran no asignado (_AnadirMarcaEnvioCorreo)');
+
+  if AAlbaran.DataTable.Active then
+     AAlbaran.DataTable.Active := True;
+
+  if AnadirMarcaEnvioCorreo(nme_AlbaranesProveedor, AAlbaran.ID) then
+  begin
+    DesconectarTabla(AAlbaran.DataTable);
+    try
+      ASoloLectura := AAlbaran.DataTable.ReadOnly;
+      if ASoloLectura then
+        SetDataTableReadOnly(AAlbaran.DataTable, False);
+      try
+        AAlbaran.Edit;
+        AAlbaran.NUM_CORREOS := AAlbaran.NUM_CORREOS + 1;
+        AAlbaran.Post;
+      finally
+        if ASoloLectura then
+          SetDataTableReadOnly(AAlbaran.DataTable, True);
+      end;
+    finally
+      ConectarTabla(AAlbaran.DataTable);
+    end;
+  end;
+end;
+
 function TAlbaranesProveedorController._Vacio: IBizAlbaranProveedor;
 begin
   Result := Buscar(ID_NULO);
@@ -902,7 +934,7 @@ begin
     AReportController.ExportToPDF(AAlbaran.ID, AFicheroTMP);
     Result := EnviarEMailMAPI(AAsunto, ATextoEMail, AFicheroTMP, '', '', AAlbaran.Proveedor.NOMBRE, AEMail, AEnviarDirectamente);
     if Result then
-//      _AnadirMarcaEnvioCorreo(AAlbaran);
+       _AnadirMarcaEnvioCorreo(AAlbaran);
   finally
     SysUtils.DeleteFile(AFicheroTMP);
     AReportController := NIL;

Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.dfm

@@ -614,6 +614,17 @@ object DataModuleAlbaranesProveedor: TDataModuleAlbaranesProveedor
         Calculated = False
         Lookup = False
         LookupCache = False
+      end
+      item
+        Name = 'NUM_CORREOS'
+        DataType = datInteger
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
       end>
     Params = <>
     MasterMappingMode = mmDataRequest

Source/Modulos/Albaranes de proveedor/Model/schAlbaranesProveedorClient_Intf.pas

@@ -9,11 +9,11 @@ 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_DarReferencia = '{15891F28-6D5E-412C-892D-1474FB348E4B}';
+  RID_DarReferencia = '{DA095C7E-E4E8-4CD8-8528-CDFABA7AC4D6}';
-  RID_AlbaranesProveedor = '{DC59E1B6-DFB0-4D9D-8F36-D5458362B1F4}';
+  RID_AlbaranesProveedor = '{9DEFDF85-B205-4A82-BA07-0635FCF732F3}';
-  RID_AlbaranesProveedor_Detalles = '{6999036F-7208-46EC-A3FE-24E093E76C10}';
+  RID_AlbaranesProveedor_Detalles = '{FBDF4F91-4049-467A-8A23-0B34C49219CF}';
-  RID_AlbaranesProveedor_Detalles_Refresh = '{68EED4B4-6B94-44D1-B148-484D3F17BD25}';
+  RID_AlbaranesProveedor_Detalles_Refresh = '{6E08DC28-910D-48BB-84F7-BB4B5C843BEC}';
-  RID_AlbaranesProveedor_Refresh = '{5A91B693-39A1-44F3-A104-266FEDD74D48}';
+  RID_AlbaranesProveedor_Refresh = '{9B6AAB0A-F47E-4F80-A860-CF79F10150D9}';
 
   { Data table names }
   nme_DarReferencia = 'DarReferencia';
@@ -70,6 +70,7 @@ const
   fld_AlbaranesProveedorREFERENCIA_ALB_DEV = 'REFERENCIA_ALB_DEV';
   fld_AlbaranesProveedorID_FAC_ALB_DEV = 'ID_FAC_ALB_DEV';
   fld_AlbaranesProveedorREFERENCIA_FAC_ALB_DEV = 'REFERENCIA_FAC_ALB_DEV';
+  fld_AlbaranesProveedorNUM_CORREOS = 'NUM_CORREOS';
 
   { AlbaranesProveedor field indexes }
   idx_AlbaranesProveedorID = 0;
@@ -113,6 +114,7 @@ const
   idx_AlbaranesProveedorREFERENCIA_ALB_DEV = 38;
   idx_AlbaranesProveedorID_FAC_ALB_DEV = 39;
   idx_AlbaranesProveedorREFERENCIA_FAC_ALB_DEV = 40;
+  idx_AlbaranesProveedorNUM_CORREOS = 41;
 
   { AlbaranesProveedor_Detalles fields }
   fld_AlbaranesProveedor_DetallesID = 'ID';
@@ -224,6 +226,7 @@ const
   fld_AlbaranesProveedor_RefreshREFERENCIA_ALB_DEV = 'REFERENCIA_ALB_DEV';
   fld_AlbaranesProveedor_RefreshID_FAC_ALB_DEV = 'ID_FAC_ALB_DEV';
   fld_AlbaranesProveedor_RefreshREFERENCIA_FAC_ALB_DEV = 'REFERENCIA_FAC_ALB_DEV';
+  fld_AlbaranesProveedor_RefreshNUM_CORREOS = 'NUM_CORREOS';
 
   { AlbaranesProveedor_Refresh field indexes }
   idx_AlbaranesProveedor_RefreshID = 0;
@@ -267,11 +270,12 @@ const
   idx_AlbaranesProveedor_RefreshREFERENCIA_ALB_DEV = 38;
   idx_AlbaranesProveedor_RefreshID_FAC_ALB_DEV = 39;
   idx_AlbaranesProveedor_RefreshREFERENCIA_FAC_ALB_DEV = 40;
+  idx_AlbaranesProveedor_RefreshNUM_CORREOS = 41;
 
 type
   { IDarReferencia }
   IDarReferencia = interface(IDAStronglyTypedDataTable)
-  ['{ED8EACC9-271E-41C8-A0D0-62B0FD223968}']
+  ['{5CD5F727-9809-49B0-8443-CD13342FA522}']
     { Property getters and setters }
     function GetVALORValue: String;
     procedure SetVALORValue(const aValue: String);
@@ -300,7 +304,7 @@ type
 
   { IAlbaranesProveedor }
   IAlbaranesProveedor = interface(IDAStronglyTypedDataTable)
-  ['{8777095F-0468-45FC-8B30-50CEB28FFDEA}']
+  ['{737FDD88-7B6C-43ED-A2DD-B0EB6D98C824}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -384,6 +388,8 @@ type
     procedure SetID_FAC_ALB_DEVValue(const aValue: Integer);
     function GetREFERENCIA_FAC_ALB_DEVValue: String;
     procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String);
+    function GetNUM_CORREOSValue: Integer;
+    procedure SetNUM_CORREOSValue(const aValue: Integer);
 
 
     { Properties }
@@ -428,6 +434,7 @@ type
     property REFERENCIA_ALB_DEV: String read GetREFERENCIA_ALB_DEVValue write SetREFERENCIA_ALB_DEVValue;
     property ID_FAC_ALB_DEV: Integer read GetID_FAC_ALB_DEVValue write SetID_FAC_ALB_DEVValue;
     property REFERENCIA_FAC_ALB_DEV: String read GetREFERENCIA_FAC_ALB_DEVValue write SetREFERENCIA_FAC_ALB_DEVValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
   end;
 
   { TAlbaranesProveedorDataTableRules }
@@ -517,6 +524,8 @@ type
     procedure SetID_FAC_ALB_DEVValue(const aValue: Integer); virtual;
     function GetREFERENCIA_FAC_ALB_DEVValue: String; virtual;
     procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -560,6 +569,7 @@ type
     property REFERENCIA_ALB_DEV: String read GetREFERENCIA_ALB_DEVValue write SetREFERENCIA_ALB_DEVValue;
     property ID_FAC_ALB_DEV: Integer read GetID_FAC_ALB_DEVValue write SetID_FAC_ALB_DEVValue;
     property REFERENCIA_FAC_ALB_DEV: String read GetREFERENCIA_FAC_ALB_DEVValue write SetREFERENCIA_FAC_ALB_DEVValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -569,7 +579,7 @@ type
 
   { IAlbaranesProveedor_Detalles }
   IAlbaranesProveedor_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{C3058BD1-A788-4CB7-A157-1E57895DA4F1}']
+  ['{22AD4182-E814-436B-A816-84190412CE2F}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -682,7 +692,7 @@ type
 
   { IAlbaranesProveedor_Detalles_Refresh }
   IAlbaranesProveedor_Detalles_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{44F9FCAE-FD1F-4178-B9E2-5B4DB40B22A9}']
+  ['{008B27AC-5E14-43A8-9619-872B8AF42821}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -795,7 +805,7 @@ type
 
   { IAlbaranesProveedor_Refresh }
   IAlbaranesProveedor_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{C77EF452-D5BC-4905-BF2B-C1F34E3FB831}']
+  ['{0767EBD5-75B6-462C-B2D7-42FBAC01680B}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -879,6 +889,8 @@ type
     procedure SetID_FAC_ALB_DEVValue(const aValue: Integer);
     function GetREFERENCIA_FAC_ALB_DEVValue: String;
     procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String);
+    function GetNUM_CORREOSValue: Integer;
+    procedure SetNUM_CORREOSValue(const aValue: Integer);
 
 
     { Properties }
@@ -923,6 +935,7 @@ type
     property REFERENCIA_ALB_DEV: String read GetREFERENCIA_ALB_DEVValue write SetREFERENCIA_ALB_DEVValue;
     property ID_FAC_ALB_DEV: Integer read GetID_FAC_ALB_DEVValue write SetID_FAC_ALB_DEVValue;
     property REFERENCIA_FAC_ALB_DEV: String read GetREFERENCIA_FAC_ALB_DEVValue write SetREFERENCIA_FAC_ALB_DEVValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
   end;
 
   { TAlbaranesProveedor_RefreshDataTableRules }
@@ -1012,6 +1025,8 @@ type
     procedure SetID_FAC_ALB_DEVValue(const aValue: Integer); virtual;
     function GetREFERENCIA_FAC_ALB_DEVValue: String; virtual;
     procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -1055,6 +1070,7 @@ type
     property REFERENCIA_ALB_DEV: String read GetREFERENCIA_ALB_DEVValue write SetREFERENCIA_ALB_DEVValue;
     property ID_FAC_ALB_DEV: Integer read GetID_FAC_ALB_DEVValue write SetID_FAC_ALB_DEVValue;
     property REFERENCIA_FAC_ALB_DEV: String read GetREFERENCIA_FAC_ALB_DEVValue write SetREFERENCIA_FAC_ALB_DEVValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -1511,6 +1527,16 @@ begin
   DataTable.Fields[idx_AlbaranesProveedorREFERENCIA_FAC_ALB_DEV].AsString := aValue;
 end;
 
+function TAlbaranesProveedorDataTableRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := DataTable.Fields[idx_AlbaranesProveedorNUM_CORREOS].AsInteger;
+end;
+
+procedure TAlbaranesProveedorDataTableRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_AlbaranesProveedorNUM_CORREOS].AsInteger := aValue;
+end;
+
 
 { TAlbaranesProveedor_DetallesDataTableRules }
 constructor TAlbaranesProveedor_DetallesDataTableRules.Create(aDataTable: TDADataTable);
@@ -2259,6 +2285,16 @@ begin
   DataTable.Fields[idx_AlbaranesProveedor_RefreshREFERENCIA_FAC_ALB_DEV].AsString := aValue;
 end;
 
+function TAlbaranesProveedor_RefreshDataTableRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := DataTable.Fields[idx_AlbaranesProveedor_RefreshNUM_CORREOS].AsInteger;
+end;
+
+procedure TAlbaranesProveedor_RefreshDataTableRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_AlbaranesProveedor_RefreshNUM_CORREOS].AsInteger := aValue;
+end;
+
 
 initialization
   RegisterDataTableRules(RID_DarReferencia, TDarReferenciaDataTableRules);

Source/Modulos/Albaranes de proveedor/Model/schAlbaranesProveedorServer_Intf.pas

@@ -9,16 +9,16 @@ 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_DarReferenciaDelta = '{97B34AA4-C89F-4EF5-BD14-EAC025E8DE2A}';
+  RID_DarReferenciaDelta = '{072ED31D-044E-4E64-9C2F-3A60BADA6E2B}';
-  RID_AlbaranesProveedorDelta = '{4C2884E6-A902-4C13-8217-86E1044EE171}';
+  RID_AlbaranesProveedorDelta = '{CE83BD2D-ADEA-4A6F-9939-F42C34875F8C}';
-  RID_AlbaranesProveedor_DetallesDelta = '{14A26AA3-09EB-432C-84C0-B5BE48912937}';
+  RID_AlbaranesProveedor_DetallesDelta = '{9B5D0070-C7CB-4B34-B97A-8C92AF15B871}';
-  RID_AlbaranesProveedor_Detalles_RefreshDelta = '{C18290F7-22E0-4F13-9F16-5B5B0F4F526A}';
+  RID_AlbaranesProveedor_Detalles_RefreshDelta = '{1C39A006-A42E-4F9A-B39B-6DCBA89A8E98}';
-  RID_AlbaranesProveedor_RefreshDelta = '{74DBC27B-B1F7-4C31-9DB8-8DAC6066D9E8}';
+  RID_AlbaranesProveedor_RefreshDelta = '{7C2640AE-B65F-4215-A655-9C1A4950D037}';
 
 type
   { IDarReferenciaDelta }
   IDarReferenciaDelta = interface(IDarReferencia)
-  ['{97B34AA4-C89F-4EF5-BD14-EAC025E8DE2A}']
+  ['{072ED31D-044E-4E64-9C2F-3A60BADA6E2B}']
     { Property getters and setters }
     function GetOldVALORValue : String;
 
@@ -47,7 +47,7 @@ type
 
   { IAlbaranesProveedorDelta }
   IAlbaranesProveedorDelta = interface(IAlbaranesProveedor)
-  ['{4C2884E6-A902-4C13-8217-86E1044EE171}']
+  ['{CE83BD2D-ADEA-4A6F-9939-F42C34875F8C}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -90,6 +90,7 @@ type
     function GetOldREFERENCIA_ALB_DEVValue : String;
     function GetOldID_FAC_ALB_DEVValue : Integer;
     function GetOldREFERENCIA_FAC_ALB_DEVValue : String;
+    function GetOldNUM_CORREOSValue : Integer;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -133,6 +134,7 @@ type
     property OldREFERENCIA_ALB_DEV : String read GetOldREFERENCIA_ALB_DEVValue;
     property OldID_FAC_ALB_DEV : Integer read GetOldID_FAC_ALB_DEVValue;
     property OldREFERENCIA_FAC_ALB_DEV : String read GetOldREFERENCIA_FAC_ALB_DEVValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
   end;
 
   { TAlbaranesProveedorBusinessProcessorRules }
@@ -263,6 +265,9 @@ type
     function GetREFERENCIA_FAC_ALB_DEVValue: String; virtual;
     function GetOldREFERENCIA_FAC_ALB_DEVValue: String; virtual;
     procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    function GetOldNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -347,6 +352,8 @@ type
     property OldID_FAC_ALB_DEV : Integer read GetOldID_FAC_ALB_DEVValue;
     property REFERENCIA_FAC_ALB_DEV : String read GetREFERENCIA_FAC_ALB_DEVValue write SetREFERENCIA_FAC_ALB_DEVValue;
     property OldREFERENCIA_FAC_ALB_DEV : String read GetOldREFERENCIA_FAC_ALB_DEVValue;
+    property NUM_CORREOS : Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -356,7 +363,7 @@ type
 
   { IAlbaranesProveedor_DetallesDelta }
   IAlbaranesProveedor_DetallesDelta = interface(IAlbaranesProveedor_Detalles)
-  ['{14A26AA3-09EB-432C-84C0-B5BE48912937}']
+  ['{9B5D0070-C7CB-4B34-B97A-8C92AF15B871}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_ALBARANValue : Integer;
@@ -483,7 +490,7 @@ type
 
   { IAlbaranesProveedor_Detalles_RefreshDelta }
   IAlbaranesProveedor_Detalles_RefreshDelta = interface(IAlbaranesProveedor_Detalles_Refresh)
-  ['{C18290F7-22E0-4F13-9F16-5B5B0F4F526A}']
+  ['{1C39A006-A42E-4F9A-B39B-6DCBA89A8E98}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_ALBARANValue : Integer;
@@ -610,7 +617,7 @@ type
 
   { IAlbaranesProveedor_RefreshDelta }
   IAlbaranesProveedor_RefreshDelta = interface(IAlbaranesProveedor_Refresh)
-  ['{74DBC27B-B1F7-4C31-9DB8-8DAC6066D9E8}']
+  ['{7C2640AE-B65F-4215-A655-9C1A4950D037}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -653,6 +660,7 @@ type
     function GetOldREFERENCIA_ALB_DEVValue : String;
     function GetOldID_FAC_ALB_DEVValue : Integer;
     function GetOldREFERENCIA_FAC_ALB_DEVValue : String;
+    function GetOldNUM_CORREOSValue : Integer;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -696,6 +704,7 @@ type
     property OldREFERENCIA_ALB_DEV : String read GetOldREFERENCIA_ALB_DEVValue;
     property OldID_FAC_ALB_DEV : Integer read GetOldID_FAC_ALB_DEVValue;
     property OldREFERENCIA_FAC_ALB_DEV : String read GetOldREFERENCIA_FAC_ALB_DEVValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
   end;
 
   { TAlbaranesProveedor_RefreshBusinessProcessorRules }
@@ -826,6 +835,9 @@ type
     function GetREFERENCIA_FAC_ALB_DEVValue: String; virtual;
     function GetOldREFERENCIA_FAC_ALB_DEVValue: String; virtual;
     procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    function GetOldNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -910,6 +922,8 @@ type
     property OldID_FAC_ALB_DEV : Integer read GetOldID_FAC_ALB_DEVValue;
     property REFERENCIA_FAC_ALB_DEV : String read GetREFERENCIA_FAC_ALB_DEVValue write SetREFERENCIA_FAC_ALB_DEVValue;
     property OldREFERENCIA_FAC_ALB_DEV : String read GetOldREFERENCIA_FAC_ALB_DEVValue;
+    property NUM_CORREOS : Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -1579,6 +1593,21 @@ begin
   BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedorREFERENCIA_FAC_ALB_DEV] := aValue;
 end;
 
+function TAlbaranesProveedorBusinessProcessorRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedorNUM_CORREOS];
+end;
+
+function TAlbaranesProveedorBusinessProcessorRules.GetOldNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesProveedorNUM_CORREOS];
+end;
+
+procedure TAlbaranesProveedorBusinessProcessorRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedorNUM_CORREOS] := aValue;
+end;
+
 
 { TAlbaranesProveedor_DetallesBusinessProcessorRules }
 constructor TAlbaranesProveedor_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
@@ -2684,6 +2713,21 @@ begin
   BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedor_RefreshREFERENCIA_FAC_ALB_DEV] := aValue;
 end;
 
+function TAlbaranesProveedor_RefreshBusinessProcessorRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedor_RefreshNUM_CORREOS];
+end;
+
+function TAlbaranesProveedor_RefreshBusinessProcessorRules.GetOldNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesProveedor_RefreshNUM_CORREOS];
+end;
+
+procedure TAlbaranesProveedor_RefreshBusinessProcessorRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedor_RefreshNUM_CORREOS] := aValue;
+end;
+
 
 initialization
   RegisterBusinessProcessorRules(RID_DarReferenciaDelta, TDarReferenciaBusinessProcessorRules);

Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.dfm

@@ -79,7 +79,8 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor
               'A, IMPORTE_TOTAL,'#10'    OBSERVACIONES, INCIDENCIAS, INCIDENCIAS_AC' +
               'TIVAS, FECHA_ALTA, FECHA_MODIFICACION,'#10'    USUARIO, ID_FORMA_PAG' +
               'O, NUM_COPIAS, ID_ALBARAN_DEV, REFERENCIA_ALB_DEV, ID_FAC_ALB_DE' +
-              'V,'#10'    REFERENCIA_FAC_ALB_DEV'#10'  FROM'#10'    V_ALBARANES_PROVEEDOR'
+              'V,'#10'    REFERENCIA_FAC_ALB_DEV, NUM_CORREOS'#10'  FROM'#10'    V_ALBARANE' +
+              'S_PROVEEDOR'
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -245,6 +246,10 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor
               item
                 DatasetField = 'REFERENCIA_FAC_ALB_DEV'
                 TableField = 'REFERENCIA_FAC_ALB_DEV'
+              end
+              item
+                DatasetField = 'NUM_CORREOS'
+                TableField = 'NUM_CORREOS'
               end>
           end>
         Name = 'AlbaranesProveedor'
@@ -675,6 +680,17 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor
             Calculated = False
             Lookup = False
             LookupCache = False
+          end
+          item
+            Name = 'NUM_CORREOS'
+            DataType = datInteger
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
           end>
         BusinessRulesClient.ScriptLanguage = rslPascalScript
         BusinessRulesServer.ScriptLanguage = rslPascalScript
@@ -1215,8 +1231,8 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor
               ', IMPORTE_TOTAL,'#10'    OBSERVACIONES, INCIDENCIAS, INCIDENCIAS_ACT' +
               'IVAS, FECHA_ALTA, FECHA_MODIFICACION,'#10'    USUARIO, ID_FORMA_PAGO' +
               ', NUM_COPIAS, ID_ALBARAN_DEV, REFERENCIA_ALB_DEV, ID_FAC_ALB_DEV' +
-              ','#10'    REFERENCIA_FAC_ALB_DEV'#10'  FROM'#10'    V_ALBARANES_PROVEEDOR'#10'WH' +
+              ','#10'    REFERENCIA_FAC_ALB_DEV, NUM_CORREOS'#10'  FROM'#10'    V_ALBARANES' +
-              'ERE V_ALBARANES_PROVEEDOR.ID = :ID'
+              '_PROVEEDOR'#10'WHERE V_ALBARANES_PROVEEDOR.ID = :ID'
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -1366,6 +1382,26 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor
               item
                 DatasetField = 'NUM_COPIAS'
                 TableField = 'NUM_COPIAS'
+              end
+              item
+                DatasetField = 'ID_ALBARAN_DEV'
+                TableField = 'ID_ALBARAN_DEV'
+              end
+              item
+                DatasetField = 'REFERENCIA_ALB_DEV'
+                TableField = 'REFERENCIA_ALB_DEV'
+              end
+              item
+                DatasetField = 'ID_FAC_ALB_DEV'
+                TableField = 'ID_FAC_ALB_DEV'
+              end
+              item
+                DatasetField = 'REFERENCIA_FAC_ALB_DEV'
+                TableField = 'REFERENCIA_FAC_ALB_DEV'
+              end
+              item
+                DatasetField = 'NUM_CORREOS'
+                TableField = 'NUM_CORREOS'
               end>
           end>
         Name = 'AlbaranesProveedor_Refresh'
@@ -1803,6 +1839,17 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor
             Calculated = False
             Lookup = False
             LookupCache = False
+          end
+          item
+            Name = 'NUM_CORREOS'
+            DataType = datInteger
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
           end>
         BusinessRulesClient.ScriptLanguage = rslPascalScript
         BusinessRulesServer.ScriptLanguage = rslPascalScript

Source/Modulos/Albaranes de proveedor/Views/uEditorElegirAlbaranesProveedor.dfm

@@ -2,7 +2,6 @@ inherited fEditorElegirAlbaranesProveedor: TfEditorElegirAlbaranesProveedor
   Caption = 'Seleccionar albar'#225'n de proveedor'
   ClientWidth = 790
   ExplicitWidth = 798
-  ExplicitHeight = 478
   PixelsPerInch = 96
   TextHeight = 13
   object JvgWizardHeader1: TJvgWizardHeader [0]
@@ -50,12 +49,10 @@ inherited fEditorElegirAlbaranesProveedor: TfEditorElegirAlbaranesProveedor
   inherited TBXDock: TTBXDock
     Top = 87
     Width = 790
-    Height = 49
     ExplicitTop = 87
     ExplicitWidth = 790
-    ExplicitHeight = 49
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 117
+      ExplicitWidth = 126
       inherited TBXItem2: TTBXItem
         Visible = False
       end
@@ -77,9 +74,18 @@ inherited fEditorElegirAlbaranesProveedor: TfEditorElegirAlbaranesProveedor
       inherited TBXSeparatorItem3: TTBXSeparatorItem
         Visible = False
       end
+      inherited TBXItem23: TTBXItem
+        Visible = False
+      end
+      inherited TBXItem3: TTBXItem
+        Visible = False
+      end
       inherited TBXSeparatorItem10: TTBXSeparatorItem
         Visible = False
       end
+      inherited TBXItem40: TTBXItem
+        Visible = False
+      end
       inherited TBXSeparatorItem2: TTBXSeparatorItem
         Visible = False
       end
@@ -91,11 +97,11 @@ inherited fEditorElegirAlbaranesProveedor: TfEditorElegirAlbaranesProveedor
       end
     end
     inherited tbxFiltro: TTBXToolbar
-      Left = 117
+      Left = 126
       Top = 23
       DockPos = 104
       DockRow = 1
-      ExplicitLeft = 117
+      ExplicitLeft = 126
       ExplicitTop = 23
       inherited TBXItem34: TTBXItem
         Action = actQuitarFiltro2
@@ -104,10 +110,13 @@ inherited fEditorElegirAlbaranesProveedor: TfEditorElegirAlbaranesProveedor
     inherited tbxMenu: TTBXToolbar
       ExplicitWidth = 790
     end
+    inherited TBXTMain2: TTBXToolbar
+      Left = 334
+      ExplicitLeft = 334
+    end
   end
   inherited StatusBar: TJvStatusBar
     Width = 790
-    ExplicitTop = 425
     ExplicitWidth = 790
   end
   inline frViewBarraSeleccion1: TfrViewBarraSeleccion [4]
@@ -171,10 +180,16 @@ inherited fEditorElegirAlbaranesProveedor: TfEditorElegirAlbaranesProveedor
   end
   inherited StatusBarImages: TPngImageList [11]
   end
-  inherited GridPopupMenu: TPopupMenu
+  inherited GridPopupMenu: TPopupMenu [12]
     Left = 56
     Top = 192
   end
+  inherited JsNuevoAlbaranDialog: TJSDialog [13]
+  end
+  inherited JsPrevisualizarDialog: TJSDialog [14]
+  end
+  inherited JsImprimirDialog: TJSDialog [15]
+  end
   object EditorSeleccionActionList: TActionList
     Images = SmallImages
     Left = 152

Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm

@@ -38,13 +38,27 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor
       OptionsView.GroupFooters = gfAlwaysVisible
       object cxGridViewNUM_COPIAS: TcxGridDBColumn
         DataBinding.FieldName = 'NUM_COPIAS'
-        OnCustomDrawCell = cxGridViewNUM_COPIASCustomDrawCell
         MinWidth = 30
         Options.HorzSizing = False
         VisibleForCustomization = False
         Width = 30
+        OnCustomDrawHeader = cxGridViewNUM_COPIASCustomDrawHeader
         IsCaptionAssigned = True
       end
+      object cxGridViewNUM_CORREOS: TcxGridDBColumn
+        DataBinding.FieldName = 'NUM_CORREOS'
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.Alignment.Horz = taCenter
+        BestFitMaxWidth = 25
+        MinWidth = 25
+        Options.Editing = False
+        Options.HorzSizing = False
+        Options.Moving = False
+        Options.ShowCaption = False
+        VisibleForCustomization = False
+        Width = 25
+        OnCustomDrawHeader = cxGridViewNUM_CORREOSCustomDrawHeader
+      end
       object cxGridViewINCIDENCIAS_ACTIVAS: TcxGridDBColumn
         Caption = 'Incidencias'
         DataBinding.FieldName = 'INCIDENCIAS_ACTIVAS'
@@ -212,8 +226,8 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor
     Left = 248
   end
   inherited ActionList1: TActionList
-    Left = 392
+    Left = 152
-    Top = 448
+    Top = 160
     object actProveedor: TAction
       Caption = 'Proveedor'
       OnExecute = actProveedorExecute
@@ -226,8 +240,92 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor
     end
   end
   inherited PngImageList10: TPngImageList
-    Left = 352
+    PngImages = <
-    Top = 448
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D4948445200000010000000100804000000B5FA37
+          EA000000097048597300000B1300000B1301009A9C180000031B694343505068
+          6F746F73686F70204943432070726F66696C65000078DA6360609EE0E8E2E4CA
+          24C0C050505452E41EE418191119A5C07E9E818D819981818181812131B9B8C0
+          3120C087818181212F3F2F9501153032307CBBC6C0C8C0C0C07059D7D1C5C995
+          8134C09A5C5054C2C0C070808181C12825B538998181E10B0303437A79494109
+          0303630C03038348527641090303630103038348764890330303630B0303134F
+          496A450903030383737E416551667A468982A1A5A5A582634A7E52AA42706571
+          496A6EB182675E727E51417E5162496A0A030303D40E060606065E97FC1205F7
+          C4CC3C05435355062A8388C82805080B113E083104482E2D2A83072503830083
+          16831F4325C32A86078CD28C518CF3189F32193235305D62D6606E64BECB62C3
+          328F9599359BF52A9B13DB267615F6991C021C9D9CAC9CCD5CCC5C6DDCDCDC13
+          79A47896F21AF31EE20BE67BC65F2D2024B05AD04DF09150A3B0A2F061917451
+          5ED1AD6271E29CE25B25522485258F4A5548EB4A3F9199231B2A27287756BE47
+          C1479157F182D214E528152595D7AA5BD51AD5FD346435DE6AEED39AA89DAA63
+          AD2BA4FB4AEF88FE7C831AC328234B6349E3DF26F74C0F9BAD30EFB7A8B04CB4
+          F2B1B6B051B515B163B1FB6AFFDCE1B6E305A763CE7B5DB6BAAE775BE9BED463
+          91E742AF05DE0B7D16FB2EF35BE5BF3E606BE0DEA063C1E7436E853E0BFB12C1
+          142918A5146D1CE3161B159717DF92303B7173D2D9E4E7A94C6972E936195199
+          5559B3B2F7E4DCCB63CA572FF0292C2E9A5D7CB8E46D9944B94B4561E5BCAAB3
+          D57F6BF5EAE2EB27351C6BFCDD6CD092DE3AAFED7A8760A777577BF7E15E863E
+          FBFEBA09FB26FE9FEC38A575EA89E9BC338267CE9AF5688ED6DC9279FB16702D
+          0C5BB478F1C7A50ECB262C7FB8D27855EBEA9B6B75D735ADBFB9D16053C7E607
+          5BADB64DDDFE61A7EFAE557B38F6A6EF3B7E40FD60E7A1D747FC8E6E3E2E7EA2
+          F6E493D3DE67B69C933DDF7EE1D3A5B8CBA7AE5A5C5B7643F466EBADAF77D2EF
+          DEBCEFF3E0C023D3C7AB9F2A3E9BF942F065D76BE637756F7FBE2FFDF0E953C1
+          E7775FF3BEBDFB91FFF3C3EFE23FDFFE55FDFF0F002E0C1D8BA03C0931000001
+          2D4944415478DA63FCCF801F3092AC20EFFFFF870C070A0EA82CF88F4D41EEFF
+          7C063E20BD80E1F0C1CD0E680AEAFEBF67C8679060F8C8F0986119C3858F8704
+          501494FECF60A867980B94FECCB08A61FBC7A2050105480A4AFE973188319C67
+          E863286238C2B099C139B06203921B20D2207082A10B688630C31F8660C7E803
+          700515FF8BC00A5E333C6778C6F0936111832EC3A58FEB106EE8FAFF8521186C
+          C21786870C6B80D2AF800EDDC28864851BC33E86FF0C3A0C3F18B603A59F30FC
+          62F8C0B019A2C055E08F81C8FEC90C8C0C5719B6315C6330014BFF072A809A00
+          22BC13A4E67B336803832891419CE137D01D5C0C2F034F6D802B6060F049F837
+          4190DF111840BF19FE7FFC9170062809F5268838C8A8CEC8CE129DF5A5E5F79F
+          1FA97F375FFA0112C51A1798000002C5780121B7DDC80000000049454E44AE42
+          6082}
+        Name = 'PngImage0'
+        Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D4948445200000010000000100804000000B5FA37
+          EA000000097048597300000B1300000B1301009A9C180000031B694343505068
+          6F746F73686F70204943432070726F66696C65000078DA6360609EE0E8E2E4CA
+          24C0C050505452E41EE418191119A5C07E9E818D819981818181812131B9B8C0
+          3120C087818181212F3F2F9501153032307CBBC6C0C8C0C0C07059D7D1C5C995
+          8134C09A5C5054C2C0C070808181C12825B538998181E10B0303437A79494109
+          0303630C03038348527641090303630103038348764890330303630B0303134F
+          496A450903030383737E416551667A468982A1A5A5A582634A7E52AA42706571
+          496A6EB182675E727E51417E5162496A0A030303D40E060606065E97FC1205F7
+          C4CC3C05435355062A8388C82805080B113E083104482E2D2A83072503830083
+          16831F4325C32A86078CD28C518CF3189F32193235305D62D6606E64BECB62C3
+          328F9599359BF52A9B13DB267615F6991C021C9D9CAC9CCD5CCC5C6DDCDCDC13
+          79A47896F21AF31EE20BE67BC65F2D2024B05AD04DF09150A3B0A2F061917451
+          5ED1AD6271E29CE25B25522485258F4A5548EB4A3F9199231B2A27287756BE47
+          C1479157F182D214E528152595D7AA5BD51AD5FD346435DE6AEED39AA89DAA63
+          AD2BA4FB4AEF88FE7C831AC328234B6349E3DF26F74C0F9BAD30EFB7A8B04CB4
+          F2B1B6B051B515B163B1FB6AFFDCE1B6E305A763CE7B5DB6BAAE775BE9BED463
+          91E742AF05DE0B7D16FB2EF35BE5BF3E606BE0DEA063C1E7436E853E0BFB12C1
+          142918A5146D1CE3161B159717DF92303B7173D2D9E4E7A94C6972E936195199
+          5559B3B2F7E4DCCB63CA572FF0292C2E9A5D7CB8E46D9944B94B4561E5BCAAB3
+          D57F6BF5EAE2EB27351C6BFCDD6CD092DE3AAFED7A8760A777577BF7E15E863E
+          FBFEBA09FB26FE9FEC38A575EA89E9BC338267CE9AF5688ED6DC9279FB16702D
+          0C5BB478F1C7A50ECB262C7FB8D27855EBEA9B6B75D735ADBFB9D16053C7E607
+          5BADB64DDDFE61A7EFAE557B38F6A6EF3B7E40FD60E7A1D747FC8E6E3E2E7EA2
+          F6E493D3DE67B69C933DDF7EE1D3A5B8CBA7AE5A5C5B7643F466EBADAF77D2EF
+          DEBCEFF3E0C023D3C7AB9F2A3E9BF942F065D76BE637756F7FBE2FFDF0E953C1
+          E7775FF3BEBDFB91FFF3C3EFE23FDFFE55FDFF0F002E0C1D8BA03C0931000000
+          C14944415478DABDD13F0BC14118C0F1EF6D06B1B1FEDE80FABD082619E49D78
+          0B769B49190C8A41C9885226857E06938588FC1D0CFE0E8F27830E6592ABE7BA
+          EE3EF7DC3D7746F8DECCDF404D2E0886B3C64D7B34D2C60215199320A4CB270E
+          ACE952626483A2387494843932D311E499D8A02071A63488E9414D1C069499DB
+          2027294DDC66C79E2D11FA9A656D83AC44A9E3E2D75B780C59D27B05190912C0
+          A7BB17CCD928FB00AD4781272DCFC78AABCEBD00F37C98F787FB0049B7EAFDF6
+          2FEEC02251018239FFBF0000000049454E44AE426082}
+        Name = 'PngImage1'
+        Background = clWindow
+      end>
+    Left = 256
+    Top = 160
+    Bitmap = {}
   end
   inherited dxPrintStyleManager1: TdxPrintStyleManager
     inherited dxPrintStyleManager1Style1: TdxPSPrintStyle

Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas

@@ -46,6 +46,7 @@ type
     cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn;
     cxGridViewREF_FACTURA_PROV: TcxGridDBColumn;
     cxGridViewNUM_COPIAS: TcxGridDBColumn;
+    cxGridViewNUM_CORREOS: TcxGridDBColumn;
     procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel:
             TcxGridLevel);
     procedure cxGridViewCODIGOCustomDrawCell(Sender: TcxCustomGridTableView;
@@ -60,8 +61,11 @@ type
     procedure actAlmacenUpdate(Sender: TObject);
     procedure cxGridViewMouseMove(Sender: TObject; Shift: TShiftState; X,
       Y: Integer);
-    procedure cxGridViewNUM_COPIASCustomDrawCell(Sender: TcxCustomGridTableView;
+    procedure cxGridViewNUM_CORREOSCustomDrawHeader(Sender: TcxGridTableView;
-      ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
+      ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo;
+      var ADone: Boolean);
+    procedure cxGridViewNUM_COPIASCustomDrawHeader(Sender: TcxGridTableView;
+      ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo;
       var ADone: Boolean);
 
   private
@@ -207,21 +211,46 @@ begin
   end;
 end;
 
-procedure TfrViewAlbaranesProveedor.cxGridViewNUM_COPIASCustomDrawCell(
+procedure TfrViewAlbaranesProveedor.cxGridViewNUM_COPIASCustomDrawHeader(
-  Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
+  Sender: TcxGridTableView; ACanvas: TcxCanvas;
-  AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+  AViewInfo: TcxGridColumnHeaderViewInfo; var ADone: Boolean);
 var
   R : TRect;
 begin
   inherited;
-  if (AViewInfo.GridRecord.DisplayTexts[cxGridViewNUM_COPIAS.Index] <> '') then
+  with AViewInfo do
   begin
+    LookAndFeelPainter.DrawHeader(ACanvas, Bounds, TextAreaBounds, Neighbors,
+      Borders, ButtonState, AlignmentHorz, AlignmentVert, MultiLine,
+      False, '', Params.Font, Params.TextColor, Params.Color);
+
     R := AViewInfo.ContentBounds;
     ACanvas.FillRect(R);
-    ACanvas.DrawImage(PngImageList, R.Left, R.Top, 4);
+    ACanvas.DrawImage(PngImageList10, R.Left + 2, R.Top, 0);
-    ACanvas.DrawTexT(AViewInfo.GridRecord.DisplayTexts[cxGridViewNUM_COPIAS.Index], R, cxAlignCenter or cxAlignVCenter);
-    ADone := True;
   end;
+
+  ADone := True;
+end;
+
+procedure TfrViewAlbaranesProveedor.cxGridViewNUM_CORREOSCustomDrawHeader(
+  Sender: TcxGridTableView; ACanvas: TcxCanvas;
+  AViewInfo: TcxGridColumnHeaderViewInfo; var ADone: Boolean);
+var
+  R : TRect;
+begin
+  inherited;
+  with AViewInfo do
+  begin
+    LookAndFeelPainter.DrawHeader(ACanvas, Bounds, TextAreaBounds, Neighbors,
+      Borders, ButtonState, AlignmentHorz, AlignmentVert, MultiLine,
+      False, '', Params.Font, Params.TextColor, Params.Color);
+
+    R := AViewInfo.ContentBounds;
+    ACanvas.FillRect(R);
+    ACanvas.DrawImage(PngImageList10, R.Left + 2, R.Top, 1);
+  end;
+
+  ADone := True;
 end;
 
 procedure TfrViewAlbaranesProveedor.cxGridViewStylesGetContentStyle(Sender:

Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas

@@ -9,11 +9,11 @@ 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_DarReferencia = '{FC555913-2986-4EBE-BC26-44B6BEB78B8D}';
+  RID_DarReferencia = '{F07C0630-2482-4183-B171-5F9A8689D08B}';
-  RID_FacturasCliente = '{78E5BD77-ED50-4C61-BFE6-2BBEA1E6DD50}';
+  RID_FacturasCliente = '{6DFFB254-B69F-4A64-A33F-92E0568329FD}';
-  RID_FacturasCliente_Detalles = '{25F1F0F4-FA66-4321-BED9-09766515CF4A}';
+  RID_FacturasCliente_Detalles = '{9EB4A221-1FE5-4D7F-8A74-0331667B2F11}';
-  RID_FacturasCliente_Detalles_Refresh = '{C916F9D8-6D3C-4CB2-AFF4-EC383EA6E951}';
+  RID_FacturasCliente_Detalles_Refresh = '{28FE35F0-46C2-493C-B30C-DFBE5B2DB181}';
-  RID_FacturasCliente_Refresh = '{FDFE263E-2822-4F0F-96BE-01641D043041}';
+  RID_FacturasCliente_Refresh = '{B30DD588-2914-4443-BBD5-50D4F138F95F}';
 
   { Data table names }
   nme_DarReferencia = 'DarReferencia';
@@ -203,6 +203,7 @@ const
   fld_FacturasCliente_RefreshREFERENCIA_COMISION = 'REFERENCIA_COMISION';
   fld_FacturasCliente_RefreshID_AGENTE = 'ID_AGENTE';
   fld_FacturasCliente_RefreshNUM_COPIAS = 'NUM_COPIAS';
+  fld_FacturasCliente_RefreshNUM_CORREOS = 'NUM_CORREOS';
   fld_FacturasCliente_RefreshFECHA_VENCIMIENTO = 'FECHA_VENCIMIENTO';
 
   { FacturasCliente_Refresh field indexes }
@@ -240,12 +241,13 @@ const
   idx_FacturasCliente_RefreshREFERENCIA_COMISION = 31;
   idx_FacturasCliente_RefreshID_AGENTE = 32;
   idx_FacturasCliente_RefreshNUM_COPIAS = 33;
-  idx_FacturasCliente_RefreshFECHA_VENCIMIENTO = 34;
+  idx_FacturasCliente_RefreshNUM_CORREOS = 34;
+  idx_FacturasCliente_RefreshFECHA_VENCIMIENTO = 35;
 
 type
   { IDarReferencia }
   IDarReferencia = interface(IDAStronglyTypedDataTable)
-  ['{12227F52-D465-4898-B134-D4C16E295BA4}']
+  ['{9DABABE4-9529-4D46-8390-02D72879F053}']
     { Property getters and setters }
     function GetVALORValue: String;
     procedure SetVALORValue(const aValue: String);
@@ -274,7 +276,7 @@ type
 
   { IFacturasCliente }
   IFacturasCliente = interface(IDAStronglyTypedDataTable)
-  ['{0FEC5F43-9506-40C0-AA99-DC678677C6C7}']
+  ['{A4A64CE1-E0C3-42E1-9FE3-3CCFC56E8149}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -513,7 +515,7 @@ type
 
   { IFacturasCliente_Detalles }
   IFacturasCliente_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{2DBD6392-F10F-4A24-B1B2-B7352ADD7B51}']
+  ['{48DB542A-94AF-49A6-9B13-E3FB282FAB21}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -620,7 +622,7 @@ type
 
   { IFacturasCliente_Detalles_Refresh }
   IFacturasCliente_Detalles_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{20C233CD-3FC4-475D-BA91-AF23A4DC6F21}']
+  ['{1ED3E85F-9BE1-4DBC-A810-895CB87EFF7B}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -727,7 +729,7 @@ type
 
   { IFacturasCliente_Refresh }
   IFacturasCliente_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{FC3E4483-F5E9-4AD0-80BC-BB9AE9C1D652}']
+  ['{4774EBB6-EE6F-4091-982C-0BE9F6733DF7}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -797,6 +799,8 @@ type
     procedure SetID_AGENTEValue(const aValue: Integer);
     function GetNUM_COPIASValue: Integer;
     procedure SetNUM_COPIASValue(const aValue: Integer);
+    function GetNUM_CORREOSValue: Integer;
+    procedure SetNUM_CORREOSValue(const aValue: Integer);
     function GetFECHA_VENCIMIENTOValue: DateTime;
     procedure SetFECHA_VENCIMIENTOValue(const aValue: DateTime);
 
@@ -836,6 +840,7 @@ type
     property REFERENCIA_COMISION: String read GetREFERENCIA_COMISIONValue write SetREFERENCIA_COMISIONValue;
     property ID_AGENTE: Integer read GetID_AGENTEValue write SetID_AGENTEValue;
     property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
     property FECHA_VENCIMIENTO: DateTime read GetFECHA_VENCIMIENTOValue write SetFECHA_VENCIMIENTOValue;
   end;
 
@@ -912,6 +917,8 @@ type
     procedure SetID_AGENTEValue(const aValue: Integer); virtual;
     function GetNUM_COPIASValue: Integer; virtual;
     procedure SetNUM_COPIASValue(const aValue: Integer); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
     function GetFECHA_VENCIMIENTOValue: DateTime; virtual;
     procedure SetFECHA_VENCIMIENTOValue(const aValue: DateTime); virtual;
 
@@ -950,6 +957,7 @@ type
     property REFERENCIA_COMISION: String read GetREFERENCIA_COMISIONValue write SetREFERENCIA_COMISIONValue;
     property ID_AGENTE: Integer read GetID_AGENTEValue write SetID_AGENTEValue;
     property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
     property FECHA_VENCIMIENTO: DateTime read GetFECHA_VENCIMIENTOValue write SetFECHA_VENCIMIENTOValue;
 
   public
@@ -2013,6 +2021,16 @@ begin
   DataTable.Fields[idx_FacturasCliente_RefreshNUM_COPIAS].AsInteger := aValue;
 end;
 
+function TFacturasCliente_RefreshDataTableRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := DataTable.Fields[idx_FacturasCliente_RefreshNUM_CORREOS].AsInteger;
+end;
+
+procedure TFacturasCliente_RefreshDataTableRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_FacturasCliente_RefreshNUM_CORREOS].AsInteger := aValue;
+end;
+
 function TFacturasCliente_RefreshDataTableRules.GetFECHA_VENCIMIENTOValue: DateTime;
 begin
   result := DataTable.Fields[idx_FacturasCliente_RefreshFECHA_VENCIMIENTO].AsDateTime;

Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas

@@ -9,16 +9,16 @@ 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_DarReferenciaDelta = '{719E22A7-4321-46B9-A290-B5AAEECCB0E7}';
+  RID_DarReferenciaDelta = '{A361CA72-14B0-4A2F-8D48-594E3B6757B5}';
-  RID_FacturasClienteDelta = '{41F232DC-7C48-4FE0-A4E2-8D04523A651F}';
+  RID_FacturasClienteDelta = '{9D0AFD95-68E6-4552-A9E1-0BD9CDCF5EF5}';
-  RID_FacturasCliente_DetallesDelta = '{2AE6BCD4-8462-49F4-82AA-FA89E30A3C17}';
+  RID_FacturasCliente_DetallesDelta = '{B9A181BB-83C6-4C37-8D94-8870ECFA5672}';
-  RID_FacturasCliente_Detalles_RefreshDelta = '{741BF8ED-55D9-4E7B-86D6-22E568D1AEB6}';
+  RID_FacturasCliente_Detalles_RefreshDelta = '{D18A6A64-A4BC-49E2-9F4C-7EB197491CAF}';
-  RID_FacturasCliente_RefreshDelta = '{84E456C5-AE88-4010-800A-C8316305E702}';
+  RID_FacturasCliente_RefreshDelta = '{1929E045-A3F6-43D9-ACCD-B31FA5847473}';
 
 type
   { IDarReferenciaDelta }
   IDarReferenciaDelta = interface(IDarReferencia)
-  ['{719E22A7-4321-46B9-A290-B5AAEECCB0E7}']
+  ['{A361CA72-14B0-4A2F-8D48-594E3B6757B5}']
     { Property getters and setters }
     function GetOldVALORValue : String;
 
@@ -47,7 +47,7 @@ type
 
   { IFacturasClienteDelta }
   IFacturasClienteDelta = interface(IFacturasCliente)
-  ['{41F232DC-7C48-4FE0-A4E2-8D04523A651F}']
+  ['{9D0AFD95-68E6-4552-A9E1-0BD9CDCF5EF5}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -321,7 +321,7 @@ type
 
   { IFacturasCliente_DetallesDelta }
   IFacturasCliente_DetallesDelta = interface(IFacturasCliente_Detalles)
-  ['{2AE6BCD4-8462-49F4-82AA-FA89E30A3C17}']
+  ['{B9A181BB-83C6-4C37-8D94-8870ECFA5672}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_FACTURAValue : Integer;
@@ -441,7 +441,7 @@ type
 
   { IFacturasCliente_Detalles_RefreshDelta }
   IFacturasCliente_Detalles_RefreshDelta = interface(IFacturasCliente_Detalles_Refresh)
-  ['{741BF8ED-55D9-4E7B-86D6-22E568D1AEB6}']
+  ['{D18A6A64-A4BC-49E2-9F4C-7EB197491CAF}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_FACTURAValue : Integer;
@@ -561,7 +561,7 @@ type
 
   { IFacturasCliente_RefreshDelta }
   IFacturasCliente_RefreshDelta = interface(IFacturasCliente_Refresh)
-  ['{84E456C5-AE88-4010-800A-C8316305E702}']
+  ['{1929E045-A3F6-43D9-ACCD-B31FA5847473}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -597,6 +597,7 @@ type
     function GetOldREFERENCIA_COMISIONValue : String;
     function GetOldID_AGENTEValue : Integer;
     function GetOldNUM_COPIASValue : Integer;
+    function GetOldNUM_CORREOSValue : Integer;
     function GetOldFECHA_VENCIMIENTOValue : DateTime;
 
     { Properties }
@@ -634,6 +635,7 @@ type
     property OldREFERENCIA_COMISION : String read GetOldREFERENCIA_COMISIONValue;
     property OldID_AGENTE : Integer read GetOldID_AGENTEValue;
     property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
     property OldFECHA_VENCIMIENTO : DateTime read GetOldFECHA_VENCIMIENTOValue;
   end;
 
@@ -744,6 +746,9 @@ type
     function GetNUM_COPIASValue: Integer; virtual;
     function GetOldNUM_COPIASValue: Integer; virtual;
     procedure SetNUM_COPIASValue(const aValue: Integer); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    function GetOldNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
     function GetFECHA_VENCIMIENTOValue: DateTime; virtual;
     function GetOldFECHA_VENCIMIENTOValue: DateTime; virtual;
     procedure SetFECHA_VENCIMIENTOValue(const aValue: DateTime); virtual;
@@ -817,6 +822,8 @@ type
     property OldID_AGENTE : Integer read GetOldID_AGENTEValue;
     property NUM_COPIAS : Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
     property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue;
+    property NUM_CORREOS : Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
     property FECHA_VENCIMIENTO : DateTime read GetFECHA_VENCIMIENTOValue write SetFECHA_VENCIMIENTOValue;
     property OldFECHA_VENCIMIENTO : DateTime read GetOldFECHA_VENCIMIENTOValue;
 
@@ -2379,6 +2386,21 @@ begin
   BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasCliente_RefreshNUM_COPIAS] := aValue;
 end;
 
+function TFacturasCliente_RefreshBusinessProcessorRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasCliente_RefreshNUM_CORREOS];
+end;
+
+function TFacturasCliente_RefreshBusinessProcessorRules.GetOldNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasCliente_RefreshNUM_CORREOS];
+end;
+
+procedure TFacturasCliente_RefreshBusinessProcessorRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasCliente_RefreshNUM_CORREOS] := aValue;
+end;
+
 function TFacturasCliente_RefreshBusinessProcessorRules.GetFECHA_VENCIMIENTOValue: DateTime;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasCliente_RefreshFECHA_VENCIMIENTO];

Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm

@@ -1106,8 +1106,8 @@ object srvFacturasCliente: TsrvFacturasCliente
               'DIGO_POSTAL, '#10'    FECHA_ALTA, FECHA_MODIFICACION, USUARIO, ID_FO' +
               'RMA_PAGO, '#10'    RECARGO_EQUIVALENCIA, ID_TIPO_IVA, IMPORTE_NETO, ' +
               'IMPORTE_PORTE, ID_COMISION_LIQUIDADA,'#10'    REFERENCIA_COMISION, I' +
-              'D_AGENTE, NUM_COPIAS'#10'  FROM'#10'    V_FACTURAS_CLIENTE'#10'  WHERE ID = ' +
+              'D_AGENTE, NUM_COPIAS, NUM_CORREOS'#10'  FROM'#10'    V_FACTURAS_CLIENTE'#10 +
-              ':ID'
+              '  WHERE ID = :ID'
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -1245,6 +1245,10 @@ object srvFacturasCliente: TsrvFacturasCliente
               item
                 DatasetField = 'NUM_COPIAS'
                 TableField = 'NUM_COPIAS'
+              end
+              item
+                DatasetField = 'NUM_CORREOS'
+                TableField = 'NUM_CORREOS'
               end>
           end>
         Name = 'FacturasCliente_Refresh'
@@ -1605,6 +1609,17 @@ object srvFacturasCliente: TsrvFacturasCliente
             Lookup = False
             LookupCache = False
           end
+          item
+            Name = 'NUM_CORREOS'
+            DataType = datInteger
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
+          end
           item
             Name = 'FECHA_VENCIMIENTO'
             DataType = datDateTime

Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm

@@ -8,8 +8,8 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
     Height = 386
     RootLevelOptions.DetailTabsPosition = dtpTop
     OnActiveTabChanged = cxGridActiveTabChanged
-    ExplicitWidth = 531
+    ExplicitWidth = 759
-    ExplicitHeight = 269
+    ExplicitHeight = 386
     inherited cxGridView: TcxGridDBTableView
       DataController.KeyFieldNames = 'ID'
       DataController.Options = [dcoAnsiSort, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoGroupsAlwaysExpanded]
@@ -25,7 +25,6 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
         DataBinding.FieldName = 'NUM_COPIAS'
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
-        OnCustomDrawCell = cxGridViewNUM_COPIASCustomDrawCell
         BestFitMaxWidth = 25
         MinWidth = 25
         Options.Editing = False
@@ -182,12 +181,12 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
   end
   inherited frViewFiltroBase1: TfrViewFiltroBase
     Width = 759
-    ExplicitWidth = 531
+    ExplicitWidth = 759
     inherited TBXDockablePanel1: TTBXDockablePanel
-      ExplicitWidth = 531
+      ExplicitWidth = 759
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 759
-        ExplicitWidth = 531
+        ExplicitWidth = 759
         inherited txtFiltroTodo: TcxTextEdit
           ExplicitWidth = 434
           Width = 434
@@ -205,10 +204,10 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 759
-        ExplicitWidth = 531
+        ExplicitWidth = 759
         inherited tbxBotones: TTBXToolbar
           Width = 749
-          ExplicitWidth = 521
+          ExplicitWidth = 749
         end
       end
     end
@@ -216,14 +215,14 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
   inherited pnlAgrupaciones: TTBXDockablePanel
     Top = 488
     Visible = True
-    ExplicitTop = 371
+    ExplicitTop = 488
-    ExplicitWidth = 531
+    ExplicitWidth = 759
     inherited TBXAlignmentPanel1: TTBXAlignmentPanel
       Width = 759
-      ExplicitWidth = 531
+      ExplicitWidth = 759
       inherited TBXToolbar1: TTBXToolbar
         Width = 749
-        ExplicitWidth = 521
+        ExplicitWidth = 749
         object TBXSeparatorItem2: TTBXSeparatorItem
         end
         object TBXItem3: TTBXItem

Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas

@@ -65,9 +65,6 @@ type
     procedure actProvinciaExecute(Sender: TObject);
     procedure actProvinciaUpdate(Sender: TObject);
     procedure actClienteUpdate(Sender: TObject);
-    procedure cxGridViewNUM_COPIASCustomDrawCell(Sender: TcxCustomGridTableView;
-      ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
-      var ADone: Boolean);
     procedure cxGridViewNUM_COPIASCustomDrawHeader(Sender: TcxGridTableView;
       ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo;
       var ADone: Boolean);
@@ -194,23 +191,6 @@ begin
   RefrescarFiltro;
 end;
 
-procedure TfrViewFacturasCliente.cxGridViewNUM_COPIASCustomDrawCell(
-  Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
-  AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
-{var
-  R : TRect;}
-begin
-//  inherited;
-  {if (AViewInfo.GridRecord.DisplayTexts[cxGridViewNUM_COPIAS.Index] <> '') then
-  begin
-    R := AViewInfo.ContentBounds;
-    ACanvas.FillRect(R);
-    ACanvas.DrawImage(PngImageList, R.Left, R.Top, 4);
-    ACanvas.DrawTexT(AViewInfo.GridRecord.DisplayTexts[cxGridViewNUM_COPIAS.Index], R, cxAlignCenter or cxAlignVCenter);
-    ADone := True;
-  end;}
-end;
-
 procedure TfrViewFacturasCliente.cxGridViewNUM_COPIASCustomDrawHeader(
   Sender: TcxGridTableView; ACanvas: TcxCanvas;
   AViewInfo: TcxGridColumnHeaderViewInfo; var ADone: Boolean);

Source/Modulos/Facturas de proveedor/Controller/FacturasProveedor_controller.bdsproj

@@ -172,7 +172,7 @@
 			<VersionInfoKeys Name="Comments"></VersionInfoKeys>
 		</VersionInfoKeys>
 	</Delphi.Personality>
-<!-- EurekaLog First Line
+	<!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=519
 Activate=1

Source/Modulos/Facturas de proveedor/Controller/FacturasProveedor_controller.dpk

@@ -53,6 +53,7 @@ contains
   uFacturasProveedorReportController in 'uFacturasProveedorReportController.pas',
   uIEditorFacturasProveedorPreview in 'View\uIEditorFacturasProveedorPreview.pas',
   uIEditorElegirArticulosFacturasProveedor in 'View\uIEditorElegirArticulosFacturasProveedor.pas',
-  uArticulosFacturaProveedorController in 'uArticulosFacturaProveedorController.pas';
+  uArticulosFacturaProveedorController in 'uArticulosFacturaProveedorController.pas',
+  uIDialogListaFacturasProvEnvioEMail in 'View\uIDialogListaFacturasProvEnvioEMail.pas';
 
 end.

Source/Modulos/Facturas de proveedor/Controller/View/uIDialogListaFacturasProvEnvioEMail.pas

@@ -0,0 +1,21 @@
+unit uIDialogListaFacturasProvEnvioEMail;
+
+interface
+
+uses
+  uBizFacturasProveedor, uFacturasProveedorController;
+
+type
+  IDialogListaFacturasProvEnvioEMail = interface
+  ['{E6515FFB-D3C8-4D36-A6A5-E263747A03BA}']
+    function GetFacturas: IBizFacturaProveedor;
+    procedure SetFacturas(const Value: IBizFacturaProveedor);
+    property Facturas: IBizFacturaProveedor read GetFacturas write SetFacturas;
+    function ShowModal : Integer;
+    procedure Release;
+  end;
+
+
+implementation
+
+end.

Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas

@@ -47,6 +47,13 @@ type
 
     function ElegirFacturas(AFacturas : IBizFacturaProveedor; AMensaje: String; AMultiSelect: Boolean): IBizFacturaProveedor;
     function ExtraerSeleccionados(ARecibosProveedor: IBizFacturaProveedor; Const ViewGrid: IViewGridBase = Nil) : IBizFacturaProveedor;
+
+    function EnviarEmailFacturas(AFacturas : IBizFacturaProveedor): Boolean;
+    function GenerarEmailFactura(AFactura : IBizFacturaProveedor): Boolean;
+    function EnviarFacturaPorEMail(AFactura: IBizFacturaProveedor;
+      const AEnviarDirectamente: Boolean = True;
+      const ADireccionEMail: String = ''; const AAsuntoEMail: String = '';
+      const ATextoEMail: String = ''): Boolean;
   end;
 
   TFacturasProveedorController = class(TObservador, IFacturasProveedorController)
@@ -69,8 +76,11 @@ type
 
     function ValidarFactura(AFactura: IBizFacturaProveedor): Boolean;
     procedure GenerarRecibos(AFactura: IBizFacturaProveedor);
+    procedure _AnadirMarcaEnvioCorreo(AFactura: IBizFacturaProveedor);
+
   protected
     procedure RecibirAviso(ASujeto: ISujeto; ADataTable: IDAStronglyTypedDataTable); override;
+
   public
     property ProveedorController: IProveedoresController read GetProveedorController write SetProveedorController;
     property DetallesController: IDetallesFacturaProveedorController read GetDetallesController write SetDetallesController;
@@ -106,6 +116,13 @@ type
 
     function ElegirFacturas(AFacturas : IBizFacturaProveedor; AMensaje: String; AMultiSelect: Boolean): IBizFacturaProveedor;
     function ExtraerSeleccionados(AFacturasProveedor: IBizFacturaProveedor; Const ViewGrid: IViewGridBase = Nil) : IBizFacturaProveedor;
+
+    function EnviarEmailFacturas(AFacturas : IBizFacturaProveedor): Boolean;
+    function GenerarEmailFactura(AFactura : IBizFacturaProveedor): Boolean;
+    function EnviarFacturaPorEMail(AFactura: IBizFacturaProveedor;
+      const AEnviarDirectamente: Boolean = True;
+      const ADireccionEMail: String = ''; const AAsuntoEMail: String = '';
+      const ATextoEMail: String = ''): Boolean;
   end;
 
 implementation
@@ -120,7 +137,9 @@ uses
   uBizPedidosProveedor, uPedidosProveedorController, uBizDetallesPedidoProveedor,
   uRecibosProveedorController, uBizRecibosProveedor,
   uFacturasProveedorReportController, DateUtils, Forms, Dialogs,
-  uFormasPagoController, uBizFormasPago;
+  uFormasPagoController, uBizFormasPago, uSistemaFunc,
+  uDialogElegirEMail, uEMailUtils, uStringsUtils,
+  uIDialogListaFacturasProvEnvioEMail, uDataModuleRegistroCorreos;
 
 procedure CopiarArticulosPedido(AOrigen: IBizDetallesPedidoProveedor;
   ADestino : IBizDetallesFacturaProveedor);
@@ -695,6 +714,37 @@ begin
   end;
 end;
 
+procedure TFacturasProveedorController._AnadirMarcaEnvioCorreo(AFactura: IBizFacturaProveedor);
+var
+  ASoloLectura : Boolean;
+begin
+  if not Assigned(AFactura) then
+    raise Exception.Create ('Factura no asignada (_AnadirMarcaEnvioCorreo)');
+
+  if AFactura.DataTable.Active then
+    AFactura.DataTable.Active := True;
+
+  if AnadirMarcaEnvioCorreo(nme_FacturasProveedor, AFactura.ID) then
+  begin
+    DesconectarTabla(AFactura.DataTable);
+    try
+      ASoloLectura := AFactura.DataTable.ReadOnly;
+      if ASoloLectura then
+        SetDataTableReadOnly(AFactura.DataTable, False);
+      try
+        AFactura.Edit;
+        AFactura.NUM_CORREOS := AFactura.NUM_CORREOS + 1;
+        AFactura.Post;
+      finally
+        if ASoloLectura then
+          SetDataTableReadOnly(AFactura.DataTable, True);
+      end;
+    finally
+      ConectarTabla(AFactura.DataTable);
+    end;
+  end;
+end;
+
 function TFacturasProveedorController._Vacio: IBizFacturaProveedor;
 begin
   Result := Buscar(ID_NULO);
@@ -794,6 +844,98 @@ begin
   end;
 end;
 
+function TFacturasProveedorController.EnviarEmailFacturas(
+  AFacturas: IBizFacturaProveedor): Boolean;
+var
+  ADialog : IDialogListaFacturasProvEnvioEMail;
+  ARespuesta : Integer;
+begin
+  ADialog := NIL;
+
+  if not Assigned(AFacturas) then
+    raise Exception.Create ('Facturas no asignadas (EnviarFacturasPorEMail)');
+
+  if AFacturas.DataTable.Active then
+    AFacturas.DataTable.Active := True;
+
+  ShowHourglassCursor;
+  try
+    CreateEditor('DialogListaFacturasProvEnvioEMail', IDialogListaFacturasProvEnvioEMail, ADialog);
+
+    if Assigned(ADialog) then
+    begin
+      try
+        ADialog.Facturas := AFacturas;
+        ARespuesta := ADialog.ShowModal;
+        Result := (ARespuesta = mrOK)
+      finally
+        ADialog.Release;
+      end;
+    end;
+  finally
+    ADialog := NIL;
+    HideHourglassCursor;
+  end;
+end;
+
+function TFacturasProveedorController.EnviarFacturaPorEMail(
+  AFactura: IBizFacturaProveedor; const AEnviarDirectamente: Boolean;
+  const ADireccionEMail, AAsuntoEMail, ATextoEMail: String): Boolean;
+var
+  AReportController : IFacturasProveedorReportController;
+  AFicheroTMP : TFileName;
+  AEMail : String;
+  AAsunto : String;
+  AListaEmail : TStringList;
+begin
+  if not Assigned(AFactura) then
+    raise Exception.Create ('Factura no asignada (EnviarFacturaPorEMail)');
+
+  if AFactura.DataTable.Active then
+    AFactura.DataTable.Active := True;
+
+  RecuperarProveedor(AFactura);
+  AFactura.Proveedor.DataTable.Active := True;
+
+  AFicheroTMP := DarFicheroPDFTemporal(EscapeIllegalChars(AFactura.REFERENCIA));
+
+  if not EsCadenaVacia(ADireccionEMail) then
+    AEMail := ADireccionEMail
+  else begin
+    AListaEmail := TStringList.Create;
+    try
+      if not EsCadenaVacia(AFactura.Proveedor.EMAIL_ADMINISTRACION) then
+        AListaEmail.Add(AFactura.Proveedor.EMAIL_ADMINISTRACION);
+
+      if not ElegirEMail(AListaEmail, AEMail) then
+        Exit;
+    finally
+      FreeANDNIL(AListaEmail);
+    end;
+  end;
+
+  if not EsCadenaVacia(AAsuntoEMail) then
+    AAsunto := AAsuntoEMail
+  else
+    AAsunto := 'Factura ' + AFactura.REFERENCIA;
+
+  ShowHourglassCursor;
+  Application.ProcessMessages;
+
+  AReportController := TFacturasProveedorReportController.Create;
+  try
+    AReportController.ExportToPDF(AFactura.ID, AFicheroTMP);
+    Result := EnviarEMailMAPI(AAsunto, ATextoEMail, AFicheroTMP, '', '', AFactura.Proveedor.NOMBRE, AEMail, AEnviarDirectamente);
+    if Result then
+       _AnadirMarcaEnvioCorreo(AFactura);
+  finally
+    SysUtils.DeleteFile(AFicheroTMP);
+    AReportController := NIL;
+    HideHourglassCursor;
+    Application.ProcessMessages;
+  end;
+end;
+
 function TFacturasProveedorController.EsEliminable(AFactura: IBizFacturaProveedor): Boolean;
 begin
   Result := EsModificable(AFactura);
@@ -1052,6 +1194,24 @@ begin
   end;
 end;
 
+function TFacturasProveedorController.GenerarEmailFactura(
+  AFactura: IBizFacturaProveedor): Boolean;
+begin
+  if not Assigned(AFactura) then
+    raise Exception.Create ('Facturas no asignadas (GenerarEmailFactura)');
+
+  if AFactura.DataTable.Active then
+    AFactura.DataTable.Active := True;
+
+  ShowHourglassCursor;
+  try
+    RecuperarProveedor(AFactura);
+    EnviarFacturaPorEMail(AFactura, False, AFactura.Proveedor.EMAIL_ADMINISTRACION);
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
 procedure TFacturasProveedorController.GenerarRecibos(AFactura: IBizFacturaProveedor);
 var
   AFormasPagoController : IFormasPagoController;

Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorReportController.pas

@@ -11,6 +11,7 @@ type
   ['{551F82DC-B8DC-482E-A20D-15003E845078}']
     procedure Preview(const AFacturaID : String);
     function Print(const AFacturaID : String): Boolean;
+    function ExportToPDF(const AID: Integer; const AFileName : String = ''): Boolean;
   end;
 
   TFacturasProveedorReportController = class(TInterfacedObject, IFacturasProveedorReportController)
@@ -23,6 +24,7 @@ type
 
     procedure Preview(const AFacturaID : String);
     function Print(const AFacturaID : String): Boolean;
+    function ExportToPDF(const AID: Integer; const AFileName : String = ''): Boolean;
   end;
 
 
@@ -31,7 +33,7 @@ implementation
 uses
   uROTypes, uEditorRegistryUtils, uIEditorFacturasProveedorPreview,
   uEditorPreview, uDataModuleFacturasProveedor, uEditorBase, cxControls,
-  schFacturasProveedorClient_Intf;
+  schFacturasProveedorClient_Intf, uStringsUtils;
 
 { TFacturasProveedorReportController }
 
@@ -53,6 +55,29 @@ begin
   inherited;
 end;
 
+function TFacturasProveedorReportController.ExportToPDF(const AID: Integer;
+  const AFileName: String): Boolean;
+var
+  AStream: Binary;
+begin
+  Result := False;
+  if EsCadenaVacia(AFileName) then
+    Exit;
+
+  ShowHourglassCursor;
+  try
+    AStream := FDataModule.GetRptPDFFacturas(AID, True);
+    try
+      AStream.SaveToFile(AFileName);
+      Result := True;
+    finally
+      FreeAndNil(AStream);
+    end;
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
 procedure TFacturasProveedorReportController.Preview(const AFacturaID : String);
 var
   AStream: Binary;

Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.bdsproj

@@ -172,7 +172,7 @@
 			<VersionInfoKeys Name="Comments"></VersionInfoKeys>
 		</VersionInfoKeys>
 	</Delphi.Personality>
-<!-- EurekaLog First Line
+	<!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=519
 Activate=1

Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm

@@ -494,6 +494,17 @@ object DataModuleFacturasProveedor: TDataModuleFacturasProveedor
         Lookup = False
         LookupCache = False
       end
+      item
+        Name = 'NUM_CORREOS'
+        DataType = datInteger
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
+      end
       item
         Name = 'FECHA_VENCIMIENTO'
         DataType = datDateTime

Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.pas

@@ -34,6 +34,8 @@ type
 
     // Report
     function GetReport(const AFacturaID: String): Binary;
+    function GetRptPDFFacturas(const AID: Integer; const ShowLogotipo: Boolean = False): Binary;
+
   end;
 
 implementation
@@ -70,6 +72,20 @@ begin
   Result := (RORemoteService as IsrvFacturasProveedor).GenerateReport(AFacturaID)
 end;
 
+function TDataModuleFacturasProveedor.GetRptPDFFacturas(const AID: Integer;
+  const ShowLogotipo: Boolean): Binary;
+var
+  AParam : TIntegerArray;
+begin
+  AParam := TIntegerArray.Create;
+  try
+    AParam.Add(AID);
+    Result := (RORemoteService as IsrvFacturasProveedor).GenerarReportPDF(AParam, ShowLogotipo)
+  finally
+    FreeANDNIL(AParam)
+  end;
+end;
+
 function TDataModuleFacturasProveedor.NewItem: IBizFacturaProveedor;
 begin
   Result := GetItem(ID_NULO)

Source/Modulos/Facturas de proveedor/FacturasProveedor_Group.bdsgroup

@@ -8,9 +8,7 @@
 			<Option Name="GUID">{2F12F93C-605F-4442-9FAC-D846A40B7499}</Option>
 		</Option>
 	</PersonalityInfo>
-	<Default.Personality>  
+	<Default.Personality>  <Projects>
-    
-    <Projects>
       <Projects Name="DataAbstract_D10.bpl">..\..\DataAbstract_D10\DataAbstract_D10.bdsproj</Projects>
       <Projects Name="Base.bpl">..\..\Base\Base.bdsproj</Projects>
       <Projects Name="GUIBase.bpl">..\..\Base\GUIBase\GUIBase.bdsproj</Projects>
@@ -25,16 +23,7 @@
       <Projects Name="FacturasProveedor_data.bpl">Data\FacturasProveedor_data.bdsproj</Projects>
       <Projects Name="AlbaranesProveedor_controller.bpl">..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.bdsproj</Projects>
       <Projects Name="AlbaranesProveedor_view.bpl">..\Albaranes de proveedor\Views\AlbaranesProveedor_view.bdsproj</Projects>
-      <Projects Name="AlbaranesProveedor_plugin.bpl">..\Albaranes de proveedor\Plugin\AlbaranesProveedor_plugin.bdsproj</Projects>
+      <Projects Name="Targets">DataAbstract_D10.bpl Base.bpl GUIBase.bpl Contactos_view.bpl Articulos_view.bpl RecibosProveedor_model.bpl RecibosProveedor_data.bpl RecibosProveedor_controller.bpl RecibosProveedor_view.bpl RecibosProveedor_plugin.bpl FacturasProveedor_model.bpl FacturasProveedor_data.bpl AlbaranesProveedor_controller.bpl AlbaranesProveedor_view.bpl</Projects>
-      <Projects Name="PedidosProveedor_controller.bpl">..\Pedidos a proveedor\Controller\PedidosProveedor_controller.bdsproj</Projects>
-      <Projects Name="FacturasProveedor_controller.bpl">Controller\FacturasProveedor_controller.bdsproj</Projects>
-      <Projects Name="AlbProv_FacProv_relation.bpl">..\Relaciones\Albaranes de proveedor - Facturas de proveedor\AlbProv_FacProv_relation.bdsproj</Projects>
-      <Projects Name="PedProv_FacProv_relation.bpl">..\Relaciones\Pedidos de proveedor - Facturas de proveedor\PedProv_FacProv_relation.bdsproj</Projects>
-      <Projects Name="FacturasProveedor_view.bpl">Views\FacturasProveedor_view.bdsproj</Projects>
-      <Projects Name="FacturasProveedor_plugin.bpl">Plugin\FacturasProveedor_plugin.bdsproj</Projects>
-      <Projects Name="FactuGES.exe">..\..\Cliente\FactuGES.bdsproj</Projects>
-      <Projects Name="FactuGES_Server.exe">..\..\Servidor\FactuGES_Server.bdsproj</Projects>
-      <Projects Name="Targets">DataAbstract_D10.bpl Base.bpl GUIBase.bpl Contactos_view.bpl Articulos_view.bpl RecibosProveedor_model.bpl RecibosProveedor_data.bpl RecibosProveedor_controller.bpl RecibosProveedor_view.bpl RecibosProveedor_plugin.bpl FacturasProveedor_model.bpl FacturasProveedor_data.bpl AlbaranesProveedor_controller.bpl AlbaranesProveedor_view.bpl AlbaranesProveedor_plugin.bpl PedidosProveedor_controller.bpl FacturasProveedor_controller.bpl AlbProv_FacProv_relation.bpl PedProv_FacProv_relation.bpl FacturasProveedor_view.bpl FacturasProveedor_plugin.bpl FactuGES.exe FactuGES_Server.exe</Projects>
     </Projects>
     <Dependencies/>
   </Default.Personality>

Source/Modulos/Facturas de proveedor/Model/Data/uIDataModuleFacturasProveedorReport.pas

@@ -9,6 +9,7 @@ type
   IDataModuleFacturasProveedorReport = interface
   ['{4979ACC5-069C-45C8-9D0B-49FC471F1A92}']
     function GetReport(const AFacturaID: String): Binary;
+    function GetRptPDFFacturas(const AID: Integer; const ShowLogotipo: Boolean = False): Binary;
   end;
 
 implementation

Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas

@@ -9,11 +9,11 @@ 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_darReferencia = '{8A6AF6AE-FDD3-46DD-9EBB-D2E6C723607B}';
+  RID_darReferencia = '{3702A8D4-542B-4B43-9C44-D838C5B94D06}';
-  RID_FacturasProveedor = '{AE87472C-8D75-440E-A9DB-4CC1913226D6}';
+  RID_FacturasProveedor = '{DF304139-ED00-47CD-82B3-2FB5BC641650}';
-  RID_FacturasProveedor_Detalles = '{DD2FFE30-C1BF-4736-838E-5D1EA821A1EA}';
+  RID_FacturasProveedor_Detalles = '{74A5AB9E-6DA2-4517-B5BB-20F9FF441D4A}';
-  RID_FacturasProveedor_Detalles_Refresh = '{9876655E-E769-445A-A8D5-54AAD69416C7}';
+  RID_FacturasProveedor_Detalles_Refresh = '{8C687B77-B589-4613-9908-935FB59DA5FB}';
-  RID_FacturasProveedor_Refresh = '{58E8EF55-3D5F-48AD-A700-53ED97F7623D}';
+  RID_FacturasProveedor_Refresh = '{81F6B50C-EF92-49C7-8207-D3BD0156CCAE}';
 
   { Data table names }
   nme_darReferencia = 'darReferencia';
@@ -61,6 +61,7 @@ const
   fld_FacturasProveedorIMPORTE_NETO = 'IMPORTE_NETO';
   fld_FacturasProveedorIMPORTE_PORTE = 'IMPORTE_PORTE';
   fld_FacturasProveedorNUM_COPIAS = 'NUM_COPIAS';
+  fld_FacturasProveedorNUM_CORREOS = 'NUM_CORREOS';
   fld_FacturasProveedorFECHA_VENCIMIENTO = 'FECHA_VENCIMIENTO';
 
   { FacturasProveedor field indexes }
@@ -96,7 +97,8 @@ const
   idx_FacturasProveedorIMPORTE_NETO = 29;
   idx_FacturasProveedorIMPORTE_PORTE = 30;
   idx_FacturasProveedorNUM_COPIAS = 31;
-  idx_FacturasProveedorFECHA_VENCIMIENTO = 32;
+  idx_FacturasProveedorNUM_CORREOS = 32;
+  idx_FacturasProveedorFECHA_VENCIMIENTO = 33;
 
   { FacturasProveedor_Detalles fields }
   fld_FacturasProveedor_DetallesID = 'ID';
@@ -195,6 +197,7 @@ const
   fld_FacturasProveedor_RefreshIMPORTE_NETO = 'IMPORTE_NETO';
   fld_FacturasProveedor_RefreshIMPORTE_PORTE = 'IMPORTE_PORTE';
   fld_FacturasProveedor_RefreshNUM_COPIAS = 'NUM_COPIAS';
+  fld_FacturasProveedor_RefreshNUM_CORREOS = 'NUM_CORREOS';
   fld_FacturasProveedor_RefreshFECHA_VENCIMIENTO = 'FECHA_VENCIMIENTO';
 
   { FacturasProveedor_Refresh field indexes }
@@ -230,12 +233,13 @@ const
   idx_FacturasProveedor_RefreshIMPORTE_NETO = 29;
   idx_FacturasProveedor_RefreshIMPORTE_PORTE = 30;
   idx_FacturasProveedor_RefreshNUM_COPIAS = 31;
-  idx_FacturasProveedor_RefreshFECHA_VENCIMIENTO = 32;
+  idx_FacturasProveedor_RefreshNUM_CORREOS = 32;
+  idx_FacturasProveedor_RefreshFECHA_VENCIMIENTO = 33;
 
 type
   { IdarReferencia }
   IdarReferencia = interface(IDAStronglyTypedDataTable)
-  ['{E4CA7807-EBBA-41AD-B9B5-38D4318CA39F}']
+  ['{83152272-9537-4CC0-B2B9-52D3DCB94CC1}']
     { Property getters and setters }
     function GetVALORValue: String;
     procedure SetVALORValue(const aValue: String);
@@ -264,7 +268,7 @@ type
 
   { IFacturasProveedor }
   IFacturasProveedor = interface(IDAStronglyTypedDataTable)
-  ['{F72C5456-F7D2-47E6-B6E4-45DD1622A9F6}']
+  ['{1D0E8202-D645-489F-9E75-F8C3E625DA5D}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -330,6 +334,8 @@ type
     procedure SetIMPORTE_PORTEValue(const aValue: Currency);
     function GetNUM_COPIASValue: Integer;
     procedure SetNUM_COPIASValue(const aValue: Integer);
+    function GetNUM_CORREOSValue: Integer;
+    procedure SetNUM_CORREOSValue(const aValue: Integer);
     function GetFECHA_VENCIMIENTOValue: DateTime;
     procedure SetFECHA_VENCIMIENTOValue(const aValue: DateTime);
 
@@ -367,6 +373,7 @@ type
     property IMPORTE_NETO: Currency read GetIMPORTE_NETOValue write SetIMPORTE_NETOValue;
     property IMPORTE_PORTE: Currency read GetIMPORTE_PORTEValue write SetIMPORTE_PORTEValue;
     property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
     property FECHA_VENCIMIENTO: DateTime read GetFECHA_VENCIMIENTOValue write SetFECHA_VENCIMIENTOValue;
   end;
 
@@ -439,6 +446,8 @@ type
     procedure SetIMPORTE_PORTEValue(const aValue: Currency); virtual;
     function GetNUM_COPIASValue: Integer; virtual;
     procedure SetNUM_COPIASValue(const aValue: Integer); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
     function GetFECHA_VENCIMIENTOValue: DateTime; virtual;
     procedure SetFECHA_VENCIMIENTOValue(const aValue: DateTime); virtual;
 
@@ -475,6 +484,7 @@ type
     property IMPORTE_NETO: Currency read GetIMPORTE_NETOValue write SetIMPORTE_NETOValue;
     property IMPORTE_PORTE: Currency read GetIMPORTE_PORTEValue write SetIMPORTE_PORTEValue;
     property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
     property FECHA_VENCIMIENTO: DateTime read GetFECHA_VENCIMIENTOValue write SetFECHA_VENCIMIENTOValue;
 
   public
@@ -485,7 +495,7 @@ type
 
   { IFacturasProveedor_Detalles }
   IFacturasProveedor_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{398A387A-683C-48EF-AD52-89A3163736C2}']
+  ['{E79A8CFF-C4FB-4165-BD40-1A655B5560FC}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -592,7 +602,7 @@ type
 
   { IFacturasProveedor_Detalles_Refresh }
   IFacturasProveedor_Detalles_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{9080B14F-8AA6-4096-9790-42188A3AE8D8}']
+  ['{7AF91EA7-7E55-42D9-99DF-E0D1BBDA4678}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -699,7 +709,7 @@ type
 
   { IFacturasProveedor_Refresh }
   IFacturasProveedor_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{786F2A15-EDAF-4AA9-BD48-027B1EEEC55A}']
+  ['{49436B87-CB54-4066-BCFF-BDDE2410A264}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -765,6 +775,8 @@ type
     procedure SetIMPORTE_PORTEValue(const aValue: Currency);
     function GetNUM_COPIASValue: Integer;
     procedure SetNUM_COPIASValue(const aValue: Integer);
+    function GetNUM_CORREOSValue: Integer;
+    procedure SetNUM_CORREOSValue(const aValue: Integer);
     function GetFECHA_VENCIMIENTOValue: DateTime;
     procedure SetFECHA_VENCIMIENTOValue(const aValue: DateTime);
 
@@ -802,6 +814,7 @@ type
     property IMPORTE_NETO: Currency read GetIMPORTE_NETOValue write SetIMPORTE_NETOValue;
     property IMPORTE_PORTE: Currency read GetIMPORTE_PORTEValue write SetIMPORTE_PORTEValue;
     property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
     property FECHA_VENCIMIENTO: DateTime read GetFECHA_VENCIMIENTOValue write SetFECHA_VENCIMIENTOValue;
   end;
 
@@ -874,6 +887,8 @@ type
     procedure SetIMPORTE_PORTEValue(const aValue: Currency); virtual;
     function GetNUM_COPIASValue: Integer; virtual;
     procedure SetNUM_COPIASValue(const aValue: Integer); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
     function GetFECHA_VENCIMIENTOValue: DateTime; virtual;
     procedure SetFECHA_VENCIMIENTOValue(const aValue: DateTime); virtual;
 
@@ -910,6 +925,7 @@ type
     property IMPORTE_NETO: Currency read GetIMPORTE_NETOValue write SetIMPORTE_NETOValue;
     property IMPORTE_PORTE: Currency read GetIMPORTE_PORTEValue write SetIMPORTE_PORTEValue;
     property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
     property FECHA_VENCIMIENTO: DateTime read GetFECHA_VENCIMIENTOValue write SetFECHA_VENCIMIENTOValue;
 
   public
@@ -1276,6 +1292,16 @@ begin
   DataTable.Fields[idx_FacturasProveedorNUM_COPIAS].AsInteger := aValue;
 end;
 
+function TFacturasProveedorDataTableRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := DataTable.Fields[idx_FacturasProveedorNUM_CORREOS].AsInteger;
+end;
+
+procedure TFacturasProveedorDataTableRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_FacturasProveedorNUM_CORREOS].AsInteger := aValue;
+end;
+
 function TFacturasProveedorDataTableRules.GetFECHA_VENCIMIENTOValue: DateTime;
 begin
   result := DataTable.Fields[idx_FacturasProveedorFECHA_VENCIMIENTO].AsDateTime;
@@ -1923,6 +1949,16 @@ begin
   DataTable.Fields[idx_FacturasProveedor_RefreshNUM_COPIAS].AsInteger := aValue;
 end;
 
+function TFacturasProveedor_RefreshDataTableRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_RefreshNUM_CORREOS].AsInteger;
+end;
+
+procedure TFacturasProveedor_RefreshDataTableRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_FacturasProveedor_RefreshNUM_CORREOS].AsInteger := aValue;
+end;
+
 function TFacturasProveedor_RefreshDataTableRules.GetFECHA_VENCIMIENTOValue: DateTime;
 begin
   result := DataTable.Fields[idx_FacturasProveedor_RefreshFECHA_VENCIMIENTO].AsDateTime;

Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas

@@ -9,16 +9,16 @@ 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_darReferenciaDelta = '{11F40542-0486-4EEB-A23C-A54896CED721}';
+  RID_darReferenciaDelta = '{0E73F199-FA0A-4189-9760-9CE6C99E7EB3}';
-  RID_FacturasProveedorDelta = '{8A5AD103-5D7D-4736-AE18-AAF5F983D4E7}';
+  RID_FacturasProveedorDelta = '{4F3FA98F-4BC6-416A-8B47-C9E2B0B2FAA7}';
-  RID_FacturasProveedor_DetallesDelta = '{529B369E-EA3A-4860-91C7-E1B4825BE2BE}';
+  RID_FacturasProveedor_DetallesDelta = '{946B1AE8-1695-4BB3-8A7A-9827305E2ACE}';
-  RID_FacturasProveedor_Detalles_RefreshDelta = '{D88F14D7-712F-4571-A0C9-EC6A3170D976}';
+  RID_FacturasProveedor_Detalles_RefreshDelta = '{D52663D1-8475-4406-90D4-19CD1638018B}';
-  RID_FacturasProveedor_RefreshDelta = '{50CC524D-33DB-47FB-9154-7529F500B4DE}';
+  RID_FacturasProveedor_RefreshDelta = '{37B84B46-1766-4FBF-89EF-D435761DD571}';
 
 type
   { IdarReferenciaDelta }
   IdarReferenciaDelta = interface(IdarReferencia)
-  ['{11F40542-0486-4EEB-A23C-A54896CED721}']
+  ['{0E73F199-FA0A-4189-9760-9CE6C99E7EB3}']
     { Property getters and setters }
     function GetOldVALORValue : String;
 
@@ -47,7 +47,7 @@ type
 
   { IFacturasProveedorDelta }
   IFacturasProveedorDelta = interface(IFacturasProveedor)
-  ['{8A5AD103-5D7D-4736-AE18-AAF5F983D4E7}']
+  ['{4F3FA98F-4BC6-416A-8B47-C9E2B0B2FAA7}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -81,6 +81,7 @@ type
     function GetOldIMPORTE_NETOValue : Currency;
     function GetOldIMPORTE_PORTEValue : Currency;
     function GetOldNUM_COPIASValue : Integer;
+    function GetOldNUM_CORREOSValue : Integer;
     function GetOldFECHA_VENCIMIENTOValue : DateTime;
 
     { Properties }
@@ -116,6 +117,7 @@ type
     property OldIMPORTE_NETO : Currency read GetOldIMPORTE_NETOValue;
     property OldIMPORTE_PORTE : Currency read GetOldIMPORTE_PORTEValue;
     property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
     property OldFECHA_VENCIMIENTO : DateTime read GetOldFECHA_VENCIMIENTOValue;
   end;
 
@@ -220,6 +222,9 @@ type
     function GetNUM_COPIASValue: Integer; virtual;
     function GetOldNUM_COPIASValue: Integer; virtual;
     procedure SetNUM_COPIASValue(const aValue: Integer); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    function GetOldNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
     function GetFECHA_VENCIMIENTOValue: DateTime; virtual;
     function GetOldFECHA_VENCIMIENTOValue: DateTime; virtual;
     procedure SetFECHA_VENCIMIENTOValue(const aValue: DateTime); virtual;
@@ -289,6 +294,8 @@ type
     property OldIMPORTE_PORTE : Currency read GetOldIMPORTE_PORTEValue;
     property NUM_COPIAS : Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
     property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue;
+    property NUM_CORREOS : Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
     property FECHA_VENCIMIENTO : DateTime read GetFECHA_VENCIMIENTOValue write SetFECHA_VENCIMIENTOValue;
     property OldFECHA_VENCIMIENTO : DateTime read GetOldFECHA_VENCIMIENTOValue;
 
@@ -300,7 +307,7 @@ type
 
   { IFacturasProveedor_DetallesDelta }
   IFacturasProveedor_DetallesDelta = interface(IFacturasProveedor_Detalles)
-  ['{529B369E-EA3A-4860-91C7-E1B4825BE2BE}']
+  ['{946B1AE8-1695-4BB3-8A7A-9827305E2ACE}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_FACTURAValue : Integer;
@@ -420,7 +427,7 @@ type
 
   { IFacturasProveedor_Detalles_RefreshDelta }
   IFacturasProveedor_Detalles_RefreshDelta = interface(IFacturasProveedor_Detalles_Refresh)
-  ['{D88F14D7-712F-4571-A0C9-EC6A3170D976}']
+  ['{D52663D1-8475-4406-90D4-19CD1638018B}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_FACTURAValue : Integer;
@@ -540,7 +547,7 @@ type
 
   { IFacturasProveedor_RefreshDelta }
   IFacturasProveedor_RefreshDelta = interface(IFacturasProveedor_Refresh)
-  ['{50CC524D-33DB-47FB-9154-7529F500B4DE}']
+  ['{37B84B46-1766-4FBF-89EF-D435761DD571}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -574,6 +581,7 @@ type
     function GetOldIMPORTE_NETOValue : Currency;
     function GetOldIMPORTE_PORTEValue : Currency;
     function GetOldNUM_COPIASValue : Integer;
+    function GetOldNUM_CORREOSValue : Integer;
     function GetOldFECHA_VENCIMIENTOValue : DateTime;
 
     { Properties }
@@ -609,6 +617,7 @@ type
     property OldIMPORTE_NETO : Currency read GetOldIMPORTE_NETOValue;
     property OldIMPORTE_PORTE : Currency read GetOldIMPORTE_PORTEValue;
     property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
     property OldFECHA_VENCIMIENTO : DateTime read GetOldFECHA_VENCIMIENTOValue;
   end;
 
@@ -713,6 +722,9 @@ type
     function GetNUM_COPIASValue: Integer; virtual;
     function GetOldNUM_COPIASValue: Integer; virtual;
     procedure SetNUM_COPIASValue(const aValue: Integer); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    function GetOldNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
     function GetFECHA_VENCIMIENTOValue: DateTime; virtual;
     function GetOldFECHA_VENCIMIENTOValue: DateTime; virtual;
     procedure SetFECHA_VENCIMIENTOValue(const aValue: DateTime); virtual;
@@ -782,6 +794,8 @@ type
     property OldIMPORTE_PORTE : Currency read GetOldIMPORTE_PORTEValue;
     property NUM_COPIAS : Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
     property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue;
+    property NUM_CORREOS : Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
     property FECHA_VENCIMIENTO : DateTime read GetFECHA_VENCIMIENTOValue write SetFECHA_VENCIMIENTOValue;
     property OldFECHA_VENCIMIENTO : DateTime read GetOldFECHA_VENCIMIENTOValue;
 
@@ -1316,6 +1330,21 @@ begin
   BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorNUM_COPIAS] := aValue;
 end;
 
+function TFacturasProveedorBusinessProcessorRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorNUM_CORREOS];
+end;
+
+function TFacturasProveedorBusinessProcessorRules.GetOldNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorNUM_CORREOS];
+end;
+
+procedure TFacturasProveedorBusinessProcessorRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorNUM_CORREOS] := aValue;
+end;
+
 function TFacturasProveedorBusinessProcessorRules.GetFECHA_VENCIMIENTOValue: DateTime;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorFECHA_VENCIMIENTO];
@@ -2269,6 +2298,21 @@ begin
   BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_RefreshNUM_COPIAS] := aValue;
 end;
 
+function TFacturasProveedor_RefreshBusinessProcessorRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_RefreshNUM_CORREOS];
+end;
+
+function TFacturasProveedor_RefreshBusinessProcessorRules.GetOldNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_RefreshNUM_CORREOS];
+end;
+
+procedure TFacturasProveedor_RefreshBusinessProcessorRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_RefreshNUM_CORREOS] := aValue;
+end;
+
 function TFacturasProveedor_RefreshBusinessProcessorRules.GetFECHA_VENCIMIENTOValue: DateTime;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_RefreshFECHA_VENCIMIENTO];

Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm

@@ -76,8 +76,8 @@ object srvFacturasProveedor: TsrvFacturasProveedor
               'TAL, OBSERVACIONES, ID_PROVEEDOR, NIF_CIF, NOMBRE, CALLE,'#10'    PO' +
               'BLACION, PROVINCIA, CODIGO_POSTAL, FECHA_ALTA, FECHA_MODIFICACIO' +
               'N,'#10'    USUARIO, ID_FORMA_PAGO, RECARGO_EQUIVALENCIA, ID_TIPO_IVA' +
-              ','#10'    IMPORTE_NETO, IMPORTE_PORTE, NUM_COPIAS'#10'  FROM'#10'    V_FACTU' +
+              ','#10'    IMPORTE_NETO, IMPORTE_PORTE, NUM_COPIAS, NUM_CORREOS'#10'  FRO' +
-              'RAS_PROVEEDOR'
+              'M'#10'    V_FACTURAS_PROVEEDOR'
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -207,6 +207,10 @@ object srvFacturasProveedor: TsrvFacturasProveedor
               item
                 DatasetField = 'NUM_COPIAS'
                 TableField = 'NUM_COPIAS'
+              end
+              item
+                DatasetField = 'NUM_CORREOS'
+                TableField = 'NUM_CORREOS'
               end>
           end>
         Name = 'FacturasProveedor'
@@ -543,6 +547,17 @@ object srvFacturasProveedor: TsrvFacturasProveedor
             Lookup = False
             LookupCache = False
           end
+          item
+            Name = 'NUM_CORREOS'
+            DataType = datInteger
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
+          end
           item
             Name = 'FECHA_VENCIMIENTO'
             DataType = datDateTime
@@ -1053,8 +1068,8 @@ object srvFacturasProveedor: TsrvFacturasProveedor
               'OTAL, OBSERVACIONES, ID_PROVEEDOR,'#10'    NIF_CIF, NOMBRE, CALLE, P' +
               'OBLACION, PROVINCIA, CODIGO_POSTAL, '#10'    FECHA_ALTA, FECHA_MODIF' +
               'ICACION, USUARIO, ID_FORMA_PAGO, '#10'    RECARGO_EQUIVALENCIA, ID_T' +
-              'IPO_IVA, IMPORTE_NETO, IMPORTE_PORTE, NUM_COPIAS'#10'  FROM'#10'    V_FA' +
+              'IPO_IVA, IMPORTE_NETO, IMPORTE_PORTE, NUM_COPIAS, NUM_CORREOS'#10'  ' +
-              'CTURAS_PROVEEDOR'#10'  WHERE ID = :ID'
+              'FROM'#10'    V_FACTURAS_PROVEEDOR'#10'  WHERE ID = :ID'
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -1184,6 +1199,10 @@ object srvFacturasProveedor: TsrvFacturasProveedor
               item
                 DatasetField = 'NUM_COPIAS'
                 TableField = 'NUM_COPIAS'
+              end
+              item
+                DatasetField = 'NUM_CORREOS'
+                TableField = 'NUM_CORREOS'
               end>
           end>
         Name = 'FacturasProveedor_Refresh'
@@ -1521,6 +1540,17 @@ object srvFacturasProveedor: TsrvFacturasProveedor
             Lookup = False
             LookupCache = False
           end
+          item
+            Name = 'NUM_CORREOS'
+            DataType = datInteger
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
+          end
           item
             Name = 'FECHA_VENCIMIENTO'
             DataType = datDateTime

Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.bdsproj

@@ -174,7 +174,7 @@
       <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
     </Excluded_Packages>
   </Delphi.Personality>
-<!-- EurekaLog First Line
+	<!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=519
 Activate=0

Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dpk

@@ -86,7 +86,8 @@ requires
   PedidosProveedor_controller,
   PedidosProveedor_model,
   AlbaranesProveedor_model,
-  AlbProv_FacProv_relation;
+  AlbProv_FacProv_relation,
+  dxGDIPlusD10;
 
 contains
   uFacturasProveedorViewRegister in 'uFacturasProveedorViewRegister.pas',
@@ -97,6 +98,7 @@ contains
   uEditorElegirArticulosFacturaProveedor in 'uEditorElegirArticulosFacturaProveedor.pas' {fEditorElegirArticulosFacturaProveedor: TfEditorElegirArticulosFacturaProveedor},
   uViewElegirArticulosFacturasProveedor in 'uViewElegirArticulosFacturasProveedor.pas' {frViewElegirArticulosFacturasProveedor: TFrame},
   uViewDetallesFacturaProveedor in 'uViewDetallesFacturaProveedor.pas' {frViewDetallesFacturaProveedor: TFrame},
-  uEditorFacturasProveedorReport in 'uEditorFacturasProveedorReport.pas' {fEditorFacturasProveedorReport: TfEditorFacturasProveedorReport};
+  uEditorFacturasProveedorReport in 'uEditorFacturasProveedorReport.pas' {fEditorFacturasProveedorReport: TfEditorFacturasProveedorReport},
+  uDialogListaFacturasProvEnvioEMail in 'uDialogListaFacturasProvEnvioEMail.pas' {fDialogListaFacturasProvEnvioEMail: TfDialogListaFacturasProvEnvioEMail};
 
 end.

Source/Modulos/Facturas de proveedor/Views/uDialogListaFacturasProvEnvioEMail.dfm

@@ -0,0 +1,89 @@
+inherited fDialogListaFacturasProvEnvioEMail: TfDialogListaFacturasProvEnvioEMail
+  Caption = 'Enviar facturas por correo electr'#243'nico'
+  ClientHeight = 432
+  ClientWidth = 735
+  ExplicitWidth = 741
+  ExplicitHeight = 457
+  PixelsPerInch = 96
+  TextHeight = 13
+  inherited pnlBotones: TFlowPanel
+    Top = 376
+    Width = 735
+    ExplicitTop = 376
+    ExplicitWidth = 735
+    inherited Button1: TButton
+      Left = 639
+      Caption = '&Salir'
+      ExplicitLeft = 639
+    end
+    inherited Button2: TButton
+      Left = 528
+      Width = 96
+      ExplicitLeft = 528
+      ExplicitWidth = 96
+    end
+  end
+  inherited FlowPanel1: TFlowPanel
+    Width = 735
+    Height = 376
+    ExplicitWidth = 735
+    ExplicitHeight = 376
+    inherited lblInstruccion: TLabel
+      Width = 306
+      Caption = 'Enviar facturas por correo electr'#243'nico'
+      Font.Style = [fsBold]
+      ExplicitWidth = 306
+    end
+    inherited Label2: TLabel
+      Height = 51
+      Caption = 
+        'Se generar'#225'n correos electr'#243'nicos autom'#225'ticos adjuntando las fac' +
+        'turas elegidas en formato PDF. S'#243'lo se tendr'#225'n en cuenta los pro' +
+        'veedores que tengan relleno su e-mail administrativo.'
+      WordWrap = True
+      ExplicitHeight = 51
+    end
+    inherited ListView1: TListView
+      Top = 121
+      Width = 658
+      Height = 232
+      Columns = <
+        item
+          Caption = 'Documento'
+          MaxWidth = 75
+          MinWidth = 75
+          Width = 75
+        end
+        item
+          Caption = 'Destinatario'
+          MaxWidth = 300
+          Width = 280
+        end
+        item
+          Caption = 'Direcci'#243'n E-Mail'
+          MaxWidth = 250
+          Width = 150
+        end
+        item
+          Caption = 'Estado'
+          MaxWidth = 250
+          Width = 149
+        end>
+      ExplicitTop = 121
+      ExplicitWidth = 658
+      ExplicitHeight = 232
+    end
+  end
+  inherited ActionList1: TActionList
+    Left = 8
+    Top = 352
+    inherited actAceptar: TAction
+      Caption = '&Generar correos'
+      OnExecute = actAceptarExecute
+      OnUpdate = actAceptarUpdate
+    end
+    inherited actCancelar: TAction
+      OnExecute = actCancelarExecute
+    end
+  end
+end

Source/Modulos/Facturas de proveedor/Views/uDialogListaFacturasProvEnvioEMail.pas

@@ -0,0 +1,158 @@
+unit uDialogListaFacturasProvEnvioEMail;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, uDialogBase, ActnList, StdCtrls, ExtCtrls, ComCtrls,
+  uDialogListaEnvioEMail, uIDialogListaFacturasProvEnvioEMail, uFacturasProveedorController,
+  uBizFacturasProveedor;
+
+type
+  TfDialogListaFacturasProvEnvioEMail = class(TfDialogListaEnvioEMail, IDialogListaFacturasProvEnvioEMail)
+    procedure actCancelarExecute(Sender: TObject);
+    procedure actAceptarUpdate(Sender: TObject);
+    procedure actAceptarExecute(Sender: TObject);
+  private
+    FFacturas : IBizFacturaProveedor;
+    FController : IFacturasProveedorController;
+  protected
+    function GetFacturas: IBizFacturaProveedor;
+    procedure SetFacturas(const Value: IBizFacturaProveedor);
+
+    procedure RellenarLista;
+    procedure BorrarLista;
+  public
+    constructor Create(AOwner: TComponent); override;
+    property Facturas: IBizFacturaProveedor read GetFacturas write SetFacturas;
+  end;
+
+implementation
+
+uses
+  schFacturasProveedorClient_Intf, uStringsUtils, cxControls;
+
+{$R *.dfm}
+
+
+{ TfDialogListaFacturasEnvioEMail }
+
+procedure TfDialogListaFacturasProvEnvioEMail.actAceptarExecute(Sender: TObject);
+var
+  i : Integer;
+begin
+  ShowHourglassCursor;
+  Application.ProcessMessages;
+  try
+    FFacturas.First;
+    FController.RecuperarProveedor(FFacturas);
+    FFacturas.Proveedor.DataTable.Active := True;
+    try
+      for i := 0 to FFacturas.DataTable.RecordCount - 1 do
+      begin
+        if not EsCadenaVacia(FFacturas.Proveedor.EMAIL_ADMINISTRACION) then
+        begin
+          if FController.EnviarFacturaPorEMail(FFacturas, True, FFacturas.Proveedor.EMAIL_ADMINISTRACION) then
+          begin
+            ListView1.Items[i].SubItems[2] := 'Correo generado';
+            ModalResult := mrOk;
+          end
+          else
+            ListView1.Items[i].SubItems[2] := 'Error al generar correo';
+          Self.Update;
+          Application.ProcessMessages;
+        end;
+
+        FFacturas.Next;
+        FController.RecuperarProveedor(FFacturas);
+        FFacturas.Proveedor.DataTable.Active := True;
+      end;
+      Button2.Enabled := False;
+    finally
+      ListView1.Items.EndUpdate;
+    end;
+  finally
+    HideHourglassCursor;
+  end;
+
+  Button1.SetFocus;
+end;
+
+procedure TfDialogListaFacturasProvEnvioEMail.actAceptarUpdate(Sender: TObject);
+begin
+  inherited;
+  (Sender as TAction).Enabled := (ListView1.Items.Count > 0)
+end;
+
+procedure TfDialogListaFacturasProvEnvioEMail.actCancelarExecute(Sender: TObject);
+begin
+  inherited;
+  ModalResult := mrOk;
+end;
+
+procedure TfDialogListaFacturasProvEnvioEMail.BorrarLista;
+begin
+  ListView1.Items.Clear;
+end;
+
+constructor TfDialogListaFacturasProvEnvioEMail.Create(AOwner: TComponent);
+begin
+  inherited;
+  ModalResult := mrCancel;
+  FController := TFacturasProveedorController.Create;
+end;
+
+function TfDialogListaFacturasProvEnvioEMail.GetFacturas: IBizFacturaProveedor;
+begin
+  Result := FFacturas;
+end;
+
+procedure TfDialogListaFacturasProvEnvioEMail.RellenarLista;
+var
+  i : Integer;
+begin
+  ListView1.Items.BeginUpdate;
+  ListView1.Items.Clear;
+
+  FFacturas.First;
+  FFacturas.DataTable.DisableControls;
+  try
+    for i := 0 to FFacturas.DataTable.RecordCount - 1 do
+    begin
+      FController.RecuperarProveedor(FFacturas);
+      FFacturas.Proveedor.DataTable.Active := True;
+
+      with ListView1.Items.Add do
+      begin
+        Caption := FFacturas.REFERENCIA;
+        SubItems.Add(FFacturas.NOMBRE);
+        SubItems.Add(FFacturas.Proveedor.EMAIL_ADMINISTRACION);
+
+        if EsCadenaVacia(FFacturas.Proveedor.EMAIL_ADMINISTRACION) then
+          SubItems.Add('Sin dirección e-mail administrativa')
+        else
+          SubItems.Add('')
+      end;
+      FFacturas.Next;
+    end;
+  finally
+    FFacturas.DataTable.EnableControls;
+    ListView1.Items.EndUpdate;
+  end;
+end;
+
+procedure TfDialogListaFacturasProvEnvioEMail.SetFacturas(
+  const Value: IBizFacturaProveedor);
+begin
+  FFacturas := Value;
+
+  if Assigned(FFacturas) then
+  begin
+    FFacturas.DataTable.Open;
+    RellenarLista;
+  end
+  else
+    BorrarLista;
+end;
+
+end.

Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.dfm

@@ -3,7 +3,7 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor
   ClientHeight = 666
   ClientWidth = 640
   ExplicitWidth = 648
-  ExplicitHeight = 700
+  ExplicitHeight = 693
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -38,7 +38,7 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor
     Width = 640
     ExplicitWidth = 640
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 632
+      ExplicitWidth = 640
       object TBXSubmenuItem2: TTBXSubmenuItem [0]
         Caption = 'Nuevo'
         DisplayMode = nbdmImageAndText
@@ -57,6 +57,9 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor
       inherited TBXItem2: TTBXItem
         Visible = False
       end
+      object TBXItem40: TTBXItem [14]
+        Action = actEnviarEMail
+      end
     end
     inherited tbxMenu: TTBXToolbar
       ExplicitWidth = 640
@@ -109,6 +112,9 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor
             Kind = skCount
             Column = frViewFacturasProveedor1.cxGridViewREFERENCIA
           end>
+        inherited cxGridViewNUM_COPIAS: TcxGridDBColumn
+          IsCaptionAssigned = True
+        end
       end
     end
     inherited frViewFiltroBase1: TfrViewFiltroBase
@@ -204,6 +210,12 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor
       ImageIndex = 24
       OnExecute = actNuevoAbonoExecute
     end
+    object actEnviarEMail: TAction
+      Category = 'Acciones'
+      Caption = 'Enviar por e-mail...'
+      OnExecute = actEnviarEMailExecute
+      OnUpdate = actEnviarEMailUpdate
+    end
   end
   inherited SmallImages: TPngImageList [5]
     PngImages = <

Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.pas

@@ -31,10 +31,14 @@ type
     JsPrevisualizarDialog: TJSDialog;
     JsImprimirDialog: TJSDialog;
     JsListaFacturasNoEliminadas: TJSDialog;
+    actEnviarEMail: TAction;
+    TBXItem40: TTBXItem;
     procedure FormShow(Sender: TObject);
     procedure actEliminarUpdate(Sender: TObject);
     procedure actNuevaFacturaExecute(Sender: TObject);
     procedure actNuevoAbonoExecute(Sender: TObject);
+    procedure actEnviarEMailExecute(Sender: TObject);
+    procedure actEnviarEMailUpdate(Sender: TObject);
   private
     FFacturas: IBizFacturaProveedor;
     FController : IFacturasProveedorController;
@@ -62,7 +66,7 @@ type
 implementation
 
 uses
-  uDataModuleFacturasProveedor, uDataModuleUsuarios,
+  cxControls, uDataModuleFacturasProveedor, uDataModuleUsuarios,
   uGridUtils, uDBSelectionListUtils,
   uAlbaranesProveedorController, uBizAlbaranesProveedor,
   uEditorBase, uGenerarFacturasProvAlbProvUtils;
@@ -79,6 +83,40 @@ begin
      (Sender as TAction).Enabled := (FFacturas.SITUACION = CTE_PENDIENTE);
 end;
 
+procedure TfEditorFacturasProveedor.actEnviarEMailExecute(Sender: TObject);
+var
+  AFacturas : IBizFacturaProveedor;
+begin
+  inherited;
+
+  if ViewGrid.NumSeleccionados = 1 then
+    FController.GenerarEmailFactura(Facturas)
+  else begin
+    ShowHourglassCursor;
+    try
+      SeleccionarFilasDesdeGrid(ViewGrid._FocusedView, (Facturas as ISeleccionable).SelectedRecords);
+      AFacturas := (Controller as IFacturasProveedorController).ExtraerSeleccionados(Facturas, ViewGrid) as IBizFacturaProveedor;
+
+      if Assigned(AFacturas) then
+         if FController.EnviarEmailFacturas(AFacturas) then
+            RefrescarInterno;
+    finally
+      AFacturas := NIL;
+      HideHourglassCursor;
+    end;
+  end;
+end;
+
+procedure TfEditorFacturasProveedor.actEnviarEMailUpdate(Sender: TObject);
+begin
+  inherited;
+  if HayDatos and Assigned(ViewGrid) then
+    (Sender as TAction).Enabled := ViewGrid.esSeleccionCeldaDatos
+      and (ViewGrid.NumSeleccionados > 0)
+  else
+    (Sender as TAction).Enabled := False;
+end;
+
 procedure TfEditorFacturasProveedor.actNuevaFacturaExecute(Sender: TObject);
 begin
   actNuevo.Execute;

Source/Modulos/Facturas de proveedor/Views/uFacturasProveedorViewRegister.pas

@@ -9,7 +9,8 @@ implementation
 
 uses
   uEditorRegistryUtils, uEditorFacturasProveedor,  uEditorFacturaProveedor,
-  uEditorElegirArticulosFacturaProveedor, uEditorFacturasProveedorReport;
+  uEditorElegirArticulosFacturaProveedor, uEditorFacturasProveedorReport,
+  uDialogListaFacturasProvEnvioEMail;
 
 procedure RegisterViews;
 begin
@@ -17,6 +18,7 @@ begin
   EditorRegistry.RegisterClass(TfEditorFacturaProveedor, 'EditorFacturaProveedor');
   EditorRegistry.RegisterClass(TfEditorElegirArticulosFacturaProveedor, 'EditorElegirArticulosFacturaProveedor');
   EditorRegistry.RegisterClass(TfEditorFacturasProveedorPreview, 'EditorFacturasProveedorPreview');
+  EditorRegistry.RegisterClass(TfDialogListaFacturasProvEnvioEMail, 'DialogListaFacturasProvEnvioEMail');
 end;
 
 procedure UnregisterViews;
@@ -25,6 +27,7 @@ begin
   EditorRegistry.UnRegisterClass(TfEditorFacturaProveedor);
   EditorRegistry.UnRegisterClass(TfEditorElegirArticulosFacturaProveedor);
   EditorRegistry.UnRegisterClass(TfEditorFacturasProveedorPreview);
+  EditorRegistry.UnRegisterClass(TfDialogListaFacturasProvEnvioEMail);
 end;
 
 end.

Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm

@@ -35,13 +35,27 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor
       OptionsView.GroupFooters = gfAlwaysVisible
       object cxGridViewNUM_COPIAS: TcxGridDBColumn
         DataBinding.FieldName = 'NUM_COPIAS'
-        OnCustomDrawCell = cxGridViewNUM_COPIASCustomDrawCell
         MinWidth = 30
         Options.HorzSizing = False
         VisibleForCustomization = False
         Width = 30
+        OnCustomDrawHeader = cxGridViewNUM_COPIASCustomDrawHeader
         IsCaptionAssigned = True
       end
+      object cxGridViewNUM_CORREOS: TcxGridDBColumn
+        DataBinding.FieldName = 'NUM_CORREOS'
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.Alignment.Horz = taCenter
+        BestFitMaxWidth = 25
+        MinWidth = 25
+        Options.Editing = False
+        Options.HorzSizing = False
+        Options.Moving = False
+        Options.ShowCaption = False
+        VisibleForCustomization = False
+        Width = 25
+        OnCustomDrawHeader = cxGridViewNUM_CORREOSCustomDrawHeader
+      end
       object cxGridViewTIPO: TcxGridDBColumn
         DataBinding.FieldName = 'TIPO'
         PropertiesClassName = 'TcxImageComboBoxProperties'
@@ -261,7 +275,91 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor
     end
   end
   inherited PngImageList10: TPngImageList
+    PngImages = <
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D4948445200000010000000100804000000B5FA37
+          EA000000097048597300000B1300000B1301009A9C180000031B694343505068
+          6F746F73686F70204943432070726F66696C65000078DA6360609EE0E8E2E4CA
+          24C0C050505452E41EE418191119A5C07E9E818D819981818181812131B9B8C0
+          3120C087818181212F3F2F9501153032307CBBC6C0C8C0C0C07059D7D1C5C995
+          8134C09A5C5054C2C0C070808181C12825B538998181E10B0303437A79494109
+          0303630C03038348527641090303630103038348764890330303630B0303134F
+          496A450903030383737E416551667A468982A1A5A5A582634A7E52AA42706571
+          496A6EB182675E727E51417E5162496A0A030303D40E060606065E97FC1205F7
+          C4CC3C05435355062A8388C82805080B113E083104482E2D2A83072503830083
+          16831F4325C32A86078CD28C518CF3189F32193235305D62D6606E64BECB62C3
+          328F9599359BF52A9B13DB267615F6991C021C9D9CAC9CCD5CCC5C6DDCDCDC13
+          79A47896F21AF31EE20BE67BC65F2D2024B05AD04DF09150A3B0A2F061917451
+          5ED1AD6271E29CE25B25522485258F4A5548EB4A3F9199231B2A27287756BE47
+          C1479157F182D214E528152595D7AA5BD51AD5FD346435DE6AEED39AA89DAA63
+          AD2BA4FB4AEF88FE7C831AC328234B6349E3DF26F74C0F9BAD30EFB7A8B04CB4
+          F2B1B6B051B515B163B1FB6AFFDCE1B6E305A763CE7B5DB6BAAE775BE9BED463
+          91E742AF05DE0B7D16FB2EF35BE5BF3E606BE0DEA063C1E7436E853E0BFB12C1
+          142918A5146D1CE3161B159717DF92303B7173D2D9E4E7A94C6972E936195199
+          5559B3B2F7E4DCCB63CA572FF0292C2E9A5D7CB8E46D9944B94B4561E5BCAAB3
+          D57F6BF5EAE2EB27351C6BFCDD6CD092DE3AAFED7A8760A777577BF7E15E863E
+          FBFEBA09FB26FE9FEC38A575EA89E9BC338267CE9AF5688ED6DC9279FB16702D
+          0C5BB478F1C7A50ECB262C7FB8D27855EBEA9B6B75D735ADBFB9D16053C7E607
+          5BADB64DDDFE61A7EFAE557B38F6A6EF3B7E40FD60E7A1D747FC8E6E3E2E7EA2
+          F6E493D3DE67B69C933DDF7EE1D3A5B8CBA7AE5A5C5B7643F466EBADAF77D2EF
+          DEBCEFF3E0C023D3C7AB9F2A3E9BF942F065D76BE637756F7FBE2FFDF0E953C1
+          E7775FF3BEBDFB91FFF3C3EFE23FDFFE55FDFF0F002E0C1D8BA03C0931000001
+          2D4944415478DA63FCCF801F3092AC20EFFFFF870C070A0EA82CF88F4D41EEFF
+          7C063E20BD80E1F0C1CD0E680AEAFEBF67C8679060F8C8F0986119C3858F8704
+          501494FECF60A867980B94FECCB08A61FBC7A2050105480A4AFE973188319C67
+          E863286238C2B099C139B06203921B20D2207082A10B688630C31F8660C7E803
+          700515FF8BC00A5E333C6778C6F0936111832EC3A58FEB106EE8FAFF8521186C
+          C21786870C6B80D2AF800EDDC28864851BC33E86FF0C3A0C3F18B603A59F30FC
+          62F8C0B019A2C055E08F81C8FEC90C8C0C5719B6315C6330014BFF072A809A00
+          22BC13A4E67B336803832891419CE137D01D5C0C2F034F6D802B6060F049F837
+          4190DF111840BF19FE7FFC9170062809F5268838C8A8CEC8CE129DF5A5E5F79F
+          1FA97F375FFA0112C51A1798000002C5780121B7DDC80000000049454E44AE42
+          6082}
+        Name = 'PngImage0'
+        Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D4948445200000010000000100804000000B5FA37
+          EA000000097048597300000B1300000B1301009A9C180000031B694343505068
+          6F746F73686F70204943432070726F66696C65000078DA6360609EE0E8E2E4CA
+          24C0C050505452E41EE418191119A5C07E9E818D819981818181812131B9B8C0
+          3120C087818181212F3F2F9501153032307CBBC6C0C8C0C0C07059D7D1C5C995
+          8134C09A5C5054C2C0C070808181C12825B538998181E10B0303437A79494109
+          0303630C03038348527641090303630103038348764890330303630B0303134F
+          496A450903030383737E416551667A468982A1A5A5A582634A7E52AA42706571
+          496A6EB182675E727E51417E5162496A0A030303D40E060606065E97FC1205F7
+          C4CC3C05435355062A8388C82805080B113E083104482E2D2A83072503830083
+          16831F4325C32A86078CD28C518CF3189F32193235305D62D6606E64BECB62C3
+          328F9599359BF52A9B13DB267615F6991C021C9D9CAC9CCD5CCC5C6DDCDCDC13
+          79A47896F21AF31EE20BE67BC65F2D2024B05AD04DF09150A3B0A2F061917451
+          5ED1AD6271E29CE25B25522485258F4A5548EB4A3F9199231B2A27287756BE47
+          C1479157F182D214E528152595D7AA5BD51AD5FD346435DE6AEED39AA89DAA63
+          AD2BA4FB4AEF88FE7C831AC328234B6349E3DF26F74C0F9BAD30EFB7A8B04CB4
+          F2B1B6B051B515B163B1FB6AFFDCE1B6E305A763CE7B5DB6BAAE775BE9BED463
+          91E742AF05DE0B7D16FB2EF35BE5BF3E606BE0DEA063C1E7436E853E0BFB12C1
+          142918A5146D1CE3161B159717DF92303B7173D2D9E4E7A94C6972E936195199
+          5559B3B2F7E4DCCB63CA572FF0292C2E9A5D7CB8E46D9944B94B4561E5BCAAB3
+          D57F6BF5EAE2EB27351C6BFCDD6CD092DE3AAFED7A8760A777577BF7E15E863E
+          FBFEBA09FB26FE9FEC38A575EA89E9BC338267CE9AF5688ED6DC9279FB16702D
+          0C5BB478F1C7A50ECB262C7FB8D27855EBEA9B6B75D735ADBFB9D16053C7E607
+          5BADB64DDDFE61A7EFAE557B38F6A6EF3B7E40FD60E7A1D747FC8E6E3E2E7EA2
+          F6E493D3DE67B69C933DDF7EE1D3A5B8CBA7AE5A5C5B7643F466EBADAF77D2EF
+          DEBCEFF3E0C023D3C7AB9F2A3E9BF942F065D76BE637756F7FBE2FFDF0E953C1
+          E7775FF3BEBDFB91FFF3C3EFE23FDFFE55FDFF0F002E0C1D8BA03C0931000000
+          C14944415478DABDD13F0BC14118C0F1EF6D06B1B1FEDE80FABD082619E49D78
+          0B769B49190C8A41C9885226857E06938588FC1D0CFE0E8F27830E6592ABE7BA
+          EE3EF7DC3D7746F8DECCDF404D2E0886B3C64D7B34D2C60215199320A4CB270E
+          ACE952626483A2387494843932D311E499D8A02071A63488E9414D1C069499DB
+          2027294DDC66C79E2D11FA9A656D83AC44A9E3E2D75B780C59D27B05190912C0
+          A7BB17CCD928FB00AD4781272DCFC78AABCEBD00F37C98F787FB0049B7EAFDF6
+          2FEEC02251018239FFBF0000000049454E44AE426082}
+        Name = 'PngImage1'
+        Background = clWindow
+      end>
     Left = 328
+    Bitmap = {}
   end
   inherited dxPrintStyleManager1: TdxPrintStyleManager
     inherited dxPrintStyleManager1Style1: TdxPSPrintStyle

Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas

@@ -57,6 +57,7 @@ type
     TBXSeparatorItem2: TTBXSeparatorItem;
     cxGridViewTIPO: TcxGridDBColumn;
     cxGridViewNUM_COPIAS: TcxGridDBColumn;
+    cxGridViewNUM_CORREOS: TcxGridDBColumn;
     procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
       ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
       out AStyle: TcxStyle);
@@ -65,8 +66,11 @@ type
     procedure actProveedorUpdate(Sender: TObject);
     procedure actProvinciaExecute(Sender: TObject);
     procedure actProvinciaUpdate(Sender: TObject);
-    procedure cxGridViewNUM_COPIASCustomDrawCell(Sender: TcxCustomGridTableView;
+    procedure cxGridViewNUM_CORREOSCustomDrawHeader(Sender: TcxGridTableView;
-      ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
+      ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo;
+      var ADone: Boolean);
+    procedure cxGridViewNUM_COPIASCustomDrawHeader(Sender: TcxGridTableView;
+      ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo;
       var ADone: Boolean);
 
   private
@@ -187,21 +191,46 @@ begin
   RefrescarFiltro;
 end;
 
-procedure TfrViewFacturasProveedor.cxGridViewNUM_COPIASCustomDrawCell(
+procedure TfrViewFacturasProveedor.cxGridViewNUM_COPIASCustomDrawHeader(
-  Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
+  Sender: TcxGridTableView; ACanvas: TcxCanvas;
-  AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+  AViewInfo: TcxGridColumnHeaderViewInfo; var ADone: Boolean);
 var
   R : TRect;
 begin
   inherited;
-  if (AViewInfo.GridRecord.DisplayTexts[cxGridViewNUM_COPIAS.Index] <> '') then
+  with AViewInfo do
   begin
+    LookAndFeelPainter.DrawHeader(ACanvas, Bounds, TextAreaBounds, Neighbors,
+      Borders, ButtonState, AlignmentHorz, AlignmentVert, MultiLine,
+      False, '', Params.Font, Params.TextColor, Params.Color);
+
     R := AViewInfo.ContentBounds;
     ACanvas.FillRect(R);
-    ACanvas.DrawImage(PngImageList, R.Left, R.Top, 4);
+    ACanvas.DrawImage(PngImageList10, R.Left + 2, R.Top, 0);
-    ACanvas.DrawTexT(AViewInfo.GridRecord.DisplayTexts[cxGridViewNUM_COPIAS.Index], R, cxAlignCenter or cxAlignVCenter);
-    ADone := True;
   end;
+
+  ADone := True;
+end;
+
+procedure TfrViewFacturasProveedor.cxGridViewNUM_CORREOSCustomDrawHeader(
+  Sender: TcxGridTableView; ACanvas: TcxCanvas;
+  AViewInfo: TcxGridColumnHeaderViewInfo; var ADone: Boolean);
+var
+  R : TRect;
+begin
+  inherited;
+  with AViewInfo do
+  begin
+    LookAndFeelPainter.DrawHeader(ACanvas, Bounds, TextAreaBounds, Neighbors,
+      Borders, ButtonState, AlignmentHorz, AlignmentVert, MultiLine,
+      False, '', Params.Font, Params.TextColor, Params.Color);
+
+    R := AViewInfo.ContentBounds;
+    ACanvas.FillRect(R);
+    ACanvas.DrawImage(PngImageList10, R.Left + 2, R.Top, 1);
+  end;
+
+  ADone := True;
 end;
 
 procedure TfrViewFacturasProveedor.cxGridViewStylesGetContentStyle(

Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas

@@ -83,6 +83,7 @@ type
     function ValidarPedido(APedido: IBizPedidoProveedor): Boolean;
     function ValidarSituacion(ASituacion: String; AFechaPedido: TDateTime;
       var AFechaRecepcion: TDateTime): Boolean;
+    procedure _AnadirMarcaEnvioCorreo(APedido: IBizPedidoProveedor);      
 
   public
     property ProveedorController: IProveedoresController read GetProveedorController write SetProveedorController;
@@ -139,7 +140,7 @@ uses
   schPedidosProveedorClient_Intf, uDAInterfaces, uPedidosProveedorReportController,
   uDateUtils, uIEditorPedidoProveedor, uIEditorElegirPedidosProveedor,
   Dialogs, uIEditorDireccionEntregaPedidoProveedor, Classes,
-  uIEditorSituacionPedidoProveedor, Variants,
+  uIEditorSituacionPedidoProveedor, Variants, uDataModuleRegistroCorreos,
   uIDialogListaPedidosProvEnvioEMail, uSistemaFunc, uStringsUtils, uDialogElegirEMail, Forms, uEMailUtils;
 
 { TPedidosProveedorController }
@@ -489,6 +490,38 @@ begin
     end;
 end;
 
+procedure TPedidosProveedorController._AnadirMarcaEnvioCorreo(
+  APedido: IBizPedidoProveedor);
+var
+  ASoloLectura : Boolean;
+begin
+  if not Assigned(APedido) then
+    raise Exception.Create ('Pedido no asignada (_AnadirMarcaEnvioCorreo)');
+
+  if APedido.DataTable.Active then
+    APedido.DataTable.Active := True;
+
+  if AnadirMarcaEnvioCorreo(nme_PedidosProveedor, APedido.ID) then
+  begin
+    DesconectarTabla(APedido.DataTable);
+    try
+      ASoloLectura := APedido.DataTable.ReadOnly;
+      if ASoloLectura then
+        SetDataTableReadOnly(APedido.DataTable, False);
+      try
+        APedido.Edit;
+        APedido.NUM_CORREOS := APedido.NUM_CORREOS + 1;
+        APedido.Post;
+      finally
+        if ASoloLectura then
+          SetDataTableReadOnly(APedido.DataTable, True);
+      end;
+    finally
+      ConectarTabla(APedido.DataTable);
+    end;
+  end;
+end;
+
 function TPedidosProveedorController._Vacio: IBizPedidoProveedor;
 begin
   Result := Buscar(ID_NULO);
@@ -671,7 +704,7 @@ begin
     AReportController.ExportToPDF(APedido.ID, AFicheroTMP);
     Result := EnviarEMailMAPI(AAsunto, ATextoEMail, AFicheroTMP, '', '', APedido.Proveedor.NOMBRE, AEMail, AEnviarDirectamente);
     if Result then
-//      _AnadirMarcaEnvioCorreo(APedido);
+       _AnadirMarcaEnvioCorreo(APedido);
   finally
     SysUtils.DeleteFile(AFicheroTMP);
     AReportController := NIL;

Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.dfm

@@ -509,6 +509,17 @@ object DataModulePedidosProveedor: TDataModulePedidosProveedor
         Calculated = False
         Lookup = False
         LookupCache = False
+      end
+      item
+        Name = 'NUM_CORREOS'
+        DataType = datInteger
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
       end>
     Params = <>
     MasterMappingMode = mmDataRequest

Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas

@@ -9,12 +9,12 @@ 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_DarReferencia = '{352EF067-18AC-4EC5-938F-7527FA27AB41}';
+  RID_DarReferencia = '{569D9087-BBEE-4EC6-9A84-936628C183A9}';
-  RID_PedidosProveedor = '{7F558FB2-C09A-403E-8CDD-C2FA5061EBF9}';
+  RID_PedidosProveedor = '{92B50C29-DC14-4FD5-A1C1-B6B4DCD3EEBD}';
-  RID_PedidosProveedor_Detalles = '{54D873B1-522E-4520-913C-93A64257BE8D}';
+  RID_PedidosProveedor_Detalles = '{B6ECB5AB-5B23-468C-9F17-B8826F1F7D3A}';
-  RID_PedidosProveedor_Detalles_Refresh = '{8E3D8B4C-F8AA-48A5-8301-1EC9701605CC}';
+  RID_PedidosProveedor_Detalles_Refresh = '{36A9B592-23EC-4FE7-BB3A-81B2BCF9928C}';
-  RID_PedidosProveedor_Refresh = '{A8C63D3C-CA6E-4AA8-B66A-4BBCEADDF26C}';
+  RID_PedidosProveedor_Refresh = '{39391BDC-E558-43CE-A6AF-5D3A22627534}';
-  RID_PedidosProveedor_Articulos_Pendientes = '{33A1AFBC-0DAC-48AB-9835-5985A5F59428}';
+  RID_PedidosProveedor_Articulos_Pendientes = '{AA412BC5-2D68-45DC-AC60-97540E357854}';
 
   { Data table names }
   nme_DarReferencia = 'DarReferencia';
@@ -67,6 +67,7 @@ const
   fld_PedidosProveedorIMPORTE_IVA = 'IMPORTE_IVA';
   fld_PedidosProveedorID_FORMA_PAGO = 'ID_FORMA_PAGO';
   fld_PedidosProveedorNUM_COPIAS = 'NUM_COPIAS';
+  fld_PedidosProveedorNUM_CORREOS = 'NUM_CORREOS';
 
   { PedidosProveedor field indexes }
   idx_PedidosProveedorID = 0;
@@ -105,6 +106,7 @@ const
   idx_PedidosProveedorIMPORTE_IVA = 33;
   idx_PedidosProveedorID_FORMA_PAGO = 34;
   idx_PedidosProveedorNUM_COPIAS = 35;
+  idx_PedidosProveedorNUM_CORREOS = 36;
 
   { PedidosProveedor_Detalles fields }
   fld_PedidosProveedor_DetallesID = 'ID';
@@ -207,6 +209,7 @@ const
   fld_PedidosProveedor_RefreshIMPORTE_IVA = 'IMPORTE_IVA';
   fld_PedidosProveedor_RefreshID_FORMA_PAGO = 'ID_FORMA_PAGO';
   fld_PedidosProveedor_RefreshNUM_COPIAS = 'NUM_COPIAS';
+  fld_PedidosProveedor_RefreshNUM_CORREOS = 'NUM_CORREOS';
 
   { PedidosProveedor_Refresh field indexes }
   idx_PedidosProveedor_RefreshID = 0;
@@ -245,6 +248,7 @@ const
   idx_PedidosProveedor_RefreshIMPORTE_IVA = 33;
   idx_PedidosProveedor_RefreshID_FORMA_PAGO = 34;
   idx_PedidosProveedor_RefreshNUM_COPIAS = 35;
+  idx_PedidosProveedor_RefreshNUM_CORREOS = 36;
 
   { PedidosProveedor_Articulos_Pendientes fields }
   fld_PedidosProveedor_Articulos_PendientesID_PEDIDO = 'ID_PEDIDO';
@@ -265,7 +269,7 @@ const
 type
   { IDarReferencia }
   IDarReferencia = interface(IDAStronglyTypedDataTable)
-  ['{7ACFFC47-33BA-425C-9DFA-FA72D8BC6D30}']
+  ['{64D07D1A-5773-40AD-A317-0371C1E4D403}']
     { Property getters and setters }
     function GetVALORValue: String;
     procedure SetVALORValue(const aValue: String);
@@ -294,7 +298,7 @@ type
 
   { IPedidosProveedor }
   IPedidosProveedor = interface(IDAStronglyTypedDataTable)
-  ['{1F5A82AC-6202-4772-939F-5FD2E6AAE0BA}']
+  ['{DB7BC08B-43B9-486E-AB73-628B2C885199}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -368,6 +372,8 @@ type
     procedure SetID_FORMA_PAGOValue(const aValue: Integer);
     function GetNUM_COPIASValue: Integer;
     procedure SetNUM_COPIASValue(const aValue: Integer);
+    function GetNUM_CORREOSValue: Integer;
+    procedure SetNUM_CORREOSValue(const aValue: Integer);
 
 
     { Properties }
@@ -407,6 +413,7 @@ type
     property IMPORTE_IVA: Currency read GetIMPORTE_IVAValue write SetIMPORTE_IVAValue;
     property ID_FORMA_PAGO: Integer read GetID_FORMA_PAGOValue write SetID_FORMA_PAGOValue;
     property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
   end;
 
   { TPedidosProveedorDataTableRules }
@@ -486,6 +493,8 @@ type
     procedure SetID_FORMA_PAGOValue(const aValue: Integer); virtual;
     function GetNUM_COPIASValue: Integer; virtual;
     procedure SetNUM_COPIASValue(const aValue: Integer); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -524,6 +533,7 @@ type
     property IMPORTE_IVA: Currency read GetIMPORTE_IVAValue write SetIMPORTE_IVAValue;
     property ID_FORMA_PAGO: Integer read GetID_FORMA_PAGOValue write SetID_FORMA_PAGOValue;
     property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -533,7 +543,7 @@ type
 
   { IPedidosProveedor_Detalles }
   IPedidosProveedor_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{18D7051D-B8C3-4A0A-896A-0CB00934D5B5}']
+  ['{E9EF64AB-0C7A-4F49-8856-34144A2E42AC}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -640,7 +650,7 @@ type
 
   { IPedidosProveedor_Detalles_Refresh }
   IPedidosProveedor_Detalles_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{C2A9B50C-251F-498A-ABD2-673D17077B34}']
+  ['{B1FF840E-8E77-4AD8-B8A8-4E749525408D}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -747,7 +757,7 @@ type
 
   { IPedidosProveedor_Refresh }
   IPedidosProveedor_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{346F0E68-4313-4072-ACB1-BA32595D7D42}']
+  ['{4D420826-77D4-4AA6-A215-8E176224B9B2}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -821,6 +831,8 @@ type
     procedure SetID_FORMA_PAGOValue(const aValue: Integer);
     function GetNUM_COPIASValue: Integer;
     procedure SetNUM_COPIASValue(const aValue: Integer);
+    function GetNUM_CORREOSValue: Integer;
+    procedure SetNUM_CORREOSValue(const aValue: Integer);
 
 
     { Properties }
@@ -860,6 +872,7 @@ type
     property IMPORTE_IVA: Currency read GetIMPORTE_IVAValue write SetIMPORTE_IVAValue;
     property ID_FORMA_PAGO: Integer read GetID_FORMA_PAGOValue write SetID_FORMA_PAGOValue;
     property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
   end;
 
   { TPedidosProveedor_RefreshDataTableRules }
@@ -939,6 +952,8 @@ type
     procedure SetID_FORMA_PAGOValue(const aValue: Integer); virtual;
     function GetNUM_COPIASValue: Integer; virtual;
     procedure SetNUM_COPIASValue(const aValue: Integer); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -977,6 +992,7 @@ type
     property IMPORTE_IVA: Currency read GetIMPORTE_IVAValue write SetIMPORTE_IVAValue;
     property ID_FORMA_PAGO: Integer read GetID_FORMA_PAGOValue write SetID_FORMA_PAGOValue;
     property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -986,7 +1002,7 @@ type
 
   { IPedidosProveedor_Articulos_Pendientes }
   IPedidosProveedor_Articulos_Pendientes = interface(IDAStronglyTypedDataTable)
-  ['{672805D4-7AC5-4FF8-941D-B60690C7BB94}']
+  ['{1DF9A26D-11AD-4D01-9C56-88D2D9839665}']
     { Property getters and setters }
     function GetID_PEDIDOValue: Integer;
     procedure SetID_PEDIDOValue(const aValue: Integer);
@@ -1442,6 +1458,16 @@ begin
   DataTable.Fields[idx_PedidosProveedorNUM_COPIAS].AsInteger := aValue;
 end;
 
+function TPedidosProveedorDataTableRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := DataTable.Fields[idx_PedidosProveedorNUM_CORREOS].AsInteger;
+end;
+
+procedure TPedidosProveedorDataTableRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_PedidosProveedorNUM_CORREOS].AsInteger := aValue;
+end;
+
 
 { TPedidosProveedor_DetallesDataTableRules }
 constructor TPedidosProveedor_DetallesDataTableRules.Create(aDataTable: TDADataTable);
@@ -2120,6 +2146,16 @@ begin
   DataTable.Fields[idx_PedidosProveedor_RefreshNUM_COPIAS].AsInteger := aValue;
 end;
 
+function TPedidosProveedor_RefreshDataTableRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := DataTable.Fields[idx_PedidosProveedor_RefreshNUM_CORREOS].AsInteger;
+end;
+
+procedure TPedidosProveedor_RefreshDataTableRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_PedidosProveedor_RefreshNUM_CORREOS].AsInteger := aValue;
+end;
+
 
 { TPedidosProveedor_Articulos_PendientesDataTableRules }
 constructor TPedidosProveedor_Articulos_PendientesDataTableRules.Create(aDataTable: TDADataTable);

Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorServer_Intf.pas

@@ -9,17 +9,17 @@ 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_DarReferenciaDelta = '{431FAF99-6789-4FA4-9A91-32E5EF0A12C4}';
+  RID_DarReferenciaDelta = '{B28F26DA-2A46-4DAA-A0D5-1DDBCA844BED}';
-  RID_PedidosProveedorDelta = '{2F368F7D-0930-4904-8052-9E28770C63F9}';
+  RID_PedidosProveedorDelta = '{7E20BCA7-2527-4CB5-B584-2D2341893091}';
-  RID_PedidosProveedor_DetallesDelta = '{DAC76FCD-4F4F-4A7B-96F4-59BB7BF62613}';
+  RID_PedidosProveedor_DetallesDelta = '{8C0FC64F-23A1-4A84-9026-FDAA9F3AA72D}';
-  RID_PedidosProveedor_Detalles_RefreshDelta = '{482666CD-B5B1-4EEE-906A-FD791C4FD32F}';
+  RID_PedidosProveedor_Detalles_RefreshDelta = '{801C5F9B-3CD7-4AFC-B4AD-F8F194EF8B1F}';
-  RID_PedidosProveedor_RefreshDelta = '{4526DFCD-81B4-47F9-A4D6-324BCD50DD86}';
+  RID_PedidosProveedor_RefreshDelta = '{1B4B8841-EF46-426A-BED9-0C6175972907}';
-  RID_PedidosProveedor_Articulos_PendientesDelta = '{F18E66C5-86C6-4207-9B9D-5B95011FF534}';
+  RID_PedidosProveedor_Articulos_PendientesDelta = '{DA326CEB-0C27-4873-BA40-1A58EC0FF8F8}';
 
 type
   { IDarReferenciaDelta }
   IDarReferenciaDelta = interface(IDarReferencia)
-  ['{431FAF99-6789-4FA4-9A91-32E5EF0A12C4}']
+  ['{B28F26DA-2A46-4DAA-A0D5-1DDBCA844BED}']
     { Property getters and setters }
     function GetOldVALORValue : String;
 
@@ -48,7 +48,7 @@ type
 
   { IPedidosProveedorDelta }
   IPedidosProveedorDelta = interface(IPedidosProveedor)
-  ['{2F368F7D-0930-4904-8052-9E28770C63F9}']
+  ['{7E20BCA7-2527-4CB5-B584-2D2341893091}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -86,6 +86,7 @@ type
     function GetOldIMPORTE_IVAValue : Currency;
     function GetOldID_FORMA_PAGOValue : Integer;
     function GetOldNUM_COPIASValue : Integer;
+    function GetOldNUM_CORREOSValue : Integer;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -124,6 +125,7 @@ type
     property OldIMPORTE_IVA : Currency read GetOldIMPORTE_IVAValue;
     property OldID_FORMA_PAGO : Integer read GetOldID_FORMA_PAGOValue;
     property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
   end;
 
   { TPedidosProveedorBusinessProcessorRules }
@@ -239,6 +241,9 @@ type
     function GetNUM_COPIASValue: Integer; virtual;
     function GetOldNUM_COPIASValue: Integer; virtual;
     procedure SetNUM_COPIASValue(const aValue: Integer); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    function GetOldNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -313,6 +318,8 @@ type
     property OldID_FORMA_PAGO : Integer read GetOldID_FORMA_PAGOValue;
     property NUM_COPIAS : Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
     property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue;
+    property NUM_CORREOS : Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -322,7 +329,7 @@ type
 
   { IPedidosProveedor_DetallesDelta }
   IPedidosProveedor_DetallesDelta = interface(IPedidosProveedor_Detalles)
-  ['{DAC76FCD-4F4F-4A7B-96F4-59BB7BF62613}']
+  ['{8C0FC64F-23A1-4A84-9026-FDAA9F3AA72D}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_PEDIDOValue : Integer;
@@ -442,7 +449,7 @@ type
 
   { IPedidosProveedor_Detalles_RefreshDelta }
   IPedidosProveedor_Detalles_RefreshDelta = interface(IPedidosProveedor_Detalles_Refresh)
-  ['{482666CD-B5B1-4EEE-906A-FD791C4FD32F}']
+  ['{801C5F9B-3CD7-4AFC-B4AD-F8F194EF8B1F}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_PEDIDOValue : Integer;
@@ -562,7 +569,7 @@ type
 
   { IPedidosProveedor_RefreshDelta }
   IPedidosProveedor_RefreshDelta = interface(IPedidosProveedor_Refresh)
-  ['{4526DFCD-81B4-47F9-A4D6-324BCD50DD86}']
+  ['{1B4B8841-EF46-426A-BED9-0C6175972907}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -600,6 +607,7 @@ type
     function GetOldIMPORTE_IVAValue : Currency;
     function GetOldID_FORMA_PAGOValue : Integer;
     function GetOldNUM_COPIASValue : Integer;
+    function GetOldNUM_CORREOSValue : Integer;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -638,6 +646,7 @@ type
     property OldIMPORTE_IVA : Currency read GetOldIMPORTE_IVAValue;
     property OldID_FORMA_PAGO : Integer read GetOldID_FORMA_PAGOValue;
     property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
   end;
 
   { TPedidosProveedor_RefreshBusinessProcessorRules }
@@ -753,6 +762,9 @@ type
     function GetNUM_COPIASValue: Integer; virtual;
     function GetOldNUM_COPIASValue: Integer; virtual;
     procedure SetNUM_COPIASValue(const aValue: Integer); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    function GetOldNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -827,6 +839,8 @@ type
     property OldID_FORMA_PAGO : Integer read GetOldID_FORMA_PAGOValue;
     property NUM_COPIAS : Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
     property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue;
+    property NUM_CORREOS : Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -836,7 +850,7 @@ type
 
   { IPedidosProveedor_Articulos_PendientesDelta }
   IPedidosProveedor_Articulos_PendientesDelta = interface(IPedidosProveedor_Articulos_Pendientes)
-  ['{F18E66C5-86C6-4207-9B9D-5B95011FF534}']
+  ['{DA326CEB-0C27-4873-BA40-1A58EC0FF8F8}']
     { Property getters and setters }
     function GetOldID_PEDIDOValue : Integer;
     function GetOldREFERENCIAValue : String;
@@ -1485,6 +1499,21 @@ begin
   BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorNUM_COPIAS] := aValue;
 end;
 
+function TPedidosProveedorBusinessProcessorRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorNUM_CORREOS];
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetOldNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_PedidosProveedorNUM_CORREOS];
+end;
+
+procedure TPedidosProveedorBusinessProcessorRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorNUM_CORREOS] := aValue;
+end;
+
 
 { TPedidosProveedor_DetallesBusinessProcessorRules }
 constructor TPedidosProveedor_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
@@ -2485,6 +2514,21 @@ begin
   BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedor_RefreshNUM_COPIAS] := aValue;
 end;
 
+function TPedidosProveedor_RefreshBusinessProcessorRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedor_RefreshNUM_CORREOS];
+end;
+
+function TPedidosProveedor_RefreshBusinessProcessorRules.GetOldNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_PedidosProveedor_RefreshNUM_CORREOS];
+end;
+
+procedure TPedidosProveedor_RefreshBusinessProcessorRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedor_RefreshNUM_CORREOS] := aValue;
+end;
+
 
 { TPedidosProveedor_Articulos_PendientesBusinessProcessorRules }
 constructor TPedidosProveedor_Articulos_PendientesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

Source/Modulos/Pedidos a proveedor/PedidosProveedor_Group.bdsgroup

@@ -23,8 +23,7 @@
       <Projects Name="FactuGES.exe">..\..\Cliente\FactuGES.bdsproj</Projects>
       <Projects Name="FactuGES_Server.exe">..\..\Servidor\FactuGES_Server.bdsproj</Projects>
       <Projects Name="PedProv_AlbProv_relation.bpl">..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.bdsproj</Projects>
-      <Projects Name="PedidosCliente_view.bpl">..\Pedidos de cliente\Views\PedidosCliente_view.bdsproj</Projects>
+      <Projects Name="Targets">DataAbstract_D10.bpl Base.bpl ControllerBase.bpl GUIBase.bpl Contactos_view.bpl Articulos_view.bpl PedidosProveedor_model.bpl PedidosProveedor_data.bpl PedidosProveedor_controller.bpl PedidosProveedor_view.bpl PedidosProveedor_plugin.bpl FactuGES.exe FactuGES_Server.exe PedProv_AlbProv_relation.bpl</Projects>
-      <Projects Name="Targets">DataAbstract_D10.bpl Base.bpl ControllerBase.bpl GUIBase.bpl Contactos_view.bpl Articulos_view.bpl PedidosProveedor_model.bpl PedidosProveedor_data.bpl PedidosProveedor_controller.bpl PedidosProveedor_view.bpl PedidosProveedor_plugin.bpl FactuGES.exe FactuGES_Server.exe PedProv_AlbProv_relation.bpl PedidosCliente_view.bpl</Projects>
     </Projects>
     <Dependencies/>
   </Default.Personality>

Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm

@@ -78,7 +78,8 @@ object srvPedidosProveedor: TsrvPedidosProveedor
               '    FECHA_ALTA, FECHA_MODIFICACION, USUARIO, ID_PEDIDO_CLIENTE, ' +
               #10'    REF_PED_CLIENTE, IMPORTE_NETO, IMPORTE_PORTE, DESCUENTO, '#10' ' +
               '   IMPORTE_DESCUENTO, BASE_IMPONIBLE, IVA, IMPORTE_IVA, '#10'    ID_' +
-              'FORMA_PAGO, NUM_COPIAS'#10'  FROM'#10'    V_PEDIDOS_PROVEEDOR'
+              'FORMA_PAGO, NUM_COPIAS, NUM_CORREOS'#10'  FROM'#10'    V_PEDIDOS_PROVEED' +
+              'OR'
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -224,6 +225,10 @@ object srvPedidosProveedor: TsrvPedidosProveedor
               item
                 DatasetField = 'NUM_COPIAS'
                 TableField = 'NUM_COPIAS'
+              end
+              item
+                DatasetField = 'NUM_CORREOS'
+                TableField = 'NUM_CORREOS'
               end>
           end>
         Name = 'PedidosProveedor'
@@ -602,6 +607,17 @@ object srvPedidosProveedor: TsrvPedidosProveedor
             Calculated = False
             Lookup = False
             LookupCache = False
+          end
+          item
+            Name = 'NUM_CORREOS'
+            DataType = datInteger
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
           end>
         BusinessRulesClient.ScriptLanguage = rslPascalScript
         BusinessRulesServer.ScriptLanguage = rslPascalScript
@@ -1130,8 +1146,8 @@ object srvPedidosProveedor: TsrvPedidosProveedor
               '    FECHA_ALTA, FECHA_MODIFICACION, USUARIO, ID_PEDIDO_CLIENTE, ' +
               #10'    REF_PED_CLIENTE, IMPORTE_NETO, IMPORTE_PORTE, DESCUENTO, '#10' ' +
               '   IMPORTE_DESCUENTO, BASE_IMPONIBLE, IVA, IMPORTE_IVA, '#10'    ID_' +
-              'FORMA_PAGO, NUM_COPIAS'#10'  FROM'#10'    V_PEDIDOS_PROVEEDOR'#10'WHERE V_PE' +
+              'FORMA_PAGO, NUM_COPIAS, NUM_CORREOS'#10'  FROM'#10'    V_PEDIDOS_PROVEED' +
-              'DIDOS_PROVEEDOR.ID = :ID'
+              'OR'#10'WHERE V_PEDIDOS_PROVEEDOR.ID = :ID'
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -1277,6 +1293,10 @@ object srvPedidosProveedor: TsrvPedidosProveedor
               item
                 DatasetField = 'NUM_COPIAS'
                 TableField = 'NUM_COPIAS'
+              end
+              item
+                DatasetField = 'NUM_CORREOS'
+                TableField = 'NUM_CORREOS'
               end>
           end>
         Name = 'PedidosProveedor_Refresh'
@@ -1655,6 +1675,17 @@ object srvPedidosProveedor: TsrvPedidosProveedor
             Calculated = False
             Lookup = False
             LookupCache = False
+          end
+          item
+            Name = 'NUM_CORREOS'
+            DataType = datInteger
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
           end>
         BusinessRulesClient.ScriptLanguage = rslPascalScript
         BusinessRulesServer.ScriptLanguage = rslPascalScript

Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.dfm

@@ -2,7 +2,6 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor
   Caption = 'Seleccionar pedido de cliente'
   ClientWidth = 656
   ExplicitWidth = 664
-  ExplicitHeight = 478
   PixelsPerInch = 96
   TextHeight = 13
   object JvgWizardHeader1: TJvgWizardHeader [0]
@@ -63,6 +62,9 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor
       inherited TBXItem4: TTBXItem
         Visible = False
       end
+      inherited TBXItem38: TTBXItem
+        Visible = False
+      end
       inherited TBXItem6: TTBXItem
         Visible = False
       end
@@ -161,6 +163,9 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor
             Kind = skCount
             Column = frViewPedidosProveedor1.cxGridViewNOMBRE
           end>
+        inherited cxGridViewNUM_COPIAS: TcxGridDBColumn
+          IsCaptionAssigned = True
+        end
         inherited cxGridViewCODIGO: TcxGridDBColumn
           IsCaptionAssigned = True
         end
@@ -174,7 +179,17 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 656
           ExplicitWidth = 656
+          inherited txtFiltroTodo: TcxTextEdit
+            ExplicitWidth = 457
+            Width = 457
+          end
+          inherited edtFechaIniFiltro: TcxDateEdit
+            ExplicitWidth = 239
+            Width = 239
+          end
           inherited edtFechaFinFiltro: TcxDateEdit
+            Left = 299
+            ExplicitLeft = 299
             ExplicitWidth = 404
             Width = 404
           end

Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm

@@ -35,13 +35,27 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor
       OptionsView.GroupFooters = gfAlwaysVisible
       object cxGridViewNUM_COPIAS: TcxGridDBColumn
         DataBinding.FieldName = 'NUM_COPIAS'
-        OnCustomDrawCell = cxGridViewNUM_COPIASCustomDrawCell
         MinWidth = 30
         Options.HorzSizing = False
         VisibleForCustomization = False
         Width = 30
+        OnCustomDrawHeader = cxGridViewNUM_COPIASCustomDrawHeader
         IsCaptionAssigned = True
       end
+      object cxGridViewNUM_CORREOS: TcxGridDBColumn
+        DataBinding.FieldName = 'NUM_CORREOS'
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.Alignment.Horz = taCenter
+        BestFitMaxWidth = 25
+        MinWidth = 25
+        Options.Editing = False
+        Options.HorzSizing = False
+        Options.Moving = False
+        Options.ShowCaption = False
+        VisibleForCustomization = False
+        Width = 25
+        OnCustomDrawHeader = cxGridViewNUM_CORREOSCustomDrawHeader
+      end
       object cxGridViewCODIGO: TcxGridDBColumn
         DataBinding.FieldName = 'ID'
         Visible = False
@@ -243,8 +257,8 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor
     Left = 288
   end
   inherited ActionList1: TActionList
-    Left = 392
+    Left = 280
-    Top = 440
+    Top = 200
     object actProveedor: TAction
       Caption = 'Proveedor'
       OnExecute = actProveedorExecute
@@ -257,8 +271,92 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor
     end
   end
   inherited PngImageList10: TPngImageList
-    Left = 360
+    PngImages = <
-    Top = 440
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D4948445200000010000000100804000000B5FA37
+          EA000000097048597300000B1300000B1301009A9C180000031B694343505068
+          6F746F73686F70204943432070726F66696C65000078DA6360609EE0E8E2E4CA
+          24C0C050505452E41EE418191119A5C07E9E818D819981818181812131B9B8C0
+          3120C087818181212F3F2F9501153032307CBBC6C0C8C0C0C07059D7D1C5C995
+          8134C09A5C5054C2C0C070808181C12825B538998181E10B0303437A79494109
+          0303630C03038348527641090303630103038348764890330303630B0303134F
+          496A450903030383737E416551667A468982A1A5A5A582634A7E52AA42706571
+          496A6EB182675E727E51417E5162496A0A030303D40E060606065E97FC1205F7
+          C4CC3C05435355062A8388C82805080B113E083104482E2D2A83072503830083
+          16831F4325C32A86078CD28C518CF3189F32193235305D62D6606E64BECB62C3
+          328F9599359BF52A9B13DB267615F6991C021C9D9CAC9CCD5CCC5C6DDCDCDC13
+          79A47896F21AF31EE20BE67BC65F2D2024B05AD04DF09150A3B0A2F061917451
+          5ED1AD6271E29CE25B25522485258F4A5548EB4A3F9199231B2A27287756BE47
+          C1479157F182D214E528152595D7AA5BD51AD5FD346435DE6AEED39AA89DAA63
+          AD2BA4FB4AEF88FE7C831AC328234B6349E3DF26F74C0F9BAD30EFB7A8B04CB4
+          F2B1B6B051B515B163B1FB6AFFDCE1B6E305A763CE7B5DB6BAAE775BE9BED463
+          91E742AF05DE0B7D16FB2EF35BE5BF3E606BE0DEA063C1E7436E853E0BFB12C1
+          142918A5146D1CE3161B159717DF92303B7173D2D9E4E7A94C6972E936195199
+          5559B3B2F7E4DCCB63CA572FF0292C2E9A5D7CB8E46D9944B94B4561E5BCAAB3
+          D57F6BF5EAE2EB27351C6BFCDD6CD092DE3AAFED7A8760A777577BF7E15E863E
+          FBFEBA09FB26FE9FEC38A575EA89E9BC338267CE9AF5688ED6DC9279FB16702D
+          0C5BB478F1C7A50ECB262C7FB8D27855EBEA9B6B75D735ADBFB9D16053C7E607
+          5BADB64DDDFE61A7EFAE557B38F6A6EF3B7E40FD60E7A1D747FC8E6E3E2E7EA2
+          F6E493D3DE67B69C933DDF7EE1D3A5B8CBA7AE5A5C5B7643F466EBADAF77D2EF
+          DEBCEFF3E0C023D3C7AB9F2A3E9BF942F065D76BE637756F7FBE2FFDF0E953C1
+          E7775FF3BEBDFB91FFF3C3EFE23FDFFE55FDFF0F002E0C1D8BA03C0931000001
+          2D4944415478DA63FCCF801F3092AC20EFFFFF870C070A0EA82CF88F4D41EEFF
+          7C063E20BD80E1F0C1CD0E680AEAFEBF67C8679060F8C8F0986119C3858F8704
+          501494FECF60A867980B94FECCB08A61FBC7A2050105480A4AFE973188319C67
+          E863286238C2B099C139B06203921B20D2207082A10B688630C31F8660C7E803
+          700515FF8BC00A5E333C6778C6F0936111832EC3A58FEB106EE8FAFF8521186C
+          C21786870C6B80D2AF800EDDC28864851BC33E86FF0C3A0C3F18B603A59F30FC
+          62F8C0B019A2C055E08F81C8FEC90C8C0C5719B6315C6330014BFF072A809A00
+          22BC13A4E67B336803832891419CE137D01D5C0C2F034F6D802B6060F049F837
+          4190DF111840BF19FE7FFC9170062809F5268838C8A8CEC8CE129DF5A5E5F79F
+          1FA97F375FFA0112C51A1798000002C5780121B7DDC80000000049454E44AE42
+          6082}
+        Name = 'PngImage0'
+        Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D4948445200000010000000100804000000B5FA37
+          EA000000097048597300000B1300000B1301009A9C180000031B694343505068
+          6F746F73686F70204943432070726F66696C65000078DA6360609EE0E8E2E4CA
+          24C0C050505452E41EE418191119A5C07E9E818D819981818181812131B9B8C0
+          3120C087818181212F3F2F9501153032307CBBC6C0C8C0C0C07059D7D1C5C995
+          8134C09A5C5054C2C0C070808181C12825B538998181E10B0303437A79494109
+          0303630C03038348527641090303630103038348764890330303630B0303134F
+          496A450903030383737E416551667A468982A1A5A5A582634A7E52AA42706571
+          496A6EB182675E727E51417E5162496A0A030303D40E060606065E97FC1205F7
+          C4CC3C05435355062A8388C82805080B113E083104482E2D2A83072503830083
+          16831F4325C32A86078CD28C518CF3189F32193235305D62D6606E64BECB62C3
+          328F9599359BF52A9B13DB267615F6991C021C9D9CAC9CCD5CCC5C6DDCDCDC13
+          79A47896F21AF31EE20BE67BC65F2D2024B05AD04DF09150A3B0A2F061917451
+          5ED1AD6271E29CE25B25522485258F4A5548EB4A3F9199231B2A27287756BE47
+          C1479157F182D214E528152595D7AA5BD51AD5FD346435DE6AEED39AA89DAA63
+          AD2BA4FB4AEF88FE7C831AC328234B6349E3DF26F74C0F9BAD30EFB7A8B04CB4
+          F2B1B6B051B515B163B1FB6AFFDCE1B6E305A763CE7B5DB6BAAE775BE9BED463
+          91E742AF05DE0B7D16FB2EF35BE5BF3E606BE0DEA063C1E7436E853E0BFB12C1
+          142918A5146D1CE3161B159717DF92303B7173D2D9E4E7A94C6972E936195199
+          5559B3B2F7E4DCCB63CA572FF0292C2E9A5D7CB8E46D9944B94B4561E5BCAAB3
+          D57F6BF5EAE2EB27351C6BFCDD6CD092DE3AAFED7A8760A777577BF7E15E863E
+          FBFEBA09FB26FE9FEC38A575EA89E9BC338267CE9AF5688ED6DC9279FB16702D
+          0C5BB478F1C7A50ECB262C7FB8D27855EBEA9B6B75D735ADBFB9D16053C7E607
+          5BADB64DDDFE61A7EFAE557B38F6A6EF3B7E40FD60E7A1D747FC8E6E3E2E7EA2
+          F6E493D3DE67B69C933DDF7EE1D3A5B8CBA7AE5A5C5B7643F466EBADAF77D2EF
+          DEBCEFF3E0C023D3C7AB9F2A3E9BF942F065D76BE637756F7FBE2FFDF0E953C1
+          E7775FF3BEBDFB91FFF3C3EFE23FDFFE55FDFF0F002E0C1D8BA03C0931000000
+          C14944415478DABDD13F0BC14118C0F1EF6D06B1B1FEDE80FABD082619E49D78
+          0B769B49190C8A41C9885226857E06938588FC1D0CFE0E8F27830E6592ABE7BA
+          EE3EF7DC3D7746F8DECCDF404D2E0886B3C64D7B34D2C60215199320A4CB270E
+          ACE952626483A2387494843932D311E499D8A02071A63488E9414D1C069499DB
+          2027294DDC66C79E2D11FA9A656D83AC44A9E3E2D75B780C59D27B05190912C0
+          A7BB17CCD928FB00AD4781272DCFC78AABCEBD00F37C98F787FB0049B7EAFDF6
+          2FEEC02251018239FFBF0000000049454E44AE426082}
+        Name = 'PngImage1'
+        Background = clWindow
+      end>
+    Left = 240
+    Top = 168
+    Bitmap = {}
   end
   inherited dxPrintStyleManager1: TdxPrintStyleManager
     inherited dxPrintStyleManager1Style1: TdxPSPrintStyle

Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas

@@ -12,7 +12,7 @@ uses
   uDADataTable, cxGridLevel, cxClasses, cxControls, cxGridCustomView, Classes,
   cxGrid,
   uBizPedidosProveedor, cxCurrencyEdit, Forms, uViewFiltroBase, ActnList,
-  TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg;
+  TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, cxTextEdit;
 
 type
   IViewPedidosProveedor = interface(IViewGrid)
@@ -56,6 +56,7 @@ type
     TBXItem3: TTBXItem;
     TBXSeparatorItem2: TTBXSeparatorItem;
     cxGridViewNUM_COPIAS: TcxGridDBColumn;
+    cxGridViewNUM_CORREOS: TcxGridDBColumn;
     procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel:
             TcxGridLevel);
     procedure cxGridViewCODIGOCustomDrawCell(Sender: TcxCustomGridTableView;
@@ -70,8 +71,11 @@ type
     procedure actAlmacenUpdate(Sender: TObject);
     procedure cxGridViewMouseMove(Sender: TObject; Shift: TShiftState; X,
       Y: Integer);
-    procedure cxGridViewNUM_COPIASCustomDrawCell(Sender: TcxCustomGridTableView;
+    procedure cxGridViewNUM_CORREOSCustomDrawHeader(Sender: TcxGridTableView;
-      ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
+      ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo;
+      var ADone: Boolean);
+    procedure cxGridViewNUM_COPIASCustomDrawHeader(Sender: TcxGridTableView;
+      ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo;
       var ADone: Boolean);
 
   private
@@ -231,21 +235,46 @@ begin
   end;
 end;
 
-procedure TfrViewPedidosProveedor.cxGridViewNUM_COPIASCustomDrawCell(
+procedure TfrViewPedidosProveedor.cxGridViewNUM_COPIASCustomDrawHeader(
-  Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
+  Sender: TcxGridTableView; ACanvas: TcxCanvas;
-  AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+  AViewInfo: TcxGridColumnHeaderViewInfo; var ADone: Boolean);
 var
   R : TRect;
 begin
   inherited;
-  if (AViewInfo.GridRecord.DisplayTexts[cxGridViewNUM_COPIAS.Index] <> '') then
+  with AViewInfo do
   begin
+    LookAndFeelPainter.DrawHeader(ACanvas, Bounds, TextAreaBounds, Neighbors,
+      Borders, ButtonState, AlignmentHorz, AlignmentVert, MultiLine,
+      False, '', Params.Font, Params.TextColor, Params.Color);
+
     R := AViewInfo.ContentBounds;
     ACanvas.FillRect(R);
-    ACanvas.DrawImage(PngImageList, R.Left, R.Top, 4);
+    ACanvas.DrawImage(PngImageList10, R.Left + 2, R.Top, 0);
-    ACanvas.DrawTexT(AViewInfo.GridRecord.DisplayTexts[cxGridViewNUM_COPIAS.Index], R, cxAlignCenter or cxAlignVCenter);
-    ADone := True;
   end;
+
+  ADone := True;
+end;
+
+procedure TfrViewPedidosProveedor.cxGridViewNUM_CORREOSCustomDrawHeader(
+  Sender: TcxGridTableView; ACanvas: TcxCanvas;
+  AViewInfo: TcxGridColumnHeaderViewInfo; var ADone: Boolean);
+var
+  R : TRect;
+begin
+  inherited;
+  with AViewInfo do
+  begin
+    LookAndFeelPainter.DrawHeader(ACanvas, Bounds, TextAreaBounds, Neighbors,
+      Borders, ButtonState, AlignmentHorz, AlignmentVert, MultiLine,
+      False, '', Params.Font, Params.TextColor, Params.Color);
+
+    R := AViewInfo.ContentBounds;
+    ACanvas.FillRect(R);
+    ACanvas.DrawImage(PngImageList10, R.Left + 2, R.Top, 1);
+  end;
+
+  ADone := True;
 end;
 
 procedure TfrViewPedidosProveedor.cxGridViewStylesGetContentStyle(Sender:

Source/Modulos/Pedidos de cliente/Controller/uPedidosClienteController.pas

@@ -84,6 +84,8 @@ type
     procedure FiltrarEmpresa(APedido: IBizPedidoCliente);
     function _Vacio : IBizPedidoCliente;
     function ValidarPedido(APedido: IBizPedidoCliente): Boolean;
+    procedure _AnadirMarcaEnvioCorreo(APedido: IBizPedidoCliente);
+
   public
     property ClienteController: IClientesController read GetClienteController write SetClienteController;
     property DetallesController: IDetallesPedidoClienteController read GetDetallesController write SetDetallesController;
@@ -141,7 +143,7 @@ uses
   uBizContactos, uDataTableUtils, uDataModuleUsuarios, Classes,
   schPedidosClienteClient_Intf, uDAInterfaces, uDateUtils, uIEditorPedidoCliente,
   uIEditorElegirPedidosCliente, uIEditorDireccionEntregaPedidoCliente,
-  schContactosClient_Intf, uPedidosClienteReportController,
+  schContactosClient_Intf, uPedidosClienteReportController, uDataModuleRegistroCorreos,
   uIDialogListaPedidosCliEnvioEMail, uSistemaFunc, uStringsUtils, uDialogElegirEMail, Forms, uEMailUtils;
 
 { TPedidosClienteController }
@@ -473,6 +475,37 @@ begin
   end;
 end;
 
+procedure TPedidosClienteController._AnadirMarcaEnvioCorreo(APedido: IBizPedidoCliente);
+var
+  ASoloLectura : Boolean;
+begin
+  if not Assigned(APedido) then
+    raise Exception.Create ('Pedido no asignada (_AnadirMarcaEnvioCorreo)');
+
+  if APedido.DataTable.Active then
+    APedido.DataTable.Active := True;
+
+  if AnadirMarcaEnvioCorreo(nme_PedidosCliente, APedido.ID) then
+  begin
+    DesconectarTabla(APedido.DataTable);
+    try
+      ASoloLectura := APedido.DataTable.ReadOnly;
+      if ASoloLectura then
+        SetDataTableReadOnly(APedido.DataTable, False);
+      try
+        APedido.Edit;
+        APedido.NUM_CORREOS := APedido.NUM_CORREOS + 1;
+        APedido.Post;
+      finally
+        if ASoloLectura then
+          SetDataTableReadOnly(APedido.DataTable, True);
+      end;
+    finally
+      ConectarTabla(APedido.DataTable);
+    end;
+  end;
+end;
+
 function TPedidosClienteController._Vacio: IBizPedidoCliente;
 begin
   Result := Buscar(ID_NULO);
@@ -654,7 +687,7 @@ begin
     AReportController.ExportToPDF(APedido.ID, AFicheroTMP);
     Result := EnviarEMailMAPI(AAsunto, ATextoEMail, AFicheroTMP, '', '', APedido.Cliente.NOMBRE, AEMail, AEnviarDirectamente);
     if Result then
-//      _AnadirMarcaEnvioCorreo(APedido);
+       _AnadirMarcaEnvioCorreo(APedido);
   finally
     SysUtils.DeleteFile(AFicheroTMP);
     AReportController := NIL;

Source/Modulos/Pedidos de cliente/Data/uDataModulePedidosCliente.dfm

@@ -492,6 +492,17 @@ object DataModulePedidosCliente: TDataModulePedidosCliente
         Calculated = False
         Lookup = False
         LookupCache = False
+      end
+      item
+        Name = 'NUM_CORREOS'
+        DataType = datInteger
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
       end>
     Params = <>
     MasterMappingMode = mmDataRequest

Source/Modulos/Pedidos de cliente/Model/schPedidosClienteClient_Intf.pas

@@ -9,13 +9,13 @@ 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_PedidoCliente_ArticulosPendientesPedirAProv = '{8DE748FF-6C86-47C4-830D-9D98F720D9A2}';
+  RID_PedidoCliente_ArticulosPendientesPedirAProv = '{4866506D-B7AD-48C1-AA0E-7F3259ADC372}';
-  RID_DarReferencia = '{11CE47BF-D7D1-4880-8E21-8B646392B2FF}';
+  RID_DarReferencia = '{8014D812-7F3F-4918-90BF-807C1840C700}';
-  RID_PedidosCliente = '{7D754DBC-3690-4000-BB2B-F7680D856532}';
+  RID_PedidosCliente = '{282EAEF6-17F1-485F-80D9-ED71D2C0B016}';
-  RID_PedidosCliente_Detalles = '{11F70932-738B-4C61-B80B-822863835CB9}';
+  RID_PedidosCliente_Detalles = '{09D5B882-A47C-42D1-B80D-8DFF76F70F10}';
-  RID_PedidosCliente_Refresh = '{3F0FCA37-E56F-495C-8B99-5B427BA0B27C}';
+  RID_PedidosCliente_Refresh = '{028AFA09-EB59-40AC-8EAF-C6320FD9105A}';
-  RID_PedidosCliente_Detalles_Refresh = '{0D7003CE-A998-403E-8BF7-A6EE94111EBA}';
+  RID_PedidosCliente_Detalles_Refresh = '{DE07DB2B-7CB4-48F9-8ADC-177DFF9166F8}';
-  RID_PedidoCliente_Articulos_Pendientes = '{DD6873C4-96B5-4410-93FA-86775F816CA5}';
+  RID_PedidoCliente_Articulos_Pendientes = '{BA23D65A-A8BE-4EDB-878B-534180C048E5}';
 
   { Data table names }
   nme_PedidoCliente_ArticulosPendientesPedirAProv = 'PedidoCliente_ArticulosPendientesPedirAProv';
@@ -81,6 +81,7 @@ const
   fld_PedidosClienteREF_TIENDA_WEB = 'REF_TIENDA_WEB';
   fld_PedidosClienteFECHA_PREVISTA_ENVIO = 'FECHA_PREVISTA_ENVIO';
   fld_PedidosClienteNUM_COPIAS = 'NUM_COPIAS';
+  fld_PedidosClienteNUM_CORREOS = 'NUM_CORREOS';
 
   { PedidosCliente field indexes }
   idx_PedidosClienteID = 0;
@@ -115,6 +116,7 @@ const
   idx_PedidosClienteREF_TIENDA_WEB = 29;
   idx_PedidosClienteFECHA_PREVISTA_ENVIO = 30;
   idx_PedidosClienteNUM_COPIAS = 31;
+  idx_PedidosClienteNUM_CORREOS = 32;
 
   { PedidosCliente_Detalles fields }
   fld_PedidosCliente_DetallesID = 'ID';
@@ -181,6 +183,7 @@ const
   fld_PedidosCliente_RefreshREF_TIENDA_WEB = 'REF_TIENDA_WEB';
   fld_PedidosCliente_RefreshFECHA_PREVISTA_ENVIO = 'FECHA_PREVISTA_ENVIO';
   fld_PedidosCliente_RefreshNUM_COPIAS = 'NUM_COPIAS';
+  fld_PedidosCliente_RefreshNUM_CORREOS = 'NUM_CORREOS';
 
   { PedidosCliente_Refresh field indexes }
   idx_PedidosCliente_RefreshID = 0;
@@ -215,6 +218,7 @@ const
   idx_PedidosCliente_RefreshREF_TIENDA_WEB = 29;
   idx_PedidosCliente_RefreshFECHA_PREVISTA_ENVIO = 30;
   idx_PedidosCliente_RefreshNUM_COPIAS = 31;
+  idx_PedidosCliente_RefreshNUM_CORREOS = 32;
 
   { PedidosCliente_Detalles_Refresh fields }
   fld_PedidosCliente_Detalles_RefreshID = 'ID';
@@ -263,7 +267,7 @@ const
 type
   { IPedidoCliente_ArticulosPendientesPedirAProv }
   IPedidoCliente_ArticulosPendientesPedirAProv = interface(IDAStronglyTypedDataTable)
-  ['{EDDEC887-DCC3-4491-AFBB-125B5FD6ACE0}']
+  ['{3C606C79-CCB1-4981-A4A1-50814B9C6AB1}']
     { Property getters and setters }
     function GetID_PEDIDOValue: Integer;
     procedure SetID_PEDIDOValue(const aValue: Integer);
@@ -322,7 +326,7 @@ type
 
   { IDarReferencia }
   IDarReferencia = interface(IDAStronglyTypedDataTable)
-  ['{3EADC907-F5EE-4E69-B8BD-C821B9293A95}']
+  ['{2CA2F013-394E-443E-AD5A-C8C3FD287B5C}']
     { Property getters and setters }
     function GetVALORValue: String;
     procedure SetVALORValue(const aValue: String);
@@ -351,7 +355,7 @@ type
 
   { IPedidosCliente }
   IPedidosCliente = interface(IDAStronglyTypedDataTable)
-  ['{ADDEFA2C-3FE4-48F2-8670-33A5041DC887}']
+  ['{ECE661D7-1653-475F-8A03-A88242EA7F98}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -417,6 +421,8 @@ type
     procedure SetFECHA_PREVISTA_ENVIOValue(const aValue: DateTime);
     function GetNUM_COPIASValue: Integer;
     procedure SetNUM_COPIASValue(const aValue: Integer);
+    function GetNUM_CORREOSValue: Integer;
+    procedure SetNUM_CORREOSValue(const aValue: Integer);
 
 
     { Properties }
@@ -452,6 +458,7 @@ type
     property REF_TIENDA_WEB: Integer read GetREF_TIENDA_WEBValue write SetREF_TIENDA_WEBValue;
     property FECHA_PREVISTA_ENVIO: DateTime read GetFECHA_PREVISTA_ENVIOValue write SetFECHA_PREVISTA_ENVIOValue;
     property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
   end;
 
   { TPedidosClienteDataTableRules }
@@ -523,6 +530,8 @@ type
     procedure SetFECHA_PREVISTA_ENVIOValue(const aValue: DateTime); virtual;
     function GetNUM_COPIASValue: Integer; virtual;
     procedure SetNUM_COPIASValue(const aValue: Integer); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -557,6 +566,7 @@ type
     property REF_TIENDA_WEB: Integer read GetREF_TIENDA_WEBValue write SetREF_TIENDA_WEBValue;
     property FECHA_PREVISTA_ENVIO: DateTime read GetFECHA_PREVISTA_ENVIOValue write SetFECHA_PREVISTA_ENVIOValue;
     property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -566,7 +576,7 @@ type
 
   { IPedidosCliente_Detalles }
   IPedidosCliente_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{87978E69-39E2-401D-9D6A-0439CD0538B7}']
+  ['{DC02EC1B-51E9-40CC-A3F1-B4D1D75448E0}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -673,7 +683,7 @@ type
 
   { IPedidosCliente_Refresh }
   IPedidosCliente_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{3AA0B5AC-FE59-4BE4-AB86-E99A713BB84E}']
+  ['{D2BB5DB6-04DF-497A-BA7C-36324598582A}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -739,6 +749,8 @@ type
     procedure SetFECHA_PREVISTA_ENVIOValue(const aValue: DateTime);
     function GetNUM_COPIASValue: Integer;
     procedure SetNUM_COPIASValue(const aValue: Integer);
+    function GetNUM_CORREOSValue: Integer;
+    procedure SetNUM_CORREOSValue(const aValue: Integer);
 
 
     { Properties }
@@ -774,6 +786,7 @@ type
     property REF_TIENDA_WEB: Integer read GetREF_TIENDA_WEBValue write SetREF_TIENDA_WEBValue;
     property FECHA_PREVISTA_ENVIO: DateTime read GetFECHA_PREVISTA_ENVIOValue write SetFECHA_PREVISTA_ENVIOValue;
     property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
   end;
 
   { TPedidosCliente_RefreshDataTableRules }
@@ -845,6 +858,8 @@ type
     procedure SetFECHA_PREVISTA_ENVIOValue(const aValue: DateTime); virtual;
     function GetNUM_COPIASValue: Integer; virtual;
     procedure SetNUM_COPIASValue(const aValue: Integer); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -879,6 +894,7 @@ type
     property REF_TIENDA_WEB: Integer read GetREF_TIENDA_WEBValue write SetREF_TIENDA_WEBValue;
     property FECHA_PREVISTA_ENVIO: DateTime read GetFECHA_PREVISTA_ENVIOValue write SetFECHA_PREVISTA_ENVIOValue;
     property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -888,7 +904,7 @@ type
 
   { IPedidosCliente_Detalles_Refresh }
   IPedidosCliente_Detalles_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{FAEEFA10-4879-47FB-8408-AB1AD9736FD8}']
+  ['{CEA381F6-75A1-48AD-9A9D-BDFF73BA4C76}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -995,7 +1011,7 @@ type
 
   { IPedidoCliente_Articulos_Pendientes }
   IPedidoCliente_Articulos_Pendientes = interface(IDAStronglyTypedDataTable)
-  ['{3D7E5529-F41E-4E90-89C8-E9C7133FF5E0}']
+  ['{584AEFF3-D810-4B52-A619-38006EB43574}']
     { Property getters and setters }
     function GetID_ARTICULOValue: Integer;
     procedure SetID_ARTICULOValue(const aValue: Integer);
@@ -1471,6 +1487,16 @@ begin
   DataTable.Fields[idx_PedidosClienteNUM_COPIAS].AsInteger := aValue;
 end;
 
+function TPedidosClienteDataTableRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := DataTable.Fields[idx_PedidosClienteNUM_CORREOS].AsInteger;
+end;
+
+procedure TPedidosClienteDataTableRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_PedidosClienteNUM_CORREOS].AsInteger := aValue;
+end;
+
 
 { TPedidosCliente_DetallesDataTableRules }
 constructor TPedidosCliente_DetallesDataTableRules.Create(aDataTable: TDADataTable);
@@ -1957,6 +1983,16 @@ begin
   DataTable.Fields[idx_PedidosCliente_RefreshNUM_COPIAS].AsInteger := aValue;
 end;
 
+function TPedidosCliente_RefreshDataTableRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := DataTable.Fields[idx_PedidosCliente_RefreshNUM_CORREOS].AsInteger;
+end;
+
+procedure TPedidosCliente_RefreshDataTableRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_PedidosCliente_RefreshNUM_CORREOS].AsInteger := aValue;
+end;
+
 
 { TPedidosCliente_Detalles_RefreshDataTableRules }
 constructor TPedidosCliente_Detalles_RefreshDataTableRules.Create(aDataTable: TDADataTable);

Source/Modulos/Pedidos de cliente/Model/schPedidosClienteServer_Intf.pas

@@ -9,18 +9,18 @@ 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_PedidoCliente_ArticulosPendientesPedirAProvDelta = '{A1B46905-CCE8-468E-B6AB-2DF026DDB175}';
+  RID_PedidoCliente_ArticulosPendientesPedirAProvDelta = '{9DF33AF3-48FE-41B5-887B-98F4D7DFC83A}';
-  RID_DarReferenciaDelta = '{35DC9BFB-0F55-496D-917D-0D43EE74D71B}';
+  RID_DarReferenciaDelta = '{BBA79BFA-59B0-4129-82AB-0D3BD9C217F2}';
-  RID_PedidosClienteDelta = '{6659E549-E57E-4745-8F1A-A63E0E576493}';
+  RID_PedidosClienteDelta = '{ECFDA30A-0379-4A81-ADF5-8668C838FA92}';
-  RID_PedidosCliente_DetallesDelta = '{3B53180C-342C-47C4-AF74-DE6888E76B61}';
+  RID_PedidosCliente_DetallesDelta = '{6293C9B7-58C6-4082-9BB3-C22E56A1E4F8}';
-  RID_PedidosCliente_RefreshDelta = '{B9655FA7-5F92-4AFE-B87F-FE5DF5E547DE}';
+  RID_PedidosCliente_RefreshDelta = '{6B062172-1FB8-4C75-8D2D-7F749CA52D3F}';
-  RID_PedidosCliente_Detalles_RefreshDelta = '{E23472AA-B366-48A0-9CEF-E80C503329A2}';
+  RID_PedidosCliente_Detalles_RefreshDelta = '{9B82DF9B-6228-4B13-ACB5-B18EB4559B30}';
-  RID_PedidoCliente_Articulos_PendientesDelta = '{3990FBD0-6B6B-4DC5-B806-C7ECE4FF3F15}';
+  RID_PedidoCliente_Articulos_PendientesDelta = '{58C4E6B6-FDC3-4283-8FA6-7D23B0A1C2CF}';
 
 type
   { IPedidoCliente_ArticulosPendientesPedirAProvDelta }
   IPedidoCliente_ArticulosPendientesPedirAProvDelta = interface(IPedidoCliente_ArticulosPendientesPedirAProv)
-  ['{A1B46905-CCE8-468E-B6AB-2DF026DDB175}']
+  ['{9DF33AF3-48FE-41B5-887B-98F4D7DFC83A}']
     { Property getters and setters }
     function GetOldID_PEDIDOValue : Integer;
     function GetOldID_ARTICULOValue : Integer;
@@ -84,7 +84,7 @@ type
 
   { IDarReferenciaDelta }
   IDarReferenciaDelta = interface(IDarReferencia)
-  ['{35DC9BFB-0F55-496D-917D-0D43EE74D71B}']
+  ['{BBA79BFA-59B0-4129-82AB-0D3BD9C217F2}']
     { Property getters and setters }
     function GetOldVALORValue : String;
 
@@ -113,7 +113,7 @@ type
 
   { IPedidosClienteDelta }
   IPedidosClienteDelta = interface(IPedidosCliente)
-  ['{6659E549-E57E-4745-8F1A-A63E0E576493}']
+  ['{ECFDA30A-0379-4A81-ADF5-8668C838FA92}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -147,6 +147,7 @@ type
     function GetOldREF_TIENDA_WEBValue : Integer;
     function GetOldFECHA_PREVISTA_ENVIOValue : DateTime;
     function GetOldNUM_COPIASValue : Integer;
+    function GetOldNUM_CORREOSValue : Integer;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -181,6 +182,7 @@ type
     property OldREF_TIENDA_WEB : Integer read GetOldREF_TIENDA_WEBValue;
     property OldFECHA_PREVISTA_ENVIO : DateTime read GetOldFECHA_PREVISTA_ENVIOValue;
     property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
   end;
 
   { TPedidosClienteBusinessProcessorRules }
@@ -284,6 +286,9 @@ type
     function GetNUM_COPIASValue: Integer; virtual;
     function GetOldNUM_COPIASValue: Integer; virtual;
     procedure SetNUM_COPIASValue(const aValue: Integer); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    function GetOldNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -350,6 +355,8 @@ type
     property OldFECHA_PREVISTA_ENVIO : DateTime read GetOldFECHA_PREVISTA_ENVIOValue;
     property NUM_COPIAS : Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
     property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue;
+    property NUM_CORREOS : Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -359,7 +366,7 @@ type
 
   { IPedidosCliente_DetallesDelta }
   IPedidosCliente_DetallesDelta = interface(IPedidosCliente_Detalles)
-  ['{3B53180C-342C-47C4-AF74-DE6888E76B61}']
+  ['{6293C9B7-58C6-4082-9BB3-C22E56A1E4F8}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_PEDIDOValue : Integer;
@@ -479,7 +486,7 @@ type
 
   { IPedidosCliente_RefreshDelta }
   IPedidosCliente_RefreshDelta = interface(IPedidosCliente_Refresh)
-  ['{B9655FA7-5F92-4AFE-B87F-FE5DF5E547DE}']
+  ['{6B062172-1FB8-4C75-8D2D-7F749CA52D3F}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -513,6 +520,7 @@ type
     function GetOldREF_TIENDA_WEBValue : Integer;
     function GetOldFECHA_PREVISTA_ENVIOValue : DateTime;
     function GetOldNUM_COPIASValue : Integer;
+    function GetOldNUM_CORREOSValue : Integer;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -547,6 +555,7 @@ type
     property OldREF_TIENDA_WEB : Integer read GetOldREF_TIENDA_WEBValue;
     property OldFECHA_PREVISTA_ENVIO : DateTime read GetOldFECHA_PREVISTA_ENVIOValue;
     property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
   end;
 
   { TPedidosCliente_RefreshBusinessProcessorRules }
@@ -650,6 +659,9 @@ type
     function GetNUM_COPIASValue: Integer; virtual;
     function GetOldNUM_COPIASValue: Integer; virtual;
     procedure SetNUM_COPIASValue(const aValue: Integer); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    function GetOldNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -716,6 +728,8 @@ type
     property OldFECHA_PREVISTA_ENVIO : DateTime read GetOldFECHA_PREVISTA_ENVIOValue;
     property NUM_COPIAS : Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
     property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue;
+    property NUM_CORREOS : Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -725,7 +739,7 @@ type
 
   { IPedidosCliente_Detalles_RefreshDelta }
   IPedidosCliente_Detalles_RefreshDelta = interface(IPedidosCliente_Detalles_Refresh)
-  ['{E23472AA-B366-48A0-9CEF-E80C503329A2}']
+  ['{9B82DF9B-6228-4B13-ACB5-B18EB4559B30}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_PEDIDOValue : Integer;
@@ -845,7 +859,7 @@ type
 
   { IPedidoCliente_Articulos_PendientesDelta }
   IPedidoCliente_Articulos_PendientesDelta = interface(IPedidoCliente_Articulos_Pendientes)
-  ['{3990FBD0-6B6B-4DC5-B806-C7ECE4FF3F15}']
+  ['{58C4E6B6-FDC3-4283-8FA6-7D23B0A1C2CF}']
     { Property getters and setters }
     function GetOldID_ARTICULOValue : Integer;
     function GetOldCANTIDAD_PEDValue : Integer;
@@ -1522,6 +1536,21 @@ begin
   BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosClienteNUM_COPIAS] := aValue;
 end;
 
+function TPedidosClienteBusinessProcessorRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosClienteNUM_CORREOS];
+end;
+
+function TPedidosClienteBusinessProcessorRules.GetOldNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_PedidosClienteNUM_CORREOS];
+end;
+
+procedure TPedidosClienteBusinessProcessorRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosClienteNUM_CORREOS] := aValue;
+end;
+
 
 { TPedidosCliente_DetallesBusinessProcessorRules }
 constructor TPedidosCliente_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
@@ -2240,6 +2269,21 @@ begin
   BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosCliente_RefreshNUM_COPIAS] := aValue;
 end;
 
+function TPedidosCliente_RefreshBusinessProcessorRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosCliente_RefreshNUM_CORREOS];
+end;
+
+function TPedidosCliente_RefreshBusinessProcessorRules.GetOldNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_PedidosCliente_RefreshNUM_CORREOS];
+end;
+
+procedure TPedidosCliente_RefreshBusinessProcessorRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosCliente_RefreshNUM_CORREOS] := aValue;
+end;
+
 
 { TPedidosCliente_Detalles_RefreshBusinessProcessorRules }
 constructor TPedidosCliente_Detalles_RefreshBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

Source/Modulos/Pedidos de cliente/Servidor/srvPedidosCliente_Impl.dfm

@@ -187,7 +187,7 @@ object srvPedidosCliente: TsrvPedidosCliente
               'CUENTO,'#10'       IMPORTE_DESCUENTO,'#10'       BASE_IMPONIBLE,'#10'       ' +
               'IVA,'#10'       IMPORTE_IVA,'#10'       IMPORTE_TOTAL,'#10'       ID_FORMA_P' +
               'AGO,'#10'       REF_TIENDA_WEB,'#10'       FECHA_PREVISTA_ENVIO,'#10'       ' +
-              'NUM_COPIAS'#10'FROM V_PEDIDOS_CLIENTE'
+              'NUM_COPIAS,'#10'       NUM_CORREOS'#10'FROM V_PEDIDOS_CLIENTE'
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -317,6 +317,10 @@ object srvPedidosCliente: TsrvPedidosCliente
               item
                 DatasetField = 'NUM_COPIAS'
                 TableField = 'NUM_COPIAS'
+              end
+              item
+                DatasetField = 'NUM_CORREOS'
+                TableField = 'NUM_CORREOS'
               end>
           end>
         Name = 'PedidosCliente'
@@ -652,6 +656,17 @@ object srvPedidosCliente: TsrvPedidosCliente
             Calculated = False
             Lookup = False
             LookupCache = False
+          end
+          item
+            Name = 'NUM_CORREOS'
+            DataType = datInteger
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
           end>
         BusinessRulesClient.ScriptLanguage = rslPascalScript
         BusinessRulesServer.ScriptLanguage = rslPascalScript
@@ -915,7 +930,8 @@ object srvPedidosCliente: TsrvPedidosCliente
               'CUENTO,'#10'       IMPORTE_DESCUENTO,'#10'       BASE_IMPONIBLE,'#10'       ' +
               'IVA,'#10'       IMPORTE_IVA,'#10'       IMPORTE_TOTAL,'#10'       ID_FORMA_P' +
               'AGO,'#10'       REF_TIENDA_WEB,'#10'       FECHA_PREVISTA_ENVIO,'#10'       ' +
-              'NUM_COPIAS'#10'FROM V_PEDIDOS_CLIENTE'#10'WHERE'#10'     ID = :ID'
+              'NUM_COPIAS,'#10'       NUM_CORREOS'#10'FROM V_PEDIDOS_CLIENTE'#10'WHERE'#10'    ' +
+              ' ID = :ID'
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -1045,6 +1061,10 @@ object srvPedidosCliente: TsrvPedidosCliente
               item
                 DatasetField = 'NUM_COPIAS'
                 TableField = 'NUM_COPIAS'
+              end
+              item
+                DatasetField = 'NUM_CORREOS'
+                TableField = 'NUM_CORREOS'
               end>
           end>
         Name = 'PedidosCliente_Refresh'
@@ -1387,6 +1407,17 @@ object srvPedidosCliente: TsrvPedidosCliente
             Calculated = False
             Lookup = False
             LookupCache = False
+          end
+          item
+            Name = 'NUM_CORREOS'
+            DataType = datInteger
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
           end>
         BusinessRulesClient.ScriptLanguage = rslPascalScript
         BusinessRulesServer.ScriptLanguage = rslPascalScript

Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.dfm

@@ -36,13 +36,27 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente
       OptionsView.GroupFooters = gfAlwaysVisible
       object cxGridViewNUM_COPIAS: TcxGridDBColumn
         DataBinding.FieldName = 'NUM_COPIAS'
-        OnCustomDrawCell = cxGridViewNUM_COPIASCustomDrawCell
         MinWidth = 30
         Options.HorzSizing = False
         VisibleForCustomization = False
         Width = 30
+        OnCustomDrawHeader = cxGridViewNUM_COPIASCustomDrawHeader
         IsCaptionAssigned = True
       end
+      object cxGridViewNUM_CORREOS: TcxGridDBColumn
+        DataBinding.FieldName = 'NUM_CORREOS'
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.Alignment.Horz = taCenter
+        BestFitMaxWidth = 25
+        MinWidth = 25
+        Options.Editing = False
+        Options.HorzSizing = False
+        Options.Moving = False
+        Options.ShowCaption = False
+        VisibleForCustomization = False
+        Width = 25
+        OnCustomDrawHeader = cxGridViewNUM_CORREOSCustomDrawHeader
+      end
       object cxGridViewID: TcxGridDBColumn
         DataBinding.FieldName = 'ID'
         Visible = False
@@ -254,6 +268,92 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente
       OnUpdate = actProvinciaUpdate
     end
   end
+  inherited PngImageList10: TPngImageList
+    PngImages = <
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D4948445200000010000000100804000000B5FA37
+          EA000000097048597300000B1300000B1301009A9C180000031B694343505068
+          6F746F73686F70204943432070726F66696C65000078DA6360609EE0E8E2E4CA
+          24C0C050505452E41EE418191119A5C07E9E818D819981818181812131B9B8C0
+          3120C087818181212F3F2F9501153032307CBBC6C0C8C0C0C07059D7D1C5C995
+          8134C09A5C5054C2C0C070808181C12825B538998181E10B0303437A79494109
+          0303630C03038348527641090303630103038348764890330303630B0303134F
+          496A450903030383737E416551667A468982A1A5A5A582634A7E52AA42706571
+          496A6EB182675E727E51417E5162496A0A030303D40E060606065E97FC1205F7
+          C4CC3C05435355062A8388C82805080B113E083104482E2D2A83072503830083
+          16831F4325C32A86078CD28C518CF3189F32193235305D62D6606E64BECB62C3
+          328F9599359BF52A9B13DB267615F6991C021C9D9CAC9CCD5CCC5C6DDCDCDC13
+          79A47896F21AF31EE20BE67BC65F2D2024B05AD04DF09150A3B0A2F061917451
+          5ED1AD6271E29CE25B25522485258F4A5548EB4A3F9199231B2A27287756BE47
+          C1479157F182D214E528152595D7AA5BD51AD5FD346435DE6AEED39AA89DAA63
+          AD2BA4FB4AEF88FE7C831AC328234B6349E3DF26F74C0F9BAD30EFB7A8B04CB4
+          F2B1B6B051B515B163B1FB6AFFDCE1B6E305A763CE7B5DB6BAAE775BE9BED463
+          91E742AF05DE0B7D16FB2EF35BE5BF3E606BE0DEA063C1E7436E853E0BFB12C1
+          142918A5146D1CE3161B159717DF92303B7173D2D9E4E7A94C6972E936195199
+          5559B3B2F7E4DCCB63CA572FF0292C2E9A5D7CB8E46D9944B94B4561E5BCAAB3
+          D57F6BF5EAE2EB27351C6BFCDD6CD092DE3AAFED7A8760A777577BF7E15E863E
+          FBFEBA09FB26FE9FEC38A575EA89E9BC338267CE9AF5688ED6DC9279FB16702D
+          0C5BB478F1C7A50ECB262C7FB8D27855EBEA9B6B75D735ADBFB9D16053C7E607
+          5BADB64DDDFE61A7EFAE557B38F6A6EF3B7E40FD60E7A1D747FC8E6E3E2E7EA2
+          F6E493D3DE67B69C933DDF7EE1D3A5B8CBA7AE5A5C5B7643F466EBADAF77D2EF
+          DEBCEFF3E0C023D3C7AB9F2A3E9BF942F065D76BE637756F7FBE2FFDF0E953C1
+          E7775FF3BEBDFB91FFF3C3EFE23FDFFE55FDFF0F002E0C1D8BA03C0931000001
+          2D4944415478DA63FCCF801F3092AC20EFFFFF870C070A0EA82CF88F4D41EEFF
+          7C063E20BD80E1F0C1CD0E680AEAFEBF67C8679060F8C8F0986119C3858F8704
+          501494FECF60A867980B94FECCB08A61FBC7A2050105480A4AFE973188319C67
+          E863286238C2B099C139B06203921B20D2207082A10B688630C31F8660C7E803
+          700515FF8BC00A5E333C6778C6F0936111832EC3A58FEB106EE8FAFF8521186C
+          C21786870C6B80D2AF800EDDC28864851BC33E86FF0C3A0C3F18B603A59F30FC
+          62F8C0B019A2C055E08F81C8FEC90C8C0C5719B6315C6330014BFF072A809A00
+          22BC13A4E67B336803832891419CE137D01D5C0C2F034F6D802B6060F049F837
+          4190DF111840BF19FE7FFC9170062809F5268838C8A8CEC8CE129DF5A5E5F79F
+          1FA97F375FFA0112C51A1798000002C5780121B7DDC80000000049454E44AE42
+          6082}
+        Name = 'PngImage0'
+        Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D4948445200000010000000100804000000B5FA37
+          EA000000097048597300000B1300000B1301009A9C180000031B694343505068
+          6F746F73686F70204943432070726F66696C65000078DA6360609EE0E8E2E4CA
+          24C0C050505452E41EE418191119A5C07E9E818D819981818181812131B9B8C0
+          3120C087818181212F3F2F9501153032307CBBC6C0C8C0C0C07059D7D1C5C995
+          8134C09A5C5054C2C0C070808181C12825B538998181E10B0303437A79494109
+          0303630C03038348527641090303630103038348764890330303630B0303134F
+          496A450903030383737E416551667A468982A1A5A5A582634A7E52AA42706571
+          496A6EB182675E727E51417E5162496A0A030303D40E060606065E97FC1205F7
+          C4CC3C05435355062A8388C82805080B113E083104482E2D2A83072503830083
+          16831F4325C32A86078CD28C518CF3189F32193235305D62D6606E64BECB62C3
+          328F9599359BF52A9B13DB267615F6991C021C9D9CAC9CCD5CCC5C6DDCDCDC13
+          79A47896F21AF31EE20BE67BC65F2D2024B05AD04DF09150A3B0A2F061917451
+          5ED1AD6271E29CE25B25522485258F4A5548EB4A3F9199231B2A27287756BE47
+          C1479157F182D214E528152595D7AA5BD51AD5FD346435DE6AEED39AA89DAA63
+          AD2BA4FB4AEF88FE7C831AC328234B6349E3DF26F74C0F9BAD30EFB7A8B04CB4
+          F2B1B6B051B515B163B1FB6AFFDCE1B6E305A763CE7B5DB6BAAE775BE9BED463
+          91E742AF05DE0B7D16FB2EF35BE5BF3E606BE0DEA063C1E7436E853E0BFB12C1
+          142918A5146D1CE3161B159717DF92303B7173D2D9E4E7A94C6972E936195199
+          5559B3B2F7E4DCCB63CA572FF0292C2E9A5D7CB8E46D9944B94B4561E5BCAAB3
+          D57F6BF5EAE2EB27351C6BFCDD6CD092DE3AAFED7A8760A777577BF7E15E863E
+          FBFEBA09FB26FE9FEC38A575EA89E9BC338267CE9AF5688ED6DC9279FB16702D
+          0C5BB478F1C7A50ECB262C7FB8D27855EBEA9B6B75D735ADBFB9D16053C7E607
+          5BADB64DDDFE61A7EFAE557B38F6A6EF3B7E40FD60E7A1D747FC8E6E3E2E7EA2
+          F6E493D3DE67B69C933DDF7EE1D3A5B8CBA7AE5A5C5B7643F466EBADAF77D2EF
+          DEBCEFF3E0C023D3C7AB9F2A3E9BF942F065D76BE637756F7FBE2FFDF0E953C1
+          E7775FF3BEBDFB91FFF3C3EFE23FDFFE55FDFF0F002E0C1D8BA03C0931000000
+          C14944415478DABDD13F0BC14118C0F1EF6D06B1B1FEDE80FABD082619E49D78
+          0B769B49190C8A41C9885226857E06938588FC1D0CFE0E8F27830E6592ABE7BA
+          EE3EF7DC3D7746F8DECCDF404D2E0886B3C64D7B34D2C60215199320A4CB270E
+          ACE952626483A2387494843932D311E499D8A02071A63488E9414D1C069499DB
+          2027294DDC66C79E2D11FA9A656D83AC44A9E3E2D75B780C59D27B05190912C0
+          A7BB17CCD928FB00AD4781272DCFC78AABCEBD00F37C98F787FB0049B7EAFDF6
+          2FEEC02251018239FFBF0000000049454E44AE426082}
+        Name = 'PngImage1'
+        Background = clWindow
+      end>
+    Bitmap = {}
+  end
   inherited dxPrintStyleManager1: TdxPrintStyleManager
     inherited dxPrintStyleManager1Style1: TdxPSPrintStyle
       BuiltInStyle = True

Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.pas

@@ -12,7 +12,7 @@ uses
   uDADataTable, cxGridLevel, cxClasses, cxControls, cxGridCustomView, Classes,
   cxGrid,
   uBizPedidosCliente, cxCurrencyEdit, Forms, uViewFiltroBase, ActnList, TB2Item,
-  TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg;
+  TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, cxTextEdit;
 
 type
   IViewPedidosCliente = interface(IViewGrid)
@@ -53,6 +53,7 @@ type
     cxGridViewTIENDAWEB: TcxGridDBColumn;
     cxGridViewFECHA_ENTREGA: TcxGridDBColumn;
     cxGridViewNUM_COPIAS: TcxGridDBColumn;
+    cxGridViewNUM_CORREOS: TcxGridDBColumn;
     procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel:
             TcxGridLevel);
     procedure cxGridViewCODIGOCustomDrawCell(Sender: TcxCustomGridTableView;
@@ -70,8 +71,11 @@ type
       var ADone: Boolean);
     procedure cxGridViewMouseMove(Sender: TObject; Shift: TShiftState; X,
       Y: Integer);
-    procedure cxGridViewNUM_COPIASCustomDrawCell(Sender: TcxCustomGridTableView;
+    procedure cxGridViewNUM_CORREOSCustomDrawHeader(Sender: TcxGridTableView;
-      ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
+      ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo;
+      var ADone: Boolean);
+    procedure cxGridViewNUM_COPIASCustomDrawHeader(Sender: TcxGridTableView;
+      ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo;
       var ADone: Boolean);
 
   private
@@ -232,21 +236,46 @@ begin
   end;
 end;
 
-procedure TfrViewPedidosCliente.cxGridViewNUM_COPIASCustomDrawCell(
+procedure TfrViewPedidosCliente.cxGridViewNUM_COPIASCustomDrawHeader(
-  Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
+  Sender: TcxGridTableView; ACanvas: TcxCanvas;
-  AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+  AViewInfo: TcxGridColumnHeaderViewInfo; var ADone: Boolean);
 var
   R : TRect;
 begin
   inherited;
-  if (AViewInfo.GridRecord.DisplayTexts[cxGridViewNUM_COPIAS.Index] <> '') then
+  with AViewInfo do
   begin
+    LookAndFeelPainter.DrawHeader(ACanvas, Bounds, TextAreaBounds, Neighbors,
+      Borders, ButtonState, AlignmentHorz, AlignmentVert, MultiLine,
+      False, '', Params.Font, Params.TextColor, Params.Color);
+
     R := AViewInfo.ContentBounds;
     ACanvas.FillRect(R);
-    ACanvas.DrawImage(PngImageList, R.Left, R.Top, 5);
+    ACanvas.DrawImage(PngImageList10, R.Left + 2, R.Top, 0);
-    ACanvas.DrawTexT(AViewInfo.GridRecord.DisplayTexts[cxGridViewNUM_COPIAS.Index], R, cxAlignCenter or cxAlignVCenter);
-    ADone := True;
   end;
+
+  ADone := True;
+end;
+
+procedure TfrViewPedidosCliente.cxGridViewNUM_CORREOSCustomDrawHeader(
+  Sender: TcxGridTableView; ACanvas: TcxCanvas;
+  AViewInfo: TcxGridColumnHeaderViewInfo; var ADone: Boolean);
+var
+  R : TRect;
+begin
+  inherited;
+  with AViewInfo do
+  begin
+    LookAndFeelPainter.DrawHeader(ACanvas, Bounds, TextAreaBounds, Neighbors,
+      Borders, ButtonState, AlignmentHorz, AlignmentVert, MultiLine,
+      False, '', Params.Font, Params.TextColor, Params.Color);
+
+    R := AViewInfo.ContentBounds;
+    ACanvas.FillRect(R);
+    ACanvas.DrawImage(PngImageList10, R.Left + 2, R.Top, 1);
+  end;
+
+  ADone := True;
 end;
 
 procedure TfrViewPedidosCliente.cxGridViewStylesGetContentStyle(Sender:

Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas

@@ -87,8 +87,9 @@ type
 
   TRecibosClienteController = class(TObservador, IRecibosClienteController)
   private
-    function ImporteTotalModificado(ARecibosCliente: IBizRecibosCliente;
+    function ImporteTotalModificado(ARecibosCliente: IBizRecibosCliente; var ImporteRestante: Currency): Boolean;
-      var ImporteRestante: Currency): Boolean;
+    procedure _AnadirMarcaEnvioCorreo(ARecibo: IBizRecibosCliente);
+
   protected
     FDataModule : IDataModuleRecibosCliente;
     FPagosController : IPagosClienteController;
@@ -159,7 +160,7 @@ uses
   Forms, uNumUtils, cxControls, DB, uEditorRegistryUtils, Dialogs,
   uDAInterfaces, uDataTableUtils, uDataModuleUsuarios,
   uDateUtils, uROTypes, DateUtils, Controls, Windows, Variants,
-  uRecibosClienteReportController, uBizContactos,
+  uRecibosClienteReportController, uBizContactos, uDataModuleRegistroCorreos,
   schRecibosClienteClient_Intf, uIEditorRecibosCliente, uIEditorReciboCliente,
   uIEditorElegirRecibosCliente, uDataModuleRecibosCliente, uIEditorFechaPago,
 
@@ -291,7 +292,7 @@ end;
 function TRecibosClienteController.BuscarRecibosACompensar(const Recibo: IBizRecibosCliente): IBizRecibosCliente;
 begin
   if not Assigned(Recibo) then
-     raise Exception.Create ('IBizReciboCliente no asignado (BuscarRecibosACompensar)');
+     raise Exception.Create ('IBizRecibosCliente no asignado (BuscarRecibosACompensar)');
 
   ShowHourglassCursor;
   try
@@ -407,6 +408,37 @@ begin
   end;
 end;
 
+procedure TRecibosClienteController._AnadirMarcaEnvioCorreo(ARecibo: IBizRecibosCliente);
+var
+  ASoloLectura : Boolean;
+begin
+  if not Assigned(ARecibo) then
+    raise Exception.Create ('Recibo no asignada (_AnadirMarcaEnvioCorreo)');
+
+  if ARecibo.DataTable.Active then
+    ARecibo.DataTable.Active := True;
+
+  if AnadirMarcaEnvioCorreo(nme_RecibosCliente, ARecibo.ID) then
+  begin
+    DesconectarTabla(ARecibo.DataTable);
+    try
+      ASoloLectura := ARecibo.DataTable.ReadOnly;
+      if ASoloLectura then
+        SetDataTableReadOnly(ARecibo.DataTable, False);
+      try
+        ARecibo.Edit;
+        ARecibo.NUM_CORREOS := ARecibo.NUM_CORREOS + 1;
+        ARecibo.Post;
+      finally
+        if ASoloLectura then
+          SetDataTableReadOnly(ARecibo.DataTable, True);
+      end;
+    finally
+      ConectarTabla(ARecibo.DataTable);
+    end;
+  end;
+end;
+
 function TRecibosClienteController._Vacio: IBizRecibosCliente;
 begin
   Result := Buscar(ID_NULO);
@@ -732,7 +764,7 @@ begin
     AReportController.ExportToPDF(ARecibo.ID, AFicheroTMP);
     Result := EnviarEMailMAPI(AAsunto, ATextoEMail, AFicheroTMP, '', '', ARecibo.Cliente.NOMBRE, AEMail, AEnviarDirectamente);
     if Result then
-//      _AnadirMarcaEnvioCorreo(ARecibo);
+       _AnadirMarcaEnvioCorreo(ARecibo);
   finally
     SysUtils.DeleteFile(AFicheroTMP);
     AReportController := NIL;

Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.dfm

@@ -451,6 +451,17 @@ object DataModuleRecibosCliente: TDataModuleRecibosCliente
         Calculated = False
         Lookup = False
         LookupCache = False
+      end
+      item
+        Name = 'NUM_CORREOS'
+        DataType = datInteger
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        Alignment = taLeftJustify
+        InPrimaryKey = False
+        Calculated = False
+        Lookup = False
+        LookupCache = False
       end>
     Params = <>
     MasterMappingMode = mmDataRequest

Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.pas

@@ -86,7 +86,7 @@ begin
   AParam := TIntegerArray.Create;
   try
     AParam.Add(AID);
-    Result := (RORemoteService as IsrvAlbaranesCliente).GenerarReportPDF(AParam, ShowLogotipo)
+    Result := (RORemoteService as IsrvRecibosCliente).GenerarReportPDF(AParam, ShowLogotipo)
   finally
     FreeANDNIL(AParam)
   end;

Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas

@@ -9,10 +9,10 @@ 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_RecibosCliente = '{052BB265-F88E-4D05-B8D4-92B9E6698ADE}';
+  RID_RecibosCliente = '{3A31A595-D48C-4913-88A1-753A1DBBA5C4}';
-  RID_RecibosCliente_Refresh = '{BE059EAD-08E4-4DEE-8CDB-2197A2DD1D35}';
+  RID_RecibosCliente_Refresh = '{F9FF0068-D1C5-43A2-BEDE-19310B8CEB7D}';
-  RID_PagosCliente = '{FBC80B2B-7966-44E9-A2C9-A13AE9CC0736}';
+  RID_PagosCliente = '{36B21D04-17C3-45EB-BBC9-F864DAEE8BEE}';
-  RID_RecibosCompensadosCli = '{0725B1A0-D613-414F-814C-240C4ABA81FF}';
+  RID_RecibosCompensadosCli = '{0768E6E5-C46A-44B5-9FE5-CCE0089141BF}';
 
   { Data table names }
   nme_RecibosCliente = 'RecibosCliente';
@@ -51,6 +51,7 @@ const
   fld_RecibosClienteFECHA_MODIFICACION = 'FECHA_MODIFICACION';
   fld_RecibosClienteUSUARIO = 'USUARIO';
   fld_RecibosClienteNUM_COPIAS = 'NUM_COPIAS';
+  fld_RecibosClienteNUM_CORREOS = 'NUM_CORREOS';
 
   { RecibosCliente field indexes }
   idx_RecibosClienteID = 0;
@@ -83,6 +84,7 @@ const
   idx_RecibosClienteFECHA_MODIFICACION = 27;
   idx_RecibosClienteUSUARIO = 28;
   idx_RecibosClienteNUM_COPIAS = 29;
+  idx_RecibosClienteNUM_CORREOS = 30;
 
   { RecibosCliente_Refresh fields }
   fld_RecibosCliente_RefreshID = 'ID';
@@ -115,6 +117,7 @@ const
   fld_RecibosCliente_RefreshFECHA_MODIFICACION = 'FECHA_MODIFICACION';
   fld_RecibosCliente_RefreshUSUARIO = 'USUARIO';
   fld_RecibosCliente_RefreshNUM_COPIAS = 'NUM_COPIAS';
+  fld_RecibosCliente_RefreshNUM_CORREOS = 'NUM_CORREOS';
 
   { RecibosCliente_Refresh field indexes }
   idx_RecibosCliente_RefreshID = 0;
@@ -147,6 +150,7 @@ const
   idx_RecibosCliente_RefreshFECHA_MODIFICACION = 27;
   idx_RecibosCliente_RefreshUSUARIO = 28;
   idx_RecibosCliente_RefreshNUM_COPIAS = 29;
+  idx_RecibosCliente_RefreshNUM_CORREOS = 30;
 
   { PagosCliente fields }
   fld_PagosClienteID = 'ID';
@@ -215,7 +219,7 @@ const
 type
   { IRecibosCliente }
   IRecibosCliente = interface(IDAStronglyTypedDataTable)
-  ['{9D61F0F9-2F51-46E0-A03A-6CD9F0606305}']
+  ['{071E91B1-00CA-4F7E-AEDD-ACF4B65D0B94}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -277,6 +281,8 @@ type
     procedure SetUSUARIOValue(const aValue: String);
     function GetNUM_COPIASValue: Integer;
     procedure SetNUM_COPIASValue(const aValue: Integer);
+    function GetNUM_CORREOSValue: Integer;
+    procedure SetNUM_CORREOSValue(const aValue: Integer);
 
 
     { Properties }
@@ -310,6 +316,7 @@ type
     property FECHA_MODIFICACION: DateTime read GetFECHA_MODIFICACIONValue write SetFECHA_MODIFICACIONValue;
     property USUARIO: String read GetUSUARIOValue write SetUSUARIOValue;
     property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
   end;
 
   { TRecibosClienteDataTableRules }
@@ -377,6 +384,8 @@ type
     procedure SetUSUARIOValue(const aValue: String); virtual;
     function GetNUM_COPIASValue: Integer; virtual;
     procedure SetNUM_COPIASValue(const aValue: Integer); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -409,6 +418,7 @@ type
     property FECHA_MODIFICACION: DateTime read GetFECHA_MODIFICACIONValue write SetFECHA_MODIFICACIONValue;
     property USUARIO: String read GetUSUARIOValue write SetUSUARIOValue;
     property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -418,7 +428,7 @@ type
 
   { IRecibosCliente_Refresh }
   IRecibosCliente_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{1CF667AF-589C-4ECC-BF84-FC968B381A93}']
+  ['{9CBDE222-CACC-4694-BEB7-73E4EA38087C}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -480,6 +490,8 @@ type
     procedure SetUSUARIOValue(const aValue: String);
     function GetNUM_COPIASValue: Integer;
     procedure SetNUM_COPIASValue(const aValue: Integer);
+    function GetNUM_CORREOSValue: Integer;
+    procedure SetNUM_CORREOSValue(const aValue: Integer);
 
 
     { Properties }
@@ -513,6 +525,7 @@ type
     property FECHA_MODIFICACION: DateTime read GetFECHA_MODIFICACIONValue write SetFECHA_MODIFICACIONValue;
     property USUARIO: String read GetUSUARIOValue write SetUSUARIOValue;
     property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
   end;
 
   { TRecibosCliente_RefreshDataTableRules }
@@ -580,6 +593,8 @@ type
     procedure SetUSUARIOValue(const aValue: String); virtual;
     function GetNUM_COPIASValue: Integer; virtual;
     procedure SetNUM_COPIASValue(const aValue: Integer); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -612,6 +627,7 @@ type
     property FECHA_MODIFICACION: DateTime read GetFECHA_MODIFICACIONValue write SetFECHA_MODIFICACIONValue;
     property USUARIO: String read GetUSUARIOValue write SetUSUARIOValue;
     property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
+    property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -621,7 +637,7 @@ type
 
   { IPagosCliente }
   IPagosCliente = interface(IDAStronglyTypedDataTable)
-  ['{5A457C91-5B7D-4026-A9A5-2928C56E9363}']
+  ['{9038B034-EDDD-4CE6-A24E-D9F12F7CF8E3}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -716,7 +732,7 @@ type
 
   { IRecibosCompensadosCli }
   IRecibosCompensadosCli = interface(IDAStronglyTypedDataTable)
-  ['{0F12FAB4-E245-4166-A361-18115BE3AE0E}']
+  ['{38498E3F-092B-4877-A3E9-EEB66C7B6806}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1148,6 +1164,16 @@ begin
   DataTable.Fields[idx_RecibosClienteNUM_COPIAS].AsInteger := aValue;
 end;
 
+function TRecibosClienteDataTableRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := DataTable.Fields[idx_RecibosClienteNUM_CORREOS].AsInteger;
+end;
+
+procedure TRecibosClienteDataTableRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_RecibosClienteNUM_CORREOS].AsInteger := aValue;
+end;
+
 
 { TRecibosCliente_RefreshDataTableRules }
 constructor TRecibosCliente_RefreshDataTableRules.Create(aDataTable: TDADataTable);
@@ -1460,6 +1486,16 @@ begin
   DataTable.Fields[idx_RecibosCliente_RefreshNUM_COPIAS].AsInteger := aValue;
 end;
 
+function TRecibosCliente_RefreshDataTableRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := DataTable.Fields[idx_RecibosCliente_RefreshNUM_CORREOS].AsInteger;
+end;
+
+procedure TRecibosCliente_RefreshDataTableRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_RecibosCliente_RefreshNUM_CORREOS].AsInteger := aValue;
+end;
+
 
 { TPagosClienteDataTableRules }
 constructor TPagosClienteDataTableRules.Create(aDataTable: TDADataTable);

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_RecibosClienteDelta = '{529A180C-95FF-4D15-945A-7F29985B2284}';
+  RID_RecibosClienteDelta = '{AA27035C-016E-417B-827B-D8851447786A}';
-  RID_RecibosCliente_RefreshDelta = '{ACD8B913-353F-4239-99D2-C8C19B4FED49}';
+  RID_RecibosCliente_RefreshDelta = '{25876270-8B70-4853-9E59-581AC90FFE3C}';
-  RID_PagosClienteDelta = '{785C0207-7ED8-44CC-84DA-218326A57DD9}';
+  RID_PagosClienteDelta = '{9FB42929-5B3B-45A1-9DB1-E7004D6BCFA4}';
-  RID_RecibosCompensadosCliDelta = '{09A91A9D-42B0-4D1D-A6AF-AEF65F7D16EE}';
+  RID_RecibosCompensadosCliDelta = '{33B534EA-40C6-4D0D-B7B3-496DF8B28FB3}';
 
 type
   { IRecibosClienteDelta }
   IRecibosClienteDelta = interface(IRecibosCliente)
-  ['{529A180C-95FF-4D15-945A-7F29985B2284}']
+  ['{AA27035C-016E-417B-827B-D8851447786A}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_RECIBO_COMPENSADOValue : Integer;
@@ -49,6 +49,7 @@ type
     function GetOldFECHA_MODIFICACIONValue : DateTime;
     function GetOldUSUARIOValue : String;
     function GetOldNUM_COPIASValue : Integer;
+    function GetOldNUM_CORREOSValue : Integer;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -81,6 +82,7 @@ type
     property OldFECHA_MODIFICACION : DateTime read GetOldFECHA_MODIFICACIONValue;
     property OldUSUARIO : String read GetOldUSUARIOValue;
     property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
   end;
 
   { TRecibosClienteBusinessProcessorRules }
@@ -178,6 +180,9 @@ type
     function GetNUM_COPIASValue: Integer; virtual;
     function GetOldNUM_COPIASValue: Integer; virtual;
     procedure SetNUM_COPIASValue(const aValue: Integer); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    function GetOldNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -240,6 +245,8 @@ type
     property OldUSUARIO : String read GetOldUSUARIOValue;
     property NUM_COPIAS : Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
     property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue;
+    property NUM_CORREOS : Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -249,7 +256,7 @@ type
 
   { IRecibosCliente_RefreshDelta }
   IRecibosCliente_RefreshDelta = interface(IRecibosCliente_Refresh)
-  ['{ACD8B913-353F-4239-99D2-C8C19B4FED49}']
+  ['{25876270-8B70-4853-9E59-581AC90FFE3C}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_RECIBO_COMPENSADOValue : Integer;
@@ -281,6 +288,7 @@ type
     function GetOldFECHA_MODIFICACIONValue : DateTime;
     function GetOldUSUARIOValue : String;
     function GetOldNUM_COPIASValue : Integer;
+    function GetOldNUM_CORREOSValue : Integer;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -313,6 +321,7 @@ type
     property OldFECHA_MODIFICACION : DateTime read GetOldFECHA_MODIFICACIONValue;
     property OldUSUARIO : String read GetOldUSUARIOValue;
     property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
   end;
 
   { TRecibosCliente_RefreshBusinessProcessorRules }
@@ -410,6 +419,9 @@ type
     function GetNUM_COPIASValue: Integer; virtual;
     function GetOldNUM_COPIASValue: Integer; virtual;
     procedure SetNUM_COPIASValue(const aValue: Integer); virtual;
+    function GetNUM_CORREOSValue: Integer; virtual;
+    function GetOldNUM_CORREOSValue: Integer; virtual;
+    procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -472,6 +484,8 @@ type
     property OldUSUARIO : String read GetOldUSUARIOValue;
     property NUM_COPIAS : Integer read GetNUM_COPIASValue write SetNUM_COPIASValue;
     property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue;
+    property NUM_CORREOS : Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
+    property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -481,7 +495,7 @@ type
 
   { IPagosClienteDelta }
   IPagosClienteDelta = interface(IPagosCliente)
-  ['{785C0207-7ED8-44CC-84DA-218326A57DD9}']
+  ['{9FB42929-5B3B-45A1-9DB1-E7004D6BCFA4}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_RECIBOValue : Integer;
@@ -587,7 +601,7 @@ type
 
   { IRecibosCompensadosCliDelta }
   IRecibosCompensadosCliDelta = interface(IRecibosCompensadosCli)
-  ['{09A91A9D-42B0-4D1D-A6AF-AEF65F7D16EE}']
+  ['{33B534EA-40C6-4D0D-B7B3-496DF8B28FB3}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_RECIBO_COMPENSADOValue : Integer;
@@ -1185,6 +1199,21 @@ begin
   BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosClienteNUM_COPIAS] := aValue;
 end;
 
+function TRecibosClienteBusinessProcessorRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosClienteNUM_CORREOS];
+end;
+
+function TRecibosClienteBusinessProcessorRules.GetOldNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_RecibosClienteNUM_CORREOS];
+end;
+
+procedure TRecibosClienteBusinessProcessorRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosClienteNUM_CORREOS] := aValue;
+end;
+
 
 { TRecibosCliente_RefreshBusinessProcessorRules }
 constructor TRecibosCliente_RefreshBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
@@ -1647,6 +1676,21 @@ begin
   BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosCliente_RefreshNUM_COPIAS] := aValue;
 end;
 
+function TRecibosCliente_RefreshBusinessProcessorRules.GetNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosCliente_RefreshNUM_CORREOS];
+end;
+
+function TRecibosCliente_RefreshBusinessProcessorRules.GetOldNUM_CORREOSValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_RecibosCliente_RefreshNUM_CORREOS];
+end;
+
+procedure TRecibosCliente_RefreshBusinessProcessorRules.SetNUM_CORREOSValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosCliente_RefreshNUM_CORREOS] := aValue;
+end;
+
 
 { TPagosClienteBusinessProcessorRules }
 constructor TPagosClienteBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm

@@ -891,4 +891,18 @@ object RptRecibosCliente: TRptRecibosCliente
     Left = 360
     Top = 128
   end
+  object frxPDFExport1: TfrxPDFExport
+    ShowDialog = False
+    UseFileCache = True
+    ShowProgress = False
+    PrintOptimized = True
+    Outline = True
+    Author = 'FactuGES'
+    Subject = 'FactuGES'
+    Background = False
+    Creator = 'FactuGES'
+    HTMLTags = True
+    Left = 360
+    Top = 344
+  end
 end

Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.pas

@@ -7,7 +7,7 @@ uses
   Dialogs, frxClass, frxDBSet, uDAScriptingProvider,
   uDADataTable, uDACDSDataTable, DB, uDAClasses, frxChart, frxGradient,
   frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDABINAdapter, uROTypes,
-  uDAInterfaces;
+  uDAInterfaces, FactuGES_Intf, frxExportPDF;
 
 type
   TRptRecibosCliente = class(TDataModule)
@@ -28,12 +28,14 @@ type
     schReport: TDASchema;
     DataDictionary: TDADataDictionary;
     frxReport: TfrxReport;
+    frxPDFExport1: TfrxPDFExport;
     procedure DataModuleCreate(Sender: TObject);
   private
     FConnection: IDAConnection;
     procedure _GenerarRecibo(const ID : Integer); overload;
   public
     function GenerarRecibo(const ID : String): Binary; overload;
+    function GenerarReportEnPDF(const ListaID : TIntegerArray; const AConLogotipo: Boolean = False): Binary;
   end;
 
 implementation
@@ -80,6 +82,24 @@ begin
   end;
 end;
 
+function TRptRecibosCliente.GenerarReportEnPDF(const ListaID: TIntegerArray;
+  const AConLogotipo: Boolean): Binary;
+var
+  i: Integer;
+begin
+//  FShowLogotipo := AConLogotipo;
+  Result := Binary.Create;
+  try
+    //Vamos generando todos y cada uno de los presupuestos recibidos
+    for i := 0 to ListaID.Count - 1 do
+        _GenerarRecibo(ListaID.Items[i]);
+
+    frxPDFExport1.Stream := Result;
+    frxReport.Export(frxPDFExport1)
+  finally
+  end;
+end;
+
 procedure TRptRecibosCliente._GenerarRecibo(const ID: Integer);
 var
   dsMaster: IDADataset;

Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.dfm

@@ -32,7 +32,7 @@ object srvRecibosCliente: TsrvRecibosCliente
               '_CIF_CLIENTE,'#10'       ENTIDAD_CLIENTE,'#10'       SUCURSAL_CLIENTE,'#10' ' +
               '      DC_CLIENTE,'#10'       CUENTA_CLIENTE,'#10'       ID_EMPRESA,'#10'    ' +
               '   FECHA_ALTA,'#10'       FECHA_MODIFICACION,'#10'       USUARIO,'#10'      ' +
-              ' NUM_COPIAS'#10#10'FROM V_RECIBOS_CLIENTE'
+              ' NUM_COPIAS,'#10'       NUM_CORREOS'#10#10'FROM V_RECIBOS_CLIENTE'
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -154,6 +154,10 @@ object srvRecibosCliente: TsrvRecibosCliente
               item
                 DatasetField = 'NUM_COPIAS'
                 TableField = 'NUM_COPIAS'
+              end
+              item
+                DatasetField = 'NUM_CORREOS'
+                TableField = 'NUM_CORREOS'
               end>
           end>
         Name = 'RecibosCliente'
@@ -474,6 +478,17 @@ object srvRecibosCliente: TsrvRecibosCliente
             Calculated = False
             Lookup = False
             LookupCache = False
+          end
+          item
+            Name = 'NUM_CORREOS'
+            DataType = datInteger
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
           end>
         BusinessRulesClient.ScriptLanguage = rslPascalScript
         BusinessRulesServer.ScriptLanguage = rslPascalScript
@@ -502,7 +517,8 @@ object srvRecibosCliente: TsrvRecibosCliente
               '_CIF_CLIENTE,'#10'       ENTIDAD_CLIENTE,'#10'       SUCURSAL_CLIENTE,'#10' ' +
               '      DC_CLIENTE,'#10'       CUENTA_CLIENTE,'#10'       ID_EMPRESA,'#10'    ' +
               '   FECHA_ALTA,'#10'       FECHA_MODIFICACION,'#10'       USUARIO,'#10'      ' +
-              ' NUM_COPIAS'#10#10'FROM V_RECIBOS_CLIENTE'#10'WHERE'#10'     ID = :ID'
+              ' NUM_COPIAS,'#10'       NUM_CORREOS'#10#10'FROM V_RECIBOS_CLIENTE'#10'WHERE'#10'  ' +
+              '   ID = :ID'
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -624,6 +640,10 @@ object srvRecibosCliente: TsrvRecibosCliente
               item
                 DatasetField = 'NUM_COPIAS'
                 TableField = 'NUM_COPIAS'
+              end
+              item
+                DatasetField = 'NUM_CORREOS'
+                TableField = 'NUM_CORREOS'
               end>
           end>
         Name = 'RecibosCliente_Refresh'
@@ -945,6 +965,17 @@ object srvRecibosCliente: TsrvRecibosCliente
             Calculated = False
             Lookup = False
             LookupCache = False
+          end
+          item
+            Name = 'NUM_CORREOS'
+            DataType = datInteger
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
           end>
         BusinessRulesClient.ScriptLanguage = rslPascalScript
         BusinessRulesServer.ScriptLanguage = rslPascalScript

Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.pas

@@ -40,6 +40,7 @@ type
     { IsrvRecibosProveedor methods }
     function GetNextAutoInc(const GeneratorName: String): Integer;
     function GenerateReport(const ID: String): Binary;
+    function GenerarReportPDF(const ListaID: TIntegerArray; const ShowLogotipo: Boolean): Binary;    
   end;
 
 implementation
@@ -81,6 +82,19 @@ begin
   SessionManager := dmServer.SessionManager;
 end;
 
+function TsrvRecibosCliente.GenerarReportPDF(const ListaID: TIntegerArray;
+  const ShowLogotipo: Boolean): Binary;
+var
+  AReportGenerator : TRptRecibosCliente;
+begin
+  AReportGenerator := TRptRecibosCliente.Create(nil);
+  try
+    Result := AReportGenerator.GenerarReportEnPDF(ListaID, ShowLogotipo);
+  finally
+    FreeAndNIL(AReportGenerator);
+  end;
+end;
+
 function TsrvRecibosCliente.GenerateReport(const ID: String): Binary;
 var
   AReportGenerator : TRptRecibosCliente;

Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm

@@ -46,13 +46,27 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
       object cxGridViewNUM_COPIAS: TcxGridDBColumn
         DataBinding.FieldName = 'NUM_COPIAS'
         PropertiesClassName = 'TcxTextEditProperties'
-        OnCustomDrawCell = cxGridViewNUM_COPIASCustomDrawCell
         MinWidth = 30
         Options.HorzSizing = False
         VisibleForCustomization = False
         Width = 30
+        OnCustomDrawHeader = cxGridViewNUM_COPIASCustomDrawHeader
         IsCaptionAssigned = True
       end
+      object cxGridViewNUM_CORREOS: TcxGridDBColumn
+        DataBinding.FieldName = 'NUM_CORREOS'
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.Alignment.Horz = taCenter
+        BestFitMaxWidth = 25
+        MinWidth = 25
+        Options.Editing = False
+        Options.HorzSizing = False
+        Options.Moving = False
+        Options.ShowCaption = False
+        VisibleForCustomization = False
+        Width = 25
+        OnCustomDrawHeader = cxGridViewNUM_CORREOSCustomDrawHeader
+      end
       object cxGridViewREFERENCIA: TcxGridDBColumn
         Caption = 'Referencia'
         DataBinding.FieldName = 'REFERENCIA'
@@ -255,6 +269,92 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
       OnUpdate = actClienteUpdate
     end
   end
+  inherited PngImageList10: TPngImageList
+    PngImages = <
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D4948445200000010000000100804000000B5FA37
+          EA000000097048597300000B1300000B1301009A9C180000031B694343505068
+          6F746F73686F70204943432070726F66696C65000078DA6360609EE0E8E2E4CA
+          24C0C050505452E41EE418191119A5C07E9E818D819981818181812131B9B8C0
+          3120C087818181212F3F2F9501153032307CBBC6C0C8C0C0C07059D7D1C5C995
+          8134C09A5C5054C2C0C070808181C12825B538998181E10B0303437A79494109
+          0303630C03038348527641090303630103038348764890330303630B0303134F
+          496A450903030383737E416551667A468982A1A5A5A582634A7E52AA42706571
+          496A6EB182675E727E51417E5162496A0A030303D40E060606065E97FC1205F7
+          C4CC3C05435355062A8388C82805080B113E083104482E2D2A83072503830083
+          16831F4325C32A86078CD28C518CF3189F32193235305D62D6606E64BECB62C3
+          328F9599359BF52A9B13DB267615F6991C021C9D9CAC9CCD5CCC5C6DDCDCDC13
+          79A47896F21AF31EE20BE67BC65F2D2024B05AD04DF09150A3B0A2F061917451
+          5ED1AD6271E29CE25B25522485258F4A5548EB4A3F9199231B2A27287756BE47
+          C1479157F182D214E528152595D7AA5BD51AD5FD346435DE6AEED39AA89DAA63
+          AD2BA4FB4AEF88FE7C831AC328234B6349E3DF26F74C0F9BAD30EFB7A8B04CB4
+          F2B1B6B051B515B163B1FB6AFFDCE1B6E305A763CE7B5DB6BAAE775BE9BED463
+          91E742AF05DE0B7D16FB2EF35BE5BF3E606BE0DEA063C1E7436E853E0BFB12C1
+          142918A5146D1CE3161B159717DF92303B7173D2D9E4E7A94C6972E936195199
+          5559B3B2F7E4DCCB63CA572FF0292C2E9A5D7CB8E46D9944B94B4561E5BCAAB3
+          D57F6BF5EAE2EB27351C6BFCDD6CD092DE3AAFED7A8760A777577BF7E15E863E
+          FBFEBA09FB26FE9FEC38A575EA89E9BC338267CE9AF5688ED6DC9279FB16702D
+          0C5BB478F1C7A50ECB262C7FB8D27855EBEA9B6B75D735ADBFB9D16053C7E607
+          5BADB64DDDFE61A7EFAE557B38F6A6EF3B7E40FD60E7A1D747FC8E6E3E2E7EA2
+          F6E493D3DE67B69C933DDF7EE1D3A5B8CBA7AE5A5C5B7643F466EBADAF77D2EF
+          DEBCEFF3E0C023D3C7AB9F2A3E9BF942F065D76BE637756F7FBE2FFDF0E953C1
+          E7775FF3BEBDFB91FFF3C3EFE23FDFFE55FDFF0F002E0C1D8BA03C0931000001
+          2D4944415478DA63FCCF801F3092AC20EFFFFF870C070A0EA82CF88F4D41EEFF
+          7C063E20BD80E1F0C1CD0E680AEAFEBF67C8679060F8C8F0986119C3858F8704
+          501494FECF60A867980B94FECCB08A61FBC7A2050105480A4AFE973188319C67
+          E863286238C2B099C139B06203921B20D2207082A10B688630C31F8660C7E803
+          700515FF8BC00A5E333C6778C6F0936111832EC3A58FEB106EE8FAFF8521186C
+          C21786870C6B80D2AF800EDDC28864851BC33E86FF0C3A0C3F18B603A59F30FC
+          62F8C0B019A2C055E08F81C8FEC90C8C0C5719B6315C6330014BFF072A809A00
+          22BC13A4E67B336803832891419CE137D01D5C0C2F034F6D802B6060F049F837
+          4190DF111840BF19FE7FFC9170062809F5268838C8A8CEC8CE129DF5A5E5F79F
+          1FA97F375FFA0112C51A1798000002C5780121B7DDC80000000049454E44AE42
+          6082}
+        Name = 'PngImage0'
+        Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D4948445200000010000000100804000000B5FA37
+          EA000000097048597300000B1300000B1301009A9C180000031B694343505068
+          6F746F73686F70204943432070726F66696C65000078DA6360609EE0E8E2E4CA
+          24C0C050505452E41EE418191119A5C07E9E818D819981818181812131B9B8C0
+          3120C087818181212F3F2F9501153032307CBBC6C0C8C0C0C07059D7D1C5C995
+          8134C09A5C5054C2C0C070808181C12825B538998181E10B0303437A79494109
+          0303630C03038348527641090303630103038348764890330303630B0303134F
+          496A450903030383737E416551667A468982A1A5A5A582634A7E52AA42706571
+          496A6EB182675E727E51417E5162496A0A030303D40E060606065E97FC1205F7
+          C4CC3C05435355062A8388C82805080B113E083104482E2D2A83072503830083
+          16831F4325C32A86078CD28C518CF3189F32193235305D62D6606E64BECB62C3
+          328F9599359BF52A9B13DB267615F6991C021C9D9CAC9CCD5CCC5C6DDCDCDC13
+          79A47896F21AF31EE20BE67BC65F2D2024B05AD04DF09150A3B0A2F061917451
+          5ED1AD6271E29CE25B25522485258F4A5548EB4A3F9199231B2A27287756BE47
+          C1479157F182D214E528152595D7AA5BD51AD5FD346435DE6AEED39AA89DAA63
+          AD2BA4FB4AEF88FE7C831AC328234B6349E3DF26F74C0F9BAD30EFB7A8B04CB4
+          F2B1B6B051B515B163B1FB6AFFDCE1B6E305A763CE7B5DB6BAAE775BE9BED463
+          91E742AF05DE0B7D16FB2EF35BE5BF3E606BE0DEA063C1E7436E853E0BFB12C1
+          142918A5146D1CE3161B159717DF92303B7173D2D9E4E7A94C6972E936195199
+          5559B3B2F7E4DCCB63CA572FF0292C2E9A5D7CB8E46D9944B94B4561E5BCAAB3
+          D57F6BF5EAE2EB27351C6BFCDD6CD092DE3AAFED7A8760A777577BF7E15E863E
+          FBFEBA09FB26FE9FEC38A575EA89E9BC338267CE9AF5688ED6DC9279FB16702D
+          0C5BB478F1C7A50ECB262C7FB8D27855EBEA9B6B75D735ADBFB9D16053C7E607
+          5BADB64DDDFE61A7EFAE557B38F6A6EF3B7E40FD60E7A1D747FC8E6E3E2E7EA2
+          F6E493D3DE67B69C933DDF7EE1D3A5B8CBA7AE5A5C5B7643F466EBADAF77D2EF
+          DEBCEFF3E0C023D3C7AB9F2A3E9BF942F065D76BE637756F7FBE2FFDF0E953C1
+          E7775FF3BEBDFB91FFF3C3EFE23FDFFE55FDFF0F002E0C1D8BA03C0931000000
+          C14944415478DABDD13F0BC14118C0F1EF6D06B1B1FEDE80FABD082619E49D78
+          0B769B49190C8A41C9885226857E06938588FC1D0CFE0E8F27830E6592ABE7BA
+          EE3EF7DC3D7746F8DECCDF404D2E0886B3C64D7B34D2C60215199320A4CB270E
+          ACE952626483A2387494843932D311E499D8A02071A63488E9414D1C069499DB
+          2027294DDC66C79E2D11FA9A656D83AC44A9E3E2D75B780C59D27B05190912C0
+          A7BB17CCD928FB00AD4781272DCFC78AABCEBD00F37C98F787FB0049B7EAFDF6
+          2FEEC02251018239FFBF0000000049454E44AE426082}
+        Name = 'PngImage1'
+        Background = clWindow
+      end>
+    Bitmap = {}
+  end
   inherited cxStyleRepositoryInforme: TcxStyleRepository
     Top = 184
   end

Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas

@@ -50,6 +50,7 @@ type
     cxGridViewREFERENCIA_REC_COMPENSADO: TcxGridDBColumn;
     cxGridViewID_RECIBO_COMPENSADO: TcxGridDBColumn;
     cxGridViewNUM_COPIAS: TcxGridDBColumn;
+    cxGridViewNUM_CORREOS: TcxGridDBColumn;
     procedure cxGridViewICONOCustomDrawCell(Sender: TcxCustomGridTableView;
       ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
       var ADone: Boolean);
@@ -64,8 +65,11 @@ type
     procedure cxGridViewID_RECIBO_COMPENSADOCustomDrawCell(
       Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
       AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
-    procedure cxGridViewNUM_COPIASCustomDrawCell(Sender: TcxCustomGridTableView;
+    procedure cxGridViewNUM_CORREOSCustomDrawHeader(Sender: TcxGridTableView;
-      ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
+      ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo;
+      var ADone: Boolean);
+    procedure cxGridViewNUM_COPIASCustomDrawHeader(Sender: TcxGridTableView;
+      ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo;
       var ADone: Boolean);
 
   private
@@ -227,21 +231,46 @@ begin
   end;
 end;
 
-procedure TfrViewRecibosCliente.cxGridViewNUM_COPIASCustomDrawCell(
+procedure TfrViewRecibosCliente.cxGridViewNUM_COPIASCustomDrawHeader(
-  Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
+  Sender: TcxGridTableView; ACanvas: TcxCanvas;
-  AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+  AViewInfo: TcxGridColumnHeaderViewInfo; var ADone: Boolean);
 var
   R : TRect;
 begin
   inherited;
-  if (AViewInfo.GridRecord.DisplayTexts[cxGridViewNUM_COPIAS.Index] <> '') then
+  with AViewInfo do
   begin
+    LookAndFeelPainter.DrawHeader(ACanvas, Bounds, TextAreaBounds, Neighbors,
+      Borders, ButtonState, AlignmentHorz, AlignmentVert, MultiLine,
+      False, '', Params.Font, Params.TextColor, Params.Color);
+
     R := AViewInfo.ContentBounds;
     ACanvas.FillRect(R);
-    ACanvas.DrawImage(PngImageList, R.Left, R.Top, 3);
+    ACanvas.DrawImage(PngImageList10, R.Left + 2, R.Top, 0);
-    ACanvas.DrawTexT(AViewInfo.GridRecord.DisplayTexts[cxGridViewNUM_COPIAS.Index], R, cxAlignCenter or cxAlignVCenter);
-    ADone := True;
   end;
+
+  ADone := True;
+end;
+
+procedure TfrViewRecibosCliente.cxGridViewNUM_CORREOSCustomDrawHeader(
+  Sender: TcxGridTableView; ACanvas: TcxCanvas;
+  AViewInfo: TcxGridColumnHeaderViewInfo; var ADone: Boolean);
+var
+  R : TRect;
+begin
+  inherited;
+  with AViewInfo do
+  begin
+    LookAndFeelPainter.DrawHeader(ACanvas, Bounds, TextAreaBounds, Neighbors,
+      Borders, ButtonState, AlignmentHorz, AlignmentVert, MultiLine,
+      False, '', Params.Font, Params.TextColor, Params.Color);
+
+    R := AViewInfo.ContentBounds;
+    ACanvas.FillRect(R);
+    ACanvas.DrawImage(PngImageList10, R.Left + 2, R.Top, 1);
+  end;
+
+  ADone := True;
 end;
 
 procedure TfrViewRecibosCliente.cxGridViewStylesGetContentStyle(

Source/Servicios/FactuGES.RODL

@@ -424,6 +424,16 @@
 </Parameter>
 </Parameters>
 </Operation>
+<Operation Name="GenerarReportPDF" UID="{4F9237D5-424B-4FEA-B664-654427A727E4}">
+<Parameters>
+<Parameter Name="Result" DataType="Binary" Flag="Result">
+</Parameter>
+<Parameter Name="ListaID" DataType="TIntegerArray" Flag="In" >
+</Parameter>
+<Parameter Name="ShowLogotipo" DataType="Boolean" Flag="In" >
+</Parameter>
+</Parameters>
+</Operation>
 </Operations>
 </Interface>
 </Interfaces>

Source/Servicios/FactuGES_Intf.pas

@@ -513,6 +513,7 @@ type
     ['{3B68252A-EE6A-4D37-B250-93F2DB940DDF}']
     function GetNextAutoInc(const GeneratorName: String): Integer;
     function GenerateReport(const ID: String): Binary;
+    function GenerarReportPDF(const ListaID: TIntegerArray; const ShowLogotipo: Boolean): Binary;
   end;
 
   { CosrvRecibosCliente }
@@ -527,6 +528,7 @@ type
 
     function GetNextAutoInc(const GeneratorName: String): Integer;
     function GenerateReport(const ID: String): Binary;
+    function GenerarReportPDF(const ListaID: TIntegerArray; const ShowLogotipo: Boolean): Binary;
   end;
 
   { IsrvRemesasCliente }
@@ -2064,6 +2066,31 @@ begin
   end
 end;
 
+function TsrvRecibosCliente_Proxy.GenerarReportPDF(const ListaID: TIntegerArray; const ShowLogotipo: Boolean): Binary;
+var
+  __request, __response : TMemoryStream;
+begin
+  result := nil;
+  __request := TMemoryStream.Create;
+  __response := TMemoryStream.Create;
+
+  try
+     __Message.Initialize(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarReportPDF');
+     __Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
+     __Message.Write('ShowLogotipo', TypeInfo(Boolean), ShowLogotipo, []);
+     __Message.Finalize;
+
+     __Message.WriteToStream(__request);
+     __TransportChannel.Dispatch(__request, __response);
+     __Message.ReadFromStream(__response);
+
+     __Message.Read('Result', TypeInfo(Binary), result, []);
+  finally
+    __request.Free;
+    __response.Free;
+  end
+end;
+
 { CosrvRemesasCliente }
 
 class function CosrvRemesasCliente.Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvRemesasCliente;

Source/Servicios/FactuGES_Invk.pas

@@ -151,6 +151,7 @@ type
   published
     procedure Invoke_GetNextAutoInc(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
     procedure Invoke_GenerateReport(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+    procedure Invoke_GenerarReportPDF(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
   end;
 
   TsrvRemesasCliente_Invoker = class(TDARemoteService_Invoker)
@@ -1068,6 +1069,37 @@ begin
   end;
 end;
 
+procedure TsrvRecibosCliente_Invoker.Invoke_GenerarReportPDF(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+{ function GenerarReportPDF(const ListaID: TIntegerArray; const ShowLogotipo: Boolean): Binary; }
+var
+  ListaID: FactuGES_Intf.TIntegerArray;
+  ShowLogotipo: Boolean;
+  lResult: Binary;
+  __lObjectDisposer: TROObjectDisposer;
+begin
+  ListaID := nil;
+  lResult := nil;
+  try
+    __Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
+    __Message.Read('ShowLogotipo', TypeInfo(Boolean), ShowLogotipo, []);
+
+    lResult := (__Instance as IsrvRecibosCliente).GenerarReportPDF(ListaID, ShowLogotipo);
+
+    __Message.Initialize(__Transport, 'FactuGES', 'srvRecibosCliente', 'GenerarReportPDFResponse');
+    __Message.Write('Result', TypeInfo(Binary), lResult, []);
+    __Message.Finalize;
+
+  finally
+    __lObjectDisposer := TROObjectDisposer.Create(__Instance);
+    try
+      __lObjectDisposer.Add(ListaID);
+      __lObjectDisposer.Add(lResult);
+    finally
+      __lObjectDisposer.Free();
+    end;
+  end;
+end;
+
 { TsrvRemesasCliente_Invoker }
 
 procedure TsrvRemesasCliente_Invoker.Invoke_GetNextAutoInc(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);

Source/Servidor/FactuGES_Server.bdsproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<PersonalityInfo>
 		<Option>
@@ -175,11 +175,10 @@
 			<VersionInfoKeys Name="ProductName">FactuGES Server</VersionInfoKeys>
 			<VersionInfoKeys Name="ProductVersion">3.0.9.0</VersionInfoKeys>
 			<VersionInfoKeys Name="Comments"></VersionInfoKeys>
-			<VersionInfoKeys Name="CompileDate">martes, 30 de septiembre de 2008 19:31</VersionInfoKeys></VersionInfoKeys>
+			<VersionInfoKeys Name="CompileDate">martes, 30 de septiembre de 2008 19:31</VersionInfoKeys></VersionInfoKeys>  <Excluded_Packages>
-		<Excluded_Packages>
+      <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
-			<Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
+    </Excluded_Packages>
-		</Excluded_Packages>
+  </Delphi.Personality>
-	</Delphi.Personality>
 	<ModelSupport>False</ModelSupport>
 	<!-- EurekaLog First Line
 [Exception Log]

Source/Servidor/FactuGES_Server.dpr

@@ -116,27 +116,27 @@ uses
   srvImpresiones_Impl in '..\Modulos\Impresiones\Servidor\srvImpresiones_Impl.pas' {srvImpresiones: TDARemoteService},
   schImpresionesClient_Intf in '..\Modulos\Impresiones\Model\schImpresionesClient_Intf.pas',
   schImpresionesServer_Intf in '..\Modulos\Impresiones\Model\schImpresionesServer_Intf.pas',
-  schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas',
-  schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas',
-  schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
-  schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas',
-  schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas',
-  schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas',
   schRemesasProveedorClient_Intf in '..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas',
   schRemesasProveedorServer_Intf in '..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas',
   schRemesasClienteClient_Intf in '..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas',
   schRemesasClienteServer_Intf in '..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas',
-  schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas',
+  srvRegistroCorreos_Impl in '..\Modulos\Registro de correos\Servidor\srvRegistroCorreos_Impl.pas' {srvRegistroCorreos: TDARemoteService},
-  schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas',
+  schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
-  schPedidosClienteClient_Intf in '..\Modulos\Pedidos de cliente\Model\schPedidosClienteClient_Intf.pas',
+  schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas',
-  schPedidosClienteServer_Intf in '..\Modulos\Pedidos de cliente\Model\schPedidosClienteServer_Intf.pas',
+  schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas',
+  schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas',
+  schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas',
+  schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas',
   schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
   schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas',
   schAlbaranesProveedorClient_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas',
   schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas',
-  srvRegistroCorreos_Impl in '..\Modulos\Registro de correos\Servidor\srvRegistroCorreos_Impl.pas' {srvRegistroCorreos: TDARemoteService},
+  schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
-  schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
+  schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas',
-  schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas';
+  schPedidosClienteClient_Intf in '..\Modulos\Pedidos de cliente\Model\schPedidosClienteClient_Intf.pas',
+  schPedidosClienteServer_Intf in '..\Modulos\Pedidos de cliente\Model\schPedidosClienteServer_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}

Source/Servidor/FactuGES_Server.drc

@@ -912,12 +912,12 @@
 #define IdResourceStrings_RSMIMEMIMETypeEmpty 65181
 #define IdResourceStrings_RSMIMEMIMEExtAlreadyExists 65182
 #define IdResourceStrings_RSStatusResolving 65183
-#define uRODECConst_sFMT_HEXL 65184
+#define uRORes_err_InvalidVarArrayDimCount 65184
-#define uRODECConst_sFMT_MIME64 65185
+#define uRORes_err_MessageNotAssigned 65185
-#define uRODECConst_sFMT_UU 65186
+#define ComConst_SOleError 65186
-#define uRODECConst_sFMT_XX 65187
+#define ComConst_SNoMethod 65187
-#define uRODECConst_sInvalidKeySize 65188
+#define ComConst_SVarNotObject 65188
-#define uRODECConst_sNotInitialized 65189
+#define ComConst_STooManyParams 65189
 #define IdResourceStrings_RSCannotAllocateSocket 65190
 #define IdResourceStrings_RSConnectionClosedGracefully 65191
 #define IdResourceStrings_RSCouldNotBindSocket 65192
@@ -928,70 +928,70 @@
 #define IdResourceStrings_RSThreadClassNotSpecified 65197
 #define IdResourceStrings_RSFileNotFound 65198
 #define IdResourceStrings_RSOnlyOneAntiFreeze 65199
-#define uRORes_err_NoXMLParsersAvailable 65200
+#define uRORes_err_UnhandledException 65200
-#define uRORes_err_IDispatchMarshalingNotSupported 65201
+#define uRORes_err_ChannelBusy 65201
-#define uRORes_err_UnsupportedVariantType 65202
+#define uRORes_err_ArrayIndexOutOfBounds 65202
-#define uRORes_err_VariantIsNotArray 65203
+#define uRORes_err_InvalidHeader 65203
-#define uRORes_err_InvalidVarArrayDimCount 65204
+#define uRORes_err_UnknownClassInStream 65204
-#define uRORes_err_MessageNotAssigned 65205
+#define uRORes_err_UnexpectedClassInStream 65205
-#define ComConst_SOleError 65206
+#define uRORes_err_SessionNotFound 65206
-#define ComConst_SNoMethod 65207
+#define uRORes_err_ChannelDoesntSupportIROMetadataReader 65207
-#define ComConst_SVarNotObject 65208
+#define uRORes_err_TooManySessions 65208
-#define ComConst_STooManyParams 65209
+#define uRORes_err_DOMElementIsNIL 65209
-#define uRODECConst_sProtectionCircular 65210
+#define uRORes_err_CannotLoadXMLDocument 65210
-#define uRODECConst_sStringFormatExists 65211
+#define uRORes_err_ErrorCreatingMsXmlDoc 65211
-#define uRODECConst_sInvalidStringFormat 65212
+#define uRORes_err_NoXMLParsersAvailable 65212
-#define uRODECConst_sInvalidFormatString 65213
+#define uRORes_err_IDispatchMarshalingNotSupported 65213
-#define uRODECConst_sFMT_COPY 65214
+#define uRORes_err_UnsupportedVariantType 65214
-#define uRODECConst_sFMT_HEX 65215
+#define uRORes_err_VariantIsNotArray 65215
-#define uRORes_err_UnknownProxyInterface 65216
+#define uRORes_str_ExceptionReraisedFromServer 65216
-#define uRORes_err_DispatcherAlreadyAssigned 65217
+#define uRORes_err_AssignError 65217
-#define uRORes_err_CannotFindMessageDispatcher 65218
+#define uRORes_err_InvalidRequestStream 65218
-#define uRORes_err_ServerOnlySupportsOneDispatcher 65219
+#define uRORes_err_NILMessage 65219
-#define uRORes_err_UnhandledException 65220
+#define uRORes_err_UnspecifiedInterface 65220
-#define uRORes_err_ChannelBusy 65221
+#define uRORes_err_UnspecifiedMessage 65221
-#define uRORes_err_ArrayIndexOutOfBounds 65222
+#define uRORes_err_UnknownMethod 65222
-#define uRORes_err_InvalidHeader 65223
+#define uRORes_err_ClassFactoryDidNotReturnInstance 65223
-#define uRORes_err_UnknownClassInStream 65224
+#define uRORes_err_TypeNotSupported 65224
-#define uRORes_err_UnexpectedClassInStream 65225
+#define uRORes_err_ClassFactoryNotFound 65225
-#define uRORes_err_SessionNotFound 65226
+#define uRORes_err_IROMessageNotSupported 65226
-#define uRORes_err_ChannelDoesntSupportIROMetadataReader 65227
+#define uRORes_err_ClassAlreadyRegistered 65227
-#define uRORes_err_TooManySessions 65228
+#define uRORes_err_UnknownProxyInterface 65228
-#define uRORes_err_DOMElementIsNIL 65229
+#define uRORes_err_DispatcherAlreadyAssigned 65229
-#define uRORes_err_CannotLoadXMLDocument 65230
+#define uRORes_err_CannotFindMessageDispatcher 65230
-#define uRORes_err_ErrorCreatingMsXmlDoc 65231
+#define uRORes_err_ServerOnlySupportsOneDispatcher 65231
-#define uRORes_err_RodlInvalidDataType 65232
+#define uRORes_err_InvalidType 65232
-#define uRORes_err_RodlStructCannotBeNested 65233
+#define uRORes_err_InvalidStream 65233
-#define uRORes_err_RodlInvalidAncestorType 65234
+#define uRORes_err_InvalidParamFlag 65234
-#define uRORes_str_ExceptionOnServer 65235
+#define uRORes_err_InvalidStringLength 65235
-#define uRORes_str_ExceptionReraisedFromServer 65236
+#define uRORes_str_InvalidClassTypeInStream 65236
-#define uRORes_err_AssignError 65237
+#define uRORes_err_UnexpectedEndOfStream 65237
-#define uRORes_err_InvalidRequestStream 65238
+#define uRORes_err_RodlDuplicateName 65238
-#define uRORes_err_NILMessage 65239
+#define uRORes_err_RodlNoDataTypeSpecified 65239
-#define uRORes_err_UnspecifiedInterface 65240
+#define uRORes_err_RodlNoEnumValues 65240
-#define uRORes_err_UnspecifiedMessage 65241
+#define uRORes_err_RodlNoStructElementsDefined 65241
-#define uRORes_err_UnknownMethod 65242
+#define uRORes_err_RodlNoOperationsDefined 65242
-#define uRORes_err_ClassFactoryDidNotReturnInstance 65243
+#define uRORes_err_RodlUsedFileDoesNotExist 65243
-#define uRORes_err_TypeNotSupported 65244
+#define uRORes_err_RodlInvalidDataType 65244
-#define uRORes_err_ClassFactoryNotFound 65245
+#define uRORes_err_RodlStructCannotBeNested 65245
-#define uRORes_err_IROMessageNotSupported 65246
+#define uRORes_err_RodlInvalidAncestorType 65246
-#define uRORes_err_ClassAlreadyRegistered 65247
+#define uRORes_str_ExceptionOnServer 65247
 #define Consts_SUTF8Encoding 65248
 #define Consts_SUTF7Encoding 65249
 #define Consts_SPageControlNotSet 65250
-#define uRORes_err_InvalidIndex 65251
+#define uRODECConst_sProtectionCircular 65251
-#define uRORes_err_InvalidType 65252
+#define uRODECConst_sStringFormatExists 65252
-#define uRORes_err_InvalidStream 65253
+#define uRODECConst_sInvalidStringFormat 65253
-#define uRORes_err_InvalidParamFlag 65254
+#define uRODECConst_sInvalidFormatString 65254
-#define uRORes_err_InvalidStringLength 65255
+#define uRODECConst_sFMT_COPY 65255
-#define uRORes_str_InvalidClassTypeInStream 65256
+#define uRODECConst_sFMT_HEX 65256
-#define uRORes_err_UnexpectedEndOfStream 65257
+#define uRODECConst_sFMT_HEXL 65257
-#define uRORes_err_RodlDuplicateName 65258
+#define uRODECConst_sFMT_MIME64 65258
-#define uRORes_err_RodlNoDataTypeSpecified 65259
+#define uRODECConst_sFMT_UU 65259
-#define uRORes_err_RodlNoEnumValues 65260
+#define uRODECConst_sFMT_XX 65260
-#define uRORes_err_RodlNoStructElementsDefined 65261
+#define uRODECConst_sInvalidKeySize 65261
-#define uRORes_err_RodlNoOperationsDefined 65262
+#define uRODECConst_sNotInitialized 65262
-#define uRORes_err_RodlUsedFileDoesNotExist 65263
+#define uRORes_err_InvalidIndex 65263
 #define Consts_SPictureLabel 65264
 #define Consts_SPictureDesc 65265
 #define Consts_SPreviewLabel 65266
@@ -2170,12 +2170,12 @@ BEGIN
 	IdResourceStrings_RSMIMEMIMETypeEmpty,	"Mimetype is empty"
 	IdResourceStrings_RSMIMEMIMEExtAlreadyExists,	"Extension already exits"
 	IdResourceStrings_RSStatusResolving,	"Resolving hostname %s."
-	uRODECConst_sFMT_HEXL,	"Hexadecimal lowercase"
+	uRORes_err_InvalidVarArrayDimCount,	"Variant Array DimCount must be 1 but is %d"
-	uRODECConst_sFMT_MIME64,	"MIME Base 64"
+	uRORes_err_MessageNotAssigned,	"Message is NIL"
-	uRODECConst_sFMT_UU,	"UU Coding"
+	ComConst_SOleError,	"OLE error %.8x"
-	uRODECConst_sFMT_XX,	"XX Coding"
+	ComConst_SNoMethod,	"Method '%s' not supported by automation object"
-	uRODECConst_sInvalidKeySize,	"Length from Encryptionkey is invalid.\r\nKeysize for %s must be to %d-%d bytes"
+	ComConst_SVarNotObject,	"Variant does not reference an automation object"
-	uRODECConst_sNotInitialized,	"%s is not initialized call Init() or InitKey() before."
+	ComConst_STooManyParams,	"Dispatch methods do not support more than 64 parameters"
 	IdResourceStrings_RSCannotAllocateSocket,	"Cannot allocate socket."
 	IdResourceStrings_RSConnectionClosedGracefully,	"Connection Closed Gracefully."
 	IdResourceStrings_RSCouldNotBindSocket,	"Could not bind socket. Address and port are already in use."
@@ -2186,26 +2186,6 @@ BEGIN
 	IdResourceStrings_RSThreadClassNotSpecified,	"Thread Class Not Specified."
 	IdResourceStrings_RSFileNotFound,	"File \"%s\" not found"
 	IdResourceStrings_RSOnlyOneAntiFreeze,	"Only one TIdAntiFreeze can exist per application."
-	uRORes_err_NoXMLParsersAvailable,	"MSXML is not installed"
-	uRORes_err_IDispatchMarshalingNotSupported,	"Marshaling of IDispatch (%d) type variants is not supported."
-	uRORes_err_UnsupportedVariantType,	"Unsupported variant type \"%d\""
-	uRORes_err_VariantIsNotArray,	"Variant must be Array, but is %d"
-	uRORes_err_InvalidVarArrayDimCount,	"Variant Array DimCount must be 1 but is %d"
-	uRORes_err_MessageNotAssigned,	"Message is NIL"
-	ComConst_SOleError,	"OLE error %.8x"
-	ComConst_SNoMethod,	"Method '%s' not supported by automation object"
-	ComConst_SVarNotObject,	"Variant does not reference an automation object"
-	ComConst_STooManyParams,	"Dispatch methods do not support more than 64 parameters"
-	uRODECConst_sProtectionCircular,	"Circular Protection detected, Protection Object is invalid."
-	uRODECConst_sStringFormatExists,	"String Format \"%d\" not exists."
-	uRODECConst_sInvalidStringFormat,	"Input is not an valid %s Format."
-	uRODECConst_sInvalidFormatString,	"Input can not be convert to %s Format."
-	uRODECConst_sFMT_COPY,	"copy Input to Output"
-	uRODECConst_sFMT_HEX,	"Hexadecimal"
-	uRORes_err_UnknownProxyInterface,	"Unknown proxy interface \"%s\""
-	uRORes_err_DispatcherAlreadyAssigned,	"Dispatcher for %s already assigned"
-	uRORes_err_CannotFindMessageDispatcher,	"Cannot find message dispatcher. Maybe there is no message component configured for  for the requested path?"
-	uRORes_err_ServerOnlySupportsOneDispatcher,	"%s servers only support one dispatcher"
 	uRORes_err_UnhandledException,	"Unhandled exception"
 	uRORes_err_ChannelBusy,	"Channel is busy. Try again later."
 	uRORes_err_ArrayIndexOutOfBounds,	"Array index out of bounds (%d)."
@@ -2218,10 +2198,10 @@ BEGIN
 	uRORes_err_DOMElementIsNIL,	"DOMElement is NIL"
 	uRORes_err_CannotLoadXMLDocument,	"Cannot load XML document.\rReason: %s\rLine: %d\rPosition: %d"
 	uRORes_err_ErrorCreatingMsXmlDoc,	"Error creating MSXML Document class\r\r%s: %s"
-	uRORes_err_RodlInvalidDataType,	"Invalid or undefined data type \"%s\"."
+	uRORes_err_NoXMLParsersAvailable,	"MSXML is not installed"
-	uRORes_err_RodlStructCannotBeNested,	"Structs cannot recursively contain themselves."
+	uRORes_err_IDispatchMarshalingNotSupported,	"Marshaling of IDispatch (%d) type variants is not supported."
-	uRORes_err_RodlInvalidAncestorType,	"Invalid or undefined ancestor type \"%s\"."
+	uRORes_err_UnsupportedVariantType,	"Unsupported variant type \"%d\""
-	uRORes_str_ExceptionOnServer,	"An exception of type %s was raised on the server: %s"
+	uRORes_err_VariantIsNotArray,	"Variant must be Array, but is %d"
 	uRORes_str_ExceptionReraisedFromServer,	"An exception was raised on the server: %s"
 	uRORes_err_AssignError,	"Cannot assign a \"%s\" to a \"%s\"."
 	uRORes_err_InvalidRequestStream,	"Invalid request stream (%d bytes)"
@@ -2234,10 +2214,10 @@ BEGIN
 	uRORes_err_ClassFactoryNotFound,	"Class factory for interface %s not found"
 	uRORes_err_IROMessageNotSupported,	"Class \"%s\" does not support IROMessage"
 	uRORes_err_ClassAlreadyRegistered,	"Class \"%s\" is already registered"
-	Consts_SUTF8Encoding,	"UTF-8"
+	uRORes_err_UnknownProxyInterface,	"Unknown proxy interface \"%s\""
-	Consts_SUTF7Encoding,	"UTF-7"
+	uRORes_err_DispatcherAlreadyAssigned,	"Dispatcher for %s already assigned"
-	Consts_SPageControlNotSet,	"PageControl must first be assigned"
+	uRORes_err_CannotFindMessageDispatcher,	"Cannot find message dispatcher. Maybe there is no message component configured for  for the requested path?"
-	uRORes_err_InvalidIndex,	"Invalid index %d"
+	uRORes_err_ServerOnlySupportsOneDispatcher,	"%s servers only support one dispatcher"
 	uRORes_err_InvalidType,	"Invalid type \"%s. Expected \"%s\"\""
 	uRORes_err_InvalidStream,	"Invalid stream"
 	uRORes_err_InvalidParamFlag,	"Invalid Parameter Flag \"%s\""
@@ -2250,6 +2230,26 @@ BEGIN
 	uRORes_err_RodlNoStructElementsDefined,	"Struct does not contain any elements."
 	uRORes_err_RodlNoOperationsDefined,	"Service interface does not contain any elements."
 	uRORes_err_RodlUsedFileDoesNotExist,	"The referenced RODL file \"%s\" could not be found."
+	uRORes_err_RodlInvalidDataType,	"Invalid or undefined data type \"%s\"."
+	uRORes_err_RodlStructCannotBeNested,	"Structs cannot recursively contain themselves."
+	uRORes_err_RodlInvalidAncestorType,	"Invalid or undefined ancestor type \"%s\"."
+	uRORes_str_ExceptionOnServer,	"An exception of type %s was raised on the server: %s"
+	Consts_SUTF8Encoding,	"UTF-8"
+	Consts_SUTF7Encoding,	"UTF-7"
+	Consts_SPageControlNotSet,	"PageControl must first be assigned"
+	uRODECConst_sProtectionCircular,	"Circular Protection detected, Protection Object is invalid."
+	uRODECConst_sStringFormatExists,	"String Format \"%d\" not exists."
+	uRODECConst_sInvalidStringFormat,	"Input is not an valid %s Format."
+	uRODECConst_sInvalidFormatString,	"Input can not be convert to %s Format."
+	uRODECConst_sFMT_COPY,	"copy Input to Output"
+	uRODECConst_sFMT_HEX,	"Hexadecimal"
+	uRODECConst_sFMT_HEXL,	"Hexadecimal lowercase"
+	uRODECConst_sFMT_MIME64,	"MIME Base 64"
+	uRODECConst_sFMT_UU,	"UU Coding"
+	uRODECConst_sFMT_XX,	"XX Coding"
+	uRODECConst_sInvalidKeySize,	"Length from Encryptionkey is invalid.\r\nKeysize for %s must be to %d-%d bytes"
+	uRODECConst_sNotInitialized,	"%s is not initialized call Init() or InitKey() before."
+	uRORes_err_InvalidIndex,	"Invalid index %d"
 	Consts_SPictureLabel,	"Picture:"
 	Consts_SPictureDesc,	" (%dx%d)"
 	Consts_SPreviewLabel,	"Preview"

Source/Servidor/FactuGES_Server.rc

@@ -16,7 +16,7 @@ BEGIN
               VALUE "FileVersion", "3.0.9.0\0"
               VALUE "ProductName", "FactuGES Server\0"
               VALUE "ProductVersion", "3.0.9.0\0"
-              VALUE "CompileDate", "miércoles, 29 de octubre de 2008 13:28\0"
+              VALUE "CompileDate", "viernes, 31 de octubre de 2008 12:56\0"
          END
     END
     BLOCK "VarFileInfo"

Source/Servidor/uDataModuleServer.dfm

@@ -59,9 +59,9 @@ object dmServer: TdmServer
       item
         Name = 'IBX'
         ConnectionString = 
-          'IBX?Server=localhost;Database=C:\Codigo Luis Leon\Database\Copia' +
+          'IBX?Server=localhost;Database=C:\Codigo Luis Leon\Database\FACTU' +
-          ' de FACTUGES(con varios dias de vencimiento).FDB;UserID=sysdba;P' +
+          'GES.FDB;UserID=sysdba;Password=masterkey;Dialect=3;Charset=ISO88' +
-          'assword=masterkey;Dialect=3;Charset=ISO8859_1;'
+          '59_1;'
         Default = True
         Tag = 0
       end>