Se habilita la recepción de pedidos de proveedor, el id_pedido se guardará en los detalles del albaran generado.

Se habilita el inventario.
Se arreglan fallos en vistas.

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@364 0c75b7a4-871f-7646-8a2f-f78d34cc349f

Database/scripts/factuges.sql

@@ -299,7 +299,8 @@ CREATE TABLE ALBARANES_CLIENTE_DETALLES (
     IMPORTE_TOTAL       TIPO_IMPORTE,
     VISIBLE             TIPO_BOOLEANO,
     FECHA_ALTA          TIMESTAMP,
-    FECHA_MODIFICACION  TIMESTAMP
+    FECHA_MODIFICACION  TIMESTAMP,
+    ID_PEDIDO           TIPO_ID		
 );
 
 
@@ -353,7 +354,8 @@ CREATE TABLE ALBARANES_PROVEEDOR_DETALLES (
     IMPORTE_TOTAL       TIPO_IMPORTE,
     VISIBLE             TIPO_BOOLEANO,
     FECHA_ALTA          TIMESTAMP,
-    FECHA_MODIFICACION  TIMESTAMP
+    FECHA_MODIFICACION  TIMESTAMP,
+    ID_PEDIDO           TIPO_ID	
 );
 
 
@@ -1172,6 +1174,45 @@ FROM ALBARANES_CLIENTE
 
 
 
+/* View: V_ALB_CLI_DETALLES */
+CREATE VIEW V_ALB_CLI_DETALLES(
+    ID_ALBARAN,
+    ID_PEDIDO,
+    SITUACION,
+    ID_ALMACEN,
+    ID_ARTICULO,
+    CANTIDAD)
+AS
+SELECT  ALBARANES_CLIENTE_DETALLES.ID_ALBARAN,
+        ALBARANES_CLIENTE_DETALLES.ID_PEDIDO,
+        V_ALB_CLI_SITUACION.SITUACION,
+        ALBARANES_CLIENTE.ID_ALMACEN,
+        COALESCE(ALBARANES_CLIENTE_DETALLES.ID_ARTICULO, 0),
+        SUM(COALESCE(ALBARANES_CLIENTE_DETALLES.CANTIDAD, 0))
+
+FROM ALBARANES_CLIENTE_DETALLES
+INNER JOIN ALBARANES_CLIENTE
+ON (ALBARANES_CLIENTE_DETALLES.ID_ALBARAN = ALBARANES_CLIENTE.ID)
+INNER JOIN V_ALB_CLI_SITUACION
+ON (ALBARANES_CLIENTE_DETALLES.ID_ALBARAN = V_ALB_CLI_SITUACION.ID)
+
+/*Mantenemos los articulos inventariables y aquellos que no existan en nuestro catálogo con el fin de no falsear la situación de los pedidos
+LEFT JOIN ARTICULOS
+ON (ALBARANES_CLIENTE_DETALLES.ID_ARTICULO = ARTICULOS.ID)
+
+WHERE (ALBARANES_CLIENTE_DETALLES.ID_ARTICULO is not null)
+AND   (ARTICULOS.INVENTARIABLE = 1)
+*/
+
+group BY  ALBARANES_CLIENTE_DETALLES.ID_ALBARAN,
+          ALBARANES_CLIENTE_DETALLES.ID_PEDIDO,
+          V_ALB_CLI_SITUACION.SITUACION,
+          ALBARANES_CLIENTE.ID_ALMACEN,
+          ALBARANES_CLIENTE_DETALLES.ID_ARTICULO
+;
+
+
+
 /* View: V_ALB_PROV_DETALLES */
 CREATE VIEW V_ALB_PROV_DETALLES(
     ID_ALBARAN,
@@ -1257,7 +1298,7 @@ SELECT
   ALBARANES_CLIENTE.REFERENCIA,
   ALBARANES_CLIENTE.REFERENCIA_CLIENTE,
   ALBARANES_CLIENTE.TIPO,  
-  V_ALB_CLI_SITUACION.SITUACION,
+  TRIM(V_ALB_CLI_SITUACION.SITUACION),
   ALBARANES_CLIENTE.ID_ALMACEN,
   ALMACENES.NOMBRE AS NOMBRE_ALMACEN,
   ALBARANES_CLIENTE.ID_PEDIDO,
@@ -1383,22 +1424,24 @@ FROM
   LEFT OUTER JOIN ALMACENES ON (ALMACENES.ID = ALBARANES_PROVEEDOR.ID_ALMACEN)
 ;
 
-/* View: V_ALMACENES  */
+
-CREATE VIEW V_ALMACENES (
+
-    ID, 
+/* View: V_ALMACENES */
-    ID_EMPRESA, 
+CREATE VIEW V_ALMACENES(
+    ID,
+    ID_EMPRESA,
     NOMBRE,
-    CALLE, 
+    CALLE,
-    PROVINCIA, 
+    PROVINCIA,
-    POBLACION, 
+    POBLACION,
     CODIGO_POSTAL,
-    TELEFONO, 
+    TELEFONO,
-    MOVIL, 
+    MOVIL,
-    FAX, 
+    FAX,
     PERSONA_CONTACTO,
-    OBSERVACIONES, 
+    OBSERVACIONES,
     FECHA_ALTA,
-    FECHA_MODIFICACION, 
+    FECHA_MODIFICACION,
     USUARIO)
 AS
 SELECT ALMACENES.ID, ALMACENES.ID_EMPRESA, ALMACENES.NOMBRE,
@@ -1407,7 +1450,8 @@ SELECT ALMACENES.ID, ALMACENES.ID_EMPRESA, ALMACENES.NOMBRE,
     ALMACENES.OBSERVACIONES, ALMACENES.FECHA_ALTA, ALMACENES.FECHA_MODIFICACION, ALMACENES.USUARIO
 FROM ALMACENES
 WHERE ALMACENES.TIPO_ALMACEN = 'ALMACEN'
-; 
+;
+
 
 
 /* View: V_ARTICULOS */
@@ -1674,40 +1718,6 @@ WHERE V_CONTACTOS.ID_CATEGORIA = 3
 ;
 
 
-CREATE VIEW V_OBRAS (
-    ID, 
-    ID_EMPRESA, 
-    NOMBRE,
-    CALLE, 
-    PROVINCIA, 
-    POBLACION, 
-    CODIGO_POSTAL,
-    TELEFONO, 
-    MOVIL, 
-    FAX, 
-    PERSONA_CONTACTO,
-    OBSERVACIONES, 
-    ID_CLIENTE, 
-    NOMBRE_CLIENTE, 
-	ID_SUBCONTRATA,
-	NOMBRE_SUBCONTRATA,
-    FECHA_ALTA,
-    FECHA_MODIFICACION, 
-    USUARIO)
-AS
-SELECT ALMACENES.ID, ALMACENES.ID_EMPRESA, ALMACENES.NOMBRE,
-    ALMACENES.CALLE, ALMACENES.PROVINCIA, ALMACENES.POBLACION, ALMACENES.CODIGO_POSTAL,
-    ALMACENES.TELEFONO, ALMACENES.MOVIL, ALMACENES.FAX, ALMACENES.PERSONA_CONTACTO,
-    ALMACENES.OBSERVACIONES, OBRAS_DATOS.ID_CLIENTE, CLIENTES.NOMBRE AS NOMBRE_CLIENTE, 
-	OBRAS_DATOS.ID_SUBCONTRATA, SUBCONTRATAS.NOMBRE AS NOMBRE_SUBCONTRATA, 
-	ALMACENES.FECHA_ALTA, ALMACENES.FECHA_MODIFICACION, ALMACENES.USUARIO
-FROM ALMACENES
-INNER JOIN OBRAS_DATOS ON (OBRAS_DATOS.ID_ALMACEN = ALMACENES.ID)
-LEFT OUTER JOIN CONTACTOS AS CLIENTES ON (CLIENTES.ID = OBRAS_DATOS.ID_CLIENTE) 
-LEFT OUTER JOIN CONTACTOS AS SUBCONTRATAS ON (SUBCONTRATAS.ID = OBRAS_DATOS.ID_SUBCONTRATA)
-WHERE ALMACENES.TIPO_ALMACEN = 'OBRA'
-; 
-
 
 /* View: V_REC_FAC_CLI */
 CREATE VIEW V_REC_FAC_CLI(
@@ -1749,7 +1759,7 @@ AS
 SELECT RECIBOS_CLIENTE.ID_FACTURA, COUNT(V_REC_CLI_SITUACION.ID_RECIBO)
 FROM V_REC_CLI_SITUACION LEFT JOIN RECIBOS_CLIENTE ON
      (RECIBOS_CLIENTE.ID = V_REC_CLI_SITUACION.ID_RECIBO)
-WHERE (V_REC_CLI_SITUACION.SITUACION = 'COBRADO')
+WHERE (TRIM(V_REC_CLI_SITUACION.SITUACION) = 'COBRADO')
 GROUP BY RECIBOS_CLIENTE.ID_FACTURA
 ;
 
@@ -1820,7 +1830,7 @@ AS
 SELECT RECIBOS_PROVEEDOR.ID_FACTURA, COUNT(V_REC_PRO_SITUACION.ID_RECIBO)
 FROM V_REC_PRO_SITUACION LEFT JOIN RECIBOS_PROVEEDOR ON
      (RECIBOS_PROVEEDOR.ID = V_REC_PRO_SITUACION.ID_RECIBO)
-WHERE (V_REC_PRO_SITUACION.SITUACION = 'PAGADO')
+WHERE (TRIM(V_REC_PRO_SITUACION.SITUACION) = 'PAGADO')
 GROUP BY RECIBOS_PROVEEDOR.ID_FACTURA
 ;
 
@@ -1893,7 +1903,7 @@ SELECT FACTURAS_CLIENTE.ID,
   CASE WHEN (FACTURAS_CLIENTE.IMPORTE_TOTAL < 0) THEN 'A' ELSE 'F' END AS TIPO,
   FACTURAS_CLIENTE.ID_COMISION_LIQUIDADA,
   FACTURAS_CLIENTE.FECHA_FACTURA,
-  V_FAC_CLI_SITUACION.SITUACION,
+  TRIM(V_FAC_CLI_SITUACION.SITUACION),
   FACTURAS_CLIENTE.BASE_IMPONIBLE,
   FACTURAS_CLIENTE.DESCUENTO,
   FACTURAS_CLIENTE.IMPORTE_DESCUENTO,
@@ -1971,7 +1981,7 @@ SELECT FACTURAS_PROVEEDOR.ID,
   CASE WHEN (FACTURAS_PROVEEDOR.IMPORTE_TOTAL < 0) THEN 'A' ELSE 'F' END AS TIPO,
   FACTURAS_PROVEEDOR.REFERENCIA_PROVEEDOR,
   FACTURAS_PROVEEDOR.FECHA_FACTURA,
-  V_FAC_PRO_SITUACION.SITUACION,
+  TRIM(V_FAC_PRO_SITUACION.SITUACION),
   FACTURAS_PROVEEDOR.BASE_IMPONIBLE,
   FACTURAS_PROVEEDOR.DESCUENTO,
   FACTURAS_PROVEEDOR.IMPORTE_DESCUENTO,
@@ -2005,6 +2015,74 @@ SELECT FACTURAS_PROVEEDOR.ID,
 
 
 
+/* View: V_INV_ENTRADAS_ALB */
+CREATE VIEW V_INV_ENTRADAS_ALB(
+    ID_ALMACEN,
+    ID_ARTICULO,
+    CANTIDAD)
+AS
+SELECT ID_ALMACEN, ID_ARTICULO, SUM(CANTIDAD)
+FROM V_ALB_PROV_DETALLES
+WHERE (ID_ALMACEN IS NOT NULL)
+GROUP BY ID_ALMACEN, ID_ARTICULO
+;
+
+
+
+/* View: V_INV_ENTRADAS_MOV */
+CREATE VIEW V_INV_ENTRADAS_MOV(
+    ID_ALMACEN,
+    ID_ARTICULO,
+    CANTIDAD)
+AS
+SELECT ID_ALMACEN, ID_ARTICULO, SUM(CANTIDAD)
+FROM MOVIMIENTOS
+WHERE TIPO = 'E'
+GROUP BY ID_ALMACEN, ID_ARTICULO
+;
+
+
+
+/* View: V_INV_ENTRADAS_AUX */
+CREATE VIEW V_INV_ENTRADAS_AUX(
+    TIPO,
+    ID_ALMACEN,
+    ID_ARTICULO,
+    CANTIDAD)
+AS
+SELECT  'ALB',
+    ID_ALMACEN,
+        ID_ARTICULO,
+        CANTIDAD
+FROM V_INV_ENTRADAS_ALB
+UNION ALL
+SELECT  'MOV',
+    ID_ALMACEN,
+        ID_ARTICULO,
+        CANTIDAD
+FROM V_INV_ENTRADAS_MOV
+;
+
+
+
+/* View: V_INV_ENTRADAS */
+CREATE VIEW V_INV_ENTRADAS(
+    ID_ALMACEN,
+    ID_ARTICULO,
+    CANTIDAD)
+AS
+SELECT
+ID_ALMACEN,
+ID_ARTICULO,
+SUM(CANTIDAD) as CANTIDAD
+FROM V_INV_ENTRADAS_AUX
+
+GROUP BY ID_ALMACEN,
+         ID_ARTICULO
+;
+
+
+
 /* View: V_PED_PROV_ARTICULOS_RECIBIDOS */
 CREATE VIEW V_PED_PROV_ARTICULOS_RECIBIDOS(
     ID_PEDIDO,
@@ -2101,6 +2179,259 @@ HAVING SUM(CANTIDAD_PEDIDA) IS NOT NULL
 
 
 
+/* View: V_INV_ENTRADAS_PENDIENTES */
+CREATE VIEW V_INV_ENTRADAS_PENDIENTES(
+    ID_ALMACEN,
+    ID_ARTICULO,
+    CANTIDAD)
+AS
+SELECT PEDIDOS_PROVEEDOR.ID_ALMACEN, V_PED_PROV_ARTICULOS.ID_ARTICULO, SUM(V_PED_PROV_ARTICULOS.CANTIDAD_PENDIENTE)
+FROM V_PED_PROV_ARTICULOS
+LEFT JOIN PEDIDOS_PROVEEDOR
+ON (PEDIDOS_PROVEEDOR.ID = V_PED_PROV_ARTICULOS.ID_PEDIDO)
+WHERE (PEDIDOS_PROVEEDOR.ID_ALMACEN IS NOT NULL)
+GROUP BY PEDIDOS_PROVEEDOR.ID_ALMACEN, V_PED_PROV_ARTICULOS.ID_ARTICULO
+;
+
+
+
+/* View: V_INV_RESERVAS */
+CREATE VIEW V_INV_RESERVAS(
+    ID_ALMACEN,
+    ID_ARTICULO,
+    CANTIDAD)
+AS
+SELECT ID_ALMACEN, ID_ARTICULO, SUM(CANTIDAD)
+FROM V_ALB_CLI_DETALLES
+WHERE (ID_ALMACEN IS NOT NULL)
+AND (SITUACION = 'PENDIENTE')
+GROUP BY ID_ALMACEN, ID_ARTICULO
+;
+
+
+
+/* View: V_INV_SALIDAS_ALB */
+CREATE VIEW V_INV_SALIDAS_ALB(
+    ID_ALMACEN,
+    ID_ARTICULO,
+    CANTIDAD)
+AS
+SELECT ID_ALMACEN, ID_ARTICULO, SUM(CANTIDAD)
+FROM V_ALB_CLI_DETALLES
+WHERE (ID_ALMACEN IS NOT NULL)
+AND (SITUACION in ('ENVIADO', 'SERVIDO'))
+GROUP BY ID_ALMACEN, ID_ARTICULO
+;
+
+
+
+/* View: V_INV_SALIDAS_MOV */
+CREATE VIEW V_INV_SALIDAS_MOV(
+    ID_ALMACEN,
+    ID_ARTICULO,
+    CANTIDAD)
+AS
+SELECT ID_ALMACEN, ID_ARTICULO, SUM(CANTIDAD)
+FROM MOVIMIENTOS
+WHERE TIPO = 'S'
+GROUP BY ID_ALMACEN, ID_ARTICULO
+;
+
+
+
+/* View: V_INV_SALIDAS_AUX */
+CREATE VIEW V_INV_SALIDAS_AUX(
+    ID_ALMACEN,
+    ID_ARTICULO,
+    CANTIDAD)
+AS
+SELECT  ID_ALMACEN,
+        ID_ARTICULO,
+        CANTIDAD
+FROM V_INV_SALIDAS_ALB
+UNION ALL
+SELECT  ID_ALMACEN,
+        ID_ARTICULO,
+        CANTIDAD
+FROM V_INV_SALIDAS_MOV
+;
+
+
+
+/* View: V_INV_SALIDAS */
+CREATE VIEW V_INV_SALIDAS(
+    ID_ALMACEN,
+    ID_ARTICULO,
+    CANTIDAD)
+AS
+SELECT
+ID_ALMACEN,
+ID_ARTICULO,
+SUM(CANTIDAD) as CANTIDAD
+FROM V_INV_SALIDAS_AUX
+
+GROUP BY ID_ALMACEN,
+         ID_ARTICULO
+;
+
+
+
+/* View: V_INV_STOCK_AUX */
+CREATE VIEW V_INV_STOCK_AUX(
+    ID_ALMACEN,
+    ID_ARTICULO,
+    CANTIDAD_ENTRADA,
+    CANTIDAD_SALIDA)
+AS
+SELECT  ID_ALMACEN,
+        ID_ARTICULO,
+        CANTIDAD as CANTIDAD_ENTRADA,
+        0 as CANTIDAD_SALIDA
+FROM V_INV_ENTRADAS
+UNION ALL
+SELECT  ID_ALMACEN,
+        ID_ARTICULO,
+        0 as CANTIDAD_ENTRADA,
+        CANTIDAD as CANTIDAD_SALIDA
+FROM V_INV_SALIDAS
+;
+
+
+
+/* View: V_INV_STOCK */
+CREATE VIEW V_INV_STOCK(
+    ID_ALMACEN,
+    ID_ARTICULO,
+    CANTIDAD)
+AS
+SELECT
+ID_ALMACEN,
+ID_ARTICULO,
+(SUM(CANTIDAD_ENTRADA) - SUM(CANTIDAD_SALIDA)) as CANTIDAD
+FROM V_INV_STOCK_AUX
+GROUP BY ID_ALMACEN,
+         ID_ARTICULO
+;
+
+
+
+/* View: V_INVENTARIO_AUX */
+CREATE VIEW V_INVENTARIO_AUX(
+    ID_ALMACEN,
+    ID_ARTICULO,
+    STOCK,
+    PENDIENTE_RECEPCION,
+    RESERVA)
+AS
+SELECT ID_ALMACEN, ID_ARTICULO, CANTIDAD as STOCK, 0 as PENDIENTES, 0 as RESERVADAS
+FROM V_INV_STOCK
+UNION ALL
+SELECT ID_ALMACEN, ID_ARTICULO, 0 as STOCK, CANTIDAD as PENDIENTES, 0 AS RESERVADAS
+FROM V_INV_ENTRADAS_PENDIENTES
+UNION ALL
+SELECT ID_ALMACEN, ID_ARTICULO, 0 as STOCK, 0 as PENDIENTES, CANTIDAD AS RESERVADAS
+FROM V_INV_RESERVAS
+;
+
+
+
+/* View: V_INVENTARIO */
+CREATE VIEW V_INVENTARIO(
+    ID_ALMACEN,
+    ID_EMPRESA,
+    NOMBRE,
+    ID_ARTICULO,
+    REFERENCIA,
+    FAMILIA,
+    DESCRIPCION,
+    REFERENCIA_PROV,
+    PRECIO_NETO,
+    STOCK,
+    UNIDADES_ALMACEN,
+    COSTE_UNIDADES,
+    RESERVA,
+    PENDIENTE_RECEPCION)
+AS
+SELECT ID_ALMACEN,
+       ALMACENES.ID_EMPRESA,
+       ALMACENES.NOMBRE,
+       ID_ARTICULO,
+       ARTICULOS.REFERENCIA,
+       ARTICULOS.FAMILIA,
+       ARTICULOS.DESCRIPCION,
+       ARTICULOS.REFERENCIA_PROV,
+       COALESCE(ARTICULOS.PRECIO_NETO,0) as PRECIO_NETO,
+       (SUM(STOCK) - SUM(RESERVA)) as STOCK,
+       SUM(STOCK) as UNIDADES_ALMACEN,
+
+       /*Si las unidades son negativas no se tiene en cuenta el coste*/
+       CASE WHEN (SUM(STOCK) < 0) THEN 0
+            ELSE (COALESCE(ARTICULOS.PRECIO_NETO,0) * SUM(STOCK))
+       END as COSTE_UNIDADES,
+
+       SUM(RESERVA) as RESERVA,
+       SUM(PENDIENTE_RECEPCION) as PENDIENTE_RECEPCION
+
+FROM V_INVENTARIO_AUX
+LEFT JOIN ARTICULOS
+ON (ARTICULOS.ID = V_INVENTARIO_AUX.ID_ARTICULO)
+LEFT JOIN ALMACENES
+ON (ALMACENES.ID = V_INVENTARIO_AUX.ID_ALMACEN)
+
+WHERE (ID_ARTICULO <> 0)
+AND   (ARTICULOS.ELIMINADO = 0)
+AND   (ARTICULOS.INVENTARIABLE = 1)
+
+GROUP BY ID_ALMACEN,
+         ALMACENES.ID_EMPRESA,
+         ALMACENES.NOMBRE,
+         ID_ARTICULO,
+         ARTICULOS.REFERENCIA,
+         ARTICULOS.FAMILIA,
+         ARTICULOS.DESCRIPCION,
+         ARTICULOS.REFERENCIA_PROV,
+         ARTICULOS.PRECIO_NETO
+;
+
+
+
+/* View: V_OBRAS */
+CREATE VIEW V_OBRAS(
+    ID,
+    ID_EMPRESA,
+    NOMBRE,
+    CALLE,
+    PROVINCIA,
+    POBLACION,
+    CODIGO_POSTAL,
+    TELEFONO,
+    MOVIL,
+    FAX,
+    PERSONA_CONTACTO,
+    OBSERVACIONES,
+    ID_CLIENTE,
+    NOMBRE_CLIENTE,
+    ID_SUBCONTRATA,
+    NOMBRE_SUBCONTRATA,
+    FECHA_ALTA,
+    FECHA_MODIFICACION,
+    USUARIO)
+AS
+SELECT ALMACENES.ID, ALMACENES.ID_EMPRESA, ALMACENES.NOMBRE,
+    ALMACENES.CALLE, ALMACENES.PROVINCIA, ALMACENES.POBLACION, ALMACENES.CODIGO_POSTAL,
+    ALMACENES.TELEFONO, ALMACENES.MOVIL, ALMACENES.FAX, ALMACENES.PERSONA_CONTACTO,
+    ALMACENES.OBSERVACIONES, OBRAS_DATOS.ID_CLIENTE, CLIENTES.NOMBRE AS NOMBRE_CLIENTE, 
+	OBRAS_DATOS.ID_SUBCONTRATA, SUBCONTRATAS.NOMBRE AS NOMBRE_SUBCONTRATA, 
+	ALMACENES.FECHA_ALTA, ALMACENES.FECHA_MODIFICACION, ALMACENES.USUARIO
+FROM ALMACENES
+INNER JOIN OBRAS_DATOS ON (OBRAS_DATOS.ID_ALMACEN = ALMACENES.ID)
+LEFT OUTER JOIN CONTACTOS AS CLIENTES ON (CLIENTES.ID = OBRAS_DATOS.ID_CLIENTE) 
+LEFT OUTER JOIN CONTACTOS AS SUBCONTRATAS ON (SUBCONTRATAS.ID = OBRAS_DATOS.ID_SUBCONTRATA)
+WHERE ALMACENES.TIPO_ALMACEN = 'OBRA'
+;
+
+
+
 /* View: V_PED_PROV_SITUACION */
 CREATE VIEW V_PED_PROV_SITUACION(
     ID_PEDIDO,
@@ -2198,6 +2529,7 @@ WHERE
 ;
 
 
+
 /* View: V_PEDIDOS_PROVEEDOR */
 CREATE VIEW V_PEDIDOS_PROVEEDOR(
     ID,
@@ -2244,7 +2576,7 @@ SELECT
   PEDIDOS_PROVEEDOR.ID_PROVEEDOR,
   V_PROVEEDORES.NOMBRE,
   PEDIDOS_PROVEEDOR.REFERENCIA,
-  V_PED_PROV_SITUACION.SITUACION,
+  TRIM(V_PED_PROV_SITUACION.SITUACION),
   PEDIDOS_PROVEEDOR.FECHA_ENVIO,
   PEDIDOS_PROVEEDOR.FECHA_PEDIDO,
   PEDIDOS_PROVEEDOR.FECHA_CONFIRMACION,
@@ -2282,7 +2614,7 @@ FROM
   INNER JOIN V_PED_PROV_SITUACION ON (V_PED_PROV_SITUACION.ID_PEDIDO = PEDIDOS_PROVEEDOR.ID)
   LEFT OUTER JOIN ALMACENES ON (ALMACENES.ID = PEDIDOS_PROVEEDOR.ID_ALMACEN)
   LEFT OUTER JOIN ALMACENES AS OBRAS ON (OBRAS.ID = PEDIDOS_PROVEEDOR.ID_OBRA)
-  LEFT OUTER JOIN PEDIDOS_CLIENTE ON (PEDIDOS_CLIENTE.ID = PEDIDOS_PROVEEDOR.ID_PEDIDO_CLIENTE)  
+  LEFT OUTER JOIN PEDIDOS_CLIENTE ON (PEDIDOS_CLIENTE.ID = PEDIDOS_PROVEEDOR.ID_PEDIDO_CLIENTE)
 ;
 
 
@@ -2420,8 +2752,8 @@ SELECT RECIBOS_CLIENTE.ID,
        RECIBOS_CLIENTE.REFERENCIA,
        CASE
        WHEN RECIBOS_CLIENTE.ID_RECIBO_COMPENSADO IS NULL
-       THEN V_REC_CLI_SITUACION.SITUACION
+       THEN TRIM(V_REC_CLI_SITUACION.SITUACION)
-       ELSE RECIBO_COMPENSADO2.SITUACION
+       ELSE TRIM(RECIBO_COMPENSADO2.SITUACION)
        END,
        RECIBOS_CLIENTE.ID_FACTURA,
        RECIBOS_CLIENTE.ID_REMESA, REMESAS_CLIENTE.REFERENCIA as REFERENCIA_REMESA,
@@ -2503,8 +2835,8 @@ SELECT RECIBOS_PROVEEDOR.ID,
        RECIBOS_PROVEEDOR.REFERENCIA_PROVEEDOR,
        CASE
        WHEN RECIBOS_PROVEEDOR.ID_RECIBO_COMPENSADO IS NULL
-       THEN V_REC_PRO_SITUACION.SITUACION
+       THEN TRIM(V_REC_PRO_SITUACION.SITUACION)
-       ELSE RECIBO_COMPENSADO2.SITUACION
+       ELSE TRIM(RECIBO_COMPENSADO2.SITUACION)
        END,
        RECIBOS_PROVEEDOR.ID_FACTURA,
        RECIBOS_PROVEEDOR.ID_REMESA, REMESAS_PROVEEDOR.REFERENCIA as REFERENCIA_REMESA,
@@ -2546,7 +2878,6 @@ ON (RECIBO_COMPENSADO2.ID_RECIBO = RECIBOS_PROVEEDOR.ID_RECIBO_COMPENSADO)
 
 
 
-
 /******************************************************************************/
 /****                             Primary Keys                             ****/
 /******************************************************************************/

Source/Base/Base.dproj

@@ -53,58 +53,58 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="..\Modulos\Obras\adortl.dcp" />
+    <DCCReference Include="..\Modulos\Obras\cxDataD11.dcp" />
+    <DCCReference Include="..\Modulos\Obras\cxEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Obras\cxExportD11.dcp" />
+    <DCCReference Include="..\Modulos\Obras\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Obras\cxGridD11.dcp" />
+    <DCCReference Include="..\Modulos\Obras\cxIntl6D11.dcp" />
+    <DCCReference Include="..\Modulos\Obras\cxIntlPrintSys3D11.dcp" />
+    <DCCReference Include="..\Modulos\Obras\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Modulos\Obras\cxPageControlD11.dcp" />
+    <DCCReference Include="..\Modulos\Obras\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Obras\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Obras\dclIndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Obras\designide.dcp" />
+    <DCCReference Include="..\Modulos\Obras\dsnap.dcp" />
+    <DCCReference Include="..\Modulos\Obras\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Modulos\Obras\dxPSCoreD11.dcp" />
+    <DCCReference Include="..\Modulos\Obras\dxThemeD11.dcp" />
+    <DCCReference Include="..\Modulos\Obras\GUISDK_D11.dcp" />
+    <DCCReference Include="..\Modulos\Obras\IndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Obras\IndyProtocols.dcp" />
+    <DCCReference Include="..\Modulos\Obras\IndySystem.dcp" />
+    <DCCReference Include="..\Modulos\Obras\Jcl.dcp" />
+    <DCCReference Include="..\Modulos\Obras\JclVcl.dcp" />
+    <DCCReference Include="..\Modulos\Obras\JSDialog100.dcp" />
+    <DCCReference Include="..\Modulos\Obras\JvCmpD11R.dcp" />
+    <DCCReference Include="..\Modulos\Obras\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Modulos\Obras\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Obras\JvDlgsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Obras\JvMMD11R.dcp" />
+    <DCCReference Include="..\Modulos\Obras\JvNetD11R.dcp" />
+    <DCCReference Include="..\Modulos\Obras\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Obras\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Obras\JvSystemD11R.dcp" />
+    <DCCReference Include="..\Modulos\Obras\pckMD5.dcp" />
+    <DCCReference Include="..\Modulos\Obras\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Modulos\Obras\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Modulos\Obras\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Modulos\Obras\PNG_D10.dcp" />
+    <DCCReference Include="..\Modulos\Obras\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Obras\RemObjects_Indy_D11.dcp" />
+    <DCCReference Include="..\Modulos\Obras\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Obras\TB2k_D10.dcp" />
+    <DCCReference Include="..\Modulos\Obras\tbx_d10.dcp" />
+    <DCCReference Include="..\Modulos\Obras\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Obras\vclactnband.dcp" />
+    <DCCReference Include="..\Modulos\Obras\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Obras\vcljpg.dcp" />
+    <DCCReference Include="..\Modulos\Obras\VclSmp.dcp" />
+    <DCCReference Include="..\Modulos\Obras\vclx.dcp" />
+    <DCCReference Include="..\Modulos\Obras\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxGridD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxIntl6D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxIntlPrintSys3D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dclIndyCore.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\IndyCore.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\IndyProtocols.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\IndySystem.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JSDialog100.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCmpD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvDlgsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvNetD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\pckMD5.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\pckUCDataConnector.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\pckUserControl_RT.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Indy_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\TB2k_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
       <DesignClass>TForm</DesignClass>

Source/GUIBase/GUIBase.dproj

@@ -58,22 +58,22 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Obras\Base.dcp" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Base.dcp" />
-    <DCCReference Include="..\Modulos\Obras\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Obras\dxBarD11.dcp" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\dxBarD11.dcp" />
-    <DCCReference Include="..\Modulos\Obras\dxBarExtItemsD11.dcp" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\dxBarExtItemsD11.dcp" />
-    <DCCReference Include="..\Modulos\Obras\dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\dxLayoutControlD11.dcp" />
-    <DCCReference Include="..\Modulos\Obras\dxPScxCommonD11.dcp" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\dxPScxCommonD11.dcp" />
-    <DCCReference Include="..\Modulos\Obras\dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="..\Modulos\Obras\dxPsPrVwAdvD11.dcp" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\dxPsPrVwAdvD11.dcp" />
-    <DCCReference Include="..\Modulos\Obras\frx11.dcp" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\frx11.dcp" />
-    <DCCReference Include="..\Modulos\Obras\frxe11.dcp" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\frxe11.dcp" />
-    <DCCReference Include="..\Modulos\Obras\fs11.dcp" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\fs11.dcp" />
-    <DCCReference Include="..\Modulos\Obras\JvAppFrmD11R.dcp" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvAppFrmD11R.dcp" />
-    <DCCReference Include="..\Modulos\Obras\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Obras\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Obras\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Obras\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\vcldb.dcp" />
     <DCCReference Include="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>

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

@@ -380,6 +380,10 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente
         Name = 'REFERENCIA_PROVEEDOR'
         DataType = datString
         Size = 255
+      end
+      item
+        Name = 'ID_PEDIDO'
+        DataType = datInteger
       end>
     Params = <>
     MasterMappingMode = mmWhere

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

@@ -9,8 +9,8 @@ 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_AlbaranesCliente = '{4F3DAC26-B5BE-40A1-91BA-40CD8BEE897B}';
+  RID_AlbaranesCliente = '{179EC550-0441-420C-A5A6-2645AD5DF320}';
-  RID_AlbaranesCliente_Detalles = '{B3816F25-6801-4E29-AB34-4AF1CDE62250}';
+  RID_AlbaranesCliente_Detalles = '{0C3A4CC7-5E16-455A-9B47-71EFAF0230F2}';
 
   { Data table names }
   nme_AlbaranesCliente = 'AlbaranesCliente';
@@ -113,6 +113,7 @@ const
   fld_AlbaranesCliente_DetallesID_ARTICULO = 'ID_ARTICULO';
   fld_AlbaranesCliente_DetallesREFERENCIA = 'REFERENCIA';
   fld_AlbaranesCliente_DetallesREFERENCIA_PROVEEDOR = 'REFERENCIA_PROVEEDOR';
+  fld_AlbaranesCliente_DetallesID_PEDIDO = 'ID_PEDIDO';
 
   { AlbaranesCliente_Detalles field indexes }
   idx_AlbaranesCliente_DetallesID = 0;
@@ -129,11 +130,12 @@ const
   idx_AlbaranesCliente_DetallesID_ARTICULO = 11;
   idx_AlbaranesCliente_DetallesREFERENCIA = 12;
   idx_AlbaranesCliente_DetallesREFERENCIA_PROVEEDOR = 13;
+  idx_AlbaranesCliente_DetallesID_PEDIDO = 14;
 
 type
   { IAlbaranesCliente }
   IAlbaranesCliente = interface(IDAStronglyTypedDataTable)
-  ['{80396348-69BF-4369-94DC-07953C3A96E7}']
+  ['{ADC392F2-58E1-4B5C-9A26-B6FF6A0A1910}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -624,7 +626,7 @@ type
 
   { IAlbaranesCliente_Detalles }
   IAlbaranesCliente_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{BACF8085-2BB1-4129-AB97-303413DC64BD}']
+  ['{E2A542CA-3048-41D1-B2C5-BEB5BBB159F6}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -682,6 +684,10 @@ type
     procedure SetREFERENCIA_PROVEEDORValue(const aValue: String);
     function GetREFERENCIA_PROVEEDORIsNull: Boolean;
     procedure SetREFERENCIA_PROVEEDORIsNull(const aValue: Boolean);
+    function GetID_PEDIDOValue: Integer;
+    procedure SetID_PEDIDOValue(const aValue: Integer);
+    function GetID_PEDIDOIsNull: Boolean;
+    procedure SetID_PEDIDOIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -713,6 +719,8 @@ type
     property REFERENCIAIsNull: Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
     property REFERENCIA_PROVEEDOR: String read GetREFERENCIA_PROVEEDORValue write SetREFERENCIA_PROVEEDORValue;
     property REFERENCIA_PROVEEDORIsNull: Boolean read GetREFERENCIA_PROVEEDORIsNull write SetREFERENCIA_PROVEEDORIsNull;
+    property ID_PEDIDO: Integer read GetID_PEDIDOValue write SetID_PEDIDOValue;
+    property ID_PEDIDOIsNull: Boolean read GetID_PEDIDOIsNull write SetID_PEDIDOIsNull;
   end;
 
   { TAlbaranesCliente_DetallesDataTableRules }
@@ -776,6 +784,10 @@ type
     procedure SetREFERENCIA_PROVEEDORValue(const aValue: String); virtual;
     function GetREFERENCIA_PROVEEDORIsNull: Boolean; virtual;
     procedure SetREFERENCIA_PROVEEDORIsNull(const aValue: Boolean); virtual;
+    function GetID_PEDIDOValue: Integer; virtual;
+    procedure SetID_PEDIDOValue(const aValue: Integer); virtual;
+    function GetID_PEDIDOIsNull: Boolean; virtual;
+    procedure SetID_PEDIDOIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -806,6 +818,8 @@ type
     property REFERENCIAIsNull: Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
     property REFERENCIA_PROVEEDOR: String read GetREFERENCIA_PROVEEDORValue write SetREFERENCIA_PROVEEDORValue;
     property REFERENCIA_PROVEEDORIsNull: Boolean read GetREFERENCIA_PROVEEDORIsNull write SetREFERENCIA_PROVEEDORIsNull;
+    property ID_PEDIDO: Integer read GetID_PEDIDOValue write SetID_PEDIDOValue;
+    property ID_PEDIDOIsNull: Boolean read GetID_PEDIDOIsNull write SetID_PEDIDOIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -1965,6 +1979,27 @@ begin
     DataTable.Fields[idx_AlbaranesCliente_DetallesREFERENCIA_PROVEEDOR].AsVariant := Null;
 end;
 
+function TAlbaranesCliente_DetallesDataTableRules.GetID_PEDIDOValue: Integer;
+begin
+  result := DataTable.Fields[idx_AlbaranesCliente_DetallesID_PEDIDO].AsInteger;
+end;
+
+procedure TAlbaranesCliente_DetallesDataTableRules.SetID_PEDIDOValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_AlbaranesCliente_DetallesID_PEDIDO].AsInteger := aValue;
+end;
+
+function TAlbaranesCliente_DetallesDataTableRules.GetID_PEDIDOIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_AlbaranesCliente_DetallesID_PEDIDO].IsNull;
+end;
+
+procedure TAlbaranesCliente_DetallesDataTableRules.SetID_PEDIDOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_AlbaranesCliente_DetallesID_PEDIDO].AsVariant := Null;
+end;
+
 
 initialization
   RegisterDataTableRules(RID_AlbaranesCliente, TAlbaranesClienteDataTableRules);

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

@@ -9,13 +9,13 @@ 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_AlbaranesClienteDelta = '{42ADDC93-7719-4DFF-84AF-D742A6F242D6}';
+  RID_AlbaranesClienteDelta = '{A0247A1C-8D8E-4287-81FB-B19EABA7591B}';
-  RID_AlbaranesCliente_DetallesDelta = '{47F5BC56-134A-4CAA-95BF-D9774DFBBFD1}';
+  RID_AlbaranesCliente_DetallesDelta = '{D0788BB3-1048-42C6-A38C-93E893A5748A}';
 
 type
   { IAlbaranesClienteDelta }
   IAlbaranesClienteDelta = interface(IAlbaranesCliente)
-  ['{42ADDC93-7719-4DFF-84AF-D742A6F242D6}']
+  ['{A0247A1C-8D8E-4287-81FB-B19EABA7591B}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -507,7 +507,7 @@ type
 
   { IAlbaranesCliente_DetallesDelta }
   IAlbaranesCliente_DetallesDelta = interface(IAlbaranesCliente_Detalles)
-  ['{47F5BC56-134A-4CAA-95BF-D9774DFBBFD1}']
+  ['{D0788BB3-1048-42C6-A38C-93E893A5748A}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_ALBARANValue : Integer;
@@ -523,6 +523,7 @@ type
     function GetOldID_ARTICULOValue : Integer;
     function GetOldREFERENCIAValue : String;
     function GetOldREFERENCIA_PROVEEDORValue : String;
+    function GetOldID_PEDIDOValue : Integer;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -539,6 +540,7 @@ type
     property OldID_ARTICULO : Integer read GetOldID_ARTICULOValue;
     property OldREFERENCIA : String read GetOldREFERENCIAValue;
     property OldREFERENCIA_PROVEEDOR : String read GetOldREFERENCIA_PROVEEDORValue;
+    property OldID_PEDIDO : Integer read GetOldID_PEDIDOValue;
   end;
 
   { TAlbaranesCliente_DetallesBusinessProcessorRules }
@@ -630,6 +632,12 @@ type
     function GetOldREFERENCIA_PROVEEDORIsNull: Boolean; virtual;
     procedure SetREFERENCIA_PROVEEDORValue(const aValue: String); virtual;
     procedure SetREFERENCIA_PROVEEDORIsNull(const aValue: Boolean); virtual;
+    function GetID_PEDIDOValue: Integer; virtual;
+    function GetID_PEDIDOIsNull: Boolean; virtual;
+    function GetOldID_PEDIDOValue: Integer; virtual;
+    function GetOldID_PEDIDOIsNull: Boolean; virtual;
+    procedure SetID_PEDIDOValue(const aValue: Integer); virtual;
+    procedure SetID_PEDIDOIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -688,6 +696,10 @@ type
     property REFERENCIA_PROVEEDORIsNull : Boolean read GetREFERENCIA_PROVEEDORIsNull write SetREFERENCIA_PROVEEDORIsNull;
     property OldREFERENCIA_PROVEEDOR : String read GetOldREFERENCIA_PROVEEDORValue;
     property OldREFERENCIA_PROVEEDORIsNull : Boolean read GetOldREFERENCIA_PROVEEDORIsNull;
+    property ID_PEDIDO : Integer read GetID_PEDIDOValue write SetID_PEDIDOValue;
+    property ID_PEDIDOIsNull : Boolean read GetID_PEDIDOIsNull write SetID_PEDIDOIsNull;
+    property OldID_PEDIDO : Integer read GetOldID_PEDIDOValue;
+    property OldID_PEDIDOIsNull : Boolean read GetOldID_PEDIDOIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -2380,6 +2392,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesCliente_DetallesREFERENCIA_PROVEEDOR] := Null;
 end;
 
+function TAlbaranesCliente_DetallesBusinessProcessorRules.GetID_PEDIDOValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesCliente_DetallesID_PEDIDO];
+end;
+
+function TAlbaranesCliente_DetallesBusinessProcessorRules.GetID_PEDIDOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesCliente_DetallesID_PEDIDO]);
+end;
+
+function TAlbaranesCliente_DetallesBusinessProcessorRules.GetOldID_PEDIDOValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesCliente_DetallesID_PEDIDO];
+end;
+
+function TAlbaranesCliente_DetallesBusinessProcessorRules.GetOldID_PEDIDOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesCliente_DetallesID_PEDIDO]);
+end;
+
+procedure TAlbaranesCliente_DetallesBusinessProcessorRules.SetID_PEDIDOValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesCliente_DetallesID_PEDIDO] := aValue;
+end;
+
+procedure TAlbaranesCliente_DetallesBusinessProcessorRules.SetID_PEDIDOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesCliente_DetallesID_PEDIDO] := Null;
+end;
+
 
 initialization
   RegisterBusinessProcessorRules(RID_AlbaranesClienteDelta, TAlbaranesClienteBusinessProcessorRules);

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

@@ -411,10 +411,10 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
               'ENTO,'#10'    ALBARANES_CLIENTE_DETALLES.IMPORTE_PORTE, ALBARANES_CL' +
               'IENTE_DETALLES.IMPORTE_TOTAL,'#10'    ALBARANES_CLIENTE_DETALLES.VIS' +
               'IBLE,'#10'    ALBARANES_CLIENTE_DETALLES.ID_ARTICULO, ARTICULOS.REFE' +
-              'RENCIA, ARTICULOS.REFERENCIA_PROV as REFERENCIA_PROVEEDOR'#10#10'FROM ' +
+              'RENCIA, ARTICULOS.REFERENCIA_PROV as REFERENCIA_PROVEEDOR,'#10'    A' +
-              'ALBARANES_CLIENTE_DETALLES'#10'LEFT JOIN ARTICULOS ON ALBARANES_CLIE' +
+              'LBARANES_CLIENTE_DETALLES.ID_PEDIDO'#10#10'FROM ALBARANES_CLIENTE_DETA' +
-              'NTE_DETALLES.ID_ARTICULO = ARTICULOS.ID'#10'where {where}'#10'ORDER BY P' +
+              'LLES'#10'LEFT JOIN ARTICULOS ON ALBARANES_CLIENTE_DETALLES.ID_ARTICU' +
-              'OSICION;'#10#10
+              'LO = ARTICULOS.ID'#10'where {where}'#10'ORDER BY POSICION;'#10#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -474,6 +474,10 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
                 DatasetField = 'REFERENCIA_PROVEEDOR'
                 TableField = '<unknown>'
                 SQLOrigin = 'REFERENCIA_PROVEEDOR'
+              end
+              item
+                DatasetField = 'ID_PEDIDO'
+                TableField = 'ID_PEDIDO'
               end>
           end>
         Name = 'AlbaranesCliente_Detalles'
@@ -551,6 +555,10 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
             Name = 'REFERENCIA_PROVEEDOR'
             DataType = datString
             Size = 255
+          end
+          item
+            Name = 'ID_PEDIDO'
+            DataType = datInteger
           end>
       end>
     JoinDataTables = <>
@@ -960,6 +968,10 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
           item
             Name = 'ID_ARTICULO'
             Value = ''
+          end
+          item
+            Name = 'ID_PEDIDO'
+            Value = ''
           end>
         Statements = <
           item
@@ -970,9 +982,10 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
               'INSERT'#10'  INTO ALBARANES_CLIENTE_DETALLES'#10'    (ID, ID_ALBARAN, PO' +
               'SICION, TIPO_DETALLE, CONCEPTO, CANTIDAD,'#10'     IMPORTE_UNIDAD, D' +
               'ESCUENTO, IMPORTE_PORTE, IMPORTE_TOTAL, '#10'     VISIBLE, ID_ARTICU' +
-              'LO)'#10'  VALUES'#10'    (:ID, :ID_ALBARAN, :POSICION, :TIPO_DETALLE, :C' +
+              'LO, ID_PEDIDO)'#10'  VALUES'#10'    (:ID, :ID_ALBARAN, :POSICION, :TIPO_' +
-              'ONCEPTO, :CANTIDAD,'#10'     :IMPORTE_UNIDAD, :DESCUENTO, :IMPORTE_P' +
+              'DETALLE, :CONCEPTO, :CANTIDAD,'#10'     :IMPORTE_UNIDAD, :DESCUENTO,' +
-              'ORTE, :IMPORTE_TOTAL, '#10'     :VISIBLE, :ID_ARTICULO)'#10
+              ' :IMPORTE_PORTE, :IMPORTE_TOTAL, '#10'     :VISIBLE, :ID_ARTICULO, :' +
+              'ID_PEDIDO)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1048,6 +1061,10 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
             Name = 'ID_ARTICULO'
             Value = ''
           end
+          item
+            Name = 'ID_PEDIDO'
+            Value = ''
+          end
           item
             Name = 'OLD_ID'
             Value = ''
@@ -1064,7 +1081,8 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
               'ANTIDAD, '#10'    IMPORTE_UNIDAD = :IMPORTE_UNIDAD, '#10'    DESCUENTO =' +
               ' :DESCUENTO, '#10'    IMPORTE_PORTE = :IMPORTE_PORTE, '#10'    IMPORTE_T' +
               'OTAL = :IMPORTE_TOTAL, '#10'    VISIBLE = :VISIBLE, '#10'    ID_ARTICULO' +
-              ' = :ID_ARTICULO'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
+              ' = :ID_ARTICULO,'#10'    ID_PEDIDO = :ID_PEDIDO'#10'  WHERE'#10'    (ID = :O' +
+              'LD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>

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

@@ -431,21 +431,21 @@ var
 begin
   inherited;
 
-  Respuesta := JsNuevoAlbaranDialog.Execute;
+//  Respuesta := JsNuevoAlbaranDialog.Execute;
 
-  if Respuesta <> IDCANCEL then
+//  if Respuesta <> IDCANCEL then
-  begin
+//  begin
-    case JsNuevoAlbaranDialog.CustomButtonResult of
+//    case JsNuevoAlbaranDialog.CustomButtonResult of
-      200   : begin   // Utilizar un pedido
+//      200   : begin   // Utilizar un pedido
 //                  if ElegirPedidoYGenerarAlbaranCli(IDAlbaranAux) then
-                    actRefrescar.Execute;
+//                    actRefrescar.Execute;
-                end;
+//                end;
-      100    : begin   // Albaran nuevo vacio
+//      100    : begin   // Albaran nuevo vacio
                   if FController.Anadir(Albaranes) then
                     FController.Ver(Albaranes);
-                end;
+//                end;
-    end;
+//    end;
-  end;
+//  end;
 end;
 
 procedure TfEditorAlbaranesCliente.PonerTitulos(const ATitulo: string);

Source/Modulos/Albaranes de proveedor/Controller/AlbaranesProveedor_controller.dproj

@@ -41,7 +41,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">AlbaranesProveedor_controller.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">AlbaranesProveedor_controller.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
@@ -53,6 +53,7 @@
     <DCCReference Include="..\..\Lib\Articulos_controller.dcp" />
     <DCCReference Include="..\..\Lib\Contactos_controller.dcp" />
     <DCCReference Include="..\..\Lib\GUIBase.dcp" />
+    <DCCReference Include="..\..\Lib\Inventario_model.dcp" />
     <DCCReference Include="..\..\Lib\PedidosProveedor_controller.dcp" />
     <DCCReference Include="..\..\Lib\PedidosProveedor_model.dcp" />
     <DCCReference Include="uAlbaranesProveedorController.pas" />
@@ -69,10 +70,9 @@
     <DCCReference Include="View\uIEditorElegirArticulosAlbaranesProveedor.pas" />
   </ItemGroup>
 </Project>
-
 <!-- EurekaLog First Line
 [Exception Log]
-EurekaLog Version=6006
+EurekaLog Version=6011
 Activate=0
 Activate Handle=1
 Save Log File=1

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

@@ -7,8 +7,7 @@ uses
   SysUtils, uDADataTable, uEditorDBItem,
   uControllerBase, uIDataModuleAlbaranesProveedor, uProveedoresController,
   uDetallesAlbaranProveedorController, uBizAlbaranesProveedor,
-  uBizDireccionesContacto;
+  uBizDireccionesContacto, uBizInventario;
-  //, uBizInventario;
 
 type
   IAlbaranesProveedorController = interface(IObservador)
@@ -33,7 +32,7 @@ type
     function Nuevo : IBizAlbaranProveedor;
     function Anadir(AAlbaran : IBizAlbaranProveedor) : Boolean; overload;
     function AnadirAlbaranDev(AAlbaran : IBizAlbaranProveedor) : Boolean;
-//    function Anadir(AAlbaran : IBizAlbaranProveedor; const IDPedido : Integer; AInventarioRecibido: IBizInventario): Boolean; overload;
+    function Anadir(AAlbaran : IBizAlbaranProveedor; const IDPedido : Integer; AInventarioRecibido: IBizInventario): Boolean; overload;
 
     function Eliminar(const ID : Integer): Boolean; overload;
     function Eliminar(AAlbaran : IBizAlbaranProveedor; AllItems: Boolean = false): Boolean; overload;
@@ -94,7 +93,7 @@ type
     function Existe(const ID: Integer) : Boolean; virtual;
     function Anadir(AAlbaran : IBizAlbaranProveedor) : Boolean; overload;
     function AnadirAlbaranDev(AAlbaran : IBizAlbaranProveedor) : Boolean;
-//    function Anadir(AAlbaran : IBizAlbaranProveedor; const IDPedido : Integer; AInventarioRecibido: IBizInventario): Boolean; overload;
+    function Anadir(AAlbaran : IBizAlbaranProveedor; const IDPedido : Integer; AInventarioRecibido: IBizInventario): Boolean; overload;
     function Buscar(const ID: Integer): IBizAlbaranProveedor;
     function BuscarTodos: IBizAlbaranProveedor;
     function BuscarAlbaranesNormales: IBizAlbaranProveedor;
@@ -131,7 +130,7 @@ uses
   uIEditorElegirAlbaranesProveedor, uIEditorDireccionEntregaAlbaranProveedor,
   schContactosClient_Intf, Forms,  schPedidosProveedorClient_Intf, uFactuGES_App,
   uBizPedidosProveedor, uPedidosProveedorController,
-//  schInventarioClient_Intf,
+  schInventarioClient_Intf,
   uArticulosController, uBizArticulos, uControllerDetallesBase, Classes,
   schArticulosClient_Intf, uControllerDetallesArticulos, Variants, uDialogUtils,
   uIEditorAlbaranDevProveedor, uAlbaranesProveedorReportController;
@@ -172,7 +171,6 @@ begin
   AAlbaran.ID_ALMACEN := APedido.ID_ALMACEN;
 end;
 
-{
 procedure CopiarArticulosAAlbaran(APedido: IBizPedidoProveedor; AAlbaran: IBizAlbaranProveedor;
     AInventarioRecibido: IBizInventario);
 var
@@ -223,8 +221,8 @@ begin
           ADetalles.IMPORTE_UNIDAD := APedido.Detalles.IMPORTE_UNIDAD;
           ADetalles.DESCUENTO := APedido.Detalles.DESCUENTO;
           ADetalles.IMPORTE_PORTE := APedido.Detalles.IMPORTE_PORTE;
-
           ADetalles.CANTIDAD := AInventarioRecibido.CANTIDAD;
+          ADetalles.ID_PEDIDO := APedido.Detalles.ID_PEDIDO;
           ADetalles.Post;
         end;
 
@@ -261,19 +259,22 @@ begin
             ADetalles.DESCUENTO := APedido.Detalles.DESCUENTO;
             ADetalles.IMPORTE_PORTE := APedido.Detalles.IMPORTE_PORTE;
             ADetalles.CANTIDAD := APedido.Detalles.CANTIDAD;
+            ADetalles.ID_PEDIDO := APedido.Detalles.ID_PEDIDO;
             ADetalles.Post;
           end;
         APedido.Detalles.Next;
       end;
+
+      //Obligamos a actualizar los totales para que asi los importes totales de los artículos
+      //se recalculen y actualicen
+      ADetallesController.ActualizarTotales(ADetalles);
+
     finally
       ADetallesController := NIL;
       AArticulosController := NIL;
     end;
   end;
-  
-  ADetallesController.ActualizarTotales(ADetalles);
 end;
-}
 
 { TAlbaranesProveedorController }
 
@@ -289,14 +290,14 @@ begin
   Result := True;
 end;
 
-{
+
-function TAlbaranesProveedorController.Anadir(AAlbaran: IBizAlbaranProveedor;
+function TAlbaranesProveedorController.Anadir(AAlbaran: IBizAlbaranProveedor; const IDPedido: Integer;
-  const IDPedido: Integer;
   AInventarioRecibido: IBizInventario): Boolean;
 var
   APedidosController : TPedidosProveedorController;
   APedido : IBizPedidoProveedor;
 begin
+
   Result := False;
   if not Assigned(AAlbaran) then
     raise Exception.Create ('Albarán no asignado (Anadir)');
@@ -341,7 +342,6 @@ begin
     Application.ProcessMessages;
   end;
 end;
-}
 
 function TAlbaranesProveedorController.AnadirAlbaranDev(AAlbaran: IBizAlbaranProveedor): Boolean;
 begin

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

@@ -364,6 +364,10 @@ inherited DataModuleAlbaranesProveedor: TDataModuleAlbaranesProveedor
         Size = 255
         DisplayLabel = 'Ref. proveedor'
         DictionaryEntry = 'AlbaranesProveedor_Detalles_REFERENCIA_PROVEEDOR'
+      end
+      item
+        Name = 'ID_PEDIDO'
+        DataType = datInteger
       end>
     Params = <>
     MasterMappingMode = mmWhere

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

@@ -9,8 +9,8 @@ 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_AlbaranesProveedor = '{B3C84E57-4911-483C-BF95-BC529DBB583C}';
+  RID_AlbaranesProveedor = '{FC61975A-BCE3-485D-9533-C8B3CAA1270B}';
-  RID_AlbaranesProveedor_Detalles = '{F665A12E-A0DC-4E29-A620-593A4192A81D}';
+  RID_AlbaranesProveedor_Detalles = '{B073AED4-CFD3-4196-9729-E76F535E4DAA}';
 
   { Data table names }
   nme_AlbaranesProveedor = 'AlbaranesProveedor';
@@ -107,6 +107,7 @@ const
   fld_AlbaranesProveedor_DetallesIMPORTE_PORTE = 'IMPORTE_PORTE';
   fld_AlbaranesProveedor_DetallesREFERENCIA = 'REFERENCIA';
   fld_AlbaranesProveedor_DetallesREFERENCIA_PROVEEDOR = 'REFERENCIA_PROVEEDOR';
+  fld_AlbaranesProveedor_DetallesID_PEDIDO = 'ID_PEDIDO';
 
   { AlbaranesProveedor_Detalles field indexes }
   idx_AlbaranesProveedor_DetallesID = 0;
@@ -123,11 +124,12 @@ const
   idx_AlbaranesProveedor_DetallesIMPORTE_PORTE = 11;
   idx_AlbaranesProveedor_DetallesREFERENCIA = 12;
   idx_AlbaranesProveedor_DetallesREFERENCIA_PROVEEDOR = 13;
+  idx_AlbaranesProveedor_DetallesID_PEDIDO = 14;
 
 type
   { IAlbaranesProveedor }
   IAlbaranesProveedor = interface(IDAStronglyTypedDataTable)
-  ['{E60D9CCD-626B-4506-B2ED-69DC12E34AC7}']
+  ['{3C2C70AF-29CE-4225-96F2-6D3307841C22}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -582,7 +584,7 @@ type
 
   { IAlbaranesProveedor_Detalles }
   IAlbaranesProveedor_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{EEB82A6C-B78D-4D5E-A152-218B7BC3E9DF}']
+  ['{C0CA4C98-111E-4203-BC3F-5FEE1E48BDF3}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -640,6 +642,10 @@ type
     procedure SetREFERENCIA_PROVEEDORValue(const aValue: String);
     function GetREFERENCIA_PROVEEDORIsNull: Boolean;
     procedure SetREFERENCIA_PROVEEDORIsNull(const aValue: Boolean);
+    function GetID_PEDIDOValue: Integer;
+    procedure SetID_PEDIDOValue(const aValue: Integer);
+    function GetID_PEDIDOIsNull: Boolean;
+    procedure SetID_PEDIDOIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -671,6 +677,8 @@ type
     property REFERENCIAIsNull: Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
     property REFERENCIA_PROVEEDOR: String read GetREFERENCIA_PROVEEDORValue write SetREFERENCIA_PROVEEDORValue;
     property REFERENCIA_PROVEEDORIsNull: Boolean read GetREFERENCIA_PROVEEDORIsNull write SetREFERENCIA_PROVEEDORIsNull;
+    property ID_PEDIDO: Integer read GetID_PEDIDOValue write SetID_PEDIDOValue;
+    property ID_PEDIDOIsNull: Boolean read GetID_PEDIDOIsNull write SetID_PEDIDOIsNull;
   end;
 
   { TAlbaranesProveedor_DetallesDataTableRules }
@@ -734,6 +742,10 @@ type
     procedure SetREFERENCIA_PROVEEDORValue(const aValue: String); virtual;
     function GetREFERENCIA_PROVEEDORIsNull: Boolean; virtual;
     procedure SetREFERENCIA_PROVEEDORIsNull(const aValue: Boolean); virtual;
+    function GetID_PEDIDOValue: Integer; virtual;
+    procedure SetID_PEDIDOValue(const aValue: Integer); virtual;
+    function GetID_PEDIDOIsNull: Boolean; virtual;
+    procedure SetID_PEDIDOIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -764,6 +776,8 @@ type
     property REFERENCIAIsNull: Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
     property REFERENCIA_PROVEEDOR: String read GetREFERENCIA_PROVEEDORValue write SetREFERENCIA_PROVEEDORValue;
     property REFERENCIA_PROVEEDORIsNull: Boolean read GetREFERENCIA_PROVEEDORIsNull write SetREFERENCIA_PROVEEDORIsNull;
+    property ID_PEDIDO: Integer read GetID_PEDIDOValue write SetID_PEDIDOValue;
+    property ID_PEDIDOIsNull: Boolean read GetID_PEDIDOIsNull write SetID_PEDIDOIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -1860,6 +1874,27 @@ begin
     DataTable.Fields[idx_AlbaranesProveedor_DetallesREFERENCIA_PROVEEDOR].AsVariant := Null;
 end;
 
+function TAlbaranesProveedor_DetallesDataTableRules.GetID_PEDIDOValue: Integer;
+begin
+  result := DataTable.Fields[idx_AlbaranesProveedor_DetallesID_PEDIDO].AsInteger;
+end;
+
+procedure TAlbaranesProveedor_DetallesDataTableRules.SetID_PEDIDOValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_AlbaranesProveedor_DetallesID_PEDIDO].AsInteger := aValue;
+end;
+
+function TAlbaranesProveedor_DetallesDataTableRules.GetID_PEDIDOIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_AlbaranesProveedor_DetallesID_PEDIDO].IsNull;
+end;
+
+procedure TAlbaranesProveedor_DetallesDataTableRules.SetID_PEDIDOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_AlbaranesProveedor_DetallesID_PEDIDO].AsVariant := Null;
+end;
+
 
 initialization
   RegisterDataTableRules(RID_AlbaranesProveedor, TAlbaranesProveedorDataTableRules);

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

@@ -9,13 +9,13 @@ 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_AlbaranesProveedorDelta = '{262D0052-9D3B-419A-B2F4-B52A68D8D3DB}';
+  RID_AlbaranesProveedorDelta = '{690BA5DB-9CB6-489D-9982-B1AE06408FB1}';
-  RID_AlbaranesProveedor_DetallesDelta = '{A33E831D-4454-40E5-BBBD-B367628D4A88}';
+  RID_AlbaranesProveedor_DetallesDelta = '{5432057E-0CF5-4D80-8595-C14DA2C23AD7}';
 
 type
   { IAlbaranesProveedorDelta }
   IAlbaranesProveedorDelta = interface(IAlbaranesProveedor)
-  ['{262D0052-9D3B-419A-B2F4-B52A68D8D3DB}']
+  ['{690BA5DB-9CB6-489D-9982-B1AE06408FB1}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -471,7 +471,7 @@ type
 
   { IAlbaranesProveedor_DetallesDelta }
   IAlbaranesProveedor_DetallesDelta = interface(IAlbaranesProveedor_Detalles)
-  ['{A33E831D-4454-40E5-BBBD-B367628D4A88}']
+  ['{5432057E-0CF5-4D80-8595-C14DA2C23AD7}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_ALBARANValue : Integer;
@@ -487,6 +487,7 @@ type
     function GetOldIMPORTE_PORTEValue : Currency;
     function GetOldREFERENCIAValue : String;
     function GetOldREFERENCIA_PROVEEDORValue : String;
+    function GetOldID_PEDIDOValue : Integer;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -503,6 +504,7 @@ type
     property OldIMPORTE_PORTE : Currency read GetOldIMPORTE_PORTEValue;
     property OldREFERENCIA : String read GetOldREFERENCIAValue;
     property OldREFERENCIA_PROVEEDOR : String read GetOldREFERENCIA_PROVEEDORValue;
+    property OldID_PEDIDO : Integer read GetOldID_PEDIDOValue;
   end;
 
   { TAlbaranesProveedor_DetallesBusinessProcessorRules }
@@ -594,6 +596,12 @@ type
     function GetOldREFERENCIA_PROVEEDORIsNull: Boolean; virtual;
     procedure SetREFERENCIA_PROVEEDORValue(const aValue: String); virtual;
     procedure SetREFERENCIA_PROVEEDORIsNull(const aValue: Boolean); virtual;
+    function GetID_PEDIDOValue: Integer; virtual;
+    function GetID_PEDIDOIsNull: Boolean; virtual;
+    function GetOldID_PEDIDOValue: Integer; virtual;
+    function GetOldID_PEDIDOIsNull: Boolean; virtual;
+    procedure SetID_PEDIDOValue(const aValue: Integer); virtual;
+    procedure SetID_PEDIDOIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -652,6 +660,10 @@ type
     property REFERENCIA_PROVEEDORIsNull : Boolean read GetREFERENCIA_PROVEEDORIsNull write SetREFERENCIA_PROVEEDORIsNull;
     property OldREFERENCIA_PROVEEDOR : String read GetOldREFERENCIA_PROVEEDORValue;
     property OldREFERENCIA_PROVEEDORIsNull : Boolean read GetOldREFERENCIA_PROVEEDORIsNull;
+    property ID_PEDIDO : Integer read GetID_PEDIDOValue write SetID_PEDIDOValue;
+    property ID_PEDIDOIsNull : Boolean read GetID_PEDIDOIsNull write SetID_PEDIDOIsNull;
+    property OldID_PEDIDO : Integer read GetOldID_PEDIDOValue;
+    property OldID_PEDIDOIsNull : Boolean read GetOldID_PEDIDOIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -2251,6 +2263,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedor_DetallesREFERENCIA_PROVEEDOR] := Null;
 end;
 
+function TAlbaranesProveedor_DetallesBusinessProcessorRules.GetID_PEDIDOValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedor_DetallesID_PEDIDO];
+end;
+
+function TAlbaranesProveedor_DetallesBusinessProcessorRules.GetID_PEDIDOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedor_DetallesID_PEDIDO]);
+end;
+
+function TAlbaranesProveedor_DetallesBusinessProcessorRules.GetOldID_PEDIDOValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesProveedor_DetallesID_PEDIDO];
+end;
+
+function TAlbaranesProveedor_DetallesBusinessProcessorRules.GetOldID_PEDIDOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesProveedor_DetallesID_PEDIDO]);
+end;
+
+procedure TAlbaranesProveedor_DetallesBusinessProcessorRules.SetID_PEDIDOValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedor_DetallesID_PEDIDO] := aValue;
+end;
+
+procedure TAlbaranesProveedor_DetallesBusinessProcessorRules.SetID_PEDIDOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesProveedor_DetallesID_PEDIDO] := Null;
+end;
+
 
 initialization
   RegisterBusinessProcessorRules(RID_AlbaranesProveedorDelta, TAlbaranesProveedorBusinessProcessorRules);

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

@@ -384,9 +384,10 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor
               'LE,'#10#10'    ALBARANES_PROVEEDOR_DETALLES.ID_ARTICULO, ALBARANES_PRO' +
               'VEEDOR_DETALLES.DESCUENTO,'#10'    ALBARANES_PROVEEDOR_DETALLES.IMPO' +
               'RTE_PORTE,'#10'    ARTICULOS.REFERENCIA, ARTICULOS.REFERENCIA_PROV a' +
-              's REFERENCIA_PROVEEDOR'#10#10'FROM ALBARANES_PROVEEDOR_DETALLES'#10'LEFT J' +
+              's REFERENCIA_PROVEEDOR,'#10'    ALBARANES_PROVEEDOR_DETALLES.ID_PEDI' +
-              'OIN ARTICULOS ON ALBARANES_PROVEEDOR_DETALLES.ID_ARTICULO = ARTI' +
+              'DO'#10#10'FROM ALBARANES_PROVEEDOR_DETALLES'#10'LEFT JOIN ARTICULOS ON ALB' +
-              'CULOS.ID'#10'WHERE {where}'#10'ORDER BY POSICION;'#10
+              'ARANES_PROVEEDOR_DETALLES.ID_ARTICULO = ARTICULOS.ID'#10'WHERE {wher' +
+              'e}'#10'ORDER BY POSICION;'#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -446,6 +447,10 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor
                 DatasetField = 'REFERENCIA_PROVEEDOR'
                 TableField = '<unknown>'
                 SQLOrigin = 'REFERENCIA_PROVEEDOR'
+              end
+              item
+                DatasetField = 'ID_PEDIDO'
+                TableField = 'ID_PEDIDO'
               end>
           end>
         Name = 'AlbaranesProveedor_Detalles'
@@ -526,6 +531,10 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor
             DataType = datString
             Size = 255
             DictionaryEntry = 'AlbaranesProveedor_Detalles_REFERENCIA_PROVEEDOR'
+          end
+          item
+            Name = 'ID_PEDIDO'
+            DataType = datInteger
           end>
       end>
     JoinDataTables = <>
@@ -914,6 +923,10 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor
           item
             Name = 'IMPORTE_PORTE'
             Value = ''
+          end
+          item
+            Name = 'ID_PEDIDO'
+            Value = ''
           end>
         Statements = <
           item
@@ -923,9 +936,10 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor
               'INSERT'#10'  INTO ALBARANES_PROVEEDOR_DETALLES'#10'    (CANTIDAD, POSICI' +
               'ON, ID, TIPO_DETALLE, CONCEPTO, IMPORTE_UNIDAD,'#10'     IMPORTE_TOT' +
               'AL, VISIBLE, ID_ALBARAN,'#10'     ID_ARTICULO, DESCUENTO, IMPORTE_PO' +
-              'RTE)'#10'  VALUES'#10'    (:CANTIDAD, :POSICION, :ID, :TIPO_DETALLE, :CO' +
+              'RTE, ID_PEDIDO)'#10'  VALUES'#10'    (:CANTIDAD, :POSICION, :ID, :TIPO_D' +
-              'NCEPTO,'#10'     :IMPORTE_UNIDAD, :IMPORTE_TOTAL, :VISIBLE, :ID_ALBA' +
+              'ETALLE, :CONCEPTO,'#10'     :IMPORTE_UNIDAD, :IMPORTE_TOTAL, :VISIBL' +
-              'RAN,'#10'     :ID_ARTICULO, :DESCUENTO, :IMPORTE_PORTE)'#10
+              'E, :ID_ALBARAN,'#10'     :ID_ARTICULO, :DESCUENTO, :IMPORTE_PORTE, :' +
+              'ID_PEDIDO)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -999,6 +1013,10 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor
             Name = 'IMPORTE_PORTE'
             Value = ''
           end
+          item
+            Name = 'ID_PEDIDO'
+            Value = ''
+          end
           item
             Name = 'OLD_ID'
             Value = ''
@@ -1014,7 +1032,8 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor
               ' = :IMPORTE_UNIDAD, '#10'    IMPORTE_TOTAL = :IMPORTE_TOTAL, '#10'    VI' +
               'SIBLE = :VISIBLE, '#10'    ID_ALBARAN = :ID_ALBARAN,'#10'    ID_ARTICULO' +
               ' = :ID_ARTICULO,'#10'    DESCUENTO = :DESCUENTO,'#10'    IMPORTE_PORTE =' +
-              ' :IMPORTE_PORTE'#10'  WHERE'#10'    (ID = :OLD_ID)'
+              ' :IMPORTE_PORTE,'#10'    ID_PEDIDO = :ID_PEDIDO'#10'  WHERE'#10'    (ID = :O' +
+              'LD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>

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

@@ -145,13 +145,13 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
     end
   end
   inherited pgPaginas: TPageControl
-    Width = 765
+    Width = 759
-    Height = 460
+    Height = 454
     ActivePage = pagContenido
     TabOrder = 1
     OnChanging = pgPaginasChanging
-    ExplicitWidth = 765
+    ExplicitWidth = 759
-    ExplicitHeight = 460
+    ExplicitHeight = 454
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
@@ -164,8 +164,8 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
       inline frViewDetallesAlbaranProveedor1: TfrViewDetallesAlbaranProveedor
         Left = 0
         Top = 0
-        Width = 757
+        Width = 751
-        Height = 432
+        Height = 426
         Align = alClient
         BiDiMode = bdLeftToRight
         Font.Charset = DEFAULT_CHARSET
@@ -177,17 +177,105 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitWidth = 757
+        ExplicitWidth = 751
-        ExplicitHeight = 432
+        ExplicitHeight = 426
         inherited ToolBar1: TToolBar
-          Width = 757
+          Width = 751
-          ExplicitWidth = 757
+          Height = 51
+          ExplicitWidth = 751
+          ExplicitHeight = 51
+          inherited ToolButton3: TToolButton
+            Wrap = False
+          end
+          inherited ToolButton4: TToolButton
+            Left = 278
+            Top = 0
+            ExplicitLeft = 278
+            ExplicitTop = 0
+          end
+          inherited ToolButton14: TToolButton [4]
+            Left = 334
+            Top = 0
+            ExplicitLeft = 334
+            ExplicitTop = 0
+          end
+          inherited FontName: TJvFontComboBox [5]
+            Left = 399
+            Top = 0
+            ExplicitLeft = 399
+            ExplicitTop = 0
+          end
+          inherited FontSize: TEdit
+            Left = 544
+            Top = 0
+            ExplicitLeft = 544
+            ExplicitTop = 0
+          end
+          inherited ToolButton13: TToolButton [7]
+            Left = 0
+            Top = 0
+            Wrap = True
+            ExplicitLeft = 0
+            ExplicitTop = 0
+            ExplicitHeight = 27
+          end
+          inherited UpDown1: TUpDown [8]
+            Left = 0
+            Top = 27
+            ExplicitLeft = 0
+            ExplicitTop = 27
+          end
+          inherited ToolButton6: TToolButton [9]
+            Left = 17
+            Top = 27
+            ExplicitLeft = 17
+            ExplicitTop = 27
+          end
+          inherited ToolButton7: TToolButton [10]
+            Left = 83
+            Top = 27
+            ExplicitLeft = 83
+            ExplicitTop = 27
+          end
+          inherited ToolButton8: TToolButton [11]
+            Left = 150
+            Top = 27
+            ExplicitLeft = 150
+            ExplicitTop = 27
+          end
+          inherited ToolButton12: TToolButton [12]
+            Left = 233
+            Top = 27
+            ExplicitLeft = 233
+            ExplicitTop = 27
+            ExplicitHeight = 22
+          end
+          inherited ToolButton9: TToolButton [13]
+            Left = 241
+            Top = 27
+            ExplicitLeft = 241
+            ExplicitTop = 27
+          end
+          inherited ToolButton10: TToolButton [14]
+            Left = 386
+            Top = 27
+            ExplicitLeft = 386
+            ExplicitTop = 27
+          end
+          inherited ToolButton11: TToolButton [15]
+            Left = 511
+            Top = 27
+            ExplicitLeft = 511
+            ExplicitTop = 27
+          end
         end
         inherited cxGrid: TcxGrid
-          Width = 757
+          Top = 77
-          Height = 360
+          Width = 751
-          ExplicitWidth = 757
+          Height = 349
-          ExplicitHeight = 360
+          ExplicitTop = 72
+          ExplicitWidth = 751
+          ExplicitHeight = 354
           inherited cxGridView: TcxGridDBTableView
             inherited cxGridViewIMPORTENETO: TcxGridDBColumn
               Options.Editing = True
@@ -195,10 +283,12 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
           end
         end
         inherited TBXDock1: TTBXDock
-          Width = 757
+          Top = 51
-          ExplicitWidth = 757
+          Width = 751
+          ExplicitTop = 51
+          ExplicitWidth = 751
           inherited TBXToolbar1: TTBXToolbar
-            ExplicitWidth = 548
+            ExplicitWidth = 626
           end
         end
       end
@@ -209,8 +299,8 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
       inline frViewIncidenciasCli: TfrViewIncidencias
         Left = 0
         Top = 0
-        Width = 757
+        Width = 751
-        Height = 432
+        Height = 426
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -220,20 +310,20 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitWidth = 757
+        ExplicitWidth = 751
-        ExplicitHeight = 432
+        ExplicitHeight = 426
         inherited pnlSup: TPanel
-          Width = 757
+          Width = 751
           ExplicitWidth = 757
           inherited eIncidenciaActiva: TcxDBCheckBox
             ExplicitHeight = 21
           end
         end
         inherited GroupBox1: TGroupBox
-          Width = 757
+          Width = 751
-          Height = 404
+          Height = 398
-          ExplicitWidth = 757
+          ExplicitWidth = 751
-          ExplicitHeight = 404
+          ExplicitHeight = 398
           inherited eIncidencias: TcxDBMemo
             ExplicitWidth = 734
             ExplicitHeight = 371

Source/Modulos/Almacenes/Almacenes_Group.groupproj

@@ -7,6 +7,7 @@
     <Projects Include="..\..\ApplicationBase\ApplicationBase.dproj" />
     <Projects Include="..\..\Base\Base.dproj" />
     <Projects Include="..\..\GUIBase\GUIBase.dproj" />
+    <Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
     <Projects Include="Controller\Almacenes_controller.dproj" />
     <Projects Include="Data\Almacenes_data.dproj" />
     <Projects Include="Model\Almacenes_model.dproj" />
@@ -17,7 +18,7 @@
     <Borland.Personality>Default.Personality</Borland.Personality>
     <Borland.ProjectType />
     <BorlandProject>
-  <BorlandProject xmlns=""> <Default.Personality> </Default.Personality> </BorlandProject></BorlandProject>
+<BorlandProject xmlns=""><Default.Personality></Default.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Target Name="Base">
     <MSBuild Projects="..\..\Base\Base.dproj" Targets="" />
@@ -91,14 +92,23 @@
   <Target Name="Almacenes_plugin:Make">
     <MSBuild Projects="Plugin\Almacenes_plugin.dproj" Targets="Make" />
   </Target>
+  <Target Name="FactuGES_Server">
+    <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="" />
+  </Target>
+  <Target Name="FactuGES_Server:Clean">
+    <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FactuGES_Server:Make">
+    <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
+  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Almacenes_model;Almacenes_data;Almacenes_controller;Almacenes_view;Almacenes_plugin" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Almacenes_model;Almacenes_data;Almacenes_controller;Almacenes_view;Almacenes_plugin;FactuGES_Server" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Almacenes_model:Clean;Almacenes_data:Clean;Almacenes_controller:Clean;Almacenes_view:Clean;Almacenes_plugin:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Almacenes_model:Clean;Almacenes_data:Clean;Almacenes_controller:Clean;Almacenes_view:Clean;Almacenes_plugin:Clean;FactuGES_Server:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Almacenes_model:Make;Almacenes_data:Make;Almacenes_controller:Make;Almacenes_view:Make;Almacenes_plugin:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Almacenes_model:Make;Almacenes_data:Make;Almacenes_controller:Make;Almacenes_view:Make;Almacenes_plugin:Make;FactuGES_Server:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>

Source/Modulos/Almacenes/Model/schAlmacenesClient_Intf.pas

@@ -9,7 +9,7 @@ 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_Almacenes = '{2C7335CF-335F-4E82-AEE3-BCD4BE4B4706}';
+  RID_Almacenes = '{EFF5A6F0-C500-4F72-8D24-5BD12C92E40E}';
 
   { Data table names }
   nme_Almacenes = 'Almacenes';
@@ -51,7 +51,7 @@ const
 type
   { IAlmacenes }
   IAlmacenes = interface(IDAStronglyTypedDataTable)
-  ['{CF373551-0AC4-4B83-90F6-AB8DB3BF1C4A}']
+  ['{104709AF-567B-415E-B54F-03C0A1BF65CA}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);

Source/Modulos/Almacenes/Model/schAlmacenesServer_Intf.pas

@@ -9,12 +9,12 @@ 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_AlmacenesDelta = '{7744482C-0E1F-4815-8945-935E26DB7BE8}';
+  RID_AlmacenesDelta = '{C73B6766-E3E1-4A09-8FFD-B9B7A7750CF1}';
 
 type
   { IAlmacenesDelta }
   IAlmacenesDelta = interface(IAlmacenes)
-  ['{7744482C-0E1F-4815-8945-935E26DB7BE8}']
+  ['{C73B6766-E3E1-4A09-8FFD-B9B7A7750CF1}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;

Source/Modulos/Almacenes/Servidor/srvAlmacenes_Impl.dfm

@@ -335,15 +335,15 @@ object srvAlmacenes: TsrvAlmacenes
           item
             ConnectionType = 'Interbase'
             Default = True
-            TargetTable = '[TABLENAME]'
+            TargetTable = 'ALMACENES'
             SQL = 
-              'INSERT'#10'  INTO "[TABLENAME]"'#10'    (ID, ID_EMPRESA, TIPO_ALMACEN, N' +
+              'INSERT'#10'  INTO ALMACENES'#10'    (ID, ID_EMPRESA, TIPO_ALMACEN, NOMBR' +
-              'OMBRE, CALLE, PROVINCIA, '#10'     POBLACION, CODIGO_POSTAL, TELEFON' +
+              'E, CALLE, PROVINCIA, '#10'     POBLACION, CODIGO_POSTAL, TELEFONO, M' +
-              'O, MOVIL, FAX, PERSONA_CONTACTO, '#10'     OBSERVACIONES, FECHA_ALTA' +
+              'OVIL, FAX, PERSONA_CONTACTO, '#10'     OBSERVACIONES, FECHA_ALTA, US' +
-              ', USUARIO)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, '#39'Almacen'#39', :NOMBRE, :' +
+              'UARIO)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, '#39'ALMACEN'#39', :NOMBRE, :CALL' +
-              'CALLE, :PROVINCIA,'#10'     :POBLACION, :CODIGO_POSTAL, :TELEFONO, :' +
+              'E, :PROVINCIA,'#10'     :POBLACION, :CODIGO_POSTAL, :TELEFONO, :MOVI' +
-              'MOVIL, :FAX, '#10'     :PERSONA_CONTACTO, :OBSERVACIONES, CURRENT_DA' +
+              'L, :FAX, '#10'     :PERSONA_CONTACTO, :OBSERVACIONES, CURRENT_DATE, ' +
-              'TE, :USUARIO)'#10
+              ':USUARIO)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -425,15 +425,15 @@ object srvAlmacenes: TsrvAlmacenes
           item
             ConnectionType = 'Interbase'
             Default = True
-            TargetTable = '[TABLENAME]'
+            TargetTable = 'ALMACENES'
             SQL = 
-              'UPDATE "[TABLENAME]"'#10'  SET '#10'    ID_EMPRESA = :ID_EMPRESA,'#10'    NO' +
+              'UPDATE ALMACENES'#10'  SET '#10'    ID_EMPRESA = :ID_EMPRESA,'#10'    NOMBRE' +
-              'MBRE = :NOMBRE,'#10'    CALLE = :CALLE, '#10'    PROVINCIA = :PROVINCIA,' +
+              ' = :NOMBRE,'#10'    CALLE = :CALLE, '#10'    PROVINCIA = :PROVINCIA, '#10'  ' +
-              ' '#10'    POBLACION = :POBLACION, '#10'    CODIGO_POSTAL = :CODIGO_POSTA' +
+              '  POBLACION = :POBLACION, '#10'    CODIGO_POSTAL = :CODIGO_POSTAL, '#10 +
-              'L, '#10'    TELEFONO = :TELEFONO, '#10'    MOVIL = :MOVIL, '#10'    FAX = :F' +
+              '    TELEFONO = :TELEFONO, '#10'    MOVIL = :MOVIL, '#10'    FAX = :FAX, ' +
-              'AX, '#10'    PERSONA_CONTACTO = :PERSONA_CONTACTO, '#10'    OBSERVACIONE' +
+              #10'    PERSONA_CONTACTO = :PERSONA_CONTACTO, '#10'    OBSERVACIONES = ' +
-              'S = :OBSERVACIONES, '#10'    FECHA_MODIFICACION = CURRENT_DATE,'#10'    ' +
+              ':OBSERVACIONES, '#10'    FECHA_MODIFICACION = CURRENT_DATE,'#10'    USUA' +
-              'USUARIO = :USUARIO'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
+              'RIO = :USUARIO'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>

Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas

@@ -16,6 +16,7 @@ type
   ['{6E156796-DB1F-4727-BBFB-FBAEF2E5C098}']
     procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; const ANuevaFila :Boolean = True);
     function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; Referencia: String; TipoReferencia: TEnumReferencia; AClienteID: Integer = -1; const ACantidad: Integer = 1): Boolean; overload;
+    function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; IDArticulo: Integer; AClienteID: Integer = -1; const ACantidad: Integer = 1): Boolean; overload;
     procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
     procedure CambiarSignoDetalles(ADetalles: IDAStronglyTypedDataTable; const AAll: Boolean = True);
     procedure AnadirConceptoInicial(ADetalles: IDAStronglyTypedDataTable; AConcepto: String);
@@ -38,6 +39,7 @@ type
 
   public
     function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; Referencia: String; TipoReferencia: TEnumReferencia; AClienteID: Integer = -1; const ACantidad: Integer = 1): Boolean; overload;
+    function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; IDArticulo: Integer; AClienteID: Integer = -1; const ACantidad: Integer = 1): Boolean; overload;
     procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; const ANuevaFila :Boolean = True); virtual;
     procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
     procedure CambiarSignoDetalles(ADetalles: IDAStronglyTypedDataTable; const AAll: Boolean = True);
@@ -128,6 +130,36 @@ begin
   end;
 end;
 
+function TControllerDetallesArticulos.AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; IDArticulo, AClienteID: Integer;
+  const ACantidad: Integer): Boolean;
+var
+  AArticulo: IBizArticulo;
+begin
+{
+  Añade el artículo con la referencia pasada por parametro a los detalles pasados por parametro
+  En el caso de asignar un AClienteID el articulo debe contener el descuento para ese cliente
+}
+  Result := False;
+  BeginUpdate(ADetalles);
+  ShowHourglassCursor;
+  try
+    AArticulo := FArticulosController.Buscar(IDArticulo, AClienteID);
+
+    if Assigned(AArticulo) then
+    begin
+      AArticulo.DataTable.Active := True;
+      if (AArticulo.RecordCount > 0) then
+      begin
+        RellenarDetalle(ADetalles, AArticulo, ACantidad);
+        Result := True;
+      end;
+    end;
+  finally
+    EndUpdate(ADetalles);
+    HideHourglassCursor;
+  end;
+end;
+
 procedure TControllerDetallesArticulos.AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; const ANuevaFila: Boolean);
 var
   AArticulos: IBizArticulo;

Source/Modulos/Inventario/Inventario_Group.groupproj

@@ -4,6 +4,7 @@
   </PropertyGroup>
   <ItemGroup />
   <ItemGroup>
+    <Projects Include="..\..\ApplicationBase\ApplicationBase.dproj" />
     <Projects Include="..\..\Base\Base.dproj" />
     <Projects Include="..\..\Cliente\FactuGES.dproj" />
     <Projects Include="..\..\GUIBase\GUIBase.dproj" />
@@ -40,6 +41,15 @@
   <Target Name="GUIBase:Make">
     <MSBuild Projects="..\..\GUIBase\GUIBase.dproj" Targets="Make" />
   </Target>
+  <Target Name="ApplicationBase">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="" />
+  </Target>
+  <Target Name="ApplicationBase:Clean">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="ApplicationBase:Make">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="Make" />
+  </Target>
   <Target Name="Contactos_view">
     <MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="" />
   </Target>
@@ -122,13 +132,13 @@
     <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
   </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;Contactos_view;Articulos_view;Inventario_model;Inventario_data;Inventario_controller;Inventario_view;Inventario_plugin;FactuGES;FactuGES_Server" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_view;Inventario_model;Inventario_data;Inventario_controller;Inventario_view;Inventario_plugin;FactuGES;FactuGES_Server" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;Contactos_view:Clean;Articulos_view:Clean;Inventario_model:Clean;Inventario_data:Clean;Inventario_controller:Clean;Inventario_view:Clean;Inventario_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_view:Clean;Inventario_model:Clean;Inventario_data:Clean;Inventario_controller:Clean;Inventario_view:Clean;Inventario_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;Contactos_view:Make;Articulos_view:Make;Inventario_model:Make;Inventario_data:Make;Inventario_controller:Make;Inventario_view:Make;Inventario_plugin:Make;FactuGES:Make;FactuGES_Server:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_view:Make;Inventario_model:Make;Inventario_data:Make;Inventario_controller:Make;Inventario_view:Make;Inventario_plugin:Make;FactuGES:Make;FactuGES_Server:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>

Source/Modulos/Inventario/Plugin/uPluginInventario.dfm

@@ -50,7 +50,6 @@ object PluginInventario: TPluginInventario
     object actInventario: TAction
       Category = 'Log'#237'stica'
       Caption = 'Inventario'
-      Enabled = False
       ImageIndex = 0
       OnExecute = actInventarioExecute
     end

Source/Modulos/Inventario/Views/uViewInventario.dfm

@@ -52,6 +52,7 @@ inherited frViewInventario: TfrViewInventario
       object cxGridViewID_ALMACEN: TcxGridDBColumn
         DataBinding.FieldName = 'ID_ALMACEN'
         Visible = False
+        VisibleForCustomization = False
       end
       object cxGridViewFAMILIA: TcxGridDBColumn
         Caption = 'Familia'
@@ -101,13 +102,17 @@ inherited frViewInventario: TfrViewInventario
       object cxGridViewPRECIO_NETO: TcxGridDBColumn
         DataBinding.FieldName = 'PRECIO_NETO'
         PropertiesClassName = 'TcxCurrencyEditProperties'
+        Visible = False
         HeaderAlignmentHorz = taRightJustify
+        VisibleForCustomization = False
       end
       object cxGridViewCOSTE_UNIDADES: TcxGridDBColumn
         DataBinding.FieldName = 'COSTE_UNIDADES'
         PropertiesClassName = 'TcxCurrencyEditProperties'
+        Visible = False
         FooterAlignmentHorz = taRightJustify
         HeaderAlignmentHorz = taRightJustify
+        VisibleForCustomization = False
       end
       object cxGridViewRESERVA: TcxGridDBColumn
         DataBinding.FieldName = 'RESERVA'
@@ -161,6 +166,9 @@ inherited frViewInventario: TfrViewInventario
       end
     end
   end
+  inherited pnlAgrupaciones: TTBXDockablePanel
+    ExplicitWidth = 554
+  end
   inherited dxComponentPrinter: TdxComponentPrinter
     inherited dxComponentPrinterLink: TdxGridReportLink
       ReportDocument.CreationDate = 38673.741107951390000000

Source/Modulos/Obras/Data/uDataModuleObras.dfm

@@ -31,6 +31,7 @@ inherited DataModuleObras: TDataModuleObras
         DataType = datAutoInc
         GeneratorName = 'GEN_ALMACENES_ID'
         Required = True
+        ServerAutoRefresh = True
         DictionaryEntry = 'Obras_ID'
         InPrimaryKey = True
       end

Source/Modulos/Obras/Model/Obras_model.dproj

@@ -41,7 +41,10 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Obras_model.dpk</Source></Source><Excluded_Packages>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Obras_model.dpk</Source></Source><Excluded_Packages>
+      
+      
+      
       <Excluded_Packages Name="$(BDS)\bin\applet100.bpl">CodeGear Control Panel Applet Package</Excluded_Packages>
     </Excluded_Packages></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>

Source/Modulos/Obras/Model/schObrasClient_Intf.pas

@@ -3,13 +3,13 @@ unit schObrasClient_Intf;
 interface
 
 uses
-  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_Obras = '{927DED8A-A584-4D02-9453-3251ED3BEE55}';
+  RID_Obras = '{0EF52B9A-E0CA-496B-B4E5-0F1CCE22F8B2}';
 
   { Data table names }
   nme_Obras = 'Obras';
@@ -59,7 +59,7 @@ const
 type
   { IObras }
   IObras = interface(IDAStronglyTypedDataTable)
-  ['{6614086B-6CF1-4B8F-AE93-DF04EE439FA2}']
+  ['{97F3636B-5BD8-40D9-8BF9-BF90DA4AC15B}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -180,7 +180,7 @@ type
   end;
 
   { TObrasDataTableRules }
-  TObrasDataTableRules = class(TIntfObjectDADataTableRules, IObras)
+  TObrasDataTableRules = class(TDADataTableRules, IObras)
   private
     f_OBSERVACIONES: IROStrings;
     procedure OBSERVACIONES_OnChange(Sender: TObject);

Source/Modulos/Obras/Model/schObrasServer_Intf.pas

@@ -9,12 +9,12 @@ 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_ObrasDelta = '{44665455-E349-4CA4-AAB6-2AFE8C829C04}';
+  RID_ObrasDelta = '{4F9A8678-7DAE-41FE-8D6A-E057807C57FA}';
 
 type
   { IObrasDelta }
   IObrasDelta = interface(IObras)
-  ['{44665455-E349-4CA4-AAB6-2AFE8C829C04}']
+  ['{4F9A8678-7DAE-41FE-8D6A-E057807C57FA}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;

Source/Modulos/Obras/Servidor/srvObras_Impl.dfm

@@ -70,6 +70,7 @@ object srvObras: TsrvObras
         GeneratorName = 'GEN_ALMACENES_ID'
         Required = True
         DisplayLabel = 'ID'
+        ServerAutoRefresh = True
       end
       item
         Name = 'Obras_ID_EMPRESA'
@@ -223,6 +224,7 @@ object srvObras: TsrvObras
             Name = 'ID'
             DataType = datAutoInc
             GeneratorName = 'GEN_ALMACENES_ID'
+            ServerAutoRefresh = True
             DictionaryEntry = 'Obras_ID'
             InPrimaryKey = True
           end
@@ -395,12 +397,13 @@ object srvObras: TsrvObras
             Default = True
             TargetTable = 'ALMACENES'
             SQL = 
-              'INSERT'#10'  INTO ALMACENES'#10'    (ID, ID_EMPRESA, NOMBRE, CALLE, PROV' +
+              'INSERT'#10'  INTO ALMACENES'#10'    (ID, ID_EMPRESA, TIPO_ALMACEN, NOMBR' +
-              'INCIA, POBLACION, CODIGO_POSTAL,'#10'     TELEFONO, MOVIL, FAX, PERS' +
+              'E, CALLE, PROVINCIA, POBLACION, CODIGO_POSTAL,'#10'     TELEFONO, MO' +
-              'ONA_CONTACTO, OBSERVACIONES, '#10'     FECHA_ALTA, USUARIO)'#10'  VALUES' +
+              'VIL, FAX, PERSONA_CONTACTO, OBSERVACIONES, '#10'     FECHA_ALTA, USU' +
-              #10'    (:ID, :ID_EMPRESA, :NOMBRE, :CALLE, :PROVINCIA, :POBLACION,' +
+              'ARIO)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, '#39'OBRA'#39', :NOMBRE, :CALLE, :' +
-              #10'     :CODIGO_POSTAL, :TELEFONO, :MOVIL, :FAX, :PERSONA_CONTACTO' +
+              'PROVINCIA, :POBLACION,'#10'     :CODIGO_POSTAL, :TELEFONO, :MOVIL, :' +
-              ', '#10'     :OBSERVACIONES, CURRENT_DATE, :USUARIO)'#10
+              'FAX, :PERSONA_CONTACTO, '#10'     :OBSERVACIONES, CURRENT_DATE, :USU' +
+              'ARIO)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -593,9 +596,8 @@ object srvObras: TsrvObras
     DeleteCommandName = 'Delete_Obras'
     UpdateCommandName = 'Update_Obras'
     ReferencedDataset = 'Obras'
-    ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands]
+    ProcessorOptions = [poPrepareCommands]
     UpdateMode = updWhereKeyOnly
-    RaiseExceptionAtError = True
     Left = 248
     Top = 24
   end

Source/Modulos/Obras/Servidor/srvObras_Impl.pas

@@ -63,7 +63,6 @@ end;
 procedure TsrvObras.DARemoteServiceCreate(Sender: TObject);
 begin
   SessionManager := dmServer.SessionManager;
-
   bpObras.BusinessRulesID := BIZ_SERVER_OBRA;
 end;
 

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

@@ -324,7 +324,12 @@ inherited DataModulePedidosProveedor: TDataModulePedidosProveedor
         DisplayLabel = 'Ref. proveedor'
         DictionaryEntry = 'PedidosProveedor_Detalles_REFERENCIA_PROVEEDOR'
       end>
-    Params = <>
+    Params = <
+      item
+        Name = 'ID'
+        Value = ''
+        ParamType = daptInput
+      end>
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteDataAdapter = rda_PedidosProveedor
     DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]

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

@@ -3,15 +3,15 @@ unit schPedidosProveedorClient_Intf;
 interface
 
 uses
-  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_PedidosProveedor = '{1CF81156-64C1-4FFB-9BA8-4A2F34CF3BB2}';
+  RID_PedidosProveedor = '{BF69E780-7218-4D16-8D06-93922A90C263}';
-  RID_PedidosProveedor_Detalles = '{E983623D-377F-457F-B248-BC3FE9E581B1}';
+  RID_PedidosProveedor_Detalles = '{325616FD-4D4C-4966-ABB4-DA61F028808A}';
-  RID_PedidosProveedor_Articulos_Pendientes = '{0948DD42-EC15-48E7-A5A4-0F3DF630BDEF}';
+  RID_PedidosProveedor_Articulos_Pendientes = '{CC923862-B303-4114-BCE9-390F29227B57}';
 
   { Data table names }
   nme_PedidosProveedor = 'PedidosProveedor';
@@ -151,7 +151,7 @@ const
 type
   { IPedidosProveedor }
   IPedidosProveedor = interface(IDAStronglyTypedDataTable)
-  ['{C489C7DC-C83D-4A64-94D5-ADA513CD2C1E}']
+  ['{86B0C6FE-F4C2-4D08-B550-9B28424DC65F}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -379,7 +379,7 @@ type
   end;
 
   { TPedidosProveedorDataTableRules }
-  TPedidosProveedorDataTableRules = class(TIntfObjectDADataTableRules, IPedidosProveedor)
+  TPedidosProveedorDataTableRules = class(TDADataTableRules, IPedidosProveedor)
   private
     f_OBSERVACIONES: IROStrings;
     f_INCIDENCIAS: IROStrings;
@@ -618,7 +618,7 @@ type
 
   { IPedidosProveedor_Detalles }
   IPedidosProveedor_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{7E0C0A15-D909-4826-AE8E-7B10A4E20F96}']
+  ['{F6C135F0-A6F6-4575-B95A-6C09F48B8AF7}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -722,7 +722,7 @@ type
   end;
 
   { TPedidosProveedor_DetallesDataTableRules }
-  TPedidosProveedor_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IPedidosProveedor_Detalles)
+  TPedidosProveedor_DetallesDataTableRules = class(TDADataTableRules, IPedidosProveedor_Detalles)
   private
   protected
     { Property getters and setters }
@@ -833,7 +833,7 @@ type
 
   { IPedidosProveedor_Articulos_Pendientes }
   IPedidosProveedor_Articulos_Pendientes = interface(IDAStronglyTypedDataTable)
-  ['{F29B11FD-AB7A-4A83-AE4D-5C8BD44D8D38}']
+  ['{6B40F639-92F1-4D42-A5F7-FEEEDAA1990A}']
     { Property getters and setters }
     function GetID_PEDIDOValue: Integer;
     procedure SetID_PEDIDOValue(const aValue: Integer);
@@ -877,7 +877,7 @@ type
   end;
 
   { TPedidosProveedor_Articulos_PendientesDataTableRules }
-  TPedidosProveedor_Articulos_PendientesDataTableRules = class(TIntfObjectDADataTableRules, IPedidosProveedor_Articulos_Pendientes)
+  TPedidosProveedor_Articulos_PendientesDataTableRules = class(TDADataTableRules, IPedidosProveedor_Articulos_Pendientes)
   private
   protected
     { Property getters and setters }

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

@@ -9,14 +9,14 @@ 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_PedidosProveedorDelta = '{196C6489-D928-4C44-9BF8-805217F34B48}';
+  RID_PedidosProveedorDelta = '{22716888-D480-4353-8839-68A6CF4AC29C}';
-  RID_PedidosProveedor_DetallesDelta = '{164697E4-3417-4195-9B7B-5DD7D5FF5C2D}';
+  RID_PedidosProveedor_DetallesDelta = '{D1D10F76-2A35-46FF-84AA-50A16F7F3E53}';
-  RID_PedidosProveedor_Articulos_PendientesDelta = '{95000330-646B-489B-9300-A0B22EB9A7A6}';
+  RID_PedidosProveedor_Articulos_PendientesDelta = '{DD6B9A4F-AF66-4725-9ABE-D62CB27BAC83}';
 
 type
   { IPedidosProveedorDelta }
   IPedidosProveedorDelta = interface(IPedidosProveedor)
-  ['{196C6489-D928-4C44-9BF8-805217F34B48}']
+  ['{22716888-D480-4353-8839-68A6CF4AC29C}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -484,7 +484,7 @@ type
 
   { IPedidosProveedor_DetallesDelta }
   IPedidosProveedor_DetallesDelta = interface(IPedidosProveedor_Detalles)
-  ['{164697E4-3417-4195-9B7B-5DD7D5FF5C2D}']
+  ['{D1D10F76-2A35-46FF-84AA-50A16F7F3E53}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_PEDIDOValue : Integer;
@@ -698,7 +698,7 @@ type
 
   { IPedidosProveedor_Articulos_PendientesDelta }
   IPedidosProveedor_Articulos_PendientesDelta = interface(IPedidosProveedor_Articulos_Pendientes)
-  ['{95000330-646B-489B-9300-A0B22EB9A7A6}']
+  ['{DD6B9A4F-AF66-4725-9ABE-D62CB27BAC83}']
     { Property getters and setters }
     function GetOldID_PEDIDOValue : Integer;
     function GetOldREFERENCIAValue : String;

Source/Modulos/Pedidos a proveedor/PedidosProveedor_Group.groupproj

@@ -4,14 +4,20 @@
   </PropertyGroup>
   <ItemGroup />
   <ItemGroup>
+    <Projects Include="..\..\ApplicationBase\ApplicationBase.dproj" />
     <Projects Include="..\..\Base\Base.dproj" />
     <Projects Include="..\..\Cliente\FactuGES.dproj" />
     <Projects Include="..\..\GUIBase\GUIBase.dproj" />
     <Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
+    <Projects Include="..\Albaranes de cliente\Data\AlbaranesCliente_data.dproj" />
+    <Projects Include="..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dproj" />
+    <Projects Include="..\Albaranes de proveedor\Data\AlbaranesProveedor_data.dproj" />
     <Projects Include="..\Articulos\Controller\Articulos_controller.dproj" />
     <Projects Include="..\Articulos\Views\Articulos_view.dproj" />
     <Projects Include="..\Contactos\Controller\Contactos_controller.dproj" />
     <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
+    <Projects Include="..\Inventario\Controller\Inventario_controller.dproj" />
+    <Projects Include="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" />
     <Projects Include="Controller\PedidosProveedor_controller.dproj" />
     <Projects Include="Data\PedidosProveedor_data.dproj" />
     <Projects Include="Model\PedidosProveedor_model.dproj" />
@@ -141,14 +147,68 @@
   <Target Name="FactuGES_Server:Make">
     <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
   </Target>
+  <Target Name="PedProv_AlbProv_relation">
+    <MSBuild Projects="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" Targets="" />
+  </Target>
+  <Target Name="PedProv_AlbProv_relation:Clean">
+    <MSBuild Projects="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="PedProv_AlbProv_relation:Make">
+    <MSBuild Projects="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" Targets="Make" />
+  </Target>
+  <Target Name="AlbaranesProveedor_controller">
+    <MSBuild Projects="..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dproj" Targets="" />
+  </Target>
+  <Target Name="AlbaranesProveedor_controller:Clean">
+    <MSBuild Projects="..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="AlbaranesProveedor_controller:Make">
+    <MSBuild Projects="..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Inventario_controller">
+    <MSBuild Projects="..\Inventario\Controller\Inventario_controller.dproj" Targets="" />
+  </Target>
+  <Target Name="Inventario_controller:Clean">
+    <MSBuild Projects="..\Inventario\Controller\Inventario_controller.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Inventario_controller:Make">
+    <MSBuild Projects="..\Inventario\Controller\Inventario_controller.dproj" Targets="Make" />
+  </Target>
+  <Target Name="ApplicationBase">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="" />
+  </Target>
+  <Target Name="ApplicationBase:Clean">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="ApplicationBase:Make">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="Make" />
+  </Target>
+  <Target Name="AlbaranesProveedor_data">
+    <MSBuild Projects="..\Albaranes de proveedor\Data\AlbaranesProveedor_data.dproj" Targets="" />
+  </Target>
+  <Target Name="AlbaranesProveedor_data:Clean">
+    <MSBuild Projects="..\Albaranes de proveedor\Data\AlbaranesProveedor_data.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="AlbaranesProveedor_data:Make">
+    <MSBuild Projects="..\Albaranes de proveedor\Data\AlbaranesProveedor_data.dproj" Targets="Make" />
+  </Target>
+  <Target Name="AlbaranesCliente_data">
+    <MSBuild Projects="..\Albaranes de cliente\Data\AlbaranesCliente_data.dproj" Targets="" />
+  </Target>
+  <Target Name="AlbaranesCliente_data:Clean">
+    <MSBuild Projects="..\Albaranes de cliente\Data\AlbaranesCliente_data.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="AlbaranesCliente_data:Make">
+    <MSBuild Projects="..\Albaranes de cliente\Data\AlbaranesCliente_data.dproj" Targets="Make" />
+  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;Contactos_controller;Contactos_view;Articulos_controller;Articulos_view;PedidosProveedor_model;PedidosProveedor_data;PedidosProveedor_controller;PedidosProveedor_view;PedidosProveedor_plugin;FactuGES;FactuGES_Server" />
+    <CallTarget Targets="Base;GUIBase;Contactos_controller;Contactos_view;Articulos_controller;Articulos_view;PedidosProveedor_model;PedidosProveedor_data;PedidosProveedor_controller;PedidosProveedor_view;PedidosProveedor_plugin;FactuGES;FactuGES_Server;PedProv_AlbProv_relation;AlbaranesProveedor_controller;Inventario_controller;ApplicationBase;AlbaranesProveedor_data;AlbaranesCliente_data" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_controller:Clean;Articulos_view:Clean;PedidosProveedor_model:Clean;PedidosProveedor_data:Clean;PedidosProveedor_controller:Clean;PedidosProveedor_view:Clean;PedidosProveedor_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_controller:Clean;Articulos_view:Clean;PedidosProveedor_model:Clean;PedidosProveedor_data:Clean;PedidosProveedor_controller:Clean;PedidosProveedor_view:Clean;PedidosProveedor_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;PedProv_AlbProv_relation:Clean;AlbaranesProveedor_controller:Clean;Inventario_controller:Clean;ApplicationBase:Clean;AlbaranesProveedor_data:Clean;AlbaranesCliente_data:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_controller:Make;Articulos_view:Make;PedidosProveedor_model:Make;PedidosProveedor_data:Make;PedidosProveedor_controller:Make;PedidosProveedor_view:Make;PedidosProveedor_plugin:Make;FactuGES:Make;FactuGES_Server:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_controller:Make;Articulos_view:Make;PedidosProveedor_model:Make;PedidosProveedor_data:Make;PedidosProveedor_controller:Make;PedidosProveedor_view:Make;PedidosProveedor_plugin:Make;FactuGES:Make;FactuGES_Server:Make;PedProv_AlbProv_relation:Make;AlbaranesProveedor_controller:Make;Inventario_controller:Make;ApplicationBase:Make;AlbaranesProveedor_data:Make;AlbaranesCliente_data:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>

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

@@ -562,7 +562,12 @@ object srvPedidosProveedor: TsrvPedidosProveedor
           end>
       end
       item
-        Params = <>
+        Params = <
+          item
+            Name = 'ID'
+            Value = ''
+            ParamType = daptInput
+          end>
         Statements = <
           item
             Connection = 'IBX'
@@ -574,7 +579,8 @@ object srvPedidosProveedor: TsrvPedidosProveedor
               'IENTE as CANTIDAD,'#10'       ARTICULOS.REFERENCIA_PROV as REFERENCI' +
               'A_PROVEEDOR'#10#10'FROM V_PED_PROV_ARTICULOS'#10'LEFT JOIN ARTICULOS ON (A' +
               'RTICULOS.ID = V_PED_PROV_ARTICULOS.ID_ARTICULO)'#10'WHERE (V_PED_PRO' +
-              'V_ARTICULOS.CANTIDAD_PENDIENTE <> 0)'#10#10
+              'V_ARTICULOS.CANTIDAD_PENDIENTE <> 0)'#10'AND (V_PED_PROV_ARTICULOS.I' +
+              'D_PEDIDO = :ID)'#10#10
             StatementType = stSQL
             ColumnMappings = <
               item

Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dpk

@@ -45,7 +45,8 @@ requires
   cxDataD11,
   dbrtl,
   vcljpg,
-  vcldb;
+  vcldb,
+  PedProv_AlbProv_relation;
 
 contains
   uPedidosProveedorViewRegister in 'uPedidosProveedorViewRegister.pas',

Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj

@@ -49,27 +49,28 @@
     <DelphiCompile Include="PedidosProveedor_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="C:\Documents and Settings\Usuario\Almacenes_controller.dcp" />
+    <DCCReference Include="..\..\Lib\Almacenes_controller.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Almacenes_model.dcp" />
+    <DCCReference Include="..\..\Lib\Almacenes_model.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Articulos_view.dcp" />
+    <DCCReference Include="..\..\Lib\Articulos_view.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" />
+    <DCCReference Include="..\..\Lib\Contactos_controller.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
+    <DCCReference Include="..\..\Lib\Contactos_model.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_view.dcp" />
+    <DCCReference Include="..\..\Lib\Contactos_view.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
+    <DCCReference Include="..\..\Lib\cxDataD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
+    <DCCReference Include="..\..\Lib\cxEditorsD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
+    <DCCReference Include="..\..\Lib\cxLibraryD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="..\..\Lib\dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\..\Lib\dxGDIPlusD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
+    <DCCReference Include="..\..\Lib\dxThemeD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
+    <DCCReference Include="..\..\Lib\GUIBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Obras_controller.dcp" />
+    <DCCReference Include="..\..\Lib\Obras_controller.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Obras_model.dcp" />
+    <DCCReference Include="..\..\Lib\Obras_model.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_controller.dcp" />
+    <DCCReference Include="..\..\Lib\PedidosProveedor_controller.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_model.dcp" />
+    <DCCReference Include="..\..\Lib\PedidosProveedor_model.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="..\..\Lib\PedProv_AlbProv_relation.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="..\..\Lib\rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
+    <DCCReference Include="..\..\Lib\vcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
+    <DCCReference Include="..\..\Lib\vcldb.dcp" />
+    <DCCReference Include="..\..\Lib\vcljpg.dcp" />
     <DCCReference Include="uEditorDireccionEntregaPedidoProveedor.pas">
       <Form>fEditorDireccionEntregaPedidoProveedor </Form>
       <DesignClass>TfEditorDireccionEntregaPedidoProveedor</DesignClass>

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

@@ -59,10 +59,11 @@ implementation
 
 uses
   uDataModulePedidosProveedor, uDataModuleUsuarios, uFactuGES_App, uEditorDBBase,
+  uGenerarAlbaranesProvUtils,
 //  uInventarioController, uBizInventario,
   uDialogUtils, uGridUtils, uDBSelectionListUtils;
 //  uAlbaranesProveedorController, uBizAlbaranesProveedor,
-//  uGenerarPedidosProvUtils, uGenerarAlbaranesProvUtils;
+//  uGenerarPedidosProvUtils, ;
 
 {$R *.dfm}
 
@@ -87,12 +88,9 @@ end;
 
 procedure TfEditorPedidosProveedor.actRecibirPedidoExecute(Sender: TObject);
 begin
-AppFactuGES.ShowCapado;
-{
   inherited;
-//  RecibirPedidoProv(FPedidos);
+  RecibirPedidoProv(FPedidos);
   actRefrescar.Execute;
-}  
 end;
 
 procedure TfEditorPedidosProveedor.actRecibirPedidoUpdate(Sender: TObject);

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

@@ -8,8 +8,8 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor
     Height = 361
     RootLevelOptions.DetailTabsPosition = dtpTop
     OnActiveTabChanged = cxGridActiveTabChanged
-    ExplicitWidth = 596
+    ExplicitWidth = 839
-    ExplicitHeight = 351
+    ExplicitHeight = 361
     inherited cxGridView: TcxGridDBTableView
       OnMouseMove = cxGridViewMouseMove
       DataController.KeyFieldNames = 'ID'
@@ -172,12 +172,12 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor
   end
   inherited frViewFiltroBase1: TfrViewFiltroBase
     Width = 839
-    ExplicitWidth = 596
+    ExplicitWidth = 839
     inherited TBXDockablePanel1: TTBXDockablePanel
-      ExplicitWidth = 596
+      ExplicitWidth = 839
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 839
-        ExplicitWidth = 596
+        ExplicitWidth = 839
         inherited txtFiltroTodo: TcxTextEdit
           ExplicitWidth = 273
           Width = 273
@@ -195,10 +195,10 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 839
-        ExplicitWidth = 596
+        ExplicitWidth = 839
         inherited tbxBotones: TTBXToolbar
           Width = 829
-          ExplicitWidth = 586
+          ExplicitWidth = 829
         end
       end
     end
@@ -206,14 +206,14 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor
   inherited pnlAgrupaciones: TTBXDockablePanel
     Top = 463
     Visible = True
-    ExplicitTop = 453
+    ExplicitTop = 463
-    ExplicitWidth = 596
+    ExplicitWidth = 839
     inherited TBXAlignmentPanel1: TTBXAlignmentPanel
       Width = 839
-      ExplicitWidth = 596
+      ExplicitWidth = 839
       inherited TBXToolbar1: TTBXToolbar
         Width = 829
-        ExplicitWidth = 586
+        ExplicitWidth = 829
         object TBXSeparatorItem2: TTBXSeparatorItem
         end
         object TBXItem3: TTBXItem

Source/Modulos/Relaciones/Pedidos de cliente - Albaranes de cliente/uGenerarAlbaranesCliUtils.pas

@@ -104,6 +104,7 @@ begin
         begin
           ADetallesController.Add(ADetalles, TIPO_DETALLE_CONCEPTO);
           ADetalles.Edit;
+          ADetalles.ID_PEDIDO := APedido.Detalles.ID_PEDIDO;          
           ADetalles.REFERENCIA := APedido.Detalles.REFERENCIA;
           ADetalles.ID_ARTICULO := APedido.Detalles.ID_ARTICULO;
           ADetalles.CONCEPTO := APedido.Detalles.CONCEPTO;

Source/Modulos/Relaciones/Pedidos de proveedor - Albaranes de proveedor/PedProv_AlbProv_relation.dpk

@@ -27,7 +27,6 @@ package PedProv_AlbProv_relation;
 requires
   rtl,
   Base,
-  ControllerBase,
   Contactos_model,
   Contactos_controller,
   PNG_D10,

Source/Modulos/Relaciones/Pedidos de proveedor - Albaranes de proveedor/PedProv_AlbProv_relation.dproj

@@ -36,50 +36,12 @@
     <DCC_ResourcePath>..\..\..\Lib;..\..\Lib</DCC_ResourcePath>
     <DCC_ObjPath>..\..\..\Lib;..\..\Lib</DCC_ObjPath>
     <DCC_IncludePath>..\..\..\Lib;..\..\Lib</DCC_IncludePath>
-    <DCC_Define>DEBUG</DCC_Define>
   </PropertyGroup>
   <ProjectExtensions>
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject xmlns=""> <Delphi.Personality>   <Parameters>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      <Parameters Name="UseLauncher">False</Parameters>
-      <Parameters Name="LoadAllSymbols">True</Parameters>
-      <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
-    </Parameters>
-    <Package_Options>
-      <Package_Options Name="ImplicitBuild">False</Package_Options>
-      <Package_Options Name="DesigntimeOnly">False</Package_Options>
-      <Package_Options Name="RuntimeOnly">False</Package_Options>
-    </Package_Options>
-    <VersionInfo>
-      <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
-      <VersionInfo Name="AutoIncBuild">False</VersionInfo>
-      <VersionInfo Name="MajorVer">1</VersionInfo>
-      <VersionInfo Name="MinorVer">0</VersionInfo>
-      <VersionInfo Name="Release">0</VersionInfo>
-      <VersionInfo Name="Build">0</VersionInfo>
-      <VersionInfo Name="Debug">False</VersionInfo>
-      <VersionInfo Name="PreRelease">False</VersionInfo>
-      <VersionInfo Name="Special">False</VersionInfo>
-      <VersionInfo Name="Private">False</VersionInfo>
-      <VersionInfo Name="DLL">False</VersionInfo>
-      <VersionInfo Name="Locale">3082</VersionInfo>
-      <VersionInfo Name="CodePage">1252</VersionInfo>
-    </VersionInfo>
-    <VersionInfoKeys>
-      <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
-      <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
-      <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
-      <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
-      <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
-      <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
-      <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
-      <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
-      <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
-      <VersionInfoKeys Name="Comments"></VersionInfoKeys>
-    </VersionInfoKeys>
-    <Excluded_Packages>
       
       
       
@@ -188,36 +150,514 @@
       <Excluded_Packages Name="T:\Bpl_D10\SMExportD2006.bpl">SMExport suite: data export from dataset. Written by Mike Shkolnik/Scalabium, 1998-2004.</Excluded_Packages>
       <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl">Intraweb 8.0 Design Package for Borland Development Studio 2006</Excluded_Packages>
       <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclie100.bpl">Internet Explorer Components</Excluded_Packages>
-    </Excluded_Packages>
+    </Excluded_Packages><Source><Source Name="MainSource">PedProv_AlbProv_relation.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
-    <Source>
-      <Source Name="MainSource">PedProv_AlbProv_relation.dpk</Source>
-    </Source>
-  </Delphi.Personality> </BorlandProject></BorlandProject>
   </ProjectExtensions>
-  <ItemGroup />
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
     <DelphiCompile Include="PedProv_AlbProv_relation.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\Albaranes de proveedor\AlbaranesProveedor_controller.dcp" />
+    <DCCReference Include="AlbaranesProveedor_controller.dcp" />
-    <DCCReference Include="..\..\Albaranes de proveedor\AlbaranesProveedor_model.dcp" />
+    <DCCReference Include="AlbaranesProveedor_model.dcp" />
-    <DCCReference Include="..\..\Albaranes de proveedor\Base.dcp" />
+    <DCCReference Include="Base.dcp" />
-    <DCCReference Include="..\..\Albaranes de proveedor\Contactos_controller.dcp" />
+    <DCCReference Include="Contactos_controller.dcp" />
-    <DCCReference Include="..\..\Albaranes de proveedor\Contactos_model.dcp" />
+    <DCCReference Include="Contactos_model.dcp" />
-    <DCCReference Include="..\..\Albaranes de proveedor\ControllerBase.dcp" />
+    <DCCReference Include="designide.dcp" />
-    <DCCReference Include="..\..\Albaranes de proveedor\designide.dcp" />
+    <DCCReference Include="Inventario_controller.dcp" />
-    <DCCReference Include="..\..\Albaranes de proveedor\Inventario_controller.dcp" />
+    <DCCReference Include="Inventario_model.dcp" />
-    <DCCReference Include="..\..\Albaranes de proveedor\Inventario_model.dcp" />
+    <DCCReference Include="JSDialog100.dcp" />
-    <DCCReference Include="..\..\Albaranes de proveedor\JSDialog100.dcp" />
+    <DCCReference Include="PedidosProveedor_controller.dcp" />
-    <DCCReference Include="..\..\Albaranes de proveedor\PedidosProveedor_controller.dcp" />
+    <DCCReference Include="PedidosProveedor_model.dcp" />
-    <DCCReference Include="..\..\Albaranes de proveedor\PedidosProveedor_model.dcp" />
+    <DCCReference Include="PNG_D10.dcp" />
-    <DCCReference Include="..\..\Albaranes de proveedor\PNG_D10.dcp" />
+    <DCCReference Include="rtl.dcp" />
-    <DCCReference Include="..\..\Albaranes de proveedor\rtl.dcp" />
-    <DCCReference Include="..\..\Albaranes de proveedor\vcl.dcp" />
-    <DCCReference Include="..\..\Albaranes de proveedor\vclactnband.dcp" />
-    <DCCReference Include="..\..\Albaranes de proveedor\vclx.dcp" />
-    <DCCReference Include="..\..\Albaranes de proveedor\xmlrtl.dcp" />
     <DCCReference Include="uGenerarAlbaranesProvUtils.pas" />
+    <DCCReference Include="vcl.dcp" />
+    <DCCReference Include="vclactnband.dcp" />
+    <DCCReference Include="vclx.dcp" />
+    <DCCReference Include="xmlrtl.dcp" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+</Project>
-</Project>
+
+<!-- EurekaLog First Line
+[Exception Log]
+EurekaLog Version=6011
+Activate=0
+Activate Handle=1
+Save Log File=1
+Foreground Tab=0
+Freeze Activate=0
+Freeze Timeout=0
+SMTP From=eurekalog@email.com
+SMTP Host=
+SMTP Port=25
+SMTP UserID=
+SMTP Password=
+Append to Log=0
+TerminateBtn Operation=2
+Errors Number=32
+Errors Terminate=3
+Email Address=
+Email Object=
+Email Send Options=0
+Output Path=
+Encrypt Password=
+AutoCloseDialogSecs=0
+WebSendMode=0
+SupportULR=
+HTMLLayout Count=15
+HTMLLine0="%3Chtml%3E"
+HTMLLine1="  %3Chead%3E"
+HTMLLine2="  %3C/head%3E"
+HTMLLine3="  %3Cbody TopMargin=10 LeftMargin=10%3E"
+HTMLLine4="    %3Ctable width="100%%" border="0"%3E"
+HTMLLine5="      %3Ctr%3E"
+HTMLLine6="        %3Ctd nowrap%3E"
+HTMLLine7="          %3Cfont face="Lucida Console, Courier" size="2"%3E"
+HTMLLine8="            %3C%%HTML_TAG%%%3E"
+HTMLLine9="          %3C/font%3E"
+HTMLLine10="        %3C/td%3E"
+HTMLLine11="      %3C/tr%3E"
+HTMLLine12="    %3C/table%3E"
+HTMLLine13="  %3C/body%3E"
+HTMLLine14="%3C/html%3E"
+AutoCrashOperation=2
+AutoCrashNumber=10
+AutoCrashMinutes=1
+WebURL=
+WebUserID=
+WebPassword=
+WebPort=0
+AttachedFiles=
+ProxyURL=
+ProxyUser=
+ProxyPassword=
+ProxyPort=8080
+TrakerUser=
+TrakerPassword=
+TrakerAssignTo=
+TrakerProject=
+TrakerCategory=
+TrakerTrialID=
+ZipPassword=
+PreBuildEvent=
+PostSuccessfulBuildEvent=
+PostFailureBuildEvent=
+ExceptionDialogType=2
+Count=0
+EMail Message Line Count=0
+loNoDuplicateErrors=0
+loAppendReproduceText=0
+loDeleteLogAtVersionChange=0
+loAddComputerNameInLogFileName=0
+loSaveModulesAndProcessesSections=1
+loSaveAssemblerAndCPUSections=1
+soAppStartDate=1
+soAppName=1
+soAppVersionNumber=1
+soAppParameters=1
+soAppCompilationDate=1
+soAppUpTime=1
+soExcDate=1
+soExcAddress=1
+soExcModuleName=1
+soExcModuleVersion=1
+soExcType=1
+soExcMessage=1
+soExcID=1
+soExcCount=1
+soExcStatus=1
+soExcNote=1
+soUserID=1
+soUserName=1
+soUserEmail=1
+soUserPrivileges=1
+soUserCompany=1
+soActCtlsFormClass=1
+soActCtlsFormText=1
+soActCtlsControlClass=1
+soActCtlsControlText=1
+soCmpName=1
+soCmpTotalMemory=1
+soCmpFreeMemory=1
+soCmpTotalDisk=1
+soCmpFreeDisk=1
+soCmpSysUpTime=1
+soCmpProcessor=1
+soCmpDisplayMode=1
+soCmpDisplayDPI=1
+soCmpVideoCard=1
+soCmpPrinter=1
+soOSType=1
+soOSBuildN=1
+soOSUpdate=1
+soOSLanguage=1
+soOSCharset=1
+soNetIP=1
+soNetSubmask=1
+soNetGateway=1
+soNetDNS1=1
+soNetDNS2=1
+soNetDHCP=1
+soCustomData=1
+sndShowSendDialog=1
+sndShowSuccessFailureMsg=0
+sndSendEntireLog=0
+sndSendXMLLogCopy=0
+sndSendScreenshot=1
+sndUseOnlyActiveWindow=0
+sndSendLastHTMLPage=1
+sndSendInSeparatedThread=0
+sndAddDateInFileName=0
+sndAddComputerNameInFileName=0
+edoSendErrorReportChecked=1
+edoAttachScreenshotChecked=1
+edoShowCopyToClipOption=1
+edoShowDetailsButton=1
+edoShowInDetailedMode=0
+edoShowInTopMostMode=0
+edoUseEurekaLogLookAndFeel=0
+edoShowSendErrorReportOption=1
+edoShowAttachScreenshotOption=1
+edoShowCustomButton=0
+csoShowDLLs=1
+csoShowBPLs=1
+csoShowBorlandThreads=1
+csoShowWindowsThreads=1
+csoDoNotStoreProcNames=0
+boPauseBorlandThreads=0
+boDoNotPauseMainThread=0
+boPauseWindowsThreads=0
+boUseMainModuleOptions=1
+boCopyLogInCaseOfError=1
+boSaveCompressedCopyInCaseOfError=0
+boHandleSafeCallExceptions=1
+boCallRTLExceptionEvent=0
+boCatchHandledExceptions=0
+loCatchLeaks=0
+loGroupsSonLeaks=1
+loHideBorlandLeaks=1
+loFreeAllLeaks=1
+loCatchLeaksExceptions=1
+cfoReduceFileSize=1
+cfoCheckFileCorruption=0
+Count mtInformationMsgCaption=1
+mtInformationMsgCaption0="Information."
+Count mtQuestionMsgCaption=1
+mtQuestionMsgCaption0="Question."
+Count mtErrorMsgCaption=1
+mtErrorMsgCaption0="Error."
+Count mtDialog_Caption=1
+mtDialog_Caption0="Error occurred"
+Count mtDialog_ErrorMsgCaption=2
+mtDialog_ErrorMsgCaption0="An error has occurred during program execution."
+mtDialog_ErrorMsgCaption1="Please read the following information for further details."
+Count mtDialog_GeneralCaption=1
+mtDialog_GeneralCaption0="General"
+Count mtDialog_GeneralHeader=1
+mtDialog_GeneralHeader0="General Information"
+Count mtDialog_CallStackCaption=1
+mtDialog_CallStackCaption0="Call Stack"
+Count mtDialog_CallStackHeader=1
+mtDialog_CallStackHeader0="Call Stack Information"
+Count mtDialog_ModulesCaption=1
+mtDialog_ModulesCaption0="Modules"
+Count mtDialog_ModulesHeader=1
+mtDialog_ModulesHeader0="Modules Information"
+Count mtDialog_ProcessesCaption=1
+mtDialog_ProcessesCaption0="Processes"
+Count mtDialog_ProcessesHeader=1
+mtDialog_ProcessesHeader0="Processes Information"
+Count mtDialog_AsmCaption=1
+mtDialog_AsmCaption0="Assembler"
+Count mtDialog_AsmHeader=1
+mtDialog_AsmHeader0="Assembler Information"
+Count mtDialog_CPUCaption=1
+mtDialog_CPUCaption0="CPU"
+Count mtDialog_CPUHeader=1
+mtDialog_CPUHeader0="CPU Information"
+Count mtDialog_OKButtonCaption=1
+mtDialog_OKButtonCaption0="%26OK"
+Count mtDialog_TerminateButtonCaption=1
+mtDialog_TerminateButtonCaption0="%26Terminate"
+Count mtDialog_RestartButtonCaption=1
+mtDialog_RestartButtonCaption0="%26Restart"
+Count mtDialog_DetailsButtonCaption=1
+mtDialog_DetailsButtonCaption0="%26Details"
+Count mtDialog_CustomButtonCaption=1
+mtDialog_CustomButtonCaption0="%26Help"
+Count mtDialog_SendMessage=1
+mtDialog_SendMessage0="%26Send this error via Internet"
+Count mtDialog_ScreenshotMessage=1
+mtDialog_ScreenshotMessage0="%26Attach a Screenshot image"
+Count mtDialog_CopyMessage=1
+mtDialog_CopyMessage0="%26Copy to Clipboard"
+Count mtDialog_SupportMessage=1
+mtDialog_SupportMessage0="Go to the Support Page"
+Count mtMSDialog_ErrorMsgCaption=1
+mtMSDialog_ErrorMsgCaption0="The application has encountered a problem. We are sorry for the inconvenience."
+Count mtMSDialog_RestartCaption=1
+mtMSDialog_RestartCaption0="Restart application."
+Count mtMSDialog_TerminateCaption=1
+mtMSDialog_TerminateCaption0="Terminate application."
+Count mtMSDialog_PleaseCaption=1
+mtMSDialog_PleaseCaption0="Please tell us about this problem."
+Count mtMSDialog_DescriptionCaption=1
+mtMSDialog_DescriptionCaption0="We have created an error report that you can send to us. We will treat this report as confidential and anonymous."
+Count mtMSDialog_SeeDetailsCaption=1
+mtMSDialog_SeeDetailsCaption0="To see what data the error report contains,"
+Count mtMSDialog_SeeClickCaption=1
+mtMSDialog_SeeClickCaption0="click here."
+Count mtMSDialog_HowToReproduceCaption=1
+mtMSDialog_HowToReproduceCaption0="What were you doing when the problem happened (optional)?"
+Count mtMSDialog_EmailCaption=1
+mtMSDialog_EmailCaption0="Email address (optional):"
+Count mtMSDialog_SendButtonCaption=1
+mtMSDialog_SendButtonCaption0="%26Send Error Report"
+Count mtMSDialog_NoSendButtonCaption=1
+mtMSDialog_NoSendButtonCaption0="%26Don't Send"
+Count mtLog_AppHeader=1
+mtLog_AppHeader0="Application"
+Count mtLog_AppStartDate=1
+mtLog_AppStartDate0="Start Date"
+Count mtLog_AppName=1
+mtLog_AppName0="Name/Description"
+Count mtLog_AppVersionNumber=1
+mtLog_AppVersionNumber0="Version Number"
+Count mtLog_AppParameters=1
+mtLog_AppParameters0="Parameters"
+Count mtLog_AppCompilationDate=1
+mtLog_AppCompilationDate0="Compilation Date"
+Count mtLog_AppUpTime=1
+mtLog_AppUpTime0="Up Time"
+Count mtLog_ExcHeader=1
+mtLog_ExcHeader0="Exception"
+Count mtLog_ExcDate=1
+mtLog_ExcDate0="Date"
+Count mtLog_ExcAddress=1
+mtLog_ExcAddress0="Address"
+Count mtLog_ExcModuleName=1
+mtLog_ExcModuleName0="Module Name"
+Count mtLog_ExcModuleVersion=1
+mtLog_ExcModuleVersion0="Module Version"
+Count mtLog_ExcType=1
+mtLog_ExcType0="Type"
+Count mtLog_ExcMessage=1
+mtLog_ExcMessage0="Message"
+Count mtLog_ExcID=1
+mtLog_ExcID0="ID"
+Count mtLog_ExcCount=1
+mtLog_ExcCount0="Count"
+Count mtLog_ExcStatus=1
+mtLog_ExcStatus0="Status"
+Count mtLog_ExcNote=1
+mtLog_ExcNote0="Note"
+Count mtLog_UserHeader=1
+mtLog_UserHeader0="User"
+Count mtLog_UserID=1
+mtLog_UserID0="ID"
+Count mtLog_UserName=1
+mtLog_UserName0="Name"
+Count mtLog_UserEmail=1
+mtLog_UserEmail0="Email"
+Count mtLog_UserCompany=1
+mtLog_UserCompany0="Company"
+Count mtLog_UserPrivileges=1
+mtLog_UserPrivileges0="Privileges"
+Count mtLog_ActCtrlsHeader=1
+mtLog_ActCtrlsHeader0="Active Controls"
+Count mtLog_ActCtrlsFormClass=1
+mtLog_ActCtrlsFormClass0="Form Class"
+Count mtLog_ActCtrlsFormText=1
+mtLog_ActCtrlsFormText0="Form Text"
+Count mtLog_ActCtrlsControlClass=1
+mtLog_ActCtrlsControlClass0="Control Class"
+Count mtLog_ActCtrlsControlText=1
+mtLog_ActCtrlsControlText0="Control Text"
+Count mtLog_CmpHeader=1
+mtLog_CmpHeader0="Computer"
+Count mtLog_CmpName=1
+mtLog_CmpName0="Name"
+Count mtLog_CmpTotalMemory=1
+mtLog_CmpTotalMemory0="Total Memory"
+Count mtLog_CmpFreeMemory=1
+mtLog_CmpFreeMemory0="Free Memory"
+Count mtLog_CmpTotalDisk=1
+mtLog_CmpTotalDisk0="Total Disk"
+Count mtLog_CmpFreeDisk=1
+mtLog_CmpFreeDisk0="Free Disk"
+Count mtLog_CmpSystemUpTime=1
+mtLog_CmpSystemUpTime0="System Up Time"
+Count mtLog_CmpProcessor=1
+mtLog_CmpProcessor0="Processor"
+Count mtLog_CmpDisplayMode=1
+mtLog_CmpDisplayMode0="Display Mode"
+Count mtLog_CmpDisplayDPI=1
+mtLog_CmpDisplayDPI0="Display DPI"
+Count mtLog_CmpVideoCard=1
+mtLog_CmpVideoCard0="Video Card"
+Count mtLog_CmpPrinter=1
+mtLog_CmpPrinter0="Printer"
+Count mtLog_OSHeader=1
+mtLog_OSHeader0="Operating System"
+Count mtLog_OSType=1
+mtLog_OSType0="Type"
+Count mtLog_OSBuildN=1
+mtLog_OSBuildN0="Build #"
+Count mtLog_OSUpdate=1
+mtLog_OSUpdate0="Update"
+Count mtLog_OSLanguage=1
+mtLog_OSLanguage0="Language"
+Count mtLog_OSCharset=1
+mtLog_OSCharset0="Charset"
+Count mtLog_NetHeader=1
+mtLog_NetHeader0="Network"
+Count mtLog_NetIP=1
+mtLog_NetIP0="IP Address"
+Count mtLog_NetSubmask=1
+mtLog_NetSubmask0="Submask"
+Count mtLog_NetGateway=1
+mtLog_NetGateway0="Gateway"
+Count mtLog_NetDNS1=1
+mtLog_NetDNS10="DNS 1"
+Count mtLog_NetDNS2=1
+mtLog_NetDNS20="DNS 2"
+Count mtLog_NetDHCP=1
+mtLog_NetDHCP0="DHCP"
+Count mtLog_CustInfoHeader=1
+mtLog_CustInfoHeader0="Custom Information"
+Count mtCallStack_Address=1
+mtCallStack_Address0="Address"
+Count mtCallStack_Name=1
+mtCallStack_Name0="Module"
+Count mtCallStack_Unit=1
+mtCallStack_Unit0="Unit"
+Count mtCallStack_Class=1
+mtCallStack_Class0="Class"
+Count mtCallStack_Procedure=1
+mtCallStack_Procedure0="Procedure/Method"
+Count mtCallStack_Line=1
+mtCallStack_Line0="Line"
+Count mtCallStack_MainThread=1
+mtCallStack_MainThread0="Main"
+Count mtCallStack_ExceptionThread=1
+mtCallStack_ExceptionThread0="Exception Thread"
+Count mtCallStack_RunningThread=1
+mtCallStack_RunningThread0="Running Thread"
+Count mtCallStack_CallingThread=1
+mtCallStack_CallingThread0="Calling Thread"
+Count mtCallStack_ThreadID=1
+mtCallStack_ThreadID0="ID"
+Count mtCallStack_ThreadPriority=1
+mtCallStack_ThreadPriority0="Priority"
+Count mtCallStack_ThreadClass=1
+mtCallStack_ThreadClass0="Class"
+Count mtCallStack_LeakCaption=1
+mtCallStack_LeakCaption0="Memory Leak"
+Count mtCallStack_LeakData=1
+mtCallStack_LeakData0="Data"
+Count mtCallStack_LeakType=1
+mtCallStack_LeakType0="Type"
+Count mtCallStack_LeakSize=1
+mtCallStack_LeakSize0="Total size"
+Count mtCallStack_LeakCount=1
+mtCallStack_LeakCount0="Count"
+Count mtSendDialog_Caption=1
+mtSendDialog_Caption0="Send."
+Count mtSendDialog_Message=1
+mtSendDialog_Message0="Message"
+Count mtSendDialog_Resolving=1
+mtSendDialog_Resolving0="Resolving DNS..."
+Count mtSendDialog_Login=1
+mtSendDialog_Login0="Login..."
+Count mtSendDialog_Connecting=1
+mtSendDialog_Connecting0="Connecting with server..."
+Count mtSendDialog_Connected=1
+mtSendDialog_Connected0="Connected with server."
+Count mtSendDialog_Sending=1
+mtSendDialog_Sending0="Sending message..."
+Count mtSendDialog_Sent=1
+mtSendDialog_Sent0="Message sent."
+Count mtSendDialog_SelectProject=1
+mtSendDialog_SelectProject0="Select project..."
+Count mtSendDialog_Searching=1
+mtSendDialog_Searching0="Searching..."
+Count mtSendDialog_Modifying=1
+mtSendDialog_Modifying0="Modifying..."
+Count mtSendDialog_Disconnecting=1
+mtSendDialog_Disconnecting0="Disconnecting..."
+Count mtSendDialog_Disconnected=1
+mtSendDialog_Disconnected0="Disconnected."
+Count mtReproduceDialog_Caption=1
+mtReproduceDialog_Caption0="Request"
+Count mtReproduceDialog_Request=1
+mtReproduceDialog_Request0="Please describe the steps to reproduce the error:"
+Count mtReproduceDialog_OKButtonCaption=1
+mtReproduceDialog_OKButtonCaption0="%26OK"
+Count mtModules_Handle=1
+mtModules_Handle0="Handle"
+Count mtModules_Name=1
+mtModules_Name0="Name"
+Count mtModules_Description=1
+mtModules_Description0="Description"
+Count mtModules_Version=1
+mtModules_Version0="Version"
+Count mtModules_Size=1
+mtModules_Size0="Size"
+Count mtModules_LastModified=1
+mtModules_LastModified0="Modified"
+Count mtModules_Path=1
+mtModules_Path0="Path"
+Count mtProcesses_ID=1
+mtProcesses_ID0="ID"
+Count mtProcesses_Name=1
+mtProcesses_Name0="Name"
+Count mtProcesses_Description=1
+mtProcesses_Description0="Description"
+Count mtProcesses_Version=1
+mtProcesses_Version0="Version"
+Count mtProcesses_Memory=1
+mtProcesses_Memory0="Memory"
+Count mtProcesses_Priority=1
+mtProcesses_Priority0="Priority"
+Count mtProcesses_Threads=1
+mtProcesses_Threads0="Threads"
+Count mtProcesses_Path=1
+mtProcesses_Path0="Path"
+Count mtCPU_Registers=1
+mtCPU_Registers0="Registers"
+Count mtCPU_Stack=1
+mtCPU_Stack0="Stack"
+Count mtCPU_MemoryDump=1
+mtCPU_MemoryDump0="Memory Dump"
+Count mtSend_SuccessMsg=1
+mtSend_SuccessMsg0="The message was sent successfully."
+Count mtSend_FailureMsg=1
+mtSend_FailureMsg0="Sorry, sending the message didn't work."
+Count mtSend_BugClosedMsg=2
+mtSend_BugClosedMsg0="These BUG is just closed."
+mtSend_BugClosedMsg1="Contact the program support to obtain an update."
+Count mtSend_UnknownErrorMsg=1
+mtSend_UnknownErrorMsg0="Unknown error."
+Count mtSend_InvalidLoginMsg=1
+mtSend_InvalidLoginMsg0="Invalid login request."
+Count mtSend_InvalidSearchMsg=1
+mtSend_InvalidSearchMsg0="Invalid search request."
+Count mtSend_InvalidSelectionMsg=1
+mtSend_InvalidSelectionMsg0="Invalid selection request."
+Count mtSend_InvalidInsertMsg=1
+mtSend_InvalidInsertMsg0="Invalid insert request."
+Count mtSend_InvalidModifyMsg=1
+mtSend_InvalidModifyMsg0="Invalid modify request."
+Count mtFileCrackedMsg=2
+mtFileCrackedMsg0="This file is cracked."
+mtFileCrackedMsg1="The application will be closed."
+Count mtException_LeakMultiFree=1
+mtException_LeakMultiFree0="Multi Free memory leak."
+Count mtException_LeakMemoryOverrun=1
+mtException_LeakMemoryOverrun0="Memory Overrun leak."
+Count mtException_AntiFreeze=1
+mtException_AntiFreeze0="The application seems to be frozen."
+Count mtInvalidEmailMsg=1
+mtInvalidEmailMsg0="Invalid email."
+TextsCollection=English
+EurekaLog Last Line -->

Source/Modulos/Relaciones/Pedidos de proveedor - Albaranes de proveedor/uGenerarAlbaranesProvUtils.pas

@@ -106,6 +106,7 @@ begin
         begin
           ADetallesController.Add(ADetalles, TIPO_DETALLE_CONCEPTO);
           ADetalles.Edit;
+          ADetalles.ID_PEDIDO := APedido.Detalles.ID_PEDIDO;          
           ADetalles.REFERENCIA := APedido.Detalles.REFERENCIA;
           ADetalles.ID_ARTICULO := APedido.Detalles.ID_ARTICULO;
           ADetalles.CONCEPTO := APedido.Detalles.CONCEPTO;

Source/Servidor/FactuGES_Server.dpr

@@ -72,14 +72,10 @@ uses
   uRptFacturasCliente_Server in '..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas' {RptFacturasCliente: TDataModule},
   uBizRemesasClienteServer in '..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas',
   uBizRemesasProveedorServer in '..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas',
-  schAlbaranesProveedorClient_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas',
-  schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas',
   schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas',
   schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas',
   schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas',
   schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas',
-  schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
-  schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas',
   schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas',
   schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas',
   schRemesasClienteClient_Intf in '..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas',
@@ -89,8 +85,6 @@ uses
   srvUnidadesMedida_Impl in '..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas' {srvUnidadesMedida: TDataAbstractService},
   schUnidadesMedidaClient_Intf in '..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas',
   schUnidadesMedidaServer_Intf in '..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas',
-  schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
-  schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas',
   schUsuariosClient_Intf in '..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas',
   schUsuariosServer_Intf in '..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas',
   uRptAlbaranesCliente_Server in '..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas' {RptAlbaranesCliente: TDataModule},
@@ -119,9 +113,15 @@ uses
   srvObras_Impl in '..\Modulos\Obras\Servidor\srvObras_Impl.pas',
   schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
   schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas',
+  uBizObrasServer in '..\Modulos\Obras\Model\uBizObrasServer.pas',
+  schAlbaranesProveedorClient_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas',
+  schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas',
+  schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
+  schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas',
   schAlmacenesClient_Intf in '..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas',
   schAlmacenesServer_Intf in '..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas',
-  uBizObrasServer in '..\Modulos\Obras\Model\uBizObrasServer.pas',
+  schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
+  schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas',
   schObrasClient_Intf in '..\Modulos\Obras\Model\schObrasClient_Intf.pas',
   schObrasServer_Intf in '..\Modulos\Obras\Model\schObrasServer_Intf.pas';
 

Source/Servidor/FactuGES_Server.dproj

@@ -1,275 +1,275 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup>
+  <PropertyGroup>
-		<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
+    <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
-		<MainSource>FactuGES_Server.dpr</MainSource>
+    <MainSource>FactuGES_Server.dpr</MainSource>
-		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-		<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-		<DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
+    <DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
-		<DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100</DCC_UsePackage>
+    <DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100</DCC_UsePackage>
-	</PropertyGroup>
+  </PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-		<Version>7.0</Version>
+    <Version>7.0</Version>
-		<DCC_DebugInformation>False</DCC_DebugInformation>
+    <DCC_DebugInformation>False</DCC_DebugInformation>
-		<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-		<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-		<DCC_MapFile>3</DCC_MapFile>
+    <DCC_MapFile>3</DCC_MapFile>
-		<DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
+    <DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
-		<DCC_Define>RELEASE</DCC_Define>
+    <DCC_Define>RELEASE</DCC_Define>
-	</PropertyGroup>
+  </PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-		<Version>7.0</Version>
+    <Version>7.0</Version>
-		<DCC_MapFile>3</DCC_MapFile>
+    <DCC_MapFile>3</DCC_MapFile>
-		<DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
+    <DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
-		<DCC_Define>DEBUG;</DCC_Define>
+    <DCC_Define>DEBUG;</DCC_Define>
-		<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
-		<DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
+    <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
-		<DCC_DebugVN>True</DCC_DebugVN>
+    <DCC_DebugVN>True</DCC_DebugVN>
-		<DCC_UnitSearchPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_UnitSearchPath>
+    <DCC_UnitSearchPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_UnitSearchPath>
-		<DCC_ResourcePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ResourcePath>
+    <DCC_ResourcePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ResourcePath>
-		<DCC_ObjPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ObjPath>
+    <DCC_ObjPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ObjPath>
-		<DCC_IncludePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_IncludePath>
+    <DCC_IncludePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_IncludePath>
-	</PropertyGroup>
+  </PropertyGroup>
-	<ProjectExtensions>
+  <ProjectExtensions>
-		<Borland.Personality>Delphi.Personality</Borland.Personality>
+    <Borland.Personality>Delphi.Personality</Borland.Personality>
-		<Borland.ProjectType/>
+    <Borland.ProjectType />
-		<BorlandProject>
+    <BorlandProject>
-			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">3</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 25 de marzo de 2008 18:11</VersionInfoKeys></VersionInfoKeys><Excluded_Packages/><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">3</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 25 de marzo de 2008 18:11</VersionInfoKeys></VersionInfoKeys><Excluded_Packages /><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
-	</ProjectExtensions>
+  </ProjectExtensions>
-	<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
-	<ItemGroup>
+  <ItemGroup>
-		<DelphiCompile Include="FactuGES_Server.dpr">
+    <DelphiCompile Include="FactuGES_Server.dpr">
-			<MainSource>MainSource</MainSource>
+      <MainSource>MainSource</MainSource>
-		</DelphiCompile>
+    </DelphiCompile>
-		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas"/>
+    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas" />
-		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas"/>
+    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas" />
-		<DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
+    <DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
-			<Form>srvEmpresas</Form>
+      <Form>srvEmpresas</Form>
-			<DesignClass>TDARemoteService</DesignClass>
+      <DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas"/>
+    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas" />
-		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas"/>
+    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas" />
-		<DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas"/>
+    <DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas" />
-		<DCCReference Include="..\Base\schBase_Intf.pas"/>
+    <DCCReference Include="..\Base\schBase_Intf.pas" />
-		<DCCReference Include="..\Base\Utiles\uSistemaFunc.pas"/>
+    <DCCReference Include="..\Base\Utiles\uSistemaFunc.pas" />
-		<DCCReference Include="..\Base\Utiles\uStringsUtils.pas"/>
+    <DCCReference Include="..\Base\Utiles\uStringsUtils.pas" />
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas"/>
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas" />
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas">
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas">
-			<Form>RptAlbaranesCliente</Form>
+      <Form>RptAlbaranesCliente</Form>
-			<DesignClass>TDataModule</DesignClass>
+      <DesignClass>TDataModule</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptWordAlbaranCliente.pas">
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptWordAlbaranCliente.pas">
-			<Form>RptWordAlbaranCliente</Form>
+      <Form>RptWordAlbaranCliente</Form>
-			<DesignClass>TDataModule</DesignClass>
+      <DesignClass>TDataModule</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
-			<Form>srvAlbaranesCliente</Form>
+      <Form>srvAlbaranesCliente</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS"/>
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS" />
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
-			<Form>srvAlbaranesProveedor</Form>
+      <Form>srvAlbaranesProveedor</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
+    <DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
-			<Form>srvAlmacenes</Form>
+      <Form>srvAlmacenes</Form>
-			<DesignClass>TDARemoteService</DesignClass>
+      <DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas"/>
+    <DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizEmpleadosServer.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizEmpleadosServer.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
+    <DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
-			<Form>RptEtiquetasContacto</Form>
+      <Form>RptEtiquetasContacto</Form>
-			<DesignClass>TDataModule</DesignClass>
+      <DesignClass>TDataModule</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Contactos\Reports\uRptFichasEmpleado_Server.pas">
+    <DCCReference Include="..\Modulos\Contactos\Reports\uRptFichasEmpleado_Server.pas">
-			<Form>RptFichasEmpleado</Form>
+      <Form>RptFichasEmpleado</Form>
-			<DesignClass>TDataModule</DesignClass>
+      <DesignClass>TDataModule</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
+    <DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
-			<Form>srvContactos</Form>
+      <Form>srvContactos</Form>
-			<DesignClass>TDARemoteService</DesignClass>
+      <DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Fabricantes\Servidor\srvFabricantes_Impl.pas">
+    <DCCReference Include="..\Modulos\Fabricantes\Servidor\srvFabricantes_Impl.pas">
-			<Form>srvFabricantes</Form>
+      <Form>srvFabricantes</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas"/>
+    <DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas" />
-		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
+    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
-			<Form>RptFacturasCliente</Form>
+      <Form>RptFacturasCliente</Form>
-			<DesignClass>TDataModule</DesignClass>
+      <DesignClass>TDataModule</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptWordFacturaCliente.pas">
+    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptWordFacturaCliente.pas">
-			<Form>RptWordFacturaCliente</Form>
+      <Form>RptWordFacturaCliente</Form>
-			<DesignClass>TDataModule</DesignClass>
+      <DesignClass>TDataModule</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
+    <DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
-			<Form>srvFacturasCliente</Form>
+      <Form>srvFacturasCliente</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas"/>
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas" />
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
-			<Form>srvFacturasProveedor</Form>
+      <Form>srvFacturasProveedor</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas"/>
+    <DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas" />
-		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas"/>
+    <DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas" />
-		<DCCReference Include="..\Modulos\Formas de pago\Servidor\srvUnidadesMedida_Impl.pas"/>
+    <DCCReference Include="..\Modulos\Formas de pago\Servidor\srvUnidadesMedida_Impl.pas" />
-		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
+    <DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
-			<Form>srvHistoricoMovimientos</Form>
+      <Form>srvHistoricoMovimientos</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
+    <DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
-			<Form>srvInventario</Form>
+      <Form>srvInventario</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Obras\Model\schObrasClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Obras\Model\schObrasClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Obras\Model\schObrasServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Obras\Model\schObrasServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Obras\Model\uBizObrasServer.pas"/>
+    <DCCReference Include="..\Modulos\Obras\Model\uBizObrasServer.pas" />
-		<DCCReference Include="..\Modulos\Obras\Servidor\srvObras_Impl.pas"/>
+    <DCCReference Include="..\Modulos\Obras\Servidor\srvObras_Impl.pas" />
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas"/>
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas" />
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
-			<Form>RptPedidosProveedor</Form>
+      <Form>RptPedidosProveedor</Form>
-			<DesignClass>TDataModule</DesignClass>
+      <DesignClass>TDataModule</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptWordPedidoProveedor.pas">
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptWordPedidoProveedor.pas">
-			<Form>RptWordPedidoProveedor</Form>
+      <Form>RptWordPedidoProveedor</Form>
-			<DesignClass>TDataModule</DesignClass>
+      <DesignClass>TDataModule</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
-			<Form>srvPedidosProveedor</Form>
+      <Form>srvPedidosProveedor</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas"/>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas" />
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
-			<Form>RptPresupuestosCliente</Form>
+      <Form>RptPresupuestosCliente</Form>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordPresupuestoCliente.pas">
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordPresupuestoCliente.pas">
-			<Form>RptWordPresupuestoCliente</Form>
+      <Form>RptWordPresupuestoCliente</Form>
-			<DesignClass>TDataModule</DesignClass>
+      <DesignClass>TDataModule</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
-			<Form>srvPresupuestosCliente</Form>
+      <Form>srvPresupuestosCliente</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
+    <DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
-			<Form>srvRecibosCliente</Form>
+      <Form>srvRecibosCliente</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
+    <DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
-			<Form>srvRecibosProveedor</Form>
+      <Form>srvRecibosProveedor</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
+    <DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
-			<Form>srvReferencias</Form>
+      <Form>srvReferencias</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas"/>
+    <DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas" />
-		<DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
+    <DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
-			<Form>srvRemesasCliente</Form>
+      <Form>srvRemesasCliente</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas"/>
+    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas" />
-		<DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
+    <DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
-			<Form>srvRemesasProveedor</Form>
+      <Form>srvRemesasProveedor</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas"/>
+    <DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas" />
-		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
+    <DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
-			<Form>srvUnidadesMedida</Form>
+      <Form>srvUnidadesMedida</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Servicios\FactuGES_Intf.pas"/>
+    <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-		<DCCReference Include="..\Servicios\FactuGES_Invk.pas"/>
+    <DCCReference Include="..\Servicios\FactuGES_Invk.pas" />
-		<DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
+    <DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
-			<Form>srvConfiguracion</Form>
+      <Form>srvConfiguracion</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
+      <DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="Configuracion\uConexionBD.pas">
+    <DCCReference Include="Configuracion\uConexionBD.pas">
-			<Form>frConexionBD</Form>
+      <Form>frConexionBD</Form>
-			<DesignClass>TFrame</DesignClass>
+      <DesignClass>TFrame</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="Configuracion\uConfGeneral.pas">
+    <DCCReference Include="Configuracion\uConfGeneral.pas">
-			<Form>frConfGeneral</Form>
+      <Form>frConfGeneral</Form>
-			<DesignClass>TFrame</DesignClass>
+      <DesignClass>TFrame</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="Configuracion\uConfiguracion.pas">
+    <DCCReference Include="Configuracion\uConfiguracion.pas">
-			<Form>fConfiguracion</Form>
+      <Form>fConfiguracion</Form>
-			<DesignClass>TForm</DesignClass>
+      <DesignClass>TForm</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="Configuracion\uFrameConfiguracion.pas">
+    <DCCReference Include="Configuracion\uFrameConfiguracion.pas">
-			<Form>FrameConfiguracion</Form>
+      <Form>FrameConfiguracion</Form>
-			<DesignClass>TFrame</DesignClass>
+      <DesignClass>TFrame</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="srvLogin_Impl.pas">
+    <DCCReference Include="srvLogin_Impl.pas">
-			<Form>srvLogin</Form>
+      <Form>srvLogin</Form>
-			<DesignClass>TDARemoteService</DesignClass>
+      <DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="uAcercaDe.pas">
+    <DCCReference Include="uAcercaDe.pas">
-			<Form>fAcercaDe</Form>
+      <Form>fAcercaDe</Form>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="uDataModuleServer.pas">
+    <DCCReference Include="uDataModuleServer.pas">
-			<Form>dmServer</Form>
+      <Form>dmServer</Form>
-			<DesignClass>TDataModule</DesignClass>
+      <DesignClass>TDataModule</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="uServerMainForm.pas">
+    <DCCReference Include="uServerMainForm.pas">
-			<Form>fServerForm</Form>
+      <Form>fServerForm</Form>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="Utiles\AHWord97.pas"/>
+    <DCCReference Include="Utiles\AHWord97.pas" />
-		<DCCReference Include="Utiles\RegExpr.pas"/>
+    <DCCReference Include="Utiles\RegExpr.pas" />
-		<DCCReference Include="Utiles\uBusinessUtils.pas"/>
+    <DCCReference Include="Utiles\uBusinessUtils.pas" />
-		<DCCReference Include="Utiles\uDatabaseUtils.pas"/>
+    <DCCReference Include="Utiles\uDatabaseUtils.pas" />
-		<DCCReference Include="Utiles\uReferenciasUtils.pas"/>
+    <DCCReference Include="Utiles\uReferenciasUtils.pas" />
-		<DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas"/>
+    <DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas" />
-		<DCCReference Include="Utiles\uSchemaUtilsServer.pas"/>
+    <DCCReference Include="Utiles\uSchemaUtilsServer.pas" />
-		<DCCReference Include="Utiles\uServerAppUtils.pas"/>
+    <DCCReference Include="Utiles\uServerAppUtils.pas" />
-		<DCCReference Include="Utiles\uSesionesUtils.pas"/>
+    <DCCReference Include="Utiles\uSesionesUtils.pas" />
-	</ItemGroup>
+  </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]

Source/Servidor/FactuGES_Server.rc

@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "1.0.3.0\0"
               VALUE "ProductVersion", "1.0.3.0\0"
-              VALUE "CompileDate", "miércoles, 16 de abril de 2008 13:08\0"
+              VALUE "CompileDate", "martes, 06 de mayo de 2008 15:51\0"
          END
     END
     BLOCK "VarFileInfo"