Ajustes para nuevas tallas 'jeans' 36-46

git-svn-id: https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/trunk@114 1c943782-d109-9647-9548-93b3ac332352

Database/1 - tablas.sql

@@ -523,6 +523,7 @@ CREATE TABLE [RDX_DEVOLUCION_AJUSTES] (
   [COLOR] varchar(10) NOT NULL,
   [APROBADO] char(1) NULL,
   [FECHACAMBIO] datetime NULL,
+  [CANT36] numeric(15, 0) NULL,
   [CANT38] numeric(15, 0) NULL,
   [CANT40] numeric(15, 0) NULL,
   [CANT42] numeric(15, 0) NULL,
@@ -567,6 +568,7 @@ CREATE TABLE [RDX_RECEPCION_AJUSTES] (
   [COLOR] varchar(10) NOT NULL,
   [APROBADO] char(1) NULL,
   [FECHACAMBIO] datetime NULL,
+  [CANT36] numeric(15, 0) NULL,
   [CANT38] numeric(15, 0) NULL,
   [CANT40] numeric(15, 0) NULL,
   [CANT42] numeric(15, 0) NULL,
@@ -615,6 +617,7 @@ CREATE TABLE [RDX_TRASPASOS_AJUSTES] (
   [OBSERVACIONES] varchar(255) NULL,
   [CONTABILIZAR] char(1) NULL,
   [FECHACAMBIO] datetime NULL,
+  [CANT36] numeric(15, 0) NULL,
   [CANT38] numeric(15, 0) NULL,
   [CANT40] numeric(15, 0) NULL,
   [CANT42] numeric(15, 0) NULL,

Database/2.1 - vistas inventario.sql

@@ -1,79 +1,104 @@
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_TRASPASOS_AJUSTES_DESGLOSADO]'))
 DROP VIEW [RDX_V_TRASPASOS_AJUSTES_DESGLOSADO]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_HOJAS_TRASPASOS]'))
 DROP VIEW [RDX_V_HOJAS_TRASPASOS]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO]'))
 DROP VIEW [RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_CONTROL_RECEPCION_DESGLOSADO]'))
 DROP VIEW [RDX_V_CONTROL_RECEPCION_DESGLOSADO]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_RECEPCION_AJUSTES_DESGLOSADO]'))
 DROP VIEW [RDX_V_RECEPCION_AJUSTES_DESGLOSADO]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_CONTROL_DEVOLUCIONES]'))
 DROP VIEW [RDX_V_CONTROL_DEVOLUCIONES]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_DEVOLUCIONES]'))
 DROP VIEW [RDX_V_DEVOLUCIONES]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_HOJAS_DEVOLUCIONES]'))
 DROP VIEW [RDX_V_HOJAS_DEVOLUCIONES]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_CONTROL_RECEPCION_ALBARANES]'))
 DROP VIEW [RDX_V_CONTROL_RECEPCION_ALBARANES]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_ALBARANES_PENDIENTES]'))
 DROP VIEW [RDX_V_ALBARANES_PENDIENTES]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_CONTROL_RECEPCION]'))
 DROP VIEW [RDX_V_CONTROL_RECEPCION]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_RECEPCION]'))
 DROP VIEW [RDX_V_RECEPCION]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_ALBARANES]'))
 DROP VIEW [RDX_V_ALBARANES]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_CONTROL_TRASPASOS]'))
 DROP VIEW [RDX_V_CONTROL_TRASPASOS]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_TRASPASOS]'))
 DROP VIEW [RDX_V_TRASPASOS]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_TRASPASO_SALIDA]'))
 DROP VIEW [RDX_V_TRASPASO_SALIDA]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_TRASPASO_ENTRADA]'))
 DROP VIEW [RDX_V_TRASPASO_ENTRADA]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_INVENTARIOEDI_TRASPASO_SALIDA]'))
 DROP VIEW [RDX_V_INVENTARIOEDI_TRASPASO_SALIDA]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA]'))
 DROP VIEW [RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_INVENTARIOEDI_TRASPASO]'))
 DROP VIEW [RDX_V_INVENTARIOEDI_TRASPASO]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA]'))
 DROP VIEW [RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_INVENTARIOEDI_RECEPCION]'))
 DROP VIEW [RDX_V_INVENTARIOEDI_RECEPCION]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_INVENTARIO_MAXFECHAS]'))
 DROP VIEW [RDX_V_INVENTARIO_MAXFECHAS]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_ULTIMO_INVENTARIO]'))
 DROP VIEW [RDX_V_ULTIMO_INVENTARIO]
 GO
 
-IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_INVENTARIOEDI_PESADA]'))
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_INVENTARIOEDI_PESADA]'))
 DROP VIEW [RDX_V_INVENTARIOEDI_PESADA]
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_INVENTARIOEDI]'))
 DROP VIEW [RDX_V_INVENTARIOEDI]
 GO
 
@@ -342,6 +367,9 @@ SELECT
       FECHA = RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.FECHA,
 
       /* CANTIDADES ENVIADAS DESDE EL CENTRO*/
+      T36 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.TALLA = 36 THEN
+                     ISNULL(RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.CANTIDAD, 0)
+            END),
       T38 = SUM(CASE WHEN ((RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.TALLA = 38) OR (UPPER(RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.TALLA) = 'S'))  THEN
                      ISNULL(RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.CANTIDAD, 0)
             END),
@@ -392,6 +420,9 @@ SELECT
       FECHA = RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.FECHA,
 
       /* CANTIDADES ENVIADAS DESDE EL CENTRO*/
+      T36 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.TALLA = 36 THEN
+                     ISNULL(RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.CANTIDAD, 0)
+            END),
       T38 = SUM(CASE WHEN ((RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.TALLA = 38) OR (UPPER(RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.TALLA) = 'S')) THEN
                      ISNULL(RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.CANTIDAD, 0)
             END),
@@ -438,6 +469,7 @@ SELECT
       PRODUCTO,
       COLOR,
       FECHA,
+	  T36,
       T38,
       T40,
       T42,
@@ -457,6 +489,7 @@ SELECT
       PRODUCTO,
       COLOR,
       FECHA,
+	  T36,
       T38,
       T40,
       T42,
@@ -485,6 +518,7 @@ SELECT
       RDX_V_TRASPASOS.CODIGO,
       RDX_V_TRASPASOS.PRODUCTO,
       RDX_V_TRASPASOS.COLOR,
+	  RDX_V_TRASPASOS.T36,
       RDX_V_TRASPASOS.T38,
       RDX_V_TRASPASOS.T40,
       RDX_V_TRASPASOS.T42,
@@ -492,6 +526,7 @@ SELECT
       RDX_V_TRASPASOS.T46,
       RDX_V_TRASPASOS.T48,
       RDX_V_TRASPASOS.TOTAL,
+	  TR36 = ISNULL(RDX_TRASPASOS_AJUSTES.CANT36, RDX_V_TRASPASOS.T36),
       TR38 = ISNULL(RDX_TRASPASOS_AJUSTES.CANT38, ISNULL(RDX_TRASPASOS_AJUSTES.CANT_S, RDX_V_TRASPASOS.T38)),
       TR40 = ISNULL(RDX_TRASPASOS_AJUSTES.CANT40, ISNULL(RDX_TRASPASOS_AJUSTES.CANT_M, RDX_V_TRASPASOS.T40)),
       TR42 = ISNULL(RDX_TRASPASOS_AJUSTES.CANT42, ISNULL(RDX_TRASPASOS_AJUSTES.CANT_L, RDX_V_TRASPASOS.T42)),
@@ -499,6 +534,7 @@ SELECT
       TR46 = ISNULL(RDX_TRASPASOS_AJUSTES.CANT46, RDX_V_TRASPASOS.T46),
       TR48 = ISNULL(RDX_TRASPASOS_AJUSTES.CANT48, RDX_V_TRASPASOS.T48),
       TOTAL_RECT =
+	             ISNULL(ISNULL(RDX_TRASPASOS_AJUSTES.CANT36, RDX_V_TRASPASOS.T36), 0) +
                  ISNULL(ISNULL(RDX_TRASPASOS_AJUSTES.CANT38, ISNULL(RDX_TRASPASOS_AJUSTES.CANT_S, RDX_V_TRASPASOS.T38)), 0) +
                  ISNULL(ISNULL(RDX_TRASPASOS_AJUSTES.CANT40, ISNULL(RDX_TRASPASOS_AJUSTES.CANT_M, RDX_V_TRASPASOS.T40)), 0) +
                  ISNULL(ISNULL(RDX_TRASPASOS_AJUSTES.CANT42, ISNULL(RDX_TRASPASOS_AJUSTES.CANT_L, RDX_V_TRASPASOS.T42)), 0) +
@@ -525,21 +561,40 @@ SELECT
       FATURAMENTO.NOME_CLIFOR AS FILIAL,
       PRODUTOS_BARRA.CODIGO_BARRA,
       FATURAMENTO_PROD.PRODUTO AS CODIGO,
+      FATURAMENTO_PROD.F1,
+      FATURAMENTO_PROD.F2,
+      FATURAMENTO_PROD.F3,      
+      FATURAMENTO_PROD.F4,      
+      FATURAMENTO_PROD.F5,      
+      FATURAMENTO_PROD.F6,      
       PRODUCTO = PRODUTOS.DESC_PRODUTO,
       PRODUTOS_BARRA.COR_PRODUTO AS COLOR,
       PRODUTOS_BARRA.GRADE AS TALLA,
-      CANTIDAD = CASE UPPER(PRODUTOS_BARRA.GRADE)
+	  CASE 
-                      WHEN '38' THEN F1 
+		WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN 
-                      WHEN 'S'  THEN F1 
+			CASE UPPER(PRODUTOS_BARRA.GRADE)
-                      WHEN '40' THEN F2
+                WHEN '36' THEN F1 
-                      WHEN 'M'  THEN F2                      
+				WHEN '38' THEN F2 
-                      WHEN '42' THEN F3
+                WHEN '40' THEN F3
-                      WHEN 'L'  THEN F3                      
+                WHEN '42' THEN F4
-                      WHEN '44' THEN F4
+                WHEN '44' THEN F5
-                      WHEN 'XL' THEN F4                      
+                WHEN '46' THEN F6
-                      WHEN '46' THEN F5
+                WHEN '48' THEN F7
-                      WHEN '48' THEN F6
+            END
-                 END,
+		ELSE
+			CASE UPPER(PRODUTOS_BARRA.GRADE)
+                WHEN '38' THEN F1 
+                WHEN 'S'  THEN F1 
+                WHEN '40' THEN F2
+                WHEN 'M'  THEN F2                      
+                WHEN '42' THEN F3
+                WHEN 'L'  THEN F3                      
+                WHEN '44' THEN F4
+                WHEN 'XL' THEN F4                      
+                WHEN '46' THEN F5
+                WHEN '48' THEN F6
+            END		
+	  END AS CANTIDAD,
       RDX_AJUSTES_ALBARAN.ESTADO,
       RDX_AJUSTES_ALBARAN.OBSERVACIONES,
       CONTABILIZAR = ISNULL(RDX_AJUSTES_ALBARAN.CONTABILIZAR, 'S')
@@ -549,27 +604,28 @@ INNER JOIN FATURAMENTO ON
        (FATURAMENTO.SERIE_NF = FATURAMENTO_PROD.SERIE_NF))
 INNER JOIN FATURAMENTO_TIPO ON
       (LTRIM(RTRIM(FATURAMENTO.TIPO_FATURAMENTO)) = FATURAMENTO_TIPO.TIPO_FATURAMENTO)
+INNER JOIN PRODUTOS ON
+     (PRODUTOS.PRODUTO = FATURAMENTO_PROD.PRODUTO)
+LEFT OUTER JOIN PRODUTOS_BARRA ON
+     (((PRODUTOS_BARRA.PRODUTO = FATURAMENTO_PROD.PRODUTO) AND
+       (PRODUTOS_BARRA.COR_PRODUTO = FATURAMENTO_PROD.COR_PRODUTO)) AND
+			((PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F1 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '36' ELSE '38' END END) OR
+             (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F1 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '36' ELSE 'S' END END) OR
+             (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F2 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '38' ELSE '40' END END) OR
+			 (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F2 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '38' ELSE 'M' END END) OR
+			 (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F3 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '40' ELSE '42' END END) OR
+			 (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F3 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '40' ELSE 'L' END END) OR
+			 (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F4 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '42' ELSE '44' END END) OR
+			 (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F4 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '42' ELSE 'XL' END END) OR
+			 (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F5 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '44' ELSE '46' END END) OR
+             (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F6 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '46' ELSE '48' END END) OR
+             (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F7 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '48' ELSE NULL END END)))
+LEFT OUTER JOIN RDX_AJUSTES_ALBARAN ON
+     (RDX_AJUSTES_ALBARAN.ALBARAN = FATURAMENTO.NF_SAIDA)
 LEFT OUTER JOIN FILIAIS ON
      (FILIAIS.FILIAL = FATURAMENTO.NOME_CLIFOR)
 LEFT OUTER JOIN RDX_FILIALES ON
      (RDX_FILIALES.CODFILIAL = FILIAIS.COD_FILIAL) 
-LEFT OUTER JOIN PRODUTOS_BARRA ON
-     (((PRODUTOS_BARRA.PRODUTO = FATURAMENTO_PROD.PRODUTO) AND
-       (PRODUTOS_BARRA.COR_PRODUTO = FATURAMENTO_PROD.COR_PRODUTO)) AND
-      ((PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F1 <> 0) THEN '38' END) OR
-       (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F1 <> 0) THEN 'S'  END) OR
-       (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F2 <> 0) THEN '40' END) OR
-       (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F2 <> 0) THEN 'M'  END) OR       
-       (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F3 <> 0) THEN '42' END) OR
-       (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F3 <> 0) THEN 'L'  END) OR       
-       (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F4 <> 0) THEN '44' END) OR
-       (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F4 <> 0) THEN 'XL' END) OR       
-       (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F5 <> 0) THEN '46' END) OR
-       (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F6 <> 0) THEN '48' END)))
-LEFT OUTER JOIN PRODUTOS ON
-     (PRODUTOS.PRODUTO = PRODUTOS_BARRA.PRODUTO)
-LEFT OUTER JOIN RDX_AJUSTES_ALBARAN ON
-     (RDX_AJUSTES_ALBARAN.ALBARAN = FATURAMENTO.NF_SAIDA)
 WHERE FATURAMENTO_TIPO.INDICADOR_TIPO = 'VTPT'   /* ALBARANES DE PRODUCTOS TERMINADOS */
 AND FATURAMENTO.NOME_CLIFOR LIKE '%INGLES%'  /* ALBARANES PARA CENTROS DEL CORTE INGLES */
 AND FATURAMENTO.EMISSAO >= convert(datetime, '20060601', 112)  /* PARA NO COGER AÑOS ANTERIORES */
@@ -593,6 +649,9 @@ SELECT
       CONTABILIZAR_ALBARAN = ISNULL(RDX_V_ALBARANES.CONTABILIZAR, 'S'),
 
       /* CANTIDADES ENVIADAS DESDE VARELA */
+      E36 = SUM(CASE WHEN RDX_V_ALBARANES.TALLA = 36 THEN
+                      ISNULL(RDX_V_ALBARANES.CANTIDAD, 0)
+            END),
       E38 = SUM(CASE WHEN ((RDX_V_ALBARANES.TALLA = 38) OR (UPPER(RDX_V_ALBARANES.TALLA) = 'S')) THEN
                       ISNULL(RDX_V_ALBARANES.CANTIDAD, 0)
             END),
@@ -619,6 +678,9 @@ SELECT
                 ),
 
       /* CANTIDADES RECIBIDAS EN EL CENTRO*/
+      R36 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_RECEPCION.TALLA = 36 THEN
+                      ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.CANTIDAD, 0)
+            END),
       R38 = SUM(CASE WHEN ((RDX_V_INVENTARIOEDI_RECEPCION.TALLA = 38) OR (UPPER(RDX_V_INVENTARIOEDI_RECEPCION.TALLA) = 'S')) THEN
                       ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.CANTIDAD, 0)
             END),
@@ -686,12 +748,13 @@ SELECT
       RDX_V_RECEPCION.CONTABILIZAR_ALBARAN,
 
       /* CANTIDADES ENVIADAS DESDE VARELA */
-      E38, E40, E42, E44, E46, E48, RDX_V_RECEPCION.ENVIADO,
+      E36, E38, E40, E42, E44, E46, E48, RDX_V_RECEPCION.ENVIADO,
 
       /* CANTIDADES RECIBIDAS EN EL CENTRO*/
-      R38, R40, R42, R44, R46, R48, RDX_V_RECEPCION.RECIBIDO,
+      R36, R38, R40, R42, R44, R46, R48, RDX_V_RECEPCION.RECIBIDO,
 
       /* CANTIDADES RECIBIDAS RECTIFICADAS */
+	  RR36 = ISNULL(RDX_RECEPCION_AJUSTES.CANT36, R36),
       RR38 = ISNULL(RDX_RECEPCION_AJUSTES.CANT38, ISNULL(RDX_RECEPCION_AJUSTES.CANT_S, R38)),
       RR40 = ISNULL(RDX_RECEPCION_AJUSTES.CANT40, ISNULL(RDX_RECEPCION_AJUSTES.CANT_M, R40)),
       RR42 = ISNULL(RDX_RECEPCION_AJUSTES.CANT42, ISNULL(RDX_RECEPCION_AJUSTES.CANT_L, R42)),
@@ -700,6 +763,7 @@ SELECT
       RR48 = ISNULL(RDX_RECEPCION_AJUSTES.CANT48, R48),
 
       RECIBIDO_RECT =
+	                ISNULL(RDX_RECEPCION_AJUSTES.CANT36, ISNULL(R36, 0)) +
                     ISNULL(RDX_RECEPCION_AJUSTES.CANT38, ISNULL(RDX_RECEPCION_AJUSTES.CANT_S, ISNULL(R38, 0))) +
                     ISNULL(RDX_RECEPCION_AJUSTES.CANT40, ISNULL(RDX_RECEPCION_AJUSTES.CANT_M, ISNULL(R40, 0))) +
                     ISNULL(RDX_RECEPCION_AJUSTES.CANT42, ISNULL(RDX_RECEPCION_AJUSTES.CANT_L, ISNULL(R42, 0))) +
@@ -708,7 +772,7 @@ SELECT
                     ISNULL(RDX_RECEPCION_AJUSTES.CANT48, ISNULL(R48, 0)),
 
       DIFERENCIA =
-      (
+      (             ISNULL(RDX_RECEPCION_AJUSTES.CANT46, ISNULL(R36, 0)) + 
                     ISNULL(RDX_RECEPCION_AJUSTES.CANT38, ISNULL(RDX_RECEPCION_AJUSTES.CANT_S, ISNULL(R38, 0))) +
                     ISNULL(RDX_RECEPCION_AJUSTES.CANT40, ISNULL(RDX_RECEPCION_AJUSTES.CANT_M, ISNULL(R40, 0))) +
                     ISNULL(RDX_RECEPCION_AJUSTES.CANT42, ISNULL(RDX_RECEPCION_AJUSTES.CANT_L, ISNULL(R42, 0))) +
@@ -746,7 +810,7 @@ select RDX_V_CONTROL_RECEPCION.ALBARAN
          WHEN 'N' THEN 'PENDIENTE'
          WHEN 'S' THEN 'APROBADO'
          END
-, CENTRO, FILIAL, FECHA, CODIGO, PRODUCTO, COLOR, E38, E40, E42, E44, E46, E48
+, CENTRO, FILIAL, FECHA, CODIGO, PRODUCTO, COLOR, E36, E38, E40, E42, E44, E46, E48
 from RDX_V_CONTROL_RECEPCION
 left join RDX_V_ALBARANES_PENDIENTES
 on (RDX_V_CONTROL_RECEPCION.ALBARAN = RDX_V_ALBARANES_PENDIENTES.ALBARAN)
@@ -768,37 +832,51 @@ SELECT
       PRODUCTO = ISNULL(PRODUTOS.DESC_PRODUTO, '*** ERROR REFERENCIA  ****'),
       PRODUTOS_BARRA.COR_PRODUTO AS COLOR,
       PRODUTOS_BARRA.GRADE AS TALLA,
-      CANTIDAD = CASE UPPER(PRODUTOS_BARRA.GRADE)
+	  CASE 
-                      WHEN '38' THEN EN1
+		WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN 
-                      WHEN 'S'  THEN EN1                      
+			CASE UPPER(PRODUTOS_BARRA.GRADE)
-                      WHEN '40' THEN EN2
+                WHEN '36' THEN EN1 
-                      WHEN 'M'  THEN EN2                      
+				WHEN '38' THEN EN2 
-                      WHEN '42' THEN EN3
+                WHEN '40' THEN EN3
-                      WHEN 'L'  THEN EN3                      
+                WHEN '42' THEN EN4
-                      WHEN '44' THEN EN4
+                WHEN '44' THEN EN5
-                      WHEN 'XL' THEN EN4                      
+                WHEN '46' THEN EN6
-                      WHEN '46' THEN EN5
+                WHEN '48' THEN EN7
-                      WHEN '48' THEN EN6
+            END
-                 END,
+		ELSE
+			CASE UPPER(PRODUTOS_BARRA.GRADE)
+                WHEN '38' THEN EN1 
+                WHEN 'S'  THEN EN1 
+                WHEN '40' THEN EN2
+                WHEN 'M'  THEN EN2                      
+                WHEN '42' THEN EN3
+                WHEN 'L'  THEN EN3                      
+                WHEN '44' THEN EN4
+                WHEN 'XL' THEN EN4                      
+                WHEN '46' THEN EN5
+                WHEN '48' THEN EN6
+            END		
+	  END AS CANTIDAD,
       RDX_AJUSTES_HOJA_DEVOLUCIONES.ESTADO,
       RDX_AJUSTES_HOJA_DEVOLUCIONES.OBSERVACIONES,
       CONTABILIZAR = ISNULL(RDX_AJUSTES_HOJA_DEVOLUCIONES.CONTABILIZAR, 'S')
 FROM LOJA_SAIDAS_PRODUTO
 INNER JOIN LOJA_SAIDAS ON (LOJA_SAIDAS.ROMANEIO_PRODUTO = LOJA_SAIDAS_PRODUTO.ROMANEIO_PRODUTO)
+INNER JOIN PRODUTOS on (PRODUTOS.PRODUTO = LOJA_SAIDAS_PRODUTO.PRODUTO)
 INNER JOIN PRODUTOS_BARRA on
      (((PRODUTOS_BARRA.PRODUTO = LOJA_SAIDAS_PRODUTO.PRODUTO) AND
        (PRODUTOS_BARRA.COR_PRODUTO = LOJA_SAIDAS_PRODUTO.COR_PRODUTO)) AND
-      ((PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN1 <> 0) THEN '38' END) OR
+			((PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN1 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '36' ELSE '38' END END) OR
-       (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN1 <> 0) THEN 'S'  END) OR      
+             (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN1 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '36' ELSE 'S' END END) OR
-       (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN2 <> 0) THEN '40' END) OR
+             (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN2 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '38' ELSE '40' END END) OR
-       (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN2 <> 0) THEN 'M'  END) OR       
+			 (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN2 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '38' ELSE 'M' END END) OR
-       (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN3 <> 0) THEN '42' END) OR
+			 (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN3 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '40' ELSE '42' END END) OR
-       (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN3 <> 0) THEN 'L'  END) OR       
+			 (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN3 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '40' ELSE 'L' END END) OR
-       (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN4 <> 0) THEN '44' END) OR
+			 (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN4 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '42' ELSE '44' END END) OR
-       (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN4 <> 0) THEN 'XL' END) OR       
+			 (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN4 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '42' ELSE 'XL' END END) OR
-       (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN5 <> 0) THEN '46' END) OR
+			 (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN5 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '44' ELSE '46' END END) OR
-       (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN6 <> 0) THEN '48' END)))
+             (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN6 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '46' ELSE '48' END END) OR
-INNER JOIN PRODUTOS on (PRODUTOS.PRODUTO = PRODUTOS_BARRA.PRODUTO)
+             (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN7 <> 0) THEN CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN '48' ELSE NULL END END)))
 INNER JOIN FILIAIS AS FILIAIS_ORI ON (FILIAIS_ORI.FILIAL = LOJA_SAIDAS.FILIAL)
 INNER JOIN RDX_FILIALES AS RDX_FILIALES_ORI ON (RDX_FILIALES_ORI.CODFILIAL = FILIAIS_ORI.COD_FILIAL)
 INNER JOIN FILIAIS AS FILIAIS_DES ON (FILIAIS_DES.FILIAL = LOJA_SAIDAS.FILIAL_DESTINO)
@@ -828,6 +906,9 @@ SELECT
       CONTABILIZAR_HOJA = ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CONTABILIZAR, 'S'),
 
       /* CANTIDADES SOLICITADAS DESDE VARELA */
+      S36 = SUM(CASE WHEN RDX_V_HOJAS_DEVOLUCIONES.TALLA = 36 THEN
+                      ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CANTIDAD, 0)
+            END),
       S38 = SUM(CASE WHEN ((RDX_V_HOJAS_DEVOLUCIONES.TALLA = 38) OR (RDX_V_HOJAS_DEVOLUCIONES.TALLA = 'S')) THEN
                       ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CANTIDAD, 0)
             END),
@@ -854,6 +935,9 @@ SELECT
                     ),
 
       /* CANTIDADES ENVIADAS DESDE EL CENTRO*/
+      E36 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.TALLA = 36 THEN
+                     ISNULL(RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.CANTIDAD, 0)
+            END),
       E38 = SUM(CASE WHEN ((RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.TALLA = 38) OR (RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.TALLA = 'S')) THEN
                      ISNULL(RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.CANTIDAD, 0)
             END),
@@ -921,12 +1005,13 @@ SELECT
       RDX_V_DEVOLUCIONES.CONTABILIZAR_HOJA,
 
       /* CANTIDADES SOLICITADAS DESDE VARELA */
-      S38, S40, S42, S44, S46, S48, RDX_V_DEVOLUCIONES.SOLICITADO,
+      S36, S38, S40, S42, S44, S46, S48, RDX_V_DEVOLUCIONES.SOLICITADO,
 
       /* CANTIDADES ENVIADAS DESDE EL CENTRO*/
-      E38, E40, E42, E44, E46, E48, RDX_V_DEVOLUCIONES.ENVIADO,
+      E36, E38, E40, E42, E44, E46, E48, RDX_V_DEVOLUCIONES.ENVIADO,
 
       /* CANTIDADES ENVIADAS RECTIFICADAS */
+	  ER36 = ISNULL(RDX_DEVOLUCION_AJUSTES.CANT36, E36),
       ER38 = ISNULL(RDX_DEVOLUCION_AJUSTES.CANT38, ISNULL(RDX_DEVOLUCION_AJUSTES.CANT_S, E38)),
       ER40 = ISNULL(RDX_DEVOLUCION_AJUSTES.CANT40, ISNULL(RDX_DEVOLUCION_AJUSTES.CANT_M, E40)),
       ER42 = ISNULL(RDX_DEVOLUCION_AJUSTES.CANT42, ISNULL(RDX_DEVOLUCION_AJUSTES.CANT_L, E42)),
@@ -935,6 +1020,7 @@ SELECT
       ER48 = ISNULL(RDX_DEVOLUCION_AJUSTES.CANT48, E48),
 
       ENVIADO_RECT =
+	                ISNULL(RDX_DEVOLUCION_AJUSTES.CANT36, ISNULL(E36, 0)) +
                     ISNULL(RDX_DEVOLUCION_AJUSTES.CANT38, ISNULL(RDX_DEVOLUCION_AJUSTES.CANT_S, ISNULL(E38, 0))) +
                     ISNULL(RDX_DEVOLUCION_AJUSTES.CANT40, ISNULL(RDX_DEVOLUCION_AJUSTES.CANT_M, ISNULL(E40, 0))) +
                     ISNULL(RDX_DEVOLUCION_AJUSTES.CANT42, ISNULL(RDX_DEVOLUCION_AJUSTES.CANT_L, ISNULL(E42, 0))) +
@@ -944,6 +1030,7 @@ SELECT
 
       DIFERENCIA =
       (
+					ISNULL(RDX_DEVOLUCION_AJUSTES.CANT46, ISNULL(E36, 0)) +
                     ISNULL(RDX_DEVOLUCION_AJUSTES.CANT38, ISNULL(RDX_DEVOLUCION_AJUSTES.CANT_S, ISNULL(E38, 0))) +
                     ISNULL(RDX_DEVOLUCION_AJUSTES.CANT40, ISNULL(RDX_DEVOLUCION_AJUSTES.CANT_M, ISNULL(E40, 0))) +
                     ISNULL(RDX_DEVOLUCION_AJUSTES.CANT42, ISNULL(RDX_DEVOLUCION_AJUSTES.CANT_L, ISNULL(E42, 0))) +
@@ -973,6 +1060,7 @@ SELECT
       RDX_RECEPCION_AJUSTES.COLOR,
       RDX_TALLAS.TALLA,
       CANTIDAD = CASE UPPER(RDX_TALLAS.TALLA)
+	                  WHEN '36' THEN RDX_RECEPCION_AJUSTES.CANT36
                       WHEN '38' THEN RDX_RECEPCION_AJUSTES.CANT38
                       WHEN '40' THEN RDX_RECEPCION_AJUSTES.CANT40
                       WHEN '42' THEN RDX_RECEPCION_AJUSTES.CANT42
@@ -989,6 +1077,7 @@ LEFT OUTER JOIN RDX_FILIALES ON (RDX_FILIALES.CODBARRA = RDX_RECEPCION_AJUSTES.C
 LEFT OUTER JOIN FILIAIS ON (FILIAIS.COD_FILIAL = RDX_FILIALES.CODFILIAL)
 LEFT OUTER JOIN PRODUTOS ON (PRODUTOS.PRODUTO = RDX_RECEPCION_AJUSTES.CODIGO)
 WHERE CASE RDX_TALLAS.TALLA
+                      WHEN '36' THEN RDX_RECEPCION_AJUSTES.CANT36
                       WHEN '38' THEN RDX_RECEPCION_AJUSTES.CANT38
                       WHEN '40' THEN RDX_RECEPCION_AJUSTES.CANT40
                       WHEN '42' THEN RDX_RECEPCION_AJUSTES.CANT42
@@ -1046,6 +1135,7 @@ SELECT
       RDX_DEVOLUCION_AJUSTES.COLOR,
       RDX_TALLAS.TALLA,
       CANTIDAD = CASE RDX_TALLAS.TALLA
+	                  WHEN '36' THEN RDX_DEVOLUCION_AJUSTES.CANT36
                       WHEN '38' THEN RDX_DEVOLUCION_AJUSTES.CANT38
                       WHEN '40' THEN RDX_DEVOLUCION_AJUSTES.CANT40
                       WHEN '42' THEN RDX_DEVOLUCION_AJUSTES.CANT42
@@ -1062,6 +1152,7 @@ LEFT OUTER JOIN RDX_FILIALES ON (RDX_FILIALES.CODBARRA = RDX_DEVOLUCION_AJUSTES.
 LEFT OUTER JOIN FILIAIS ON (FILIAIS.COD_FILIAL = RDX_FILIALES.CODFILIAL)
 LEFT OUTER JOIN PRODUTOS ON (PRODUTOS.PRODUTO = RDX_DEVOLUCION_AJUSTES.CODIGO)
 WHERE CASE RDX_TALLAS.TALLA
+                      WHEN '36' THEN RDX_DEVOLUCION_AJUSTES.CANT36
                       WHEN '38' THEN RDX_DEVOLUCION_AJUSTES.CANT38
                       WHEN '40' THEN RDX_DEVOLUCION_AJUSTES.CANT40
                       WHEN '42' THEN RDX_DEVOLUCION_AJUSTES.CANT42
@@ -1091,7 +1182,8 @@ SELECT
       PRODUTOS_BARRA.COR_PRODUTO AS COLOR,
       PRODUTOS_BARRA.GRADE AS TALLA,
       CANTIDAD = CASE UPPER(PRODUTOS_BARRA.GRADE)
-                      WHEN '38' THEN EN1
+                      WHEN '36' THEN EN7
+					  WHEN '38' THEN EN1
                       WHEN 'S'  THEN EN1                      
                       WHEN '40' THEN EN2
                       WHEN 'M'  THEN EN2                      
@@ -1107,7 +1199,8 @@ INNER JOIN LOJA_SAIDAS ON (LOJA_SAIDAS.ROMANEIO_PRODUTO = LOJA_SAIDAS_PRODUTO.RO
 INNER JOIN PRODUTOS_BARRA on
      (((PRODUTOS_BARRA.PRODUTO = LOJA_SAIDAS_PRODUTO.PRODUTO) AND
        (PRODUTOS_BARRA.COR_PRODUTO = LOJA_SAIDAS_PRODUTO.COR_PRODUTO)) AND
-      ((PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN1 <> 0) THEN '38' END) OR
+      ((PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN7 <> 0) THEN '36' END) OR
+	   (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN1 <> 0) THEN '38' END) OR
        (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN1 <> 0) THEN 'S'  END) OR      
        (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN2 <> 0) THEN '40' END) OR
        (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN2 <> 0) THEN 'M'  END) OR       
@@ -1141,6 +1234,7 @@ SELECT
       RDX_TRASPASOS_AJUSTES.COLOR,
       RDX_TALLAS.TALLA,
       CANTIDAD = CASE UPPER(RDX_TALLAS.TALLA)
+	                  WHEN '36' THEN RDX_TRASPASOS_AJUSTES.CANT36
                       WHEN '38' THEN RDX_TRASPASOS_AJUSTES.CANT38
                       WHEN '40' THEN RDX_TRASPASOS_AJUSTES.CANT40
                       WHEN '42' THEN RDX_TRASPASOS_AJUSTES.CANT42
@@ -1159,6 +1253,7 @@ LEFT OUTER JOIN RDX_FILIALES AS RDX_FILIALES2 ON (RDX_FILIALES2.CODBARRA = RDX_T
 LEFT OUTER JOIN FILIAIS AS FILIAIS2 ON (FILIAIS2.COD_FILIAL = RDX_FILIALES2.CODFILIAL)
 LEFT OUTER JOIN PRODUTOS ON (PRODUTOS.PRODUTO = RDX_TRASPASOS_AJUSTES.CODIGO)
 WHERE CASE RDX_TALLAS.TALLA
+                      WHEN '36' THEN RDX_TRASPASOS_AJUSTES.CANT36
                       WHEN '38' THEN RDX_TRASPASOS_AJUSTES.CANT38
                       WHEN '40' THEN RDX_TRASPASOS_AJUSTES.CANT40
                       WHEN '42' THEN RDX_TRASPASOS_AJUSTES.CANT42

Database/2.2 - vistas ventas.sql

@@ -1,28 +1,36 @@
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_VENTASTERMINADAS]'))
 DROP VIEW [RDX_V_VENTASTERMINADAS]
 GO
 
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_VENTASPROCESOPENDIENTES]'))
 DROP VIEW [RDX_V_VENTASPROCESOPENDIENTES]
 GO
 
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_VENTASPROCESO]'))
 DROP VIEW [RDX_V_VENTASPROCESO]
 GO
 
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_REFERENCIA_GENERICA]'))
 DROP VIEW [RDX_V_REFERENCIA_GENERICA]
 GO
 
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_VENTASEDI_ERRONEAS]'))
 DROP VIEW [RDX_V_VENTASEDI_ERRONEAS]
 GO
 
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_VENTASEDI_RESUELTAS]'))
 DROP VIEW [RDX_V_VENTASEDI_RESUELTAS]
 GO
 
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_REFERENCIAS_RESUELTAS]'))
 DROP VIEW [RDX_V_REFERENCIAS_RESUELTAS]
 GO
 
-IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_VENTASEDI_PESADA]'))
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_VENTASEDI_PESADA]'))
 DROP VIEW [RDX_V_VENTASEDI_PESADA]
 GO
 
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_VENTASEDI]'))
 DROP VIEW [RDX_V_VENTASEDI]
 GO
 
@@ -280,6 +288,7 @@ SELECT
   COLECAO AS COLECCION,
   COR_PRODUTO AS COLOR,
   GRADE AS TALLA,
+  TALLA36 = CASE WHEN (GRADE = 36) THEN ISNULL(CANVEN, 0) + ISNULL(CANVENNET, 0) ELSE NULL END,
   TALLA38 = CASE WHEN ((GRADE = 38) OR (UPPER(GRADE) = 'S')) THEN ISNULL(CANVEN, 0) + ISNULL(CANVENNET, 0) ELSE NULL END,
   TALLA40 = CASE WHEN ((GRADE = 40) OR (UPPER(GRADE) = 'M')) THEN ISNULL(CANVEN, 0) + ISNULL(CANVENNET, 0) ELSE NULL END,
   TALLA42 = CASE WHEN ((GRADE = 42) OR (UPPER(GRADE) = 'L')) THEN ISNULL(CANVEN, 0) + ISNULL(CANVENNET, 0) ELSE NULL END,

Database/2.3 - vistas stock.sql

@@ -1,17 +1,32 @@
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_CONTROL_INVENTARIO]'))
 DROP VIEW [RDX_V_CONTROL_INVENTARIO]
 GO
+
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_INVENTARIO_STOCK_DESGLOSADO]'))
 DROP VIEW [RDX_V_INVENTARIO_STOCK_DESGLOSADO]
 GO
+
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_STOCK_CALCULADO_DESGLOSADO]'))
 DROP VIEW [RDX_V_STOCK_CALCULADO_DESGLOSADO]
 GO
+
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_STOCK_CALCULADO]'))
 DROP VIEW [RDX_V_STOCK_CALCULADO]
 GO
+
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_STOCK]'))
 DROP VIEW [RDX_V_STOCK]
 GO
+
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_STOCK_VENTAS]'))
 DROP VIEW [RDX_V_STOCK_VENTAS]
 GO
+
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_STOCK_INVENTARIO]'))
 DROP VIEW [RDX_V_STOCK_INVENTARIO]
 GO
+
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[RDX_V_STOCK_VARELA]'))
 DROP VIEW [RDX_V_STOCK_VARELA]
 GO
 
@@ -26,14 +41,14 @@ SELECT ESTOQUE_PRODUTOS.FILIAL,
        PRODUTOS.TIPO_PRODUTO,
        PRODUTOS.GRUPO_PRODUTO,
        COLECCION = PRODUTOS.COLECAO,
-       ESTOQUE_PRODUTOS.ES1 as K38,
+	   CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN ESTOQUE_PRODUTOS.ES1 ELSE 0 END AS K36,
-       ESTOQUE_PRODUTOS.ES2 as K40,
+	   CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN ESTOQUE_PRODUTOS.ES2 ELSE ESTOQUE_PRODUTOS.ES1 END AS K38,
-       ESTOQUE_PRODUTOS.ES3 as K42,
+	   CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN ESTOQUE_PRODUTOS.ES3 ELSE ESTOQUE_PRODUTOS.ES2 END AS K40,
-       ESTOQUE_PRODUTOS.ES4 as K44,
+	   CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN ESTOQUE_PRODUTOS.ES4 ELSE ESTOQUE_PRODUTOS.ES3 END AS K42,
-       ESTOQUE_PRODUTOS.ES5 as K46,
+	   CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN ESTOQUE_PRODUTOS.ES5 ELSE ESTOQUE_PRODUTOS.ES4 END AS K44,
-       ESTOQUE_PRODUTOS.ES6 as K48,
+	   CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN ESTOQUE_PRODUTOS.ES6 ELSE ESTOQUE_PRODUTOS.ES5 END AS K46,
+	   CASE WHEN (PRODUTOS.GRADE IN ('JEANS')) THEN ESTOQUE_PRODUTOS.ES7 ELSE ESTOQUE_PRODUTOS.ES6 END AS K48,
        ESTOQUE_PRODUTOS.ESTOQUE as KT
-
 FROM ESTOQUE_PRODUTOS
 LEFT OUTER JOIN PRODUTOS ON (PRODUTOS.PRODUTO = ESTOQUE_PRODUTOS.PRODUTO)
 WHERE FILIAL LIKE '%VARELA IMAGEN Y DISEÑO%'
@@ -135,6 +150,24 @@ SELECT
       GRUPO_PRODUCTO = PRODUTOS.GRUPO_PRODUTO,
       COLECCION = PRODUTOS.COLECAO,
       COLOR = ISNULL(RDX_V_STOCK_INVENTARIO.COLOR, RDX_V_STOCK_VENTAS.COLOR),
+      E36 = SUM(CASE ISNULL(RDX_V_STOCK_INVENTARIO.TALLA, RDX_V_STOCK_VENTAS.TALLA)
+                 WHEN '36' THEN
+                      CASE RDX_V_STOCK_INVENTARIO.OPERACION
+                           WHEN 'RM' THEN 0
+                           WHEN 'R' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
+                           WHEN 'E' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
+                           ELSE
+                               0
+                      END
+                      +
+                      CASE
+                          WHEN (RDX_V_STOCK_VENTAS.CANTIDAD < 0) THEN
+                              RDX_V_STOCK_VENTAS.CANTIDAD * (-1)
+                          ELSE
+                              0
+                      END
+                 END),
+	  
       E38 = SUM(CASE 
                  WHEN ((ISNULL(RDX_V_STOCK_INVENTARIO.TALLA, RDX_V_STOCK_VENTAS.TALLA) = '38') OR (UPPER(ISNULL(RDX_V_STOCK_INVENTARIO.TALLA, RDX_V_STOCK_VENTAS.TALLA)) = 'S')) THEN
                       CASE RDX_V_STOCK_INVENTARIO.OPERACION
@@ -243,6 +276,24 @@ SELECT
                       END
                  END),
 
+      S36 = SUM(CASE ISNULL(RDX_V_STOCK_INVENTARIO.TALLA, RDX_V_STOCK_VENTAS.TALLA)
+                 WHEN '36' THEN
+                      CASE RDX_V_STOCK_INVENTARIO.OPERACION
+                           WHEN 'D' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
+                           WHEN 'S' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
+                           WHEN 'T' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
+                           ELSE
+                               0
+                      END
+                      +
+                      CASE
+                          WHEN (RDX_V_STOCK_VENTAS.CANTIDAD > 0) THEN
+                              RDX_V_STOCK_VENTAS.CANTIDAD * (-1)
+                          ELSE
+                              0
+                      END
+                 END),
+				 
       S38 = SUM(CASE 
                  WHEN ((ISNULL(RDX_V_STOCK_INVENTARIO.TALLA, RDX_V_STOCK_VENTAS.TALLA) = '38') OR (UPPER(ISNULL(RDX_V_STOCK_INVENTARIO.TALLA, RDX_V_STOCK_VENTAS.TALLA)) = 'S')) THEN
                       CASE RDX_V_STOCK_INVENTARIO.OPERACION
@@ -385,27 +436,30 @@ SELECT
       GRUPO_PRODUCTO,
       COLECCION,
       COLOR,
+	  E36,
       E38,
       E40,
       E42,
       E44,
       E46,
       E48,
-      TE = ISNULL(E38, 0) + ISNULL(E40, 0) + ISNULL(E42, 0) + ISNULL(E44, 0) + ISNULL(E46, 0) + ISNULL(E48, 0),
+      TE = ISNULL(E36, 0) + ISNULL(E38, 0) + ISNULL(E40, 0) + ISNULL(E42, 0) + ISNULL(E44, 0) + ISNULL(E46, 0) + ISNULL(E48, 0),
+	  S36,
       S38,
       S40,
       S42,
       S44,
       S46,
       S48,
-      TS = ISNULL(S38, 0) + ISNULL(S40, 0) + ISNULL(S42, 0) + ISNULL(S44, 0) + ISNULL(S46, 0) + ISNULL(S48, 0),
+      TS = ISNULL(S36, 0) + ISNULL(S38, 0) + ISNULL(S40, 0) + ISNULL(S42, 0) + ISNULL(S44, 0) + ISNULL(S46, 0) + ISNULL(S48, 0),
+      K36 = ISNULL(E36, 0) + ISNULL(S36, 0),
       K38 = ISNULL(E38, 0) + ISNULL(S38, 0),
       K40 = ISNULL(E40, 0) + ISNULL(S40, 0),
       K42 = ISNULL(E42, 0) + ISNULL(S42, 0),
       K44 = ISNULL(E44, 0) + ISNULL(S44, 0),
       K46 = ISNULL(E46, 0) + ISNULL(S46, 0),
       K48 = ISNULL(E48, 0) + ISNULL(S48, 0),
-      KT = ISNULL(E38, 0) + ISNULL(S38, 0) + ISNULL(E40, 0) + ISNULL(S40, 0) +
+      KT = ISNULL(E36, 0) + ISNULL(E38, 0) + ISNULL(S38, 0) + ISNULL(E40, 0) + ISNULL(S40, 0) +
            ISNULL(E42, 0) + ISNULL(S42, 0) + ISNULL(E44, 0) + ISNULL(S44, 0) +
            ISNULL(E46, 0) + ISNULL(S46, 0) + ISNULL(E48, 0) + ISNULL(S48, 0)
 
@@ -428,6 +482,7 @@ SELECT FECHA,
       COLOR,
       RDX_TALLAS.TALLA,
       CANTIDAD = CASE RDX_TALLAS.TALLA
+					  WHEN '36' THEN RDX_V_STOCK_CALCULADO.K36
                       WHEN '38' THEN RDX_V_STOCK_CALCULADO.K38
                       WHEN '40' THEN RDX_V_STOCK_CALCULADO.K40
                       WHEN '42' THEN RDX_V_STOCK_CALCULADO.K42
@@ -483,7 +538,13 @@ select
       TIPO_PRODUCTO,
       GRUPO_PRODUCTO,
       COLECCION,
-      I38 = SUM(CASE TALLA
+      I36 = SUM(CASE TALLA
+            WHEN '36' THEN
+                 CANTIDAD_INVENTARIO
+            ELSE 0
+            END)
+	  
+      ,I38 = SUM(CASE TALLA
             WHEN '38' THEN
                  CANTIDAD_INVENTARIO
             ELSE 0
@@ -519,7 +580,13 @@ select
             ELSE 0
             END)
 
-     ,K38 = SUM(CASE TALLA
+     ,K36 = SUM(CASE TALLA
+            WHEN '36' THEN
+                 CANTIDAD_STOCK
+            ELSE 0
+            END)
+
+ 	 ,K38 = SUM(CASE TALLA
             WHEN '38' THEN
                  CANTIDAD_STOCK
             ELSE 0

Database/4 - datos.sql

@@ -0,0 +1,44 @@
+INSERT INTO [RDX_TALLAS] ([TALLA], [TIPO_TALLAJE])
+VALUES (N'38', 1)
+GO
+
+INSERT INTO [RDX_TALLAS] ([TALLA], [TIPO_TALLAJE])
+VALUES (N'40', 1)
+GO
+
+INSERT INTO [RDX_TALLAS] ([TALLA], [TIPO_TALLAJE])
+VALUES (N'42', 1)
+GO
+
+INSERT INTO [RDX_TALLAS] ([TALLA], [TIPO_TALLAJE])
+VALUES (N'44', 1)
+GO
+
+INSERT INTO [RDX_TALLAS] ([TALLA], [TIPO_TALLAJE])
+VALUES (N'46', 1)
+GO
+
+INSERT INTO [RDX_TALLAS] ([TALLA], [TIPO_TALLAJE])
+VALUES (N'48', 1)
+GO
+
+INSERT INTO [RDX_TALLAS] ([TALLA], [TIPO_TALLAJE])
+VALUES (N'S', 2)
+GO
+
+INSERT INTO [RDX_TALLAS] ([TALLA], [TIPO_TALLAJE])
+VALUES (N'M', 2)
+GO
+
+INSERT INTO [RDX_TALLAS] ([TALLA], [TIPO_TALLAJE])
+VALUES (N'L', 2)
+GO
+
+INSERT INTO [RDX_TALLAS] ([TALLA], [TIPO_TALLAJE])
+VALUES (N'XL', 2)
+GO
+
+INSERT INTO [RDX_TALLAS] ([TALLA], [TIPO_TALLAJE])
+VALUES (N'36', 1)
+GO
+

Database/ANTERIOR/Script Datos.sql

@@ -1,178 +0,0 @@
---------------- SQL ---------------
-CREATE USER [usuario_gft]
-  FOR LOGIN [usuario_gft]
-  WITH DEFAULT_SCHEMA = [dbo]
-GO
-
-COMMIT
-GO
-
-INSERT INTO [RDX_FILIALES] ([CODFILIAL], [CODBARRA])
-VALUES 
-  ('010082','8422416200065')
-GO
-
-INSERT INTO [RDX_FILIALES] ([CODFILIAL], [CODBARRA])
-VALUES 
-  ('010083','8422416200058')
-GO
-
-INSERT INTO [RDX_FILIALES] ([CODFILIAL], [CODBARRA])
-VALUES 
-  ('010086','8422416200041')
-GO
-
-INSERT INTO [RDX_FILIALES] ([CODFILIAL], [CODBARRA])
-VALUES 
-  ('010089','8422416200102')
-GO
-
-INSERT INTO [RDX_FILIALES] ([CODFILIAL], [CODBARRA])
-VALUES 
-  ('010090','8422416200126')
-GO
-
-INSERT INTO [RDX_FILIALES] ([CODFILIAL], [CODBARRA])
-VALUES 
-  ('010091','8422416200133')
-GO
-
-INSERT INTO [RDX_FILIALES] ([CODFILIAL], [CODBARRA])
-VALUES 
-  ('010092','8422416200188')
-GO
-
-INSERT INTO [RDX_FILIALES] ([CODFILIAL], [CODBARRA])
-VALUES 
-  ('010244','8422416101256')
-GO
-
-INSERT INTO [RDX_FILIALES] ([CODFILIAL], [CODBARRA])
-VALUES 
-  ('010094','8422416200959')
-GO
-
-INSERT INTO [RDX_FILIALES] ([CODFILIAL], [CODBARRA])
-VALUES 
-  ('010096','8422416209068')
-GO
-
-INSERT INTO [RDX_FILIALES] ([CODFILIAL], [CODBARRA])
-VALUES 
-  ('010088','8422416200089')
-GO
-
-INSERT INTO [RDX_FILIALES] ([CODFILIAL], [CODBARRA])
-VALUES 
-  ('010103','8422416200140')
-GO
-
-INSERT INTO [RDX_FILIALES] ([CODFILIAL], [CODBARRA])
-VALUES 
-  ('010087','8422416200072')
-GO
-
-INSERT INTO [RDX_FILIALES] ([CODFILIAL], [CODBARRA])
-VALUES 
-  ('000001','8435159800003')
-GO
-
-COMMIT
-GO
-
-
-
---------------- SQL ---------------
-CREATE TABLE [RDX_TALLAS] (
-  [TALLA] char(2) NOT NULL
-)
-ON [PRIMARY]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_TALLAS]
-TO [public]
-GO
-
-INSERT INTO [RDX_TALLAS] ([TALLA])
-VALUES 
-  ('38')
-GO
-
-INSERT INTO [RDX_TALLAS] ([TALLA])
-VALUES 
-  ('40')
-GO
-
-INSERT INTO [RDX_TALLAS] ([TALLA])
-VALUES 
-  ('42')
-GO
-
-INSERT INTO [RDX_TALLAS] ([TALLA])
-VALUES 
-  ('44')
-GO
-
-INSERT INTO [RDX_TALLAS] ([TALLA])
-VALUES 
-  ('46')
-GO
-
-INSERT INTO [RDX_TALLAS] ([TALLA])
-VALUES 
-  ('48')
-GO
-
-COMMIT
-GO
-
-
-
-
-
-/* Códigos de barra de ECI que son referencias nulas */
-
-INSERT INTO [PRODUTOS_BARRA] ([CODIGO_BARRA], [PRODUTO], [COR_PRODUTO], [TAMANHO], [GRADE], [DATA_PARA_TRANSFERENCIA], [CODIGO_BARRA_PADRAO], [NOME_CLIFOR])
-VALUES 
-  ('61800000000','107CH.EN.01','300',1,'38',CURRENT_TIMESTAMP,0,NULL)
-GO
-
-INSERT INTO [PRODUTOS_BARRA] ([CODIGO_BARRA], [PRODUTO], [COR_PRODUTO], [TAMANHO], [GRADE], [DATA_PARA_TRANSFERENCIA], [CODIGO_BARRA_PADRAO], [NOME_CLIFOR])
-VALUES
-  ('61810001406','107CH.EN.01','300',1,'38',CURRENT_TIMESTAMP,0,NULL)
-GO
-
-INSERT INTO [PRODUTOS_BARRA] ([CODIGO_BARRA], [PRODUTO], [COR_PRODUTO], [TAMANHO], [GRADE], [DATA_PARA_TRANSFERENCIA], [CODIGO_BARRA_PADRAO], [NOME_CLIFOR])
-VALUES
-  ('61810001547','107CH.EN.01','300',1,'38',CURRENT_TIMESTAMP,0,NULL)
-GO
-
-INSERT INTO [PRODUTOS_BARRA] ([CODIGO_BARRA], [PRODUTO], [COR_PRODUTO], [TAMANHO], [GRADE], [DATA_PARA_TRANSFERENCIA], [CODIGO_BARRA_PADRAO], [NOME_CLIFOR])
-VALUES
-  ('61810001042','107CH.EN.01','300',1,'38',CURRENT_TIMESTAMP,0,NULL)
-GO
-
-INSERT INTO [PRODUTOS_BARRA] ([CODIGO_BARRA], [PRODUTO], [COR_PRODUTO], [TAMANHO], [GRADE], [DATA_PARA_TRANSFERENCIA], [CODIGO_BARRA_PADRAO], [NOME_CLIFOR])
-VALUES
-  ('61810001141','107CH.EN.01','300',1,'38',CURRENT_TIMESTAMP,0,NULL)
-GO
-
-INSERT INTO [PRODUTOS_BARRA] ([CODIGO_BARRA], [PRODUTO], [COR_PRODUTO], [TAMANHO], [GRADE], [DATA_PARA_TRANSFERENCIA], [CODIGO_BARRA_PADRAO], [NOME_CLIFOR])
-VALUES
-  ('8300733557232','107CH.EN.01','300',1,'38',CURRENT_TIMESTAMP,0,NULL)
-GO
-
-COMMIT
-GO
-
-
-
-
-
-
-
-
-
-
-

Database/ANTERIOR/Script Tablas.sql

@@ -1,519 +0,0 @@
---------------- SQL ---------------
-CREATE TABLE [RDX_CABINV] (
-  [NUMDOC] varchar(25) NOT NULL,
-  [TIPODOC] varchar(3) NULL,
-  [TIPOLIQ] varchar(3) NULL,
-  [FECHA] datetime NULL,
-  [FECHALIQ] datetime NULL,
-  [EMISOR] varchar(17) NULL,
-  [RECEPTOR] varchar(17) NULL,
-  [DPTO] varchar(3) NULL,
-  [CENTRO] varchar(17) NULL,
-  [FECHA_CARGA] datetime NULL
-)
-ON [PRIMARY]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_CABINV]
-TO [public]
-GO
-
-ALTER TABLE [RDX_CABINV]
-ADD PRIMARY KEY CLUSTERED ([NUMDOC])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_CABINV_idx] ON [RDX_CABINV]
-  ([FECHALIQ])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_CABINV_idx2] ON [RDX_CABINV]
-  ([CENTRO])
-ON [PRIMARY]
-GO
-
---------------- SQL ---------------
-CREATE TABLE [RDX_LININV] (
-  [NUMDOC] varchar(25) NOT NULL,
-  [NUMLIN] numeric(6, 0) NOT NULL,
-  [CODART] varchar(17) NULL,
-  [FAMILIA] varchar(17) NULL,
-  [BARRA] varchar(17) NULL,
-  [TALLA] varchar(17) NULL,
-  [MARCA] varchar(25) NULL,
-  [TAMANO] varchar(25) NULL,
-  [SERIE] varchar(25) NULL,
-  [COLOR] varchar(25) NULL,
-  [MODELO] varchar(25) NULL,
-  [DIBUJO] varchar(25) NULL,
-  [DESCRIP] varchar(70) NULL
-)
-ON [PRIMARY]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_LININV]
-TO [public]
-GO
-
-ALTER TABLE [RDX_LININV]
-ADD PRIMARY KEY CLUSTERED ([NUMDOC], [NUMLIN])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_LININV_idx] ON [RDX_LININV]
-  ([CODART])
-ON [PRIMARY]
-GO
-
---------------- SQL ---------------
-CREATE TABLE [RDX_CANTINV] (
-  [NUMDOC] varchar(25) NOT NULL,
-  [NUMLIN] numeric(6, 0) NOT NULL,
-  [NUMCANT] numeric(6, 0) NOT NULL,
-  [TIPOCANT] varchar(3) NULL,
-  [CANTIDAD] numeric(15, 0) NULL,
-  [CENTRO] varchar(17) NULL,
-  [TMOV] varchar(3) NULL,
-  [FACT] varchar(12) NULL,
-  [DEPTO] varchar(3) NULL,
-  [IDVEN] varchar(10) NULL
-)
-ON [PRIMARY]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_CANTINV]
-TO [public]
-GO
-
-ALTER TABLE [RDX_CANTINV]
-ADD PRIMARY KEY CLUSTERED ([NUMDOC], [NUMLIN], [NUMCANT])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_CANTINV_idx] ON [RDX_CANTINV]
-  ([TIPOCANT])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_CANTINV_idx2] ON [RDX_CANTINV]
-  ([IDVEN])
-ON [PRIMARY]
-GO
-
---------------- SQL ---------------
-CREATE TABLE [RDX_CABVEN] (
-  [CLAVE1] numeric(10, 0) NOT NULL,
-  [NUMINF] varchar(35) NULL,
-  [FUNCION] varchar(10) NULL,
-  [FECINI] datetime NULL,
-  [FECFIN] datetime NULL,
-  [FECINF] datetime NULL,
-  [PERVENINI] datetime NULL,
-  [PERVENFIN] datetime NULL,
-  [EANOFI] varchar(17) NULL,
-  [EANEMI] varchar(17) NULL,
-  [EANREC] varchar(17) NULL,
-  [EANVEN] varchar(17) NULL,
-  [EANALM] varchar(17) NULL,
-  [EANREP] varchar(17) NULL,
-  [EANPRO] varchar(17) NULL,
-  [EANADMSA] varchar(17) NULL,
-  [EANREPSR] varchar(17) NULL,
-  [ADMVENSA] varchar(35) NULL,
-  [REPDEPSR] varchar(35) NULL,
-  [EMAILSA] varchar(35) NULL,
-  [NUMFAXSA] varchar(35) NULL,
-  [NUMTELSA] varchar(35) NULL,
-  [NUMTLXSA] varchar(35) NULL,
-  [X400SA] varchar(35) NULL,
-  [EMAILSR] varchar(35) NULL,
-  [NUMFAXSR] varchar(35) NULL,
-  [NUMTELSR] varchar(35) NULL,
-  [NUMTLXSR] varchar(35) NULL,
-  [X400SR] varchar(35) NULL,
-  [NUMPRE] varchar(35) NULL,
-  [NUMINFSC] varchar(35) NULL,
-  [NUMCON] varchar(35) NULL,
-  [FECPRE] datetime NULL,
-  [FECINFSC] datetime NULL,
-  [FECCON] datetime NULL,
-  [DIVPED] varchar(3) NULL,
-  [DIVPRE] varchar(3) NULL,
-  [DIVPAG] varchar(3) NULL,
-  [DIVPEDF] varchar(3) NULL,
-  [DIVPREF] varchar(3) NULL,
-  [DIVPAGF] varchar(3) NULL,
-  [TASCAM] numeric(15, 3) NULL,
-  [FECTAS] datetime NULL,
-  [FECHA_CARGA] datetime NULL
-)
-ON [PRIMARY]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_CABVEN]
-TO [public]
-GO
-
-ALTER TABLE [RDX_CABVEN]
-ADD PRIMARY KEY CLUSTERED ([CLAVE1])
-ON [PRIMARY]
-GO
-
---------------- SQL ---------------
-CREATE TABLE [RDX_LUGVEN] (
-  [CLAVE1] numeric(10, 0) NOT NULL,
-  [CLAVE2] numeric(5, 0) NOT NULL,
-  [EANLUG] varchar(17) NULL,
-  [LUGVEN] varchar(70) NULL,
-  [FECINI] datetime NULL,
-  [FECFIN] datetime NULL,
-  [PERVENINI] datetime NULL,
-  [PERVENFIN] datetime NULL
-)
-ON [PRIMARY]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_LUGVEN]
-TO [public]
-GO
-
-ALTER TABLE [RDX_LUGVEN]
-ADD PRIMARY KEY CLUSTERED ([CLAVE1], [CLAVE2])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_LUGVEN_PERVENINI_IDX] ON [RDX_LUGVEN]
-  ([PERVENINI])
-ON [PRIMARY]
-GO
-
-ALTER TABLE [RDX_LUGVEN]
-ADD CONSTRAINT [FK__RDX_LUGVE__CLAVE__4A59F0B5] FOREIGN KEY ([CLAVE1]) 
-  REFERENCES [RDX_CABVEN] ([CLAVE1]) 
-  ON UPDATE CASCADE
-  ON DELETE CASCADE
-GO
-
-ALTER TABLE [RDX_LUGVEN]
-NOCHECK CONSTRAINT [FK__RDX_LUGVE__CLAVE__4A59F0B5]
-GO
-
---------------- SQL ---------------
-CREATE TABLE [RDX_ARTVEN] (
-  [CLAVE1] numeric(10, 0) NOT NULL,
-  [CLAVE2] numeric(5, 0) NOT NULL,
-  [CLAVE3] numeric(5, 0) NOT NULL,
-  [EANART] varchar(17) NULL,
-  [CODCOM] varchar(35) NULL,
-  [NUMVAR] varchar(35) NULL,
-  [CODPRO] varchar(35) NULL,
-  [DESARTCO] varchar(35) NULL,
-  [DESART] varchar(70) NULL,
-  [NUMCON] varchar(35) NULL,
-  [NUMLIS] varchar(35) NULL,
-  [CONESP1] varchar(3) NULL,
-  [CONESP2] varchar(3) NULL,
-  [CONESP3] varchar(3) NULL,
-  [VALVEN] numeric(15, 3) NULL,
-  [PRENETCT] numeric(15, 3) NULL,
-  [PREBRUCT] numeric(15, 3) NULL,
-  [PREINFET] numeric(15, 3) NULL,
-  [PREINFFT] numeric(15, 3) NULL,
-  [PRECALCT] numeric(15, 3) NULL,
-  [PRENETCA] numeric(15, 3) NULL,
-  [PREBRUCA] numeric(15, 3) NULL,
-  [PREINFEA] numeric(15, 3) NULL,
-  [PREINFFA] numeric(15, 3) NULL,
-  [PRECALCA] numeric(15, 3) NULL,
-  [BAPRUN1] numeric(9, 0) NULL,
-  [UNIMED1] varchar(3) NULL,
-  [BAPRUN2] numeric(9, 0) NULL,
-  [UNIMED2] varchar(3) NULL,
-  [BAPRUN3] numeric(9, 0) NULL,
-  [UNIMED3] varchar(3) NULL,
-  [BAPRUN4] numeric(9, 0) NULL,
-  [UNIMED4] varchar(3) NULL,
-  [BAPRUN5] numeric(9, 0) NULL,
-  [UNIMED5] varchar(3) NULL,
-  [CANVEN] numeric(15, 3) NULL,
-  [EXIPRO] numeric(15, 3) NULL,
-  [DESEXI] numeric(15, 3) NULL,
-  [ESPMEDCV] varchar(3) NULL,
-  [ESPMEDEP] varchar(3) NULL,
-  [ESPMEDDE] varchar(3) NULL,
-  [CANDEV] numeric(15, 3) NULL,
-  [EANVEN] varchar(17) NULL,
-  [NOMVEN] varchar(70) NULL,
-  [NUMTALON] varchar(35) NULL,
-  [CANVENNET] numeric(15, 3) NULL,
-  [UMEDVENNET] varchar(3) NULL,
-  [CANESP] numeric(15, 3) NULL,
-  [UMEDESP] varchar(3) NULL
-)
-ON [PRIMARY]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_ARTVEN]
-TO [public]
-GO
-
-ALTER TABLE [RDX_ARTVEN]
-ADD PRIMARY KEY CLUSTERED ([CLAVE1], [CLAVE2], [CLAVE3])
-ON [PRIMARY]
-GO
-
-ALTER TABLE [RDX_ARTVEN]
-ADD CONSTRAINT [FK__RDX_ARTVEN__56BFC79A] FOREIGN KEY ([CLAVE1], [CLAVE2]) 
-  REFERENCES [RDX_LUGVEN] ([CLAVE1], [CLAVE2]) 
-  ON UPDATE CASCADE
-  ON DELETE CASCADE
-GO
-
-ALTER TABLE [RDX_ARTVEN]
-NOCHECK CONSTRAINT [FK__RDX_ARTVEN__56BFC79A]
-GO
-
---------------- SQL ---------------
-CREATE TABLE [RDX_INFORMES] (
-  [ID] smallint IDENTITY(1, 1) NOT NULL,
-  [CATEGORIA] varchar(15) NULL,
-  [ICONO] smallint NULL,
-  [NOMBRE] varchar(50) NULL,
-  [DESCRIPCION] varchar(255) NULL,
-  [ORDEN] smallint NULL,
-  [VISTA] text NULL,
-  [MODIFICABLE] char(1) CONSTRAINT [DF__RDX_INFOR__MODIF__5C78A0F0] DEFAULT 'S' NOT NULL
-)
-ON [PRIMARY]
-TEXTIMAGE_ON [PRIMARY]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_INFORMES]
-TO [public]
-GO
-
-ALTER TABLE [RDX_INFORMES]
-ADD CONSTRAINT [RDX_INFORMES_pk] 
-PRIMARY KEY CLUSTERED ([ID])
-ON [PRIMARY]
-GO
-
---------------- SQL ---------------
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_ARTVEN]
-TO [public]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_CABINV]
-TO [public]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_CABVEN]
-TO [public]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_CANTINV]
-TO [public]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_LININV]
-TO [public]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_LUGVEN]
-TO [public]
-GO
-
-
---------------- SQL ---------------
-CREATE TABLE [RDX_LOG_CARGA] (
-  [ID] int IDENTITY(1, 1) NOT NULL,
-  [REPORT] varchar(10) NOT NULL,
-  [FECHA] datetime NOT NULL,
-  [OK] bit NOT NULL,
-  [ERROR_MSG] varchar(255) NULL
-)
-ON [PRIMARY]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_LOG_CARGA]
-TO [public]
-GO
-
-ALTER TABLE [RDX_LOG_CARGA]
-ADD UNIQUE NONCLUSTERED ([ID])
-ON [PRIMARY]
-GO
-
---------------- SQL ---------------
-CREATE TABLE [RDX_REFERENCIA_GENERICA] (
-  [NUMINF] varchar(35) NOT NULL,
-  [CLAVE1] numeric(10, 0) NOT NULL,
-  [CLAVE2] numeric(5, 0) NOT NULL,
-  [CLAVE3] numeric(5, 0) NOT NULL,
-  [FECHACAMBIO] datetime NOT NULL,
-  [ESTADO] char(1) NOT NULL,
-  [CODIGO_BARRA] varchar(25) NULL
-)
-ON [PRIMARY]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_REFERENCIA_GENERICA]
-TO [public]
-GO
-
-ALTER TABLE [RDX_REFERENCIA_GENERICA]
-ADD CONSTRAINT [PK__RDX_REFERENCIA_G__68DE77D5] 
-PRIMARY KEY CLUSTERED ([NUMINF], [CLAVE1], [CLAVE2], [CLAVE3])
-ON [PRIMARY]
-GO
-
---------------- SQL ---------------
-CREATE TABLE [RDX_AJUSTES_ALBARAN] (
-  [ALBARAN] char(7) NOT NULL,
-  [ESTADO] varchar(15) NULL,
-  [OBSERVACIONES] varchar(255) NULL,
-  [CONTABILIZAR] char(1) NULL
-)
-ON [PRIMARY]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_AJUSTES_ALBARAN]
-TO [public]
-GO
-
-ALTER TABLE [RDX_AJUSTES_ALBARAN]
-ADD CONSTRAINT [PK__RDX_AJUSTES_ALBA__1B69F7A2] 
-PRIMARY KEY CLUSTERED ([ALBARAN])
-ON [PRIMARY]
-GO
-
---------------- SQL ---------------
-CREATE TABLE [RDX_AJUSTES_HOJA_DEVOLUCIONES] (
-  [NUMHOJA] char(8) NOT NULL,
-  [ESTADO] varchar(20) NULL,
-  [OBSERVACIONES] varchar(255) NULL,
-  [CONTABILIZAR] char(1) CONSTRAINT [DF__RDX_AJUST__CONTA__7BF14C49] DEFAULT 'S' NULL
-)
-ON [PRIMARY]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_AJUSTES_HOJA_DEVOLUCIONES]
-TO [public]
-GO
-
-ALTER TABLE [RDX_AJUSTES_HOJA_DEVOLUCIONES]
-ADD CONSTRAINT [PK__RDX_AJUSTES_HOJA__483C9E19] 
-PRIMARY KEY CLUSTERED ([NUMHOJA])
-ON [PRIMARY]
-GO
-
---------------- SQL ---------------
-CREATE TABLE [RDX_DEVOLUCION_AJUSTES] (
-  [FECHA] datetime NOT NULL,
-  [CENTRO] varchar(17) NOT NULL,
-  [CODIGO] varchar(12) NOT NULL,
-  [COLOR] varchar(10) NOT NULL,
-  [APROBADO] char(1) NULL,
-  [FECHACAMBIO] datetime NULL,
-  [CANT38] numeric(15, 0) NULL,
-  [CANT40] numeric(15, 0) NULL,
-  [CANT42] numeric(15, 0) NULL,
-  [CANT44] numeric(15, 0) NULL,
-  [CANT46] numeric(15, 0) NULL,
-  [CANT48] numeric(15, 0) NULL
-)
-ON [PRIMARY]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_DEVOLUCION_AJUSTES]
-TO [public]
-GO
-
-ALTER TABLE [RDX_DEVOLUCION_AJUSTES]
-ADD CONSTRAINT [PK_RDX_DEVOLUCION_AJUSTES_2F70F04A] 
-PRIMARY KEY CLUSTERED ([FECHA], [CENTRO], [CODIGO], [COLOR])
-ON [PRIMARY]
-GO
-
---------------- SQL ---------------
-CREATE TABLE [RDX_RECEPCION_AJUSTES] (
-  [FECHA] datetime NOT NULL,
-  [CENTRO] varchar(17) NOT NULL,
-  [CODIGO] varchar(12) NOT NULL,
-  [COLOR] varchar(10) NOT NULL,
-  [APROBADO] char(1) NULL,
-  [FECHACAMBIO] datetime NULL,
-  [CANT38] numeric(15, 0) NULL,
-  [CANT40] numeric(15, 0) NULL,
-  [CANT42] numeric(15, 0) NULL,
-  [CANT44] numeric(15, 0) NULL,
-  [CANT46] numeric(15, 0) NULL,
-  [CANT48] numeric(15, 0) NULL
-)
-ON [PRIMARY]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_RECEPCION_AJUSTES]
-TO [public]
-GO
-
-ALTER TABLE [RDX_RECEPCION_AJUSTES]
-ADD CONSTRAINT [PK_RDX_RECEPCION_AJUSTES_2F70F04F] 
-PRIMARY KEY CLUSTERED ([FECHA], [CENTRO], [CODIGO], [COLOR])
-ON [PRIMARY]
-GO
-
---------------- SQL ---------------
-CREATE TABLE [RDX_TRASPASOS_AJUSTES] (
-  [FECHA] datetime NOT NULL,
-  [CENTRO] varchar(17) NOT NULL,
-  [CENTRO2] varchar(17) NOT NULL,
-  [CODIGO] varchar(12) NOT NULL,
-  [COLOR] varchar(10) NOT NULL,
-  [APROBADO] char(1) NULL,
-  [ESTADO] varchar(20) NULL,
-  [OBSERVACIONES] varchar(255) NULL,
-  [CONTABILIZAR] char(1) NULL,
-  [FECHACAMBIO] datetime NULL,
-  [CANT38] numeric(15, 0) NULL,
-  [CANT40] numeric(15, 0) NULL,
-  [CANT42] numeric(15, 0) NULL,
-  [CANT44] numeric(15, 0) NULL,
-  [CANT46] numeric(15, 0) NULL,
-  [CANT48] numeric(15, 0) NULL,
-  [TIPOCANT] varchar(3) NOT NULL
-)
-ON [PRIMARY]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_TRASPASOS_AJUSTES]
-TO [public]
-GO
-
-ALTER TABLE [RDX_TRASPASOS_AJUSTES]
-ADD CONSTRAINT [PK_RDX_TRASPASOS_AJUSTES_2F70F04A] 
-PRIMARY KEY CLUSTERED ([FECHA], [CENTRO], [CENTRO2], [CODIGO], [COLOR], [TIPOCANT])
-ON [PRIMARY]
-GO

Database/ANTERIOR/Script Vistas STOCK.sql

@@ -1,431 +0,0 @@
---
--- Definition for view RDX_V_STOCK_VARELA : 
---
-
-CREATE VIEW RDX_V_STOCK_VARELA AS
-SELECT ESTOQUE_PRODUTOS.FILIAL,
-       ESTOQUE_PRODUTOS.PRODUTO AS CODIGO,
-       ESTOQUE_PRODUTOS.COR_PRODUTO AS COLOR,
-       PRODUCTO = PRODUTOS.DESC_PRODUTO,
-       PRODUTOS.TIPO_PRODUTO,
-       PRODUTOS.GRUPO_PRODUTO,
-       COLECCION=COLECOES.DESC_COLECAO,
-
-       ESTOQUE_PRODUTOS.ES1 as K38,
-       ESTOQUE_PRODUTOS.ES2 as K40,
-       ESTOQUE_PRODUTOS.ES3 as K42,
-       ESTOQUE_PRODUTOS.ES4 as K44,
-       ESTOQUE_PRODUTOS.ES5 as K46,
-       ESTOQUE_PRODUTOS.ES6 as K48,
-       ESTOQUE_PRODUTOS.ESTOQUE as KT
-
-FROM ESTOQUE_PRODUTOS
-LEFT OUTER JOIN PRODUTOS ON (PRODUTOS.PRODUTO = ESTOQUE_PRODUTOS.PRODUTO)
-LEFT OUTER JOIN COLECOES ON (PRODUTOS.COLECAO = COLECOES.COLECAO)
-
-WHERE FILIAL LIKE '%VARELA IMAGEN Y DISEÑO%'
-GO
-
-
-
---
--- Definition for view RDX_V_STOCK_VENTAS : 
---
-
-CREATE VIEW RDX_V_STOCK_VENTAS AS
-SELECT
-  PERVENINI AS FECHA,
-  DAY(PERVENINI) AS DIA,
-  DATENAME(DW, PERVENINI) DIASEMANA,
-  DATENAME(MONTH, PERVENINI) AS MES,
-  YEAR(PERVENINI) AS ANO,
-  FILIAL AS CENTRO,
-  CODIGO = ISNULL(PRODUTO, '107CH.EN.01'),
-  DESC_PRODUTO AS PRODUCTO,
-  GRUPO_PRODUTO AS GRUPOPRODUCTO,
-  TIPO_PRODUTO AS TIPOPRODUCTO,
-  DESC_COLECAO AS COLECCION,
-  COLOR = ISNULL(COR_PRODUTO, '300'),
-  GRADE AS TALLA,
-  CANTIDAD = ISNULL(CANVEN, 0) + ISNULL(CANVENNET, 0)
-FROM
-  RDX_V_VENTASEDI_RESUELTAS
-WHERE NOT ((DESC_PRODUTO LIKE '%ERROR REFERENCIA%') AND ((VALVEN < 1) AND (VALVEN > 0)))	/* QUITAR COMPOSTURAS */
-GO
-
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_V_STOCK_VENTAS]
-TO [public]
-GO
-
-
---
--- Definition for view RDX_V_STOCK_INVENTARIO : 
---
-
-CREATE VIEW RDX_V_STOCK_INVENTARIO AS
-SELECT
-      FECHA = ISNULL(RDX_V_INVENTARIOEDI.FECHA, ISNULL(RDX_V_RECEPCION_AJUSTES_DESGLOSADO.FECHA, ISNULL(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.FECHA, RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.FECHA))),
-      CENTRO = ISNULL(RDX_V_INVENTARIOEDI.FILIAL, ISNULL(RDX_V_RECEPCION_AJUSTES_DESGLOSADO.FILIAL, ISNULL(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.FILIAL, RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.FILIAL))),
-      CODIGO = ISNULL(RDX_V_INVENTARIOEDI.CODIGO, ISNULL(RDX_V_RECEPCION_AJUSTES_DESGLOSADO.CODIGO, ISNULL(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.CODIGO, RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.CODIGO))),
-      PRODUCTO = ISNULL(RDX_V_INVENTARIOEDI.PRODUCTO, ISNULL(RDX_V_RECEPCION_AJUSTES_DESGLOSADO.PRODUCTO, ISNULL(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.PRODUCTO, RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.PRODUCTO))),
-      COLOR = ISNULL(RDX_V_INVENTARIOEDI.COLOR, ISNULL(RDX_V_RECEPCION_AJUSTES_DESGLOSADO.COLOR, ISNULL(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.COLOR, RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.COLOR))),
-      TALLA = ISNULL(RDX_V_INVENTARIOEDI.TALLA, ISNULL(RDX_V_RECEPCION_AJUSTES_DESGLOSADO.TALLA, ISNULL(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.TALLA, RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.TALLA))),
-      CANTIDAD = ISNULL(RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.CANTIDAD, ISNULL(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.CANTIDAD, ISNULL(RDX_V_RECEPCION_AJUSTES_DESGLOSADO.CANTIDAD, RDX_V_INVENTARIOEDI.CANTIDAD))),
-      /*RDX_V_INVENTARIOEDI.CANTIDAD,
-      RDX_V_RECEPCION_AJUSTES_DESGLOSADO.CANTIDAD,
-      RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.CANTIDAD,
-      RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.CANTIDAD,*/
-      OPERACION = CASE RDX_V_INVENTARIOEDI.TIPOCANT
-                       WHEN '194' THEN 'R'
-                       WHEN '46' THEN 'E'
-                       WHEN '145' THEN 'RM'
-                       WHEN '48' THEN 'S'
-                       WHEN '61' THEN 'D'
-                       WHEN '65' THEN 'T'
-                       ELSE
-                            CASE
-                                WHEN RDX_V_RECEPCION_AJUSTES_DESGLOSADO.CANTIDAD IS NOT NULL THEN 'R'
-                                WHEN RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.CANTIDAD IS NOT NULL THEN 'D'
-                                ELSE RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.TIPO
-                            END
-                  END
-FROM RDX_V_INVENTARIOEDI
-FULL OUTER JOIN RDX_V_INVENTARIO_MAXFECHAS ON
-     (RDX_V_INVENTARIO_MAXFECHAS.CENTRO = RDX_V_INVENTARIOEDI.CENTRO) AND
-     (RDX_V_INVENTARIO_MAXFECHAS.CODIGO = RDX_V_INVENTARIOEDI.CODIGO) AND
-     (RDX_V_INVENTARIO_MAXFECHAS.COLOR = RDX_V_INVENTARIOEDI.COLOR) AND
-     (RDX_V_INVENTARIO_MAXFECHAS.TALLA = RDX_V_INVENTARIOEDI.TALLA)
-FULL OUTER JOIN RDX_V_RECEPCION_AJUSTES_DESGLOSADO ON
-     (RDX_V_RECEPCION_AJUSTES_DESGLOSADO.CENTRO = RDX_V_INVENTARIOEDI.CENTRO) AND
-     (RDX_V_INVENTARIOEDI.CENTRO = RDX_V_INVENTARIOEDI.CENTRO2) AND
-     (RDX_V_RECEPCION_AJUSTES_DESGLOSADO.CODIGO = RDX_V_INVENTARIOEDI.CODIGO) AND
-     (RDX_V_RECEPCION_AJUSTES_DESGLOSADO.COLOR = RDX_V_INVENTARIOEDI.COLOR) AND
-     (RDX_V_RECEPCION_AJUSTES_DESGLOSADO.TALLA = RDX_V_INVENTARIOEDI.TALLA) AND
-     (RDX_V_RECEPCION_AJUSTES_DESGLOSADO.FECHA = RDX_V_INVENTARIOEDI.FECHA)
-FULL OUTER JOIN RDX_V_TRASPASOS_AJUSTES_DESGLOSADO ON
-     (RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.CENTRO = RDX_V_INVENTARIOEDI.CENTRO) AND
-     (RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.CENTRO2 = RDX_V_INVENTARIOEDI.CENTRO2) AND
-     (RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.CODIGO = RDX_V_INVENTARIOEDI.CODIGO) AND
-     (RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.COLOR = RDX_V_INVENTARIOEDI.COLOR) AND
-     (RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.TALLA = RDX_V_INVENTARIOEDI.TALLA) AND
-     (RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.FECHA = RDX_V_INVENTARIOEDI.FECHA) AND
-     (RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.TIPO = RDX_V_INVENTARIOEDI.TIPOCANT)
-FULL OUTER JOIN RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO ON
-     (RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.CENTRO = RDX_V_INVENTARIOEDI.CENTRO) AND
-     (RDX_V_INVENTARIOEDI.CENTRO = RDX_V_INVENTARIOEDI.CENTRO2) AND
-     (RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.CODIGO = RDX_V_INVENTARIOEDI.CODIGO) AND
-     (RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.COLOR = RDX_V_INVENTARIOEDI.COLOR) AND
-     (RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.TALLA = RDX_V_INVENTARIOEDI.TALLA) AND
-     (RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.FECHA = RDX_V_INVENTARIOEDI.FECHA)
-WHERE
-     ((RDX_V_INVENTARIO_MAXFECHAS.FECHA IS NULL)  /* Puede haber prendas que no se hayan inventariado nunca */
-     OR
-      (ISNULL(RDX_V_INVENTARIOEDI.FECHA, ISNULL(RDX_V_RECEPCION_AJUSTES_DESGLOSADO.FECHA, ISNULL(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.FECHA, RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.FECHA))) >= RDX_V_INVENTARIO_MAXFECHAS.FECHA))
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_V_STOCK_INVENTARIO]
-TO [public]
-GO
-
-
---
--- Definition for view RDX_V_STOCK : 
---
-
-CREATE VIEW RDX_V_STOCK AS
-SELECT
-      CENTRO = ISNULL(RDX_V_STOCK_INVENTARIO.CENTRO, RDX_V_STOCK_VENTAS.CENTRO),
-      CODIGO = ISNULL(RDX_V_STOCK_INVENTARIO.CODIGO, RDX_V_STOCK_VENTAS.CODIGO),
-      PRODUCTO = ISNULL(RDX_V_STOCK_INVENTARIO.PRODUCTO, RDX_V_STOCK_VENTAS.PRODUCTO),
-      TIPO_PRODUCTO = PRODUTOS.TIPO_PRODUTO,
-      GRUPO_PRODUCTO = PRODUTOS.GRUPO_PRODUTO,
-      COLECCION = COLECOES.DESC_COLECAO,
-      COLOR = ISNULL(RDX_V_STOCK_INVENTARIO.COLOR, RDX_V_STOCK_VENTAS.COLOR),
-      E38 = SUM(CASE ISNULL(RDX_V_STOCK_INVENTARIO.TALLA, RDX_V_STOCK_VENTAS.TALLA)
-                 WHEN '38' THEN
-                      CASE RDX_V_STOCK_INVENTARIO.OPERACION
-                           WHEN 'RM' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
-                           WHEN 'R' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
-                           WHEN 'E' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
-                           ELSE
-                               0
-                      END
-                      +
-                      CASE
-                          WHEN ((RDX_V_STOCK_VENTAS.CANTIDAD * (-1)) > 0) THEN
-                              RDX_V_STOCK_VENTAS.CANTIDAD * (-1)
-                          ELSE
-                              0
-                      END
-                 END),
-
-      E40 = SUM(CASE ISNULL(RDX_V_STOCK_INVENTARIO.TALLA, RDX_V_STOCK_VENTAS.TALLA)
-                 WHEN '40' THEN
-                      CASE RDX_V_STOCK_INVENTARIO.OPERACION
-                           WHEN 'RM' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
-                           WHEN 'R' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
-                           WHEN 'E' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
-                           ELSE
-                               0
-                      END
-                      +
-                      CASE
-                          WHEN ((RDX_V_STOCK_VENTAS.CANTIDAD * (-1)) > 0) THEN
-                              RDX_V_STOCK_VENTAS.CANTIDAD * (-1)
-                          ELSE
-                              0
-                      END
-                 END),
-
-      E42 = SUM(CASE ISNULL(RDX_V_STOCK_INVENTARIO.TALLA, RDX_V_STOCK_VENTAS.TALLA)
-                 WHEN '42' THEN
-                      CASE RDX_V_STOCK_INVENTARIO.OPERACION
-                           WHEN 'RM' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
-                           WHEN 'R' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
-                           WHEN 'E' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
-                           ELSE
-                               0
-                      END
-                      +
-                      CASE
-                          WHEN ((RDX_V_STOCK_VENTAS.CANTIDAD * (-1)) > 0) THEN
-                              RDX_V_STOCK_VENTAS.CANTIDAD * (-1)
-                          ELSE
-                              0
-                      END
-                 END),
-
-      E44 = SUM(CASE ISNULL(RDX_V_STOCK_INVENTARIO.TALLA, RDX_V_STOCK_VENTAS.TALLA)
-                 WHEN '44' THEN
-                      CASE RDX_V_STOCK_INVENTARIO.OPERACION
-                           WHEN 'RM' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
-                           WHEN 'R' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
-                           WHEN 'E' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
-                           ELSE
-                               0
-                      END
-                      +
-                      CASE
-                          WHEN ((RDX_V_STOCK_VENTAS.CANTIDAD * (-1)) > 0) THEN
-                              RDX_V_STOCK_VENTAS.CANTIDAD * (-1)
-                          ELSE
-                              0
-                      END
-                 END),
-
-      E46 = SUM(CASE ISNULL(RDX_V_STOCK_INVENTARIO.TALLA, RDX_V_STOCK_VENTAS.TALLA)
-                 WHEN '46' THEN
-                      CASE RDX_V_STOCK_INVENTARIO.OPERACION
-                           WHEN 'RM' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
-                           WHEN 'R' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
-                           WHEN 'E' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
-                           ELSE
-                               0
-                      END
-                      +
-                      CASE
-                          WHEN ((RDX_V_STOCK_VENTAS.CANTIDAD * (-1)) > 0) THEN
-                              RDX_V_STOCK_VENTAS.CANTIDAD * (-1)
-                          ELSE
-                              0
-                      END
-                 END),
-
-      E48 = SUM(CASE ISNULL(RDX_V_STOCK_INVENTARIO.TALLA, RDX_V_STOCK_VENTAS.TALLA)
-                 WHEN '48' THEN
-                      CASE RDX_V_STOCK_INVENTARIO.OPERACION
-                           WHEN 'RM' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
-                           WHEN 'R' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
-                           WHEN 'E' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD
-                           ELSE
-                               0
-                      END
-                      +
-                      CASE
-                          WHEN ((RDX_V_STOCK_VENTAS.CANTIDAD * (-1)) > 0) THEN
-                              RDX_V_STOCK_VENTAS.CANTIDAD * (-1)
-                          ELSE
-                              0
-                      END
-                 END),
-
-      S38 = SUM(CASE ISNULL(RDX_V_STOCK_INVENTARIO.TALLA, RDX_V_STOCK_VENTAS.TALLA)
-                 WHEN '38' THEN
-                      CASE RDX_V_STOCK_INVENTARIO.OPERACION
-                           WHEN 'D' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
-                           WHEN 'S' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
-                           WHEN 'T' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
-                           ELSE
-                               0
-                      END
-                      +
-                      CASE
-                          WHEN ((RDX_V_STOCK_VENTAS.CANTIDAD * (-1)) < 0) THEN
-                              RDX_V_STOCK_VENTAS.CANTIDAD * (-1)
-                          ELSE
-                              0
-                      END
-                 END),
-
-      S40 = SUM(CASE ISNULL(RDX_V_STOCK_INVENTARIO.TALLA, RDX_V_STOCK_VENTAS.TALLA)
-                 WHEN '40' THEN
-                      CASE RDX_V_STOCK_INVENTARIO.OPERACION
-                           WHEN 'D' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
-                           WHEN 'S' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
-                           WHEN 'T' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
-                           ELSE
-                               0
-                      END
-                      +
-                      CASE
-                          WHEN ((RDX_V_STOCK_VENTAS.CANTIDAD * (-1)) < 0) THEN
-                              RDX_V_STOCK_VENTAS.CANTIDAD * (-1)
-                          ELSE
-                              0
-                      END
-                 END),
-
-      S42 = SUM(CASE ISNULL(RDX_V_STOCK_INVENTARIO.TALLA, RDX_V_STOCK_VENTAS.TALLA)
-                 WHEN '42' THEN
-                      CASE RDX_V_STOCK_INVENTARIO.OPERACION
-                           WHEN 'D' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
-                           WHEN 'S' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
-                           WHEN 'T' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
-                           ELSE
-                               0
-                      END
-                      +
-                      CASE
-                          WHEN ((RDX_V_STOCK_VENTAS.CANTIDAD * (-1)) < 0) THEN
-                              RDX_V_STOCK_VENTAS.CANTIDAD * (-1)
-                          ELSE
-                              0
-                      END
-                 END),
-
-      S44 = SUM(CASE ISNULL(RDX_V_STOCK_INVENTARIO.TALLA, RDX_V_STOCK_VENTAS.TALLA)
-                 WHEN '44' THEN
-                      CASE RDX_V_STOCK_INVENTARIO.OPERACION
-                           WHEN 'D' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
-                           WHEN 'S' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
-                           WHEN 'T' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
-                           ELSE
-                               0
-                      END
-                      +
-                      CASE
-                          WHEN ((RDX_V_STOCK_VENTAS.CANTIDAD * (-1)) < 0) THEN
-                              RDX_V_STOCK_VENTAS.CANTIDAD * (-1)
-                          ELSE
-                              0
-                      END
-                 END),
-
-      S46 = SUM(CASE ISNULL(RDX_V_STOCK_INVENTARIO.TALLA, RDX_V_STOCK_VENTAS.TALLA)
-                 WHEN '46' THEN
-                      CASE RDX_V_STOCK_INVENTARIO.OPERACION
-                           WHEN 'D' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
-                           WHEN 'S' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
-                           WHEN 'T' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
-                           ELSE
-                               0
-                      END
-                      +
-                      CASE
-                          WHEN ((RDX_V_STOCK_VENTAS.CANTIDAD * (-1)) < 0) THEN
-                              RDX_V_STOCK_VENTAS.CANTIDAD * (-1)
-                          ELSE
-                              0
-                      END
-                 END),
-
-      S48 = SUM(CASE ISNULL(RDX_V_STOCK_INVENTARIO.TALLA, RDX_V_STOCK_VENTAS.TALLA)
-                 WHEN '48' THEN
-                      CASE RDX_V_STOCK_INVENTARIO.OPERACION
-                           WHEN 'D' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
-                           WHEN 'S' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
-                           WHEN 'T' THEN RDX_V_STOCK_INVENTARIO.CANTIDAD * (-1)
-                           ELSE
-                               0
-                      END
-                      +
-                      CASE
-                          WHEN ((RDX_V_STOCK_VENTAS.CANTIDAD * (-1)) < 0) THEN
-                              RDX_V_STOCK_VENTAS.CANTIDAD * (-1)
-                          ELSE
-                              0
-                      END
-                 END)
-FROM
-  RDX_V_STOCK_INVENTARIO
-FULL OUTER JOIN RDX_V_STOCK_VENTAS ON
-     (RDX_V_STOCK_INVENTARIO.CENTRO = RDX_V_STOCK_VENTAS.CENTRO)
-     AND (RDX_V_STOCK_INVENTARIO.CODIGO = RDX_V_STOCK_VENTAS.CODIGO)
-     AND (RDX_V_STOCK_INVENTARIO.COLOR = RDX_V_STOCK_VENTAS.COLOR)
-     AND (RDX_V_STOCK_INVENTARIO.TALLA = RDX_V_STOCK_VENTAS.TALLA)
-     AND (RDX_V_STOCK_INVENTARIO.FECHA = RDX_V_STOCK_VENTAS.FECHA)
-LEFT OUTER JOIN PRODUTOS ON
-     (PRODUTOS.PRODUTO = ISNULL(RDX_V_STOCK_INVENTARIO.CODIGO, RDX_V_STOCK_VENTAS.CODIGO))
-LEFT OUTER JOIN COLECOES ON
-     (COLECOES.COLECAO = PRODUTOS.COLECAO)
-
-GROUP BY
-      ISNULL(RDX_V_STOCK_INVENTARIO.CENTRO, RDX_V_STOCK_VENTAS.CENTRO),
-      ISNULL(RDX_V_STOCK_INVENTARIO.CODIGO, RDX_V_STOCK_VENTAS.CODIGO),
-      ISNULL(RDX_V_STOCK_INVENTARIO.PRODUCTO, RDX_V_STOCK_VENTAS.PRODUCTO),
-      PRODUTOS.TIPO_PRODUTO,
-      PRODUTOS.GRUPO_PRODUTO,
-      COLECOES.DESC_COLECAO,
-      ISNULL(RDX_V_STOCK_INVENTARIO.COLOR, RDX_V_STOCK_VENTAS.COLOR)
-GO
-
---
--- Definition for view RDX_V_STOCK_CALCULADO : 
---
-
-CREATE VIEW RDX_V_STOCK_CALCULADO AS
-SELECT
-      CENTRO,
-      CODIGO,
-      PRODUCTO,
-      TIPO_PRODUCTO,
-      GRUPO_PRODUCTO,
-      COLECCION,
-      COLOR,
-      E38,
-      E40,
-      E42,
-      E44,
-      E46,
-      E48,
-      TE = ISNULL(E38, 0) + ISNULL(E40, 0) + ISNULL(E42, 0) + ISNULL(E44, 0) + ISNULL(E46, 0) + ISNULL(E48, 0),
-      S38,
-      S40,
-      S42,
-      S44,
-      S46,
-      S48,
-      TS = ISNULL(S38, 0) + ISNULL(S40, 0) + ISNULL(S42, 0) + ISNULL(S44, 0) + ISNULL(S46, 0) + ISNULL(S48, 0),
-      K38 = ISNULL(E38, 0) + ISNULL(S38, 0),
-      K40 = ISNULL(E40, 0) + ISNULL(S40, 0),
-      K42 = ISNULL(E42, 0) + ISNULL(S42, 0),
-      K44 = ISNULL(E44, 0) + ISNULL(S44, 0),
-      K46 = ISNULL(E46, 0) + ISNULL(S46, 0),
-      K48 = ISNULL(E48, 0) + ISNULL(S48, 0),
-      KT = ISNULL(E38, 0) + ISNULL(S38, 0) + ISNULL(E40, 0) + ISNULL(S40, 0) +
-           ISNULL(E42, 0) + ISNULL(S42, 0) + ISNULL(E44, 0) + ISNULL(S44, 0) +
-           ISNULL(E46, 0) + ISNULL(S46, 0) + ISNULL(E48, 0) + ISNULL(S48, 0)
-
-FROM RDX_V_STOCK
-GO
-
-
-
-
-
-
-
-

Database/ANTERIOR/Script Vistas.sql

@@ -1,302 +0,0 @@
---
--- Definition for view RDX_V_VENTASEDI : 
---
-
-CREATE VIEW RDX_V_VENTASEDI
-AS
-SELECT
-  RDX_CABVEN.NUMINF,
-  RDX_ARTVEN.CLAVE1,
-  RDX_ARTVEN.CLAVE2,
-  RDX_ARTVEN.CLAVE3,
-  RDX_LUGVEN.PERVENINI,
-  RDX_ARTVEN.NUMTALON,
-  RDX_LUGVEN.EANLUG,
-  FILIAL = ISNULL(FILIAIS.FILIAL, RDX_LUGVEN.EANLUG),
-  RDX_ARTVEN.EANVEN,
-  LOJA_VENDEDORES.VENDEDOR AS CODVEN,
-  VENDEDOR = ISNULL(LTRIM(RTRIM(LOJA_VENDEDORES.NOME_VENDEDOR)) + ' ' + LTRIM(RTRIM(LOJA_VENDEDORES.VENDEDOR_APELIDO)), RDX_ARTVEN.EANVEN),
-  RDX_ARTVEN.EANART,
-  RDX_ARTVEN.CODCOM,
-  produtos.PRODUTO,
-  ISNULL(produtos.DESC_PRODUTO, '*** ERROR REFERENCIA  **** LLAMAR AL CI') AS DESC_PRODUTO,
-  PRODUTOS_BARRA.COR_PRODUTO,
-  PRODUTOS_BARRA.GRADE,
-  produtos.TIPO_PRODUTO,
-  produtos.GRUPO_PRODUTO,
-  COLECOES.DESC_COLECAO,
-  RDX_ARTVEN.VALVEN,
-  RDX_ARTVEN.CANVEN,
-  RDX_ARTVEN.CANDEV,
-  RDX_ARTVEN.CANVENNET,
-  RDX_ARTVEN.CANESP
-FROM
-  RDX_ARTVEN
-  INNER JOIN RDX_LUGVEN ON (RDX_ARTVEN.CLAVE1 = RDX_LUGVEN.CLAVE1 AND RDX_ARTVEN.CLAVE2 = RDX_LUGVEN.CLAVE2)
-  INNER JOIN RDX_CABVEN ON (RDX_LUGVEN.CLAVE1 = RDX_CABVEN.CLAVE1)
-  left outer join RDX_FILIALES on (RDX_FILIALES.CODBARRA = RDX_LUGVEN.EANLUG)
-  left outer join FILIAIS on (FILIAIS.COD_FILIAL = RDX_FILIALES.CODFILIAL)
-  LEFT OUTER JOIN LOJA_VENDEDORES ON (LOJA_VENDEDORES.RG LIKE '%' + RDX_ARTVEN.EANVEN + '%')
-  LEFT OUTER JOIN PRODUTOS_BARRA ON ((PRODUTOS_BARRA.CODIGO_BARRA = RDX_ARTVEN.EANART) or (PRODUTOS_BARRA.CODIGO_BARRA = RDX_ARTVEN.CODCOM))
-  LEFT OUTER JOIN PRODUTOS on (produtos.PRODUTO = PRODUTOS_BARRA.PRODUTO)
-  LEFT OUTER JOIN COLECOES on (COLECOES.COLECAO = PRODUTOS.COLECAO)
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_V_VENTASEDI]
-TO [public]
-GO
-
---
--- Definition for view RDX_V_REFERENCIAS_RESUELTAS : 
---
-
-CREATE VIEW RDX_V_REFERENCIAS_RESUELTAS
-AS
-SELECT *
-FROM RDX_REFERENCIA_GENERICA
-WHERE ESTADO = 'R'
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_V_REFERENCIAS_RESUELTAS]
-TO [public]
-GO
-
-
---
--- Definition for view RDX_V_VENTASEDI_RESUELTAS : 
---
-
-CREATE VIEW RDX_V_VENTASEDI_RESUELTAS
-AS
-SELECT
-  RDX_V_VENTASEDI.NUMINF,
-  RDX_V_VENTASEDI.CLAVE1,
-  RDX_V_VENTASEDI.CLAVE2,
-  RDX_V_VENTASEDI.CLAVE3,
-  RDX_V_VENTASEDI.PERVENINI,
-  RDX_V_VENTASEDI.NUMTALON,
-  RDX_V_VENTASEDI.EANLUG,
-  RDX_V_VENTASEDI.FILIAL,
-  RDX_V_VENTASEDI.EANVEN,
-  RDX_V_VENTASEDI.CODVEN,
-  RDX_V_VENTASEDI.VENDEDOR,
-  EANART = ISNULL(RDX_V_REFERENCIAS_RESUELTAS.CODIGO_BARRA, RDX_V_VENTASEDI.EANART),
-  RDX_V_VENTASEDI.CODCOM,
-  PRODUTO = ISNULL(PRODUTOS_BARRA.PRODUTO, RDX_V_VENTASEDI.PRODUTO),
-  DESC_PRODUTO = ISNULL(PRODUTOS.DESC_PRODUTO, RDX_V_VENTASEDI.DESC_PRODUTO),
-  COR_PRODUTO = ISNULL(PRODUTOS_BARRA.COR_PRODUTO, RDX_V_VENTASEDI.COR_PRODUTO),
-  GRADE = ISNULL(PRODUTOS_BARRA.GRADE, RDX_V_VENTASEDI.GRADE),
-  TIPO_PRODUTO = ISNULL(PRODUTOS.TIPO_PRODUTO, RDX_V_VENTASEDI.TIPO_PRODUTO),
-  GRUPO_PRODUTO = ISNULL(PRODUTOS.GRUPO_PRODUTO, RDX_V_VENTASEDI.GRUPO_PRODUTO),
-  DESC_COLECAO = ISNULL(COLECOES.DESC_COLECAO, RDX_V_VENTASEDI.DESC_COLECAO),
-  RDX_V_VENTASEDI.VALVEN,
-  RDX_V_VENTASEDI.CANVEN,
-  RDX_V_VENTASEDI.CANDEV,
-  RDX_V_VENTASEDI.CANVENNET,
-  RDX_V_VENTASEDI.CANESP
-FROM RDX_V_VENTASEDI
-LEFT JOIN RDX_V_REFERENCIAS_RESUELTAS ON (
-     (RDX_V_REFERENCIAS_RESUELTAS.NUMINF = RDX_V_VENTASEDI.NUMINF) AND
-     (RDX_V_REFERENCIAS_RESUELTAS.CLAVE1 = RDX_V_VENTASEDI.CLAVE1) AND
-     (RDX_V_REFERENCIAS_RESUELTAS.CLAVE2 = RDX_V_VENTASEDI.CLAVE2) AND
-     (RDX_V_REFERENCIAS_RESUELTAS.CLAVE3 = RDX_V_VENTASEDI.CLAVE3))
-LEFT JOIN PRODUTOS_BARRA ON (
-     (PRODUTOS_BARRA.CODIGO_BARRA = ISNULL(RDX_V_REFERENCIAS_RESUELTAS.CODIGO_BARRA, RDX_V_VENTASEDI.EANART)))
-LEFT JOIN PRODUTOS ON (
-     (PRODUTOS.PRODUTO = PRODUTOS_BARRA.PRODUTO))
-LEFT JOIN COLECOES ON (
-     (COLECOES.COLECAO = PRODUTOS.COLECAO))
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_V_VENTASEDI_RESUELTAS]
-TO [public]
-GO
-
-
---
--- Definition for view RDX_V_VENTASEDI_ERRONEAS : 
---
-
-CREATE VIEW RDX_V_VENTASEDI_ERRONEAS
-AS
-SELECT
-*
-FROM
-  RDX_V_VENTASEDI
-WHERE PRODUTO = '107CH.EN.01'
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_V_VENTASEDI_ERRONEAS]
-TO [public]
-GO
-
---
--- Definition for view RDX_V_VENTASTERMINADAS : 
---
-
-CREATE VIEW RDX_V_VENTASTERMINADAS
-AS
-SELECT
-  NUMINF,
-  CLAVE1,
-  CLAVE2,
-  CLAVE3,
-  PERVENINI AS FECHA,
-  DAY(PERVENINI) AS DIA,
-  DATENAME(DW, PERVENINI) DIASEMANA,
-  DATENAME(MONTH, PERVENINI) AS MES,
-  YEAR(PERVENINI) AS ANO,
-  FILIAL AS CENTRO,
-  VENDEDOR,
-  NUMTALON,
-  PRODUTO AS CODIGO,
-  DESC_PRODUTO AS PRODUCTO,
-  GRUPO_PRODUTO AS GRUPOPRODUCTO,
-  TIPO_PRODUTO AS TIPOPRODUCTO,
-  DESC_COLECAO AS COLECCION,
-  COR_PRODUTO AS COLOR,
-  GRADE AS TALLA,
-  TALLA38 = CASE WHEN (GRADE = 38) THEN ISNULL(CANVEN, 0) + ISNULL(CANVENNET, 0) ELSE NULL END,
-  TALLA40 = CASE WHEN (GRADE = 40) THEN ISNULL(CANVEN, 0) + ISNULL(CANVENNET, 0) ELSE NULL END,
-  TALLA42 = CASE WHEN (GRADE = 42) THEN ISNULL(CANVEN, 0) + ISNULL(CANVENNET, 0) ELSE NULL END,
-  TALLA44 = CASE WHEN (GRADE = 44) THEN ISNULL(CANVEN, 0) + ISNULL(CANVENNET, 0) ELSE NULL END,
-  TALLA46 = CASE WHEN (GRADE = 46) THEN ISNULL(CANVEN, 0) + ISNULL(CANVENNET, 0) ELSE NULL END,
-  TALLA48 = CASE WHEN (GRADE = 48) THEN ISNULL(CANVEN, 0) + ISNULL(CANVENNET, 0) ELSE NULL END,
-  VENTAS = CASE WHEN (CANVEN > 0) THEN CANVEN ELSE 0 END +
-           CASE WHEN (CANVENNET > 0) THEN CANVENNET ELSE 0 END,
-
-  DEVOLUCIONES = CASE WHEN (CANVEN < 0) THEN CANVEN ELSE 0 END +
-           CASE WHEN (CANVENNET < 0) THEN CANVENNET ELSE 0 END,
-
-  TOTAL = ISNULL(CANVEN, 0) + ISNULL(CANVENNET, 0),
-  VALVEN = CASE WHEN (VALVEN > 0) THEN VALVEN ELSE 0 END,
-  VALDEV = CASE WHEN (VALVEN < 0) THEN VALVEN ELSE 0 END,
-  VALTOT = VALVEN
-FROM
-  RDX_V_VENTASEDI_RESUELTAS
-WHERE NOT ((DESC_PRODUTO LIKE '%ERROR REFERENCIA%') AND ((VALVEN < 1) AND (VALVEN > 0)))	/* QUITAR COMPOSTURAS */
-AND (CANESP IS NULL OR CANESP = 0)	/* QUITAR INICIO V.PROCESO */
-AND (VALVEN IS NOT NULL)	/* QUITAR CAMBIO DE TALLA */
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_V_VENTASTERMINADAS]
-TO [public]
-GO
-
-
---
--- Definition for view RDX_V_VENTASPROCESO : 
---
-
-CREATE VIEW RDX_V_VENTASPROCESO AS
-SELECT
-  NUMINF,
-  CLAVE1,
-  CLAVE2,
-  CLAVE3,
-  PERVENINI AS FECHA,
-  DAY(PERVENINI) AS DIA,
-  DATENAME(DW, PERVENINI) DIASEMANA,
-  DATENAME(MONTH, PERVENINI) AS MES,
-  YEAR(PERVENINI) AS ANO,
-  FILIAL AS CENTRO,
-  VENDEDOR,
-  NUMTALON,
-  PRODUTO AS CODIGO,
-  DESC_PRODUTO AS PRODUCTO,
-  GRUPO_PRODUTO AS GRUPOPRODUCTO,
-  TIPO_PRODUTO AS TIPOPRODUCTO,
-  DESC_COLECAO AS COLECCION,
-  COR_PRODUTO AS COLOR,
-  GRADE AS TALLA,
-  CANESP AS INICIO,
-  CANVENNET AS FINAL,
-  VALVEN AS IMPORTE
-FROM
-  RDX_V_VENTASEDI_RESUELTAS
-WHERE ((CANESP IS NOT NULL) OR (CANVENNET IS NOT NULL))
-AND NOT ((DESC_PRODUTO LIKE '%ERROR REFERENCIA%') AND ((VALVEN < 1) AND (VALVEN > 0)))	/* QUITAR COMPOSTURAS */
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_V_VENTASPROCESO]
-TO [public]
-GO
-
-
---
--- Definition for view RDX_V_VENTASPROCESOPENDIENTES : 
---
-
-CREATE VIEW RDX_V_VENTASPROCESOPENDIENTES AS
-SELECT NUMTALON,
-	CODIGO,
-	COLOR,
-	TALLA,
-	SUM(ISNULL(INICIO, 0)) AS INICIO,
-	SUM(ABS(ISNULL(FINAL, 0))) AS FINAL
-FROM RDX_V_VENTASPROCESO
-GROUP BY NUMTALON, CODIGO, COLOR, TALLA
-HAVING ((SUM(ISNULL(INICIO, 0)) <> 0) AND
-			  (SUM(ISNULL(INICIO, 0)) > SUM(ABS(ISNULL(FINAL, 0)))))
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_V_VENTASPROCESOPENDIENTES]
-TO [public]
-GO
-
-
-
---------------- SQL ---------------
-
---
--- Definition for view RDX_V_REFERENCIA_GENERICA : 
---
-
-CREATE VIEW RDX_V_REFERENCIA_GENERICA
-AS
-SELECT DISTINCT
-  VENTAS.NUMINF,
-  VENTAS.CLAVE1,
-  VENTAS.CLAVE2,
-  VENTAS.CLAVE3,
-  VENTAS.PERVENINI AS FECHA,
-  VENTAS.EANLUG AS CODCENTRO,
-  VENTAS.FILIAL AS CENTRO,
-  VENTAS.EANVEN AS CODVENDEDOR,
-  VENTAS.VENDEDOR,
-  VENTAS.NUMTALON,
-  CODIGO_BARRA = ISNULL(PRODUTOS_BARRA.CODIGO_BARRA, VENTAS.EANART),
-  CODIGO = ISNULL(PRODUTOS_BARRA.PRODUTO, VENTAS.PRODUTO),
-  PRODUCTO = ISNULL(PRODUTOS.DESC_PRODUTO, VENTAS.DESC_PRODUTO),
-  COLOR = ISNULL(PRODUTOS_BARRA.COR_PRODUTO, VENTAS.COR_PRODUTO),
-  TALLA = ISNULL(PRODUTOS_BARRA.GRADE, VENTAS.GRADE),
-  VENTAS.CANESP AS VTAPROCESO,
-  VENTAS.CANVENNET AS VTAFINAL,
-  VTATERM = VENTAS.CANVEN,
-  VALTOT = VENTAS.VALVEN,
-  REF.ESTADO,
-  REF.FECHACAMBIO
-FROM RDX_V_VENTASEDI_ERRONEAS VENTAS
-LEFT OUTER JOIN RDX_REFERENCIA_GENERICA REF ON
-     (REF.NUMINF = VENTAS.NUMINF AND REF.CLAVE1 = VENTAS.CLAVE1 AND
-      REF.CLAVE2 = VENTAS.CLAVE2 AND REF.CLAVE3 = VENTAS.CLAVE3)
-LEFT OUTER JOIN PRODUTOS_BARRA on
-     (PRODUTOS_BARRA.CODIGO_BARRA = REF.CODIGO_BARRA)
-LEFT OUTER JOIN PRODUTOS ON
-     (PRODUTOS.PRODUTO = PRODUTOS_BARRA.PRODUTO)
-WHERE NOT ((VENTAS.VALVEN < 1) AND (VENTAS.VALVEN > 0)) /* QUITAR COMPOSTURAS */
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_V_REFERENCIA_GENERICA]
-TO [public]
-GO
-
-

Database/SCRIPT MEJORAS TABLAS.SQL

@@ -1,263 +0,0 @@
-ALTER TABLE [dbo].[RDX_TALLAS]
-ADD [TIPO_TALLAJE] smallint NULL
-GO
-
-update rdx_tallas
-set TIPO_TALLAJE = 1
-GO
-
-insert into rdx_tallas (TALLA, TIPO_TALLAJE)
-Values('S', 2)
-GO
-
-insert into rdx_tallas (TALLA, TIPO_TALLAJE)
-Values('M', 2)
-GO
-
-insert into rdx_tallas (TALLA, TIPO_TALLAJE)
-Values('L', 2)
-GO
-
-insert into rdx_tallas (TALLA, TIPO_TALLAJE)
-Values('XL', 2)
-GO
-
-ALTER TABLE [dbo].[RDX_TRASPASOS_AJUSTES]
-ADD [CANT_S] numeric(15, 0) NULL
-GO
-
-ALTER TABLE [dbo].[RDX_TRASPASOS_AJUSTES]
-ADD [CANT_M] numeric(15, 0) NULL
-GO
-
-ALTER TABLE [dbo].[RDX_TRASPASOS_AJUSTES]
-ADD [CANT_L] numeric(15, 0) NULL
-GO
-
-ALTER TABLE [dbo].[RDX_TRASPASOS_AJUSTES]
-ADD [CANT_XL] numeric(15, 0) NULL
-GO
-
-ALTER TABLE [dbo].[RDX_RECEPCION_AJUSTES]
-ADD [CANT_S] numeric(15, 0) NULL
-GO
-
-ALTER TABLE [dbo].[RDX_RECEPCION_AJUSTES]
-ADD [CANT_M] numeric(15, 0) NULL
-GO
-
-ALTER TABLE [dbo].[RDX_RECEPCION_AJUSTES]
-ADD [CANT_L] numeric(15, 0) NULL
-GO
-
-ALTER TABLE [dbo].[RDX_RECEPCION_AJUSTES]
-ADD [CANT_XL] numeric(15, 0) NULL
-GO
-
-ALTER TABLE [dbo].[RDX_DEVOLUCION_AJUSTES]
-ADD [CANT_S] numeric(15, 0) NULL
-GO
-
-ALTER TABLE [dbo].[RDX_DEVOLUCION_AJUSTES]
-ADD [CANT_M] numeric(15, 0) NULL
-GO
-
-ALTER TABLE [dbo].[RDX_DEVOLUCION_AJUSTES]
-ADD [CANT_L] numeric(15, 0) NULL
-GO
-
-ALTER TABLE [dbo].[RDX_DEVOLUCION_AJUSTES]
-ADD [CANT_XL] numeric(15, 0) NULL
-GO
-
-CREATE PROCEDURE dbo.RDX_P_TIPO_TALLAJE
-@PRODUCTO VARCHAR(12), @TIPO_TALLAJE smallint OUT
-AS
-BEGIN
-     set @TIPO_TALLAJE = (SELECT DISTINCT RDX_TALLAS.TIPO_TALLAJE
-     FROM PRODUTOS_BARRA
-     LEFT JOIN RDX_TALLAS ON (PRODUTOS_BARRA.GRADE = RDX_TALLAS.TALLA)
-     WHERE PRODUTOS_BARRA.PRODUTO = @PRODUCTO)
-END
-GO
-
-/*--------------- SQL ---------------*/
-
-IF EXISTS (SELECT * FROM sysobjects WHERE id = OBJECT_ID(N'[RDX_INVENTARIOEDI]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
-  DROP TABLE [RDX_INVENTARIOEDI]
-GO
-
-CREATE TABLE [RDX_INVENTARIOEDI] (
-  [NUMDOC] varchar(25) NOT NULL,
-  [NUMLIN] numeric(6, 0) NOT NULL,
-  [NUMCANT] numeric(6, 0) NOT NULL,
-  [TIPOCANT] varchar(3) NULL,
-  [FECHA] datetime NULL,
-  [CENTRO] varchar(17) NULL,
-  [FILIAL] varchar(25) NULL,
-  [CODVEN] varchar(10) NULL,
-  [VENDEDOR] varchar(66) NULL,
-  [CODIGO_BARRA] varchar(17) NULL,
-  [CODIGO] varchar(12) NULL,
-  [PRODUCTO] varchar(40) NULL,
-  [COLOR] varchar(10) NULL,
-  [TALLA] varchar(8) NULL,
-  [CANTIDAD] numeric(15, 0) NULL,
-  [CENTRO2] varchar(17) NULL,
-  [FILIAL2] varchar(25) NULL,
-  [ULTIMO_INVENTARIO] char(1) NULL,
-  [IGNORAR] char(1) NULL
-)
-ON [PRIMARY]
-GO
-
-ALTER TABLE [RDX_INVENTARIOEDI]
-ADD CONSTRAINT [RDX_INVENTARIOEDI_pk] 
-PRIMARY KEY CLUSTERED ([NUMDOC], [NUMLIN], [NUMCANT])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_INVENTARIOEDI_idx] ON [RDX_INVENTARIOEDI]
-  ([TIPOCANT])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_INVENTARIOEDI_idx2] ON [RDX_INVENTARIOEDI]
-  ([FECHA])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_INVENTARIOEDI_idx3] ON [RDX_INVENTARIOEDI]
-  ([CENTRO])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_INVENTARIOEDI_idx4] ON [RDX_INVENTARIOEDI]
-  ([CODVEN])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_INVENTARIOEDI_idx5] ON [RDX_INVENTARIOEDI]
-  ([CODIGO_BARRA])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_INVENTARIOEDI_idx6] ON [RDX_INVENTARIOEDI]
-  ([CODIGO])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_INVENTARIOEDI_idx7] ON [RDX_INVENTARIOEDI]
-  ([CENTRO2])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_INVENTARIOEDI_idx8] ON [RDX_INVENTARIOEDI]
-  ([ULTIMO_INVENTARIO])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_INVENTARIOEDI_idx9] ON [RDX_INVENTARIOEDI]
-  ([CENTRO], [CODIGO], [COLOR], [TALLA])
-ON [PRIMARY]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_INVENTARIOEDI]
-TO [public]
-GO
-
-/*--------------- SQL ---------------*/
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[RDX_VENTASEDI]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
-  DROP TABLE [RDX_VENTASEDI]
-GO
-
-CREATE TABLE [RDX_VENTASEDI] (
-  [NUMINF] varchar(35) NOT NULL,
-  [CLAVE1] numeric(10, 0) NOT NULL,
-  [CLAVE2] numeric(5, 0) NOT NULL,
-  [CLAVE3] numeric(5, 0) NOT NULL,
-  [PERVENINI] datetime NULL,
-  [NUMTALON] varchar(35) NULL,
-  [EANLUG] varchar(17) NULL,
-  [FILIAL] varchar(25) NULL,
-  [EANVEN] varchar(17) NULL,
-  [CODVEN] varchar(4) NULL,
-  [VENDEDOR] varchar(66) NULL,
-  [EANART] varchar(17) NULL,
-  [CODCOM] varchar(35) NULL,
-  [PRODUTO] varchar(12) NULL,
-  [DESC_PRODUTO] varchar(40) NULL,
-  [COR_PRODUTO] varchar(10) NULL,
-  [GRADE] varchar(8) NULL,
-  [TIPO_PRODUTO] varchar(25) NULL,
-  [GRUPO_PRODUTO] varchar(25) NULL,
-  [DESC_COLECAO] varchar(40) NULL,
-  [VALVEN] numeric(15, 3) NULL,
-  [CANVEN] numeric(15, 3) NULL,
-  [CANDEV] numeric(15, 3) NULL,
-  [CANVENNET] numeric(15, 3) NULL,
-  [CANESP] numeric(15, 3) NULL,
-  [IGNORAR] char(1) NULL
-)
-ON [PRIMARY]
-GO
-
-ALTER TABLE [RDX_VENTASEDI]
-ADD CONSTRAINT [RDX_VENTASEDI_pk] 
-PRIMARY KEY CLUSTERED ([NUMINF], [CLAVE1], [CLAVE2], [CLAVE3])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_VENTASEDI_idx] ON [RDX_VENTASEDI]
-  ([PERVENINI])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_VENTASEDI_idx2] ON [RDX_VENTASEDI]
-  ([NUMTALON])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_VENTASEDI_idx3] ON [RDX_VENTASEDI]
-  ([EANVEN])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_VENTASEDI_idx4] ON [RDX_VENTASEDI]
-  ([CODVEN])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_VENTASEDI_idx5] ON [RDX_VENTASEDI]
-  ([EANART])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_VENTASEDI_idx6] ON [RDX_VENTASEDI]
-  ([CODCOM])
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_VENTASEDI_idx7] ON [RDX_VENTASEDI]
-  ([PRODUTO])
-ON [PRIMARY]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_VENTASEDI]
-TO [public]
-GO
-
-
-
-UPDATE RDX_CABINV
-SET CARGADO = NULL;
-
-UPDATE RDX_CABVEN
-SET CARGADO = NULL;
-GO
-
-
->>>>>>>>>>><LANZAR PROCEDIMIENTOS DE CARGA

Database/__Script mejoras.sql

@@ -1,434 +0,0 @@
-CREATE NONCLUSTERED INDEX [RDX_REFERENCIA_GENERICA_idx3] ON [dbo].[RDX_REFERENCIA_GENERICA]
-  ([ESTADO])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_FILIALES_idx] ON [dbo].[RDX_FILIALES]
-  ([CODBARRA])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-
-CREATE NONCLUSTERED INDEX [RDX_FILIALES_idx2] ON [dbo].[RDX_FILIALES]
-  ([CODFILIAL])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [FILIAIS_idx] ON [dbo].[FILIAIS]
-  ([COD_FILIAL])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [LOJA_VENDEDORES_idx] ON [dbo].[LOJA_VENDEDORES]
-  ([RG])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_CANTINV_idx3] ON [dbo].[RDX_CANTINV]
-  ([TIPOCANT])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-
-CREATE NONCLUSTERED INDEX [RDX_AJUSTES_ALBARAN_idx] ON [dbo].[RDX_AJUSTES_ALBARAN]
-  ([ESTADO])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_AJUSTES_ALBARAN_idx2] ON [dbo].[RDX_AJUSTES_ALBARAN]
-  ([CONTABILIZAR])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [FATURAMENTO_TIPO_idx] ON [dbo].[FATURAMENTO_TIPO]
-  ([INDICADOR_TIPO])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_TALLAS_idx] ON [dbo].[RDX_TALLAS]
-  ([TALLA])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-
-CREATE NONCLUSTERED INDEX [RDX_TRASPASOS_AJUSTES_idx] ON [dbo].[RDX_TRASPASOS_AJUSTES]
-  ([APROBADO])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_TRASPASOS_AJUSTES_idx2] ON [dbo].[RDX_TRASPASOS_AJUSTES]
-  ([ESTADO])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-
-CREATE NONCLUSTERED INDEX [RDX_DEVOLUCION_AJUSTES_idx] ON [dbo].[RDX_DEVOLUCION_AJUSTES]
-  ([APROBADO])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_DEVOLUCION_AJUSTES_idx2] ON [dbo].[RDX_DEVOLUCION_AJUSTES]
-  ([FECHACAMBIO])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [PRODUTOS_idx] ON [dbo].[PRODUTOS]
-  ([DESC_PRODUTO])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_ARTVEN_idx] ON [dbo].[RDX_ARTVEN]
-  ([EANART])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_ARTVEN_idx2] ON [dbo].[RDX_ARTVEN]
-  ([CODCOM])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_ARTVEN_idx4] ON [dbo].[RDX_ARTVEN]
-  ([NUMTALON])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_ARTVEN_idx5] ON [dbo].[RDX_ARTVEN]
-  ([EANVEN])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_CABVEN_idx] ON [dbo].[RDX_CABVEN]
-  ([NUMINF])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_CABVEN_idx2] ON [dbo].[RDX_CABVEN]
-  ([IGNORAR])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_INFORMES_idx] ON [dbo].[RDX_INFORMES]
-  ([CATEGORIA])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_LUGVEN_idx] ON [dbo].[RDX_LUGVEN]
-  ([EANLUG])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_RECEPCION_AJUSTES_idx] ON [dbo].[RDX_RECEPCION_AJUSTES]
-  ([FECHACAMBIO])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_RECEPCION_AJUSTES_idx2] ON [dbo].[RDX_RECEPCION_AJUSTES]
-  ([APROBADO])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-ON [PRIMARY]
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_REFERENCIA_GENERICA_idx] ON [dbo].[RDX_REFERENCIA_GENERICA]
-  ([FECHACAMBIO])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_REFERENCIA_GENERICA_idx2] ON [dbo].[RDX_REFERENCIA_GENERICA]
-  ([CODIGO_BARRA])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-GO
-
-CREATE NONCLUSTERED INDEX [RDX_TRASPASOS_AJUSTES_idx3] ON [dbo].[RDX_TRASPASOS_AJUSTES]
-  ([FECHACAMBIO])
-WITH (
-  PAD_INDEX = OFF,
-  DROP_EXISTING = OFF,
-  STATISTICS_NORECOMPUTE = OFF,
-  SORT_IN_TEMPDB = OFF,
-  ONLINE = OFF,
-  ALLOW_ROW_LOCKS = ON,
-  ALLOW_PAGE_LOCKS = ON)
-ON [PRIMARY]
-GO
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-CREATE VIEW RDX_V_INVENTARIOEDI AS
-SELECT
-      RDX_CANTINV.NUMDOC,
-      RDX_CANTINV.NUMLIN,
-      RDX_CANTINV.NUMCANT,
-      RDX_CANTINV.TIPOCANT,
-      RDX_CABINV.FECHALIQ AS FECHA,
-      RDX_CABINV.CENTRO,
-      FILIAL = ISNULL(FILIAIS.FILIAL, RDX_CABINV.CENTRO),
-      RDX_CANTINV.IDVEN AS CODVEN,
-      VENDEDOR = ISNULL(LTRIM(RTRIM(LOJA_VENDEDORES.NOME_VENDEDOR)) + ' ' + LTRIM(RTRIM(LOJA_VENDEDORES.VENDEDOR_APELIDO)), RDX_CANTINV.IDVEN),
-      RDX_LININV.CODART AS CODIGO_BARRA,
-      CODIGO = ISNULL(PRODUTOS.PRODUTO, '107CH.EN.01'),
-      PRODUCTO = ISNULL(PRODUTOS.DESC_PRODUTO, '*** ERROR REFERENCIA  **** LLAMAR AL CI'),
-      COLOR = ISNULL(PRODUTOS_BARRA.COR_PRODUTO, 300),
-      TALLA = PRODUTOS_BARRA.GRADE,
-      RDX_CANTINV.CANTIDAD,
-      CENTRO2 = RDX_CANTINV.CENTRO,
-      FILIAL2 = ISNULL(FILIAIS2.FILIAL, RDX_CANTINV.CENTRO)
-FROM RDX_CANTINV
-INNER JOIN RDX_LININV ON
-      ((RDX_LININV.NUMDOC = RDX_CANTINV.NUMDOC) AND
-       (RDX_LININV.NUMLIN = RDX_CANTINV.NUMLIN))
-INNER JOIN RDX_CABINV ON
-      (RDX_CABINV.NUMDOC = RDX_LININV.NUMDOC)
-LEFT OUTER JOIN RDX_FILIALES ON (RDX_FILIALES.CODBARRA = RDX_CABINV.CENTRO)
-LEFT OUTER JOIN FILIAIS ON (FILIAIS.COD_FILIAL = RDX_FILIALES.CODFILIAL)
-LEFT OUTER JOIN RDX_FILIALES RDX_FILIALES2 ON (RDX_FILIALES2.CODBARRA = RDX_CANTINV.CENTRO)
-LEFT OUTER JOIN FILIAIS FILIAIS2 ON (FILIAIS2.COD_FILIAL = RDX_FILIALES2.CODFILIAL)
-LEFT OUTER JOIN LOJA_VENDEDORES ON (LOJA_VENDEDORES.RG = RDX_CANTINV.IDVEN)
-LEFT OUTER JOIN PRODUTOS_BARRA ON ((PRODUTOS_BARRA.CODIGO_BARRA = RDX_LININV.CODART))
-LEFT OUTER JOIN PRODUTOS ON (PRODUTOS.PRODUTO = PRODUTOS_BARRA.PRODUTO)
-WHERE RDX_CABINV.FECHALIQ >= convert(datetime, '20060601', 112)  /* PARA NO COGER AÑOS ANTERIORES */
-AND (RDX_CABINV.IGNORAR IS NULL) OR (RDX_CABINV.IGNORAR <> 'S')
-GO
-
-
-
-create table RDX_INVENTARIOEDI (
-  [NUMDOC]numeric(10, 0) NOT NULL,
-  [NUMLIN]numeric(5, 0) NOT NULL,
-  [NUMCANT]varchar(17) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-  [TIPOCANT]varchar(70) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-  [FECHA]datetime NULL,
-  [CENTRO]datetime NULL,
-  [FILIAL]datetime NULL,
-  [CODVEN]datetime NULL,
-  [VENDEDOR]datetime NULL,
-  [CODIGO_BARRA]
-  [CODIGO]
-  [PRODUCTO]
-  [COLOR]
-  [TALLA]
-  [CANTIDAD]
-  [CENTRO2]
-  [FILIAL2]
-  PRIMARY KEY CLUSTERED ([CLAVE1], [CLAVE2]),
-  CONSTRAINT [FK__RDX_LUGVE__CLAVE__4A59F0B5] FOREIGN KEY ([CLAVE1]) 
-  REFERENCES [dbo].[RDX_CABVEN] ([CLAVE1]) 
-  ON UPDATE CASCADE
-  ON DELETE CASCADE
-)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

Source/Base/Base.dproj

@@ -46,6 +46,18 @@
       
       
       
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>

Source/Base/uEditorGridBase.dfm

@@ -5,7 +5,7 @@ inherited fEditorGridBase: TfEditorGridBase
   ClientHeight = 446
   ClientWidth = 703
   ExplicitWidth = 711
-  ExplicitHeight = 480
+  ExplicitHeight = 473
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -1430,4 +1430,9 @@ inherited fEditorGridBase: TfEditorGridBase
       Action = actImprimir
     end
   end
+  object TimerParaFiltro: TTimer
+    OnTimer = TimerParaFiltroTimer
+    Left = 472
+    Top = 80
+  end
 end

Source/Base/uViewGridBase.pas

@@ -276,7 +276,9 @@ var
 begin
   with _FocusedView.DataController.Filter do
   begin
-    BeginUpdate;
+    ShowHourglassCursor;
+    Application.ProcessMessages;
+//    BeginUpdate;
     try
       Options := [fcoCaseInsensitive, fcoSoftCompare];
       Root.Clear;
@@ -295,7 +297,9 @@ begin
       else
         Active := False;
     finally
-      EndUpdate;
+//      EndUpdate;
+      HideHourglassCursor;
+      Application.ProcessMessages;
     end;
   end;
 end;

Source/Cliente/AdminPV.drc

@@ -12,10 +12,10 @@ STRINGTABLE
 BEGIN
 END
 
-/* c:\archivos de programa\codegear\rad studio\5.0\Lib\WindowsXP.res */
 /* C:\Varela_D2007\Lib\JVCL\JvXPCore.res */
-/* C:\Varela_D2007\Source\Cliente\uSplash.dfm */
+/* c:\archivos de programa\codegear\rad studio\5.0\Lib\WindowsXP.res */
-/* C:\Varela_D2007\Source\Cliente\uAcercaDe.dfm */
+/* uAcercaDe.dfm */
-/* C:\Varela_D2007\Source\Cliente\uPantallaPrincipal.dfm */
+/* uSplash.dfm */
+/* uPantallaPrincipal.dfm */
 /* C:\Varela_D2007\Source\Cliente\AdminPV.res */
 /* C:\Varela_D2007\Source\Cliente\AdminPV.drf */

Source/Cliente/AdminPV.rc

@@ -17,7 +17,7 @@ BEGIN
               VALUE "InternalName", "Administración de puntos de venta\0"
               VALUE "ProductName", "Administración de puntos de venta\0"
               VALUE "ProductVersion", "1.0.0.0\0"
-              VALUE "CompileDate", "miércoles, 23 de abril de 2008 16:58\0"
+              VALUE "CompileDate", "lunes, 28 de abril de 2008 18:21\0"
          END
     END
     BLOCK "VarFileInfo"

Source/Modulos/Devoluciones/Cliente/Devoluciones.dpk

@@ -71,7 +71,6 @@ contains
   uPluginControllerDevoluciones in 'uPluginControllerDevoluciones.pas' {ModuleDevoluciones: TModuleController},
   uBizDevoluciones in '..\Reglas\uBizDevoluciones.pas',
   uDataModuleDevoluciones in 'uDataModuleDevoluciones.pas' {dmDevoluciones: TDAClientDataModule},
-  uViewListaDevoluciones in 'uViewListaDevoluciones.pas' {frViewListaDevoluciones: TCustomView},
   uEditorListaDevoluciones in 'uEditorListaDevoluciones.pas' {fEditorListaDevoluciones: TCustomEditor},
   uEditorAjustarDevoluciones in 'uEditorAjustarDevoluciones.pas' {fEditorAjustarRecepciones};
 

Source/Modulos/Devoluciones/Cliente/Devoluciones.dproj

@@ -53,46 +53,40 @@
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
     <DCCReference Include="..\Reglas\uBizDevoluciones.pas" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
+    <DCCReference Include="adortl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="Base.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\bdertl.dcp" />
+    <DCCReference Include="bdertl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\ControlesBase.dcp" />
+    <DCCReference Include="ControlesBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD10.dcp" />
+    <DCCReference Include="cxDataD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD10.dcp" />
+    <DCCReference Include="cxEditorsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD10.dcp" />
+    <DCCReference Include="cxExportD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD10.dcp" />
+    <DCCReference Include="cxExtEditorsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxGridD10.dcp" />
+    <DCCReference Include="cxGridD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD10.dcp" />
+    <DCCReference Include="cxLibraryD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD10.dcp" />
+    <DCCReference Include="cxPageControlD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxTreeListD10.dcp" />
+    <DCCReference Include="cxTreeListD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
+    <DCCReference Include="dsnap.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxComnD10.dcp" />
+    <DCCReference Include="dxComnD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD10.dcp" />
+    <DCCReference Include="dxLayoutControlD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD10.dcp" />
+    <DCCReference Include="dxPSCoreD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD10.dcp" />
+    <DCCReference Include="dxThemeD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11.dcp" />
+    <DCCReference Include="GUISDK_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
+    <DCCReference Include="Jcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
+    <DCCReference Include="JclVcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
+    <DCCReference Include="JvCoreD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCustomD11R.dcp" />
+    <DCCReference Include="JvCustomD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" />
+    <DCCReference Include="JvGlobusD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
+    <DCCReference Include="JvPageCompsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
+    <DCCReference Include="JvSystemD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Parametros.dcp" />
+    <DCCReference Include="Parametros.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D11R.dcp" />
+    <DCCReference Include="PluginSDK_D11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
+    <DCCReference Include="PngComponentsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
+    <DCCReference Include="PNG_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tb2k_D10.dcp" />
+    <DCCReference Include="tb2k_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_D10.dcp" />
+    <DCCReference Include="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="uDataModuleDevoluciones.pas">
       <Form>dmDevoluciones</Form>
       <DesignClass>TDAClientDataModule</DesignClass>
@@ -108,10 +102,12 @@
       <Form>ModuleDevoluciones</Form>
       <DesignClass>TModuleController</DesignClass>
     </DCCReference>
-    <DCCReference Include="uViewListaDevoluciones.pas">
+    <DCCReference Include="vcl.dcp" />
-      <Form>frViewListaDevoluciones</Form>
+    <DCCReference Include="vclactnband.dcp" />
-      <DesignClass>TCustomView</DesignClass>
+    <DCCReference Include="vcldb.dcp" />
-    </DCCReference>
+    <DCCReference Include="vcljpg.dcp" />
+    <DCCReference Include="VclSmp.dcp" />
+    <DCCReference Include="vclx.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line

Source/Modulos/Devoluciones/Cliente/uDataModuleDevoluciones.dfm

@@ -36,7 +36,6 @@ object dmDevoluciones: TdmDevoluciones
         Name = 'FILIAL'
         DataType = datString
         Size = 25
-        LogChanges = False
         ReadOnly = True
         DictionaryEntry = 'Devoluciones_FILIAL'
       end
@@ -52,7 +51,6 @@ object dmDevoluciones: TdmDevoluciones
         Name = 'PRODUCTO'
         DataType = datString
         Size = 40
-        LogChanges = False
         ReadOnly = True
         DictionaryEntry = 'Devoluciones_PRODUCTO'
       end
@@ -95,10 +93,16 @@ object dmDevoluciones: TdmDevoluciones
         Size = 1
         DictionaryEntry = 'Devoluciones_CONTABILIZAR_HOJA'
       end
+      item
+        Name = 'S36'
+        DataType = datInteger
+        ReadOnly = True
+        Alignment = taRightJustify
+        DictionaryEntry = 'Devoluciones_S36'
+      end
       item
         Name = 'S38'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_S38'
@@ -106,7 +110,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'S40'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_S40'
@@ -114,7 +117,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'S42'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_S42'
@@ -122,7 +124,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'S44'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_S44'
@@ -130,7 +131,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'S46'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_S46'
@@ -138,7 +138,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'S48'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_S48'
@@ -146,15 +145,20 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'SOLICITADO'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_SOLICITADO'
       end
+      item
+        Name = 'E36'
+        DataType = datFloat
+        ReadOnly = True
+        Alignment = taRightJustify
+        DictionaryEntry = 'Devoluciones_E36'
+      end
       item
         Name = 'E38'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_E38'
@@ -162,7 +166,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'E40'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_E40'
@@ -170,7 +173,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'E42'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_E42'
@@ -178,7 +180,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'E44'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_E44'
@@ -186,7 +187,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'E46'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_E46'
@@ -194,7 +194,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'E48'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_E48'
@@ -202,11 +201,17 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'ENVIADO'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_ENVIADO'
       end
+      item
+        Name = 'ER36'
+        DataType = datFloat
+        DisplayLabel = 'ER38'
+        Alignment = taRightJustify
+        DictionaryEntry = 'Devoluciones_ER38'
+      end
       item
         Name = 'ER38'
         DataType = datFloat
@@ -247,14 +252,12 @@ object dmDevoluciones: TdmDevoluciones
         Name = 'ENVIADO_RECT'
         DataType = datFloat
         Alignment = taRightJustify
-        ServerAutoRefresh = True
         DictionaryEntry = 'Devoluciones_ENVIADO_RECT'
       end
       item
         Name = 'DIFERENCIA'
         DataType = datFloat
         Alignment = taRightJustify
-        ServerAutoRefresh = True
         DictionaryEntry = 'Devoluciones_DIFERENCIA'
       end>
     Params = <>
@@ -300,7 +303,6 @@ object dmDevoluciones: TdmDevoluciones
         Name = 'FILIAL'
         DataType = datString
         Size = 25
-        LogChanges = False
         ReadOnly = True
         DictionaryEntry = 'Devoluciones_FILIAL'
       end
@@ -316,7 +318,6 @@ object dmDevoluciones: TdmDevoluciones
         Name = 'PRODUCTO'
         DataType = datString
         Size = 40
-        LogChanges = False
         ReadOnly = True
         DictionaryEntry = 'Devoluciones_PRODUCTO'
       end
@@ -359,10 +360,16 @@ object dmDevoluciones: TdmDevoluciones
         Size = 1
         DictionaryEntry = 'Devoluciones_CONTABILIZAR_HOJA'
       end
+      item
+        Name = 'S36'
+        DataType = datInteger
+        ReadOnly = True
+        Alignment = taRightJustify
+        DictionaryEntry = 'Devoluciones_S36'
+      end
       item
         Name = 'S38'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_S38'
@@ -370,7 +377,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'S40'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_S40'
@@ -378,7 +384,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'S42'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_S42'
@@ -386,7 +391,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'S44'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_S44'
@@ -394,7 +398,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'S46'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_S46'
@@ -402,7 +405,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'S48'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_S48'
@@ -410,15 +412,20 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'SOLICITADO'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_SOLICITADO'
       end
+      item
+        Name = 'E36'
+        DataType = datFloat
+        ReadOnly = True
+        Alignment = taRightJustify
+        DictionaryEntry = 'Devoluciones_E36'
+      end
       item
         Name = 'E38'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_E38'
@@ -426,7 +433,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'E40'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_E40'
@@ -434,7 +440,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'E42'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_E42'
@@ -442,7 +447,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'E44'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_E44'
@@ -450,7 +454,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'E46'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_E46'
@@ -458,7 +461,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'E48'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_E48'
@@ -466,11 +468,16 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'ENVIADO'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_ENVIADO'
       end
+      item
+        Name = 'ER36'
+        DataType = datFloat
+        Alignment = taRightJustify
+        DictionaryEntry = 'Devoluciones_ER36'
+      end
       item
         Name = 'ER38'
         DataType = datFloat
@@ -511,14 +518,12 @@ object dmDevoluciones: TdmDevoluciones
         Name = 'ENVIADO_RECT'
         DataType = datFloat
         Alignment = taRightJustify
-        ServerAutoRefresh = True
         DictionaryEntry = 'Devoluciones_ENVIADO_RECT'
       end
       item
         Name = 'DIFERENCIA'
         DataType = datFloat
         Alignment = taRightJustify
-        ServerAutoRefresh = True
         DictionaryEntry = 'Devoluciones_DIFERENCIA'
       end>
     Params = <>
@@ -564,7 +569,6 @@ object dmDevoluciones: TdmDevoluciones
         Name = 'FILIAL'
         DataType = datString
         Size = 25
-        LogChanges = False
         ReadOnly = True
         DictionaryEntry = 'Devoluciones_FILIAL'
       end
@@ -622,10 +626,16 @@ object dmDevoluciones: TdmDevoluciones
         Size = 1
         DictionaryEntry = 'Devoluciones_CONTABILIZAR_HOJA'
       end
+      item
+        Name = 'S36'
+        DataType = datInteger
+        ReadOnly = True
+        Alignment = taRightJustify
+        DictionaryEntry = 'Devoluciones_S36'
+      end
       item
         Name = 'S38'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_S38'
@@ -633,7 +643,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'S40'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_S40'
@@ -641,7 +650,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'S42'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_S42'
@@ -649,7 +657,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'S44'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_S44'
@@ -657,7 +664,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'S46'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_S46'
@@ -665,7 +671,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'S48'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_S48'
@@ -673,15 +678,20 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'SOLICITADO'
         DataType = datInteger
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_SOLICITADO'
       end
+      item
+        Name = 'E36'
+        DataType = datFloat
+        ReadOnly = True
+        Alignment = taRightJustify
+        DictionaryEntry = 'Devoluciones_E36'
+      end
       item
         Name = 'E38'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_E38'
@@ -689,7 +699,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'E40'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_E40'
@@ -697,7 +706,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'E42'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_E42'
@@ -705,7 +713,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'E44'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_E44'
@@ -713,7 +720,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'E46'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_E46'
@@ -721,7 +727,6 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'E48'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_E48'
@@ -729,11 +734,16 @@ object dmDevoluciones: TdmDevoluciones
       item
         Name = 'ENVIADO'
         DataType = datFloat
-        LogChanges = False
         ReadOnly = True
         Alignment = taRightJustify
         DictionaryEntry = 'Devoluciones_ENVIADO'
       end
+      item
+        Name = 'ER36'
+        DataType = datFloat
+        Alignment = taRightJustify
+        DictionaryEntry = 'Devoluciones_ER36'
+      end
       item
         Name = 'ER38'
         DataType = datFloat
@@ -774,14 +784,12 @@ object dmDevoluciones: TdmDevoluciones
         Name = 'ENVIADO_RECT'
         DataType = datFloat
         Alignment = taRightJustify
-        ServerAutoRefresh = True
         DictionaryEntry = 'Devoluciones_ENVIADO_RECT'
       end
       item
         Name = 'DIFERENCIA'
         DataType = datFloat
         Alignment = taRightJustify
-        ServerAutoRefresh = True
         DictionaryEntry = 'Devoluciones_DIFERENCIA'
       end>
     Params = <>

Source/Modulos/Devoluciones/Cliente/uEditorAjustarDevoluciones.dfm

@@ -110,7 +110,7 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       Caption = 'Cantidad:'
     end
     object edtEnv40: TcxDBMaskEdit
-      Left = 218
+      Left = 296
       Top = 256
       DataBinding.DataField = 'S40'
       DataBinding.DataSource = dsDataSource
@@ -126,11 +126,11 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 9
+      TabOrder = 10
-      Width = 25
+      Width = 83
     end
     object edtEnv38: TcxDBMaskEdit
-      Left = 120
+      Left = 208
       Top = 256
       DataBinding.DataField = 'S38'
       DataBinding.DataSource = dsDataSource
@@ -146,11 +146,11 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 8
+      TabOrder = 9
-      Width = 25
+      Width = 83
     end
     object edtEnv42: TcxDBMaskEdit
-      Left = 323
+      Left = 384
       Top = 256
       DataBinding.DataField = 'S42'
       DataBinding.DataSource = dsDataSource
@@ -166,11 +166,11 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 10
+      TabOrder = 11
-      Width = 25
+      Width = 83
     end
     object edtEnv44: TcxDBMaskEdit
-      Left = 421
+      Left = 472
       Top = 256
       DataBinding.DataField = 'S44'
       DataBinding.DataSource = dsDataSource
@@ -186,11 +186,11 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 11
+      TabOrder = 12
-      Width = 25
+      Width = 83
     end
     object edtEnv46: TcxDBMaskEdit
-      Left = 541
+      Left = 560
       Top = 256
       DataBinding.DataField = 'S46'
       DataBinding.DataSource = dsDataSource
@@ -206,11 +206,11 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 12
+      TabOrder = 13
-      Width = 25
+      Width = 83
     end
     object edtEnv48: TcxDBMaskEdit
-      Left = 639
+      Left = 648
       Top = 256
       DataBinding.DataField = 'S48'
       DataBinding.DataSource = dsDataSource
@@ -226,11 +226,11 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 13
+      TabOrder = 14
-      Width = 25
+      Width = 83
     end
     object edtRec38: TcxDBMaskEdit
-      Left = 112
+      Left = 201
       Top = 331
       DataBinding.DataField = 'E38'
       DataBinding.DataSource = dsDataSource
@@ -246,11 +246,11 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 14
+      TabOrder = 17
-      Width = 98
+      Width = 83
     end
     object edtRec40: TcxDBMaskEdit
-      Left = 216
+      Left = 290
       Top = 331
       DataBinding.DataField = 'E40'
       DataBinding.DataSource = dsDataSource
@@ -266,11 +266,11 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 16
+      TabOrder = 19
-      Width = 98
+      Width = 83
     end
     object edtRec42: TcxDBMaskEdit
-      Left = 320
+      Left = 379
       Top = 331
       DataBinding.DataField = 'E42'
       DataBinding.DataSource = dsDataSource
@@ -286,11 +286,11 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 18
+      TabOrder = 21
-      Width = 98
+      Width = 83
     end
     object edtRec44: TcxDBMaskEdit
-      Left = 424
+      Left = 468
       Top = 331
       DataBinding.DataField = 'E44'
       DataBinding.DataSource = dsDataSource
@@ -306,11 +306,11 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 20
+      TabOrder = 23
-      Width = 98
+      Width = 83
     end
     object edtRec46: TcxDBMaskEdit
-      Left = 528
+      Left = 557
       Top = 331
       DataBinding.DataField = 'E46'
       DataBinding.DataSource = dsDataSource
@@ -326,11 +326,11 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 22
+      TabOrder = 25
-      Width = 98
+      Width = 83
     end
     object edtRec48: TcxDBMaskEdit
-      Left = 632
+      Left = 646
       Top = 331
       DataBinding.DataField = 'E48'
       DataBinding.DataSource = dsDataSource
@@ -346,11 +346,11 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 24
+      TabOrder = 27
-      Width = 98
+      Width = 83
     end
     object edtRecR48: TcxCurrencyEdit
-      Left = 632
+      Left = 646
       Top = 358
       Properties.Alignment.Horz = taRightJustify
       Properties.DecimalPlaces = 0
@@ -367,11 +367,11 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 25
+      TabOrder = 28
-      Width = 98
+      Width = 83
     end
     object edtRecR46: TcxCurrencyEdit
-      Left = 528
+      Left = 557
       Top = 358
       Properties.Alignment.Horz = taRightJustify
       Properties.DecimalPlaces = 0
@@ -388,11 +388,11 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 23
+      TabOrder = 26
-      Width = 98
+      Width = 83
     end
     object edtRecR44: TcxCurrencyEdit
-      Left = 424
+      Left = 468
       Top = 358
       Properties.Alignment.Horz = taRightJustify
       Properties.DecimalPlaces = 0
@@ -409,11 +409,11 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 21
+      TabOrder = 24
-      Width = 98
+      Width = 83
     end
     object edtRecR42: TcxCurrencyEdit
-      Left = 320
+      Left = 379
       Top = 358
       Properties.Alignment.Horz = taRightJustify
       Properties.DecimalPlaces = 0
@@ -430,11 +430,11 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 19
+      TabOrder = 22
-      Width = 98
+      Width = 83
     end
     object edtRecR40: TcxCurrencyEdit
-      Left = 216
+      Left = 290
       Top = 358
       Properties.Alignment.Horz = taRightJustify
       Properties.DecimalPlaces = 0
@@ -451,11 +451,11 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 17
+      TabOrder = 20
-      Width = 98
+      Width = 83
     end
     object edtRecR38: TcxCurrencyEdit
-      Left = 112
+      Left = 201
       Top = 358
       Properties.Alignment.Horz = taRightJustify
       Properties.DecimalPlaces = 0
@@ -472,8 +472,8 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 15
+      TabOrder = 18
-      Width = 98
+      Width = 83
     end
     object edtFecha: TcxDBLabel
       Left = 144
@@ -621,6 +621,67 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
       TabOrder = 6
       Width = 708
     end
+    object edtEnv36: TcxDBMaskEdit
+      Left = 120
+      Top = 256
+      DataBinding.DataField = 'S36'
+      DataBinding.DataSource = dsDataSource
+      Enabled = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.TextColor = clActiveCaption
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 8
+      Width = 83
+    end
+    object edtRec36: TcxDBMaskEdit
+      Left = 112
+      Top = 331
+      DataBinding.DataField = 'E36'
+      DataBinding.DataSource = dsDataSource
+      Enabled = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.TextColor = clActiveCaption
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 15
+      Width = 83
+    end
+    object edtRecR36: TcxCurrencyEdit
+      Left = 112
+      Top = 358
+      Properties.Alignment.Horz = taRightJustify
+      Properties.DecimalPlaces = 0
+      Properties.DisplayFormat = ',0;-,0'
+      Properties.UseThousandSeparator = True
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.TextColor = clActiveCaption
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 16
+      Width = 83
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -730,6 +791,15 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
             ControlOptions.AutoColor = True
             ControlOptions.ShowBorder = False
           end
+          object dxLayoutControl1Item91: TdxLayoutItem
+            AutoAligns = [aaVertical]
+            AlignHorz = ahClient
+            Caption = '36'
+            CaptionOptions.AlignHorz = taCenter
+            CaptionOptions.Layout = clTop
+            Control = edtEnv36
+            ControlOptions.ShowBorder = False
+          end
           object dxLayoutControl1Item11: TdxLayoutItem
             AutoAligns = [aaVertical]
             AlignHorz = ahClient
@@ -813,6 +883,26 @@ object fEditorAjustarDevoluciones: TfEditorAjustarDevoluciones
             ControlOptions.ShowBorder = False
           end
         end
+        object dxLayoutControl1Group110: TdxLayoutGroup
+          ShowCaption = False
+          Hidden = True
+          ShowBorder = False
+          object dxLayoutControl1Item122: TdxLayoutItem
+            AutoAligns = [aaVertical]
+            AlignHorz = ahClient
+            Caption = '36'
+            CaptionOptions.AlignHorz = taCenter
+            CaptionOptions.Layout = clTop
+            Control = edtRec36
+            ControlOptions.ShowBorder = False
+          end
+          object dxLayoutControl1Item129: TdxLayoutItem
+            CaptionOptions.AlignHorz = taCenter
+            CaptionOptions.Layout = clTop
+            Control = edtRecR36
+            ControlOptions.ShowBorder = False
+          end
+        end
         object dxLayoutControl1Group10: TdxLayoutGroup
           ShowCaption = False
           Hidden = True

Source/Modulos/Devoluciones/Cliente/uEditorAjustarDevoluciones.pas

@@ -113,6 +113,9 @@ type
     dxLayoutControl1Item8: TdxLayoutItem;
     dxLayoutControl1Group7: TdxLayoutGroup;
     dxLayoutControl1Group6: TdxLayoutGroup;
+    edtEnv36: TcxDBMaskEdit;
+    edtRec36: TcxDBMaskEdit;
+    edtRecR36: TcxCurrencyEdit;
     procedure FormShow(Sender: TObject);
     procedure cxGridViewCustomDrawCell(Sender: TcxCustomGridTableView;
       ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
@@ -214,6 +217,11 @@ procedure TfEditorAjustarDevoluciones.CargarValores;
 begin
   with FItems.DataTable do
   begin
+    if FieldByName('E36').AsInteger <> FieldByName('ER36').AsInteger then
+      edtRecR36.Value := FieldByName('ER36').AsInteger
+    else
+      edtRecR36.Value := FieldByName('E36').AsInteger;
+
     if FieldByName('E38').AsInteger <> FieldByName('ER38').AsInteger then
       edtRecR38.Value := FieldByName('ER38').AsInteger
     else
@@ -267,6 +275,7 @@ begin
   with FItems.DataTable do
   begin
     Edit;
+    FieldByName('ER36').AsFloat := edtRecR38.Value;
     FieldByName('ER38').AsFloat := edtRecR38.Value;
     FieldByName('ER40').AsFloat := edtRecR40.Value;
     FieldByName('ER42').AsFloat := edtRecR42.Value;

Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.dfm

@@ -8,7 +8,7 @@ inherited frViewListaDevoluciones: TfrViewListaDevoluciones
     Width = 829
     Height = 417
     ExplicitTop = 60
-    ExplicitWidth = 466
+    ExplicitWidth = 829
     ExplicitHeight = 417
     inherited cxGridView: TcxGridDBTableView
       OnMouseDown = cxGridViewMouseDown
@@ -112,6 +112,15 @@ inherited frViewListaDevoluciones: TfrViewListaDevoluciones
         DataBinding.FieldName = 'OBSERVACIONES_HOJA'
         PropertiesClassName = 'TcxMemoProperties'
       end
+      object cxGridViewS36: TcxGridDBColumn
+        DataBinding.FieldName = 'S36'
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.Alignment.Horz = taCenter
+        HeaderAlignmentHorz = taRightJustify
+        Styles.Content = cxStyleEnviado
+        Styles.OnGetContentStyle = cxGridViewNUMHOJAStylesGetContentStyle
+        Width = 42
+      end
       object cxGridViewS38: TcxGridDBColumn
         Caption = 'S38/S'
         DataBinding.FieldName = 'S38'
@@ -179,6 +188,12 @@ inherited frViewListaDevoluciones: TfrViewListaDevoluciones
         Styles.Content = cxStyleSubtotal
         Width = 43
       end
+      object cxGridViewE36: TcxGridDBColumn
+        DataBinding.FieldName = 'E36'
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.Alignment.Horz = taCenter
+        Visible = False
+      end
       object cxGridViewE38: TcxGridDBColumn
         Caption = 'E38/S'
         DataBinding.FieldName = 'E38'
@@ -225,6 +240,16 @@ inherited frViewListaDevoluciones: TfrViewListaDevoluciones
         Properties.Alignment.Horz = taCenter
         Visible = False
       end
+      object cxGridViewER36: TcxGridDBColumn
+        Caption = 'E36'
+        DataBinding.FieldName = 'ER36'
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.Alignment.Horz = taCenter
+        OnGetDisplayText = cxGridBandedViewRR36GetDisplayText
+        Styles.Content = cxStyleRecibido
+        Styles.OnGetContentStyle = cxGridBandedViewRR36StylesGetContentStyle
+        Width = 41
+      end
       object cxGridViewER38: TcxGridDBColumn
         Caption = 'E38/S'
         DataBinding.FieldName = 'ER38'
@@ -317,7 +342,6 @@ inherited frViewListaDevoluciones: TfrViewListaDevoluciones
     FloatingHeight = 60
     SupportedDocks = [dkStandardDock, dkMultiDock]
     TabOrder = 1
-    ExplicitWidth = 466
     inline frViewParametrosCentro1: TfrViewParametrosCentro
       Left = 0
       Top = 19
@@ -355,7 +379,6 @@ inherited frViewListaDevoluciones: TfrViewListaDevoluciones
       Font.Style = [fsBold]
       ParentFont = False
       Underline = True
-      ExplicitWidth = 466
     end
     object pnlAgrupaciones: TTBXAlignmentPanel
       Left = 425
@@ -366,7 +389,6 @@ inherited frViewListaDevoluciones: TfrViewListaDevoluciones
       AutoSize = True
       Color = clBtnFace
       TabOrder = 2
-      ExplicitWidth = 41
       object Button1: TButton
         Left = 6
         Top = 10

Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.pas

@@ -58,6 +58,7 @@ type
     cxGridViewESTADO_HOJA: TcxGridDBColumn;
     cxGridViewOBSERVACIONES_HOJA: TcxGridDBColumn;
     cxGridViewCONTABILIZAR_HOJA: TcxGridDBColumn;
+    cxGridViewS36: TcxGridDBColumn;
     cxGridViewS38: TcxGridDBColumn;
     cxGridViewS40: TcxGridDBColumn;
     cxGridViewS42: TcxGridDBColumn;
@@ -65,6 +66,7 @@ type
     cxGridViewS46: TcxGridDBColumn;
     cxGridViewS48: TcxGridDBColumn;
     cxGridViewSOLICITADO: TcxGridDBColumn;
+    cxGridViewE36: TcxGridDBColumn;
     cxGridViewE38: TcxGridDBColumn;
     cxGridViewE40: TcxGridDBColumn;
     cxGridViewE42: TcxGridDBColumn;
@@ -72,6 +74,7 @@ type
     cxGridViewE46: TcxGridDBColumn;
     cxGridViewE48: TcxGridDBColumn;
     cxGridViewENVIADO: TcxGridDBColumn;
+    cxGridViewER36: TcxGridDBColumn;
     cxGridViewER38: TcxGridDBColumn;
     cxGridViewER40: TcxGridDBColumn;
     cxGridViewER42: TcxGridDBColumn;
@@ -94,6 +97,9 @@ type
     Button1: TButton;
     procedure cxGridViewMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
+    procedure cxGridBandedViewRR36GetDisplayText(
+      Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
+      var AText: String);
     procedure cxGridBandedViewRR38GetDisplayText(
       Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
       var AText: String);
@@ -112,6 +118,9 @@ type
     procedure cxGridBandedViewRR48GetDisplayText(
       Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
       var AText: String);
+    procedure cxGridBandedViewRR36StylesGetContentStyle(
+      Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+      AItem: TcxCustomGridTableItem; out AStyle: TcxStyle);
     procedure cxGridBandedViewRR38StylesGetContentStyle(
       Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
       AItem: TcxCustomGridTableItem; out AStyle: TcxStyle);
@@ -252,6 +261,37 @@ begin
   cxGridViewAPROBADO.Visible := True;
 end;
 
+procedure TfrViewListaDevoluciones.cxGridBandedViewRR36GetDisplayText(
+  Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
+  var AText: String);
+var
+  AStr : String;
+begin
+  inherited;
+  if not Assigned( ARecord ) then
+    Exit;
+
+  AStr := VarToStrDef(ARecord.Values[cxGridViewE36.Index], '');
+  if not ((AStr = '') and (AText = '0')) and (AStr <> AText) then
+  begin
+    if Length(AStr) = 0 then
+      AStr := '0';
+    AText := AText + ' (' + AStr + ')';
+  end;
+end;
+
+procedure TfrViewListaDevoluciones.cxGridBandedViewRR36StylesGetContentStyle(
+  Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+  AItem: TcxCustomGridTableItem; out AStyle: TcxStyle);
+begin
+  inherited;
+  if Assigned(ARecord) and Assigned(AItem) then
+  begin
+    if ARecord.Values[AItem.Index] <> ARecord.Values[cxGridViewE36.Index] then
+      AStyle := cxStyleCantidadRectificada;
+  end;
+end;
+
 procedure TfrViewListaDevoluciones.cxGridBandedViewRR38GetDisplayText(
   Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
   var AText: String);

Source/Modulos/Devoluciones/Servidor/srvDevoluciones_Impl.dfm

@@ -45,6 +45,10 @@ object srvDevoluciones: TsrvDevoluciones
                 DatasetField = 'FECHA'
                 TableField = 'FECHA'
               end
+              item
+                DatasetField = 'E36'
+                TableField = 'E36'
+              end
               item
                 DatasetField = 'E38'
                 TableField = 'E38'
@@ -101,6 +105,10 @@ object srvDevoluciones: TsrvDevoluciones
                 DatasetField = 'CONTABILIZAR_HOJA'
                 TableField = 'CONTABILIZAR_HOJA'
               end
+              item
+                DatasetField = 'S36'
+                TableField = 'S36'
+              end
               item
                 DatasetField = 'S38'
                 TableField = 'S38'
@@ -129,6 +137,10 @@ object srvDevoluciones: TsrvDevoluciones
                 DatasetField = 'SOLICITADO'
                 TableField = 'SOLICITADO'
               end
+              item
+                DatasetField = 'ER36'
+                TableField = 'ER36'
+              end
               item
                 DatasetField = 'ER38'
                 TableField = 'ER38'
@@ -234,6 +246,11 @@ object srvDevoluciones: TsrvDevoluciones
             Size = 1
             DictionaryEntry = 'Devoluciones_CONTABILIZAR_HOJA'
           end
+          item
+            Name = 'S36'
+            DataType = datInteger
+            DictionaryEntry = 'Devoluciones_S36'
+          end
           item
             Name = 'S38'
             DataType = datInteger
@@ -269,6 +286,11 @@ object srvDevoluciones: TsrvDevoluciones
             DataType = datInteger
             DictionaryEntry = 'Devoluciones_SOLICITADO'
           end
+          item
+            Name = 'E36'
+            DataType = datFloat
+            DictionaryEntry = 'Devoluciones_E36'
+          end
           item
             Name = 'E38'
             DataType = datFloat
@@ -304,6 +326,11 @@ object srvDevoluciones: TsrvDevoluciones
             DataType = datFloat
             DictionaryEntry = 'Devoluciones_ENVIADO'
           end
+          item
+            Name = 'ER36'
+            DataType = datFloat
+            DictionaryEntry = 'Devoluciones_ER38'
+          end
           item
             Name = 'ER38'
             DataType = datFloat
@@ -384,6 +411,10 @@ object srvDevoluciones: TsrvDevoluciones
                 DatasetField = 'FECHA'
                 TableField = 'FECHA'
               end
+              item
+                DatasetField = 'E36'
+                TableField = 'E36'
+              end
               item
                 DatasetField = 'E38'
                 TableField = 'E38'
@@ -436,6 +467,10 @@ object srvDevoluciones: TsrvDevoluciones
                 DatasetField = 'CONTABILIZAR_HOJA'
                 TableField = 'CONTABILIZAR_HOJA'
               end
+              item
+                DatasetField = 'S36'
+                TableField = 'S36'
+              end
               item
                 DatasetField = 'S38'
                 TableField = 'S38'
@@ -464,6 +499,10 @@ object srvDevoluciones: TsrvDevoluciones
                 DatasetField = 'SOLICITADO'
                 TableField = 'SOLICITADO'
               end
+              item
+                DatasetField = 'ER36'
+                TableField = 'ER36'
+              end
               item
                 DatasetField = 'ER38'
                 TableField = 'ER38'
@@ -569,6 +608,11 @@ object srvDevoluciones: TsrvDevoluciones
             Size = 1
             DictionaryEntry = 'Devoluciones_CONTABILIZAR_HOJA'
           end
+          item
+            Name = 'S36'
+            DataType = datInteger
+            DictionaryEntry = 'Devoluciones_S36'
+          end
           item
             Name = 'S38'
             DataType = datInteger
@@ -604,6 +648,11 @@ object srvDevoluciones: TsrvDevoluciones
             DataType = datInteger
             DictionaryEntry = 'Devoluciones_SOLICITADO'
           end
+          item
+            Name = 'E36'
+            DataType = datFloat
+            DictionaryEntry = 'Devoluciones_E36'
+          end
           item
             Name = 'E38'
             DataType = datFloat
@@ -639,6 +688,11 @@ object srvDevoluciones: TsrvDevoluciones
             DataType = datFloat
             DictionaryEntry = 'Devoluciones_ENVIADO'
           end
+          item
+            Name = 'ER36'
+            DataType = datFloat
+            DictionaryEntry = 'Devoluciones_ER36'
+          end
           item
             Name = 'ER38'
             DataType = datFloat
@@ -715,6 +769,10 @@ object srvDevoluciones: TsrvDevoluciones
                 DatasetField = 'FECHA'
                 TableField = 'FECHA'
               end
+              item
+                DatasetField = 'E36'
+                TableField = 'E36'
+              end
               item
                 DatasetField = 'E38'
                 TableField = 'E38'
@@ -771,6 +829,10 @@ object srvDevoluciones: TsrvDevoluciones
                 DatasetField = 'CONTABILIZAR_HOJA'
                 TableField = 'CONTABILIZAR_HOJA'
               end
+              item
+                DatasetField = 'S36'
+                TableField = 'S36'
+              end
               item
                 DatasetField = 'S38'
                 TableField = 'S38'
@@ -799,6 +861,10 @@ object srvDevoluciones: TsrvDevoluciones
                 DatasetField = 'SOLICITADO'
                 TableField = 'SOLICITADO'
               end
+              item
+                DatasetField = 'ER36'
+                TableField = 'ER36'
+              end
               item
                 DatasetField = 'ER38'
                 TableField = 'ER38'
@@ -904,6 +970,11 @@ object srvDevoluciones: TsrvDevoluciones
             Size = 1
             DictionaryEntry = 'Devoluciones_CONTABILIZAR_HOJA'
           end
+          item
+            Name = 'S36'
+            DataType = datInteger
+            DictionaryEntry = 'Devoluciones_S36'
+          end
           item
             Name = 'S38'
             DataType = datInteger
@@ -939,6 +1010,11 @@ object srvDevoluciones: TsrvDevoluciones
             DataType = datInteger
             DictionaryEntry = 'Devoluciones_SOLICITADO'
           end
+          item
+            Name = 'E36'
+            DataType = datFloat
+            DictionaryEntry = 'Devoluciones_E36'
+          end
           item
             Name = 'E38'
             DataType = datFloat
@@ -974,6 +1050,11 @@ object srvDevoluciones: TsrvDevoluciones
             DataType = datFloat
             DictionaryEntry = 'Devoluciones_ENVIADO'
           end
+          item
+            Name = 'ER36'
+            DataType = datFloat
+            DictionaryEntry = 'Devoluciones_ER36'
+          end
           item
             Name = 'ER38'
             DataType = datFloat
@@ -1107,6 +1188,12 @@ object srvDevoluciones: TsrvDevoluciones
             Value = ''
             ParamType = daptInput
           end
+          item
+            Name = 'ER36'
+            DataType = datFloat
+            Value = ''
+            ParamType = daptInput
+          end
           item
             Name = 'ER38'
             DataType = datFloat
@@ -1185,59 +1272,61 @@ object srvDevoluciones: TsrvDevoluciones
               'begin'#10#9'declare @rowcount_var int'#10#10'    declare @NUMHOJA char(8)'#10' ' +
               '   declare @ESTADO_HOJA varchar(20)'#10'    declare @OBSERVACIONES_H' +
               'OJA varchar(255)'#10'    declare @CONTABILIZAR_HOJA char(1)'#10#10'    dec' +
-              'lare @ER38 numeric(15,0)'#10'    declare @ER40 numeric(15,0)'#10'    dec' +
+              'lare @ER36 numeric(15,0)'#10'    declare @ER38 numeric(15,0)'#10'    dec' +
-              'lare @ER42 numeric(15,0)'#10'    declare @ER44 numeric(15,0)'#10'    dec' +
+              'lare @ER40 numeric(15,0)'#10'    declare @ER42 numeric(15,0)'#10'    dec' +
-              'lare @ER46 numeric(15,0)'#10'    declare @ER48 numeric(15,0)'#10'    dec' +
+              'lare @ER44 numeric(15,0)'#10'    declare @ER46 numeric(15,0)'#10'    dec' +
-              'lare @ER_S numeric(15,0)'#10'    declare @ER_M numeric(15,0)'#10'    dec' +
+              'lare @ER48 numeric(15,0)'#10'    declare @ER_S numeric(15,0)'#10'    dec' +
-              'lare @ER_L numeric(15,0)'#10'    declare @ER_XL numeric(15,0)'#10#10#10'    ' +
+              'lare @ER_M numeric(15,0)'#10'    declare @ER_L numeric(15,0)'#10'    dec' +
-              'declare @APROBADO char(1)'#10'    declare @FECHA datetime'#10'    declar' +
+              'lare @ER_XL numeric(15,0)'#10#10#10'    declare @APROBADO char(1)'#10'    de' +
-              'e @CENTRO varchar(17)'#10'    declare @CODIGO varchar(12)'#10'    declar' +
+              'clare @FECHA datetime'#10'    declare @CENTRO varchar(17)'#10'    declar' +
-              'e @COLOR varchar(10)'#10#10'    declare @TIPO_TALLAJE smallint'#10#10'    se' +
+              'e @CODIGO varchar(12)'#10'    declare @COLOR varchar(10)'#10#10'    declar' +
-              't @NUMHOJA = :NUMHOJA'#10'    set @ESTADO_HOJA = :ESTADO_HOJA'#10'    se' +
+              'e @TIPO_TALLAJE smallint'#10#10'    set @NUMHOJA = :NUMHOJA'#10'    set @E' +
-              't @OBSERVACIONES_HOJA = :OBSERVACIONES_HOJA'#10'    set @CONTABILIZA' +
+              'STADO_HOJA = :ESTADO_HOJA'#10'    set @OBSERVACIONES_HOJA = :OBSERVA' +
-              'R_HOJA = :CONTABILIZAR_HOJA'#10#10'    set @ER38 = :ER38'#10'    set @ER40' +
+              'CIONES_HOJA'#10'    set @CONTABILIZAR_HOJA = :CONTABILIZAR_HOJA'#10#10'   ' +
-              ' = :ER40'#10'    set @ER42 = :ER42'#10'    set @ER44 = :ER44'#10'    set @ER' +
+              ' set @ER36 = :ER36'#10'    set @ER38 = :ER38'#10'    set @ER40 = :ER40'#10' ' +
-              '46 = :ER46'#10'    set @ER48 = :ER48'#10'    set @ER_S = :ER38'#10'    set @' +
+              '   set @ER42 = :ER42'#10'    set @ER44 = :ER44'#10'    set @ER46 = :ER46' +
-              'ER_M = :ER40'#10'    set @ER_L = :ER42'#10'    set @ER_XL = :ER44'#10#10'    s' +
+              #10'    set @ER48 = :ER48'#10'    set @ER_S = :ER38'#10'    set @ER_M = :ER' +
-              'et @APROBADO = :APROBADO'#10'    set @FECHA = :FECHA'#10'    set @CENTRO' +
+              '40'#10'    set @ER_L = :ER42'#10'    set @ER_XL = :ER44'#10#10'    set @APROBA' +
-              ' = :CENTRO'#10'    set @CODIGO = :CODIGO'#10'    set @COLOR = :COLOR'#10#10'  ' +
+              'DO = :APROBADO'#10'    set @FECHA = :FECHA'#10'    set @CENTRO = :CENTRO' +
-              '  /* *********************************** */'#10'    if @NUMHOJA <> '#39 +
+              #10'    set @CODIGO = :CODIGO'#10'    set @COLOR = :COLOR'#10#10'    /* *****' +
-              #39#10'    begin'#10#9'     update RDX_AJUSTES_HOJA_DEVOLUCIONES set'#10#9'    ' +
+              '****************************** */'#10'    if @NUMHOJA <> '#39#39#10'    begi' +
-              '       ESTADO = @ESTADO_HOJA,'#10#9#9'       OBSERVACIONES = @OBSERVAC' +
+              'n'#10#9'     update RDX_AJUSTES_HOJA_DEVOLUCIONES set'#10#9'           EST' +
-              'IONES_HOJA,'#10#9#9'       CONTABILIZAR = @CONTABILIZAR_HOJA'#10#9'     whe' +
+              'ADO = @ESTADO_HOJA,'#10#9#9'       OBSERVACIONES = @OBSERVACIONES_HOJA' +
-              're RDX_AJUSTES_HOJA_DEVOLUCIONES.NUMHOJA = @NUMHOJA'#10#10#9#9' select @' +
+              ','#10#9#9'       CONTABILIZAR = @CONTABILIZAR_HOJA'#10#9'     where RDX_AJU' +
-              'ROWCOUNT_VAR = @@ROWCOUNT'#10#10#9'     if @ROWCOUNT_VAR = 0'#10#9#9' begin'#10#9 +
+              'STES_HOJA_DEVOLUCIONES.NUMHOJA = @NUMHOJA'#10#10#9#9' select @ROWCOUNT_V' +
-              '          insert into RDX_AJUSTES_HOJA_DEVOLUCIONES'#10#9'           ' +
+              'AR = @@ROWCOUNT'#10#10#9'     if @ROWCOUNT_VAR = 0'#10#9#9' begin'#10#9'          ' +
-              '      (NUMHOJA, ESTADO, OBSERVACIONES, CONTABILIZAR)'#10#9#9'      val' +
+              'insert into RDX_AJUSTES_HOJA_DEVOLUCIONES'#10#9'                 (NUM' +
-              'ues (@NUMHOJA, @ESTADO_HOJA,'#10#9'                  @OBSERVACIONES_H' +
+              'HOJA, ESTADO, OBSERVACIONES, CONTABILIZAR)'#10#9#9'      values (@NUMH' +
-              'OJA, @CONTABILIZAR_HOJA)'#10#9'     end'#10'    end'#10#10'    /* ARREGLO PARA ' +
+              'OJA, @ESTADO_HOJA,'#10#9'                  @OBSERVACIONES_HOJA, @CONT' +
-              'QUE SOPORTE LOS NUEVOS TALLAJES*** */'#10#10'    execute RDX_P_TIPO_TA' +
+              'ABILIZAR_HOJA)'#10#9'     end'#10'    end'#10#10'    /* ARREGLO PARA QUE SOPORT' +
-              'LLAJE @CODIGO, @TIPO_TALLAJE OUTPUT'#10#10'    if @TIPO_TALLAJE = 1'#10'  ' +
+              'E LOS NUEVOS TALLAJES*** */'#10#10'    execute RDX_P_TIPO_TALLAJE @COD' +
-              '  begin'#10'       set @ER_S = NULL'#10'       set @ER_M = NULL'#10'       s' +
+              'IGO, @TIPO_TALLAJE OUTPUT'#10#10'    if @TIPO_TALLAJE = 1'#10'    begin'#10'  ' +
-              'et @ER_L = NULL'#10'       set @ER_XL = NULL'#10'    end'#10'    '#10'    if @TI' +
+              '     set @ER_S = NULL'#10'       set @ER_M = NULL'#10'       set @ER_L =' +
-              'PO_TALLAJE = 2'#10'    begin'#10'       set @ER38 = NULL'#10'       set @ER4' +
+              ' NULL'#10'       set @ER_XL = NULL'#10'    end'#10'    '#10'    if @TIPO_TALLAJE' +
-              '0 = NULL'#10'       set @ER42 = NULL'#10'       set @ER44 = NULL'#10'       ' +
+              ' = 2'#10'    begin'#10'       set @ER36 = NULL'#10'       set @ER38 = NULL'#10' ' +
-              'set @ER46 = NULL'#10'       set @ER48 = NULL'#10'    end'#10#10'    /* *******' +
+              '      set @ER40 = NULL'#10'       set @ER42 = NULL'#10'       set @ER44 ' +
-              '**************************** */'#10#9'update RDX_DEVOLUCION_AJUSTES s' +
+              '= NULL'#10'       set @ER46 = NULL'#10'       set @ER48 = NULL'#10'    end'#10#10 +
-              'et'#10#9'           CANT38 = @ER38,'#10#9'           CANT40 = @ER40,'#10#9'    ' +
+              '    /* *********************************** */'#10#9'update RDX_DEVOLU' +
-              '       CANT42 = @ER42,'#10#9'           CANT44 = @ER44,'#10#9'           C' +
+              'CION_AJUSTES set'#10#9'           CANT36 = @ER36,'#10#9'           CANT38 ' +
-              'ANT46 = @ER46,'#10#9'           CANT48 = @ER48,'#10#9'           CANT_S = ' +
+              '= @ER38,'#10#9'           CANT40 = @ER40,'#10#9'           CANT42 = @ER42,' +
-              '@ER_S,'#10#9'           CANT_M = @ER_M,'#10#9'           CANT_L = @ER_L,'#10#9 +
+              #10#9'           CANT44 = @ER44,'#10#9'           CANT46 = @ER46,'#10#9'      ' +
-              '           CANT_XL = @ER_XL,'#10'               APROBADO = @APROBADO' +
+              '     CANT48 = @ER48,'#10#9'           CANT_S = @ER_S,'#10#9'           CAN' +
-              ','#10'               FECHACAMBIO = CURRENT_TIMESTAMP'#10#9'where'#10'        ' +
+              'T_M = @ER_M,'#10#9'           CANT_L = @ER_L,'#10#9'           CANT_XL = @' +
-              '     (RDX_DEVOLUCION_AJUSTES.CENTRO = @CENTRO and'#10#9'      RDX_DEV' +
+              'ER_XL,'#10'               APROBADO = @APROBADO,'#10'               FECHA' +
-              'OLUCION_AJUSTES.CODIGO = @CODIGO and'#10#9'      RDX_DEVOLUCION_AJUST' +
+              'CAMBIO = CURRENT_TIMESTAMP'#10#9'where'#10'             (RDX_DEVOLUCION_A' +
-              'ES.COLOR = @COLOR and'#10#9'      RDX_DEVOLUCION_AJUSTES.FECHA = @FEC' +
+              'JUSTES.CENTRO = @CENTRO and'#10#9'      RDX_DEVOLUCION_AJUSTES.CODIGO' +
-              'HA)'#10#10#9'select @ROWCOUNT_VAR = @@ROWCOUNT'#10#10#9'if @ROWCOUNT_VAR = 0'#10' ' +
+              ' = @CODIGO and'#10#9'      RDX_DEVOLUCION_AJUSTES.COLOR = @COLOR and'#10 +
-              '   begin'#10'         insert into RDX_DEVOLUCION_AJUSTES'#10'           ' +
+              #9'      RDX_DEVOLUCION_AJUSTES.FECHA = @FECHA)'#10#10#9'select @ROWCOUNT' +
-              '     (FECHA, CENTRO, CODIGO, COLOR,'#10'                 APROBADO, F' +
+              '_VAR = @@ROWCOUNT'#10#10#9'if @ROWCOUNT_VAR = 0'#10'    begin'#10'         inse' +
-              'ECHACAMBIO,'#10'                 CANT38, CANT40, CANT42,'#10'           ' +
+              'rt into RDX_DEVOLUCION_AJUSTES'#10'                (FECHA, CENTRO, C' +
-              '      CANT44, CANT46, CANT48,'#10'                 CANT_S, CANT_M, C' +
+              'ODIGO, COLOR,'#10'                 APROBADO, FECHACAMBIO, CANT36,'#10'  ' +
-              'ANT_L, CANT_XL)'#10'         values ('#10'                 @FECHA, @CENT' +
+              '               CANT38, CANT40, CANT42,'#10'                 CANT44, ' +
-              'RO, @CODIGO,'#10'                 @COLOR, @APROBADO, CURRENT_TIMESTA' +
+              'CANT46, CANT48,'#10'                 CANT_S, CANT_M, CANT_L, CANT_XL' +
-              'MP,'#10'                 @ER38, @ER40, @ER42,'#10'                 @ER44' +
+              ')'#10'         values ('#10'                 @FECHA, @CENTRO, @CODIGO,'#10' ' +
-              ', @ER46, @ER48,'#10'                 @ER_S, @ER_M, @ER_L, @ER_XL)'#10'  ' +
+              '                @COLOR, @APROBADO, CURRENT_TIMESTAMP, @ER36,'#10'   ' +
-              '  end'#10'end'#10
+              '              @ER38, @ER40, @ER42,'#10'                 @ER44, @ER46' +
+              ', @ER48,'#10'                 @ER_S, @ER_M, @ER_L, @ER_XL)'#10'    end'#10'e' +
+              'nd'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1357,6 +1446,13 @@ object srvDevoluciones: TsrvDevoluciones
         Size = 1
         DisplayLabel = 'CONTABILIZAR_HOJA'
       end
+      item
+        Name = 'Devoluciones_S36'
+        DataType = datInteger
+        DisplayLabel = 'S36'
+        ReadOnly = True
+        Alignment = taRightJustify
+      end
       item
         Name = 'Devoluciones_S38'
         DataType = datInteger
@@ -1407,6 +1503,13 @@ object srvDevoluciones: TsrvDevoluciones
         Alignment = taRightJustify
         ServerAutoRefresh = True
       end
+      item
+        Name = 'Devoluciones_E36'
+        DataType = datFloat
+        DisplayLabel = 'E36'
+        ReadOnly = True
+        Alignment = taRightJustify
+      end
       item
         Name = 'Devoluciones_E38'
         DataType = datFloat
@@ -1457,6 +1560,12 @@ object srvDevoluciones: TsrvDevoluciones
         Alignment = taRightJustify
         ServerAutoRefresh = True
       end
+      item
+        Name = 'Devoluciones_ER36'
+        DataType = datFloat
+        DisplayLabel = 'ER36'
+        Alignment = taRightJustify
+      end
       item
         Name = 'Devoluciones_ER38'
         DataType = datFloat

Source/Modulos/Recepciones/Cliente/Recepciones.dpk

@@ -78,7 +78,6 @@ contains
   uBizRecepciones in '..\Reglas\uBizRecepciones.pas',
   uViewListaRecepciones in 'uViewListaRecepciones.pas' {frViewListaRecepciones: TCustomView},
   uEditorListaRecepciones in 'uEditorListaRecepciones.pas' {fEditorListaRecepciones: TCustomEditor},
-  uEditorAjustarRecepciones in 'uEditorAjustarRecepciones.pas' {fEditorAjustarRecepciones},
   uViewListaRecepcionesAlbaran in 'uViewListaRecepcionesAlbaran.pas' {frViewListaRecepcionesAlbaran: TCustomView},
   uEditorListaRecepcionesAlbaran in 'uEditorListaRecepcionesAlbaran.pas' {fEditorListaRecepcionesAlbaran: TCustomEditor};
 

Source/Modulos/Recepciones/Cliente/Recepciones.dproj

@@ -106,9 +106,6 @@
       <Form>dmRecepciones</Form>
       <DesignClass>TDAClientDataModule</DesignClass>
     </DCCReference>
-    <DCCReference Include="uEditorAjustarRecepciones.pas">
-      <Form>fEditorAjustarRecepciones</Form>
-    </DCCReference>
     <DCCReference Include="uEditorListaRecepciones.pas">
       <Form>fEditorListaRecepciones</Form>
       <DesignClass>TCustomEditor</DesignClass>

Source/Modulos/Recepciones/Cliente/Recepciones.drc

@@ -18,6 +18,5 @@ END
 /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uViewListaRecepcionesAlbaran.dfm */
 /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uEditorListaRecepcionesAlbaran.dfm */
 /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uPluginControllerRecepciones.dfm */
-/* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uEditorAjustarRecepciones.dfm */
 /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\Recepciones.res */
 /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\Recepciones.drf */

Source/Modulos/Recepciones/Cliente/uDataModuleRecepciones.dfm

@@ -98,6 +98,14 @@ object dmRecepciones: TdmRecepciones
         Size = 1
         DictionaryEntry = 'Recepciones_CONTABILIZAR_ALBARAN'
       end
+      item
+        Name = 'E36'
+        DataType = datInteger
+        LogChanges = False
+        ReadOnly = True
+        Alignment = taRightJustify
+        DictionaryEntry = 'Recepciones_E36'
+      end
       item
         Name = 'E38'
         DataType = datInteger
@@ -158,6 +166,14 @@ object dmRecepciones: TdmRecepciones
         Alignment = taRightJustify
         DictionaryEntry = 'Recepciones_ENVIADO'
       end
+      item
+        Name = 'R36'
+        DataType = datFloat
+        LogChanges = False
+        ReadOnly = True
+        Alignment = taRightJustify
+        DictionaryEntry = 'Recepciones_R36'
+      end
       item
         Name = 'R38'
         DataType = datFloat
@@ -218,6 +234,12 @@ object dmRecepciones: TdmRecepciones
         Alignment = taRightJustify
         DictionaryEntry = 'Recepciones_RECIBIDO'
       end
+      item
+        Name = 'RR36'
+        DataType = datFloat
+        Alignment = taRightJustify
+        DictionaryEntry = 'Recepciones_RR36'
+      end
       item
         Name = 'RR38'
         DataType = datFloat
@@ -377,6 +399,14 @@ object dmRecepciones: TdmRecepciones
         Size = 1
         DictionaryEntry = 'Recepciones_CONTABILIZAR_ALBARAN'
       end
+      item
+        Name = 'E36'
+        DataType = datInteger
+        LogChanges = False
+        ReadOnly = True
+        Alignment = taRightJustify
+        DictionaryEntry = 'Recepciones_E36'
+      end
       item
         Name = 'E38'
         DataType = datInteger
@@ -437,6 +467,14 @@ object dmRecepciones: TdmRecepciones
         Alignment = taRightJustify
         DictionaryEntry = 'Recepciones_ENVIADO'
       end
+      item
+        Name = 'R36'
+        DataType = datFloat
+        LogChanges = False
+        ReadOnly = True
+        Alignment = taRightJustify
+        DictionaryEntry = 'Recepciones_R36'
+      end
       item
         Name = 'R38'
         DataType = datFloat
@@ -497,6 +535,12 @@ object dmRecepciones: TdmRecepciones
         Alignment = taRightJustify
         DictionaryEntry = 'Recepciones_RECIBIDO'
       end
+      item
+        Name = 'RR36'
+        DataType = datFloat
+        Alignment = taRightJustify
+        DictionaryEntry = 'Recepciones_RR36'
+      end
       item
         Name = 'RR38'
         DataType = datFloat
@@ -656,6 +700,14 @@ object dmRecepciones: TdmRecepciones
         Size = 1
         DictionaryEntry = 'Recepciones_CONTABILIZAR_ALBARAN'
       end
+      item
+        Name = 'E36'
+        DataType = datInteger
+        LogChanges = False
+        ReadOnly = True
+        Alignment = taRightJustify
+        DictionaryEntry = 'Recepciones_E36'
+      end
       item
         Name = 'E38'
         DataType = datInteger
@@ -716,6 +768,14 @@ object dmRecepciones: TdmRecepciones
         Alignment = taRightJustify
         DictionaryEntry = 'Recepciones_ENVIADO'
       end
+      item
+        Name = 'R36'
+        DataType = datFloat
+        LogChanges = False
+        ReadOnly = True
+        Alignment = taRightJustify
+        DictionaryEntry = 'Recepciones_R36'
+      end
       item
         Name = 'R38'
         DataType = datFloat
@@ -776,6 +836,12 @@ object dmRecepciones: TdmRecepciones
         Alignment = taRightJustify
         DictionaryEntry = 'Recepciones_RECIBIDO'
       end
+      item
+        Name = 'RR36'
+        DataType = datFloat
+        Alignment = taRightJustify
+        DictionaryEntry = 'Recepciones_RR36'
+      end
       item
         Name = 'RR38'
         DataType = datFloat
@@ -877,6 +943,8 @@ object dmRecepciones: TdmRecepciones
         Name = 'ESTADOPRODUCTO'
         DataType = datString
         Size = 9
+        DisplayLabel = 'RecepcionesAlbaran_ESTADOPRODUCTO'
+        DictionaryEntry = 'RecepcionesAlbaran_ESTADOPRODUCTO'
       end
       item
         Name = 'CODIGO'
@@ -900,6 +968,14 @@ object dmRecepciones: TdmRecepciones
         ReadOnly = True
         DictionaryEntry = 'Recepciones_COLOR'
       end
+      item
+        Name = 'E36'
+        DataType = datInteger
+        LogChanges = False
+        ReadOnly = True
+        Alignment = taRightJustify
+        DictionaryEntry = 'Recepciones_E36'
+      end
       item
         Name = 'E38'
         DataType = datInteger

Source/Modulos/Recepciones/Cliente/uEditorAjustarRecepciones.dfm

@@ -110,7 +110,7 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       Caption = 'Cantidad:'
     end
     object edtEnv40: TcxDBMaskEdit
-      Left = 213
+      Left = 292
       Top = 258
       DataBinding.DataField = 'E40'
       DataBinding.DataSource = dsDataSource
@@ -125,11 +125,11 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 9
+      TabOrder = 10
-      Width = 25
+      Width = 83
     end
     object edtEnv38: TcxDBMaskEdit
-      Left = 114
+      Left = 203
       Top = 258
       DataBinding.DataField = 'E38'
       DataBinding.DataSource = dsDataSource
@@ -144,11 +144,11 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 8
+      TabOrder = 9
-      Width = 25
+      Width = 83
     end
     object edtEnv42: TcxDBMaskEdit
-      Left = 319
+      Left = 381
       Top = 258
       DataBinding.DataField = 'E42'
       DataBinding.DataSource = dsDataSource
@@ -163,11 +163,11 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 10
+      TabOrder = 11
-      Width = 25
+      Width = 83
     end
     object edtEnv44: TcxDBMaskEdit
-      Left = 418
+      Left = 470
       Top = 258
       DataBinding.DataField = 'E44'
       DataBinding.DataSource = dsDataSource
@@ -182,11 +182,11 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 11
+      TabOrder = 12
-      Width = 25
+      Width = 83
     end
     object edtEnv46: TcxDBMaskEdit
-      Left = 539
+      Left = 559
       Top = 258
       DataBinding.DataField = 'E46'
       DataBinding.DataSource = dsDataSource
@@ -201,11 +201,11 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 12
+      TabOrder = 13
-      Width = 25
+      Width = 83
     end
     object edtEnv48: TcxDBMaskEdit
-      Left = 638
+      Left = 648
       Top = 258
       DataBinding.DataField = 'E48'
       DataBinding.DataSource = dsDataSource
@@ -220,11 +220,11 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 13
+      TabOrder = 14
-      Width = 25
+      Width = 83
     end
     object edtRec38: TcxDBMaskEdit
-      Left = 112
+      Left = 201
       Top = 333
       DataBinding.DataField = 'R38'
       DataBinding.DataSource = dsDataSource
@@ -239,11 +239,11 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 14
+      TabOrder = 17
-      Width = 98
+      Width = 83
     end
     object edtRec40: TcxDBMaskEdit
-      Left = 216
+      Left = 290
       Top = 333
       DataBinding.DataField = 'R40'
       DataBinding.DataSource = dsDataSource
@@ -258,11 +258,11 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 16
+      TabOrder = 19
-      Width = 98
+      Width = 83
     end
     object edtRec42: TcxDBMaskEdit
-      Left = 320
+      Left = 379
       Top = 333
       DataBinding.DataField = 'R42'
       DataBinding.DataSource = dsDataSource
@@ -277,11 +277,11 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 18
+      TabOrder = 21
-      Width = 98
+      Width = 83
     end
     object edtRec44: TcxDBMaskEdit
-      Left = 424
+      Left = 468
       Top = 333
       DataBinding.DataField = 'R44'
       DataBinding.DataSource = dsDataSource
@@ -296,11 +296,11 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 20
+      TabOrder = 23
-      Width = 98
+      Width = 83
     end
     object edtRec46: TcxDBMaskEdit
-      Left = 528
+      Left = 557
       Top = 333
       DataBinding.DataField = 'R46'
       DataBinding.DataSource = dsDataSource
@@ -315,11 +315,11 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 22
+      TabOrder = 25
-      Width = 98
+      Width = 83
     end
     object edtRec48: TcxDBMaskEdit
-      Left = 632
+      Left = 646
       Top = 333
       DataBinding.DataField = 'R48'
       DataBinding.DataSource = dsDataSource
@@ -334,11 +334,11 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 24
+      TabOrder = 27
-      Width = 98
+      Width = 83
     end
     object edtRecR48: TcxCurrencyEdit
-      Left = 632
+      Left = 646
       Top = 360
       Properties.Alignment.Horz = taRightJustify
       Properties.DecimalPlaces = 0
@@ -353,11 +353,11 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 25
+      TabOrder = 28
-      Width = 98
+      Width = 83
     end
     object edtRecR46: TcxCurrencyEdit
-      Left = 528
+      Left = 557
       Top = 360
       Properties.Alignment.Horz = taRightJustify
       Properties.DecimalPlaces = 0
@@ -372,11 +372,11 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 23
+      TabOrder = 26
-      Width = 98
+      Width = 83
     end
     object edtRecR44: TcxCurrencyEdit
-      Left = 424
+      Left = 468
       Top = 360
       Properties.Alignment.Horz = taRightJustify
       Properties.DecimalPlaces = 0
@@ -391,11 +391,11 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 21
+      TabOrder = 24
-      Width = 98
+      Width = 83
     end
     object edtRecR42: TcxCurrencyEdit
-      Left = 320
+      Left = 379
       Top = 360
       Properties.Alignment.Horz = taRightJustify
       Properties.DecimalPlaces = 0
@@ -410,11 +410,11 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 19
+      TabOrder = 22
-      Width = 98
+      Width = 83
     end
     object edtRecR40: TcxCurrencyEdit
-      Left = 216
+      Left = 290
       Top = 360
       Properties.Alignment.Horz = taRightJustify
       Properties.DecimalPlaces = 0
@@ -429,11 +429,11 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 17
+      TabOrder = 20
-      Width = 98
+      Width = 83
     end
     object edtRecR38: TcxCurrencyEdit
-      Left = 112
+      Left = 201
       Top = 360
       Properties.Alignment.Horz = taRightJustify
       Properties.DecimalPlaces = 0
@@ -448,8 +448,8 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 15
+      TabOrder = 18
-      Width = 98
+      Width = 83
     end
     object edtFecha: TcxDBLabel
       Left = 133
@@ -585,6 +585,63 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
       TabOrder = 6
       Width = 319
     end
+    object edtRec36: TcxDBMaskEdit
+      Left = 112
+      Top = 333
+      DataBinding.DataField = 'R36'
+      DataBinding.DataSource = dsDataSource
+      Enabled = False
+      Properties.Alignment.Horz = taRightJustify
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.TextColor = clActiveCaption
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 15
+      Width = 83
+    end
+    object edtRecR36: TcxCurrencyEdit
+      Left = 112
+      Top = 360
+      Properties.Alignment.Horz = taRightJustify
+      Properties.DecimalPlaces = 0
+      Properties.DisplayFormat = ',0;-,0'
+      Properties.UseThousandSeparator = True
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.TextColor = clActiveCaption
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 16
+      Width = 83
+    end
+    object edtEnv36: TcxDBMaskEdit
+      Left = 114
+      Top = 258
+      DataBinding.DataField = 'E36'
+      DataBinding.DataSource = dsDataSource
+      Enabled = False
+      Properties.Alignment.Horz = taRightJustify
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.TextColor = clActiveCaption
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 8
+      Width = 83
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -694,6 +751,15 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
             ControlOptions.AutoColor = True
             ControlOptions.ShowBorder = False
           end
+          object dxLayoutControl1Item91: TdxLayoutItem
+            AutoAligns = [aaVertical]
+            AlignHorz = ahClient
+            Caption = '36'
+            CaptionOptions.AlignHorz = taCenter
+            CaptionOptions.Layout = clTop
+            Control = edtEnv36
+            ControlOptions.ShowBorder = False
+          end
           object dxLayoutControl1Item11: TdxLayoutItem
             AutoAligns = [aaVertical]
             AlignHorz = ahClient
@@ -777,6 +843,26 @@ object fEditorAjustarRecepciones: TfEditorAjustarRecepciones
             ControlOptions.ShowBorder = False
           end
         end
+        object dxLayoutControl1Group99: TdxLayoutGroup
+          ShowCaption = False
+          Hidden = True
+          ShowBorder = False
+          object dxLayoutControl1Item92: TdxLayoutItem
+            AutoAligns = [aaVertical]
+            AlignHorz = ahClient
+            Caption = '36'
+            CaptionOptions.AlignHorz = taCenter
+            CaptionOptions.Layout = clTop
+            Control = edtRec36
+            ControlOptions.ShowBorder = False
+          end
+          object dxLayoutControl1Item93: TdxLayoutItem
+            CaptionOptions.AlignHorz = taCenter
+            CaptionOptions.Layout = clTop
+            Control = edtRecR36
+            ControlOptions.ShowBorder = False
+          end
+        end
         object dxLayoutControl1Group10: TdxLayoutGroup
           ShowCaption = False
           Hidden = True

Source/Modulos/Recepciones/Cliente/uEditorAjustarRecepciones.pas

@@ -113,6 +113,9 @@ type
     dxLayoutControl1Item8: TdxLayoutItem;
     dxLayoutControl1Group7: TdxLayoutGroup;
     dxLayoutControl1Group6: TdxLayoutGroup;
+    edtRec36: TcxDBMaskEdit;
+    edtRecR36: TcxCurrencyEdit;
+    edtEnv36: TcxDBMaskEdit;
     procedure FormShow(Sender: TObject);
     procedure cxGridViewCustomDrawCell(Sender: TcxCustomGridTableView;
       ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
@@ -215,6 +218,11 @@ procedure TfEditorAjustarRecepciones.CargarValores;
 begin
   with FItems.DataTable do
   begin
+    if FieldByName('R36').AsInteger <> FieldByName('RR36').AsInteger then
+      edtRecR36.Value := FieldByName('RR36').AsInteger
+    else
+      edtRecR36.Value := FieldByName('R36').AsInteger;
+
     if FieldByName('R38').AsInteger <> FieldByName('RR38').AsInteger then
       edtRecR38.Value := FieldByName('RR38').AsInteger
     else
@@ -265,6 +273,7 @@ begin
   with FItems.DataTable do
   begin
     Edit;
+    FieldByName('RR36').AsVariant := edtRecR36.Value;
     FieldByName('RR38').AsVariant := edtRecR38.Value;
     FieldByName('RR40').AsVariant := edtRecR40.Value;
     FieldByName('RR42').AsVariant := edtRecR42.Value;

Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.dfm

@@ -4,9 +4,9 @@ inherited frViewListaRecepciones: TfrViewListaRecepciones
   ExplicitWidth = 695
   ExplicitHeight = 477
   inherited cxGrid: TcxGrid
-    Top = 61
+    Top = 128
     Width = 695
-    Height = 416
+    Height = 349
     ExplicitTop = 128
     ExplicitWidth = 695
     ExplicitHeight = 349
@@ -118,6 +118,15 @@ inherited frViewListaRecepciones: TfrViewListaRecepciones
         Visible = False
         Width = 20
       end
+      object cxGridBandedViewE36: TcxGridDBColumn
+        DataBinding.FieldName = 'E36'
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.Alignment.Horz = taCenter
+        HeaderAlignmentHorz = taRightJustify
+        Styles.Content = cxStyleEnviado
+        Styles.OnGetContentStyle = cxGridBandedViewALBARANStylesGetContentStyle
+        Width = 36
+      end
       object cxGridBandedViewE38: TcxGridDBColumn
         Caption = 'E38/S'
         DataBinding.FieldName = 'E38'
@@ -185,6 +194,14 @@ inherited frViewListaRecepciones: TfrViewListaRecepciones
         Styles.Content = cxStyleSubtotal
         Width = 36
       end
+      object cxGridBandedViewR36: TcxGridDBColumn
+        DataBinding.FieldName = 'R36'
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.Alignment.Horz = taCenter
+        Visible = False
+        HeaderAlignmentHorz = taRightJustify
+        Width = 25
+      end
       object cxGridBandedViewR38: TcxGridDBColumn
         Caption = 'R38/S'
         DataBinding.FieldName = 'R38'
@@ -245,8 +262,17 @@ inherited frViewListaRecepciones: TfrViewListaRecepciones
         HeaderAlignmentHorz = taRightJustify
         Width = 25
       end
+      object cxGridBandedViewRR36: TcxGridDBColumn
+        DataBinding.FieldName = 'RR36'
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.Alignment.Horz = taCenter
+        OnGetDisplayText = cxGridBandedViewRR36GetDisplayText
+        HeaderGlyphAlignmentHorz = taRightJustify
+        Styles.Content = cxStyleRecibido
+        Styles.OnGetContentStyle = cxGridBandedViewRR36StylesGetContentStyle
+        Width = 34
+      end
       object cxGridBandedViewRR38: TcxGridDBColumn
-        Caption = 'RR38/S'
         DataBinding.FieldName = 'RR38'
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.Alignment.Horz = taCenter
@@ -350,7 +376,7 @@ inherited frViewListaRecepciones: TfrViewListaRecepciones
       Left = 0
       Top = 19
       Width = 425
-      Height = 42
+      Height = 109
       Align = alLeft
       TabOrder = 0
       ReadOnly = False
@@ -388,13 +414,11 @@ inherited frViewListaRecepciones: TfrViewListaRecepciones
       Left = 425
       Top = 19
       Width = 270
-      Height = 42
+      Height = 109
       Align = alClient
       AutoSize = True
       Color = clBtnFace
       TabOrder = 2
-      ExplicitLeft = 431
-      ExplicitTop = 0
       object Button1: TButton
         Left = 6
         Top = 10

Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.pas

@@ -48,6 +48,7 @@ type
     cxGridBandedViewCOLOR: TcxGridDBColumn;
     cxGridBandedViewFECHA: TcxGridDBColumn;
     cxGridBandedViewALBARAN: TcxGridDBColumn;
+    cxGridBandedViewE36: TcxGridDBColumn;
     cxGridBandedViewE38: TcxGridDBColumn;
     cxGridBandedViewE40: TcxGridDBColumn;
     cxGridBandedViewE42: TcxGridDBColumn;
@@ -55,6 +56,7 @@ type
     cxGridBandedViewE46: TcxGridDBColumn;
     cxGridBandedViewE48: TcxGridDBColumn;
     cxGridBandedViewENVIADO: TcxGridDBColumn;
+    cxGridBandedViewR36: TcxGridDBColumn;
     cxGridBandedViewR38: TcxGridDBColumn;
     cxGridBandedViewR40: TcxGridDBColumn;
     cxGridBandedViewR42: TcxGridDBColumn;
@@ -95,6 +97,9 @@ type
     Button1: TButton;
     procedure cxGridViewMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
+    procedure cxGridBandedViewRR36GetDisplayText(
+      Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
+      var AText: String);
     procedure cxGridBandedViewRR38GetDisplayText(
       Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
       var AText: String);
@@ -116,6 +121,9 @@ type
     procedure cxGridBandedViewRR48GetDisplayText(
       Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
       var AText: String);
+    procedure cxGridBandedViewRR36StylesGetContentStyle(
+      Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+      AItem: TcxCustomGridTableItem; out AStyle: TcxStyle);
     procedure cxGridBandedViewRR38StylesGetContentStyle(
       Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
       AItem: TcxCustomGridTableItem; out AStyle: TcxStyle);
@@ -274,6 +282,37 @@ begin
     AText := AText + ' (' + VarToStr(ARecord.Values[cxGridBandedViewESTADO_ALBARAN.Index]) + ')';
 end;
 
+procedure TfrViewListaRecepciones.cxGridBandedViewRR36GetDisplayText(
+  Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
+  var AText: String);
+var
+  AStr : String;
+begin
+  inherited;
+  if not Assigned( ARecord ) then
+    Exit;
+
+  AStr := VarToStrDef(ARecord.Values[cxGridBandedViewR36.Index], '');
+  if not ((AStr = '') and (AText = '0')) and (AStr <> AText) then
+  begin
+    if Length(AStr) = 0 then
+      AStr := '0';
+    AText := AText + ' (' + AStr + ')';
+  end;
+end;
+
+procedure TfrViewListaRecepciones.cxGridBandedViewRR36StylesGetContentStyle(
+  Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+  AItem: TcxCustomGridTableItem; out AStyle: TcxStyle);
+begin
+  inherited;
+  if Assigned(ARecord) and Assigned(AItem) then
+  begin
+    if ARecord.Values[AItem.Index] <> ARecord.Values[cxGridBandedViewR36.Index] then
+      AStyle := cxStyleCantidadRectificada;
+  end;
+end;
+
 procedure TfrViewListaRecepciones.cxGridBandedViewRR38GetDisplayText(
   Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
   var AText: String);

Source/Modulos/Recepciones/Cliente/uViewListaRecepcionesAlbaran.dfm

@@ -57,6 +57,10 @@ inherited frViewListaRecepcionesAlbaran: TfrViewListaRecepcionesAlbaran
         DataBinding.FieldName = 'COLOR'
         Width = 35
       end
+      object cxGridViewE36: TcxGridDBColumn
+        DataBinding.FieldName = 'E36'
+        Width = 38
+      end
       object cxGridViewE38: TcxGridDBColumn
         Caption = 'E38/S'
         DataBinding.FieldName = 'E38'
@@ -70,20 +74,20 @@ inherited frViewListaRecepcionesAlbaran: TfrViewListaRecepcionesAlbaran
       object cxGridViewE42: TcxGridDBColumn
         Caption = 'E42/L'
         DataBinding.FieldName = 'E42'
-        Width = 36
+        Width = 38
       end
       object cxGridViewE44: TcxGridDBColumn
         Caption = 'E44/XL'
         DataBinding.FieldName = 'E44'
-        Width = 39
+        Width = 38
       end
       object cxGridViewE46: TcxGridDBColumn
         DataBinding.FieldName = 'E46'
-        Width = 37
+        Width = 38
       end
       object cxGridViewE48: TcxGridDBColumn
         DataBinding.FieldName = 'E48'
-        Width = 37
+        Width = 38
       end
     end
   end

Source/Modulos/Recepciones/Cliente/uViewListaRecepcionesAlbaran.pas

@@ -66,6 +66,7 @@ type
     pnlAgrupaciones: TTBXAlignmentPanel;
     TBXAlignmentPanel1: TTBXAlignmentPanel;
     Button1: TButton;
+    cxGridViewE36: TcxGridDBColumn;
     procedure cxGridViewALBARANGetDataText(Sender: TcxCustomGridTableItem;
       ARecordIndex: Integer; var AText: String);
   protected

Source/Modulos/Recepciones/Servidor/srvRecepciones_Impl.dfm

@@ -19,9 +19,9 @@ object srvRecepciones: TsrvRecepciones
             Connection = 'GFT_VARELA'
             TargetTable = 'RDX_V_CONTROL_RECEPCION_ALBARANES'
             SQL = 
-              'SELECT ALBARAN, ESTADOALBARAN, FILIAL, ESTADOPRODUCTO, CODIGO, P' +
+              'SELECT'#10'   ALBARAN, ESTADOALBARAN, FILIAL, ESTADOPRODUCTO, CODIGO' +
-              'RODUCTO, COLOR, E38,'#10'E40, E42, E44, E46, E48'#10'FROM RDX_V_CONTROL_' +
+              ', PRODUCTO, COLOR,'#10'   E36, E38, E40, E42, E44, E46, E48'#10'FROM RDX' +
-              'RECEPCION_ALBARANES'
+              '_V_CONTROL_RECEPCION_ALBARANES'#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -75,6 +75,10 @@ object srvRecepciones: TsrvRecepciones
               item
                 DatasetField = 'E48'
                 TableField = 'E48'
+              end
+              item
+                DatasetField = 'E36'
+                TableField = 'E36'
               end>
           end>
         Name = 'RecepcionesAlbaran'
@@ -101,6 +105,7 @@ object srvRecepciones: TsrvRecepciones
             Name = 'ESTADOPRODUCTO'
             DataType = datString
             Size = 9
+            DictionaryEntry = 'RecepcionesAlbaran_ESTADOPRODUCTO'
           end
           item
             Name = 'CODIGO'
@@ -120,6 +125,11 @@ object srvRecepciones: TsrvRecepciones
             Size = 10
             DictionaryEntry = 'Recepciones_COLOR'
           end
+          item
+            Name = 'E36'
+            DataType = datInteger
+            DictionaryEntry = 'Recepciones_E36'
+          end
           item
             Name = 'E38'
             DataType = datInteger
@@ -157,7 +167,13 @@ object srvRecepciones: TsrvRecepciones
           item
             Connection = 'GFT_VARELA'
             TargetTable = 'RDX_V_CONTROL_RECEPCION'
-            SQL = 'SELECT '#10'    *'#10'  FROM'#10'    RDX_V_CONTROL_RECEPCION'
+            SQL = 
+              'SELECT '#10'    APROBADO, FECHACAMBIO, CENTRO, FILIAL, CODIGO, PRODU' +
+              'CTO, '#10'    COLOR, FECHA, ALBARAN, ESTADO_ALBARAN, OBSERVACIONES_A' +
+              'LBARAN, '#10'    CONTABILIZAR_ALBARAN, E36, E38, E40, E42, E44, E46,' +
+              ' '#10'    E48, ENVIADO, R36, R38, R40, R42, R44, R46, R48, RECIBIDO,' +
+              ' '#10'    RR36, RR38, RR40, RR42, RR44, RR46, RR48, RECIBIDO_RECT, '#10 +
+              '    DIFERENCIA'#10'  FROM'#10'    RDX_V_CONTROL_RECEPCION'#10#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -295,6 +311,18 @@ object srvRecepciones: TsrvRecepciones
               item
                 DatasetField = 'FECHACAMBIO'
                 TableField = 'FECHACAMBIO'
+              end
+              item
+                DatasetField = 'E36'
+                TableField = 'E36'
+              end
+              item
+                DatasetField = 'R36'
+                TableField = 'R36'
+              end
+              item
+                DatasetField = 'RR36'
+                TableField = 'RR36'
               end>
           end>
         Name = 'Recepciones'
@@ -373,6 +401,11 @@ object srvRecepciones: TsrvRecepciones
             Size = 1
             DictionaryEntry = 'Recepciones_CONTABILIZAR_ALBARAN'
           end
+          item
+            Name = 'E36'
+            DataType = datInteger
+            DictionaryEntry = 'Recepciones_E36'
+          end
           item
             Name = 'E38'
             DataType = datInteger
@@ -408,6 +441,11 @@ object srvRecepciones: TsrvRecepciones
             DataType = datInteger
             DictionaryEntry = 'Recepciones_ENVIADO'
           end
+          item
+            Name = 'R36'
+            DataType = datFloat
+            DictionaryEntry = 'Recepciones_R36'
+          end
           item
             Name = 'R38'
             DataType = datFloat
@@ -443,6 +481,11 @@ object srvRecepciones: TsrvRecepciones
             DataType = datFloat
             DictionaryEntry = 'Recepciones_RECIBIDO'
           end
+          item
+            Name = 'RR36'
+            DataType = datFloat
+            DictionaryEntry = 'Recepciones_RR36'
+          end
           item
             Name = 'RR38'
             DataType = datFloat
@@ -630,6 +673,18 @@ object srvRecepciones: TsrvRecepciones
               item
                 DatasetField = 'FECHACAMBIO'
                 TableField = 'FECHACAMBIO'
+              end
+              item
+                DatasetField = 'E36'
+                TableField = 'E36'
+              end
+              item
+                DatasetField = 'R36'
+                TableField = 'R36'
+              end
+              item
+                DatasetField = 'RR36'
+                TableField = 'RR36'
               end>
           end>
         Name = 'RecepcionesPendientes'
@@ -708,6 +763,11 @@ object srvRecepciones: TsrvRecepciones
             Size = 1
             DictionaryEntry = 'Recepciones_CONTABILIZAR_ALBARAN'
           end
+          item
+            Name = 'E36'
+            DataType = datInteger
+            DictionaryEntry = 'Recepciones_E36'
+          end
           item
             Name = 'E38'
             DataType = datInteger
@@ -743,6 +803,11 @@ object srvRecepciones: TsrvRecepciones
             DataType = datInteger
             DictionaryEntry = 'Recepciones_ENVIADO'
           end
+          item
+            Name = 'R36'
+            DataType = datFloat
+            DictionaryEntry = 'Recepciones_R36'
+          end
           item
             Name = 'R38'
             DataType = datFloat
@@ -778,6 +843,11 @@ object srvRecepciones: TsrvRecepciones
             DataType = datFloat
             DictionaryEntry = 'Recepciones_RECIBIDO'
           end
+          item
+            Name = 'RR36'
+            DataType = datFloat
+            DictionaryEntry = 'Recepciones_RR36'
+          end
           item
             Name = 'RR38'
             DataType = datFloat
@@ -965,6 +1035,18 @@ object srvRecepciones: TsrvRecepciones
               item
                 DatasetField = 'APROBADO'
                 TableField = 'APROBADO'
+              end
+              item
+                DatasetField = 'E36'
+                TableField = 'E36'
+              end
+              item
+                DatasetField = 'R36'
+                TableField = 'R36'
+              end
+              item
+                DatasetField = 'RR36'
+                TableField = 'RR36'
               end>
           end>
         Name = 'RecepcionesAprobadas'
@@ -1043,6 +1125,11 @@ object srvRecepciones: TsrvRecepciones
             Size = 1
             DictionaryEntry = 'Recepciones_CONTABILIZAR_ALBARAN'
           end
+          item
+            Name = 'E36'
+            DataType = datInteger
+            DictionaryEntry = 'Recepciones_E36'
+          end
           item
             Name = 'E38'
             DataType = datInteger
@@ -1078,6 +1165,11 @@ object srvRecepciones: TsrvRecepciones
             DataType = datInteger
             DictionaryEntry = 'Recepciones_ENVIADO'
           end
+          item
+            Name = 'R36'
+            DataType = datFloat
+            DictionaryEntry = 'Recepciones_R36'
+          end
           item
             Name = 'R38'
             DataType = datFloat
@@ -1113,6 +1205,11 @@ object srvRecepciones: TsrvRecepciones
             DataType = datFloat
             DictionaryEntry = 'Recepciones_RECIBIDO'
           end
+          item
+            Name = 'RR36'
+            DataType = datFloat
+            DictionaryEntry = 'Recepciones_RR36'
+          end
           item
             Name = 'RR38'
             DataType = datFloat
@@ -1664,6 +1761,33 @@ object srvRecepciones: TsrvRecepciones
         LogChanges = False
         DisplayLabel = 'DIFERENCIA'
         Alignment = taRightJustify
+      end
+      item
+        Name = 'RecepcionesAlbaran_ESTADOPRODUCTO'
+        DataType = datString
+        Size = 9
+      end
+      item
+        Name = 'Recepciones_E36'
+        DataType = datInteger
+        LogChanges = False
+        DisplayLabel = 'E36'
+        ReadOnly = True
+        Alignment = taRightJustify
+      end
+      item
+        Name = 'Recepciones_R36'
+        DataType = datFloat
+        LogChanges = False
+        DisplayLabel = 'R36'
+        ReadOnly = True
+        Alignment = taRightJustify
+      end
+      item
+        Name = 'Recepciones_RR36'
+        DataType = datFloat
+        DisplayLabel = 'RR36'
+        Alignment = taRightJustify
       end>
     Left = 48
     Top = 104

Source/Modulos/Traspasos/Cliente/Traspasos.dproj

@@ -46,7 +46,20 @@
     <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><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><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.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Traspasos.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">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><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.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Traspasos.dpk</Source></Source><Excluded_Packages>
+      
+      
+      
+      
+      
+      
+      <Excluded_Packages Name="$(BDS)\bin\dclIndyCore100.bpl">Indy 10 Core Design Time</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web 9.0 Design Package for CodeGear RAD Studio</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+    </Excluded_Packages></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
@@ -54,52 +67,52 @@
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
     <DCCReference Include="..\Reglas\uBizTraspasos.pas" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\adortl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\Base.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\bdertl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\bdertl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\ControlesBase.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\ControlesBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\cxDataD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\cxEditorsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\cxExportD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\cxExtEditorsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxGridD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\cxGridD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\cxLibraryD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\cxPageControlD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxTreeListD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\cxTreeListD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dclcxLibraryD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dclcxLibraryD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\designide.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dsnap.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxComnD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxComnD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxLayoutControlD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxCommonD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGridLnkD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxGridLnkD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSLnksD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSLnksD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxThemeD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\GUISDK_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\Jcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\JclVcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\JvCoreD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCustomD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\JvCustomD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\JvGlobusD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\JvPageCompsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\JvSystemD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Parametros.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\Parametros.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\PluginSDK_D11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\PngComponentsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\PNG_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tb2k_D10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\tb2k_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_D10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\tbx_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\vcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\vclactnband.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\vcldb.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\vcljpg.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclshlctrls.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\vclshlctrls.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\VclSmp.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\vclx.dcp" />
     <DCCReference Include="uDataModuleTraspasos.pas">
       <Form>dmTraspasos</Form>
       <DesignClass>TDAClientDataModule</DesignClass>

Source/Modulos/Traspasos/Cliente/uDataModuleTraspasos.dfm

@@ -121,6 +121,12 @@ object dmTraspasos: TdmTraspasos
         ReadOnly = True
         DictionaryEntry = 'Traspasos_COLOR'
       end
+      item
+        Name = 'T36'
+        DataType = datFloat
+        ReadOnly = True
+        DictionaryEntry = 'Traspasos_T36'
+      end
       item
         Name = 'T38'
         DataType = datFloat
@@ -164,6 +170,11 @@ object dmTraspasos: TdmTraspasos
         ReadOnly = True
         DictionaryEntry = 'Traspasos_TOTAL'
       end
+      item
+        Name = 'TR36'
+        DataType = datFloat
+        DictionaryEntry = 'Traspasos_TR36'
+      end
       item
         Name = 'TR38'
         DataType = datFloat
@@ -198,7 +209,6 @@ object dmTraspasos: TdmTraspasos
         Name = 'TOTAL_RECT'
         DataType = datFloat
         DisplayLabel = 'Total'
-        ServerAutoRefresh = True
         DictionaryEntry = 'Traspasos_TOTAL_RECT'
       end>
     Params = <>
@@ -329,6 +339,12 @@ object dmTraspasos: TdmTraspasos
         ReadOnly = True
         DictionaryEntry = 'Traspasos_COLOR'
       end
+      item
+        Name = 'T36'
+        DataType = datFloat
+        ReadOnly = True
+        DictionaryEntry = 'Traspasos_T36'
+      end
       item
         Name = 'T38'
         DataType = datFloat
@@ -372,6 +388,11 @@ object dmTraspasos: TdmTraspasos
         ReadOnly = True
         DictionaryEntry = 'Traspasos_TOTAL'
       end
+      item
+        Name = 'TR36'
+        DataType = datFloat
+        DictionaryEntry = 'Traspasos_TR36'
+      end
       item
         Name = 'TR38'
         DataType = datFloat
@@ -406,7 +427,6 @@ object dmTraspasos: TdmTraspasos
         Name = 'TOTAL_RECT'
         DataType = datFloat
         DisplayLabel = 'Total'
-        ServerAutoRefresh = True
         DictionaryEntry = 'Traspasos_TOTAL_RECT'
       end>
     Params = <>
@@ -537,6 +557,12 @@ object dmTraspasos: TdmTraspasos
         ReadOnly = True
         DictionaryEntry = 'Traspasos_COLOR'
       end
+      item
+        Name = 'T36'
+        DataType = datFloat
+        ReadOnly = True
+        DictionaryEntry = 'Traspasos_T36'
+      end
       item
         Name = 'T38'
         DataType = datFloat
@@ -580,6 +606,11 @@ object dmTraspasos: TdmTraspasos
         ReadOnly = True
         DictionaryEntry = 'Traspasos_TOTAL'
       end
+      item
+        Name = 'TR36'
+        DataType = datFloat
+        DictionaryEntry = 'Traspasos_TR36'
+      end
       item
         Name = 'TR38'
         DataType = datFloat
@@ -614,7 +645,6 @@ object dmTraspasos: TdmTraspasos
         Name = 'TOTAL_RECT'
         DataType = datFloat
         DisplayLabel = 'Total'
-        ServerAutoRefresh = True
         DictionaryEntry = 'Traspasos_TOTAL_RECT'
       end>
     Params = <>

Source/Modulos/Traspasos/Cliente/uEditorAjustarTraspasos.dfm

@@ -3,7 +3,7 @@ object fEditorAjustarTraspasos: TfEditorAjustarTraspasos
   Top = 312
   BorderStyle = bsDialog
   Caption = 'Modificaci'#243'n de recepciones de productos'
-  ClientHeight = 536
+  ClientHeight = 533
   ClientWidth = 752
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
@@ -37,7 +37,7 @@ object fEditorAjustarTraspasos: TfEditorAjustarTraspasos
     SymbolFont.Name = 'Wingdings'
     SymbolFont.Style = [fsBold]
     Captions.Strings = (
-      'Modificaci'#243'n de recepciones de productos')
+      'Modificaci'#243'n de traspasos de productos')
     Comments.Strings = (
       '')
     Gradient.FromColor = clHighlight
@@ -136,7 +136,7 @@ object fEditorAjustarTraspasos: TfEditorAjustarTraspasos
       ParentFont = False
     end
     object edtRec38: TcxDBMaskEdit
-      Left = 112
+      Left = 201
       Top = 333
       DataBinding.DataField = 'T38'
       DataBinding.DataSource = dsDataSource
@@ -151,11 +151,11 @@ object fEditorAjustarTraspasos: TfEditorAjustarTraspasos
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 6
+      TabOrder = 8
-      Width = 98
+      Width = 83
     end
     object edtRec40: TcxDBMaskEdit
-      Left = 216
+      Left = 290
       Top = 333
       DataBinding.DataField = 'T40'
       DataBinding.DataSource = dsDataSource
@@ -170,11 +170,11 @@ object fEditorAjustarTraspasos: TfEditorAjustarTraspasos
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 8
+      TabOrder = 10
-      Width = 98
+      Width = 83
     end
     object edtRec42: TcxDBMaskEdit
-      Left = 320
+      Left = 379
       Top = 333
       DataBinding.DataField = 'T42'
       DataBinding.DataSource = dsDataSource
@@ -189,11 +189,11 @@ object fEditorAjustarTraspasos: TfEditorAjustarTraspasos
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 10
+      TabOrder = 12
-      Width = 98
+      Width = 83
     end
     object edtRec44: TcxDBMaskEdit
-      Left = 424
+      Left = 468
       Top = 333
       DataBinding.DataField = 'T44'
       DataBinding.DataSource = dsDataSource
@@ -208,11 +208,11 @@ object fEditorAjustarTraspasos: TfEditorAjustarTraspasos
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 12
+      TabOrder = 14
-      Width = 98
+      Width = 83
     end
     object edtRec46: TcxDBMaskEdit
-      Left = 528
+      Left = 557
       Top = 333
       DataBinding.DataField = 'T46'
       DataBinding.DataSource = dsDataSource
@@ -227,11 +227,11 @@ object fEditorAjustarTraspasos: TfEditorAjustarTraspasos
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 14
+      TabOrder = 16
-      Width = 98
+      Width = 83
     end
     object edtRec48: TcxDBMaskEdit
-      Left = 632
+      Left = 646
       Top = 333
       DataBinding.DataField = 'T48'
       DataBinding.DataSource = dsDataSource
@@ -246,11 +246,30 @@ object fEditorAjustarTraspasos: TfEditorAjustarTraspasos
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 16
+      TabOrder = 18
-      Width = 98
+      Width = 83
     end
     object edtRecR48: TcxCurrencyEdit
-      Left = 632
+      Left = 646
+      Top = 360
+      Properties.Alignment.Horz = taRightJustify
+      Properties.DecimalPlaces = 0
+      Properties.DisplayFormat = ',0;-,0'
+      Properties.UseThousandSeparator = True
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.TextColor = clActiveCaption
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 19
+      Width = 83
+    end
+    object edtRecR46: TcxCurrencyEdit
+      Left = 557
       Top = 360
       Properties.Alignment.Horz = taRightJustify
       Properties.DecimalPlaces = 0
@@ -266,10 +285,10 @@ object fEditorAjustarTraspasos: TfEditorAjustarTraspasos
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 17
-      Width = 98
+      Width = 83
     end
-    object edtRecR46: TcxCurrencyEdit
+    object edtRecR44: TcxCurrencyEdit
-      Left = 528
+      Left = 468
       Top = 360
       Properties.Alignment.Horz = taRightJustify
       Properties.DecimalPlaces = 0
@@ -285,10 +304,10 @@ object fEditorAjustarTraspasos: TfEditorAjustarTraspasos
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 15
-      Width = 98
+      Width = 83
     end
-    object edtRecR44: TcxCurrencyEdit
+    object edtRecR42: TcxCurrencyEdit
-      Left = 424
+      Left = 379
       Top = 360
       Properties.Alignment.Horz = taRightJustify
       Properties.DecimalPlaces = 0
@@ -304,10 +323,10 @@ object fEditorAjustarTraspasos: TfEditorAjustarTraspasos
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 13
-      Width = 98
+      Width = 83
     end
-    object edtRecR42: TcxCurrencyEdit
+    object edtRecR40: TcxCurrencyEdit
-      Left = 320
+      Left = 290
       Top = 360
       Properties.Alignment.Horz = taRightJustify
       Properties.DecimalPlaces = 0
@@ -323,10 +342,10 @@ object fEditorAjustarTraspasos: TfEditorAjustarTraspasos
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 11
-      Width = 98
+      Width = 83
     end
-    object edtRecR40: TcxCurrencyEdit
+    object edtRecR38: TcxCurrencyEdit
-      Left = 216
+      Left = 201
       Top = 360
       Properties.Alignment.Horz = taRightJustify
       Properties.DecimalPlaces = 0
@@ -342,26 +361,7 @@ object fEditorAjustarTraspasos: TfEditorAjustarTraspasos
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 9
-      Width = 98
+      Width = 83
-    end
-    object edtRecR38: TcxCurrencyEdit
-      Left = 112
-      Top = 360
-      Properties.Alignment.Horz = taRightJustify
-      Properties.DecimalPlaces = 0
-      Properties.DisplayFormat = ',0;-,0'
-      Properties.UseThousandSeparator = True
-      Style.LookAndFeel.Kind = lfStandard
-      Style.LookAndFeel.NativeStyle = True
-      StyleDisabled.LookAndFeel.Kind = lfStandard
-      StyleDisabled.LookAndFeel.NativeStyle = True
-      StyleDisabled.TextColor = clActiveCaption
-      StyleFocused.LookAndFeel.Kind = lfStandard
-      StyleFocused.LookAndFeel.NativeStyle = True
-      StyleHot.LookAndFeel.Kind = lfStandard
-      StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 7
-      Width = 98
     end
     object edtFecha: TcxDBLabel
       Left = 133
@@ -469,6 +469,44 @@ object fEditorAjustarTraspasos: TfEditorAjustarTraspasos
       TabOrder = 4
       Width = 319
     end
+    object edtRec36: TcxDBMaskEdit
+      Left = 112
+      Top = 333
+      DataBinding.DataField = 'T36'
+      DataBinding.DataSource = dsDataSource
+      Enabled = False
+      Properties.Alignment.Horz = taRightJustify
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.TextColor = clActiveCaption
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 6
+      Width = 83
+    end
+    object edtRecR36: TcxCurrencyEdit
+      Left = 112
+      Top = 360
+      Properties.Alignment.Horz = taRightJustify
+      Properties.DecimalPlaces = 0
+      Properties.DisplayFormat = ',0;-,0'
+      Properties.UseThousandSeparator = True
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.TextColor = clActiveCaption
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 7
+      Width = 83
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -594,6 +632,28 @@ object fEditorAjustarTraspasos: TfEditorAjustarTraspasos
             ControlOptions.ShowBorder = False
           end
         end
+        object dxLayoutControl1Group99: TdxLayoutGroup
+          ShowCaption = False
+          Hidden = True
+          ShowBorder = False
+          object dxLayoutControl1Item92: TdxLayoutItem
+            AutoAligns = [aaVertical]
+            AlignHorz = ahClient
+            Caption = '36'
+            CaptionOptions.AlignHorz = taCenter
+            CaptionOptions.Layout = clTop
+            Control = edtRec36
+            ControlOptions.ShowBorder = False
+          end
+          object dxLayoutControl1Item93: TdxLayoutItem
+            Caption = 'edtRecR36'
+            CaptionOptions.AlignHorz = taCenter
+            CaptionOptions.Layout = clTop
+            ShowCaption = False
+            Control = edtRecR36
+            ControlOptions.ShowBorder = False
+          end
+        end
         object dxLayoutControl1Group10: TdxLayoutGroup
           ShowCaption = False
           Hidden = True

Source/Modulos/Traspasos/Cliente/uEditorAjustarTraspasos.pas

@@ -99,6 +99,8 @@ type
     dxLayoutControl1Item10: TdxLayoutItem;
     lblCentroDestino: TLabel;
     dxLayoutControl1Group2: TdxLayoutGroup;
+    edtRec36: TcxDBMaskEdit;
+    edtRecR36: TcxCurrencyEdit;
     procedure FormShow(Sender: TObject);
     procedure cxGridViewCustomDrawCell(Sender: TcxCustomGridTableView;
       ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
@@ -192,6 +194,11 @@ procedure TfEditorAjustarTraspasos.CargarValores;
 begin
   with FItems.DataTable do
   begin
+    if FieldByName('T36').AsInteger <> FieldByName('TR36').AsInteger then
+      edtRecR36.Value := FieldByName('TR36').AsInteger
+    else
+      edtRecR36.Value := FieldByName('T36').AsInteger;
+
     if FieldByName('T38').AsInteger <> FieldByName('TR38').AsInteger then
       edtRecR38.Value := FieldByName('TR38').AsInteger
     else
@@ -251,6 +258,7 @@ begin
   with FItems.DataTable do
   begin
     Edit;
+    FieldByName('TR36').AsVariant := edtRecR36.Value;
     FieldByName('TR38').AsVariant := edtRecR38.Value;
     FieldByName('TR40').AsVariant := edtRecR40.Value;
     FieldByName('TR42').AsVariant := edtRecR42.Value;

Source/Modulos/Traspasos/Cliente/uEditorListaTraspasos.dfm

@@ -113,14 +113,6 @@ inherited fEditorListaTraspasos: TfEditorListaTraspasos
     end
     inherited TBXDockablePanel1: TTBXDockablePanel
       ExplicitWidth = 901
-      inherited frViewParametrosCentro1: TfrViewParametrosCentro
-        inherited dxLayoutControl1: TdxLayoutControl
-          inherited ccbCentro: TJvCheckedComboBox
-            Width = 392
-            ExplicitWidth = 392
-          end
-        end
-      end
       inherited TBXLabel1: TTBXLabel
         Width = 901
         ExplicitWidth = 901

Source/Modulos/Traspasos/Cliente/uEditorListaTraspasos.pas

@@ -128,7 +128,7 @@ procedure TfEditorListaTraspasos.actModificarExecute(
   Sender: TObject);
 begin
   ViewGrid._FocusedView.BeginUpdate;
-  ViewGrid.SaveGridStatus;
+//  ViewGrid.SaveGridStatus;
   try
     FItems.Show;
   finally
@@ -137,7 +137,7 @@ begin
     Application.ProcessMessages;
     try
       ViewGrid._FocusedView.EndUpdate;
-      ViewGrid.RestoreGridStatus;
+//      ViewGrid.RestoreGridStatus;
     finally
       HideHourglassCursor;
     end;

Source/Modulos/Traspasos/Cliente/uViewListaTraspasos.dfm

@@ -47,6 +47,7 @@ inherited frViewListaTraspasos: TfrViewListaTraspasos
         IsCaptionAssigned = True
       end
       object cxGridViewFECHA: TcxGridDBColumn
+        Caption = 'Fecha'
         DataBinding.FieldName = 'FECHA'
         SortIndex = 1
         SortOrder = soAscending
@@ -58,6 +59,7 @@ inherited frViewListaTraspasos: TfrViewListaTraspasos
         Visible = False
       end
       object cxGridViewESTADO_TRASPASO: TcxGridDBColumn
+        Caption = 'Estado'
         DataBinding.FieldName = 'ESTADO_TRASPASO'
         Styles.OnGetContentStyle = cxGridViewFECHAStylesGetContentStyle
         Width = 59
@@ -122,6 +124,10 @@ inherited frViewListaTraspasos: TfrViewListaTraspasos
         DataBinding.FieldName = 'COLOR'
         Visible = False
       end
+      object cxGridViewT36: TcxGridDBColumn
+        DataBinding.FieldName = 'T36'
+        Visible = False
+      end
       object cxGridViewT38: TcxGridDBColumn
         Caption = 'T38/S'
         DataBinding.FieldName = 'T38'
@@ -154,6 +160,13 @@ inherited frViewListaTraspasos: TfrViewListaTraspasos
         DataBinding.FieldName = 'TOTAL'
         Visible = False
       end
+      object cxGridViewTR36: TcxGridDBColumn
+        Caption = '36'
+        DataBinding.FieldName = 'TR36'
+        OnGetDisplayText = cxGridViewTR36GetDisplayText
+        Styles.OnGetContentStyle = cxGridViewFECHAStylesGetContentStyle
+        Width = 59
+      end
       object cxGridViewTR38: TcxGridDBColumn
         Caption = '38/S'
         DataBinding.FieldName = 'TR38'
@@ -197,6 +210,7 @@ inherited frViewListaTraspasos: TfrViewListaTraspasos
         Width = 57
       end
       object cxGridViewTOTAL_RECT: TcxGridDBColumn
+        Caption = 'Total'
         DataBinding.FieldName = 'TOTAL_RECT'
         OnGetDataText = cxGridViewTOTAL_RECTGetDataText
         Styles.OnGetContentStyle = cxGridViewFECHAStylesGetContentStyle

Source/Modulos/Traspasos/Cliente/uViewListaTraspasos.pas

@@ -60,6 +60,7 @@ type
     cxGridViewCODIGO: TcxGridDBColumn;
     cxGridViewPRODUCTO: TcxGridDBColumn;
     cxGridViewCOLOR: TcxGridDBColumn;
+    cxGridViewTR36: TcxGridDBColumn;
     cxGridViewTR38: TcxGridDBColumn;
     cxGridViewTR40: TcxGridDBColumn;
     cxGridViewTR42: TcxGridDBColumn;
@@ -67,6 +68,7 @@ type
     cxGridViewTR46: TcxGridDBColumn;
     cxGridViewTR48: TcxGridDBColumn;
     cxGridViewTOTAL_RECT: TcxGridDBColumn;
+    cxGridViewT36: TcxGridDBColumn;
     cxGridViewT38: TcxGridDBColumn;
     cxGridViewT40: TcxGridDBColumn;
     cxGridViewT42: TcxGridDBColumn;
@@ -94,6 +96,8 @@ type
     procedure cxGridBandedViewCODIGOGetDisplayText(
       Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
       var AText: String);
+    procedure cxGridViewTR36GetDisplayText(Sender: TcxCustomGridTableItem;
+      ARecord: TcxCustomGridRecord; var AText: String);
     procedure cxGridViewTR38GetDisplayText(Sender: TcxCustomGridTableItem;
       ARecord: TcxCustomGridRecord; var AText: String);
     procedure cxGridViewTR40GetDisplayText(Sender: TcxCustomGridTableItem;
@@ -358,6 +362,25 @@ begin
   AText := StringReplace(AText, 'CODIGO : ', '', [rfReplaceAll, rfIgnoreCase])
 end;
 
+procedure TfrViewListaTraspasos.cxGridViewTR36GetDisplayText(
+  Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
+  var AText: String);
+var
+  AStr : String;
+begin
+  inherited;
+  if not Assigned( ARecord ) then
+    Exit;
+
+  AStr := VarToStrDef(ARecord.Values[cxGridViewT36.Index], '');
+  if not ((AStr = '') and (AText = '0')) and (AStr <> AText) then
+  begin
+    if Length(AStr) = 0 then
+      AStr := '0';
+    AText := AText + ' (' + AStr + ')';
+  end;
+end;
+
 procedure TfrViewListaTraspasos.cxGridViewTR38GetDisplayText(
   Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
   var AText: String);

Source/Modulos/Traspasos/Servidor/srvTraspasos_Impl.dfm

@@ -24,9 +24,9 @@ object srvTraspasos: TsrvTraspasos
             SQL = 
               'SELECT '#10'    TIPO, FECHA, CENTRO, FILIAL, CENTRO2, FILIAL2, APROB' +
               'ADO, '#10'    ESTADO_TRASPASO, OBSERVACIONES, CONTABILIZAR, FECHACAM' +
-              'BIO, '#10'    CODIGO, PRODUCTO, COLOR, T38, T40, T42, T44, T46, T48,' +
+              'BIO, '#10'    CODIGO, PRODUCTO, COLOR, T36, T38, T40, T42, T44, T46,' +
-              ' '#10'    TOTAL, TR38, TR40, TR42, TR44, TR46, TR48, TOTAL_RECT'#10'  FR' +
+              ' T48,'#10'    TOTAL, TR36, TR38, TR40, TR42, TR44, TR46, TR48, TOTAL' +
-              'OM'#10'    RDX_V_CONTROL_TRASPASOS'
+              '_RECT'#10'  FROM'#10'    RDX_V_CONTROL_TRASPASOS'#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -140,6 +140,14 @@ object srvTraspasos: TsrvTraspasos
               item
                 DatasetField = 'FECHACAMBIO'
                 TableField = 'FECHACAMBIO'
+              end
+              item
+                DatasetField = 'T36'
+                TableField = 'T36'
+              end
+              item
+                DatasetField = 'TR36'
+                TableField = 'TR36'
               end>
           end>
         Name = 'Traspasos'
@@ -226,6 +234,11 @@ object srvTraspasos: TsrvTraspasos
             Size = 10
             DictionaryEntry = 'Traspasos_COLOR'
           end
+          item
+            Name = 'T36'
+            DataType = datFloat
+            DictionaryEntry = 'Traspasos_T36'
+          end
           item
             Name = 'T38'
             DataType = datFloat
@@ -261,6 +274,11 @@ object srvTraspasos: TsrvTraspasos
             DataType = datFloat
             DictionaryEntry = 'Traspasos_TOTAL'
           end
+          item
+            Name = 'TR36'
+            DataType = datFloat
+            DictionaryEntry = 'Traspasos_TR36'
+          end
           item
             Name = 'TR38'
             DataType = datFloat
@@ -306,9 +324,9 @@ object srvTraspasos: TsrvTraspasos
             SQL = 
               'SELECT '#10'    TIPO, FECHA, CENTRO, FILIAL, CENTRO2, FILIAL2, APROB' +
               'ADO, '#10'    ESTADO_TRASPASO, OBSERVACIONES, CONTABILIZAR, FECHACAM' +
-              'BIO, '#10'    CODIGO, PRODUCTO, COLOR, T38, T40, T42, T44, T46, T48,' +
+              'BIO, '#10'    CODIGO, PRODUCTO, COLOR, T36, T38, T40, T42, T44, T46,' +
-              ' '#10'    TOTAL, TR38, TR40, TR42, TR44, TR46, TR48, TOTAL_RECT'#10'  FR' +
+              ' T48,'#10'    TOTAL, TR36, TR38, TR40, TR42, TR44, TR46, TR48, TOTAL' +
-              'OM'#10'    RDX_V_CONTROL_TRASPASOS'#10'  WHERE APROBADO = '#39'N'#39
+              '_RECT'#10'  FROM'#10'    RDX_V_CONTROL_TRASPASOS'#10'  WHERE APROBADO = '#39'N'#39#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -422,6 +440,14 @@ object srvTraspasos: TsrvTraspasos
               item
                 DatasetField = 'FECHACAMBIO'
                 TableField = 'FECHACAMBIO'
+              end
+              item
+                DatasetField = 'T36'
+                TableField = 'T36'
+              end
+              item
+                DatasetField = 'TR36'
+                TableField = 'TR36'
               end>
           end>
         Name = 'TraspasosPendientes'
@@ -508,6 +534,11 @@ object srvTraspasos: TsrvTraspasos
             Size = 10
             DictionaryEntry = 'Traspasos_COLOR'
           end
+          item
+            Name = 'T36'
+            DataType = datFloat
+            DictionaryEntry = 'Traspasos_T36'
+          end
           item
             Name = 'T38'
             DataType = datFloat
@@ -543,6 +574,11 @@ object srvTraspasos: TsrvTraspasos
             DataType = datFloat
             DictionaryEntry = 'Traspasos_TOTAL'
           end
+          item
+            Name = 'TR36'
+            DataType = datFloat
+            DictionaryEntry = 'Traspasos_TR36'
+          end
           item
             Name = 'TR38'
             DataType = datFloat
@@ -588,9 +624,9 @@ object srvTraspasos: TsrvTraspasos
             SQL = 
               'SELECT '#10'    TIPO, FECHA, CENTRO, FILIAL, CENTRO2, FILIAL2, APROB' +
               'ADO, '#10'    ESTADO_TRASPASO, OBSERVACIONES, CONTABILIZAR, FECHACAM' +
-              'BIO, '#10'    CODIGO, PRODUCTO, COLOR, T38, T40, T42, T44, T46, T48,' +
+              'BIO, '#10'    CODIGO, PRODUCTO, COLOR, T36, T38, T40, T42, T44, T46,' +
-              ' '#10'    TOTAL, TR38, TR40, TR42, TR44, TR46, TR48, TOTAL_RECT'#10'  FR' +
+              ' T48,'#10'    TOTAL, TR36, TR38, TR40, TR42, TR44, TR46, TR48, TOTAL' +
-              'OM'#10'    RDX_V_CONTROL_TRASPASOS'#10'  WHERE APROBADO = '#39'S'#39
+              '_RECT'#10'  FROM'#10'    RDX_V_CONTROL_TRASPASOS'#10'  WHERE APROBADO = '#39'S'#39#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -704,6 +740,14 @@ object srvTraspasos: TsrvTraspasos
               item
                 DatasetField = 'FECHACAMBIO'
                 TableField = 'FECHACAMBIO'
+              end
+              item
+                DatasetField = 'T36'
+                TableField = 'T36'
+              end
+              item
+                DatasetField = 'TR36'
+                TableField = 'TR36'
               end>
           end>
         Name = 'TraspasosAprobados'
@@ -790,6 +834,11 @@ object srvTraspasos: TsrvTraspasos
             Size = 10
             DictionaryEntry = 'Traspasos_COLOR'
           end
+          item
+            Name = 'T36'
+            DataType = datFloat
+            DictionaryEntry = 'Traspasos_T36'
+          end
           item
             Name = 'T38'
             DataType = datFloat
@@ -825,6 +874,11 @@ object srvTraspasos: TsrvTraspasos
             DataType = datFloat
             DictionaryEntry = 'Traspasos_TOTAL'
           end
+          item
+            Name = 'TR36'
+            DataType = datFloat
+            DictionaryEntry = 'Traspasos_TR36'
+          end
           item
             Name = 'TR38'
             DataType = datFloat
@@ -926,7 +980,9 @@ object srvTraspasos: TsrvTraspasos
       item
         Params = <
           item
-            Name = 'ESTADO'
+            Name = 'ESTADO_TRASPASO'
+            DataType = datString
+            Size = 15
             Value = ''
           end
           item
@@ -934,98 +990,88 @@ object srvTraspasos: TsrvTraspasos
             DataType = datString
             Size = 255
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'CONTABILIZAR'
             DataType = datString
             Size = 1
             Value = ''
-            ParamType = daptInput
+          end
+          item
+            Name = 'TR36'
+            DataType = datFloat
+            Value = ''
           end
           item
             Name = 'TR38'
             DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'TR40'
             DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'TR42'
             DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'TR44'
             DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'TR46'
             DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'TR48'
             DataType = datFloat
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'APROBADO'
             DataType = datString
             Size = 1
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'FECHA'
             DataType = datDateTime
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'CENTRO'
             DataType = datString
             Size = 17
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'CENTRO2'
             DataType = datString
             Size = 17
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'CODIGO'
             DataType = datString
             Size = 12
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'COLOR'
             DataType = datString
             Size = 10
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'TIPO'
             DataType = datString
-            Size = 1
+            Size = 2
             Value = ''
-            ParamType = daptInput
           end>
         Statements = <
           item
@@ -1034,56 +1080,58 @@ object srvTraspasos: TsrvTraspasos
             SQL = 
               'begin'#10'    declare @rowcount_var int'#10'    declare @ESTADO varchar(' +
               '20)'#10'    declare @OBSERVACIONES varchar(255)'#10'    declare @CONTABI' +
-              'LIZAR char(1)'#10#10'    declare @TR38 numeric(15,0)'#10'    declare @TR40' +
+              'LIZAR char(1)'#10#10'    declare @TR36 numeric(15,0)'#10'    declare @TR38' +
-              ' numeric(15,0)'#10'    declare @TR42 numeric(15,0)'#10'    declare @TR44' +
+              ' numeric(15,0)'#10'    declare @TR40 numeric(15,0)'#10'    declare @TR42' +
-              ' numeric(15,0)'#10'    declare @TR46 numeric(15,0)'#10'    declare @TR48' +
+              ' numeric(15,0)'#10'    declare @TR44 numeric(15,0)'#10'    declare @TR46' +
-              ' numeric(15,0)'#10'    declare @TR_S numeric(15,0)'#10'    declare @TR_M' +
+              ' numeric(15,0)'#10'    declare @TR48 numeric(15,0)'#10'    declare @TR_S' +
-              ' numeric(15,0)'#10'    declare @TR_L numeric(15,0)'#10'    declare @TR_X' +
+              ' numeric(15,0)'#10'    declare @TR_M numeric(15,0)'#10'    declare @TR_L' +
-              'L numeric(15,0)'#10#10'    declare @APROBADO char(1)'#10'    declare @FECH' +
+              ' numeric(15,0)'#10'    declare @TR_XL numeric(15,0)'#10#10'    declare @AP' +
-              'A datetime'#10'    declare @CENTRO varchar(17)'#10'    declare @CENTRO2 ' +
+              'ROBADO char(1)'#10'    declare @FECHA datetime'#10'    declare @CENTRO v' +
-              'varchar(17)'#10'    declare @CODIGO varchar(12)'#10'    declare @COLOR v' +
+              'archar(17)'#10'    declare @CENTRO2 varchar(17)'#10'    declare @CODIGO ' +
-              'archar(10)'#10'    declare @TIPOCANT varchar(3)'#10'    declare @TIPO_TA' +
+              'varchar(12)'#10'    declare @COLOR varchar(10)'#10'    declare @TIPOCANT' +
-              'LLAJE smallint'#10'    '#10'    set @ESTADO = :ESTADO'#10'    set @OBSERVACI' +
+              ' varchar(3)'#10'    declare @TIPO_TALLAJE smallint'#10#10'    set @ESTADO ' +
-              'ONES = :OBSERVACIONES'#10'    set @CONTABILIZAR = :CONTABILIZAR'#10#10'   ' +
+              '= :ESTADO_TRASPASO'#10'    set @OBSERVACIONES = :OBSERVACIONES'#10'    s' +
-              ' set @TR38 = :TR38'#10'    set @TR40 = :TR40'#10'    set @TR42 = :TR42'#10' ' +
+              'et @CONTABILIZAR = :CONTABILIZAR'#10#10'    set @TR36 = :TR36'#10'    set ' +
-              '   set @TR44 = :TR44'#10'    set @TR46 = :TR46'#10'    set @TR48 = :TR48' +
+              '@TR38 = :TR38'#10'    set @TR40 = :TR40'#10'    set @TR42 = :TR42'#10'    se' +
-              #10'    set @TR_S = :TR38'#10'    set @TR_M = :TR40'#10'    set @TR_L = :TR' +
+              't @TR44 = :TR44'#10'    set @TR46 = :TR46'#10'    set @TR48 = :TR48'#10'    ' +
-              '42'#10'    set @TR_XL = :TR44'#10#10'    set @APROBADO = :APROBADO'#10'    set' +
+              'set @TR_S = :TR38'#10'    set @TR_M = :TR40'#10'    set @TR_L = :TR42'#10'  ' +
-              ' @FECHA = :FECHA'#10'    set @CENTRO = :CENTRO'#10'    set @CENTRO2 = :C' +
+              '  set @TR_XL = :TR44'#10#10'    set @APROBADO = :APROBADO'#10'    set @FEC' +
-              'ENTRO2'#10'    set @CODIGO = :CODIGO'#10'    set @COLOR = :COLOR'#10'    set' +
+              'HA = :FECHA'#10'    set @CENTRO = :CENTRO'#10'    set @CENTRO2 = :CENTRO' +
-              ' @TIPOCANT = :TIPO'#10#10'    /* ARREGLO PARA QUE SOPORTE LOS NUEVOS T' +
+              '2'#10'    set @CODIGO = :CODIGO'#10'    set @COLOR = :COLOR'#10'    set @TIP' +
-              'ALLAJES*** */'#10#10'    execute RDX_P_TIPO_TALLAJE @CODIGO, @TIPO_TAL' +
+              'OCANT = :TIPO'#10#10'    /* ARREGLO PARA QUE SOPORTE LOS NUEVOS TALLAJ' +
-              'LAJE OUTPUT'#10#10'    if @TIPO_TALLAJE = 1'#10'    begin'#10'       set @TR_S' +
+              'ES*** */'#10#10'    execute RDX_P_TIPO_TALLAJE @CODIGO, @TIPO_TALLAJE ' +
-              ' = NULL'#10'       set @TR_M = NULL'#10'       set @TR_L = NULL'#10'       s' +
+              'OUTPUT'#10#10'    if @TIPO_TALLAJE = 1'#10'    begin'#10'       set @TR_S = NU' +
-              'et @TR_XL = NULL'#10'    end'#10'    else'#10'    begin'#10'       set @TR38 = N' +
+              'LL'#10'       set @TR_M = NULL'#10'       set @TR_L = NULL'#10'       set @T' +
-              'ULL'#10'       set @TR40 = NULL'#10'       set @TR42 = NULL'#10'       set @' +
+              'R_XL = NULL'#10'    end'#10'    else'#10'    begin'#10'       set @TR36 = NULL'#10' ' +
-              'TR44 = NULL'#10'       set @TR46 = NULL'#10'       set @TR48 = NULL'#10'    ' +
+              '      set @TR38 = NULL'#10'       set @TR40 = NULL'#10'       set @TR42 ' +
-              'end'#10#10'    /* *********************************** */'#10#9'update RDX_T' +
+              '= NULL'#10'       set @TR44 = NULL'#10'       set @TR46 = NULL'#10'       se' +
-              'RASPASOS_AJUSTES set'#10#9'           CANT38 = @TR38,'#10#9'           CAN' +
+              't @TR48 = NULL'#10'    end'#10#10'    /* *********************************' +
-              'T40 = @TR40,'#10#9'           CANT42 = @TR42,'#10#9'           CANT44 = @T' +
+              '** */'#10#9'update RDX_TRASPASOS_AJUSTES set'#10#9'           CANT36 = @TR' +
-              'R44,'#10#9'           CANT46 = @TR46,'#10#9'           CANT48 = @TR48,'#10#9'  ' +
+              '36,'#10#9'           CANT38 = @TR38,'#10#9'           CANT40 = @TR40,'#10#9'   ' +
-              '         CANT_S = @TR_S,'#10#9'           CANT_M = @TR_M,'#10#9'          ' +
+              '        CANT42 = @TR42,'#10#9'           CANT44 = @TR44,'#10#9'           ' +
-              ' CANT_L = @TR_L,'#10#9'           CANT_XL = @TR_XL,'#10'               AP' +
+              'CANT46 = @TR46,'#10#9'           CANT48 = @TR48,'#10#9'           CANT_S =' +
-              'ROBADO = @APROBADO,'#10'               ESTADO = @ESTADO,'#10'           ' +
+              ' @TR_S,'#10#9'           CANT_M = @TR_M,'#10#9'           CANT_L = @TR_L,'#10 +
-              '    TIPOCANT = @TIPOCANT,'#10'               OBSERVACIONES = @OBSERV' +
+              #9'           CANT_XL = @TR_XL,'#10'               APROBADO = @APROBAD' +
-              'ACIONES,'#10'               CONTABILIZAR = @CONTABILIZAR,'#10'          ' +
+              'O,'#10'               ESTADO = @ESTADO,'#10'               TIPOCANT = @T' +
-              '     FECHACAMBIO = CURRENT_TIMESTAMP'#10#9'where'#10'             (RDX_TR' +
+              'IPOCANT,'#10'               OBSERVACIONES = @OBSERVACIONES,'#10'        ' +
-              'ASPASOS_AJUSTES.CENTRO = @CENTRO and'#10'              RDX_TRASPASOS' +
+              '       CONTABILIZAR = @CONTABILIZAR,'#10'               FECHACAMBIO ' +
-              '_AJUSTES.CENTRO2 = @CENTRO2 and'#10#9'      RDX_TRASPASOS_AJUSTES.COD' +
+              '= CURRENT_TIMESTAMP'#10#9'where'#10'             (RDX_TRASPASOS_AJUSTES.C' +
-              'IGO = @CODIGO and'#10#9'      RDX_TRASPASOS_AJUSTES.COLOR = @COLOR an' +
+              'ENTRO = @CENTRO and'#10'              RDX_TRASPASOS_AJUSTES.CENTRO2 ' +
-              'd'#10#9'      RDX_TRASPASOS_AJUSTES.FECHA = @FECHA)'#10#10#9'select @ROWCOUN' +
+              '= @CENTRO2 and'#10#9'      RDX_TRASPASOS_AJUSTES.CODIGO = @CODIGO and' +
-              'T_VAR = @@ROWCOUNT'#10#10#9'if @ROWCOUNT_VAR = 0'#10'    begin'#10'         ins' +
+              #10#9'      RDX_TRASPASOS_AJUSTES.COLOR = @COLOR and'#10#9'      RDX_TRAS' +
-              'ert into RDX_TRASPASOS_AJUSTES'#10'                (FECHA, CENTRO, C' +
+              'PASOS_AJUSTES.FECHA = @FECHA)'#10#10#9'select @ROWCOUNT_VAR = @@ROWCOUN' +
-              'ENTRO2, CODIGO, COLOR,'#10'                 APROBADO, FECHACAMBIO, T' +
+              'T'#10#10#9'if @ROWCOUNT_VAR = 0'#10'    begin'#10'         insert into RDX_TRAS' +
-              'IPOCANT,'#10'                 ESTADO, OBSERVACIONES, CONTABILIZAR,'#10' ' +
+              'PASOS_AJUSTES'#10'                (FECHA, CENTRO, CENTRO2, CODIGO, C' +
-              '                CANT38, CANT40, CANT42,'#10'                 CANT44,' +
+              'OLOR,'#10'                 APROBADO, FECHACAMBIO, TIPOCANT,'#10'        ' +
-              ' CANT46, CANT48,'#10'                 CANT_S, CANT_M, CANT_L, CANT_X' +
+              '         ESTADO, OBSERVACIONES, CONTABILIZAR,'#10'                 C' +
-              'L)'#10'         values ('#10'                 @FECHA, @CENTRO, @CENTRO2,' +
+              'ANT36, CANT38, CANT40, CANT42,'#10'                 CANT44, CANT46, ' +
-              ' @CODIGO,'#10'                 @COLOR, @APROBADO, CURRENT_TIMESTAMP,' +
+              'CANT48,'#10'                 CANT_S, CANT_M, CANT_L, CANT_XL)'#10'      ' +
-              ' @TIPOCANT,'#10'                 @ESTADO, @OBSERVACIONES, @CONTABILI' +
+              '   values ('#10'                 @FECHA, @CENTRO, @CENTRO2, @CODIGO,' +
-              'ZAR,'#10'                 @TR38, @TR40, @TR42,'#10'                 @TR4' +
+              #10'                 @COLOR, @APROBADO, CURRENT_TIMESTAMP, @TIPOCAN' +
-              '4, @TR46, @TR48,'#10'                 @TR_S, @TR_M, @TR_L, @TR_XL)'#10' ' +
+              'T,'#10'                 @ESTADO, @OBSERVACIONES, @CONTABILIZAR, @TR3' +
-              '   end'#10'end'#10
+              '6,'#10'                 @TR38, @TR40, @TR42,'#10'                 @TR44,' +
+              ' @TR46, @TR48,'#10'                 @TR_S, @TR_M, @TR_L, @TR_XL)'#10'   ' +
+              ' end'#10'end'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1267,6 +1315,17 @@ object srvTraspasos: TsrvTraspasos
         DataType = datDateTime
         DisplayLabel = 'Fecha cambio'
         ReadOnly = True
+      end
+      item
+        Name = 'Traspasos_T36'
+        DataType = datFloat
+        DisplayLabel = 'T36'
+        ReadOnly = True
+      end
+      item
+        Name = 'Traspasos_TR36'
+        DataType = datFloat
+        DisplayLabel = 'TR36'
       end>
     Left = 40
     Top = 168
@@ -1279,7 +1338,7 @@ object srvTraspasos: TsrvTraspasos
     ProcessorOptions = [poAutoGenerateInsert, poAutoGenerateDelete, poPrepareCommands, poIgnoreRowsAffected]
     UpdateMode = updWhereKeyOnly
     Left = 192
-    Top = 32
+    Top = 24
   end
   object bpTraspasosAprobadas: TDABusinessProcessor
     Schema = schTraspasos
@@ -1299,6 +1358,6 @@ object srvTraspasos: TsrvTraspasos
     ProcessorOptions = [poAutoGenerateInsert, poAutoGenerateDelete, poPrepareCommands, poIgnoreRowsAffected]
     UpdateMode = updWhereKeyOnly
     Left = 192
-    Top = 152
+    Top = 160
   end
 end

Source/Servidor/AdminPV_Server.rc

@@ -16,7 +16,7 @@ BEGIN
               VALUE "FileVersion", "2.1.1.0\0"
               VALUE "ProductName", "AdminPV_Server\0"
               VALUE "ProductVersion", "2.1.1.0\0"
-              VALUE "CompileDate", "miércoles, 23 de abril de 2008 16:58\0"
+              VALUE "CompileDate", "lunes, 28 de abril de 2008 18:21\0"
          END
     END
     BLOCK "VarFileInfo"