From 46bb97ed5775d3be7e012227008d289d3ee8af54 Mon Sep 17 00:00:00 2001 From: roberto Date: Thu, 18 Sep 2008 17:39:18 +0000 Subject: [PATCH] Se adaptan los albaranes de cliente para que se puedan relacionar con las oredenes de devolucion y asi ver en la oreden de que albaran procede y si esta facturado o no git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES/trunk@280 c93665c3-c93d-084d-9b98-7d5f4a9c3376 --- Database/FACTUGES.FDB | Bin 25645056 -> 25657344 bytes Database/Script.txt | 328 +++++++++++------- Database/VISTAS.SQL | 186 +++++----- Database/factuges.sql | 6 +- Source/Cliente/FactuGES.bdsproj | 6 +- Source/Cliente/FactuGES.rc | 8 +- Source/Cliente/FactuGES.res | Bin 171932 -> 171932 bytes .../AlbaranesCliente_Group.bdsgroup | 7 +- .../uAlbaranesClienteController.pas | 31 ++ .../Data/uDataModuleAlbaranesCliente.dfm | 55 +++ .../Model/schAlbaranesClienteClient_Intf.pas | 164 ++++++++- .../Model/schAlbaranesClienteServer_Intf.pas | 196 ++++++++++- .../Servidor/srvAlbaranesCliente_Impl.dfm | 204 ++++++++++- .../Views/uEditorAlbaranCliente.dfm | 40 +-- .../Views/uEditorAlbaranCliente.pas | 2 +- .../Views/uEditorAlbaranesCliente.dfm | 32 +- .../Views/uEditorAlbaranesCliente.pas | 15 +- .../Views/uEditorAlbaranesDevCliente.dfm | 5 +- .../Views/uViewAlbaranCliente.dfm | 88 ++--- .../Views/uViewAlbaranCliente.pas | 31 +- .../Views/uViewAlbaranDevCliente.dfm | 154 +++++++- .../Views/uViewAlbaranDevCliente.pas | 78 ++++- .../Views/uViewAlbaranesDevCliente.dfm | 19 +- .../Views/uViewAlbaranesDevCliente.pas | 2 + .../AlbaranesProveedor_Group.bdsgroup | 7 +- .../uAlbaranesProveedorController.pas | 32 ++ .../Data/uDataModuleAlbaranesProveedor.dfm | 55 +++ .../schAlbaranesProveedorClient_Intf.pas | 164 ++++++++- .../schAlbaranesProveedorServer_Intf.pas | 196 ++++++++++- .../Servidor/srvAlbaranesProveedor_Impl.dfm | 191 +++++++++- .../Views/uEditorAlbaranProveedor.pas | 2 +- .../Views/uEditorAlbaranesDevProveedor.dfm | 5 +- .../Views/uEditorAlbaranesProveedor.dfm | 12 +- .../Views/uEditorAlbaranesProveedor.pas | 9 + .../Views/uViewAlbaranDevProveedor.dfm | 87 ++++- .../Views/uViewAlbaranDevProveedor.pas | 75 +++- .../Views/uViewAlbaranProveedor.dfm | 7 +- .../Views/uViewAlbaranProveedor.pas | 39 ++- .../Views/uViewAlbaranesDevProveedor.dfm | 18 +- .../Views/uViewAlbaranesDevProveedor.pas | 2 + Source/Servidor/FactuGES_Server.bdsproj | 17 +- Source/Servidor/FactuGES_Server.dpr | 10 +- Source/Servidor/FactuGES_Server.drc | 202 +++++------ Source/Servidor/FactuGES_Server.rc | 10 +- Source/Servidor/FactuGES_Server.res | Bin 23352 -> 23348 bytes 45 files changed, 2242 insertions(+), 555 deletions(-) diff --git a/Database/FACTUGES.FDB b/Database/FACTUGES.FDB index 98a24cbeb1a5cff8874e12f333f99c6b188e9e91..1893359e26e5e8dcc349ab3025965da72bf222fa 100644 GIT binary patch delta 30779 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 delta 20236 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 0; - - -CREATE VIEW V_PED_PROV_ART_SIN_ALBARAN( - ID, + REFERENCIA_CLIENTE, + TIPO, + ID_ALBARAN_DEV, + REFERENCIA_ALB_DEV, + ID_FAC_ALB_DEV, + REFERENCIA_FAC_ALB_DEV, + SITUACION, + ID_ALMACEN, + NOMBRE_ALMACEN, ID_PEDIDO, - ID_EMPRESA, - REFERENCIA_PEDIDO, - FECHA_PEDIDO, - FECHA_CONFIRMACION, - ID_PROVEEDOR, + REF_PEDIDO, + ID_FACTURA, + REF_FACTURA, CALLE, CODIGO_POSTAL, POBLACION, PROVINCIA, PERSONA_CONTACTO, TELEFONO, - IVA, - ID_FORMA_PAGO, - PROVEEDOR, - ID_ARTICULO, - FAMILIA, - REFERENCIA, - REFERENCIA_PROVEEDOR, - DESCRIPCION, - CANTIDAD_PEDIDA, - CANTIDAD_RECIBIDA, - CANTIDAD_PENDIENTE, - PRECIO_COSTE, + IMPORTE_NETO, + IMPORTE_PORTE, DESCUENTO, - PRECIO_NETO, - PRECIO_PORTE) + IMPORTE_DESCUENTO, + BASE_IMPONIBLE, + IVA, + IMPORTE_IVA, + IMPORTE_TOTAL, + OBSERVACIONES, + INCIDENCIAS, + INCIDENCIAS_ACTIVAS, + FECHA_ALTA, + FECHA_MODIFICACION, + USUARIO, + ID_FORMA_PAGO, + FECHA_PREVISTA_ENVIO, + FECHA_ENVIO, + FECHA_RECEPCION, + ID_AGENTE, + AGENTE, + NUM_COPIAS) AS SELECT - V_PED_PROV_ARTICULOS.ID_PEDIDO || 0 || V_PED_PROV_ARTICULOS.ID_ARTICULO as ID, /*Para tener un ID unico sobre el que poder consultar en la sentencia de selección del grid*/ - V_PED_PROV_ARTICULOS.ID_PEDIDO, - PEDIDOS_PROVEEDOR.ID_EMPRESA, - PEDIDOS_PROVEEDOR.referencia, - PEDIDOS_PROVEEDOR.fecha_pedido, - PEDIDOS_PROVEEDOR.fecha_confirmacion, - PEDIDOS_PROVEEDOR.id_proveedor, - PEDIDOS_PROVEEDOR.CALLE, - PEDIDOS_PROVEEDOR.CODIGO_POSTAL, - PEDIDOS_PROVEEDOR.POBLACION, - PEDIDOS_PROVEEDOR.PROVINCIA, - PEDIDOS_PROVEEDOR.PERSONA_CONTACTO, - PEDIDOS_PROVEEDOR.TELEFONO, - PEDIDOS_PROVEEDOR.IVA, - PEDIDOS_PROVEEDOR.ID_FORMA_PAGO, - CONTACTOS.nombre, - V_PED_PROV_ARTICULOS.ID_ARTICULO, - articulos.familia, - articulos.referencia, - articulos.referencia_prov, - articulos.descripcion, - V_PED_PROV_ARTICULOS.CANTIDAD_PEDIDA, - V_PED_PROV_ARTICULOS.CANTIDAD_RECIBIDA, - V_PED_PROV_ARTICULOS.CANTIDAD_PENDIENTE, + ALBARANES_CLIENTE.ID, + ALBARANES_CLIENTE.ID_EMPRESA, + ALBARANES_CLIENTE.ID_CLIENTE, + CLIENTES.NOMBRE, + ALBARANES_CLIENTE.FECHA_ALBARAN, + ALBARANES_CLIENTE.REFERENCIA, + ALBARANES_CLIENTE.REFERENCIA_CLIENTE, + ALBARANES_CLIENTE.TIPO, + ALBARANES_CLIENTE.ID_ALBARAN_DEV, + ALB_DEV.REFERENCIA, + ALB_DEV.ID_FACTURA, + FAC_CLI_ALB_DEV.REFERENCIA, + V_ALB_CLI_SITUACION.SITUACION, + ALBARANES_CLIENTE.ID_ALMACEN, + ALMACENES.NOMBRE AS NOMBRE_ALMACEN, + ALBARANES_CLIENTE.ID_PEDIDO, + PEDIDOS_CLIENTE.REFERENCIA AS REF_PEDIDO, + ALBARANES_CLIENTE.ID_FACTURA, + FACTURAS_CLIENTE.REFERENCIA AS REF_FACTURA, + ALBARANES_CLIENTE.CALLE, + ALBARANES_CLIENTE.CODIGO_POSTAL, + ALBARANES_CLIENTE.POBLACION, + ALBARANES_CLIENTE.PROVINCIA, + ALBARANES_CLIENTE.PERSONA_CONTACTO, + ALBARANES_CLIENTE.TELEFONO, + ALBARANES_CLIENTE.IMPORTE_NETO, + ALBARANES_CLIENTE.IMPORTE_PORTE, + ALBARANES_CLIENTE.DESCUENTO, + ALBARANES_CLIENTE.IMPORTE_DESCUENTO, + ALBARANES_CLIENTE.BASE_IMPONIBLE, + ALBARANES_CLIENTE.IVA, + ALBARANES_CLIENTE.IMPORTE_IVA, + ALBARANES_CLIENTE.IMPORTE_TOTAL, + ALBARANES_CLIENTE.OBSERVACIONES, + ALBARANES_CLIENTE.INCIDENCIAS, + ALBARANES_CLIENTE.INCIDENCIAS_ACTIVAS, + ALBARANES_CLIENTE.FECHA_ALTA, + ALBARANES_CLIENTE.FECHA_MODIFICACION, + ALBARANES_CLIENTE.USUARIO, + ALBARANES_CLIENTE.ID_FORMA_PAGO, + ALBARANES_CLIENTE.FECHA_PREVISTA_ENVIO, + ALBARANES_CLIENTE.FECHA_ENVIO, + ALBARANES_CLIENTE.FECHA_RECEPCION, + CLIENTES_DATOS.ID_AGENTE, + AGENTES.NOMBRE, + IMPRESIONES.NUM_COPIAS - ARTICULOS.PRECIO_COSTE, - ARTICULOS.DESCUENTO, - ARTICULOS.PRECIO_NETO, - ARTICULOS.PRECIO_PORTE +FROM + ALBARANES_CLIENTE + INNER JOIN V_ALB_CLI_SITUACION ON (V_ALB_CLI_SITUACION.ID = ALBARANES_CLIENTE.ID) + INNER JOIN CONTACTOS CLIENTES ON (CLIENTES.ID = ALBARANES_CLIENTE.ID_CLIENTE) + LEFT OUTER JOIN ALBARANES_CLIENTE ALB_DEV ON (ALB_DEV.ID = ALBARANES_CLIENTE.ID_ALBARAN_DEV) + LEFT OUTER JOIN FACTURAS_CLIENTE FAC_CLI_ALB_DEV ON (FAC_CLI_ALB_DEV.ID = ALB_DEV.ID_FACTURA) + LEFT OUTER JOIN CLIENTES_DATOS ON (CLIENTES_DATOS.ID_CLIENTE = ALBARANES_CLIENTE.ID_CLIENTE) + LEFT OUTER JOIN CONTACTOS AGENTES ON (AGENTES.ID = CLIENTES_DATOS.ID_AGENTE) + 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')) +; -from V_PED_PROV_ARTICULOS -left join PEDIDOS_PROVEEDOR on (PEDIDOS_PROVEEDOR.id = V_PED_PROV_ARTICULOS.id_pedido) -left join CONTACTOS on (contactos.id = PEDIDOS_PROVEEDOR.id_proveedor) -left join articulos on (articulos.id = V_PED_PROV_ARTICULOS.ID_ARTICULO) -where cantidad_pendiente > 0; +DROP VIEW V_ALBARANES_PROVEEDOR; + +CREATE VIEW V_ALBARANES_PROVEEDOR( + ID, + ID_EMPRESA, + ID_PROVEEDOR, + NOMBRE, + FECHA_ALBARAN, + REFERENCIA, + REFERENCIA_PROVEEDOR, + TIPO, + ID_ALBARAN_DEV, + REFERENCIA_ALB_DEV, + ID_FAC_ALB_DEV, + REFERENCIA_FAC_ALB_DEV, + ID_ALMACEN, + NOMBRE_ALMACEN, + ID_PEDIDO, + REF_PED_PROVEEDOR, + ID_FACTURA, + REF_FACTURA, + REF_FACTURA_PROV, + CALLE, + CODIGO_POSTAL, + POBLACION, + PROVINCIA, + PERSONA_CONTACTO, + TELEFONO, + IMPORTE_NETO, + IMPORTE_PORTE, + DESCUENTO, + IMPORTE_DESCUENTO, + BASE_IMPONIBLE, + IVA, + IMPORTE_IVA, + IMPORTE_TOTAL, + OBSERVACIONES, + INCIDENCIAS, + INCIDENCIAS_ACTIVAS, + FECHA_ALTA, + FECHA_MODIFICACION, + USUARIO, + ID_FORMA_PAGO, + NUM_COPIAS) +AS +SELECT + ALBARANES_PROVEEDOR.ID, + ALBARANES_PROVEEDOR.ID_EMPRESA, + ALBARANES_PROVEEDOR.ID_PROVEEDOR, + CONTACTOS.NOMBRE, + ALBARANES_PROVEEDOR.FECHA_ALBARAN, + ALBARANES_PROVEEDOR.REFERENCIA, + ALBARANES_PROVEEDOR.REFERENCIA_PROVEEDOR, + ALBARANES_PROVEEDOR.TIPO, + ALBARANES_PROVEEDOR.ID_ALBARAN_DEV, + ALB_DEV.REFERENCIA, + ALB_DEV.ID_FACTURA, + FAC_PROV_ALB_DEV.REFERENCIA, + ALBARANES_PROVEEDOR.ID_ALMACEN, + ALMACENES.NOMBRE AS NOMBRE_ALMACEN, + ALBARANES_PROVEEDOR.ID_PEDIDO, + PEDIDOS_PROVEEDOR.REFERENCIA AS REF_PED_PROVEEDOR, + ALBARANES_PROVEEDOR.ID_FACTURA, + FACTURAS_PROVEEDOR.REFERENCIA AS REF_FACTURA, + ALBARANES_PROVEEDOR.REF_FACTURA_PROV, + ALBARANES_PROVEEDOR.CALLE, + ALBARANES_PROVEEDOR.CODIGO_POSTAL, + ALBARANES_PROVEEDOR.POBLACION, + ALBARANES_PROVEEDOR.PROVINCIA, + ALBARANES_PROVEEDOR.PERSONA_CONTACTO, + ALBARANES_PROVEEDOR.TELEFONO, + ALBARANES_PROVEEDOR.IMPORTE_NETO, + ALBARANES_PROVEEDOR.IMPORTE_PORTE, + ALBARANES_PROVEEDOR.DESCUENTO, + ALBARANES_PROVEEDOR.IMPORTE_DESCUENTO, + ALBARANES_PROVEEDOR.BASE_IMPONIBLE, + ALBARANES_PROVEEDOR.IVA, + ALBARANES_PROVEEDOR.IMPORTE_IVA, + ALBARANES_PROVEEDOR.IMPORTE_TOTAL, + ALBARANES_PROVEEDOR.OBSERVACIONES, + ALBARANES_PROVEEDOR.INCIDENCIAS, + ALBARANES_PROVEEDOR.INCIDENCIAS_ACTIVAS, + ALBARANES_PROVEEDOR.FECHA_ALTA, + ALBARANES_PROVEEDOR.FECHA_MODIFICACION, + ALBARANES_PROVEEDOR.USUARIO, + ALBARANES_PROVEEDOR.ID_FORMA_PAGO, + IMPRESIONES.NUM_COPIAS +FROM + ALBARANES_PROVEEDOR + INNER JOIN CONTACTOS ON (CONTACTOS.ID = ALBARANES_PROVEEDOR.ID_PROVEEDOR) + LEFT OUTER JOIN ALBARANES_PROVEEDOR ALB_DEV ON (ALB_DEV.ID = ALBARANES_PROVEEDOR.ID_ALBARAN_DEV) + LEFT OUTER JOIN FACTURAS_PROVEEDOR FAC_PROV_ALB_DEV ON (FAC_PROV_ALB_DEV.ID = ALB_DEV.ID_FACTURA) + 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')) +; \ No newline at end of file diff --git a/Database/VISTAS.SQL b/Database/VISTAS.SQL index 89416a4b..14f29c90 100644 --- a/Database/VISTAS.SQL +++ b/Database/VISTAS.SQL @@ -296,44 +296,48 @@ WHERE CREATE VIEW V_ALBARANES_PROVEEDOR( -ID, -ID_EMPRESA, -ID_PROVEEDOR, -NOMBRE, -FECHA_ALBARAN, -REFERENCIA, -REFERENCIA_PROVEEDOR, -TIPO, -ID_ALMACEN, -NOMBRE_ALMACEN, -ID_PEDIDO, -REF_PED_PROVEEDOR, -ID_FACTURA, -REF_FACTURA, -REF_FACTURA_PROV, -CALLE, -CODIGO_POSTAL, -POBLACION, -PROVINCIA, -PERSONA_CONTACTO, -TELEFONO, -IMPORTE_NETO, -IMPORTE_PORTE, -DESCUENTO, -IMPORTE_DESCUENTO, -BASE_IMPONIBLE, -IVA, -IMPORTE_IVA, -IMPORTE_TOTAL, -OBSERVACIONES, -INCIDENCIAS, -INCIDENCIAS_ACTIVAS, -FECHA_ALTA, -FECHA_MODIFICACION, -USUARIO, -ID_FORMA_PAGO, -NUM_COPIAS) - AS + ID, + ID_EMPRESA, + ID_PROVEEDOR, + NOMBRE, + FECHA_ALBARAN, + REFERENCIA, + REFERENCIA_PROVEEDOR, + TIPO, + ID_ALBARAN_DEV, + REFERENCIA_ALB_DEV, + ID_FAC_ALB_DEV, + REFERENCIA_FAC_ALB_DEV, + ID_ALMACEN, + NOMBRE_ALMACEN, + ID_PEDIDO, + REF_PED_PROVEEDOR, + ID_FACTURA, + REF_FACTURA, + REF_FACTURA_PROV, + CALLE, + CODIGO_POSTAL, + POBLACION, + PROVINCIA, + PERSONA_CONTACTO, + TELEFONO, + IMPORTE_NETO, + IMPORTE_PORTE, + DESCUENTO, + IMPORTE_DESCUENTO, + BASE_IMPONIBLE, + IVA, + IMPORTE_IVA, + IMPORTE_TOTAL, + OBSERVACIONES, + INCIDENCIAS, + INCIDENCIAS_ACTIVAS, + FECHA_ALTA, + FECHA_MODIFICACION, + USUARIO, + ID_FORMA_PAGO, + NUM_COPIAS) +AS SELECT ALBARANES_PROVEEDOR.ID, ALBARANES_PROVEEDOR.ID_EMPRESA, @@ -343,6 +347,10 @@ SELECT ALBARANES_PROVEEDOR.REFERENCIA, ALBARANES_PROVEEDOR.REFERENCIA_PROVEEDOR, ALBARANES_PROVEEDOR.TIPO, + ALBARANES_PROVEEDOR.ID_ALBARAN_DEV, + ALB_DEV.REFERENCIA, + ALB_DEV.ID_FACTURA, + FAC_PROV_ALB_DEV.REFERENCIA, ALBARANES_PROVEEDOR.ID_ALMACEN, ALMACENES.NOMBRE AS NOMBRE_ALMACEN, ALBARANES_PROVEEDOR.ID_PEDIDO, @@ -375,6 +383,8 @@ SELECT FROM ALBARANES_PROVEEDOR INNER JOIN CONTACTOS ON (CONTACTOS.ID = ALBARANES_PROVEEDOR.ID_PROVEEDOR) + LEFT OUTER JOIN ALBARANES_PROVEEDOR ALB_DEV ON (ALB_DEV.ID = ALBARANES_PROVEEDOR.ID_ALBARAN_DEV) + LEFT OUTER JOIN FACTURAS_PROVEEDOR FAC_PROV_ALB_DEV ON (FAC_PROV_ALB_DEV.ID = ALB_DEV.ID_FACTURA) 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) @@ -996,49 +1006,53 @@ FROM ALBARANES_CLIENTE; CREATE VIEW V_ALBARANES_CLIENTE( -ID, -ID_EMPRESA, -ID_CLIENTE, -NOMBRE, -FECHA_ALBARAN, -REFERENCIA, -REFERENCIA_CLIENTE, -TIPO, -SITUACION, -ID_ALMACEN, -NOMBRE_ALMACEN, -ID_PEDIDO, -REF_PEDIDO, -ID_FACTURA, -REF_FACTURA, -CALLE, -CODIGO_POSTAL, -POBLACION, -PROVINCIA, -PERSONA_CONTACTO, -TELEFONO, -IMPORTE_NETO, -IMPORTE_PORTE, -DESCUENTO, -IMPORTE_DESCUENTO, -BASE_IMPONIBLE, -IVA, -IMPORTE_IVA, -IMPORTE_TOTAL, -OBSERVACIONES, -INCIDENCIAS, -INCIDENCIAS_ACTIVAS, -FECHA_ALTA, -FECHA_MODIFICACION, -USUARIO, -ID_FORMA_PAGO, -FECHA_PREVISTA_ENVIO, -FECHA_ENVIO, -FECHA_RECEPCION, -ID_AGENTE, -AGENTE, -NUM_COPIAS) - AS + ID, + ID_EMPRESA, + ID_CLIENTE, + NOMBRE, + FECHA_ALBARAN, + REFERENCIA, + REFERENCIA_CLIENTE, + TIPO, + ID_ALBARAN_DEV, + REFERENCIA_ALB_DEV, + ID_FAC_ALB_DEV, + REFERENCIA_FAC_ALB_DEV, + SITUACION, + ID_ALMACEN, + NOMBRE_ALMACEN, + ID_PEDIDO, + REF_PEDIDO, + ID_FACTURA, + REF_FACTURA, + CALLE, + CODIGO_POSTAL, + POBLACION, + PROVINCIA, + PERSONA_CONTACTO, + TELEFONO, + IMPORTE_NETO, + IMPORTE_PORTE, + DESCUENTO, + IMPORTE_DESCUENTO, + BASE_IMPONIBLE, + IVA, + IMPORTE_IVA, + IMPORTE_TOTAL, + OBSERVACIONES, + INCIDENCIAS, + INCIDENCIAS_ACTIVAS, + FECHA_ALTA, + FECHA_MODIFICACION, + USUARIO, + ID_FORMA_PAGO, + FECHA_PREVISTA_ENVIO, + FECHA_ENVIO, + FECHA_RECEPCION, + ID_AGENTE, + AGENTE, + NUM_COPIAS) +AS SELECT ALBARANES_CLIENTE.ID, ALBARANES_CLIENTE.ID_EMPRESA, @@ -1048,6 +1062,10 @@ SELECT ALBARANES_CLIENTE.REFERENCIA, ALBARANES_CLIENTE.REFERENCIA_CLIENTE, ALBARANES_CLIENTE.TIPO, + ALBARANES_CLIENTE.ID_ALBARAN_DEV, + ALB_DEV.REFERENCIA, + ALB_DEV.ID_FACTURA, + FAC_CLI_ALB_DEV.REFERENCIA, V_ALB_CLI_SITUACION.SITUACION, ALBARANES_CLIENTE.ID_ALMACEN, ALMACENES.NOMBRE AS NOMBRE_ALMACEN, @@ -1087,13 +1105,15 @@ FROM ALBARANES_CLIENTE INNER JOIN V_ALB_CLI_SITUACION ON (V_ALB_CLI_SITUACION.ID = ALBARANES_CLIENTE.ID) INNER JOIN CONTACTOS CLIENTES ON (CLIENTES.ID = ALBARANES_CLIENTE.ID_CLIENTE) + LEFT OUTER JOIN ALBARANES_CLIENTE ALB_DEV ON (ALB_DEV.ID = ALBARANES_CLIENTE.ID_ALBARAN_DEV) + LEFT OUTER JOIN FACTURAS_CLIENTE FAC_CLI_ALB_DEV ON (FAC_CLI_ALB_DEV.ID = ALB_DEV.ID_FACTURA) LEFT OUTER JOIN CLIENTES_DATOS ON (CLIENTES_DATOS.ID_CLIENTE = ALBARANES_CLIENTE.ID_CLIENTE) LEFT OUTER JOIN CONTACTOS AGENTES ON (AGENTES.ID = CLIENTES_DATOS.ID_AGENTE) 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')) +; /*Agrupa los artículos de un mismo albarán (ya que en un albarán puede existir varias lineas con el mismo artículo). diff --git a/Database/factuges.sql b/Database/factuges.sql index 49065785..d6ba36df 100644 --- a/Database/factuges.sql +++ b/Database/factuges.sql @@ -156,7 +156,8 @@ CREATE TABLE ALBARANES_CLIENTE ( FECHA_RECEPCION DATE, FECHA_PREVISTA_ENVIO DATE, REFERENCIA_CLIENTE VARCHAR(255) COLLATE ES_ES, - TIPO VARCHAR(1) + TIPO VARCHAR(1), + ID_ALBARAN_DEV TIPO_ID ); @@ -211,7 +212,8 @@ CREATE TABLE ALBARANES_PROVEEDOR ( IMPORTE_PORTE TIPO_IMPORTE, REFERENCIA_PROVEEDOR VARCHAR(255), REF_FACTURA_PROV VARCHAR(255), - TIPO VARCHAR(1) + TIPO VARCHAR(1), + ID_ALBARAN_DEV TIPO_ID ); diff --git a/Source/Cliente/FactuGES.bdsproj b/Source/Cliente/FactuGES.bdsproj index cf225069..e06ca7d1 100644 --- a/Source/Cliente/FactuGES.bdsproj +++ b/Source/Cliente/FactuGES.bdsproj @@ -149,7 +149,7 @@ False 3 0 - 5 + 6 0 False False @@ -162,13 +162,13 @@ Rodax Software S.L. - 3.0.5.0 + 3.0.6.0 FactuGES - 3.0.5.0 + 3.0.6.0 Muststang Peak EasyListview Runtime Package diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 6a4931db..eea292dc 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "c:\Codigo Luis Leon\Source\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 3,0,5,0 -PRODUCTVERSION 3,0,5,0 +FILEVERSION 3,0,6,0 +PRODUCTVERSION 3,0,6,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,9 +13,9 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "3.0.5.0\0" + VALUE "FileVersion", "3.0.6.0\0" VALUE "InternalName", "FactuGES\0" - VALUE "ProductVersion", "3.0.5.0\0" + VALUE "ProductVersion", "3.0.6.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 69629f0e4477477d9dc78f2673b3da6a74d7973c..44d2e1ad2134b0d6382301faa98ad708f6ac01e3 100644 GIT binary patch delta 42 vcmbQUpKH#3u7(!IElgtbIN2B&7?^>WZMytCrjv|j(_hYGN(WMb^O?K>3zQ5x delta 42 vcmbQUpKH#3u7(!IElgtbI9VAO7?^>Wb-MgKrjv}O(_hYGN(WMb^O?K>3sDR< diff --git a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.bdsgroup b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.bdsgroup index 8fbb0e63..4ad68757 100644 --- a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.bdsgroup +++ b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.bdsgroup @@ -18,14 +18,15 @@ Model\AlbaranesCliente_model.bdsproj Data\AlbaranesCliente_data.bdsproj Controller\AlbaranesCliente_controller.bdsproj + ..\Facturas de cliente\Controller\FacturasCliente_controller.bdsproj + ..\Relaciones\Pedidos de cliente - Albaranes de cliente\PedCli_AlbCli_relation.bdsproj + ..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.bdsproj Views\AlbaranesCliente_view.bdsproj Plugin\AlbaranesCliente_plugin.bdsproj - ..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.bdsproj ..\Facturas de cliente\Views\FacturasCliente_view.bdsproj ..\..\Servidor\FactuGES_Server.bdsproj ..\..\Cliente\FactuGES.bdsproj - ..\Relaciones\Pedidos de cliente - Albaranes de cliente\PedCli_AlbCli_relation.bdsproj - DataAbstract_D10.bpl Base.bpl ControllerBase.bpl GUIBase.bpl Contactos_view.bpl Articulos_view.bpl AlbaranesCliente_model.bpl AlbaranesCliente_data.bpl AlbaranesCliente_controller.bpl AlbaranesCliente_view.bpl AlbaranesCliente_plugin.bpl AlbCli_FacCli_relation.bpl FacturasCliente_view.bpl FactuGES_Server.exe FactuGES.exe PedCli_AlbCli_relation.bpl + 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 diff --git a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas index 75680c4a..cfdbc577 100644 --- a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas +++ b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas @@ -39,6 +39,7 @@ type procedure DescartarCambios(AAlbaran : IBizAlbaranCliente); function Existe(const ID: Integer) : Boolean; function Duplicar(AAlbaran: IBizAlbaranCliente): IBizAlbaranCliente; + function GenerarOrdenDev(AAlbaran: IBizAlbaranCliente): IBizAlbaranCliente; function ExtraerSeleccionados(AAlbaran: IBizAlbaranCliente; Const ViewGrid: IViewGridBase = Nil) : IBizAlbaranCliente; function ElegirAlbaranes(AAlbaran: IBizAlbaranCliente; AMensaje: String; AMultiSelect: Boolean): IBizAlbaranCliente; @@ -116,6 +117,7 @@ type procedure VerTodosAlbaranesDev(AAlbarans: IBizAlbaranCliente); procedure VerDireccionEntrega(AAlbaran : IBizAlbaranCliente); function Duplicar(AAlbaran: IBizAlbaranCliente): IBizAlbaranCliente; + function GenerarOrdenDev(AAlbaran: IBizAlbaranCliente): IBizAlbaranCliente; procedure CopiarDireccionEnvio (const ADireccionEnvio: IBizDireccionesContacto; AAlbaran: IBizAlbaranCliente); @@ -425,7 +427,9 @@ begin FECHA_PREVISTA_ENVIO := 0; FECHA_ENVIO := 0; FECHA_RECEPCION := 0; + REF_FACTURA := ''; ID_FACTURA := 0; + REF_PEDIDO := ''; ID_PEDIDO := 0; end; Result.Post; @@ -1038,6 +1042,33 @@ begin end; end; +function TAlbaranesClienteController.GenerarOrdenDev(AAlbaran: IBizAlbaranCliente): IBizAlbaranCliente; +var + AOrden : IBizAlbaranCliente; + IdAlbaran: Integer; + +begin + if Assigned(AAlbaran) then + begin + IdAlbaran := AAlbaran.ID; + AOrden := Duplicar(AAlbaran); + if Assigned(AOrden) then + begin + if not AOrden.DataTable.Editing then + AOrden.Edit; + + AOrden.TIPO := CTE_TIPO_ALBARAN_DEV; + AOrden.ID_ALBARAN_DEV := IdAlbaran; + AOrden.Post; + + //Convierte todos los articulos del albaran a negativos por se una orden de devolucion + FDetallesController.CambiarSignoDetalles(AOrden.Detalles); + + end; + Ver(AOrden); + end; +end; + function TAlbaranesClienteController.GetClienteController: IClientesController; begin Result := FClienteController; diff --git a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm index 7258c4c1..bdd0b90d 100644 --- a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm @@ -621,6 +621,61 @@ object DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente BlobType = dabtUnknown DisplayWidth = 0 Alignment = taLeftJustify + DictionaryEntry = 'AlbaranesCliente_NUM_COPIAS' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'ID_ALBARAN_DEV' + DataType = datInteger + BlobType = dabtUnknown + DisplayWidth = 0 + DisplayLabel = 'AlbaranesCliente_ID_ALBARAN_DEV' + Alignment = taLeftJustify + DictionaryEntry = 'AlbaranesCliente_ID_ALBARAN_DEV' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'REFERENCIA_ALB_DEV' + DataType = datString + Size = 255 + BlobType = dabtUnknown + DisplayWidth = 0 + DisplayLabel = 'AlbaranesCliente_REFERENCIA_ALB_DEV' + Alignment = taLeftJustify + DictionaryEntry = 'AlbaranesCliente_REFERENCIA_ALB_DEV' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'ID_FAC_ALB_DEV' + DataType = datInteger + BlobType = dabtUnknown + DisplayWidth = 0 + DisplayLabel = 'AlbaranesCliente_ID_FAC_ALB_DEV' + Alignment = taLeftJustify + DictionaryEntry = 'AlbaranesCliente_ID_FAC_ALB_DEV' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'REFERENCIA_FAC_ALB_DEV' + DataType = datString + Size = 255 + BlobType = dabtUnknown + DisplayWidth = 0 + DisplayLabel = 'Ref. factura alb. dev.' + Alignment = taLeftJustify + DictionaryEntry = 'AlbaranesCliente_REFERENCIA_FAC_ALB_DEV' InPrimaryKey = False Calculated = False Lookup = False diff --git a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas index 0a321e0a..3e714fe4 100644 --- a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas +++ b/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 = '{DCC75E0A-1413-4F74-8EF2-D5261717689F}'; - RID_AlbaranesCliente = '{BD15D29D-2048-44B3-BE79-0485BDB36C8E}'; - RID_AlbaranesCliente_Detalles = '{4CA5BC9A-72EA-4187-BD2E-A9EF5BAAF24E}'; - RID_AlbaranesCliente_Detalles_Refresh = '{9F94485D-D822-4622-A4C0-30D76050FD48}'; - RID_AlbaranesCliente_Refresh = '{2CF53053-8A71-4901-80B3-3527508FD486}'; + RID_DarReferencia = '{EB3008DB-9520-42B6-8860-4AAD682CA8B5}'; + RID_AlbaranesCliente = '{21D36B32-4BCE-485C-A44A-9A72CC73A57E}'; + RID_AlbaranesCliente_Detalles = '{493A3E1F-36BC-42B1-B149-2CFFAE856399}'; + RID_AlbaranesCliente_Detalles_Refresh = '{DED95756-45A8-43C5-A74D-314BCED7EEE4}'; + RID_AlbaranesCliente_Refresh = '{4A56E94D-34D5-424F-8CDB-8FDF86479EA6}'; { Data table names } nme_DarReferencia = 'DarReferencia'; @@ -71,6 +71,10 @@ const fld_AlbaranesClienteID_AGENTE = 'ID_AGENTE'; fld_AlbaranesClienteAGENTE = 'AGENTE'; fld_AlbaranesClienteNUM_COPIAS = 'NUM_COPIAS'; + fld_AlbaranesClienteID_ALBARAN_DEV = 'ID_ALBARAN_DEV'; + 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'; { AlbaranesCliente field indexes } idx_AlbaranesClienteID = 0; @@ -115,6 +119,10 @@ const idx_AlbaranesClienteID_AGENTE = 39; idx_AlbaranesClienteAGENTE = 40; idx_AlbaranesClienteNUM_COPIAS = 41; + idx_AlbaranesClienteID_ALBARAN_DEV = 42; + idx_AlbaranesClienteREFERENCIA_ALB_DEV = 43; + idx_AlbaranesClienteID_FAC_ALB_DEV = 44; + idx_AlbaranesClienteREFERENCIA_FAC_ALB_DEV = 45; { AlbaranesCliente_Detalles fields } fld_AlbaranesCliente_DetallesID = 'ID'; @@ -227,6 +235,10 @@ const fld_AlbaranesCliente_RefreshID_AGENTE = 'ID_AGENTE'; fld_AlbaranesCliente_RefreshAGENTE = 'AGENTE'; fld_AlbaranesCliente_RefreshNUM_COPIAS = 'NUM_COPIAS'; + fld_AlbaranesCliente_RefreshID_ALBARAN_DEV = 'ID_ALBARAN_DEV'; + 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'; { AlbaranesCliente_Refresh field indexes } idx_AlbaranesCliente_RefreshID = 0; @@ -271,11 +283,15 @@ const idx_AlbaranesCliente_RefreshID_AGENTE = 39; idx_AlbaranesCliente_RefreshAGENTE = 40; idx_AlbaranesCliente_RefreshNUM_COPIAS = 41; + idx_AlbaranesCliente_RefreshID_ALBARAN_DEV = 42; + idx_AlbaranesCliente_RefreshREFERENCIA_ALB_DEV = 43; + idx_AlbaranesCliente_RefreshID_FAC_ALB_DEV = 44; + idx_AlbaranesCliente_RefreshREFERENCIA_FAC_ALB_DEV = 45; type { IDarReferencia } IDarReferencia = interface(IDAStronglyTypedDataTable) - ['{569D59FB-01EC-4F5E-B15D-B32F804F2345}'] + ['{0EBA0952-DA21-4716-941F-6B43CC6545CF}'] { Property getters and setters } function GetVALORValue: String; procedure SetVALORValue(const aValue: String); @@ -304,7 +320,7 @@ type { IAlbaranesCliente } IAlbaranesCliente = interface(IDAStronglyTypedDataTable) - ['{121684CB-5C66-4812-9536-EAD43E7D4B71}'] + ['{BDCF155C-E6B4-4D9F-874B-75667EBCB8AF}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -390,6 +406,14 @@ type procedure SetAGENTEValue(const aValue: String); function GetNUM_COPIASValue: Integer; procedure SetNUM_COPIASValue(const aValue: Integer); + function GetID_ALBARAN_DEVValue: Integer; + procedure SetID_ALBARAN_DEVValue(const aValue: Integer); + function GetREFERENCIA_ALB_DEVValue: String; + procedure SetREFERENCIA_ALB_DEVValue(const aValue: String); + function GetID_FAC_ALB_DEVValue: Integer; + procedure SetID_FAC_ALB_DEVValue(const aValue: Integer); + function GetREFERENCIA_FAC_ALB_DEVValue: String; + procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); { Properties } @@ -435,6 +459,10 @@ type property ID_AGENTE: Integer read GetID_AGENTEValue write SetID_AGENTEValue; property AGENTE: String read GetAGENTEValue write SetAGENTEValue; property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue; + property ID_ALBARAN_DEV: Integer read GetID_ALBARAN_DEVValue write SetID_ALBARAN_DEVValue; + 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; end; { TAlbaranesClienteDataTableRules } @@ -526,6 +554,14 @@ type procedure SetAGENTEValue(const aValue: String); virtual; function GetNUM_COPIASValue: Integer; virtual; procedure SetNUM_COPIASValue(const aValue: Integer); virtual; + function GetID_ALBARAN_DEVValue: Integer; virtual; + procedure SetID_ALBARAN_DEVValue(const aValue: Integer); virtual; + function GetREFERENCIA_ALB_DEVValue: String; virtual; + procedure SetREFERENCIA_ALB_DEVValue(const aValue: String); virtual; + function GetID_FAC_ALB_DEVValue: Integer; virtual; + 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; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -570,6 +606,10 @@ type property ID_AGENTE: Integer read GetID_AGENTEValue write SetID_AGENTEValue; property AGENTE: String read GetAGENTEValue write SetAGENTEValue; property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue; + property ID_ALBARAN_DEV: Integer read GetID_ALBARAN_DEVValue write SetID_ALBARAN_DEVValue; + 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; public constructor Create(aDataTable: TDADataTable); override; @@ -579,7 +619,7 @@ type { IAlbaranesCliente_Detalles } IAlbaranesCliente_Detalles = interface(IDAStronglyTypedDataTable) - ['{0D42AFD8-9D02-42A7-A52E-4BD1087377C2}'] + ['{0BA1E8DD-4911-4C91-BE56-A5E014DC032E}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -692,7 +732,7 @@ type { IAlbaranesCliente_Detalles_Refresh } IAlbaranesCliente_Detalles_Refresh = interface(IDAStronglyTypedDataTable) - ['{370021CC-EFF6-465B-9577-8DD5FFB6F162}'] + ['{26DDDA1E-6A88-4840-AE9A-6B169D04C411}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -805,7 +845,7 @@ type { IAlbaranesCliente_Refresh } IAlbaranesCliente_Refresh = interface(IDAStronglyTypedDataTable) - ['{20F45447-E91C-4B75-9381-526433477CD7}'] + ['{FE5577F8-543C-4BA4-B52F-BCB1B0D1BF46}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -891,6 +931,14 @@ type procedure SetAGENTEValue(const aValue: String); function GetNUM_COPIASValue: Integer; procedure SetNUM_COPIASValue(const aValue: Integer); + function GetID_ALBARAN_DEVValue: Integer; + procedure SetID_ALBARAN_DEVValue(const aValue: Integer); + function GetREFERENCIA_ALB_DEVValue: String; + procedure SetREFERENCIA_ALB_DEVValue(const aValue: String); + function GetID_FAC_ALB_DEVValue: Integer; + procedure SetID_FAC_ALB_DEVValue(const aValue: Integer); + function GetREFERENCIA_FAC_ALB_DEVValue: String; + procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); { Properties } @@ -936,6 +984,10 @@ type property ID_AGENTE: Integer read GetID_AGENTEValue write SetID_AGENTEValue; property AGENTE: String read GetAGENTEValue write SetAGENTEValue; property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue; + property ID_ALBARAN_DEV: Integer read GetID_ALBARAN_DEVValue write SetID_ALBARAN_DEVValue; + 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; end; { TAlbaranesCliente_RefreshDataTableRules } @@ -1027,6 +1079,14 @@ type procedure SetAGENTEValue(const aValue: String); virtual; function GetNUM_COPIASValue: Integer; virtual; procedure SetNUM_COPIASValue(const aValue: Integer); virtual; + function GetID_ALBARAN_DEVValue: Integer; virtual; + procedure SetID_ALBARAN_DEVValue(const aValue: Integer); virtual; + function GetREFERENCIA_ALB_DEVValue: String; virtual; + procedure SetREFERENCIA_ALB_DEVValue(const aValue: String); virtual; + function GetID_FAC_ALB_DEVValue: Integer; virtual; + 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; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -1071,6 +1131,10 @@ type property ID_AGENTE: Integer read GetID_AGENTEValue write SetID_AGENTEValue; property AGENTE: String read GetAGENTEValue write SetAGENTEValue; property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue; + property ID_ALBARAN_DEV: Integer read GetID_ALBARAN_DEVValue write SetID_ALBARAN_DEVValue; + 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; public constructor Create(aDataTable: TDADataTable); override; @@ -1537,6 +1601,46 @@ begin DataTable.Fields[idx_AlbaranesClienteNUM_COPIAS].AsInteger := aValue; end; +function TAlbaranesClienteDataTableRules.GetID_ALBARAN_DEVValue: Integer; +begin + result := DataTable.Fields[idx_AlbaranesClienteID_ALBARAN_DEV].AsInteger; +end; + +procedure TAlbaranesClienteDataTableRules.SetID_ALBARAN_DEVValue(const aValue: Integer); +begin + DataTable.Fields[idx_AlbaranesClienteID_ALBARAN_DEV].AsInteger := aValue; +end; + +function TAlbaranesClienteDataTableRules.GetREFERENCIA_ALB_DEVValue: String; +begin + result := DataTable.Fields[idx_AlbaranesClienteREFERENCIA_ALB_DEV].AsString; +end; + +procedure TAlbaranesClienteDataTableRules.SetREFERENCIA_ALB_DEVValue(const aValue: String); +begin + DataTable.Fields[idx_AlbaranesClienteREFERENCIA_ALB_DEV].AsString := aValue; +end; + +function TAlbaranesClienteDataTableRules.GetID_FAC_ALB_DEVValue: Integer; +begin + result := DataTable.Fields[idx_AlbaranesClienteID_FAC_ALB_DEV].AsInteger; +end; + +procedure TAlbaranesClienteDataTableRules.SetID_FAC_ALB_DEVValue(const aValue: Integer); +begin + DataTable.Fields[idx_AlbaranesClienteID_FAC_ALB_DEV].AsInteger := aValue; +end; + +function TAlbaranesClienteDataTableRules.GetREFERENCIA_FAC_ALB_DEVValue: String; +begin + result := DataTable.Fields[idx_AlbaranesClienteREFERENCIA_FAC_ALB_DEV].AsString; +end; + +procedure TAlbaranesClienteDataTableRules.SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); +begin + DataTable.Fields[idx_AlbaranesClienteREFERENCIA_FAC_ALB_DEV].AsString := aValue; +end; + { TAlbaranesCliente_DetallesDataTableRules } constructor TAlbaranesCliente_DetallesDataTableRules.Create(aDataTable: TDADataTable); @@ -2295,6 +2399,46 @@ begin DataTable.Fields[idx_AlbaranesCliente_RefreshNUM_COPIAS].AsInteger := aValue; end; +function TAlbaranesCliente_RefreshDataTableRules.GetID_ALBARAN_DEVValue: Integer; +begin + result := DataTable.Fields[idx_AlbaranesCliente_RefreshID_ALBARAN_DEV].AsInteger; +end; + +procedure TAlbaranesCliente_RefreshDataTableRules.SetID_ALBARAN_DEVValue(const aValue: Integer); +begin + DataTable.Fields[idx_AlbaranesCliente_RefreshID_ALBARAN_DEV].AsInteger := aValue; +end; + +function TAlbaranesCliente_RefreshDataTableRules.GetREFERENCIA_ALB_DEVValue: String; +begin + result := DataTable.Fields[idx_AlbaranesCliente_RefreshREFERENCIA_ALB_DEV].AsString; +end; + +procedure TAlbaranesCliente_RefreshDataTableRules.SetREFERENCIA_ALB_DEVValue(const aValue: String); +begin + DataTable.Fields[idx_AlbaranesCliente_RefreshREFERENCIA_ALB_DEV].AsString := aValue; +end; + +function TAlbaranesCliente_RefreshDataTableRules.GetID_FAC_ALB_DEVValue: Integer; +begin + result := DataTable.Fields[idx_AlbaranesCliente_RefreshID_FAC_ALB_DEV].AsInteger; +end; + +procedure TAlbaranesCliente_RefreshDataTableRules.SetID_FAC_ALB_DEVValue(const aValue: Integer); +begin + DataTable.Fields[idx_AlbaranesCliente_RefreshID_FAC_ALB_DEV].AsInteger := aValue; +end; + +function TAlbaranesCliente_RefreshDataTableRules.GetREFERENCIA_FAC_ALB_DEVValue: String; +begin + result := DataTable.Fields[idx_AlbaranesCliente_RefreshREFERENCIA_FAC_ALB_DEV].AsString; +end; + +procedure TAlbaranesCliente_RefreshDataTableRules.SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); +begin + DataTable.Fields[idx_AlbaranesCliente_RefreshREFERENCIA_FAC_ALB_DEV].AsString := aValue; +end; + initialization RegisterDataTableRules(RID_DarReferencia, TDarReferenciaDataTableRules); diff --git a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas index 886cd159..4fc2ee70 100644 --- a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas +++ b/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 = '{BB048978-E82B-4CB5-9C1D-7107E5F17BB1}'; - RID_AlbaranesClienteDelta = '{D5AF214C-6088-4F9D-B3AD-31F0331285DE}'; - RID_AlbaranesCliente_DetallesDelta = '{2BB9CAA9-9328-4A65-BE4C-B06D2B48303A}'; - RID_AlbaranesCliente_Detalles_RefreshDelta = '{E0DD7094-E6BE-4AB9-B6F6-DD1989A64904}'; - RID_AlbaranesCliente_RefreshDelta = '{036CCB6F-FFF2-4369-8F75-FE0D068481B6}'; + RID_DarReferenciaDelta = '{686A4397-FE20-45D3-9CED-8AF55D9542EB}'; + RID_AlbaranesClienteDelta = '{51F248ED-D277-4C06-BAC6-810A28646B1B}'; + RID_AlbaranesCliente_DetallesDelta = '{CC2B288D-936A-40AC-8691-DC28A6515213}'; + RID_AlbaranesCliente_Detalles_RefreshDelta = '{8D8BE999-438B-4A1F-9BFE-D9215AFFE426}'; + RID_AlbaranesCliente_RefreshDelta = '{EF94943F-4DE8-49C6-920D-635E8E5783DD}'; type { IDarReferenciaDelta } IDarReferenciaDelta = interface(IDarReferencia) - ['{BB048978-E82B-4CB5-9C1D-7107E5F17BB1}'] + ['{686A4397-FE20-45D3-9CED-8AF55D9542EB}'] { Property getters and setters } function GetOldVALORValue : String; @@ -47,7 +47,7 @@ type { IAlbaranesClienteDelta } IAlbaranesClienteDelta = interface(IAlbaranesCliente) - ['{D5AF214C-6088-4F9D-B3AD-31F0331285DE}'] + ['{51F248ED-D277-4C06-BAC6-810A28646B1B}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -91,6 +91,10 @@ type function GetOldID_AGENTEValue : Integer; function GetOldAGENTEValue : String; function GetOldNUM_COPIASValue : Integer; + function GetOldID_ALBARAN_DEVValue : Integer; + function GetOldREFERENCIA_ALB_DEVValue : String; + function GetOldID_FAC_ALB_DEVValue : Integer; + function GetOldREFERENCIA_FAC_ALB_DEVValue : String; { Properties } property OldID : Integer read GetOldIDValue; @@ -135,6 +139,10 @@ type property OldID_AGENTE : Integer read GetOldID_AGENTEValue; property OldAGENTE : String read GetOldAGENTEValue; property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue; + property OldID_ALBARAN_DEV : Integer read GetOldID_ALBARAN_DEVValue; + 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; end; { TAlbaranesClienteBusinessProcessorRules } @@ -268,6 +276,18 @@ type function GetNUM_COPIASValue: Integer; virtual; function GetOldNUM_COPIASValue: Integer; virtual; procedure SetNUM_COPIASValue(const aValue: Integer); virtual; + function GetID_ALBARAN_DEVValue: Integer; virtual; + function GetOldID_ALBARAN_DEVValue: Integer; virtual; + procedure SetID_ALBARAN_DEVValue(const aValue: Integer); virtual; + function GetREFERENCIA_ALB_DEVValue: String; virtual; + function GetOldREFERENCIA_ALB_DEVValue: String; virtual; + procedure SetREFERENCIA_ALB_DEVValue(const aValue: String); virtual; + function GetID_FAC_ALB_DEVValue: Integer; virtual; + function GetOldID_FAC_ALB_DEVValue: Integer; virtual; + procedure SetID_FAC_ALB_DEVValue(const aValue: Integer); virtual; + function GetREFERENCIA_FAC_ALB_DEVValue: String; virtual; + function GetOldREFERENCIA_FAC_ALB_DEVValue: String; virtual; + procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -354,6 +374,14 @@ type property OldAGENTE : String read GetOldAGENTEValue; property NUM_COPIAS : Integer read GetNUM_COPIASValue write SetNUM_COPIASValue; property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue; + property ID_ALBARAN_DEV : Integer read GetID_ALBARAN_DEVValue write SetID_ALBARAN_DEVValue; + property OldID_ALBARAN_DEV : Integer read GetOldID_ALBARAN_DEVValue; + property REFERENCIA_ALB_DEV : String read GetREFERENCIA_ALB_DEVValue write SetREFERENCIA_ALB_DEVValue; + property OldREFERENCIA_ALB_DEV : String read GetOldREFERENCIA_ALB_DEVValue; + property ID_FAC_ALB_DEV : Integer read GetID_FAC_ALB_DEVValue write SetID_FAC_ALB_DEVValue; + 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; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -363,7 +391,7 @@ type { IAlbaranesCliente_DetallesDelta } IAlbaranesCliente_DetallesDelta = interface(IAlbaranesCliente_Detalles) - ['{2BB9CAA9-9328-4A65-BE4C-B06D2B48303A}'] + ['{CC2B288D-936A-40AC-8691-DC28A6515213}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_ALBARANValue : Integer; @@ -490,7 +518,7 @@ type { IAlbaranesCliente_Detalles_RefreshDelta } IAlbaranesCliente_Detalles_RefreshDelta = interface(IAlbaranesCliente_Detalles_Refresh) - ['{E0DD7094-E6BE-4AB9-B6F6-DD1989A64904}'] + ['{8D8BE999-438B-4A1F-9BFE-D9215AFFE426}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_ALBARANValue : Integer; @@ -617,7 +645,7 @@ type { IAlbaranesCliente_RefreshDelta } IAlbaranesCliente_RefreshDelta = interface(IAlbaranesCliente_Refresh) - ['{036CCB6F-FFF2-4369-8F75-FE0D068481B6}'] + ['{EF94943F-4DE8-49C6-920D-635E8E5783DD}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -661,6 +689,10 @@ type function GetOldID_AGENTEValue : Integer; function GetOldAGENTEValue : String; function GetOldNUM_COPIASValue : Integer; + function GetOldID_ALBARAN_DEVValue : Integer; + function GetOldREFERENCIA_ALB_DEVValue : String; + function GetOldID_FAC_ALB_DEVValue : Integer; + function GetOldREFERENCIA_FAC_ALB_DEVValue : String; { Properties } property OldID : Integer read GetOldIDValue; @@ -705,6 +737,10 @@ type property OldID_AGENTE : Integer read GetOldID_AGENTEValue; property OldAGENTE : String read GetOldAGENTEValue; property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue; + property OldID_ALBARAN_DEV : Integer read GetOldID_ALBARAN_DEVValue; + 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; end; { TAlbaranesCliente_RefreshBusinessProcessorRules } @@ -838,6 +874,18 @@ type function GetNUM_COPIASValue: Integer; virtual; function GetOldNUM_COPIASValue: Integer; virtual; procedure SetNUM_COPIASValue(const aValue: Integer); virtual; + function GetID_ALBARAN_DEVValue: Integer; virtual; + function GetOldID_ALBARAN_DEVValue: Integer; virtual; + procedure SetID_ALBARAN_DEVValue(const aValue: Integer); virtual; + function GetREFERENCIA_ALB_DEVValue: String; virtual; + function GetOldREFERENCIA_ALB_DEVValue: String; virtual; + procedure SetREFERENCIA_ALB_DEVValue(const aValue: String); virtual; + function GetID_FAC_ALB_DEVValue: Integer; virtual; + function GetOldID_FAC_ALB_DEVValue: Integer; virtual; + procedure SetID_FAC_ALB_DEVValue(const aValue: Integer); virtual; + function GetREFERENCIA_FAC_ALB_DEVValue: String; virtual; + function GetOldREFERENCIA_FAC_ALB_DEVValue: String; virtual; + procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -924,6 +972,14 @@ type property OldAGENTE : String read GetOldAGENTEValue; property NUM_COPIAS : Integer read GetNUM_COPIASValue write SetNUM_COPIASValue; property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue; + property ID_ALBARAN_DEV : Integer read GetID_ALBARAN_DEVValue write SetID_ALBARAN_DEVValue; + property OldID_ALBARAN_DEV : Integer read GetOldID_ALBARAN_DEVValue; + property REFERENCIA_ALB_DEV : String read GetREFERENCIA_ALB_DEVValue write SetREFERENCIA_ALB_DEVValue; + property OldREFERENCIA_ALB_DEV : String read GetOldREFERENCIA_ALB_DEVValue; + property ID_FAC_ALB_DEV : Integer read GetID_FAC_ALB_DEVValue write SetID_FAC_ALB_DEVValue; + 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; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -1608,6 +1664,66 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteNUM_COPIAS] := aValue; end; +function TAlbaranesClienteBusinessProcessorRules.GetID_ALBARAN_DEVValue: Integer; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteID_ALBARAN_DEV]; +end; + +function TAlbaranesClienteBusinessProcessorRules.GetOldID_ALBARAN_DEVValue: Integer; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesClienteID_ALBARAN_DEV]; +end; + +procedure TAlbaranesClienteBusinessProcessorRules.SetID_ALBARAN_DEVValue(const aValue: Integer); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteID_ALBARAN_DEV] := aValue; +end; + +function TAlbaranesClienteBusinessProcessorRules.GetREFERENCIA_ALB_DEVValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteREFERENCIA_ALB_DEV]; +end; + +function TAlbaranesClienteBusinessProcessorRules.GetOldREFERENCIA_ALB_DEVValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesClienteREFERENCIA_ALB_DEV]; +end; + +procedure TAlbaranesClienteBusinessProcessorRules.SetREFERENCIA_ALB_DEVValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteREFERENCIA_ALB_DEV] := aValue; +end; + +function TAlbaranesClienteBusinessProcessorRules.GetID_FAC_ALB_DEVValue: Integer; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteID_FAC_ALB_DEV]; +end; + +function TAlbaranesClienteBusinessProcessorRules.GetOldID_FAC_ALB_DEVValue: Integer; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesClienteID_FAC_ALB_DEV]; +end; + +procedure TAlbaranesClienteBusinessProcessorRules.SetID_FAC_ALB_DEVValue(const aValue: Integer); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteID_FAC_ALB_DEV] := aValue; +end; + +function TAlbaranesClienteBusinessProcessorRules.GetREFERENCIA_FAC_ALB_DEVValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteREFERENCIA_FAC_ALB_DEV]; +end; + +function TAlbaranesClienteBusinessProcessorRules.GetOldREFERENCIA_FAC_ALB_DEVValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesClienteREFERENCIA_FAC_ALB_DEV]; +end; + +procedure TAlbaranesClienteBusinessProcessorRules.SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteREFERENCIA_FAC_ALB_DEV] := aValue; +end; + { TAlbaranesCliente_DetallesBusinessProcessorRules } constructor TAlbaranesCliente_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); @@ -2728,6 +2844,66 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesCliente_RefreshNUM_COPIAS] := aValue; end; +function TAlbaranesCliente_RefreshBusinessProcessorRules.GetID_ALBARAN_DEVValue: Integer; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesCliente_RefreshID_ALBARAN_DEV]; +end; + +function TAlbaranesCliente_RefreshBusinessProcessorRules.GetOldID_ALBARAN_DEVValue: Integer; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesCliente_RefreshID_ALBARAN_DEV]; +end; + +procedure TAlbaranesCliente_RefreshBusinessProcessorRules.SetID_ALBARAN_DEVValue(const aValue: Integer); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesCliente_RefreshID_ALBARAN_DEV] := aValue; +end; + +function TAlbaranesCliente_RefreshBusinessProcessorRules.GetREFERENCIA_ALB_DEVValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesCliente_RefreshREFERENCIA_ALB_DEV]; +end; + +function TAlbaranesCliente_RefreshBusinessProcessorRules.GetOldREFERENCIA_ALB_DEVValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesCliente_RefreshREFERENCIA_ALB_DEV]; +end; + +procedure TAlbaranesCliente_RefreshBusinessProcessorRules.SetREFERENCIA_ALB_DEVValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesCliente_RefreshREFERENCIA_ALB_DEV] := aValue; +end; + +function TAlbaranesCliente_RefreshBusinessProcessorRules.GetID_FAC_ALB_DEVValue: Integer; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesCliente_RefreshID_FAC_ALB_DEV]; +end; + +function TAlbaranesCliente_RefreshBusinessProcessorRules.GetOldID_FAC_ALB_DEVValue: Integer; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesCliente_RefreshID_FAC_ALB_DEV]; +end; + +procedure TAlbaranesCliente_RefreshBusinessProcessorRules.SetID_FAC_ALB_DEVValue(const aValue: Integer); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesCliente_RefreshID_FAC_ALB_DEV] := aValue; +end; + +function TAlbaranesCliente_RefreshBusinessProcessorRules.GetREFERENCIA_FAC_ALB_DEVValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesCliente_RefreshREFERENCIA_FAC_ALB_DEV]; +end; + +function TAlbaranesCliente_RefreshBusinessProcessorRules.GetOldREFERENCIA_FAC_ALB_DEVValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesCliente_RefreshREFERENCIA_FAC_ALB_DEV]; +end; + +procedure TAlbaranesCliente_RefreshBusinessProcessorRules.SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesCliente_RefreshREFERENCIA_FAC_ALB_DEV] := aValue; +end; + initialization RegisterBusinessProcessorRules(RID_DarReferenciaDelta, TDarReferenciaBusinessProcessorRules); diff --git a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm index 3753f75a..522a8dbf 100644 --- a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm +++ b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm @@ -79,7 +79,8 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente 'TOTAL, OBSERVACIONES, '#10' INCIDENCIAS, INCIDENCIAS_ACTIVAS, FEC' + 'HA_ALTA,'#10' FECHA_MODIFICACION, USUARIO, ID_FORMA_PAGO, FECHA_P' + 'REVISTA_ENVIO, FECHA_ENVIO,'#10' FECHA_RECEPCION, ID_AGENTE, AGEN' + - 'TE, NUM_COPIAS'#10' FROM'#10' V_ALBARANES_CLIENTE' + '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' StatementType = stSQL ColumnMappings = < item @@ -249,6 +250,22 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente 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> end> Name = 'AlbaranesCliente' @@ -683,8 +700,49 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente Name = 'NUM_COPIAS' DataType = datInteger BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify + DictionaryEntry = 'AlbaranesCliente_NUM_COPIAS' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'ID_ALBARAN_DEV' + DataType = datInteger + BlobType = dabtUnknown + DictionaryEntry = 'AlbaranesCliente_ID_ALBARAN_DEV' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'REFERENCIA_ALB_DEV' + DataType = datString + Size = 255 + BlobType = dabtUnknown + DictionaryEntry = 'AlbaranesCliente_REFERENCIA_ALB_DEV' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'ID_FAC_ALB_DEV' + DataType = datInteger + BlobType = dabtUnknown + DictionaryEntry = 'AlbaranesCliente_ID_FAC_ALB_DEV' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'REFERENCIA_FAC_ALB_DEV' + DataType = datString + Size = 255 + BlobType = dabtUnknown + DictionaryEntry = 'AlbaranesCliente_REFERENCIA_FAC_ALB_DEV' InPrimaryKey = False Calculated = False Lookup = False @@ -1216,8 +1274,9 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente 'TOTAL, OBSERVACIONES, '#10' INCIDENCIAS, INCIDENCIAS_ACTIVAS, FEC' + 'HA_ALTA,'#10' FECHA_MODIFICACION, USUARIO, ID_FORMA_PAGO, FECHA_P' + 'REVISTA_ENVIO, FECHA_ENVIO,'#10' FECHA_RECEPCION, ID_AGENTE, AGEN' + - 'TE, NUM_COPIAS'#10' FROM'#10' V_ALBARANES_CLIENTE'#10' WHERE V_ALBARANE' + - 'S_CLIENTE.ID = :ID' + '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' ' + + 'WHERE V_ALBARANES_CLIENTE.ID = :ID' StatementType = stSQL ColumnMappings = < item @@ -1387,6 +1446,22 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente 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> end> Name = 'AlbaranesCliente_Refresh' @@ -1830,6 +1905,50 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente Calculated = False Lookup = False LookupCache = False + end + item + Name = 'ID_ALBARAN_DEV' + DataType = datInteger + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'REFERENCIA_ALB_DEV' + DataType = datString + Size = 255 + BlobType = dabtUnknown + DictionaryEntry = 'AlbaranesCliente_REFERENCIA_ALB_DEV' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'ID_FAC_ALB_DEV' + DataType = datInteger + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'REFERENCIA_FAC_ALB_DEV' + DataType = datString + Size = 255 + BlobType = dabtUnknown + DictionaryEntry = 'AlbaranesCliente_REFERENCIA_FAC_ALB_DEV' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False end> BusinessRulesClient.ScriptLanguage = rslPascalScript BusinessRulesServer.ScriptLanguage = rslPascalScript @@ -2409,6 +2528,13 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente BlobType = dabtUnknown Value = '' ParamType = daptInput + end + item + Name = 'ID_ALBARAN_DEV' + DataType = datInteger + BlobType = dabtUnknown + Value = '' + ParamType = daptInput end> Statements = < item @@ -2423,15 +2549,16 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente ' IMPORTE_IVA, IMPORTE_TOTAL, '#10' OBSERVACIONES, INCIDENCIAS, I' + 'NCIDENCIAS_ACTIVAS, FECHA_ALTA, '#10' FECHA_MODIFICACION, USUARI' + 'O, ID_FORMA_PAGO,'#10' FECHA_PREVISTA_ENVIO, FECHA_ENVIO, FECHA_' + - 'RECEPCION, TIPO)'#10' VALUES'#10' (:ID, :ID_EMPRESA, :ID_CLIENTE, :R' + - 'EFERENCIA, :REFERENCIA_CLIENTE,'#10' :FECHA_ALBARAN, :ID_PEDIDO,' + - ' :ID_ALMACEN, :ID_FACTURA, :CALLE,'#10' :CODIGO_POSTAL, :POBLACI' + - 'ON, :PROVINCIA, :PERSONA_CONTACTO, '#10' :TELEFONO, :BASE_IMPONI' + - 'BLE, :IMPORTE_NETO, :IMPORTE_PORTE, '#10' :DESCUENTO, :IMPORTE_D' + - 'ESCUENTO, :IVA, :IMPORTE_IVA, '#10' :IMPORTE_TOTAL, :OBSERVACION' + - 'ES, :INCIDENCIAS, :INCIDENCIAS_ACTIVAS, '#10' :FECHA_ALTA, :FECH' + - 'A_MODIFICACION, :USUARIO,'#10' :ID_FORMA_PAGO, :FECHA_PREVISTA_E' + - 'NVIO, :FECHA_ENVIO, :FECHA_RECEPCION, :TIPO)' + 'RECEPCION, TIPO, ID_ALBARAN_DEV)'#10' VALUES'#10' (:ID, :ID_EMPRESA,' + + ' :ID_CLIENTE, :REFERENCIA, :REFERENCIA_CLIENTE,'#10' :FECHA_ALBA' + + 'RAN, :ID_PEDIDO, :ID_ALMACEN, :ID_FACTURA, :CALLE,'#10' :CODIGO_' + + 'POSTAL, :POBLACION, :PROVINCIA, :PERSONA_CONTACTO, '#10' :TELEFO' + + 'NO, :BASE_IMPONIBLE, :IMPORTE_NETO, :IMPORTE_PORTE, '#10' :DESCU' + + 'ENTO, :IMPORTE_DESCUENTO, :IVA, :IMPORTE_IVA, '#10' :IMPORTE_TOT' + + 'AL, :OBSERVACIONES, :INCIDENCIAS, :INCIDENCIAS_ACTIVAS, '#10' :F' + + 'ECHA_ALTA, :FECHA_MODIFICACION, :USUARIO,'#10' :ID_FORMA_PAGO, :' + + 'FECHA_PREVISTA_ENVIO, :FECHA_ENVIO, :FECHA_RECEPCION, :TIPO, :ID' + + '_ALBARAN_DEV)' StatementType = stSQL ColumnMappings = <> end> @@ -2680,6 +2807,13 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente Value = '' ParamType = daptInput end + item + Name = 'ID_ALBARAN_DEV' + DataType = datInteger + BlobType = dabtUnknown + Value = '' + ParamType = daptInput + end item Name = 'OLD_ID' DataType = datInteger @@ -2710,7 +2844,8 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente 'ARIO = :USUARIO, '#10' ID_FORMA_PAGO = :ID_FORMA_PAGO,'#10' FECHA_' + 'PREVISTA_ENVIO = :FECHA_PREVISTA_ENVIO,'#10' FECHA_ENVIO = :FECHA' + '_ENVIO, '#10' FECHA_RECEPCION = :FECHA_RECEPCION,'#10' TIPO = :TIP' + - 'O'#10' WHERE'#10' (ID = :OLD_ID)' + 'O,'#10' ID_ALBARAN_DEV = :ID_ALBARAN_DEV'#10' WHERE'#10' (ID = :OLD_I' + + 'D)' StatementType = stSQL ColumnMappings = <> end> @@ -3301,6 +3436,45 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente DisplayWidth = 0 DisplayLabel = 'Agente' Alignment = taLeftJustify + end + item + Name = 'AlbaranesCliente_NUM_COPIAS' + DataType = datInteger + BlobType = dabtUnknown + DisplayWidth = 0 + DisplayLabel = 'NUM_COPIAS' + Alignment = taLeftJustify + end + item + Name = 'AlbaranesCliente_ID_ALBARAN_DEV' + DataType = datInteger + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + end + item + Name = 'AlbaranesCliente_REFERENCIA_ALB_DEV' + DataType = datString + Size = 255 + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + end + item + Name = 'AlbaranesCliente_ID_FAC_ALB_DEV' + DataType = datInteger + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + end + item + Name = 'AlbaranesCliente_REFERENCIA_FAC_ALB_DEV' + DataType = datString + Size = 255 + BlobType = dabtUnknown + DisplayWidth = 0 + DisplayLabel = 'Ref. factura alb. dev.' + Alignment = taLeftJustify end> Left = 48 Top = 152 diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm index 0be6dadb..cf5c4550 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm @@ -181,42 +181,6 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente inherited ToolBar1: TToolBar Width = 757 ExplicitWidth = 757 - inherited UpDown1: TUpDown - Left = 236 - ExplicitLeft = 236 - end - inherited ToolButton13: TToolButton - Left = 253 - ExplicitLeft = 253 - end - inherited ToolButton6: TToolButton - Left = 261 - ExplicitLeft = 261 - end - inherited ToolButton7: TToolButton - Left = 295 - ExplicitLeft = 295 - end - inherited ToolButton8: TToolButton - Left = 329 - ExplicitLeft = 329 - end - inherited ToolButton12: TToolButton - Left = 363 - ExplicitLeft = 363 - end - inherited ToolButton9: TToolButton - Left = 371 - ExplicitLeft = 371 - end - inherited ToolButton10: TToolButton - Left = 405 - ExplicitLeft = 405 - end - inherited ToolButton11: TToolButton - Left = 439 - ExplicitLeft = 439 - end end inherited cxGrid: TcxGrid Width = 757 @@ -236,6 +200,10 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente object pagInicidencias: TTabSheet Caption = 'Incidencias' ImageIndex = 2 + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 inline frViewIncidenciasCli: TfrViewIncidencias Left = 0 Top = 0 diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas index a19403db..e72f888a 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas @@ -342,7 +342,7 @@ begin if Assigned(FController) then begin - ViewAlbaran.ViewClienteAlbaran.Controller := Controller.ClienteController; + ViewAlbaran.Controller := Controller; frViewDetallesAlbaranCliente1.Controller := Controller.DetallesController; end; end; diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.dfm index 1b7fa4b6..348589b7 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.dfm @@ -1,16 +1,17 @@ inherited fEditorAlbaranesCliente: TfEditorAlbaranesCliente Caption = 'Lista de albaranes de cliente' - ClientWidth = 583 - ExplicitWidth = 591 - ExplicitHeight = 240 + ClientHeight = 449 + ClientWidth = 855 + ExplicitWidth = 863 + ExplicitHeight = 476 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 583 + Width = 855 Caption = 'Lista de albaranes de cliente' ExplicitWidth = 583 inherited Image1: TImage - Left = 556 + Left = 828 Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0000180806000000E0773DF80000000970485973000017120000171201679FD2 @@ -122,19 +123,19 @@ inherited fEditorAlbaranesCliente: TfEditorAlbaranesCliente end end inherited TBXDock: TTBXDock - Width = 583 + Width = 855 ExplicitWidth = 583 inherited tbxMain: TTBXToolbar - ExplicitWidth = 583 + ExplicitWidth = 638 object TBXSeparatorItem17: TTBXSeparatorItem [10] end end inherited tbxMenu: TTBXToolbar - ExplicitWidth = 583 + ExplicitWidth = 855 end inherited TBXTMain2: TTBXToolbar Visible = True - ExplicitWidth = 242 + ExplicitWidth = 514 object TBXItem42: TTBXItem Action = actEnviar DisplayMode = nbdmImageAndText @@ -145,6 +146,10 @@ inherited fEditorAlbaranesCliente: TfEditorAlbaranesCliente end object TBXSeparatorItem18: TTBXSeparatorItem end + object TBXItem39: TTBXItem + Action = actGenerarOrden + DisplayMode = nbdmImageAndText + end object TBXItem44: TTBXItem Action = actConfirmarRecepcion DisplayMode = nbdmImageAndText @@ -162,7 +167,8 @@ inherited fEditorAlbaranesCliente: TfEditorAlbaranesCliente end end inherited StatusBar: TJvStatusBar - Width = 583 + Top = 430 + Width = 855 ExplicitWidth = 583 end inherited EditorActionList: TActionList @@ -213,6 +219,12 @@ inherited fEditorAlbaranesCliente: TfEditorAlbaranesCliente OnExecute = actGenerarEtiquetasExecute OnUpdate = actGenerarEtiquetasUpdate end + object actGenerarOrden: TAction + Category = 'Acciones' + Caption = 'Generar orden dev.' + ImageIndex = 23 + OnExecute = actGenerarOrdenExecute + end end inherited SmallImages: TPngImageList PngImages = < diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas index 3195aaf9..986323cc 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas @@ -36,6 +36,8 @@ type actGenerarEtiquetas: TAction; TBXItem38: TTBXItem; JsListaAlbaranesNoEliminados: TJSDialog; + actGenerarOrden: TAction; + TBXItem39: TTBXItem; procedure FormShow(Sender: TObject); procedure actGenerarFacturaUpdate(Sender: TObject); procedure actGenerarFacturaExecute(Sender: TObject); @@ -48,6 +50,7 @@ type procedure actConfirmarRecepcionUpdate(Sender: TObject); procedure actGenerarEtiquetasExecute(Sender: TObject); procedure actGenerarEtiquetasUpdate(Sender: TObject); + procedure actGenerarOrdenExecute(Sender: TObject); protected FAlbaranes: IBizAlbaranCliente; @@ -187,6 +190,12 @@ begin and ViewGrid.esSeleccionCeldaDatos; end; +procedure TfEditorAlbaranesCliente.actGenerarOrdenExecute(Sender: TObject); +begin + inherited; + FController.GenerarOrdenDev(Albaranes); +end; + procedure TfEditorAlbaranesCliente.actEnviarExecute(Sender: TObject); var AInventarioController : IInventarioController; @@ -274,12 +283,12 @@ end; procedure TfEditorAlbaranesCliente.DuplicarInterno; var - APedido : IBizAlbaranCliente; + AAlbaran : IBizAlbaranCliente; begin inherited; - APedido := FController.Duplicar(Albaranes); + AAlbaran := FController.Duplicar(Albaranes); try - FController.Ver(APedido); + FController.Ver(AAlbaran); finally actRefrescar.Execute; end; diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.dfm index 3df1adaf..e4bf7117 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.dfm @@ -1,6 +1,5 @@ inherited fEditorAlbaranesDevCliente: TfEditorAlbaranesDevCliente Caption = 'Lista de '#243'rdenes de devoluci'#243'n a cliente' - ExplicitHeight = 478 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -149,6 +148,10 @@ inherited fEditorAlbaranesDevCliente: TfEditorAlbaranesDevCliente Enabled = False Visible = False end + inherited actGenerarOrden: TAction + Enabled = False + Visible = False + end end inherited SmallImages: TPngImageList PngImages = < diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm index 1b7177a7..5f1aa90f 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm @@ -13,6 +13,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Align = alClient ParentBackground = True TabOrder = 0 + TabStop = False AutoContentSizes = [acsWidth, acsHeight] DesignSize = ( 822 @@ -51,10 +52,10 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 2 - Width = 119 + Width = 301 end object memObservaciones: TcxDBMemo - Left = 440 + Left = 447 Top = 387 Anchors = [akLeft, akTop, akRight, akBottom] DataBinding.DataField = 'OBSERVACIONES' @@ -68,8 +69,8 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True TabOrder = 21 - Height = 253 - Width = 186 + Height = 141 + Width = 353 end object eReferencia: TcxDBTextEdit Left = 116 @@ -95,12 +96,12 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 0 - Width = 143 + Width = 301 end inline frViewClienteAlbaran: TfrViewDatosYSeleccionCliente - Left = 440 + Left = 447 Top = 28 - Width = 350 + Width = 353 Height = 212 Align = alTop AutoSize = True @@ -112,37 +113,40 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente ParentFont = False TabOrder = 17 ReadOnly = False - ExplicitLeft = 440 + ExplicitLeft = 447 ExplicitTop = 28 + ExplicitWidth = 353 inherited dxLayoutControl1: TdxLayoutControl + Width = 353 Align = alTop + ExplicitWidth = 353 inherited edtlNombre: TcxDBTextEdit - ExplicitWidth = 224 - Width = 224 + ExplicitWidth = 279 + Width = 279 end inherited edtNIFCIF: TcxDBTextEdit - ExplicitWidth = 562 - Width = 562 + ExplicitWidth = 279 + Width = 279 end inherited edtCalle: TcxDBTextEdit - ExplicitWidth = 562 - Width = 562 + ExplicitWidth = 279 + Width = 279 end inherited edtPoblacion: TcxDBTextEdit - ExplicitWidth = 177 - Width = 177 + ExplicitWidth = 161 + Width = 161 end inherited edtProvincia: TcxDBTextEdit - ExplicitWidth = 327 - Width = 327 + ExplicitWidth = 279 + Width = 279 end inherited edtCodigoPostal: TcxDBTextEdit - Left = 268 - ExplicitLeft = 268 + Left = 261 + ExplicitLeft = 261 end inherited Button3: TBitBtn - Left = 158 - ExplicitLeft = 158 + Left = 151 + ExplicitLeft = 151 end end inherited DADataSource: TDADataSource @@ -179,7 +183,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 8 - Width = 263 + Width = 301 end object ePoblacion: TcxDBTextEdit Left = 116 @@ -198,10 +202,10 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 9 - Width = 162 + Width = 200 end object eCodigoPostal: TcxDBTextEdit - Left = 345 + Left = 352 Top = 251 DataBinding.DataField = 'CODIGO_POSTAL' DataBinding.DataSource = DADataSource @@ -236,7 +240,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 11 - Width = 263 + Width = 301 end object ePersonaContacto: TcxDBTextEdit Left = 116 @@ -256,7 +260,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 12 - Width = 84 + Width = 301 end object eTlfTrabajo: TcxDBTextEdit Left = 116 @@ -275,10 +279,10 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 13 - Width = 122 + Width = 301 end object bElegirDireccion: TBitBtn - Left = 238 + Left = 245 Top = 359 Width = 172 Height = 23 @@ -287,7 +291,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente TabOrder = 14 end object Button1: TButton - Left = 278 + Left = 285 Top = 138 Width = 132 Height = 23 @@ -315,7 +319,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 5 - Width = 16 + Width = 163 end object cbFormaPago: TcxDBLookupComboBox Left = 116 @@ -344,10 +348,10 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 3 - Width = 32 + Width = 163 end object bFormasPago: TButton - Left = 278 + Left = 285 Top = 109 Width = 132 Height = 23 @@ -356,7 +360,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente OnClick = bFormasPagoClick end object eFechaRecepcion: TcxDBDateEdit - Left = 574 + Left = 581 Top = 330 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_RECEPCION' @@ -378,7 +382,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 20 - Width = 123 + Width = 219 end object cbConAlmacen: TCheckBox Left = 32 @@ -416,7 +420,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 16 - Width = 69 + Width = 200 end object eRefFacturaCli: TcxDBTextEdit Left = 116 @@ -442,10 +446,10 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 7 - Width = 207 + Width = 301 end object eFechaPrevista: TcxDBDateEdit - Left = 574 + Left = 581 Top = 276 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_PREVISTA_ENVIO' @@ -469,7 +473,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 18 - Width = 122 + Width = 219 end object eRefCliente: TcxDBTextEdit Left = 116 @@ -494,10 +498,10 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 1 - Width = 284 + Width = 301 end object eFechaEnvio: TcxDBDateEdit - Left = 574 + Left = 581 Top = 303 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_ENVIO' @@ -519,7 +523,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 19 - Width = 217 + Width = 219 end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas index 226f53fe..9fd5b226 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas @@ -12,7 +12,7 @@ uses cxTextEdit, cxMaskEdit, cxCalendar, dxLayoutControl, cxControls, cxMemo, uViewDireccionEntregaAlbaranCliente, Buttons, ActnList, uBizPedidosCliente, uPedidosClienteController, ExtCtrls, cxLookupEdit, cxDBLookupEdit, - cxDBLookupComboBox, uFormasPagoController, uAlmacenesController; + cxDBLookupComboBox, uFormasPagoController, uAlmacenesController, uAlbaranesClienteController; type IViewAlbaranCliente = interface(IViewBase) @@ -24,6 +24,10 @@ type function GetViewClienteAlbaran: TfrViewDatosYSeleccionCliente; procedure SetViewClienteAlbaran(const Value: TfrViewDatosYSeleccionCliente); property ViewClienteAlbaran: TfrViewDatosYSeleccionCliente read GetViewClienteAlbaran write SetViewClienteAlbaran; + + function GetController : IAlbaranesClienteController; + procedure SetController (const Value : IAlbaranesClienteController); + property Controller : IAlbaranesClienteController read GetController write SetController; end; TfrViewAlbaranCliente = class(TfrViewBase, IViewAlbaranCliente) @@ -117,6 +121,7 @@ type procedure frViewClienteAlbaranactAnadirContactoUpdate(Sender: TObject); protected + FController : IAlbaranesClienteController; FAlbaran : IBizAlbaranCliente; FAlmacenesController : IAlmacenesController; FPedidoAsociado : IBizPedidoCliente; @@ -128,10 +133,14 @@ type procedure SetAlbaran(const Value: IBizAlbaranCliente); virtual; function GetViewClienteAlbaran: TfrViewDatosYSeleccionCliente; procedure SetViewClienteAlbaran(const Value: TfrViewDatosYSeleccionCliente); + function GetController : IAlbaranesClienteController; + procedure SetController (const Value : IAlbaranesClienteController); public property Albaran: IBizAlbaranCliente read GetAlbaran write SetAlbaran; property ViewClienteAlbaran: TfrViewDatosYSeleccionCliente read GetViewClienteAlbaran; + property Controller : IAlbaranesClienteController read GetController write SetController; + end; implementation @@ -141,7 +150,7 @@ implementation { TfrViewAlbaranCliente } uses - uClientesController, uBizDireccionesContacto, uAlbaranesClienteController, + uClientesController, uBizDireccionesContacto, schAlbaranesClienteClient_Intf, uBizFormasPago, uBizAlmacenes, uDateUtils, uDialogUtils; @@ -236,12 +245,13 @@ end; procedure TfrViewAlbaranCliente.CustomViewDestroy(Sender: TObject); begin - inherited; + FController := Nil; FViewClienteAlbaran := Nil; FPedidoController := NIL; FFormasPagoController := NIL; FPedidoAsociado := NIL; FAlmacenesController := NIL; + inherited; end; procedure TfrViewAlbaranCliente.eFechaEnvioPropertiesValidate(Sender: TObject; @@ -338,6 +348,11 @@ begin Result := FAlbaran; end; +function TfrViewAlbaranCliente.GetController: IAlbaranesClienteController; +begin + Result := FController; +end; + function TfrViewAlbaranCliente.GetViewClienteAlbaran: TfrViewDatosYSeleccionCliente; begin Result := FViewClienteAlbaran; @@ -405,6 +420,16 @@ begin end; end; +procedure TfrViewAlbaranCliente.SetController(const Value: IAlbaranesClienteController); +begin + FController := Value; + + if Assigned(FController) then + begin + ViewClienteAlbaran.Controller := Controller.ClienteController; + end; +end; + procedure TfrViewAlbaranCliente.SetViewClienteAlbaran(const Value: TfrViewDatosYSeleccionCliente); begin FViewClienteAlbaran := Value; diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.dfm index 1847ac0f..a985ec42 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.dfm @@ -1,7 +1,9 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente inherited dxLayoutControl1: TdxLayoutControl inherited Label1: TLabel + Top = 479 Width = 299 + ExplicitTop = 479 ExplicitWidth = 299 end inherited edtFechaAlbaran: TcxDBDateEdit @@ -9,17 +11,23 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente Width = 119 end inherited memObservaciones: TcxDBMemo - ExplicitWidth = 186 + Left = 449 + TabOrder = 23 + ExplicitLeft = 449 + ExplicitWidth = 342 ExplicitHeight = 253 Height = 253 - Width = 186 + Width = 342 end inherited eReferencia: TcxDBTextEdit ExplicitWidth = 143 Width = 143 end inherited frViewClienteAlbaran: TfrViewDatosYSeleccionCliente + Left = 449 Width = 350 + TabOrder = 19 + ExplicitLeft = 449 ExplicitWidth = 350 inherited dxLayoutControl1: TdxLayoutControl Width = 350 @@ -43,51 +51,156 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente ExplicitWidth = 327 Width = 327 end + inherited edtCodigoPostal: TcxDBTextEdit + Left = 259 + ExplicitLeft = 259 + end + inherited Button3: TBitBtn + Left = 149 + ExplicitLeft = 149 + end end end inherited eCalle: TcxDBTextEdit + Top = 253 + TabOrder = 10 + ExplicitTop = 253 ExplicitWidth = 263 Width = 263 end inherited ePoblacion: TcxDBTextEdit + Top = 280 + TabOrder = 11 + ExplicitTop = 280 ExplicitWidth = 162 Width = 162 end + inherited eCodigoPostal: TcxDBTextEdit + Left = 354 + Top = 280 + TabOrder = 12 + ExplicitLeft = 354 + ExplicitTop = 280 + end inherited eProvincia: TcxDBTextEdit + Top = 307 + TabOrder = 13 + ExplicitTop = 307 ExplicitWidth = 263 Width = 263 end inherited ePersonaContacto: TcxDBTextEdit + Top = 334 + TabOrder = 14 + ExplicitTop = 334 ExplicitWidth = 84 Width = 84 end inherited eTlfTrabajo: TcxDBTextEdit + Top = 361 + TabOrder = 15 + ExplicitTop = 361 ExplicitWidth = 122 Width = 122 end - inherited eReferenciaPedidoCli: TcxTextEdit - ExplicitWidth = 16 - Width = 16 + inherited bElegirDireccion: TBitBtn + Left = 247 + Top = 388 + TabOrder = 16 + ExplicitLeft = 247 + ExplicitTop = 388 + end + inherited Button1: TButton + Left = 287 + ExplicitLeft = 287 end inherited cbFormaPago: TcxDBLookupComboBox ExplicitWidth = 32 Width = 32 end + inherited bFormasPago: TButton + Left = 287 + ExplicitLeft = 287 + end + inherited eFechaRecepcion: TcxDBDateEdit + Left = 583 + TabOrder = 22 + ExplicitLeft = 583 + ExplicitWidth = 123 + Width = 123 + end + object eReferenciaAlbaranCli: TcxTextEdit [17] + Left = 116 + Top = 167 + Anchors = [akLeft, akTop, akRight] + Enabled = False + Properties.ReadOnly = False + Properties.ValidateOnEnter = True + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.Color = clWindow + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.TextColor = clWindowText + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 7 + Width = 165 + end + object Button2: TButton [18] + Left = 287 + Top = 167 + Width = 132 + Height = 23 + Action = actVerAlbaranCli + TabOrder = 8 + end + inherited cbConAlmacen: TCheckBox + Top = 447 + TabOrder = 17 + ExplicitTop = 447 + end inherited cbAlmacen: TcxDBLookupComboBox + Top = 447 + TabOrder = 18 + ExplicitTop = 447 ExplicitWidth = 69 Width = 69 end inherited eRefFacturaCli: TcxDBTextEdit + Top = 196 + TabOrder = 9 + ExplicitTop = 196 ExplicitWidth = 207 Width = 207 end + inherited eFechaPrevista: TcxDBDateEdit + Left = 583 + TabOrder = 20 + ExplicitLeft = 583 + ExplicitWidth = 122 + Width = 122 + end + inherited eRefCliente: TcxDBTextEdit + ExplicitWidth = 284 + Width = 284 + end + inherited eFechaEnvio: TcxDBDateEdit + Left = 583 + TabOrder = 21 + ExplicitLeft = 583 + ExplicitWidth = 217 + Width = 217 + end inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group6: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup Caption = 'Datos de la orden' - inherited dxLayoutControl1Item3: TdxLayoutItem - Caption = 'Referencia:' - end inherited dxLayoutControl1Item2: TdxLayoutItem Caption = 'Fecha de orden:' end @@ -96,6 +209,24 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente inherited dxLayoutControl1Group15: TdxLayoutGroup Visible = False end + object dxLayoutControl1Group16: TdxLayoutGroup [1] + ShowCaption = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item17: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Ref. alb. origen:' + Control = eReferenciaAlbaranCli + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item25: TdxLayoutItem + ShowCaption = False + Control = Button2 + ControlOptions.ShowBorder = False + end + end inherited dxLayoutControl1Item22: TdxLayoutItem Caption = 'Ref. abono:' end @@ -124,4 +255,11 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente end end end + inherited ActionList1: TActionList + object actVerAlbaranCli: TAction + Caption = 'Ver el albar'#225'n origen' + OnExecute = actVerAlbaranCliExecute + OnUpdate = actVerAlbaranCliUpdate + end + end end diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.pas index 7beeec26..2454fb71 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.pas @@ -8,14 +8,24 @@ uses dxLayoutControl, StdCtrls, cxDropDownEdit, cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, cxTextEdit, Buttons, uCustomView, uViewBase, uViewDatosYSeleccionCliente, cxDBEdit, cxMemo, cxContainer, cxEdit, - cxMaskEdit, cxCalendar, cxControls; + cxMaskEdit, cxCalendar, cxControls, uBizAlbaranesCliente; type TfrViewAlbaranDevCliente = class(TfrViewAlbaranCliente) - private - { Private declarations } - public - { Public declarations } + dxLayoutControl1Item17: TdxLayoutItem; + eReferenciaAlbaranCli: TcxTextEdit; + dxLayoutControl1Item25: TdxLayoutItem; + Button2: TButton; + dxLayoutControl1Group16: TdxLayoutGroup; + actVerAlbaranCli: TAction; + procedure actVerAlbaranCliExecute(Sender: TObject); + procedure CustomViewCreate(Sender: TObject); + procedure CustomViewDestroy(Sender: TObject); + procedure actVerAlbaranCliUpdate(Sender: TObject); + procedure frViewClienteAlbaranactElegirContactoUpdate(Sender: TObject); + protected + FAlbaranAsociado : IBizAlbaranCliente; + procedure SetAlbaran(const Value: IBizAlbaranCliente); override; end; var @@ -25,4 +35,62 @@ implementation {$R *.dfm} +procedure TfrViewAlbaranDevCliente.actVerAlbaranCliExecute(Sender: TObject); +begin + inherited; + Controller.Ver(FAlbaranAsociado); +end; + +procedure TfrViewAlbaranDevCliente.actVerAlbaranCliUpdate(Sender: TObject); +begin + if (Sender as TAction).Enabled then + (Sender as TAction).Enabled := Assigned(FAlbaranAsociado); +end; + +procedure TfrViewAlbaranDevCliente.CustomViewCreate(Sender: TObject); +begin + inherited; + FAlbaranAsociado := NIL; +end; + +procedure TfrViewAlbaranDevCliente.CustomViewDestroy(Sender: TObject); +begin + FAlbaranAsociado := NIL; + inherited; +end; + +procedure TfrViewAlbaranDevCliente.frViewClienteAlbaranactElegirContactoUpdate( + Sender: TObject); +begin + inherited; + if (Sender as TAction).Enabled then + (Sender as TAction).Enabled := not Assigned(FAlbaranAsociado); +end; + +procedure TfrViewAlbaranDevCliente.SetAlbaran(const Value: IBizAlbaranCliente); +begin + inherited; + + if Assigned(FAlbaran) then + begin + FAlbaranAsociado := NIL; + if (FAlbaran.ID_ALBARAN_DEV > 0) then + begin + FAlbaranAsociado := Controller.Buscar(FAlbaran.ID_ALBARAN_DEV); + if Assigned(FAlbaranAsociado) then + begin + FAlbaranAsociado.DataTable.Active := True; + eReferenciaAlbaranCli.Text := FAlbaranAsociado.REFERENCIA + end + else + eReferenciaAlbaranCli.Text := ''; + end + else + eReferenciaAlbaranCli.Text := 'No hay pedido asociado'; + end + else begin + FAlbaranAsociado := NIL; + end; +end; + end. diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.dfm index 26331b76..07e0ce69 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.dfm @@ -2,6 +2,17 @@ inherited frViewAlbaranesDevCliente: TfrViewAlbaranesDevCliente OnCreate = CustomViewCreate inherited cxGrid: TcxGrid inherited cxGridView: TcxGridDBTableView + inherited cxGridViewNUM_COPIAS: TcxGridDBColumn + IsCaptionAssigned = True + end + object cxGridViewREFERENCIA_ALB_DEV: TcxGridDBColumn [3] + Caption = 'Ref. alb. origen' + DataBinding.FieldName = 'REFERENCIA_ALB_DEV' + end + object cxGridViewREFERENCIA_FAC_ALB_DEV: TcxGridDBColumn [4] + Caption = 'Ref. fac. alb. origen' + DataBinding.FieldName = 'REFERENCIA_FAC_ALB_DEV' + end inherited cxGridViewFECHA_ALBARAN: TcxGridDBColumn Caption = 'Fecha' end @@ -14,14 +25,16 @@ inherited frViewAlbaranesDevCliente: TfrViewAlbaranesDevCliente inherited TBXDockablePanel1: TTBXDockablePanel inherited dxLayoutControl1: TdxLayoutControl inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 + ExplicitWidth = 468 + Width = 468 end inherited edtFechaIniFiltro: TcxDateEdit ExplicitWidth = 121 Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit + Left = 369 + ExplicitLeft = 369 ExplicitWidth = 121 Width = 121 end @@ -30,7 +43,7 @@ inherited frViewAlbaranesDevCliente: TfrViewAlbaranesDevCliente end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink - ReportDocument.CreationDate = 39232.492941620370000000 + ReportDocument.CreationDate = 39232.492941620360000000 BuiltInReportLink = True end end diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.pas index a1b23c83..aaf5586b 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.pas @@ -20,6 +20,8 @@ type end; TfrViewAlbaranesDevCliente = class(TfrViewAlbaranesCliente, IViewAlbaranesDevCliente) + cxGridViewREFERENCIA_ALB_DEV: TcxGridDBColumn; + cxGridViewREFERENCIA_FAC_ALB_DEV: TcxGridDBColumn; procedure CustomViewCreate(Sender: TObject); end; diff --git a/Source/Modulos/Albaranes de proveedor/AlbaranesProveedor_Group.bdsgroup b/Source/Modulos/Albaranes de proveedor/AlbaranesProveedor_Group.bdsgroup index 3a7deb80..bb9f8729 100644 --- a/Source/Modulos/Albaranes de proveedor/AlbaranesProveedor_Group.bdsgroup +++ b/Source/Modulos/Albaranes de proveedor/AlbaranesProveedor_Group.bdsgroup @@ -8,9 +8,7 @@ - - - + ..\..\DataAbstract_D10\DataAbstract_D10.bdsproj ..\..\Base\Base.bdsproj ..\..\Base\ControllerBase\ControllerBase.bdsproj @@ -31,7 +29,8 @@ ..\Facturas de proveedor\Controller\FacturasProveedor_controller.bdsproj ..\Inventario\Controller\Inventario_controller.bdsproj ..\Pedidos de cliente\Controller\PedidosCliente_controller.bdsproj - 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 + ..\Albaranes de cliente\Views\AlbaranesCliente_view.bdsproj + 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 diff --git a/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas b/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas index 149e0c57..7b385cd4 100644 --- a/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas +++ b/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas @@ -40,6 +40,7 @@ type procedure DescartarCambios(AAlbaran : IBizAlbaranProveedor); function Existe(const ID: Integer) : Boolean; function Duplicar(AAlbaran: IBizAlbaranProveedor): IBizAlbaranProveedor; + function GenerarOrdenDev(AAlbaran: IBizAlbaranProveedor): IBizAlbaranProveedor; function ExtraerSeleccionados(AAlbaran: IBizAlbaranProveedor; Const ViewGrid: IViewGridBase = Nil) : IBizAlbaranProveedor; function ElegirAlbaranes(AAlbaran: IBizAlbaranProveedor; AMensaje: String; AMultiSelect: Boolean): IBizAlbaranProveedor; @@ -108,6 +109,7 @@ type procedure VerTodosAlbaranesDev(AAlbarans: IBizAlbaranProveedor); procedure VerDireccionEntrega(AAlbaran : IBizAlbaranProveedor); function Duplicar(AAlbaran: IBizAlbaranProveedor): IBizAlbaranProveedor; + function GenerarOrdenDev(AAlbaran: IBizAlbaranProveedor): IBizAlbaranProveedor; procedure CopiarDireccionEnvio (const ADireccionEnvio: IBizDireccionesContacto; AAlbaran: IBizAlbaranProveedor); @@ -551,7 +553,10 @@ begin INCIDENCIAS_ACTIVAS := 0; REFERENCIA := ''; ID_PEDIDO := 0; + REF_PED_PROVEEDOR := ''; ID_FACTURA := 0; + REF_FACTURA := ''; + REF_FACTURA_PROV := ''; end; Result.Post; finally @@ -1120,6 +1125,33 @@ begin Result := FProveedorController; end; +function TAlbaranesProveedorController.GenerarOrdenDev(AAlbaran: IBizAlbaranProveedor): IBizAlbaranProveedor; +var + AOrden : IBizAlbaranProveedor; + IdAlbaran: Integer; + +begin + if Assigned(AAlbaran) then + begin + IdAlbaran := AAlbaran.ID; + AOrden := Duplicar(AAlbaran); + if Assigned(AOrden) then + begin + if not AOrden.DataTable.Editing then + AOrden.Edit; + + AOrden.TIPO := CTE_TIPO_ALBARAN_DEV; + AOrden.ID_ALBARAN_DEV := IdAlbaran; + AOrden.Post; + + //Convierte todos los articulos del albaran a negativos por se una orden de devolucion + FDetallesController.CambiarSignoDetalles(AOrden.Detalles); + + end; + Ver(AOrden); + end; +end; + function TAlbaranesProveedorController.GetDetallesController: IDetallesAlbaranProveedorController; begin Result := FDetallesController; diff --git a/Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.dfm index 0d5614b4..44fc83c6 100644 --- a/Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.dfm @@ -555,6 +555,61 @@ object DataModuleAlbaranesProveedor: TDataModuleAlbaranesProveedor BlobType = dabtUnknown DisplayWidth = 0 Alignment = taLeftJustify + DictionaryEntry = 'AlbaranesProveedor_NUM_COPIAS' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'ID_ALBARAN_DEV' + DataType = datInteger + BlobType = dabtUnknown + DisplayWidth = 0 + DisplayLabel = 'AlbaranesProveedor_ID_ALBARAN_DEV' + Alignment = taLeftJustify + DictionaryEntry = 'AlbaranesProveedor_ID_ALBARAN_DEV' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'REFERENCIA_ALB_DEV' + DataType = datString + Size = 255 + BlobType = dabtUnknown + DisplayWidth = 0 + DisplayLabel = 'Ref. albar'#225'n rel.' + Alignment = taLeftJustify + DictionaryEntry = 'AlbaranesProveedor_REFERENCIA_ALB_DEV' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'ID_FAC_ALB_DEV' + DataType = datInteger + BlobType = dabtUnknown + DisplayWidth = 0 + DisplayLabel = 'AlbaranesProveedor_ID_FAC_ALB_DEV' + Alignment = taLeftJustify + DictionaryEntry = 'AlbaranesProveedor_ID_FAC_ALB_DEV' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'REFERENCIA_FAC_ALB_DEV' + DataType = datString + Size = 255 + BlobType = dabtUnknown + DisplayWidth = 0 + DisplayLabel = 'Ref. factura alb. rel.' + Alignment = taLeftJustify + DictionaryEntry = 'AlbaranesProveedor_REFERENCIA_FAC_ALB_DEV' InPrimaryKey = False Calculated = False Lookup = False diff --git a/Source/Modulos/Albaranes de proveedor/Model/schAlbaranesProveedorClient_Intf.pas b/Source/Modulos/Albaranes de proveedor/Model/schAlbaranesProveedorClient_Intf.pas index 0bc87218..97538895 100644 --- a/Source/Modulos/Albaranes de proveedor/Model/schAlbaranesProveedorClient_Intf.pas +++ b/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 = '{3F50C24C-9A27-46B2-BA07-3363BB4C42F0}'; - RID_AlbaranesProveedor = '{4EE00E6F-CE2D-4A3F-8BB7-4CC56A04C494}'; - RID_AlbaranesProveedor_Detalles = '{EAEB48A8-713D-4559-AF51-B102B0EE4CDC}'; - RID_AlbaranesProveedor_Detalles_Refresh = '{C0B6846B-07A4-407C-9D66-AC584AF21C0D}'; - RID_AlbaranesProveedor_Refresh = '{4A135BA2-5325-45B4-B75C-59B39DEF034F}'; + RID_DarReferencia = '{15891F28-6D5E-412C-892D-1474FB348E4B}'; + RID_AlbaranesProveedor = '{DC59E1B6-DFB0-4D9D-8F36-D5458362B1F4}'; + RID_AlbaranesProveedor_Detalles = '{6999036F-7208-46EC-A3FE-24E093E76C10}'; + RID_AlbaranesProveedor_Detalles_Refresh = '{68EED4B4-6B94-44D1-B148-484D3F17BD25}'; + RID_AlbaranesProveedor_Refresh = '{5A91B693-39A1-44F3-A104-266FEDD74D48}'; { Data table names } nme_DarReferencia = 'DarReferencia'; @@ -66,6 +66,10 @@ const fld_AlbaranesProveedorUSUARIO = 'USUARIO'; fld_AlbaranesProveedorID_FORMA_PAGO = 'ID_FORMA_PAGO'; fld_AlbaranesProveedorNUM_COPIAS = 'NUM_COPIAS'; + fld_AlbaranesProveedorID_ALBARAN_DEV = 'ID_ALBARAN_DEV'; + 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'; { AlbaranesProveedor field indexes } idx_AlbaranesProveedorID = 0; @@ -105,6 +109,10 @@ const idx_AlbaranesProveedorUSUARIO = 34; idx_AlbaranesProveedorID_FORMA_PAGO = 35; idx_AlbaranesProveedorNUM_COPIAS = 36; + idx_AlbaranesProveedorID_ALBARAN_DEV = 37; + idx_AlbaranesProveedorREFERENCIA_ALB_DEV = 38; + idx_AlbaranesProveedorID_FAC_ALB_DEV = 39; + idx_AlbaranesProveedorREFERENCIA_FAC_ALB_DEV = 40; { AlbaranesProveedor_Detalles fields } fld_AlbaranesProveedor_DetallesID = 'ID'; @@ -212,6 +220,10 @@ const fld_AlbaranesProveedor_RefreshUSUARIO = 'USUARIO'; fld_AlbaranesProveedor_RefreshID_FORMA_PAGO = 'ID_FORMA_PAGO'; fld_AlbaranesProveedor_RefreshNUM_COPIAS = 'NUM_COPIAS'; + fld_AlbaranesProveedor_RefreshID_ALBARAN_DEV = 'ID_ALBARAN_DEV'; + 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'; { AlbaranesProveedor_Refresh field indexes } idx_AlbaranesProveedor_RefreshID = 0; @@ -251,11 +263,15 @@ const idx_AlbaranesProveedor_RefreshUSUARIO = 34; idx_AlbaranesProveedor_RefreshID_FORMA_PAGO = 35; idx_AlbaranesProveedor_RefreshNUM_COPIAS = 36; + idx_AlbaranesProveedor_RefreshID_ALBARAN_DEV = 37; + idx_AlbaranesProveedor_RefreshREFERENCIA_ALB_DEV = 38; + idx_AlbaranesProveedor_RefreshID_FAC_ALB_DEV = 39; + idx_AlbaranesProveedor_RefreshREFERENCIA_FAC_ALB_DEV = 40; type { IDarReferencia } IDarReferencia = interface(IDAStronglyTypedDataTable) - ['{61465610-D794-47C4-9ABC-8741E6E36F27}'] + ['{ED8EACC9-271E-41C8-A0D0-62B0FD223968}'] { Property getters and setters } function GetVALORValue: String; procedure SetVALORValue(const aValue: String); @@ -284,7 +300,7 @@ type { IAlbaranesProveedor } IAlbaranesProveedor = interface(IDAStronglyTypedDataTable) - ['{42B45AE6-5EB4-4C8D-82C8-1C4AD82E64A8}'] + ['{8777095F-0468-45FC-8B30-50CEB28FFDEA}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -360,6 +376,14 @@ type procedure SetID_FORMA_PAGOValue(const aValue: Integer); function GetNUM_COPIASValue: Integer; procedure SetNUM_COPIASValue(const aValue: Integer); + function GetID_ALBARAN_DEVValue: Integer; + procedure SetID_ALBARAN_DEVValue(const aValue: Integer); + function GetREFERENCIA_ALB_DEVValue: String; + procedure SetREFERENCIA_ALB_DEVValue(const aValue: String); + function GetID_FAC_ALB_DEVValue: Integer; + procedure SetID_FAC_ALB_DEVValue(const aValue: Integer); + function GetREFERENCIA_FAC_ALB_DEVValue: String; + procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); { Properties } @@ -400,6 +424,10 @@ type property USUARIO: String read GetUSUARIOValue write SetUSUARIOValue; property ID_FORMA_PAGO: Integer read GetID_FORMA_PAGOValue write SetID_FORMA_PAGOValue; property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue; + property ID_ALBARAN_DEV: Integer read GetID_ALBARAN_DEVValue write SetID_ALBARAN_DEVValue; + 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; end; { TAlbaranesProveedorDataTableRules } @@ -481,6 +509,14 @@ type procedure SetID_FORMA_PAGOValue(const aValue: Integer); virtual; function GetNUM_COPIASValue: Integer; virtual; procedure SetNUM_COPIASValue(const aValue: Integer); virtual; + function GetID_ALBARAN_DEVValue: Integer; virtual; + procedure SetID_ALBARAN_DEVValue(const aValue: Integer); virtual; + function GetREFERENCIA_ALB_DEVValue: String; virtual; + procedure SetREFERENCIA_ALB_DEVValue(const aValue: String); virtual; + function GetID_FAC_ALB_DEVValue: Integer; virtual; + 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; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -520,6 +556,10 @@ type property USUARIO: String read GetUSUARIOValue write SetUSUARIOValue; property ID_FORMA_PAGO: Integer read GetID_FORMA_PAGOValue write SetID_FORMA_PAGOValue; property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue; + property ID_ALBARAN_DEV: Integer read GetID_ALBARAN_DEVValue write SetID_ALBARAN_DEVValue; + 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; public constructor Create(aDataTable: TDADataTable); override; @@ -529,7 +569,7 @@ type { IAlbaranesProveedor_Detalles } IAlbaranesProveedor_Detalles = interface(IDAStronglyTypedDataTable) - ['{7648F585-1867-4E43-A6D9-7FEE51485725}'] + ['{C3058BD1-A788-4CB7-A157-1E57895DA4F1}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -642,7 +682,7 @@ type { IAlbaranesProveedor_Detalles_Refresh } IAlbaranesProveedor_Detalles_Refresh = interface(IDAStronglyTypedDataTable) - ['{B23F5262-0AAA-4C52-B3DA-A1589AB4F1C5}'] + ['{44F9FCAE-FD1F-4178-B9E2-5B4DB40B22A9}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -755,7 +795,7 @@ type { IAlbaranesProveedor_Refresh } IAlbaranesProveedor_Refresh = interface(IDAStronglyTypedDataTable) - ['{256505AA-BA0B-4945-8A00-0F5543C724CC}'] + ['{C77EF452-D5BC-4905-BF2B-C1F34E3FB831}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -831,6 +871,14 @@ type procedure SetID_FORMA_PAGOValue(const aValue: Integer); function GetNUM_COPIASValue: Integer; procedure SetNUM_COPIASValue(const aValue: Integer); + function GetID_ALBARAN_DEVValue: Integer; + procedure SetID_ALBARAN_DEVValue(const aValue: Integer); + function GetREFERENCIA_ALB_DEVValue: String; + procedure SetREFERENCIA_ALB_DEVValue(const aValue: String); + function GetID_FAC_ALB_DEVValue: Integer; + procedure SetID_FAC_ALB_DEVValue(const aValue: Integer); + function GetREFERENCIA_FAC_ALB_DEVValue: String; + procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); { Properties } @@ -871,6 +919,10 @@ type property USUARIO: String read GetUSUARIOValue write SetUSUARIOValue; property ID_FORMA_PAGO: Integer read GetID_FORMA_PAGOValue write SetID_FORMA_PAGOValue; property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue; + property ID_ALBARAN_DEV: Integer read GetID_ALBARAN_DEVValue write SetID_ALBARAN_DEVValue; + 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; end; { TAlbaranesProveedor_RefreshDataTableRules } @@ -952,6 +1004,14 @@ type procedure SetID_FORMA_PAGOValue(const aValue: Integer); virtual; function GetNUM_COPIASValue: Integer; virtual; procedure SetNUM_COPIASValue(const aValue: Integer); virtual; + function GetID_ALBARAN_DEVValue: Integer; virtual; + procedure SetID_ALBARAN_DEVValue(const aValue: Integer); virtual; + function GetREFERENCIA_ALB_DEVValue: String; virtual; + procedure SetREFERENCIA_ALB_DEVValue(const aValue: String); virtual; + function GetID_FAC_ALB_DEVValue: Integer; virtual; + 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; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -991,6 +1051,10 @@ type property USUARIO: String read GetUSUARIOValue write SetUSUARIOValue; property ID_FORMA_PAGO: Integer read GetID_FORMA_PAGOValue write SetID_FORMA_PAGOValue; property NUM_COPIAS: Integer read GetNUM_COPIASValue write SetNUM_COPIASValue; + property ID_ALBARAN_DEV: Integer read GetID_ALBARAN_DEVValue write SetID_ALBARAN_DEVValue; + 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; public constructor Create(aDataTable: TDADataTable); override; @@ -1407,6 +1471,46 @@ begin DataTable.Fields[idx_AlbaranesProveedorNUM_COPIAS].AsInteger := aValue; end; +function TAlbaranesProveedorDataTableRules.GetID_ALBARAN_DEVValue: Integer; +begin + result := DataTable.Fields[idx_AlbaranesProveedorID_ALBARAN_DEV].AsInteger; +end; + +procedure TAlbaranesProveedorDataTableRules.SetID_ALBARAN_DEVValue(const aValue: Integer); +begin + DataTable.Fields[idx_AlbaranesProveedorID_ALBARAN_DEV].AsInteger := aValue; +end; + +function TAlbaranesProveedorDataTableRules.GetREFERENCIA_ALB_DEVValue: String; +begin + result := DataTable.Fields[idx_AlbaranesProveedorREFERENCIA_ALB_DEV].AsString; +end; + +procedure TAlbaranesProveedorDataTableRules.SetREFERENCIA_ALB_DEVValue(const aValue: String); +begin + DataTable.Fields[idx_AlbaranesProveedorREFERENCIA_ALB_DEV].AsString := aValue; +end; + +function TAlbaranesProveedorDataTableRules.GetID_FAC_ALB_DEVValue: Integer; +begin + result := DataTable.Fields[idx_AlbaranesProveedorID_FAC_ALB_DEV].AsInteger; +end; + +procedure TAlbaranesProveedorDataTableRules.SetID_FAC_ALB_DEVValue(const aValue: Integer); +begin + DataTable.Fields[idx_AlbaranesProveedorID_FAC_ALB_DEV].AsInteger := aValue; +end; + +function TAlbaranesProveedorDataTableRules.GetREFERENCIA_FAC_ALB_DEVValue: String; +begin + result := DataTable.Fields[idx_AlbaranesProveedorREFERENCIA_FAC_ALB_DEV].AsString; +end; + +procedure TAlbaranesProveedorDataTableRules.SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); +begin + DataTable.Fields[idx_AlbaranesProveedorREFERENCIA_FAC_ALB_DEV].AsString := aValue; +end; + { TAlbaranesProveedor_DetallesDataTableRules } constructor TAlbaranesProveedor_DetallesDataTableRules.Create(aDataTable: TDADataTable); @@ -2115,6 +2219,46 @@ begin DataTable.Fields[idx_AlbaranesProveedor_RefreshNUM_COPIAS].AsInteger := aValue; end; +function TAlbaranesProveedor_RefreshDataTableRules.GetID_ALBARAN_DEVValue: Integer; +begin + result := DataTable.Fields[idx_AlbaranesProveedor_RefreshID_ALBARAN_DEV].AsInteger; +end; + +procedure TAlbaranesProveedor_RefreshDataTableRules.SetID_ALBARAN_DEVValue(const aValue: Integer); +begin + DataTable.Fields[idx_AlbaranesProveedor_RefreshID_ALBARAN_DEV].AsInteger := aValue; +end; + +function TAlbaranesProveedor_RefreshDataTableRules.GetREFERENCIA_ALB_DEVValue: String; +begin + result := DataTable.Fields[idx_AlbaranesProveedor_RefreshREFERENCIA_ALB_DEV].AsString; +end; + +procedure TAlbaranesProveedor_RefreshDataTableRules.SetREFERENCIA_ALB_DEVValue(const aValue: String); +begin + DataTable.Fields[idx_AlbaranesProveedor_RefreshREFERENCIA_ALB_DEV].AsString := aValue; +end; + +function TAlbaranesProveedor_RefreshDataTableRules.GetID_FAC_ALB_DEVValue: Integer; +begin + result := DataTable.Fields[idx_AlbaranesProveedor_RefreshID_FAC_ALB_DEV].AsInteger; +end; + +procedure TAlbaranesProveedor_RefreshDataTableRules.SetID_FAC_ALB_DEVValue(const aValue: Integer); +begin + DataTable.Fields[idx_AlbaranesProveedor_RefreshID_FAC_ALB_DEV].AsInteger := aValue; +end; + +function TAlbaranesProveedor_RefreshDataTableRules.GetREFERENCIA_FAC_ALB_DEVValue: String; +begin + result := DataTable.Fields[idx_AlbaranesProveedor_RefreshREFERENCIA_FAC_ALB_DEV].AsString; +end; + +procedure TAlbaranesProveedor_RefreshDataTableRules.SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); +begin + DataTable.Fields[idx_AlbaranesProveedor_RefreshREFERENCIA_FAC_ALB_DEV].AsString := aValue; +end; + initialization RegisterDataTableRules(RID_DarReferencia, TDarReferenciaDataTableRules); diff --git a/Source/Modulos/Albaranes de proveedor/Model/schAlbaranesProveedorServer_Intf.pas b/Source/Modulos/Albaranes de proveedor/Model/schAlbaranesProveedorServer_Intf.pas index e6ea59ba..5e6590a1 100644 --- a/Source/Modulos/Albaranes de proveedor/Model/schAlbaranesProveedorServer_Intf.pas +++ b/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 = '{ED7AB12B-996F-49BF-B0BD-0FBF07091D2C}'; - RID_AlbaranesProveedorDelta = '{4DE57AD5-32F1-4CDC-9D41-5557B7EC11A0}'; - RID_AlbaranesProveedor_DetallesDelta = '{097F48A6-6CC7-43A8-A5C2-BCE54EE3B9B7}'; - RID_AlbaranesProveedor_Detalles_RefreshDelta = '{D590E2D3-0875-4A95-9B35-CBD3DC43B6C0}'; - RID_AlbaranesProveedor_RefreshDelta = '{23A6B8F2-95A9-4A11-8822-6D9FA3511F8C}'; + RID_DarReferenciaDelta = '{97B34AA4-C89F-4EF5-BD14-EAC025E8DE2A}'; + RID_AlbaranesProveedorDelta = '{4C2884E6-A902-4C13-8217-86E1044EE171}'; + RID_AlbaranesProveedor_DetallesDelta = '{14A26AA3-09EB-432C-84C0-B5BE48912937}'; + RID_AlbaranesProveedor_Detalles_RefreshDelta = '{C18290F7-22E0-4F13-9F16-5B5B0F4F526A}'; + RID_AlbaranesProveedor_RefreshDelta = '{74DBC27B-B1F7-4C31-9DB8-8DAC6066D9E8}'; type { IDarReferenciaDelta } IDarReferenciaDelta = interface(IDarReferencia) - ['{ED7AB12B-996F-49BF-B0BD-0FBF07091D2C}'] + ['{97B34AA4-C89F-4EF5-BD14-EAC025E8DE2A}'] { Property getters and setters } function GetOldVALORValue : String; @@ -47,7 +47,7 @@ type { IAlbaranesProveedorDelta } IAlbaranesProveedorDelta = interface(IAlbaranesProveedor) - ['{4DE57AD5-32F1-4CDC-9D41-5557B7EC11A0}'] + ['{4C2884E6-A902-4C13-8217-86E1044EE171}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -86,6 +86,10 @@ type function GetOldUSUARIOValue : String; function GetOldID_FORMA_PAGOValue : Integer; function GetOldNUM_COPIASValue : Integer; + function GetOldID_ALBARAN_DEVValue : Integer; + function GetOldREFERENCIA_ALB_DEVValue : String; + function GetOldID_FAC_ALB_DEVValue : Integer; + function GetOldREFERENCIA_FAC_ALB_DEVValue : String; { Properties } property OldID : Integer read GetOldIDValue; @@ -125,6 +129,10 @@ type property OldUSUARIO : String read GetOldUSUARIOValue; property OldID_FORMA_PAGO : Integer read GetOldID_FORMA_PAGOValue; property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue; + property OldID_ALBARAN_DEV : Integer read GetOldID_ALBARAN_DEVValue; + 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; end; { TAlbaranesProveedorBusinessProcessorRules } @@ -243,6 +251,18 @@ type function GetNUM_COPIASValue: Integer; virtual; function GetOldNUM_COPIASValue: Integer; virtual; procedure SetNUM_COPIASValue(const aValue: Integer); virtual; + function GetID_ALBARAN_DEVValue: Integer; virtual; + function GetOldID_ALBARAN_DEVValue: Integer; virtual; + procedure SetID_ALBARAN_DEVValue(const aValue: Integer); virtual; + function GetREFERENCIA_ALB_DEVValue: String; virtual; + function GetOldREFERENCIA_ALB_DEVValue: String; virtual; + procedure SetREFERENCIA_ALB_DEVValue(const aValue: String); virtual; + function GetID_FAC_ALB_DEVValue: Integer; virtual; + function GetOldID_FAC_ALB_DEVValue: Integer; virtual; + procedure SetID_FAC_ALB_DEVValue(const aValue: Integer); virtual; + function GetREFERENCIA_FAC_ALB_DEVValue: String; virtual; + function GetOldREFERENCIA_FAC_ALB_DEVValue: String; virtual; + procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -319,6 +339,14 @@ 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 ID_ALBARAN_DEV : Integer read GetID_ALBARAN_DEVValue write SetID_ALBARAN_DEVValue; + property OldID_ALBARAN_DEV : Integer read GetOldID_ALBARAN_DEVValue; + property REFERENCIA_ALB_DEV : String read GetREFERENCIA_ALB_DEVValue write SetREFERENCIA_ALB_DEVValue; + property OldREFERENCIA_ALB_DEV : String read GetOldREFERENCIA_ALB_DEVValue; + property ID_FAC_ALB_DEV : Integer read GetID_FAC_ALB_DEVValue write SetID_FAC_ALB_DEVValue; + 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; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -328,7 +356,7 @@ type { IAlbaranesProveedor_DetallesDelta } IAlbaranesProveedor_DetallesDelta = interface(IAlbaranesProveedor_Detalles) - ['{097F48A6-6CC7-43A8-A5C2-BCE54EE3B9B7}'] + ['{14A26AA3-09EB-432C-84C0-B5BE48912937}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_ALBARANValue : Integer; @@ -455,7 +483,7 @@ type { IAlbaranesProveedor_Detalles_RefreshDelta } IAlbaranesProveedor_Detalles_RefreshDelta = interface(IAlbaranesProveedor_Detalles_Refresh) - ['{D590E2D3-0875-4A95-9B35-CBD3DC43B6C0}'] + ['{C18290F7-22E0-4F13-9F16-5B5B0F4F526A}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_ALBARANValue : Integer; @@ -582,7 +610,7 @@ type { IAlbaranesProveedor_RefreshDelta } IAlbaranesProveedor_RefreshDelta = interface(IAlbaranesProveedor_Refresh) - ['{23A6B8F2-95A9-4A11-8822-6D9FA3511F8C}'] + ['{74DBC27B-B1F7-4C31-9DB8-8DAC6066D9E8}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -621,6 +649,10 @@ type function GetOldUSUARIOValue : String; function GetOldID_FORMA_PAGOValue : Integer; function GetOldNUM_COPIASValue : Integer; + function GetOldID_ALBARAN_DEVValue : Integer; + function GetOldREFERENCIA_ALB_DEVValue : String; + function GetOldID_FAC_ALB_DEVValue : Integer; + function GetOldREFERENCIA_FAC_ALB_DEVValue : String; { Properties } property OldID : Integer read GetOldIDValue; @@ -660,6 +692,10 @@ type property OldUSUARIO : String read GetOldUSUARIOValue; property OldID_FORMA_PAGO : Integer read GetOldID_FORMA_PAGOValue; property OldNUM_COPIAS : Integer read GetOldNUM_COPIASValue; + property OldID_ALBARAN_DEV : Integer read GetOldID_ALBARAN_DEVValue; + 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; end; { TAlbaranesProveedor_RefreshBusinessProcessorRules } @@ -778,6 +814,18 @@ type function GetNUM_COPIASValue: Integer; virtual; function GetOldNUM_COPIASValue: Integer; virtual; procedure SetNUM_COPIASValue(const aValue: Integer); virtual; + function GetID_ALBARAN_DEVValue: Integer; virtual; + function GetOldID_ALBARAN_DEVValue: Integer; virtual; + procedure SetID_ALBARAN_DEVValue(const aValue: Integer); virtual; + function GetREFERENCIA_ALB_DEVValue: String; virtual; + function GetOldREFERENCIA_ALB_DEVValue: String; virtual; + procedure SetREFERENCIA_ALB_DEVValue(const aValue: String); virtual; + function GetID_FAC_ALB_DEVValue: Integer; virtual; + function GetOldID_FAC_ALB_DEVValue: Integer; virtual; + procedure SetID_FAC_ALB_DEVValue(const aValue: Integer); virtual; + function GetREFERENCIA_FAC_ALB_DEVValue: String; virtual; + function GetOldREFERENCIA_FAC_ALB_DEVValue: String; virtual; + procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -854,6 +902,14 @@ 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 ID_ALBARAN_DEV : Integer read GetID_ALBARAN_DEVValue write SetID_ALBARAN_DEVValue; + property OldID_ALBARAN_DEV : Integer read GetOldID_ALBARAN_DEVValue; + property REFERENCIA_ALB_DEV : String read GetREFERENCIA_ALB_DEVValue write SetREFERENCIA_ALB_DEVValue; + property OldREFERENCIA_ALB_DEV : String read GetOldREFERENCIA_ALB_DEVValue; + property ID_FAC_ALB_DEV : Integer read GetID_FAC_ALB_DEVValue write SetID_FAC_ALB_DEVValue; + 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; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -1463,6 +1519,66 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedorNUM_COPIAS] := aValue; end; +function TAlbaranesProveedorBusinessProcessorRules.GetID_ALBARAN_DEVValue: Integer; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedorID_ALBARAN_DEV]; +end; + +function TAlbaranesProveedorBusinessProcessorRules.GetOldID_ALBARAN_DEVValue: Integer; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesProveedorID_ALBARAN_DEV]; +end; + +procedure TAlbaranesProveedorBusinessProcessorRules.SetID_ALBARAN_DEVValue(const aValue: Integer); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedorID_ALBARAN_DEV] := aValue; +end; + +function TAlbaranesProveedorBusinessProcessorRules.GetREFERENCIA_ALB_DEVValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedorREFERENCIA_ALB_DEV]; +end; + +function TAlbaranesProveedorBusinessProcessorRules.GetOldREFERENCIA_ALB_DEVValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesProveedorREFERENCIA_ALB_DEV]; +end; + +procedure TAlbaranesProveedorBusinessProcessorRules.SetREFERENCIA_ALB_DEVValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedorREFERENCIA_ALB_DEV] := aValue; +end; + +function TAlbaranesProveedorBusinessProcessorRules.GetID_FAC_ALB_DEVValue: Integer; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedorID_FAC_ALB_DEV]; +end; + +function TAlbaranesProveedorBusinessProcessorRules.GetOldID_FAC_ALB_DEVValue: Integer; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesProveedorID_FAC_ALB_DEV]; +end; + +procedure TAlbaranesProveedorBusinessProcessorRules.SetID_FAC_ALB_DEVValue(const aValue: Integer); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedorID_FAC_ALB_DEV] := aValue; +end; + +function TAlbaranesProveedorBusinessProcessorRules.GetREFERENCIA_FAC_ALB_DEVValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedorREFERENCIA_FAC_ALB_DEV]; +end; + +function TAlbaranesProveedorBusinessProcessorRules.GetOldREFERENCIA_FAC_ALB_DEVValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesProveedorREFERENCIA_FAC_ALB_DEV]; +end; + +procedure TAlbaranesProveedorBusinessProcessorRules.SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedorREFERENCIA_FAC_ALB_DEV] := aValue; +end; + { TAlbaranesProveedor_DetallesBusinessProcessorRules } constructor TAlbaranesProveedor_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); @@ -2508,6 +2624,66 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedor_RefreshNUM_COPIAS] := aValue; end; +function TAlbaranesProveedor_RefreshBusinessProcessorRules.GetID_ALBARAN_DEVValue: Integer; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedor_RefreshID_ALBARAN_DEV]; +end; + +function TAlbaranesProveedor_RefreshBusinessProcessorRules.GetOldID_ALBARAN_DEVValue: Integer; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesProveedor_RefreshID_ALBARAN_DEV]; +end; + +procedure TAlbaranesProveedor_RefreshBusinessProcessorRules.SetID_ALBARAN_DEVValue(const aValue: Integer); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedor_RefreshID_ALBARAN_DEV] := aValue; +end; + +function TAlbaranesProveedor_RefreshBusinessProcessorRules.GetREFERENCIA_ALB_DEVValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedor_RefreshREFERENCIA_ALB_DEV]; +end; + +function TAlbaranesProveedor_RefreshBusinessProcessorRules.GetOldREFERENCIA_ALB_DEVValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesProveedor_RefreshREFERENCIA_ALB_DEV]; +end; + +procedure TAlbaranesProveedor_RefreshBusinessProcessorRules.SetREFERENCIA_ALB_DEVValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedor_RefreshREFERENCIA_ALB_DEV] := aValue; +end; + +function TAlbaranesProveedor_RefreshBusinessProcessorRules.GetID_FAC_ALB_DEVValue: Integer; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedor_RefreshID_FAC_ALB_DEV]; +end; + +function TAlbaranesProveedor_RefreshBusinessProcessorRules.GetOldID_FAC_ALB_DEVValue: Integer; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesProveedor_RefreshID_FAC_ALB_DEV]; +end; + +procedure TAlbaranesProveedor_RefreshBusinessProcessorRules.SetID_FAC_ALB_DEVValue(const aValue: Integer); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedor_RefreshID_FAC_ALB_DEV] := aValue; +end; + +function TAlbaranesProveedor_RefreshBusinessProcessorRules.GetREFERENCIA_FAC_ALB_DEVValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedor_RefreshREFERENCIA_FAC_ALB_DEV]; +end; + +function TAlbaranesProveedor_RefreshBusinessProcessorRules.GetOldREFERENCIA_FAC_ALB_DEVValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesProveedor_RefreshREFERENCIA_FAC_ALB_DEV]; +end; + +procedure TAlbaranesProveedor_RefreshBusinessProcessorRules.SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedor_RefreshREFERENCIA_FAC_ALB_DEV] := aValue; +end; + initialization RegisterBusinessProcessorRules(RID_DarReferenciaDelta, TDarReferenciaBusinessProcessorRules); diff --git a/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.dfm b/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.dfm index dbaea735..be488dd9 100644 --- a/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.dfm +++ b/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.dfm @@ -78,7 +78,8 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor 'ESCUENTO,'#10' IMPORTE_DESCUENTO, BASE_IMPONIBLE, IVA, IMPORTE_IV' + 'A, IMPORTE_TOTAL,'#10' OBSERVACIONES, INCIDENCIAS, INCIDENCIAS_AC' + 'TIVAS, FECHA_ALTA, FECHA_MODIFICACION,'#10' USUARIO, ID_FORMA_PAG' + - 'O, NUM_COPIAS'#10' FROM'#10' V_ALBARANES_PROVEEDOR' + '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' StatementType = stSQL ColumnMappings = < item @@ -228,6 +229,22 @@ 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> end> Name = 'AlbaranesProveedor' @@ -611,8 +628,49 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor Name = 'NUM_COPIAS' DataType = datInteger BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify + DictionaryEntry = 'AlbaranesProveedor_NUM_COPIAS' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'ID_ALBARAN_DEV' + DataType = datInteger + BlobType = dabtUnknown + DictionaryEntry = 'AlbaranesProveedor_ID_ALBARAN_DEV' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'REFERENCIA_ALB_DEV' + DataType = datString + Size = 255 + BlobType = dabtUnknown + DictionaryEntry = 'AlbaranesProveedor_REFERENCIA_ALB_DEV' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'ID_FAC_ALB_DEV' + DataType = datInteger + BlobType = dabtUnknown + DictionaryEntry = 'AlbaranesProveedor_ID_FAC_ALB_DEV' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'REFERENCIA_FAC_ALB_DEV' + DataType = datString + Size = 255 + BlobType = dabtUnknown + DictionaryEntry = 'AlbaranesProveedor_REFERENCIA_FAC_ALB_DEV' InPrimaryKey = False Calculated = False Lookup = False @@ -1156,8 +1214,9 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor 'SCUENTO,'#10' IMPORTE_DESCUENTO, BASE_IMPONIBLE, IVA, IMPORTE_IVA' + ', IMPORTE_TOTAL,'#10' OBSERVACIONES, INCIDENCIAS, INCIDENCIAS_ACT' + 'IVAS, FECHA_ALTA, FECHA_MODIFICACION,'#10' USUARIO, ID_FORMA_PAGO' + - ', NUM_COPIAS'#10' FROM'#10' V_ALBARANES_PROVEEDOR'#10'WHERE V_ALBARANES_' + - 'PROVEEDOR.ID = :ID' + ', 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' + + 'ERE V_ALBARANES_PROVEEDOR.ID = :ID' StatementType = stSQL ColumnMappings = < item @@ -1700,6 +1759,50 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor Calculated = False Lookup = False LookupCache = False + end + item + Name = 'ID_ALBARAN_DEV' + DataType = datInteger + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'REFERENCIA_ALB_DEV' + DataType = datString + Size = 255 + BlobType = dabtUnknown + DictionaryEntry = 'AlbaranesProveedor_REFERENCIA_ALB_DEV' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'ID_FAC_ALB_DEV' + DataType = datInteger + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'REFERENCIA_FAC_ALB_DEV' + DataType = datString + Size = 255 + BlobType = dabtUnknown + DictionaryEntry = 'AlbaranesProveedor_REFERENCIA_FAC_ALB_DEV' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False end> BusinessRulesClient.ScriptLanguage = rslPascalScript BusinessRulesServer.ScriptLanguage = rslPascalScript @@ -1978,6 +2081,13 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor BlobType = dabtUnknown Value = '' ParamType = daptInput + end + item + Name = 'ID_ALBARAN_DEV' + DataType = datInteger + BlobType = dabtUnknown + Value = '' + ParamType = daptInput end> Statements = < item @@ -1993,16 +2103,17 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor 'TAL,'#10' OBSERVACIONES,'#10' INCIDENCIAS,'#10' INCIDENCIAS_ACTIVAS' + ','#10' FECHA_ALTA,'#10' FECHA_MODIFICACION,'#10' USUARIO,'#10' ID_AL' + 'MACEN,'#10' ID_FORMA_PAGO,'#10' IMPORTE_NETO,'#10' IMPORTE_PORTE,'#10' ' + - ' TIPO)'#10' VALUES ('#10' :ID,'#10' :ID_EMPRESA,'#10' :ID_PROVEEDOR,' + - #10' :FECHA_ALBARAN,'#10' :ID_PEDIDO,'#10' :ID_FACTURA,'#10' :REFER' + - 'ENCIA,'#10' :REFERENCIA_PROVEEDOR,'#10' :REF_FACTURA_PROV,'#10' :CA' + - 'LLE,'#10' :CODIGO_POSTAL,'#10' :POBLACION,'#10' :PROVINCIA,'#10' :PE' + - 'RSONA_CONTACTO,'#10' :TELEFONO,'#10' :BASE_IMPONIBLE,'#10' :DESCUEN' + - 'TO,'#10' :IMPORTE_DESCUENTO,'#10' :IVA,'#10' :IMPORTE_IVA,'#10' :IMP' + - 'ORTE_TOTAL,'#10' :OBSERVACIONES,'#10' :INCIDENCIAS,'#10' :INCIDENCI' + - 'AS_ACTIVAS,'#10' :FECHA_ALTA,'#10' :FECHA_MODIFICACION,'#10' :USUAR' + - 'IO,'#10' :ID_ALMACEN,'#10' :ID_FORMA_PAGO,'#10' :IMPORTE_NETO,'#10' ' + - ':IMPORTE_PORTE,'#10' :TIPO);' + ' TIPO,'#10' ID_ALBARAN_DEV)'#10' VALUES ('#10' :ID,'#10' :ID_EMPRESA' + + ','#10' :ID_PROVEEDOR,'#10' :FECHA_ALBARAN,'#10' :ID_PEDIDO,'#10' :ID' + + '_FACTURA,'#10' :REFERENCIA,'#10' :REFERENCIA_PROVEEDOR,'#10' :REF_F' + + 'ACTURA_PROV,'#10' :CALLE,'#10' :CODIGO_POSTAL,'#10' :POBLACION,'#10' ' + + ' :PROVINCIA,'#10' :PERSONA_CONTACTO,'#10' :TELEFONO,'#10' :BASE_IMP' + + 'ONIBLE,'#10' :DESCUENTO,'#10' :IMPORTE_DESCUENTO,'#10' :IVA,'#10' :I' + + 'MPORTE_IVA,'#10' :IMPORTE_TOTAL,'#10' :OBSERVACIONES,'#10' :INCIDEN' + + 'CIAS,'#10' :INCIDENCIAS_ACTIVAS,'#10' :FECHA_ALTA,'#10' :FECHA_MODI' + + 'FICACION,'#10' :USUARIO,'#10' :ID_ALMACEN,'#10' :ID_FORMA_PAGO,'#10' ' + + ' :IMPORTE_NETO,'#10' :IMPORTE_PORTE,'#10' :TIPO,'#10' :ID_ALBARAN_D' + + 'EV);' StatementType = stSQL ColumnMappings = <> end> @@ -2259,6 +2370,13 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor Value = '' ParamType = daptInput end + item + Name = 'ID_ALBARAN_DEV' + DataType = datInteger + BlobType = dabtUnknown + Value = '' + ParamType = daptInput + end item Name = 'OLD_ID' DataType = datInteger @@ -2287,7 +2405,8 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor #10' FECHA_MODIFICACION = :FECHA_MODIFICACION,'#10' USUARIO = :US' + 'UARIO,'#10' ID_ALMACEN = :ID_ALMACEN,'#10' ID_FORMA_PAGO = :ID_FOR' + 'MA_PAGO,'#10' IMPORTE_NETO = :IMPORTE_NETO,'#10' IMPORTE_PORTE = :' + - 'IMPORTE_PORTE,'#10' TIPO = :TIPO'#10' WHERE'#10' (ID = :OLD_ID);' + 'IMPORTE_PORTE,'#10' TIPO = :TIPO,'#10' ID_ALBARAN_DEV = :ID_ALBARA' + + 'N_DEV'#10' WHERE'#10' (ID = :OLD_ID);' StatementType = stSQL ColumnMappings = <> end> @@ -3119,6 +3238,46 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor DisplayWidth = 0 DisplayLabel = 'Ref. factura prov' Alignment = taLeftJustify + end + item + Name = 'AlbaranesProveedor_NUM_COPIAS' + DataType = datInteger + BlobType = dabtUnknown + DisplayWidth = 0 + DisplayLabel = 'NUM_COPIAS' + Alignment = taLeftJustify + end + item + Name = 'AlbaranesProveedor_ID_ALBARAN_DEV' + DataType = datInteger + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + end + item + Name = 'AlbaranesProveedor_REFERENCIA_ALB_DEV' + DataType = datString + Size = 255 + BlobType = dabtUnknown + DisplayWidth = 0 + DisplayLabel = 'Ref. albar'#225'n rel.' + Alignment = taLeftJustify + end + item + Name = 'AlbaranesProveedor_ID_FAC_ALB_DEV' + DataType = datInteger + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + end + item + Name = 'AlbaranesProveedor_REFERENCIA_FAC_ALB_DEV' + DataType = datString + Size = 255 + BlobType = dabtUnknown + DisplayWidth = 0 + DisplayLabel = 'Ref. factura alb. rel.' + Alignment = taLeftJustify end> Left = 48 Top = 128 diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas index 760200f3..76f663ce 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas @@ -288,7 +288,7 @@ begin if Assigned(FController) then begin - ViewAlbaran.ViewProveedorAlbaran.Controller := Controller.ProveedorController; + ViewAlbaran.Controller := Controller; frViewDetallesAlbaranProveedor1.Controller := Controller.DetallesController; end; end; diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesDevProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesDevProveedor.dfm index 6e998086..310edb38 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesDevProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesDevProveedor.dfm @@ -2,7 +2,6 @@ inherited fEditorAlbaranesDevProveedor: TfEditorAlbaranesDevProveedor Caption = 'Lista de '#243'rdenes de devoluci'#243'n de proveedor' ClientWidth = 872 ExplicitWidth = 880 - ExplicitHeight = 478 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -154,6 +153,10 @@ inherited fEditorAlbaranesDevProveedor: TfEditorAlbaranesDevProveedor inherited actGenerarFactura: TAction Caption = 'Generar abono' end + inherited actGenerarOrden: TAction + Enabled = False + Visible = False + end end inherited SmallImages: TPngImageList PngImages = < diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.dfm index fe07d2cd..445c82ec 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.dfm @@ -2,7 +2,6 @@ inherited fEditorAlbaranesProveedor: TfEditorAlbaranesProveedor Caption = 'Lista de albaranes de proveedor' ClientWidth = 606 ExplicitWidth = 614 - ExplicitHeight = 240 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -132,7 +131,11 @@ inherited fEditorAlbaranesProveedor: TfEditorAlbaranesProveedor end inherited TBXTMain2: TTBXToolbar Visible = True - ExplicitWidth = 117 + ExplicitWidth = 239 + object TBXItem38: TTBXItem + Action = actGenerarOrden + DisplayMode = nbdmImageAndText + end object TBXItem39: TTBXItem Action = actGenerarFactura DisplayMode = nbdmImageAndText @@ -165,6 +168,11 @@ inherited fEditorAlbaranesProveedor: TfEditorAlbaranesProveedor OnExecute = actGenerarFacturaExecute OnUpdate = actGenerarFacturaUpdate end + object actGenerarOrden: TAction + Caption = 'Generar orden dev.' + ImageIndex = 23 + OnExecute = actGenerarOrdenExecute + end end inherited SmallImages: TPngImageList PngImages = < diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.pas index 9ac3c5a9..7d03d2a5 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.pas @@ -22,10 +22,13 @@ type JsImprimirDialog: TJSDialog; TBXItem39: TTBXItem; JsListaAlbaranesNoEliminados: TJSDialog; + actGenerarOrden: TAction; + TBXItem38: TTBXItem; procedure FormShow(Sender: TObject); procedure actGenerarFacturaExecute(Sender: TObject); procedure actGenerarFacturaUpdate(Sender: TObject); procedure actEliminarUpdate(Sender: TObject); + procedure actGenerarOrdenExecute(Sender: TObject); protected FAlbaranes: IBizAlbaranProveedor; @@ -91,6 +94,12 @@ begin and ViewGrid.esSeleccionCeldaDatos; end; +procedure TfEditorAlbaranesProveedor.actGenerarOrdenExecute(Sender: TObject); +begin + inherited; + FController.GenerarOrdenDev(Albaranes); +end; + procedure TfEditorAlbaranesProveedor.AsignarVista; begin ViewGrid := CreateView(TfrViewAlbaranesProveedor) as IViewAlbaranesProveedor; diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranDevProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranDevProveedor.dfm index ac68d610..f7903178 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranDevProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranDevProveedor.dfm @@ -11,6 +11,7 @@ inherited frViewAlbaranDevProveedor: TfrViewAlbaranDevProveedor Width = 119 end inherited memObservaciones: TcxDBMemo + TabOrder = 13 ExplicitWidth = 186 ExplicitHeight = 162 Height = 162 @@ -24,6 +25,7 @@ inherited frViewAlbaranDevProveedor: TfrViewAlbaranDevProveedor end inherited frViewProveedorAlbaran: TfrViewDatosYSeleccionProveedor Width = 350 + TabOrder = 12 ExplicitWidth = 350 inherited dxLayoutControl1: TdxLayoutControl Width = 350 @@ -50,8 +52,11 @@ inherited frViewAlbaranDevProveedor: TfrViewAlbaranDevProveedor end end inherited frViewDireccionEntregaAlbaranProv1: TfrViewDireccionEntregaAlbaranProv + Top = 278 Width = 445 Height = 175 + TabOrder = 11 + ExplicitTop = 278 ExplicitWidth = 445 ExplicitHeight = 175 inherited dxLayoutControl1: TdxLayoutControl @@ -93,25 +98,76 @@ inherited frViewAlbaranDevProveedor: TfrViewAlbaranDevProveedor end inherited cbFormaPago: TcxDBLookupComboBox Left = 114 + Top = 221 + TabOrder = 9 ExplicitLeft = 114 + ExplicitTop = 221 ExplicitWidth = 90 Width = 90 end - inherited eReferenciaPedidoCli: TcxTextEdit + inherited bFormasPago: TButton + Top = 221 + TabOrder = 10 + ExplicitTop = 221 + end + inherited eReferenciaPedidoProv: TcxTextEdit Left = 114 ExplicitLeft = 114 - ExplicitWidth = 69 - Width = 69 + ExplicitWidth = 192 + Width = 192 + end + object eReferenciaAlbaranProv: TcxTextEdit [9] + Left = 114 + Top = 138 + Anchors = [akLeft, akTop, akRight] + Enabled = False + Properties.ReadOnly = False + Properties.ValidateOnEnter = True + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.Color = clWindow + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.TextColor = clWindowText + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 5 + Width = 199 + end + object Button2: TButton [10] + Left = 312 + Top = 138 + Width = 132 + Height = 23 + Action = actVerAlbaran + TabOrder = 6 end inherited eRefFactura: TcxDBTextEdit + Left = 114 + Top = 167 + TabOrder = 7 + ExplicitLeft = 114 + ExplicitTop = 167 ExplicitWidth = 330 Width = 330 end inherited eReferenciaProveedor: TcxDBTextEdit + Left = 114 + ExplicitLeft = 114 ExplicitWidth = 330 Width = 330 end inherited eReferenciaFacturaProveedor: TcxDBTextEdit + Left = 114 + Top = 194 + TabOrder = 8 + ExplicitLeft = 114 + ExplicitTop = 194 ExplicitWidth = 330 Width = 330 end @@ -125,6 +181,24 @@ inherited frViewAlbaranDevProveedor: TfrViewAlbaranDevProveedor inherited dxLayoutControl1Group5: TdxLayoutGroup Visible = False end + object dxLayoutControl1Group9: TdxLayoutGroup [4] + ShowCaption = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item13: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Ref. alb. origen:' + Control = eReferenciaAlbaranProv + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item14: TdxLayoutItem + ShowCaption = False + Control = Button2 + ControlOptions.ShowBorder = False + end + end inherited dxLayoutControl1Item10: TdxLayoutItem Caption = 'Ref. abono:' end @@ -138,4 +212,11 @@ inherited frViewAlbaranDevProveedor: TfrViewAlbaranDevProveedor end end end + inherited ActionList1: TActionList + object actVerAlbaran: TAction + Caption = 'Ver albar'#225'n origen' + OnExecute = actVerAlbaranExecute + OnUpdate = actVerAlbaranUpdate + end + end end diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranDevProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranDevProveedor.pas index 31428187..026f3347 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranDevProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranDevProveedor.pas @@ -8,7 +8,7 @@ uses dxLayoutControl, cxTextEdit, StdCtrls, cxDropDownEdit, cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, uViewDireccionEntregaAlbaranProv, uCustomView, uViewBase, uViewDatosYSeleccionProveedor, cxDBEdit, cxMemo, - cxContainer, cxEdit, cxMaskEdit, cxCalendar, cxControls; + cxContainer, cxEdit, cxMaskEdit, cxCalendar, cxControls, uBizAlbaranesProveedor; type IViewAlbaranDevProveedor = interface(IViewAlbaranProveedor) @@ -16,9 +16,82 @@ type end; TfrViewAlbaranDevProveedor = class(TfrViewAlbaranProveedor, IViewAlbaranDevProveedor) + dxLayoutControl1Item13: TdxLayoutItem; + eReferenciaAlbaranProv: TcxTextEdit; + dxLayoutControl1Item14: TdxLayoutItem; + Button2: TButton; + dxLayoutControl1Group9: TdxLayoutGroup; + actVerAlbaran: TAction; + procedure actVerAlbaranExecute(Sender: TObject); + procedure CustomViewCreate(Sender: TObject); + procedure CustomViewDestroy(Sender: TObject); + procedure actVerAlbaranUpdate(Sender: TObject); + procedure frViewProveedorAlbaranactElegirContactoUpdate(Sender: TObject); + protected + FAlbaranAsociado : IBizAlbaranProveedor; + procedure SetAlbaran(const Value: IBizAlbaranProveedor); override; + end; implementation {$R *.dfm} +procedure TfrViewAlbaranDevProveedor.actVerAlbaranExecute(Sender: TObject); +begin + inherited; + Controller.Ver(FAlbaranAsociado); +end; + +procedure TfrViewAlbaranDevProveedor.actVerAlbaranUpdate(Sender: TObject); +begin + if (Sender as TAction).Enabled then + (Sender as TAction).Enabled := Assigned(FAlbaranAsociado); +end; + +procedure TfrViewAlbaranDevProveedor.CustomViewCreate(Sender: TObject); +begin + inherited; + FAlbaranAsociado := NIL; +end; + +procedure TfrViewAlbaranDevProveedor.CustomViewDestroy(Sender: TObject); +begin + FAlbaranAsociado := NIL; + inherited; +end; + +procedure TfrViewAlbaranDevProveedor.frViewProveedorAlbaranactElegirContactoUpdate( + Sender: TObject); +begin + inherited; + if (Sender as TAction).Enabled then + (Sender as TAction).Enabled := not Assigned(FAlbaranAsociado); +end; + +procedure TfrViewAlbaranDevProveedor.SetAlbaran(const Value: IBizAlbaranProveedor); +begin + inherited; + + if Assigned(FAlbaran) then + begin + FAlbaranAsociado := NIL; + if (FAlbaran.ID_ALBARAN_DEV > 0) then + begin + FAlbaranAsociado := Controller.Buscar(FAlbaran.ID_ALBARAN_DEV); + if Assigned(FAlbaranAsociado) then + begin + FAlbaranAsociado.DataTable.Active := True; + eReferenciaAlbaranProv.Text := FAlbaranAsociado.REFERENCIA + end + else + eReferenciaAlbaranProv.Text := ''; + end + else + eReferenciaAlbaranProv.Text := 'No hay pedido asociado'; + end + else begin + FAlbaranAsociado := NIL; + end; +end; + end. diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm index 2ad38a37..5d4603a0 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm @@ -13,6 +13,7 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor Align = alClient ParentBackground = True TabOrder = 0 + TabStop = False AutoContentSizes = [acsWidth, acsHeight] DesignSize = ( 827 @@ -221,7 +222,7 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor TabOrder = 8 OnClick = bFormasPagoClick end - object eReferenciaPedidoCli: TcxTextEdit + object eReferenciaPedidoProv: TcxTextEdit Left = 119 Top = 109 Anchors = [akLeft, akTop, akRight] @@ -242,7 +243,7 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 3 - Width = 122 + Width = 187 end object Button1: TButton Left = 312 @@ -363,7 +364,7 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor AutoAligns = [aaVertical] AlignHorz = ahClient Caption = 'Ref. del pedido:' - Control = eReferenciaPedidoCli + Control = eReferenciaPedidoProv ControlOptions.ShowBorder = False end object dxLayoutControl1Item9: TdxLayoutItem diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.pas index e0c80218..a456ee64 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.pas @@ -12,7 +12,7 @@ uses cxTextEdit, cxMaskEdit, cxCalendar, dxLayoutControl, cxControls, cxMemo, uViewDireccionEntregaAlbaranProv, Buttons, ActnList, cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, uFormasPagoController, - uBizPedidosProveedor, uPedidosProveedorController; + uBizPedidosProveedor, uPedidosProveedorController, uAlbaranesProveedorController; type IViewAlbaranProveedor = interface(IViewBase) @@ -24,6 +24,10 @@ type function GetViewProveedorAlbaran: TfrViewDatosYSeleccionProveedor; procedure SetViewProveedorAlbaran(const Value: TfrViewDatosYSeleccionProveedor); property ViewProveedorAlbaran: TfrViewDatosYSeleccionProveedor read GetViewProveedorAlbaran write SetViewProveedorAlbaran; + + function GetController : IAlbaranesProveedorController; + procedure SetController (const Value : IAlbaranesProveedorController); + property Controller : IAlbaranesProveedorController read GetController write SetController; end; TfrViewAlbaranProveedor = class(TfrViewBase, IViewAlbaranProveedor) @@ -55,7 +59,7 @@ type dxLayoutControl1Group4: TdxLayoutGroup; dsFormaPago: TDADataSource; dxLayoutControl1Item8: TdxLayoutItem; - eReferenciaPedidoCli: TcxTextEdit; + eReferenciaPedidoProv: TcxTextEdit; dxLayoutControl1Item9: TdxLayoutItem; Button1: TButton; dxLayoutControl1Group5: TdxLayoutGroup; @@ -80,6 +84,7 @@ type procedure actVerPedidoUpdate(Sender: TObject); protected + FController : IAlbaranesProveedorController; FAlbaran : IBizAlbaranProveedor; FViewProveedorAlbaran : TfrViewDatosYSeleccionProveedor; FFormasPagoController : IFormasPagoController; @@ -90,10 +95,14 @@ type procedure SetAlbaran(const Value: IBizAlbaranProveedor); virtual; function GetViewProveedorAlbaran: TfrViewDatosYSeleccionProveedor; procedure SetViewProveedorAlbaran(const Value: TfrViewDatosYSeleccionProveedor); + function GetController : IAlbaranesProveedorController; + procedure SetController (const Value : IAlbaranesProveedorController); public property Albaran: IBizAlbaranProveedor read GetAlbaran write SetAlbaran; property ViewProveedorAlbaran: TfrViewDatosYSeleccionProveedor read GetViewProveedorAlbaran; + property Controller : IAlbaranesProveedorController read GetController write SetController; + end; implementation @@ -103,7 +112,7 @@ implementation { TfrViewAlbaranProveedor } uses - uProveedoresController, uBizDireccionesContacto, uAlbaranesProveedorController, + uProveedoresController, uBizDireccionesContacto, uBizFormasPago, schAlbaranesProveedorClient_Intf; @@ -176,6 +185,7 @@ end; procedure TfrViewAlbaranProveedor.CustomViewDestroy(Sender: TObject); begin + FController := Nil; FPedidoController := NIL; FFormasPagoController := NIL; FPedidoAsociado := NIL; @@ -222,6 +232,11 @@ begin Result := FAlbaran; end; +function TfrViewAlbaranProveedor.GetController: IAlbaranesProveedorController; +begin + Result := FController; +end; + function TfrViewAlbaranProveedor.GetViewProveedorAlbaran: TfrViewDatosYSeleccionProveedor; begin Result := FViewProveedorAlbaran; @@ -238,7 +253,7 @@ begin frViewProveedorAlbaran.Proveedor := FAlbaran.Proveedor; frViewDireccionEntregaAlbaranProv1.AlbaranProveedor := FAlbaran; - eReferenciaPedidoCli.Enabled := False; + eReferenciaPedidoProv.Enabled := False; eRefFactura.Enabled := False; FPedidoAsociado := NIL; @@ -248,13 +263,13 @@ begin if Assigned(FPedidoAsociado) then begin FPedidoAsociado.DataTable.Active := True; - eReferenciaPedidoCli.Text := FPedidoAsociado.REFERENCIA + eReferenciaPedidoProv.Text := FPedidoAsociado.REFERENCIA end else - eReferenciaPedidoCli.Text := ''; + eReferenciaPedidoProv.Text := ''; end else - eReferenciaPedidoCli.Text := 'No hay pedido asociado'; + eReferenciaPedidoProv.Text := 'No hay pedido asociado'; end else begin DADataSource.DataTable := NIL; @@ -264,6 +279,16 @@ begin end; end; +procedure TfrViewAlbaranProveedor.SetController(const Value: IAlbaranesProveedorController); +begin + FController := Value; + + if Assigned(FController) then + begin + ViewProveedorAlbaran.Controller := Controller.ProveedorController; + end; +end; + procedure TfrViewAlbaranProveedor.SetViewProveedorAlbaran(const Value: TfrViewDatosYSeleccionProveedor); begin FViewProveedorAlbaran := Value; diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.dfm index 2b717fb0..f1ea8f13 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.dfm @@ -2,6 +2,17 @@ inherited frViewAlbaranesDevProveedor: TfrViewAlbaranesDevProveedor OnCreate = CustomViewCreate inherited cxGrid: TcxGrid inherited cxGridView: TcxGridDBTableView + inherited cxGridViewNUM_COPIAS: TcxGridDBColumn + IsCaptionAssigned = True + end + object cxGridViewREFERENCIA_ALB_DEV: TcxGridDBColumn [4] + Caption = 'Ref. alb. origen' + DataBinding.FieldName = 'REFERENCIA_ALB_DEV' + end + object cxGridViewREFERENCIA_FAC_ALB_DEV: TcxGridDBColumn [5] + Caption = 'Ref. fac. alb. origen' + DataBinding.FieldName = 'REFERENCIA_FAC_ALB_DEV' + end inherited cxGridViewREF_FACTURA: TcxGridDBColumn Caption = 'Ref. abono' end @@ -13,7 +24,7 @@ inherited frViewAlbaranesDevProveedor: TfrViewAlbaranesDevProveedor inherited txtFiltroTodo: TcxTextEdit ExplicitWidth = 273 Width = 273 - end + end inherited edtFechaIniFiltro: TcxDateEdit ExplicitWidth = 121 Width = 121 @@ -23,11 +34,6 @@ inherited frViewAlbaranesDevProveedor: TfrViewAlbaranesDevProveedor Width = 217 end end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - inherited tbxBotones: TTBXToolbar - Width = 586 - end - end end end inherited dxComponentPrinter: TdxComponentPrinter diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.pas index a0195923..89251983 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.pas @@ -20,6 +20,8 @@ type end; TfrViewAlbaranesDevProveedor = class(TfrViewAlbaranesProveedor, IViewAlbaranesDevProveedor) + cxGridViewREFERENCIA_ALB_DEV: TcxGridDBColumn; + cxGridViewREFERENCIA_FAC_ALB_DEV: TcxGridDBColumn; procedure CustomViewCreate(Sender: TObject); end; diff --git a/Source/Servidor/FactuGES_Server.bdsproj b/Source/Servidor/FactuGES_Server.bdsproj index 7f0124e8..0800b0bd 100644 --- a/Source/Servidor/FactuGES_Server.bdsproj +++ b/Source/Servidor/FactuGES_Server.bdsproj @@ -1,4 +1,4 @@ - +