diff --git a/Database/1 - tablas.sql b/Database/1 - tablas.sql
new file mode 100644
index 0000000..b3035f6
--- /dev/null
+++ b/Database/1 - tablas.sql
@@ -0,0 +1,878 @@
+/*--------------- SQL ---------------*/
+
+IF EXISTS (SELECT * FROM sysobjects WHERE id = OBJECT_ID(N'[RDX_CABINV]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
+ DROP TABLE [RDX_CABINV]
+GO
+
+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,
+ [IGNORAR] varchar(1) NULL,
+ [CARGADO] char(1) NULL
+)
+ON [PRIMARY]
+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
+
+CREATE NONCLUSTERED INDEX [RDX_CABINV_idx3] ON [RDX_CABINV]
+ ([IGNORAR])
+ON [PRIMARY]
+GO
+
+GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
+ON [RDX_CABINV]
+TO [public]
+GO
+
+/*--------------- SQL ---------------*/
+
+IF EXISTS (SELECT * FROM sysobjects WHERE id = OBJECT_ID(N'[RDX_LININV]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
+ DROP TABLE [RDX_LININV]
+GO
+
+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
+
+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
+
+GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
+ON [RDX_LININV]
+TO [public]
+GO
+
+/*--------------- SQL ---------------*/
+
+IF EXISTS (SELECT * FROM sysobjects WHERE id = OBJECT_ID(N'[RDX_CANTINV]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
+ DROP TABLE [RDX_CANTINV]
+GO
+
+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
+
+ALTER TABLE [RDX_CANTINV]
+ADD PRIMARY KEY CLUSTERED ([NUMDOC], [NUMLIN], [NUMCANT])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_CANTINV_idx] ON [RDX_CANTINV]
+ ([CENTRO])
+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
+
+GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
+ON [RDX_CANTINV]
+TO [public]
+GO
+
+/*--------------- SQL ---------------*/
+
+IF EXISTS (SELECT * FROM sysobjects WHERE id = OBJECT_ID(N'[RDX_CABVEN]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
+ DROP TABLE [RDX_CABVEN]
+GO
+
+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,
+ [IGNORAR] varchar(1) NULL,
+ [CARGADO] char(1) NULL
+)
+ON [PRIMARY]
+GO
+
+ALTER TABLE [RDX_CABVEN]
+ADD PRIMARY KEY CLUSTERED ([CLAVE1])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_CABVEN_idx] ON [RDX_CABVEN]
+ ([NUMINF])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_CABVEN_idx2] ON [RDX_CABVEN]
+ ([IGNORAR])
+ON [PRIMARY]
+GO
+
+GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
+ON [RDX_CABVEN]
+TO [public]
+GO
+
+/*--------------- SQL ---------------*/
+
+IF EXISTS (SELECT * FROM sysobjects WHERE id = OBJECT_ID(N'[RDX_LUGVEN]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
+ DROP TABLE [RDX_LUGVEN]
+GO
+
+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
+
+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
+
+CREATE NONCLUSTERED INDEX [RDX_LUGVEN_idx] ON [RDX_LUGVEN]
+ ([EANLUG])
+ON [PRIMARY]
+GO
+
+GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
+ON [RDX_LUGVEN]
+TO [public]
+GO
+
+/*--------------- SQL ---------------*/
+
+IF EXISTS (SELECT * FROM sysobjects WHERE id = OBJECT_ID(N'[RDX_ARTVEN]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
+ DROP TABLE [RDX_ARTVEN]
+GO
+
+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
+
+ALTER TABLE [RDX_ARTVEN]
+ADD PRIMARY KEY CLUSTERED ([CLAVE1], [CLAVE2], [CLAVE3])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_ARTVEN_idx] ON [RDX_ARTVEN]
+ ([EANART])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_ARTVEN_idx2] ON [RDX_ARTVEN]
+ ([CODCOM])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_ARTVEN_idx4] ON [RDX_ARTVEN]
+ ([NUMTALON])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_ARTVEN_idx5] ON [RDX_ARTVEN]
+ ([EANVEN])
+ON [PRIMARY]
+GO
+
+GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
+ON [RDX_ARTVEN]
+TO [public]
+GO
+
+/*--------------- SQL ---------------*/
+
+IF EXISTS (SELECT * FROM sysobjects WHERE id = OBJECT_ID(N'[RDX_INFORMES]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
+ DROP TABLE [RDX_INFORMES]
+GO
+
+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
+
+ALTER TABLE [RDX_INFORMES]
+ADD CONSTRAINT [RDX_INFORMES_pk]
+PRIMARY KEY CLUSTERED ([ID])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_INFORMES_idx] ON [RDX_INFORMES]
+ ([CATEGORIA])
+ON [PRIMARY]
+GO
+
+GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
+ON [RDX_INFORMES]
+TO [public]
+GO
+
+/*--------------- SQL ---------------*/
+
+IF EXISTS (SELECT * FROM sysobjects WHERE id = OBJECT_ID(N'[RDX_LOG_CARGA]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
+ DROP TABLE [RDX_LOG_CARGA]
+GO
+
+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
+
+ALTER TABLE [RDX_LOG_CARGA]
+ADD UNIQUE NONCLUSTERED ([ID])
+ON [PRIMARY]
+GO
+
+GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
+ON [RDX_LOG_CARGA]
+TO [public]
+GO
+
+/*--------------- SQL ---------------*/
+
+IF EXISTS (SELECT * FROM sysobjects WHERE id = OBJECT_ID(N'[RDX_REFERENCIA_GENERICA]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
+ DROP TABLE [RDX_REFERENCIA_GENERICA]
+GO
+
+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,
+ [CANVEN] numeric(15, 3) NULL,
+ [CANESP] numeric(15, 3) NULL,
+ [CANVENNET] numeric(15, 3) NULL,
+ [NUMCON] smallint CONSTRAINT [DF__RDX_REFER__NUMCO__28C3F2C0] DEFAULT 0 NOT NULL,
+ [VALVEN] numeric(15, 3) NULL
+)
+ON [PRIMARY]
+GO
+
+ALTER TABLE [RDX_REFERENCIA_GENERICA]
+ADD CONSTRAINT [PK__RDX_REFERENCIA_G__68DE77D5]
+PRIMARY KEY CLUSTERED ([NUMINF], [CLAVE1], [CLAVE2], [CLAVE3], [NUMCON])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_REFERENCIA_GENERICA_idx] ON [RDX_REFERENCIA_GENERICA]
+ ([FECHACAMBIO])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_REFERENCIA_GENERICA_idx2] ON [RDX_REFERENCIA_GENERICA]
+ ([CODIGO_BARRA])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_REFERENCIA_GENERICA_idx3] ON [RDX_REFERENCIA_GENERICA]
+ ([ESTADO])
+ON [PRIMARY]
+GO
+
+GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
+ON [RDX_REFERENCIA_GENERICA]
+TO [public]
+GO
+
+/*--------------- SQL ---------------*/
+
+IF EXISTS (SELECT * FROM sysobjects WHERE id = OBJECT_ID(N'[RDX_AJUSTES_ALBARAN]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
+ DROP TABLE [RDX_AJUSTES_ALBARAN]
+GO
+
+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
+
+ALTER TABLE [RDX_AJUSTES_ALBARAN]
+ADD CONSTRAINT [PK__RDX_AJUSTES_ALBA__1B69F7A2]
+PRIMARY KEY CLUSTERED ([ALBARAN])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_AJUSTES_ALBARAN_idx] ON [RDX_AJUSTES_ALBARAN]
+ ([ESTADO])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_AJUSTES_ALBARAN_idx2] ON [RDX_AJUSTES_ALBARAN]
+ ([CONTABILIZAR])
+ON [PRIMARY]
+GO
+
+GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
+ON [RDX_AJUSTES_ALBARAN]
+TO [public]
+GO
+
+/*--------------- SQL ---------------*/
+
+IF EXISTS (SELECT * FROM sysobjects WHERE id = OBJECT_ID(N'[RDX_AJUSTES_HOJA_DEVOLUCIONES]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
+ DROP TABLE [RDX_AJUSTES_HOJA_DEVOLUCIONES]
+GO
+
+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
+
+ALTER TABLE [RDX_AJUSTES_HOJA_DEVOLUCIONES]
+ADD CONSTRAINT [PK__RDX_AJUSTES_HOJA__483C9E19]
+PRIMARY KEY CLUSTERED ([NUMHOJA])
+ON [PRIMARY]
+GO
+
+GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
+ON [RDX_AJUSTES_HOJA_DEVOLUCIONES]
+TO [public]
+GO
+
+/*--------------- SQL ---------------*/
+
+IF EXISTS (SELECT * FROM sysobjects WHERE id = OBJECT_ID(N'[RDX_DEVOLUCION_AJUSTES]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
+ DROP TABLE [RDX_DEVOLUCION_AJUSTES]
+GO
+
+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
+
+ALTER TABLE [RDX_DEVOLUCION_AJUSTES]
+ADD CONSTRAINT [PK_RDX_DEVOLUCION_AJUSTES_2F70F04A]
+PRIMARY KEY CLUSTERED ([FECHA], [CENTRO], [CODIGO], [COLOR])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_DEVOLUCION_AJUSTES_idx] ON [RDX_DEVOLUCION_AJUSTES]
+ ([APROBADO])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_DEVOLUCION_AJUSTES_idx2] ON [RDX_DEVOLUCION_AJUSTES]
+ ([FECHACAMBIO])
+ON [PRIMARY]
+GO
+
+GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
+ON [RDX_DEVOLUCION_AJUSTES]
+TO [public]
+GO
+
+/*--------------- SQL ---------------*/
+
+IF EXISTS (SELECT * FROM sysobjects WHERE id = OBJECT_ID(N'[RDX_RECEPCION_AJUSTES]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
+ DROP TABLE [RDX_RECEPCION_AJUSTES]
+GO
+
+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
+
+ALTER TABLE [RDX_RECEPCION_AJUSTES]
+ADD CONSTRAINT [PK_RDX_RECEPCION_AJUSTES_2F70F04F]
+PRIMARY KEY CLUSTERED ([FECHA], [CENTRO], [CODIGO], [COLOR])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_RECEPCION_AJUSTES_idx] ON [RDX_RECEPCION_AJUSTES]
+ ([FECHACAMBIO])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_RECEPCION_AJUSTES_idx2] ON [RDX_RECEPCION_AJUSTES]
+ ([APROBADO])
+ON [PRIMARY]
+GO
+
+GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
+ON [RDX_RECEPCION_AJUSTES]
+TO [public]
+GO
+
+/*--------------- SQL ---------------*/
+
+IF EXISTS (SELECT * FROM sysobjects WHERE id = OBJECT_ID(N'[RDX_TRASPASOS_AJUSTES]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
+ DROP TABLE [RDX_TRASPASOS_AJUSTES]
+GO
+
+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
+
+ALTER TABLE [RDX_TRASPASOS_AJUSTES]
+ADD CONSTRAINT [PK_RDX_TRASPASOS_AJUSTES_2F70F04A]
+PRIMARY KEY CLUSTERED ([FECHA], [CENTRO], [CENTRO2], [CODIGO], [COLOR])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_TRASPASOS_AJUSTES_idx] ON [RDX_TRASPASOS_AJUSTES]
+ ([APROBADO])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_TRASPASOS_AJUSTES_idx2] ON [RDX_TRASPASOS_AJUSTES]
+ ([ESTADO])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_TRASPASOS_AJUSTES_idx3] ON [RDX_TRASPASOS_AJUSTES]
+ ([FECHACAMBIO])
+ON [PRIMARY]
+GO
+
+GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
+ON [RDX_TRASPASOS_AJUSTES]
+TO [public]
+GO
+
+/*--------------- SQL ---------------*/
+
+IF EXISTS (SELECT * FROM sysobjects WHERE id = OBJECT_ID(N'[RDX_FILIALES]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
+ DROP TABLE [RDX_FILIALES]
+GO
+
+CREATE TABLE [RDX_FILIALES] (
+ [CODFILIAL] char(6) NULL,
+ [CODBARRA] varchar(17) NULL
+)
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_FILIALES_idx] ON [RDX_FILIALES]
+ ([CODBARRA])
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_FILIALES_idx2] ON [RDX_FILIALES]
+ ([CODFILIAL])
+ON [PRIMARY]
+GO
+
+GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
+ON [RDX_FILIALES]
+TO [public]
+GO
+
+/*--------------- SQL ---------------*/
+
+IF EXISTS (SELECT * FROM sysobjects WHERE id = OBJECT_ID(N'[RDX_TALLAS]') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)
+ DROP TABLE [RDX_TALLAS]
+GO
+
+CREATE TABLE [RDX_TALLAS] (
+ [TALLA] char(2) NOT NULL
+)
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX [RDX_TALLAS_idx] ON [RDX_TALLAS]
+ ([TALLA])
+ON [PRIMARY]
+GO
+
+
+GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
+ON [RDX_TALLAS]
+TO [public]
+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
+
+/* EOF */
+
+
diff --git a/Database/2.1 - vistas inventario.sql b/Database/2.1 - vistas inventario.sql
new file mode 100644
index 0000000..8a62f8f
--- /dev/null
+++ b/Database/2.1 - vistas inventario.sql
@@ -0,0 +1,1028 @@
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_INVENTARIOEDI AS
+SELECT
+ NUMDOC,
+ NUMLIN,
+ NUMCANT,
+ TIPOCANT,
+ FECHA,
+ CENTRO,
+ FILIAL,
+ CODVEN,
+ VENDEDOR,
+ CODIGO_BARRA,
+ CODIGO,
+ PRODUCTO,
+ COLOR,
+ TALLA,
+ CANTIDAD,
+ CENTRO2,
+ FILIAL2,
+ ULTIMO_INVENTARIO
+FROM RDX_INVENTARIOEDI
+WHERE FECHA >= convert(datetime, '20060601', 112) /* PARA NO COGER AÑOS ANTERIORES */
+AND ((IGNORAR IS NULL) OR (IGNORAR <> 'S'))
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_INVENTARIOEDI_PESADA 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
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_ULTIMO_INVENTARIO AS
+SELECT FECHA,
+ CENTRO,
+ FILIAL,
+ CODIGO,
+ PRODUCTO,
+ COLOR,
+ TALLA,
+ SUM(CANTIDAD) AS CANTIDAD
+FROM RDX_INVENTARIOEDI
+WHERE (TIPOCANT = '145') AND
+ (ULTIMO_INVENTARIO IS NOT NULL)
+GROUP BY FECHA,
+ CENTRO,
+ FILIAL,
+ CODIGO,
+ PRODUCTO,
+ COLOR,
+ TALLA
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_INVENTARIO_MAXFECHAS AS
+SELECT
+ CENTRO,
+ CODIGO,
+ COLOR,
+ TALLA,
+ FECHA = MAX(FECHA)
+FROM RDX_INVENTARIOEDI
+WHERE TIPOCANT = 145
+ AND FECHA >= convert(datetime, '20060601', 112) /* PARA NO COGER AÑOS ANTERIORES */
+ AND (IGNORAR IS NULL) OR (IGNORAR <> 'S')
+GROUP BY
+ CENTRO,
+ CODIGO,
+ COLOR,
+ TALLA
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_INVENTARIOEDI_RECEPCION AS
+SELECT
+ NUMDOC,
+ NUMLIN,
+ NUMCANT,
+ TIPOCANT,
+ FECHA,
+ CENTRO,
+ FILIAL,
+ CODVEN,
+ VENDEDOR,
+ CODIGO_BARRA,
+ CODIGO,
+ PRODUCTO,
+ COLOR,
+ TALLA,
+ CANTIDAD
+FROM RDX_V_INVENTARIOEDI
+WHERE TIPOCANT = 194 /* RECEPCION DE PRENDAS DESDE VARELA */
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA AS
+SELECT
+ NUMDOC,
+ NUMLIN,
+ NUMCANT,
+ TIPOCANT,
+ FECHA,
+ CENTRO,
+ FILIAL,
+ CODVEN,
+ VENDEDOR,
+ CODIGO_BARRA,
+ CODIGO,
+ PRODUCTO,
+ COLOR,
+ TALLA,
+ CANTIDAD
+FROM RDX_V_INVENTARIOEDI
+WHERE (TIPOCANT = 61) /* DEVOLUCION DE PRENDAS A VARELA */
+ OR (TIPOCANT = 65) /* DEVOLUCION POR TARA */
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_INVENTARIOEDI_TRASPASO AS
+SELECT
+ NUMDOC,
+ NUMLIN,
+ NUMCANT,
+ TIPOCANT,
+ FECHA,
+ CENTRO,
+ FILIAL,
+ CODVEN,
+ VENDEDOR,
+ CODIGO_BARRA,
+ CODIGO,
+ PRODUCTO,
+ COLOR,
+ TALLA,
+ CANTIDAD,
+ CENTRO2,
+ FILIAL2
+FROM RDX_V_INVENTARIOEDI
+WHERE (TIPOCANT = 46) or (TIPOCANT = 48)
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA AS
+SELECT
+ NUMDOC,
+ NUMLIN,
+ NUMCANT,
+ TIPOCANT,
+ FECHA,
+ CENTRO,
+ FILIAL,
+ CODVEN,
+ VENDEDOR,
+ CODIGO_BARRA,
+ CODIGO,
+ PRODUCTO,
+ COLOR,
+ TALLA,
+ CANTIDAD,
+ CENTRO_ORIGEN = CENTRO2,
+ FILIAL_ORIGEN = FILIAL2
+FROM RDX_V_INVENTARIOEDI
+WHERE TIPOCANT = 46 /* ENTRADA DE PRENDAS DESDE OTRO CENTRO */
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_INVENTARIOEDI_TRASPASO_SALIDA AS
+SELECT
+ NUMDOC,
+ NUMLIN,
+ NUMCANT,
+ TIPOCANT,
+ FECHA,
+ CENTRO,
+ FILIAL,
+ CODVEN,
+ VENDEDOR,
+ CODIGO_BARRA,
+ CODIGO,
+ PRODUCTO,
+ COLOR,
+ TALLA,
+ CANTIDAD,
+ CENTRO_DESTINO = CENTRO2,
+ FILIAL_DESTINO = FILIAL2
+FROM RDX_V_INVENTARIOEDI
+WHERE TIPOCANT = 48 /* SALIDA DE PRENDAS A OTRO CENTRO */
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_TRASPASO_ENTRADA AS
+SELECT
+ CENTRO_ORIGEN = RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.CENTRO_ORIGEN,
+ FILIAL_ORIGEN = RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.FILIAL_ORIGEN,
+
+ CENTRO_DESTINO = RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.CENTRO,
+ FILIAL_DESTINO = RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.FILIAL,
+
+ CODIGO = RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.CODIGO,
+ PRODUCTO = RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.PRODUCTO,
+ COLOR = RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.COLOR,
+ FECHA = RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.FECHA,
+
+ /* CANTIDADES ENVIADAS DESDE EL CENTRO*/
+ T38 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.TALLA = 38 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.CANTIDAD, 0)
+ END),
+ T40 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.TALLA = 40 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.CANTIDAD, 0)
+ END),
+ T42 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.TALLA = 42 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.CANTIDAD, 0)
+ END),
+ T44 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.TALLA = 44 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.CANTIDAD, 0)
+ END),
+ T46 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.TALLA = 46 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.CANTIDAD, 0)
+ END),
+ T48 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.TALLA = 48 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.CANTIDAD, 0)
+ END),
+
+ TOTAL = SUM(ISNULL(RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.CANTIDAD, 0))
+
+FROM
+ RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA
+GROUP BY
+ RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.CENTRO_ORIGEN,
+ RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.FILIAL_ORIGEN,
+ RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.CENTRO,
+ RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.FILIAL,
+ RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.CODIGO,
+ RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.PRODUCTO,
+ RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.COLOR,
+ RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA.FECHA
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_TRASPASO_SALIDA AS
+SELECT
+ CENTRO_ORIGEN = RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.CENTRO,
+ FILIAL_ORIGEN = RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.FILIAL,
+
+ CENTRO_DESTINO = RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.CENTRO_DESTINO,
+ FILIAL_DESTINO = RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.FILIAL_DESTINO,
+
+ CODIGO = RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.CODIGO,
+ PRODUCTO = RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.PRODUCTO,
+ COLOR = RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.COLOR,
+ FECHA = RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.FECHA,
+
+ /* CANTIDADES ENVIADAS DESDE EL CENTRO*/
+ T38 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.TALLA = 38 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.CANTIDAD, 0)
+ END),
+ T40 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.TALLA = 40 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.CANTIDAD, 0)
+ END),
+ T42 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.TALLA = 42 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.CANTIDAD, 0)
+ END),
+ T44 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.TALLA = 44 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.CANTIDAD, 0)
+ END),
+ T46 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.TALLA = 46 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.CANTIDAD, 0)
+ END),
+ T48 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.TALLA = 48 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.CANTIDAD, 0)
+ END),
+
+ TOTAL = SUM(ISNULL(RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.CANTIDAD, 0))
+FROM
+ RDX_V_INVENTARIOEDI_TRASPASO_SALIDA
+GROUP BY
+ RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.CENTRO,
+ RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.FILIAL,
+ RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.CENTRO_DESTINO,
+ RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.FILIAL_DESTINO,
+ RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.CODIGO,
+ RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.PRODUCTO,
+ RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.COLOR,
+ RDX_V_INVENTARIOEDI_TRASPASO_SALIDA.FECHA
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_TRASPASOS AS
+SELECT
+ TIPO = 'S',
+ CENTRO_ORIGEN as CENTRO,
+ FILIAL_ORIGEN as FILIAL,
+ CENTRO_DESTINO as CENTRO2,
+ FILIAL_DESTINO as FILIAL2,
+ CODIGO,
+ PRODUCTO,
+ COLOR,
+ FECHA,
+ T38,
+ T40,
+ T42,
+ T44,
+ T46,
+ T48,
+ TOTAL
+FROM RDX_V_TRASPASO_SALIDA
+UNION
+SELECT
+ 'E',
+ CENTRO_DESTINO,
+ FILIAL_DESTINO,
+ CENTRO_ORIGEN,
+ FILIAL_ORIGEN,
+ CODIGO,
+ PRODUCTO,
+ COLOR,
+ FECHA,
+ T38,
+ T40,
+ T42,
+ T44,
+ T46,
+ T48,
+ TOTAL
+FROM RDX_V_TRASPASO_ENTRADA
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_CONTROL_TRASPASOS AS
+SELECT
+ RDX_V_TRASPASOS.TIPO,
+ RDX_V_TRASPASOS.FECHA,
+ RDX_V_TRASPASOS.CENTRO,
+ RDX_V_TRASPASOS.FILIAL,
+ RDX_V_TRASPASOS.CENTRO2,
+ RDX_V_TRASPASOS.FILIAL2,
+ APROBADO = ISNULL(RDX_TRASPASOS_AJUSTES.APROBADO, 'N'),
+ ESTADO_TRASPASO = RDX_TRASPASOS_AJUSTES.ESTADO,
+ OBSERVACIONES = RDX_TRASPASOS_AJUSTES.OBSERVACIONES,
+ CONTABILIZAR = ISNULL(RDX_TRASPASOS_AJUSTES.CONTABILIZAR, 'S'),
+ RDX_TRASPASOS_AJUSTES.FECHACAMBIO,
+ RDX_V_TRASPASOS.CODIGO,
+ RDX_V_TRASPASOS.PRODUCTO,
+ RDX_V_TRASPASOS.COLOR,
+ RDX_V_TRASPASOS.T38,
+ RDX_V_TRASPASOS.T40,
+ RDX_V_TRASPASOS.T42,
+ RDX_V_TRASPASOS.T44,
+ RDX_V_TRASPASOS.T46,
+ RDX_V_TRASPASOS.T48,
+ RDX_V_TRASPASOS.TOTAL,
+ TR38 = ISNULL(RDX_TRASPASOS_AJUSTES.CANT38, RDX_V_TRASPASOS.T38),
+ TR40 = ISNULL(RDX_TRASPASOS_AJUSTES.CANT40, RDX_V_TRASPASOS.T40),
+ TR42 = ISNULL(RDX_TRASPASOS_AJUSTES.CANT42, RDX_V_TRASPASOS.T42),
+ TR44 = ISNULL(RDX_TRASPASOS_AJUSTES.CANT44, RDX_V_TRASPASOS.T44),
+ 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.CANT38, RDX_V_TRASPASOS.T38), 0) +
+ ISNULL(ISNULL(RDX_TRASPASOS_AJUSTES.CANT40, RDX_V_TRASPASOS.T40), 0) +
+ ISNULL(ISNULL(RDX_TRASPASOS_AJUSTES.CANT42, RDX_V_TRASPASOS.T42), 0) +
+ ISNULL(ISNULL(RDX_TRASPASOS_AJUSTES.CANT44, RDX_V_TRASPASOS.T44), 0) +
+ ISNULL(ISNULL(RDX_TRASPASOS_AJUSTES.CANT46, RDX_V_TRASPASOS.T46), 0) +
+ ISNULL(ISNULL(RDX_TRASPASOS_AJUSTES.CANT48, RDX_V_TRASPASOS.T48), 0)
+FROM RDX_V_TRASPASOS
+LEFT OUTER JOIN RDX_TRASPASOS_AJUSTES ON
+ ((RDX_TRASPASOS_AJUSTES.CENTRO = RDX_V_TRASPASOS.CENTRO) AND
+ (RDX_TRASPASOS_AJUSTES.CENTRO2 = RDX_V_TRASPASOS.CENTRO2) AND
+ (RDX_TRASPASOS_AJUSTES.CODIGO = RDX_V_TRASPASOS.CODIGO) AND
+ (RDX_TRASPASOS_AJUSTES.COLOR = RDX_V_TRASPASOS.COLOR) AND
+ (RDX_TRASPASOS_AJUSTES.FECHA = RDX_V_TRASPASOS.FECHA) AND
+ (RDX_TRASPASOS_AJUSTES.TIPOCANT = RDX_V_TRASPASOS.TIPO))
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_ALBARANES AS
+SELECT
+ FATURAMENTO.NF_SAIDA AS ALBARAN,
+ FATURAMENTO.EMISSAO AS FECHA,
+ RDX_FILIALES.CODBARRA AS CENTRO,
+ FATURAMENTO.NOME_CLIFOR AS FILIAL,
+ PRODUTOS_BARRA.CODIGO_BARRA,
+ FATURAMENTO_PROD.PRODUTO AS CODIGO,
+ PRODUCTO = PRODUTOS.DESC_PRODUTO,
+ PRODUTOS_BARRA.COR_PRODUTO AS COLOR,
+ PRODUTOS_BARRA.GRADE AS TALLA,
+ CANTIDAD = CASE PRODUTOS_BARRA.GRADE
+ WHEN '38' THEN F1
+ WHEN '40' THEN F2
+ WHEN '42' THEN F3
+ WHEN '44' THEN F4
+ WHEN '46' THEN F5
+ WHEN '48' THEN F6
+ END,
+ RDX_AJUSTES_ALBARAN.ESTADO,
+ RDX_AJUSTES_ALBARAN.OBSERVACIONES,
+ CONTABILIZAR = ISNULL(RDX_AJUSTES_ALBARAN.CONTABILIZAR, 'S')
+FROM FATURAMENTO_PROD
+INNER JOIN FATURAMENTO ON
+ ((FATURAMENTO.NF_SAIDA = FATURAMENTO_PROD.NF_SAIDA) AND
+ (FATURAMENTO.SERIE_NF = FATURAMENTO_PROD.SERIE_NF))
+INNER JOIN FATURAMENTO_TIPO ON
+ (LTRIM(RTRIM(FATURAMENTO.TIPO_FATURAMENTO)) = FATURAMENTO_TIPO.TIPO_FATURAMENTO)
+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.F2 <> 0) THEN '40' END) OR
+ (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F3 <> 0) THEN '42' END) OR
+ (PRODUTOS_BARRA.GRADE = CASE WHEN (FATURAMENTO_PROD.F4 <> 0) THEN '44' 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 */
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_RECEPCION AS
+SELECT
+ CENTRO = ISNULL(RDX_V_ALBARANES.CENTRO, RDX_V_INVENTARIOEDI_RECEPCION.CENTRO),
+ FILIAL = ISNULL(RDX_V_ALBARANES.FILIAL, RDX_V_INVENTARIOEDI_RECEPCION.FILIAL),
+ CODIGO = ISNULL(RDX_V_ALBARANES.CODIGO, RDX_V_INVENTARIOEDI_RECEPCION.CODIGO),
+ PRODUCTO = ISNULL(RDX_V_ALBARANES.PRODUCTO, RDX_V_INVENTARIOEDI_RECEPCION.PRODUCTO),
+ COLOR = ISNULL(RDX_V_ALBARANES.COLOR, RDX_V_INVENTARIOEDI_RECEPCION.COLOR),
+ FECHA = ISNULL(RDX_V_ALBARANES.FECHA, RDX_V_INVENTARIOEDI_RECEPCION.FECHA),
+
+ /* ALBARAN Y ESTADO */
+ ALBARAN = RDX_V_ALBARANES.ALBARAN,
+ ESTADO_ALBARAN = RDX_V_ALBARANES.ESTADO,
+ OBSERVACIONES_ALBARAN = RDX_V_ALBARANES.OBSERVACIONES,
+ CONTABILIZAR_ALBARAN = ISNULL(RDX_V_ALBARANES.CONTABILIZAR, 'S'),
+
+ /* CANTIDADES ENVIADAS DESDE VARELA */
+ E38 = SUM(CASE WHEN RDX_V_ALBARANES.TALLA = 38 THEN
+ ISNULL(RDX_V_ALBARANES.CANTIDAD, 0)
+ END),
+ E40 = SUM(CASE WHEN RDX_V_ALBARANES.TALLA = 40 THEN
+ ISNULL(RDX_V_ALBARANES.CANTIDAD, 0)
+ END),
+ E42 = SUM(CASE WHEN RDX_V_ALBARANES.TALLA = 42 THEN
+ ISNULL(RDX_V_ALBARANES.CANTIDAD, 0)
+ END),
+ E44 = SUM(CASE WHEN RDX_V_ALBARANES.TALLA = 44 THEN
+ ISNULL(RDX_V_ALBARANES.CANTIDAD, 0)
+ END),
+ E46 = SUM(CASE WHEN RDX_V_ALBARANES.TALLA = 46 THEN
+ ISNULL(RDX_V_ALBARANES.CANTIDAD, 0)
+ END),
+ E48 = SUM(CASE WHEN RDX_V_ALBARANES.TALLA = 48 THEN
+ ISNULL(RDX_V_ALBARANES.CANTIDAD, 0)
+ END),
+ ENVIADO = SUM(
+ CASE ISNULL(RDX_V_ALBARANES.CONTABILIZAR, 'S')
+ WHEN 'N' THEN 0
+ ELSE ISNULL(RDX_V_ALBARANES.CANTIDAD, 0)
+ END
+ ),
+
+ /* CANTIDADES RECIBIDAS EN EL CENTRO*/
+ R38 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_RECEPCION.TALLA = 38 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.CANTIDAD, 0)
+ END),
+ R40 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_RECEPCION.TALLA = 40 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.CANTIDAD, 0)
+ END),
+ R42 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_RECEPCION.TALLA = 42 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.CANTIDAD, 0)
+ END),
+ R44 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_RECEPCION.TALLA = 44 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.CANTIDAD, 0)
+ END),
+ R46 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_RECEPCION.TALLA = 46 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.CANTIDAD, 0)
+ END),
+ R48 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_RECEPCION.TALLA = 48 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.CANTIDAD, 0)
+ END),
+ RECIBIDO = SUM(ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.CANTIDAD, 0)),
+
+ DIFERENCIA = SUM(
+ CASE ISNULL(RDX_V_ALBARANES.CONTABILIZAR, 'S')
+ WHEN 'N' THEN 0
+ ELSE ISNULL(RDX_V_ALBARANES.CANTIDAD, 0)
+ END
+ ) -
+ SUM(ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.CANTIDAD, 0))
+FROM
+ RDX_V_ALBARANES
+FULL OUTER JOIN RDX_V_INVENTARIOEDI_RECEPCION ON
+ ((RDX_V_INVENTARIOEDI_RECEPCION.CENTRO = RDX_V_ALBARANES.CENTRO) AND
+ (RDX_V_INVENTARIOEDI_RECEPCION.CODIGO_BARRA = RDX_V_ALBARANES.CODIGO_BARRA) AND
+ (RDX_V_INVENTARIOEDI_RECEPCION.FECHA = RDX_V_ALBARANES.FECHA))
+GROUP BY
+ ISNULL(RDX_V_ALBARANES.CENTRO, RDX_V_INVENTARIOEDI_RECEPCION.CENTRO),
+ ISNULL(RDX_V_ALBARANES.FILIAL, RDX_V_INVENTARIOEDI_RECEPCION.FILIAL),
+ ISNULL(RDX_V_ALBARANES.CODIGO, RDX_V_INVENTARIOEDI_RECEPCION.CODIGO),
+ ISNULL(RDX_V_ALBARANES.PRODUCTO, RDX_V_INVENTARIOEDI_RECEPCION.PRODUCTO),
+ ISNULL(RDX_V_ALBARANES.COLOR, RDX_V_INVENTARIOEDI_RECEPCION.COLOR),
+ ISNULL(RDX_V_ALBARANES.FECHA, RDX_V_INVENTARIOEDI_RECEPCION.FECHA),
+ RDX_V_ALBARANES.ALBARAN,
+ RDX_V_ALBARANES.ESTADO,
+ RDX_V_ALBARANES.OBSERVACIONES,
+ ISNULL(RDX_V_ALBARANES.CONTABILIZAR, 'S')
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_CONTROL_RECEPCION AS
+SELECT
+ APROBADO = ISNULL(RDX_RECEPCION_AJUSTES.APROBADO, 'N'),
+ RDX_RECEPCION_AJUSTES.FECHACAMBIO,
+
+ RDX_V_RECEPCION.CENTRO,
+ RDX_V_RECEPCION.FILIAL,
+ RDX_V_RECEPCION.CODIGO,
+ RDX_V_RECEPCION.PRODUCTO,
+ RDX_V_RECEPCION.COLOR,
+ RDX_V_RECEPCION.FECHA,
+
+ /* ALBARAN Y ESTADO */
+ RDX_V_RECEPCION.ALBARAN,
+ RDX_V_RECEPCION.ESTADO_ALBARAN,
+ RDX_V_RECEPCION.OBSERVACIONES_ALBARAN,
+ RDX_V_RECEPCION.CONTABILIZAR_ALBARAN,
+
+ /* CANTIDADES ENVIADAS DESDE VARELA */
+ 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,
+
+ /* CANTIDADES RECIBIDAS RECTIFICADAS */
+ RR38 = ISNULL(RDX_RECEPCION_AJUSTES.CANT38, R38),
+ RR40 = ISNULL(RDX_RECEPCION_AJUSTES.CANT40, R40),
+ RR42 = ISNULL(RDX_RECEPCION_AJUSTES.CANT42, R42),
+ RR44 = ISNULL(RDX_RECEPCION_AJUSTES.CANT44, R44),
+ RR46 = ISNULL(RDX_RECEPCION_AJUSTES.CANT46, R46),
+ RR48 = ISNULL(RDX_RECEPCION_AJUSTES.CANT48, R48),
+
+ RECIBIDO_RECT =
+ ISNULL(RDX_RECEPCION_AJUSTES.CANT38, ISNULL(R38, 0)) +
+ ISNULL(RDX_RECEPCION_AJUSTES.CANT40, ISNULL(R40, 0)) +
+ ISNULL(RDX_RECEPCION_AJUSTES.CANT42, ISNULL(R42, 0)) +
+ ISNULL(RDX_RECEPCION_AJUSTES.CANT44, ISNULL(R44, 0)) +
+ ISNULL(RDX_RECEPCION_AJUSTES.CANT46, ISNULL(R46, 0)) +
+ ISNULL(RDX_RECEPCION_AJUSTES.CANT48, ISNULL(R48, 0)),
+
+ DIFERENCIA =
+ (
+ ISNULL(RDX_RECEPCION_AJUSTES.CANT38, ISNULL(R38, 0)) +
+ ISNULL(RDX_RECEPCION_AJUSTES.CANT40, ISNULL(R40, 0)) +
+ ISNULL(RDX_RECEPCION_AJUSTES.CANT42, ISNULL(R42, 0)) +
+ ISNULL(RDX_RECEPCION_AJUSTES.CANT44, ISNULL(R44, 0)) +
+ ISNULL(RDX_RECEPCION_AJUSTES.CANT46, ISNULL(R46, 0)) +
+ ISNULL(RDX_RECEPCION_AJUSTES.CANT48, ISNULL(R48, 0))
+ ) - ENVIADO
+FROM
+ RDX_V_RECEPCION
+LEFT OUTER JOIN RDX_RECEPCION_AJUSTES ON
+ ((RDX_RECEPCION_AJUSTES.FECHA = RDX_V_RECEPCION.FECHA) AND
+ (RDX_RECEPCION_AJUSTES.CENTRO = RDX_V_RECEPCION.CENTRO) AND
+ (RDX_RECEPCION_AJUSTES.CODIGO = RDX_V_RECEPCION.CODIGO) AND
+ (RDX_RECEPCION_AJUSTES.COLOR = RDX_V_RECEPCION.COLOR))
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_ALBARANES_PENDIENTES AS
+SELECT DISTINCT ALBARAN, APROBADO
+FROM RDX_V_CONTROL_RECEPCION
+WHERE ALBARAN IS NOT NULL
+AND APROBADO = 'N'
+GO
+
+/*--------------- SQL ---------------*/GO
+
+CREATE VIEW RDX_V_CONTROL_RECEPCION_ALBARANES AS
+select RDX_V_CONTROL_RECEPCION.ALBARAN
+,ESTADOALBARAN = CASE
+ WHEN RDX_V_ALBARANES_PENDIENTES.ALBARAN is NULL THEN 'R'
+ ELSE 'P'
+ END
+,ESTADOPRODUCTO = CASE RDX_V_CONTROL_RECEPCION.APROBADO
+ WHEN 'N' THEN 'PENDIENTE'
+ WHEN 'S' THEN 'APROBADO'
+ END
+, CENTRO, FILIAL, FECHA, CODIGO, PRODUCTO, COLOR, 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)
+where RDX_V_CONTROL_RECEPCION.ALBARAN is not null
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_HOJAS_DEVOLUCIONES AS
+SELECT
+ LOJA_SAIDAS.ROMANEIO_PRODUTO AS NUMHOJA,
+ LOJA_SAIDAS.EMISSAO AS FECHA,
+ RDX_FILIALES_ORI.CODBARRA AS CENTRO_ORIGEN,
+ LOJA_SAIDAS.FILIAL AS FILIAL_ORIGEN,
+ RDX_FILIALES_DES.CODBARRA AS CENTRO_DESTINO,
+ LOJA_SAIDAS.FILIAL_DESTINO AS FILIAL_DESTINO,
+ PRODUTOS_BARRA.CODIGO_BARRA,
+ LOJA_SAIDAS_PRODUTO.PRODUTO AS CODIGO,
+ PRODUCTO = ISNULL(PRODUTOS.DESC_PRODUTO, '*** ERROR REFERENCIA ****'),
+ PRODUTOS_BARRA.COR_PRODUTO AS COLOR,
+ PRODUTOS_BARRA.GRADE AS TALLA,
+ CANTIDAD = CASE PRODUTOS_BARRA.GRADE
+ WHEN '38' THEN EN1
+ WHEN '40' THEN EN2
+ WHEN '42' THEN EN3
+ WHEN '44' THEN EN4
+ WHEN '46' THEN EN5
+ WHEN '48' THEN EN6
+ END,
+ 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_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.EN2 <> 0) THEN '40' END) OR
+ (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN3 <> 0) THEN '42' END) OR
+ (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN4 <> 0) THEN '44' END) OR
+ (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN5 <> 0) THEN '46' END) OR
+ (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN6 <> 0) THEN '48' END)))
+INNER JOIN PRODUTOS on (PRODUTOS.PRODUTO = PRODUTOS_BARRA.PRODUTO)
+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)
+INNER JOIN RDX_FILIALES AS RDX_FILIALES_DES ON (RDX_FILIALES_DES.CODFILIAL = FILIAIS_DES.COD_FILIAL)
+LEFT OUTER JOIN RDX_AJUSTES_HOJA_DEVOLUCIONES ON
+ (RDX_AJUSTES_HOJA_DEVOLUCIONES.NUMHOJA = LOJA_SAIDAS.ROMANEIO_PRODUTO)
+WHERE
+ LOJA_SAIDAS.TIPO_ENTRADA_SAIDA = 2 /* DEVOLUCION DE PRENDAS A VARELA */
+AND LOJA_SAIDAS.EMISSAO >= '2006.07.01' /* PARA NO COGER AÑOS ANTERIORES */
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_DEVOLUCIONES AS
+SELECT
+ CENTRO = ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CENTRO_ORIGEN, RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.CENTRO),
+ FILIAL = ISNULL(RDX_V_HOJAS_DEVOLUCIONES.FILIAL_ORIGEN, RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.FILIAL),
+ CODIGO = ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CODIGO, RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.CODIGO),
+ PRODUCTO = ISNULL(RDX_V_HOJAS_DEVOLUCIONES.PRODUCTO, RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.PRODUCTO),
+ COLOR = ISNULL(RDX_V_HOJAS_DEVOLUCIONES.COLOR, RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.COLOR),
+ FECHA = ISNULL(RDX_V_HOJAS_DEVOLUCIONES.FECHA, RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.FECHA),
+
+ /* HOJA DE MOVIMIENTOS Y ESTADO */
+ NUMHOJA = RDX_V_HOJAS_DEVOLUCIONES.NUMHOJA,
+ ESTADO_HOJA = RDX_V_HOJAS_DEVOLUCIONES.ESTADO,
+ OBSERVACIONES_HOJA = RDX_V_HOJAS_DEVOLUCIONES.OBSERVACIONES,
+ CONTABILIZAR_HOJA = ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CONTABILIZAR, 'S'),
+
+ /* CANTIDADES SOLICITADAS DESDE VARELA */
+ S38 = SUM(CASE WHEN RDX_V_HOJAS_DEVOLUCIONES.TALLA = 38 THEN
+ ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CANTIDAD, 0)
+ END),
+ S40 = SUM(CASE WHEN RDX_V_HOJAS_DEVOLUCIONES.TALLA = 40 THEN
+ ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CANTIDAD, 0)
+ END),
+ S42 = SUM(CASE WHEN RDX_V_HOJAS_DEVOLUCIONES.TALLA = 42 THEN
+ ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CANTIDAD, 0)
+ END),
+ S44 = SUM(CASE WHEN RDX_V_HOJAS_DEVOLUCIONES.TALLA = 44 THEN
+ ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CANTIDAD, 0)
+ END),
+ S46 = SUM(CASE WHEN RDX_V_HOJAS_DEVOLUCIONES.TALLA = 46 THEN
+ ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CANTIDAD, 0)
+ END),
+ S48 = SUM(CASE WHEN RDX_V_HOJAS_DEVOLUCIONES.TALLA = 48 THEN
+ ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CANTIDAD, 0)
+ END),
+ SOLICITADO = SUM(
+ CASE ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CONTABILIZAR, 'S')
+ WHEN 'N' THEN 0
+ ELSE ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CANTIDAD, 0)
+ END
+ ),
+
+ /* CANTIDADES ENVIADAS DESDE EL CENTRO*/
+ E38 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.TALLA = 38 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.CANTIDAD, 0)
+ END),
+ E40 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.TALLA = 40 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.CANTIDAD, 0)
+ END),
+ E42 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.TALLA = 42 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.CANTIDAD, 0)
+ END),
+ E44 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.TALLA = 44 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.CANTIDAD, 0)
+ END),
+ E46 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.TALLA = 46 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.CANTIDAD, 0)
+ END),
+ E48 = SUM(CASE WHEN RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.TALLA = 48 THEN
+ ISNULL(RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.CANTIDAD, 0)
+ END),
+
+ ENVIADO = SUM(ISNULL(RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.CANTIDAD, 0)),
+
+ DIFERENCIA = SUM(
+ CASE ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CONTABILIZAR, 'S')
+ WHEN 'N' THEN 0
+ ELSE ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CANTIDAD, 0)
+ END) -
+ SUM(ISNULL(RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.CANTIDAD, 0))
+FROM
+ RDX_V_HOJAS_DEVOLUCIONES
+FULL OUTER JOIN RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA ON
+ ((RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.CENTRO = RDX_V_HOJAS_DEVOLUCIONES.CENTRO_ORIGEN) AND
+ (RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.CODIGO_BARRA = RDX_V_HOJAS_DEVOLUCIONES.CODIGO_BARRA) AND
+ (RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.FECHA = RDX_V_HOJAS_DEVOLUCIONES.FECHA))
+GROUP BY
+ ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CENTRO_ORIGEN, RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.CENTRO),
+ ISNULL(RDX_V_HOJAS_DEVOLUCIONES.FILIAL_ORIGEN, RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.FILIAL),
+ ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CODIGO, RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.CODIGO),
+ ISNULL(RDX_V_HOJAS_DEVOLUCIONES.PRODUCTO, RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.PRODUCTO),
+ ISNULL(RDX_V_HOJAS_DEVOLUCIONES.COLOR, RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.COLOR),
+ ISNULL(RDX_V_HOJAS_DEVOLUCIONES.FECHA, RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA.FECHA),
+ RDX_V_HOJAS_DEVOLUCIONES.NUMHOJA,
+ RDX_V_HOJAS_DEVOLUCIONES.ESTADO,
+ RDX_V_HOJAS_DEVOLUCIONES.OBSERVACIONES,
+ ISNULL(RDX_V_HOJAS_DEVOLUCIONES.CONTABILIZAR, 'S')
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_CONTROL_DEVOLUCIONES AS
+SELECT
+ APROBADO = ISNULL(RDX_DEVOLUCION_AJUSTES.APROBADO, 'N'),
+ RDX_DEVOLUCION_AJUSTES.FECHACAMBIO,
+
+ RDX_V_DEVOLUCIONES.CENTRO,
+ RDX_V_DEVOLUCIONES.FILIAL,
+ RDX_V_DEVOLUCIONES.CODIGO,
+ RDX_V_DEVOLUCIONES.PRODUCTO,
+ RDX_V_DEVOLUCIONES.COLOR,
+ RDX_V_DEVOLUCIONES.FECHA,
+
+ /* HOJA DE MOVIMIENTOS Y ESTADO */
+ RDX_V_DEVOLUCIONES.NUMHOJA,
+ RDX_V_DEVOLUCIONES.ESTADO_HOJA,
+ RDX_V_DEVOLUCIONES.OBSERVACIONES_HOJA,
+ RDX_V_DEVOLUCIONES.CONTABILIZAR_HOJA,
+
+ /* CANTIDADES SOLICITADAS DESDE VARELA */
+ 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,
+
+ /* CANTIDADES ENVIADAS RECTIFICADAS */
+ ER38 = ISNULL(RDX_DEVOLUCION_AJUSTES.CANT38, E38),
+ ER40 = ISNULL(RDX_DEVOLUCION_AJUSTES.CANT40, E40),
+ ER42 = ISNULL(RDX_DEVOLUCION_AJUSTES.CANT42, E42),
+ ER44 = ISNULL(RDX_DEVOLUCION_AJUSTES.CANT44, E44),
+ ER46 = ISNULL(RDX_DEVOLUCION_AJUSTES.CANT46, E46),
+ ER48 = ISNULL(RDX_DEVOLUCION_AJUSTES.CANT48, E48),
+
+ ENVIADO_RECT =
+ ISNULL(RDX_DEVOLUCION_AJUSTES.CANT38, ISNULL(E38, 0)) +
+ ISNULL(RDX_DEVOLUCION_AJUSTES.CANT40, ISNULL(E40, 0)) +
+ ISNULL(RDX_DEVOLUCION_AJUSTES.CANT42, ISNULL(E42, 0)) +
+ ISNULL(RDX_DEVOLUCION_AJUSTES.CANT44, ISNULL(E44, 0)) +
+ ISNULL(RDX_DEVOLUCION_AJUSTES.CANT46, ISNULL(E46, 0)) +
+ ISNULL(RDX_DEVOLUCION_AJUSTES.CANT48, ISNULL(E48, 0)),
+
+ DIFERENCIA =
+ (
+ ISNULL(RDX_DEVOLUCION_AJUSTES.CANT38, ISNULL(E38, 0)) +
+ ISNULL(RDX_DEVOLUCION_AJUSTES.CANT40, ISNULL(E40, 0)) +
+ ISNULL(RDX_DEVOLUCION_AJUSTES.CANT42, ISNULL(E42, 0)) +
+ ISNULL(RDX_DEVOLUCION_AJUSTES.CANT44, ISNULL(E44, 0)) +
+ ISNULL(RDX_DEVOLUCION_AJUSTES.CANT46, ISNULL(E46, 0)) +
+ ISNULL(RDX_DEVOLUCION_AJUSTES.CANT48, ISNULL(E48, 0))
+ ) - SOLICITADO
+FROM
+ RDX_V_DEVOLUCIONES
+LEFT OUTER JOIN RDX_DEVOLUCION_AJUSTES ON
+ ((RDX_DEVOLUCION_AJUSTES.FECHA = RDX_V_DEVOLUCIONES.FECHA) AND
+ (RDX_DEVOLUCION_AJUSTES.CENTRO = RDX_V_DEVOLUCIONES.CENTRO) AND
+ (RDX_DEVOLUCION_AJUSTES.CODIGO = RDX_V_DEVOLUCIONES.CODIGO) AND
+ (RDX_DEVOLUCION_AJUSTES.COLOR = RDX_V_DEVOLUCIONES.COLOR))
+GO
+
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_RECEPCION_AJUSTES_DESGLOSADO AS
+SELECT
+ RDX_RECEPCION_AJUSTES.FECHA,
+ RDX_RECEPCION_AJUSTES.CENTRO,
+ FILIAL = ISNULL(FILIAIS.FILIAL, RDX_RECEPCION_AJUSTES.CENTRO),
+ RDX_RECEPCION_AJUSTES.CODIGO,
+ PRODUCTO = PRODUTOS.DESC_PRODUTO,
+ RDX_RECEPCION_AJUSTES.COLOR,
+ RDX_TALLAS.TALLA,
+ CANTIDAD = CASE RDX_TALLAS.TALLA
+ WHEN '38' THEN RDX_RECEPCION_AJUSTES.CANT38
+ WHEN '40' THEN RDX_RECEPCION_AJUSTES.CANT40
+ WHEN '42' THEN RDX_RECEPCION_AJUSTES.CANT42
+ WHEN '44' THEN RDX_RECEPCION_AJUSTES.CANT44
+ WHEN '46' THEN RDX_RECEPCION_AJUSTES.CANT46
+ WHEN '48' THEN RDX_RECEPCION_AJUSTES.CANT48
+ END
+FROM RDX_TALLAS, RDX_RECEPCION_AJUSTES
+LEFT OUTER JOIN RDX_FILIALES ON (RDX_FILIALES.CODBARRA = RDX_RECEPCION_AJUSTES.CENTRO)
+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 '38' THEN RDX_RECEPCION_AJUSTES.CANT38
+ WHEN '40' THEN RDX_RECEPCION_AJUSTES.CANT40
+ WHEN '42' THEN RDX_RECEPCION_AJUSTES.CANT42
+ WHEN '44' THEN RDX_RECEPCION_AJUSTES.CANT44
+ WHEN '46' THEN RDX_RECEPCION_AJUSTES.CANT46
+ WHEN '48' THEN RDX_RECEPCION_AJUSTES.CANT48
+ END IS NOT NULL
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_CONTROL_RECEPCION_DESGLOSADO AS
+SELECT
+ FECHA = ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.FECHA, RDX_V_RECEPCION_AJUSTES_DESGLOSADO.FECHA),
+ CENTRO = ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.CENTRO, RDX_V_RECEPCION_AJUSTES_DESGLOSADO.CENTRO),
+ FILIAL = ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.FILIAL, RDX_V_RECEPCION_AJUSTES_DESGLOSADO.FILIAL),
+ CODIGO = ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.CODIGO, RDX_V_RECEPCION_AJUSTES_DESGLOSADO.CODIGO),
+ PRODUCTO = ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.PRODUCTO, RDX_V_RECEPCION_AJUSTES_DESGLOSADO.PRODUCTO),
+ COLOR = ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.COLOR, RDX_V_RECEPCION_AJUSTES_DESGLOSADO.COLOR),
+ TALLA = ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.TALLA, RDX_V_RECEPCION_AJUSTES_DESGLOSADO.TALLA),
+ CANTIDAD = SUM(ISNULL(RDX_V_RECEPCION_AJUSTES_DESGLOSADO.CANTIDAD, RDX_V_INVENTARIOEDI_RECEPCION.CANTIDAD))
+FROM
+ RDX_V_RECEPCION_AJUSTES_DESGLOSADO
+FULL OUTER JOIN RDX_V_INVENTARIOEDI_RECEPCION ON
+ (RDX_V_RECEPCION_AJUSTES_DESGLOSADO.FECHA = RDX_V_INVENTARIOEDI_RECEPCION.FECHA) AND
+ (RDX_V_RECEPCION_AJUSTES_DESGLOSADO.CENTRO = RDX_V_INVENTARIOEDI_RECEPCION.CENTRO) AND
+ (RDX_V_RECEPCION_AJUSTES_DESGLOSADO.CODIGO = RDX_V_INVENTARIOEDI_RECEPCION.CODIGO) AND
+ (RDX_V_RECEPCION_AJUSTES_DESGLOSADO.COLOR = RDX_V_INVENTARIOEDI_RECEPCION.COLOR) AND
+ (RDX_V_RECEPCION_AJUSTES_DESGLOSADO.TALLA = RDX_V_INVENTARIOEDI_RECEPCION.TALLA)
+GROUP BY
+ ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.FECHA, RDX_V_RECEPCION_AJUSTES_DESGLOSADO.FECHA),
+ ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.CENTRO, RDX_V_RECEPCION_AJUSTES_DESGLOSADO.CENTRO),
+ ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.FILIAL, RDX_V_RECEPCION_AJUSTES_DESGLOSADO.FILIAL),
+ ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.CODIGO, RDX_V_RECEPCION_AJUSTES_DESGLOSADO.CODIGO),
+ ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.PRODUCTO, RDX_V_RECEPCION_AJUSTES_DESGLOSADO.PRODUCTO),
+ ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.COLOR, RDX_V_RECEPCION_AJUSTES_DESGLOSADO.COLOR),
+ ISNULL(RDX_V_INVENTARIOEDI_RECEPCION.TALLA, RDX_V_RECEPCION_AJUSTES_DESGLOSADO.TALLA)
+GO
+
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO AS
+SELECT
+ RDX_DEVOLUCION_AJUSTES.FECHA,
+ RDX_DEVOLUCION_AJUSTES.CENTRO,
+ FILIAL = ISNULL(FILIAIS.FILIAL, RDX_DEVOLUCION_AJUSTES.CENTRO),
+ RDX_DEVOLUCION_AJUSTES.CODIGO,
+ PRODUCTO = PRODUTOS.DESC_PRODUTO,
+ RDX_DEVOLUCION_AJUSTES.COLOR,
+ RDX_TALLAS.TALLA,
+ CANTIDAD = CASE RDX_TALLAS.TALLA
+ WHEN '38' THEN RDX_DEVOLUCION_AJUSTES.CANT38
+ WHEN '40' THEN RDX_DEVOLUCION_AJUSTES.CANT40
+ WHEN '42' THEN RDX_DEVOLUCION_AJUSTES.CANT42
+ WHEN '44' THEN RDX_DEVOLUCION_AJUSTES.CANT44
+ WHEN '46' THEN RDX_DEVOLUCION_AJUSTES.CANT46
+ WHEN '48' THEN RDX_DEVOLUCION_AJUSTES.CANT48
+ END
+FROM RDX_TALLAS, RDX_DEVOLUCION_AJUSTES
+LEFT OUTER JOIN RDX_FILIALES ON (RDX_FILIALES.CODBARRA = RDX_DEVOLUCION_AJUSTES.CENTRO)
+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 '38' THEN RDX_DEVOLUCION_AJUSTES.CANT38
+ WHEN '40' THEN RDX_DEVOLUCION_AJUSTES.CANT40
+ WHEN '42' THEN RDX_DEVOLUCION_AJUSTES.CANT42
+ WHEN '44' THEN RDX_DEVOLUCION_AJUSTES.CANT44
+ WHEN '46' THEN RDX_DEVOLUCION_AJUSTES.CANT46
+ WHEN '48' THEN RDX_DEVOLUCION_AJUSTES.CANT48
+ END IS NOT NULL
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_HOJAS_TRASPASOS AS
+SELECT
+ LOJA_SAIDAS.ROMANEIO_PRODUTO AS NUMHOJA,
+ LOJA_SAIDAS.EMISSAO AS FECHA,
+ RDX_FILIALES_ORI.CODBARRA AS CENTRO_ORIGEN,
+ LOJA_SAIDAS.FILIAL AS FILIAL_ORIGEN,
+ RDX_FILIALES_DES.CODBARRA AS CENTRO_DESTINO,
+ LOJA_SAIDAS.FILIAL_DESTINO AS FILIAL_DESTINO,
+ PRODUTOS_BARRA.CODIGO_BARRA,
+ LOJA_SAIDAS_PRODUTO.PRODUTO AS CODIGO,
+ PRODUCTO = ISNULL(PRODUTOS.DESC_PRODUTO, '*** ERROR REFERENCIA ****'),
+ PRODUTOS_BARRA.COR_PRODUTO AS COLOR,
+ PRODUTOS_BARRA.GRADE AS TALLA,
+ CANTIDAD = CASE PRODUTOS_BARRA.GRADE
+ WHEN '38' THEN EN1
+ WHEN '40' THEN EN2
+ WHEN '42' THEN EN3
+ WHEN '44' THEN EN4
+ WHEN '46' THEN EN5
+ WHEN '48' THEN EN6
+ END
+FROM LOJA_SAIDAS_PRODUTO
+INNER JOIN LOJA_SAIDAS ON (LOJA_SAIDAS.ROMANEIO_PRODUTO = LOJA_SAIDAS_PRODUTO.ROMANEIO_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.EN2 <> 0) THEN '40' END) OR
+ (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN3 <> 0) THEN '42' END) OR
+ (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN4 <> 0) THEN '44' END) OR
+ (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN5 <> 0) THEN '46' END) OR
+ (PRODUTOS_BARRA.GRADE = CASE WHEN (LOJA_SAIDAS_PRODUTO.EN6 <> 0) THEN '48' END)))
+INNER JOIN PRODUTOS on (PRODUTOS.PRODUTO = PRODUTOS_BARRA.PRODUTO)
+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)
+INNER JOIN RDX_FILIALES AS RDX_FILIALES_DES ON (RDX_FILIALES_DES.CODFILIAL = FILIAIS_DES.COD_FILIAL)
+WHERE LOJA_SAIDAS.TIPO_ENTRADA_SAIDA = 1 /* TRASPASOS DE PRENDAS A OTRO CENTRO */
+AND LOJA_SAIDAS.EMISSAO >= '2006.07.01' /* PARA NO COGER AÑOS ANTERIORES */
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_TRASPASOS_AJUSTES_DESGLOSADO AS
+SELECT
+ RDX_TRASPASOS_AJUSTES.FECHA,
+ RDX_TRASPASOS_AJUSTES.CENTRO,
+ FILIAL = ISNULL(FILIAIS.FILIAL, RDX_TRASPASOS_AJUSTES.CENTRO),
+ RDX_TRASPASOS_AJUSTES.CENTRO2,
+ FILIAL2 = ISNULL(FILIAIS2.FILIAL, RDX_TRASPASOS_AJUSTES.CENTRO2),
+ TIPO = RDX_TRASPASOS_AJUSTES.TIPOCANT,
+ RDX_TRASPASOS_AJUSTES.CODIGO,
+ PRODUCTO = PRODUTOS.DESC_PRODUTO,
+ RDX_TRASPASOS_AJUSTES.COLOR,
+ RDX_TALLAS.TALLA,
+ CANTIDAD = CASE RDX_TALLAS.TALLA
+ WHEN '38' THEN RDX_TRASPASOS_AJUSTES.CANT38
+ WHEN '40' THEN RDX_TRASPASOS_AJUSTES.CANT40
+ WHEN '42' THEN RDX_TRASPASOS_AJUSTES.CANT42
+ WHEN '44' THEN RDX_TRASPASOS_AJUSTES.CANT44
+ WHEN '46' THEN RDX_TRASPASOS_AJUSTES.CANT46
+ WHEN '48' THEN RDX_TRASPASOS_AJUSTES.CANT48
+ END
+FROM RDX_TALLAS, RDX_TRASPASOS_AJUSTES
+LEFT OUTER JOIN RDX_FILIALES ON (RDX_FILIALES.CODBARRA = RDX_TRASPASOS_AJUSTES.CENTRO)
+LEFT OUTER JOIN FILIAIS ON (FILIAIS.COD_FILIAL = RDX_FILIALES.CODFILIAL)
+LEFT OUTER JOIN RDX_FILIALES AS RDX_FILIALES2 ON (RDX_FILIALES2.CODBARRA = RDX_TRASPASOS_AJUSTES.CENTRO2)
+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 '38' THEN RDX_TRASPASOS_AJUSTES.CANT38
+ WHEN '40' THEN RDX_TRASPASOS_AJUSTES.CANT40
+ WHEN '42' THEN RDX_TRASPASOS_AJUSTES.CANT42
+ WHEN '44' THEN RDX_TRASPASOS_AJUSTES.CANT44
+ WHEN '46' THEN RDX_TRASPASOS_AJUSTES.CANT46
+ WHEN '48' THEN RDX_TRASPASOS_AJUSTES.CANT48
+ END IS NOT NULL
+GO
+
+/* EOF */
diff --git a/Database/2.2 - vistas ventas.sql b/Database/2.2 - vistas ventas.sql
new file mode 100644
index 0000000..d2edf4f
--- /dev/null
+++ b/Database/2.2 - vistas ventas.sql
@@ -0,0 +1,284 @@
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_VENTASEDI AS
+SELECT
+ NUMINF,
+ CLAVE1,
+ CLAVE2,
+ CLAVE3,
+ PERVENINI,
+ NUMTALON,
+ EANLUG,
+ FILIAL,
+ EANVEN,
+ CODVEN,
+ VENDEDOR,
+ EANART,
+ CODCOM,
+ PRODUTO,
+ DESC_PRODUTO,
+ COR_PRODUTO,
+ GRADE,
+ TIPO_PRODUTO,
+ GRUPO_PRODUTO,
+ DESC_COLECAO,
+ VALVEN,
+ CANVEN,
+ CANDEV,
+ CANVENNET,
+ CANESP,
+ IGNORAR
+FROM RDX_VENTASEDI
+WHERE (IGNORAR IS NULL) OR (IGNORAR <> 'S')
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_VENTASEDI_PESADA
+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)
+WHERE (RDX_CABVEN.IGNORAR IS NULL) OR (RDX_CABVEN.IGNORAR <> 'S')
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_REFERENCIAS_RESUELTAS
+AS
+SELECT *
+FROM RDX_REFERENCIA_GENERICA
+WHERE ESTADO = 'R'
+GO
+
+/*--------------- SQL ---------------*/
+
+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),
+ PRODUTOS.COLECAO,
+ 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
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_VENTASEDI_ERRONEAS
+AS
+SELECT
+*
+FROM
+ RDX_V_VENTASEDI
+WHERE PRODUTO = '107CH.EN.01'
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_REFERENCIA_GENERICA
+AS
+SELECT DISTINCT
+ VENTAS.NUMINF,
+ VENTAS.CLAVE1,
+ VENTAS.CLAVE2,
+ VENTAS.CLAVE3,
+ NUMCON = ISNULL(REF.NUMCON, 0),
+ 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),
+ VTAPROCESO = ISNULL(REF.CANESP, VENTAS.CANESP),
+ VTAFINAL = ISNULL(REF.CANVENNET, VENTAS.CANVENNET),
+ VTATERM = ISNULL(REF.CANVEN, VENTAS.CANVEN),
+ VALTOT = ISNULL(REF.VALVEN, 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
+
+/*--------------- SQL ---------------*/
+
+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,
+ 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
+
+/*--------------- SQL ---------------*/
+
+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
+
+/*--------------- SQL ---------------*/
+
+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,
+ 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,
+
+ VTATERMDEV = ISNULL(CANVEN, 0),
+ VTAFINALRESC = ISNULL(CANVENNET, 0),
+
+ 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),
+
+ VALTERMDEV = CASE WHEN (CANVEN <> 0) THEN ISNULL(VALVEN, 0) ELSE 0 END,
+ VALFINALRESC = CASE WHEN (CANVENNET <> 0) THEN ISNULL(VALVEN, 0) ELSE 0 END,
+
+ 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 */
+AND ((CANVENNET >= 0) OR (CANVENNET IS NULL)) /* IGNORAR LAS RESCISIONES DE V.PROCESO */
+GO
+
+/* EOF */
diff --git a/Database/2.3 - vistas stock.sql b/Database/2.3 - vistas stock.sql
new file mode 100644
index 0000000..44cb859
--- /dev/null
+++ b/Database/2.3 - vistas stock.sql
@@ -0,0 +1,579 @@
+/*--------------- SQL ---------------*/
+
+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 = PRODUTOS.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)
+WHERE FILIAL LIKE '%VARELA IMAGEN Y DISEÑO%'
+GO
+
+/*--------------- SQL ---------------*/
+
+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.CENTRO, ISNULL(RDX_V_RECEPCION_AJUSTES_DESGLOSADO.CENTRO, ISNULL(RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.CENTRO, RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.CENTRO))),
+ FILIAL = 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))),
+ 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_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)
+GO
+
+/*--------------- SQL ---------------*/
+
+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,
+ EANLUG AS CENTRO,
+ FILIAL AS FILIAL,
+ CODIGO = ISNULL(PRODUTO, '107CH.EN.01'),
+ DESC_PRODUTO AS PRODUCTO,
+ GRUPO_PRODUTO AS GRUPOPRODUCTO,
+ TIPO_PRODUTO AS TIPOPRODUCTO,
+ COLECAO AS COLECCION,
+ COLOR = ISNULL(COR_PRODUTO, '300'),
+ GRADE AS TALLA,
+ CANTIDAD = ISNULL(CANVEN, 0)
+ +
+ CASE
+ WHEN ISNULL(CANVENNET, 0) < 0 THEN
+ ISNULL(CANVENNET, 0)
+ ELSE 0
+ END
+ +
+ ISNULL(CANESP, 0)
+FROM
+ RDX_V_VENTASEDI_RESUELTAS
+WHERE NOT ((DESC_PRODUTO LIKE '%ERROR REFERENCIA%') AND ((VALVEN < 1) AND (VALVEN > 0))) /* QUITAR COMPOSTURAS */
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_STOCK AS
+SELECT
+ CENTRO = ISNULL(RDX_V_STOCK_INVENTARIO.CENTRO, RDX_V_STOCK_VENTAS.CENTRO),
+ FILIAL = ISNULL(RDX_V_STOCK_INVENTARIO.FILIAL, RDX_V_STOCK_VENTAS.FILIAL),
+ 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 = PRODUTOS.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 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),
+
+ 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 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),
+
+ 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 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),
+
+ 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 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),
+
+ 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 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),
+
+ 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 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),
+
+ 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 > 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 > 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 > 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 > 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 > 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 > 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))
+GROUP BY
+ ISNULL(RDX_V_STOCK_INVENTARIO.CENTRO, RDX_V_STOCK_VENTAS.CENTRO),
+ ISNULL(RDX_V_STOCK_INVENTARIO.FILIAL, RDX_V_STOCK_VENTAS.FILIAL),
+ 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,
+ PRODUTOS.COLECAO,
+ ISNULL(RDX_V_STOCK_INVENTARIO.COLOR, RDX_V_STOCK_VENTAS.COLOR)
+GO
+
+/*--------------- SQL ---------------*/
+
+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
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_STOCK_CALCULADO_DESGLOSADO AS
+SELECT CENTRO,
+ CODIGO,
+ PRODUCTO,
+ TIPO_PRODUCTO,
+ GRUPO_PRODUCTO,
+ COLECCION,
+ COLOR,
+ RDX_TALLAS.TALLA,
+ CANTIDAD = CASE RDX_TALLAS.TALLA
+ WHEN '38' THEN RDX_V_STOCK_CALCULADO.K38
+ WHEN '40' THEN RDX_V_STOCK_CALCULADO.K40
+ WHEN '42' THEN RDX_V_STOCK_CALCULADO.K42
+ WHEN '44' THEN RDX_V_STOCK_CALCULADO.K44
+ WHEN '46' THEN RDX_V_STOCK_CALCULADO.K46
+ WHEN '48' THEN RDX_V_STOCK_CALCULADO.K48
+ END
+
+FROM RDX_TALLAS, RDX_V_STOCK_CALCULADO
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_INVENTARIO_STOCK_DESGLOSADO AS
+SELECT
+ ISNULL(RDX_V_STOCK_CALCULADO_DESGLOSADO.CENTRO, RDX_V_ULTIMO_INVENTARIO.FILIAL) as CENTRO,
+ ISNULL(RDX_V_STOCK_CALCULADO_DESGLOSADO.CODIGO, RDX_V_ULTIMO_INVENTARIO.CODIGO) as CODIGO,
+ ISNULL(RDX_V_STOCK_CALCULADO_DESGLOSADO.PRODUCTO, RDX_V_ULTIMO_INVENTARIO.PRODUCTO) as PRODUCTO,
+ ISNULL(RDX_V_STOCK_CALCULADO_DESGLOSADO.COLOR, RDX_V_ULTIMO_INVENTARIO.COLOR) as COLOR,
+ ISNULL(RDX_V_STOCK_CALCULADO_DESGLOSADO.TALLA, RDX_V_ULTIMO_INVENTARIO.TALLA) as TALLA,
+
+ RDX_V_STOCK_CALCULADO_DESGLOSADO.TIPO_PRODUCTO,
+ RDX_V_STOCK_CALCULADO_DESGLOSADO.GRUPO_PRODUCTO,
+ RDX_V_STOCK_CALCULADO_DESGLOSADO.COLECCION,
+
+ RDX_V_STOCK_CALCULADO_DESGLOSADO.CANTIDAD as CANTIDAD_STOCK,
+ RDX_V_ULTIMO_INVENTARIO.CANTIDAD as CANTIDAD_INVENTARIO
+
+FROM RDX_V_ULTIMO_INVENTARIO
+FULL OUTER JOIN RDX_V_STOCK_CALCULADO_DESGLOSADO ON
+(RDX_V_ULTIMO_INVENTARIO.FILIAL = RDX_V_STOCK_CALCULADO_DESGLOSADO.CENTRO)
+AND (RDX_V_ULTIMO_INVENTARIO.CODIGO = RDX_V_STOCK_CALCULADO_DESGLOSADO.CODIGO)
+AND (RDX_V_ULTIMO_INVENTARIO.COLOR = RDX_V_STOCK_CALCULADO_DESGLOSADO.COLOR)
+AND (RDX_V_ULTIMO_INVENTARIO.TALLA = RDX_V_STOCK_CALCULADO_DESGLOSADO.TALLA)
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_INVENTARIO_STOCK AS
+select
+ CENTRO,
+ CODIGO,
+ PRODUCTO,
+ COLOR,
+ TIPO_PRODUCTO,
+ GRUPO_PRODUCTO,
+ COLECCION,
+ I38 = SUM(CASE TALLA
+ WHEN '38' THEN
+ CANTIDAD_INVENTARIO
+ ELSE 0
+ END)
+
+ ,I40 = SUM(CASE TALLA
+ WHEN '40' THEN
+ CANTIDAD_INVENTARIO
+ ELSE 0
+ END)
+
+ ,I42 = SUM(CASE TALLA
+ WHEN '42' THEN
+ CANTIDAD_INVENTARIO
+ ELSE 0
+ END)
+
+ ,I44 = SUM(CASE TALLA
+ WHEN '44' THEN
+ CANTIDAD_INVENTARIO
+ ELSE 0
+ END)
+
+ ,I46 = SUM(CASE TALLA
+ WHEN '46' THEN
+ CANTIDAD_INVENTARIO
+ ELSE 0
+ END)
+
+ ,I48 = SUM(CASE TALLA
+ WHEN '48' THEN
+ CANTIDAD_INVENTARIO
+ ELSE 0
+ END)
+
+ ,K38 = SUM(CASE TALLA
+ WHEN '38' THEN
+ CANTIDAD_STOCK
+ ELSE 0
+ END)
+
+ ,K40 = SUM(CASE TALLA
+ WHEN '40' THEN
+ CANTIDAD_STOCK
+ ELSE 0
+ END)
+
+ ,K42 = SUM(CASE TALLA
+ WHEN '42' THEN
+ CANTIDAD_STOCK
+ ELSE 0
+ END)
+
+ ,K44 = SUM(CASE TALLA
+ WHEN '44' THEN
+ CANTIDAD_STOCK
+ ELSE 0
+ END)
+
+ ,K46 = SUM(CASE TALLA
+ WHEN '46' THEN
+ CANTIDAD_STOCK
+ ELSE 0
+ END)
+
+ ,K48 = SUM(CASE TALLA
+ WHEN '48' THEN
+ CANTIDAD_STOCK
+ ELSE 0
+ END)
+
+from RDX_V_INVENTARIO_STOCK_DESGLOSADO
+
+group by CENTRO,
+ CODIGO,
+ PRODUCTO,
+ COLOR,
+ TIPO_PRODUCTO,
+ GRUPO_PRODUCTO,
+ COLECCION
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE VIEW RDX_V_CONTROL_INVENTARIO AS
+SELECT
+ CENTRO,
+ CODIGO,
+ PRODUCTO,
+ COLOR,
+ TIPO_PRODUCTO,
+ GRUPO_PRODUCTO,
+ COLECCION,
+
+ I38,
+ I40,
+ I42,
+ I44,
+ I46,
+ I48,
+ TI = ISNULL(I38, 0) + ISNULL(I40, 0) + ISNULL(I42, 0) + ISNULL(I44, 0) + ISNULL(I46, 0) + ISNULL(I48, 0),
+
+ K38,
+ K40,
+ K42,
+ K44,
+ K46,
+ K48,
+ TK = ISNULL(K38, 0) + ISNULL(K40, 0) + ISNULL(K42, 0) + ISNULL(K44, 0) + ISNULL(K46, 0) + ISNULL(K48, 0),
+
+ D38 = ISNULL(I38, 0) - ISNULL(K38, 0),
+ D40 = ISNULL(I40, 0) - ISNULL(K40, 0),
+ D42 = ISNULL(I42, 0) - ISNULL(K42, 0),
+ D44 = ISNULL(I44, 0) - ISNULL(K44, 0),
+ D46 = ISNULL(I46, 0) - ISNULL(K46, 0),
+ D48 = ISNULL(I48, 0) - ISNULL(K48, 0),
+ DT = ISNULL(I38, 0) - ISNULL(K38, 0) + ISNULL(I40, 0) - ISNULL(K40, 0) +
+ ISNULL(I42, 0) - ISNULL(K42, 0) + ISNULL(I44, 0) - ISNULL(K44, 0) +
+ ISNULL(I46, 0) - ISNULL(K46, 0) + ISNULL(I48, 0) - ISNULL(K48, 0)
+
+FROM RDX_V_INVENTARIO_STOCK
+where ((ISNULL(I38, 0) - ISNULL(K38, 0) + ISNULL(I40, 0) - ISNULL(K40, 0) +
+ ISNULL(I42, 0) - ISNULL(K42, 0) + ISNULL(I44, 0) - ISNULL(K44, 0) +
+ ISNULL(I46, 0) - ISNULL(K46, 0) + ISNULL(I48, 0) - ISNULL(K48, 0)) <> 0)
+
+GO
+/* EOF */
diff --git a/Database/3 - procedimientos.sql b/Database/3 - procedimientos.sql
new file mode 100644
index 0000000..11c1189
--- /dev/null
+++ b/Database/3 - procedimientos.sql
@@ -0,0 +1,176 @@
+/*--------------- SQL ---------------*/
+
+CREATE PROCEDURE crosstab
+ @select varchar(8000),
+ @sumfunc varchar(100),
+ @pivot varchar(100),
+ @table varchar(100)
+AS
+
+ DECLARE @sql varchar(8000), @delim varchar(1)
+ SET NOCOUNT ON
+ SET ANSI_WARNINGS OFF
+
+ EXEC ('SELECT ' + @pivot + ' AS pivot INTO ##pivot FROM ' + @table + ' WHERE 1=2')
+ EXEC ('INSERT INTO ##pivot SELECT DISTINCT ' + @pivot + ' FROM ' + @table + ' WHERE ' + @pivot + ' Is Not Null')
+
+ SELECT @sql='', @sumfunc=stuff(@sumfunc, len(@sumfunc), 1, ' END)' )
+
+ SELECT @delim=CASE Sign( CharIndex('char', data_type)+CharIndex('date', data_type) )
+ WHEN 0 THEN '' ELSE '''' END
+ FROM tempdb.information_schema.columns
+ WHERE table_name='##pivot' AND column_name='pivot'
+
+ SELECT @sql=@sql + '''' + convert(varchar(100), pivot) + ''' = ' + stuff(@sumfunc,charindex( '(', @sumfunc )+1, 0, ' CASE ' + @pivot + ' WHEN ' + @delim + convert(varchar(100), pivot) + @delim + ' THEN ' ) + ', ' FROM ##pivot
+
+ DROP TABLE ##pivot
+
+ SELECT @sql=left(@sql, len(@sql)-1)
+ SELECT @select=stuff(@select, charindex(' FROM ', @select)+1, 0, ', ' + @sql + ' ')
+
+ EXEC (@select)
+ SET ANSI_WARNINGS ON
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE PROCEDURE RDX_P_CARGAR_INVENTARIOEDI
+AS
+BEGIN
+ INSERT INTO RDX_INVENTARIOEDI (
+ NUMDOC, NUMLIN, NUMCANT, TIPOCANT, FECHA, CENTRO, FILIAL, CODVEN,
+ VENDEDOR, CODIGO_BARRA, CODIGO, PRODUCTO, COLOR, TALLA, CANTIDAD,
+ CENTRO2, FILIAL2, IGNORAR )
+ 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),
+ RDX_CABINV.IGNORAR
+ 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.CARGADO IS NULL
+
+ UPDATE RDX_CABINV SET
+ CARGADO = 1
+ WHERE CARGADO IS NULL
+END
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE PROCEDURE RDX_P_CARGAR_VENTASEDI
+AS
+BEGIN
+ INSERT INTO RDX_VENTASEDI (
+ NUMINF, CLAVE1, CLAVE2, CLAVE3, PERVENINI, NUMTALON, EANLUG,
+ FILIAL, EANVEN, CODVEN, VENDEDOR, EANART, CODCOM, PRODUTO,
+ DESC_PRODUTO, COR_PRODUTO, GRADE, TIPO_PRODUTO, GRUPO_PRODUTO,
+ DESC_COLECAO, VALVEN, CANVEN, CANDEV, CANVENNET, CANESP )
+ 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)
+ WHERE RDX_CABVEN.CARGADO IS NULL
+
+
+ UPDATE RDX_CABVEN SET
+ CARGADO = 1
+ WHERE CARGADO IS NULL
+END
+GO
+
+/*--------------- SQL ---------------*/
+
+CREATE PROCEDURE RDX_P_SET_ULTIMOINVENTARIO
+AS
+BEGIN
+ DECLARE @CENTRO VARCHAR(17),
+ @CODIGO VARCHAR(12),
+ @COLOR VARCHAR(10),
+ @TALLA VARCHAR(8),
+ @FECHA DATETIME,
+ @UPDATECMD VARCHAR(255)
+
+ DECLARE ASD CURSOR FOR
+ SELECT RTRIM(CENTRO), RTRIM(CODIGO), RTRIM(COLOR), RTRIM(TALLA), FECHA
+ FROM RDX_V_INVENTARIO_MAXFECHAS
+ OPEN ASD
+ FETCH NEXT FROM ASD INTO @CENTRO, @CODIGO, @COLOR, @TALLA, @FECHA
+
+ IF @@ROWCOUNT >= 0
+ BEGIN
+ WHILE @@FETCH_STATUS = 0
+ BEGIN
+ UPDATE RDX_INVENTARIOEDI SET ULTIMO_INVENTARIO=NULL
+ WHERE CENTRO = @CENTRO AND CODIGO = @CODIGO AND COLOR = @COLOR AND TALLA = @TALLA
+
+ UPDATE RDX_INVENTARIOEDI SET ULTIMO_INVENTARIO=1
+ WHERE FECHA = CONVERT(VARCHAR, @FECHA, 112) AND CENTRO = @CENTRO AND CODIGO = @CODIGO AND COLOR = @COLOR AND TALLA = @TALLA AND TIPOCANT = 145
+
+ FETCH NEXT FROM ASD INTO @CENTRO, @CODIGO, @COLOR, @TALLA, @FECHA
+ END
+ END
+ CLOSE ASD
+ DEALLOCATE ASD
+END
+GO
+
+/* EOF */
\ No newline at end of file
diff --git a/Database/Script Datos.sql b/Database/ANTERIOR/Script Datos.sql
similarity index 89%
rename from Database/Script Datos.sql
rename to Database/ANTERIOR/Script Datos.sql
index f752f14..0a98c3d 100644
--- a/Database/Script Datos.sql
+++ b/Database/ANTERIOR/Script Datos.sql
@@ -4,19 +4,6 @@ CREATE USER [usuario_gft]
WITH DEFAULT_SCHEMA = [dbo]
GO
---------------- SQL ---------------
-CREATE TABLE [RDX_FILIALES] (
- [CODFILIAL] char(6) NULL,
- [CODBARRA] varchar(17) NULL
-)
-ON [PRIMARY]
-GO
-
-GRANT SELECT, INSERT, DELETE, REFERENCES, UPDATE
-ON [RDX_FILIALES]
-TO [public]
-GO
-
COMMIT
GO
diff --git a/Database/Script Tablas.sql b/Database/ANTERIOR/Script Tablas.sql
similarity index 100%
rename from Database/Script Tablas.sql
rename to Database/ANTERIOR/Script Tablas.sql
diff --git a/Database/Script Vistas INVRPT.sql b/Database/ANTERIOR/Script Vistas INVRPT.sql
similarity index 100%
rename from Database/Script Vistas INVRPT.sql
rename to Database/ANTERIOR/Script Vistas INVRPT.sql
diff --git a/Database/Script Vistas STOCK.sql b/Database/ANTERIOR/Script Vistas STOCK.sql
similarity index 100%
rename from Database/Script Vistas STOCK.sql
rename to Database/ANTERIOR/Script Vistas STOCK.sql
diff --git a/Database/Script Vistas.sql b/Database/ANTERIOR/Script Vistas.sql
similarity index 100%
rename from Database/Script Vistas.sql
rename to Database/ANTERIOR/Script Vistas.sql
diff --git a/Database/SCRIPT MEJORAS TABLAS.SQL b/Database/SCRIPT MEJORAS TABLAS.SQL
new file mode 100644
index 0000000..769a8be
--- /dev/null
+++ b/Database/SCRIPT MEJORAS TABLAS.SQL
@@ -0,0 +1,473 @@
+IF EXISTS (SELECT * FROM sysobjects WHERE id = OBJECT_ID(N'[FK__RDX_LUGVE__CLAVE__4A59F0B5]') AND OBJECTPROPERTY(id, N'IsForeignKey') = 1)
+ ALTER TABLE [RDX_LUGVEN]
+ DROP CONSTRAINT [FK__RDX_LUGVE__CLAVE__4A59F0B5]
+GO
+
+--
+-- Dropping foreign key FK__RDX_ARTVEN__56BFC79A :
+--
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[FK__RDX_ARTVEN__56BFC79A]') AND OBJECTPROPERTY(id, N'IsForeignKey') = 1)
+ ALTER TABLE [dbo].[RDX_ARTVEN]
+ DROP CONSTRAINT [FK__RDX_ARTVEN__56BFC79A]
+GO
+
+ALTER TABLE [RDX_CABINV]
+ADD [CARGADO]char(1) NULL
+GO
+
+ALTER TABLE [RDX_CABVEN]
+ADD [CARGADO]char(1) NULL
+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
+
+
+
+/*--------------- SQL ---------------*/
+
+CREATE PROCEDURE RDX_P_CARGAR_INVENTARIOEDI
+AS
+BEGIN
+ INSERT INTO RDX_INVENTARIOEDI (
+ NUMDOC, NUMLIN, NUMCANT, TIPOCANT, FECHA, CENTRO, FILIAL, CODVEN,
+ VENDEDOR, CODIGO_BARRA, CODIGO, PRODUCTO, COLOR, TALLA, CANTIDAD,
+ CENTRO2, FILIAL2, IGNORAR )
+ 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),
+ RDX_CABINV.IGNORAR
+ 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.CARGADO IS NULL
+
+ UPDATE RDX_CABINV SET
+ CARGADO = 1
+ WHERE CARGADO IS NULL
+END
+go
+
+/*--------------- SQL ---------------*/
+
+CREATE PROCEDURE RDX_P_CARGAR_VENTASEDI
+AS
+BEGIN
+ INSERT INTO RDX_VENTASEDI (
+ NUMINF, CLAVE1, CLAVE2, CLAVE3, PERVENINI, NUMTALON, EANLUG,
+ FILIAL, EANVEN, CODVEN, VENDEDOR, EANART, CODCOM, PRODUTO,
+ DESC_PRODUTO, COR_PRODUTO, GRADE, TIPO_PRODUTO, GRUPO_PRODUTO,
+ DESC_COLECAO, VALVEN, CANVEN, CANDEV, CANVENNET, CANESP )
+ 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)
+ WHERE RDX_CABVEN.CARGADO IS NULL
+
+
+ UPDATE RDX_CABVEN SET
+ CARGADO = 1
+ WHERE CARGADO IS NULL
+END
+go
+
+/*--------------- SQL ---------------*/
+
+CREATE PROCEDURE RDX_P_SET_ULTIMOINVENTARIO
+AS
+BEGIN
+ DECLARE @CENTRO VARCHAR(17),
+ @CODIGO VARCHAR(12),
+ @COLOR VARCHAR(10),
+ @TALLA VARCHAR(8),
+ @FECHA DATETIME,
+ @UPDATECMD VARCHAR(255)
+
+ DECLARE ASD CURSOR FOR
+ SELECT RTRIM(CENTRO), RTRIM(CODIGO), RTRIM(COLOR), RTRIM(TALLA), FECHA
+ FROM RDX_V_INVENTARIO_MAXFECHAS
+ OPEN ASD
+ FETCH NEXT FROM ASD INTO @CENTRO, @CODIGO, @COLOR, @TALLA, @FECHA
+
+ IF @@ROWCOUNT >= 0
+ BEGIN
+ WHILE @@FETCH_STATUS = 0
+ BEGIN
+ UPDATE RDX_INVENTARIOEDI SET ULTIMO_INVENTARIO=NULL
+ WHERE CENTRO = @CENTRO AND CODIGO = @CODIGO AND COLOR = @COLOR AND TALLA = @TALLA
+
+ UPDATE RDX_INVENTARIOEDI SET ULTIMO_INVENTARIO=1
+ WHERE FECHA = CONVERT(VARCHAR, @FECHA, 112) AND CENTRO = @CENTRO AND CODIGO = @CODIGO AND COLOR = @COLOR AND TALLA = @TALLA AND TIPOCANT = 145
+
+ FETCH NEXT FROM ASD INTO @CENTRO, @CODIGO, @COLOR, @TALLA, @FECHA
+ END
+ END
+ CLOSE ASD
+ DEALLOCATE ASD
+END
+go
+
+
+/* borrar vistas */
+
+
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_ALBARANES]'))
+DROP VIEW [dbo].[RDX_V_ALBARANES]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_HOJAS_DEVOLUCIONES]'))
+DROP VIEW [dbo].[RDX_V_HOJAS_DEVOLUCIONES]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_HOJAS_TRASPASOS]'))
+DROP VIEW [dbo].[RDX_V_HOJAS_TRASPASOS]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_INVENTARIOEDI]'))
+DROP VIEW [dbo].[RDX_V_INVENTARIOEDI]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_INVENTARIOEDI_TRASPASO]'))
+DROP VIEW [dbo].[RDX_V_INVENTARIOEDI_TRASPASO]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_DEVOLUCIONES]'))
+DROP VIEW [dbo].[RDX_V_DEVOLUCIONES]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_CONTROL_DEVOLUCIONES]'))
+DROP VIEW [dbo].[RDX_V_CONTROL_DEVOLUCIONES]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_CONTROL_TRASPASOS]'))
+DROP VIEW [dbo].[RDX_V_CONTROL_TRASPASOS]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_CONTROL_RECEPCION_DESGLOSADO]'))
+DROP VIEW [dbo].[RDX_V_CONTROL_RECEPCION_DESGLOSADO]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_STOCK_VARELA]'))
+DROP VIEW [dbo].[RDX_V_STOCK_VARELA]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_STOCK]'))
+DROP VIEW [dbo].[RDX_V_STOCK]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_CONTROL_RECEPCION_ALBARANES]'))
+DROP VIEW [dbo].[RDX_V_CONTROL_RECEPCION_ALBARANES]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_INVENTARIO_STOCK_DESGLOSADO]'))
+DROP VIEW [dbo].[RDX_V_INVENTARIO_STOCK_DESGLOSADO]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_CONTROL_INVENTARIO]'))
+DROP VIEW [dbo].[RDX_V_CONTROL_INVENTARIO]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_VENTASTERMINADAS]'))
+DROP VIEW [dbo].[RDX_V_VENTASTERMINADAS]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_VENTASPROCESO]'))
+DROP VIEW [dbo].[RDX_V_VENTASPROCESO]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_VENTASPROCESOPENDIENTES]'))
+DROP VIEW [dbo].[RDX_V_VENTASPROCESOPENDIENTES]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_VENTASEDI]'))
+DROP VIEW [dbo].[RDX_V_VENTASEDI]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_REFERENCIA_GENERICA]'))
+DROP VIEW [dbo].[RDX_V_REFERENCIA_GENERICA]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA]'))
+DROP VIEW [dbo].[RDX_V_INVENTARIOEDI_DEVOLUCION_Y_TARA]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_TRASPASOS]'))
+DROP VIEW [dbo].[RDX_V_TRASPASOS]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_STOCK_VENTAS]'))
+DROP VIEW [dbo].[RDX_V_STOCK_VENTAS]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_STOCK_INVENTARIO]'))
+DROP VIEW [dbo].[RDX_V_STOCK_INVENTARIO]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_ALBARANES_PENDIENTES]'))
+DROP VIEW [dbo].[RDX_V_ALBARANES_PENDIENTES]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_ULTIMO_INVENTARIO]'))
+DROP VIEW [dbo].[RDX_V_ULTIMO_INVENTARIO]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_STOCK_CALCULADO_DESGLOSADO]'))
+DROP VIEW [dbo].[RDX_V_STOCK_CALCULADO_DESGLOSADO]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_INVENTARIO_STOCK]'))
+DROP VIEW [dbo].[RDX_V_INVENTARIO_STOCK]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_VENTASEDI_ERRONEAS]'))
+DROP VIEW [dbo].[RDX_V_VENTASEDI_ERRONEAS]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_TRASPASO_ENTRADA]'))
+DROP VIEW [dbo].[RDX_V_TRASPASO_ENTRADA]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_TRASPASO_SALIDA]'))
+DROP VIEW [dbo].[RDX_V_TRASPASO_SALIDA]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_RECEPCION_AJUSTES_DESGLOSADO]'))
+DROP VIEW [dbo].[RDX_V_RECEPCION_AJUSTES_DESGLOSADO]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_VENTASEDI_RESUELTAS]'))
+DROP VIEW [dbo].[RDX_V_VENTASEDI_RESUELTAS]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_TRASPASOS_AJUSTES_DESGLOSADO]'))
+DROP VIEW [dbo].[RDX_V_TRASPASOS_AJUSTES_DESGLOSADO]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO]'))
+DROP VIEW [dbo].[RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_CONTROL_RECEPCION]'))
+DROP VIEW [dbo].[RDX_V_CONTROL_RECEPCION]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_INVENTARIO_MAXFECHAS]'))
+DROP VIEW [dbo].[RDX_V_INVENTARIO_MAXFECHAS]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_STOCK_CALCULADO]'))
+DROP VIEW [dbo].[RDX_V_STOCK_CALCULADO]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA]'))
+DROP VIEW [dbo].[RDX_V_INVENTARIOEDI_TRASPASO_ENTRADA]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_INVENTARIOEDI_TRASPASO_SALIDA]'))
+DROP VIEW [dbo].[RDX_V_INVENTARIOEDI_TRASPASO_SALIDA]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_RECEPCION]'))
+DROP VIEW [dbo].[RDX_V_RECEPCION]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_REFERENCIAS_RESUELTAS]'))
+DROP VIEW [dbo].[RDX_V_REFERENCIAS_RESUELTAS]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_INVENTARIOEDI_RECEPCION]'))
+DROP VIEW [dbo].[RDX_V_INVENTARIOEDI_RECEPCION]
+go
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_INVENTARIOEDI_PESADA]'))
+DROP VIEW [dbo].[RDX_V_INVENTARIOEDI_PESADA]
+GO
+IF EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'[dbo].[RDX_V_VENTASEDI_PESADA]'))
+DROP VIEW [dbo].[RDX_V_VENTASEDI_PESADA]
+GO
+
+
diff --git a/Database/Varela-2007-08-01.zip b/Database/Varela-2007-08-01.zip
deleted file mode 100644
index 08c8f08..0000000
Binary files a/Database/Varela-2007-08-01.zip and /dev/null differ
diff --git a/Database/__Script mejoras.sql b/Database/__Script mejoras.sql
new file mode 100644
index 0000000..21f90d7
--- /dev/null
+++ b/Database/__Script mejoras.sql
@@ -0,0 +1,434 @@
+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
+)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Output/Cliente/AdminPV.exe b/Output/Cliente/AdminPV.exe
index d40d544..addaf1e 100644
Binary files a/Output/Cliente/AdminPV.exe and b/Output/Cliente/AdminPV.exe differ
diff --git a/Output/Cliente/CargaEDI.exe b/Output/Cliente/CargaEDI.exe
index bf59a54..a33ff1e 100644
Binary files a/Output/Cliente/CargaEDI.exe and b/Output/Cliente/CargaEDI.exe differ
diff --git a/Output/Servidor/AdminPV_Server.exe b/Output/Servidor/AdminPV_Server.exe
index d3427ee..7e6e7ce 100644
Binary files a/Output/Servidor/AdminPV_Server.exe and b/Output/Servidor/AdminPV_Server.exe differ
diff --git a/Source/AdminPVGroup.bpg b/Source/AdminPVGroup.bpg
index 776be41..722af4b 100644
--- a/Source/AdminPVGroup.bpg
+++ b/Source/AdminPVGroup.bpg
@@ -9,10 +9,10 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
DCC = $(ROOT)\bin\dcc32.exe $**
BRCC = $(ROOT)\bin\brcc32.exe $**
#------------------------------------------------------------------------------
-PROJECTS = DataAbstract_D7.bpl BaseD7.bpl ControlesBaseD7.bpl Usuarios.bpl \
- Configuracion.bpl FicherosEDI.bpl VentasTerminadas.bpl VentasProceso.bpl \
- ReferenciaGenerica.bpl Recepciones.bpl Devoluciones.bpl Traspasos.bpl Stock.bpl \
- AdminPV.exe AdminPV_Server.exe CargaEDI.exe
+PROJECTS = DataAbstract_D7.bpl BaseD7.bpl ControlesBaseD7.bpl Parametros.bpl \
+ Usuarios.bpl Configuracion.bpl FicherosEDI.bpl VentasTerminadas.bpl \
+ VentasProceso.bpl ReferenciaGenerica.bpl Recepciones.bpl Devoluciones.bpl \
+ Traspasos.bpl Stock.bpl AdminPV.exe AdminPV_Server.exe CargaEDI.exe
#------------------------------------------------------------------------------
default: $(PROJECTS)
#------------------------------------------------------------------------------
@@ -66,4 +66,7 @@ Traspasos.bpl: Modulos\Traspasos\Cliente\Traspasos.dpk
Stock.bpl: Modulos\Stock\Cliente\Stock.dpk
$(DCC)
+Parametros.bpl: Modulos\Parametros\Cliente\Parametros.dpk
+ $(DCC)
+
diff --git a/Source/Base/BaseD7.dof b/Source/Base/BaseD7.dof
index 96676d8..6f6c56e 100644
--- a/Source/Base/BaseD7.dof
+++ b/Source/Base/BaseD7.dof
@@ -140,15 +140,27 @@ T:\BPL_D7\dxPSCoreD7.bpl=ExpressPrinting System by Developer Express Inc.
[HistoryLists\hlUnitAliases]
Count=1
Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+[HistoryLists\hlSearchPath]
+Count=3
+Item0=..\Lib
+Item1=..\Lib;..\Base
+Item2=..\..\..\Lib
[HistoryLists\hlUnitOutputDirectory]
Count=1
Item0=.\
-[HistoryLists\hlBPLOutput]
-Count=1
+[HistoryLists\hlOutputDirectorry]
+Count=2
Item0=..\..\Output\Cliente
-[HistoryLists\hlDCPOutput]
-Count=1
+Item1=..\..\Output\Servidor
+[HistoryLists\hlBPLOutput]
+Count=3
Item0=..\Lib
+Item1=..\..\..\..\Output\Cliente
+Item2=..\..\Output\Cliente
+[HistoryLists\hlDCPOutput]
+Count=2
+Item0=..\Lib
+Item1=..\..\..\Lib
[Exception Log]
EurekaLog Version=519
Activate=1
diff --git a/Source/CargaEDI/CargaEDI.dof b/Source/CargaEDI/CargaEDI.dof
index c2df716..75a90da 100644
--- a/Source/CargaEDI/CargaEDI.dof
+++ b/Source/CargaEDI/CargaEDI.dof
@@ -113,8 +113,8 @@ RootDir=C:\Archivos de programa\Borland\Delphi7\Bin\
IncludeVerInfo=1
AutoIncBuild=0
MajorVer=1
-MinorVer=0
-Release=0
+MinorVer=1
+Release=1
Build=0
Debug=0
PreRelease=0
@@ -126,7 +126,7 @@ CodePage=1252
[Version Info Keys]
CompanyName=
FileDescription=
-FileVersion=1.0.0.0
+FileVersion=1.1.1.0
InternalName=
LegalCopyright=
LegalTrademarks=
@@ -141,9 +141,10 @@ T:\BPL_D7\dxPSCoreD7.bpl=ExpressPrinting System by Developer Express Inc.
Count=1
Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
[HistoryLists\hlSearchPath]
-Count=2
+Count=3
Item0=..\Lib
-Item1=..\..\..\Lib
+Item1=..\Lib;..\Base
+Item2=..\..\..\Lib
[HistoryLists\hlUnitOutputDirectory]
Count=1
Item0=.\
diff --git a/Source/CargaEDI/CargaEDI.res b/Source/CargaEDI/CargaEDI.res
index 9317914..5385745 100644
Binary files a/Source/CargaEDI/CargaEDI.res and b/Source/CargaEDI/CargaEDI.res differ
diff --git a/Source/Cliente/AdminPV.cfg b/Source/Cliente/AdminPV.cfg
index 80307b5..e4b793b 100644
--- a/Source/Cliente/AdminPV.cfg
+++ b/Source/Cliente/AdminPV.cfg
@@ -40,7 +40,6 @@
-O"..\Lib"
-I"..\Lib"
-R"..\Lib"
--DEUREKALOG;EUREKALOG_VER5
-LUBaseD7;Configuracion;ControlesBaseD7;Usuarios;FicherosEDI;VentasProceso;VentasTerminadas;ReferenciaGenerica
-w-UNSAFE_TYPE
-w-UNSAFE_CODE
diff --git a/Source/Cliente/AdminPV.dof b/Source/Cliente/AdminPV.dof
index 3550d0d..105bdb6 100644
--- a/Source/Cliente/AdminPV.dof
+++ b/Source/Cliente/AdminPV.dof
@@ -96,7 +96,7 @@ PackageDLLOutputDir=..\Lib
PackageDCPOutputDir=..\Lib
SearchPath=..\Lib
Packages=BaseD7;Configuracion;ControlesBaseD7;Usuarios;FicherosEDI;VentasProceso;VentasTerminadas;ReferenciaGenerica
-Conditionals=EUREKALOG;EUREKALOG_VER5
+Conditionals=
DebugSourceDirs=
UsePackages=1
[Parameters]
@@ -114,7 +114,7 @@ IncludeVerInfo=1
AutoIncBuild=0
MajorVer=1
MinorVer=1
-Release=0
+Release=1
Build=0
Debug=0
PreRelease=0
@@ -126,7 +126,7 @@ CodePage=1252
[Version Info Keys]
CompanyName=Rodax Software S.L.
FileDescription=
-FileVersion=1.1.0.0
+FileVersion=1.1.1.0
InternalName=Administración de puntos de venta
LegalCopyright=
LegalTrademarks=
@@ -137,24 +137,21 @@ Comments=
[Excluded Packages]
c:\archivos de programa\borland\delphi7\Bin\designdgm70.bpl=Borland Module Diagram Editview
T:\BPL_D7\dxPSCoreD7.bpl=ExpressPrinting System by Developer Express Inc.
-[HistoryLists\hlConditionals]
-Count=1
-Item0=EUREKALOG;EUREKALOG_VER5
[HistoryLists\hlUnitAliases]
Count=1
Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
[HistoryLists\hlSearchPath]
Count=3
-Item0=..\Lib;..\Base
-Item1=..\Lib
+Item0=..\Lib
+Item1=..\Lib;..\Base
Item2=..\..\..\Lib
[HistoryLists\hlUnitOutputDirectory]
Count=1
Item0=.\
[HistoryLists\hlOutputDirectorry]
Count=2
-Item0=..\..\Output\Servidor
-Item1=..\..\Output\Cliente
+Item0=..\..\Output\Cliente
+Item1=..\..\Output\Servidor
[HistoryLists\hlBPLOutput]
Count=3
Item0=..\Lib
@@ -166,7 +163,7 @@ Item0=..\Lib
Item1=..\..\..\Lib
[Exception Log]
EurekaLog Version=519
-Activate=1
+Activate=0
Activate Handle=1
Save Log File=1
Foreground Tab=0
diff --git a/Source/Cliente/AdminPV.dpr b/Source/Cliente/AdminPV.dpr
index 9946450..e50b5c9 100644
--- a/Source/Cliente/AdminPV.dpr
+++ b/Source/Cliente/AdminPV.dpr
@@ -1,7 +1,6 @@
program AdminPV;
uses
- ExceptionLog,
Forms,
uLoginForm,
uPantallaPrincipal in 'uPantallaPrincipal.pas' {fPantallaPrincipal},
diff --git a/Source/Cliente/AdminPV.res b/Source/Cliente/AdminPV.res
index 2761c63..ed2e3bc 100644
Binary files a/Source/Cliente/AdminPV.res and b/Source/Cliente/AdminPV.res differ
diff --git a/Source/ControlesBase/Cliente/Bak/uViewControlesBase_TreeView.dfm b/Source/ControlesBase/Cliente/Bak/uViewControlesBase_TreeView.dfm
deleted file mode 100644
index 017ce3e..0000000
--- a/Source/ControlesBase/Cliente/Bak/uViewControlesBase_TreeView.dfm
+++ /dev/null
@@ -1,369 +0,0 @@
-inherited frViewControlesBase: TfrViewControlesBase
- object cxTreeList: TcxDBTreeList
- Left = 0
- Top = 0
- Width = 296
- Height = 216
- BorderStyle = cxcbsNone
- Align = alClient
- Bands = <
- item
- Options.Sizing = False
- end
- item
- end>
- BufferedPaint = True
- DataController.DataSource = dsDataTable
- DataController.ParentField = 'ID'
- DataController.KeyField = 'ID'
- DefaultRowHeight = 18
- OptionsCustomizing.BandCustomizing = False
- OptionsCustomizing.BandHorzSizing = False
- OptionsCustomizing.BandMoving = False
- OptionsCustomizing.BandVertSizing = False
- OptionsCustomizing.ColumnCustomizing = False
- OptionsCustomizing.ColumnHorzSizing = False
- OptionsCustomizing.ColumnMoving = False
- OptionsCustomizing.ColumnVertSizing = False
- OptionsCustomizing.DynamicSizing = True
- OptionsCustomizing.RowSizing = True
- OptionsData.Editing = False
- OptionsData.Deleting = False
- OptionsData.CheckHasChildren = False
- OptionsSelection.CellSelect = False
- OptionsView.CellAutoHeight = True
- OptionsView.CellEndEllipsis = True
- OptionsView.ScrollBars = ssVertical
- OptionsView.Buttons = False
- OptionsView.ColumnAutoWidth = True
- OptionsView.Headers = False
- OptionsView.ShowRoot = False
- RootValue = -1
- TabOrder = 0
- object cxDBTreeListICONO: TcxDBTreeListColumn
- PropertiesClassName = 'TcxImageComboBoxProperties'
- Properties.Alignment.Horz = taCenter
- Properties.Images = ReportImages
- Properties.Items = <
- item
- ImageIndex = 0
- Value = 1
- end
- item
- ImageIndex = 1
- Value = 2
- end
- item
- ImageIndex = 2
- Value = 3
- end
- item
- Value = 0
- end
- item
- ImageIndex = 3
- Value = 4
- end
- item
- ImageIndex = 4
- Value = 5
- end
- item
- ImageIndex = 5
- Value = 6
- end
- item
- ImageIndex = 6
- Value = 7
- end
- item
- ImageIndex = 7
- Value = 8
- end>
- Properties.LargeImages = ReportImages
- Properties.MultiLineText = True
- Properties.ReadOnly = True
- DataBinding.FieldName = 'ICONO'
- Width = 45
- Position.ColIndex = 0
- Position.LineCount = 2
- Position.RowIndex = 0
- Position.BandIndex = 0
- end
- object cxDBTreeListORDEN: TcxDBTreeListColumn
- Visible = False
- DataBinding.FieldName = 'ORDEN'
- Options.Sizing = False
- Width = 45
- Position.ColIndex = 0
- Position.RowIndex = 1
- Position.BandIndex = 0
- end
- object cxDBTreeListNOMBRE: TcxDBTreeListColumn
- PropertiesClassName = 'TcxTextEditProperties'
- Properties.Alignment.Vert = taBottomJustify
- DataBinding.FieldName = 'NOMBRE'
- Width = 588
- Position.ColIndex = 0
- Position.RowIndex = 0
- Position.BandIndex = 1
- end
- object cxDBTreeListDESCRIPCION: TcxDBTreeListColumn
- PropertiesClassName = 'TcxTextEditProperties'
- DataBinding.FieldName = 'DESCRIPCION'
- Width = 588
- Position.ColIndex = 0
- Position.RowIndex = 1
- Position.BandIndex = 1
- end
- object cxDBTreeListDUMMY: TcxDBTreeListColumn
- Width = 588
- Position.ColIndex = 0
- Position.RowIndex = 2
- Position.BandIndex = 1
- end
- end
- object cxStyleRepository1: TcxStyleRepository
- Left = 80
- Top = 96
- object cxStyleTITULO: TcxStyle
- AssignedValues = [svFont, svTextColor]
- Font.Charset = DEFAULT_CHARSET
- Font.Color = clWindowText
- Font.Height = -12
- Font.Name = 'MS Sans Serif'
- Font.Style = [fsBold]
- TextColor = clActiveCaption
- end
- object cxStyleDESCRIPCION: TcxStyle
- end
- object cxStyle1: TcxStyle
- AssignedValues = [svColor, svTextColor]
- Color = clHighlight
- TextColor = clHighlightText
- end
- end
- object ReportImages: TPngImageList
- Height = 28
- Width = 28
- PngImages = <
- item
- PngImage.Data = {
- 89504E470D0A1A0A0000000D494844520000001C0000001C0806000000720DDF
- 940000000970485973000017120000171201679FD252000002024944415478DA
- BDD5DB2E03411800E0E923B870E1CE9D085A940B823894D2489C4FAFE101BC80
- 8444840B89B3D4A954292D8A2855DD5655EB14E205A4570E09BAFB9B5944C7A1
- B335F87727F3CFBF93F976B3995D1500A0FF0C553468D93A9107A4F6D6A8313E
- E4F33597AFCBE74BDED93384FCF67E5534F0F181287061F3186A4AD27E74E746
- AB80921213507B471785C604CD1B21A82D4DFF1138B1B48F325393D175F88642
- FF0494F01A46AB07156853D0EDFD0385C604E71D41A82BCB880B1325098922A0
- 699B80CAF2D2D1E35384420F6C7DAA6FC1B9F523A8D7A9E3C6483F6BF7A2EEBE
- B14F736282A6F50034E834716392847B51425BDE2B74777F87C2E1B03C6770C2
- C200D73058CE06BFC23ED64C36171B9C5D3D84C68A4C6E8CD4CC6B6E363863F7
- 43933E8B1B23F9A2C3C306A7ED07D0ACCFE6C6486EDD14D8E094CD072D955A0A
- 227B8C0550B5D7F1AAD3A7005CC16095961B23BD63D7CF062757BCD05A95C38D
- C95BC41D6083C66501DA0CB9DC18694E21A800B40AD062C8E1C6445C77F9426C
- 107FF1F13BCCE5C622B8F71C9E28031B2BB4DC18C97DC1333638BEE8863A5D36
- 738F452FFC0ED278E0F4820D8E59F6A0A6348B1B237342E797CAC0EA620D3746
- 421138BAE0024391861B530C8E9877A1B250CD8D290687E777405FA0E6C61483
- 43734E28CFCF90FF65BF114C70D0B40DBD0393BF82BD454CF03FE219EFD39C05
- A47A98E90000000049454E44AE426082}
- Name = 'PngImage0'
- Background = clWindow
- end
- item
- PngImage.Data = {
- 89504E470D0A1A0A0000000D494844520000001C0000001C0806000000720DDF
- 940000000970485973000017120000171201679FD252000002CB4944415478DA
- BDD36F4813711807F0EF4984F5A68108254249648689A961334B8C95342CAD4C
- 222D5F66607F2C825E1426B504090A7B636446A00605A624A4258A664EF1DFA6
- 0E97298D72AED3306FCB68A277D7EE3776E9727AB7AB1E381EF8DDFD9ECFEFB9
- E78EE2791EFF33286F90A228E0DA171EB737504AB37E3D48F1DD34A865415556
- 13CF3CD5504AF2AB660D765D3E8F804F15E8A86644F40FF0597D2F59385B69C7
- 8353EBFCCA8FD24611929F8B840C15A0676076AA60187720DBC1514B8227B471
- A0624AC01B2ECACA6CDF05D43C2FC39EE4740C6487E2C0B77982093134F51D21
- 012C7C82728373D5F160344D639AF90A477E0A8269777D130D9C1126F6374096
- E3F0AE220FEF9D3BA056AB0926849DF901AAF028268C3CC17CCE500EE8C1E2F7
- 6F4780B5074F8C6A6C8DD84C30A1539D4E07ABD5EAFB2B5D0816D78CAF08AA1D
- 3A119B9C9B01373F8B86E15472CF1B53D4A177671E8C9918839331E2B82E14C1
- 918761785DAA1C94825D2D2AC3E3AA97CA416F6C62D60E8E9D857DD226621DDD
- 83A86DEC940F2E35C38533F3850987AA6BEAF2BF43E11FE3381EED95CB77D6DE
- 35409E13C0FA961EFF407F3096E5F1A6AD573EE8C15896C3AD829398E3D39197
- FA62454CC84DED0679A080DDA9B591B54DB6EB181C9B41ECCC38FA5497901955
- 2462E7EE772EDA9F16BD8A1CB0A5B35F3A98793056EC4C386D516136AE24AD86
- A5D90C8B3310D59FD7E0ADE1C3929D913DAEABCDF5F1480633526244ACAE3C17
- DDFA56E4C586C160F909FD340D666D1C0A6E3EF489B1AE757DAF493A7844132D
- 163A9D93838F23666C0CE611141A066D7C10128EDD5D169B77E52EE39074F050
- 7214D95CDA3885AA1B5A848547226B5F201233EE91E26ECC5DD8F326DCE06FBC
- CF342C1DD4EE8D5C74FA85F394820957BF79443A9892B84D11263C631A1E950E
- 6AD4118A30216481C9F1E18A30D960D2CE2DA86ED0436948068B4BCA15639E58
- 11FCD7F10B8E341130466CDCF80000000049454E44AE426082}
- Name = 'PngImage1'
- Background = clWindow
- end
- item
- PngImage.Data = {
- 89504E470D0A1A0A0000000D494844520000001C0000001C0806000000720DDF
- 940000000970485973000017120000171201679FD252000002B14944415478DA
- BDD5CB4F13411800F0AF897AF2A0311E8C07F5604C63E9839683040D42A1D098
- D42A8826DEFC070C4AF4E4C1981883C117C13755B02922A505ACB440855829B5
- DB07B5151589070831846C222A242ADD717760B14B6B676991AFBB99D9D96FF7
- 37B3B3D3952084602D439208760E8CE003AE8DDF05C7EC0F6F8B757C1E6F0BF5
- DA9B2608BB6E4B1281E50312801DFDEF90E1E0DE8C7A6E7150B06DEB66A8BE50
- 2740D382F6973174B8489611687EFE0694D29D304D7F17A0FF0564D87B581C7E
- 2850EF811F733F05685AD0E68E2263710EAE5FB14D12A173C6ED10671888C711
- B43A2928DE27835FBFE70568C8D920F927D8DEF7161DD1CA458F8CC7B8B2CD15
- 806B0DCD493969416B5F041DD52A568C310C5BC61918087C86D9B959A0691AE7
- 349A3B09602F0B9690C154D8F236ABD34B06DB7A865145A952F41C26C6A9C24D
- 820ED87B7D64F0992B8C2A75AAAC46C6B775B9FD64B0D51542C774B959635CDD
- D14F91C1A7CE20AA2A530B206E8D910041DBE2718F272802EC66C172754673C8
- 8751B501A3EEC130196CE90EA0E3E59AAC46B650B24BC41721839617143AA1CF
- CB1AE3760F1515013A2854A5D7648DC5D9766F304606D97F7C760EF3F045D71D
- 5329E7E864FE467CF31DF7C6539E0F566E8179F67AFFF08838B0A2542D6A64BB
- 1E4C80A9F8EFB7939E61C07CEB34DCA93D8FF383D10F64F049970F19B5B9C435
- C63DB2DDA6C92590C3462718A0ECD5507FB906E746DE7F2283CD9D43C850A422
- 62DC2393367DC1208F8D8E3330133A0B372E9DC139B18F63E2C043850A8C3D1C
- F89A728E0CCAF5B80332F3145CD5489730FA1B827563355077B11AE789029B3A
- BC487F409176647C9BC2320DAAA1BB491D5A11F8D83E88CAF6CB89D8C2EB9FBC
- 14124314F8C8F61AE90AE45963A24153BB0795E4E7E06FD96A04116CB4BE42F5
- F75B5605E3232DB816F1079F420105E5B916660000000049454E44AE426082}
- Name = 'PngImage2'
- Background = clWindow
- end
- item
- PngImage.Data = {
- 89504E470D0A1A0A0000000D494844520000001C0000001C0806000000720DDF
- 940000000970485973000017120000171201679FD252000002E14944415478DA
- 63FCFFFF3F033D0123B2859B0E5C03734062308CC207423082B2C1F260046177
- 4F9ACF707EE77446640BD03D8462E1C6FD57FFFB3B6A93E5F2E55B4F33488A0A
- 3214D5F5A1588AD7C20DFBAEFC0F70D221CBC2A55B4E3218682A30BC7EFB19C5
- 52A22DEC5CFF142E5E1E284D504C86F509838DB13AC3976F3F512CC56BE1FABD
- 97FF073AEB92E4B3BFFFFE31FCFDFB9F61D58ED30CCE963A0CBF7EFF41B1F4DC
- 8E698C382D5CB7E7D2FF20173D922D03D16B769E61E89FB618430D5E0BD7EEB9
- F83FD8451F23F8B081127F49B865FFFE01E9BFFF180E9CB9C7F0F5DB5786B76F
- DF82D5CC5BBA898085BB8116BAEA93E4339865E8626B771C236CE19A5D17FE87
- B819506C19486CC3EE13842D5CBDF3FCFF5077439420454F8D20D5202D208341
- 74B6BB10D8B2C93BDF81B300509821D5818761F3DE53842D5CB5F3DCFF307723
- 8A7C06636FDD7F9AB0852B779CFD1FEE618CE2A3D20029B0013D9B9EA3F8ECDF
- 7F089DEECC0FB674FADE8F50710686441B4E865D87CF1261E176A0859EC6703E
- C85042BE411143E2EF3D7A9EB0852BB69FF91FE16982E2C3026F71B0017D5B5E
- 217CF60FE1C354475EB06533F77F81C7619C251BC3811317095BB87CDBE9FF91
- 5EA614F90C2C0FC4874F5F26C2C2ADA7FF877B99800DE9DEF81CECE25C0F51B0
- 4113B7BF41F1D93F48CDC4906CC705B66CF6C16F701FC698B3301C3B7B85B085
- C0121F1887A614F9EC2F50FC0F903E75E11A711686B819A3C459B69B10D82048
- 3E43F80C9662136C38C0F2F38EFC848B459830329CBD7C83B0854B369FF81FE8
- 6244308FC17C815087E9D38BD76F13B670F1A6E3FFFD9D0CC11A27ED780B8E33
- 483EFB07CC679F507CF60FDAD48806C617C8B2C527FE80C5402058FF2FC3959B
- 7788B3D0C7419F229FFD85DA4A94858B361EFBEF65A74FB165445BB870C3D1FF
- 1EB67A6459B6EA3C13DC1CA28374C1FA23FFDD6DF428F219493E9CBFEEF07F57
- 2B5D705D460D40D0C2796B0FFD9F327B05552C8301BC16D2030000BD734D0581
- 7DF1720000000049454E44AE426082}
- Name = 'PngImage3'
- Background = clWindow
- end
- item
- PngImage.Data = {
- 89504E470D0A1A0A0000000D494844520000001C0000001C0806000000720DDF
- 940000000970485973000017120000171201679FD252000001C64944415478DA
- 63FCFFFF3F033D01E38059B87CDB699ADB1CE965CA88622150806CC3FE01CDF9
- F7EF3FC3DFBFFF18FEFEFB87C4FECFB06CD32186794B37319CDB310DBF858C33
- 1919823435197EFDFD0BC6BFA134980D34F4C79F3F0C3F81EC3F40F64F201BCC
- 07E237515FE196FD03CAADD87284780BC9011FA2BEC12D03D1ABB71D25CE424A
- 8211661988BF6EE771D22D644CC4EFDBCF537F30FCF903B1186C21D462107FD3
- 9E9394F9106CE85F245F807CF7F73F56CB40BEDEB2EF146E0B09F9845470A7E9
- 35C3F60367F05BF87F3E224B5E5C69C8A01F7E1E271F19A0CB81CCBA59FF8A61
- D7E1B3F82D4CC830806B2A78C0C030418101271F19A0CB2D987181E17AED0B86
- 3D47CFD3CF8757AA9F33EC3F7E817E3EBC50FE84E1F0E9CBF4F3E1D9D2C70CC7
- CE5EA19F0F4F173F643871FE1AFD7C78A2F001C3E98BD7B15B18EE69C2C09CC4
- 44551F1ECDBBC770EECA4DEC1686BA1B33B0A63053D5878773EE325CB8760BBB
- 85412E860C1CE9AC54F5E1FECCDB0C576EDEC16EA1BF933E0377263B557D88D7
- 426F7B5D06FE1C4E066A02BC167ADAE8E02CF149AD2190014E0BDDACB4A86E19
- 5E0B9D2D3419566D3D42D5208501AC16764F9A4F13CB6000C5427A01BA5B0800
- BE8AE7E7F700C7D10000000049454E44AE426082}
- Name = 'PngImage4'
- Background = clWindow
- end
- item
- PngImage.Data = {
- 89504E470D0A1A0A0000000D494844520000001C0000001C0806000000720DDF
- 940000000970485973000017120000171201679FD2520000020E4944415478DA
- 63FCFFFF3F033D0123C842464646086F06034D6CFF9FFE9F11C5C2695326FDEF
- 9ED4CFF0A0F801C311EF7D641BFC0F08FFFCFFC5F0FBDF2F300DC2FE4D310CFF
- E7A359A8A8A6F8FFFEADFB0C8585850C1BB66E6058B26F1E752CDB15C3C07082
- 01D342980F4100D9329BAD4E382D60636283606636067628FBE1D7470C5BDD57
- C12D0CDE9D84DD425C3E0459986060806A112307030FB310032F8B1098E666E6
- 63E060E201E3A8B61C868D754B2016027D1ABE3783741F225B88CF324E661E86
- C0E60486B5B5F3C096FD065A1AB32F8F7C1F12B20C447B3686302CAB9E0AB610
- E4CBA403E5E4F99018CB40D8B1DE836151653F3C0ED30ED692EEC334430BA22C
- 6305261A9B5A278679159D700BB30E3593914A4F90963D669537C32DCC3BDC49
- 9A0F91C19FFFBFC1090196026186FE46E323F06F86A2237DA4F99012CB4072E5
- 47A790EE434296FDFAFF1D21CEF01BA5B4A93D3E97781F622BAA6096FE46E363
- B30C841B4F2C26CE878BF6CDA1D832106E3DB992B00FA9651908779E5A4F9C0F
- 67EE9E40B16520F57DA7B712F621B52C03D193CEEC26CE871377B6906DD9CF7F
- DFE1EC19E78E10F621BA65BF900C40CE637843018AE79C3F459C0FDBB695E2CD
- D0C45806C20B2E5C20EC43522D5B1E7E066B99EAB05800B785E83EACDB9C4991
- CF6080281F52CB32BC16A2FB10D45CA41AC06621A821ACA0AA006E043FB0A6A2
- 65508061213D010026DA8D05688EA69C0000000049454E44AE426082}
- Name = 'PngImage5'
- Background = clWindow
- end
- item
- PngImage.Data = {
- 89504E470D0A1A0A0000000D494844520000001C0000001C0806000000720DDF
- 940000000970485973000017120000171201679FD252000003474944415478DA
- BD946B48536118C79F95140409E62DBB7C083F85084566372135D2F292B74AD3
- CCC44B492C32FC966D5AFA2D2A34E9A236733A9D695EA76B622A998917549CA9
- 980895B75D6995A5DBD9DBD939DBAB23754B9D0FBC9CE7FF1ECEF37BFEEFCB79
- 180821D8C860E8808CDB03CE649E4AAEAB16E214902B033D741D330039AE7B6D
- D604637AD8027F500D12A5CA28EF1E0F845EE526386A5F5040026329A055BC08
- 1173EAE5AB21C672E78353768C37D48895D0DBD36B948B9D7221EFE721C89E3F
- 029A3C1F06063A8C0D5AE834E99038BB2C007730BBD048FA7E8B029DEF0E812A
- E7300DB4BDD98DE4596EAB2EA6256B68B50808420B84965C04A29E863DBEA00D
- 5822040AEE59D3C0FCFC853C2E6E657D296A1E4A8AB7601D10FC83825608DB81
- F5560B8A22BFB5395CCACD527B558D1D24902081FEC6C0FCC5EDAE43F8FA8751
- E0DAA64E600935A0280E589D43739D1972417317B01AD4A0E0051A03E3E37BA9
- 82797907CDBAC388C87928E519DF595DD576ACBD7DE5241481B0B51BD80DF320
- E79DA38176CC4E24CB765F77673A985A4340D3077218D4CF81BC24480FBCF111
- C9728E9974187D85006EE166AC432FCCC29BD7DBB03EEDA784C67A1BAC8F7BCD
- 500DB474F4035BF007E4A5C134D03EA90D499F7A98ED4CD7F5B20E1769EA3DB9
- DE770D00BBEE37C8F9217AE0B556247D7EF21F87BA1F9AF372618E5E8C9883B2
- D2AD58FB07A940506D8DB5A78F0C5A447658BB9D98A08EB5BD474C0267496028
- 0D74486841925C4F2357A6A68739CE74300DF9ECECFB0469B5BF405616A607C6
- 352149FE29ECF045EE015CB8886B859B08393F0B95E52BDF597BB323D6AEEE5F
- A81A3D03C3904E02A506A063AC08CD707CD6D599EE9E0DBA7F6814D2ABBE83B4
- 225C0F8C11A29957675605536BB48BDE2D0D178F7C867BE552905447D3C09DD1
- 023459E80789097D94CBAC272EF8C394E4617C446919FB202D751CEB943BBBE1
- 41E604D6D76FD9C1B3C732AC2F27D2434007BCCF9F8299BA583D30AA067D2B0C
- C09D6A34A67F680D61DA992174C00CDE57986E48A081BB222BD11827C0ECE9F1
- 3F300CE48EC3B4288906EE09E5A291E270E094BF3339DE561B9905A330D5C4A4
- 814E5E8FD0B4B5DDDAABAE104E2A194C3627EB8F94045A94A60F0CDCC8D870E0
- 5FA7D4B1F664B3FE1D0000000049454E44AE426082}
- Name = 'PngImage6'
- Background = clWindow
- end
- item
- PngImage.Data = {
- 89504E470D0A1A0A0000000D494844520000001C0000001C0806000000720DDF
- 940000000970485973000017120000171201679FD252000001084944415478DA
- 63FCFFFF3F033D01E3A88534B19031F124ED6DBD7081E1FFF97446B885516106
- 0CEF7E3130ECD870812134D480E1EB1F06862F50FCE937847E71807C390C0B3D
- 0220169EDA7681C12BD00045D38B1F1036C3093C72474F31788598E1D4876121
- CD82F2FF3F60C431A15AB874CBC9FF6E969A0C5FBFFF64387AE11E43B48F3956
- BD407564C98180914716C3B91DD310161AA849812DBCFDF82DD52D9CB27807C3
- BCA59B502D549515663875E90E83A0A020568D7FFFFE6558B1FD0C5972D397ED
- C6B49016D1F7FBD72F0656363686F7EFDF635A48CB38C41AA4A3714809188DC3
- D1381C8D43E2E21014A42BB71DA3593C6258D83B6521CD2C8301B885F404C3DF
- 42005A1A11E70A945A890000000049454E44AE426082}
- Name = 'PngImage7'
- Background = clWindow
- end>
- PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
- Left = 115
- Top = 96
- Bitmap = {}
- end
- object dsDataTable: TDADataSource
- Left = 40
- Top = 96
- end
-end
diff --git a/Source/ControlesBase/Cliente/Bak/uViewControlesBase_TreeView.pas b/Source/ControlesBase/Cliente/Bak/uViewControlesBase_TreeView.pas
deleted file mode 100644
index f50bfef..0000000
--- a/Source/ControlesBase/Cliente/Bak/uViewControlesBase_TreeView.pas
+++ /dev/null
@@ -1,108 +0,0 @@
-unit uViewControlesBase_TreeView;
-
-interface
-
-uses
- Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
- Dialogs, uViewBase, cxGraphics, cxCustomData, cxStyles, cxTL,
- cxImageComboBox, cxMaskEdit, cxTextEdit, cxInplaceContainer, cxDBTL,
- cxControls, cxTLData, Menus, uBizControlesBase, DB, uDADataTable,
- ImgList, PngImageList;
-
-type
- IViewControlesBase = interface(IViewBase)
- ['{D991FCEC-08DB-4F77-BD57-FA04B3C88788}']
- function GetDblClick: TNotifyEvent;
- procedure SetDblClick(const Value: TNotifyEvent);
- property OnDblClick: TNotifyEvent read GetDblClick write SetDblClick;
-
- function GetPopupMenu: TPopupMenu;
- procedure SetPopupMenu(const Value: TPopupMenu);
- property PopupMenu: TPopupMenu read GetPopupMenu write SetPopupMenu;
-
- function GetControl: IBizControlBase;
- procedure SetControl(const Value: IBizControlBase);
- property Control: IBizControlBase read GetControl write SetControl;
-
- procedure Refresh;
- end;
-
- TfrViewControlesBase = class(TfrViewBase, IViewControlesBase)
- cxTreeList: TcxDBTreeList;
- cxDBTreeListICONO: TcxDBTreeListColumn;
- cxDBTreeListORDEN: TcxDBTreeListColumn;
- cxDBTreeListNOMBRE: TcxDBTreeListColumn;
- cxDBTreeListDESCRIPCION: TcxDBTreeListColumn;
- cxDBTreeListDUMMY: TcxDBTreeListColumn;
- cxStyleRepository1: TcxStyleRepository;
- cxStyleTITULO: TcxStyle;
- cxStyleDESCRIPCION: TcxStyle;
- cxStyle1: TcxStyle;
- ReportImages: TPngImageList;
- dsDataTable: TDADataSource;
- protected
- FControl : IBizControlBase;
- FOnDblClick: TNotifyEvent;
- FPopupMenu: TPopupMenu;
-
- function GetDblClick: TNotifyEvent; virtual;
- procedure SetDblClick(const Value: TNotifyEvent); virtual;
-
- function GetPopupMenu: TPopupMenu; virtual;
- procedure SetPopupMenu(const Value: TPopupMenu); virtual;
-
- function GetControl: IBizControlBase; virtual;
- procedure SetControl(const Value: IBizControlBase); virtual;
- public
- procedure Refresh; override;
- property Control: IBizControlBase read GetControl write SetControl;
- property OnDblClick: TNotifyEvent read GetDblClick write SetDblClick;
- property PopupMenu: TPopupMenu read GetPopupMenu write SetPopupMenu;
- end;
-
-implementation
-
-{$R *.dfm}
-
-{ TfrViewControlesBase }
-
-function TfrViewControlesBase.GetControl: IBizControlBase;
-begin
- Result := FControl;
-end;
-
-function TfrViewControlesBase.GetDblClick: TNotifyEvent;
-begin
- Result := FOnDblClick;
-end;
-
-function TfrViewControlesBase.GetPopupMenu: TPopupMenu;
-begin
- Result := FPopupMenu;
-end;
-
-procedure TfrViewControlesBase.Refresh;
-begin
- inherited;
- cxTreeList.Refresh;
-end;
-
-procedure TfrViewControlesBase.SetControl(const Value: IBizControlBase);
-begin
- FControl := Value;
- dsDataTable.DataTable := Value.DataTable;
-end;
-
-procedure TfrViewControlesBase.SetDblClick(const Value: TNotifyEvent);
-begin
- FOnDblClick := Value;
-end;
-
-procedure TfrViewControlesBase.SetPopupMenu(const Value: TPopupMenu);
-begin
- FPopupMenu := Value;
- cxTreeList.PopupMenu := FPopupMenu;
-end;
-
-end.
-
diff --git a/Source/ControlesBase/Cliente/uViewColumnas.dfm b/Source/ControlesBase/Cliente/uViewColumnas.dfm
index 5d094b2..ecbb78b 100644
--- a/Source/ControlesBase/Cliente/uViewColumnas.dfm
+++ b/Source/ControlesBase/Cliente/uViewColumnas.dfm
@@ -1,6 +1,25 @@
inherited frViewColumnas: TfrViewColumnas
Width = 316
Height = 350
+ object lbColumnas: TcxCheckListBox
+ Left = 0
+ Top = 29
+ Width = 316
+ Height = 321
+ Align = alClient
+ Items = <>
+ Style.LookAndFeel.Kind = lfStandard
+ Style.LookAndFeel.NativeStyle = True
+ StyleDisabled.Color = clWindow
+ StyleDisabled.LookAndFeel.Kind = lfStandard
+ StyleDisabled.LookAndFeel.NativeStyle = True
+ StyleFocused.LookAndFeel.Kind = lfStandard
+ StyleFocused.LookAndFeel.NativeStyle = True
+ StyleHot.LookAndFeel.Kind = lfStandard
+ StyleHot.LookAndFeel.NativeStyle = True
+ TabOrder = 0
+ OnClickCheck = lbColumnasClickCheck
+ end
object TBXLabel1: TTBXLabel
Left = 0
Top = 0
@@ -20,23 +39,4 @@ inherited frViewColumnas: TfrViewColumnas
ParentFont = False
Underline = True
end
- object lbColumnas: TcxCheckListBox
- Left = 0
- Top = 29
- Width = 316
- Height = 321
- Align = alClient
- Items = <>
- Style.LookAndFeel.Kind = lfStandard
- Style.LookAndFeel.NativeStyle = True
- StyleDisabled.Color = clWindow
- StyleDisabled.LookAndFeel.Kind = lfStandard
- StyleDisabled.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.Kind = lfStandard
- StyleFocused.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.Kind = lfStandard
- StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 1
- OnClickCheck = lbColumnasClickCheck
- end
end
diff --git a/Source/ControlesBase/Cliente/uViewControlBase.dfm b/Source/ControlesBase/Cliente/uViewControlBase.dfm
index 370f82e..f01fddc 100644
--- a/Source/ControlesBase/Cliente/uViewControlBase.dfm
+++ b/Source/ControlesBase/Cliente/uViewControlBase.dfm
@@ -124,13 +124,13 @@ inherited frViewControlBase: TfrViewControlBase
Align = alClient
TabOrder = 0
ReadOnly = False
- inherited TBXLabel1: TTBXLabel
- Width = 210
- end
inherited lbColumnas: TcxCheckListBox
Width = 210
Height = 130
end
+ inherited TBXLabel1: TTBXLabel
+ Width = 210
+ end
end
end
object tsAgrupacion: TTabSheet
diff --git a/Source/ControlesBase/Cliente/uViewParametrosControlGrid.ddp b/Source/ControlesBase/Cliente/uViewParametrosControlGrid.ddp
new file mode 100644
index 0000000..4370276
Binary files /dev/null and b/Source/ControlesBase/Cliente/uViewParametrosControlGrid.ddp differ
diff --git a/Source/Modulos/Devoluciones/Cliente/Devoluciones.dof b/Source/Modulos/Devoluciones/Cliente/Devoluciones.dof
index 25a28d7..e3c2ef2 100644
--- a/Source/Modulos/Devoluciones/Cliente/Devoluciones.dof
+++ b/Source/Modulos/Devoluciones/Cliente/Devoluciones.dof
@@ -149,8 +149,8 @@ Count=1
Item0=.\
[HistoryLists\hlOutputDirectorry]
Count=2
-Item0=..\..\Output\Servidor
-Item1=..\..\Output\Cliente
+Item0=..\..\Output\Cliente
+Item1=..\..\Output\Servidor
[HistoryLists\hlBPLOutput]
Count=3
Item0=..\Lib
diff --git a/Source/Modulos/Devoluciones/Cliente/Devoluciones.dpk b/Source/Modulos/Devoluciones/Cliente/Devoluciones.dpk
index 2e7d280..982e597 100644
--- a/Source/Modulos/Devoluciones/Cliente/Devoluciones.dpk
+++ b/Source/Modulos/Devoluciones/Cliente/Devoluciones.dpk
@@ -64,7 +64,8 @@ requires
JvCustomD7R,
bdertl,
VclSmp,
- dxLayoutControlD7;
+ dxLayoutControlD7,
+ Parametros;
contains
uPluginControllerDevoluciones in 'uPluginControllerDevoluciones.pas' {ModuleDevoluciones: TModuleController},
diff --git a/Source/Modulos/Devoluciones/Cliente/uEditorAjustarDevoluciones.pas b/Source/Modulos/Devoluciones/Cliente/uEditorAjustarDevoluciones.pas
index c1da6d5..f117ee0 100644
--- a/Source/Modulos/Devoluciones/Cliente/uEditorAjustarDevoluciones.pas
+++ b/Source/Modulos/Devoluciones/Cliente/uEditorAjustarDevoluciones.pas
@@ -199,9 +199,15 @@ end;
procedure TfEditorAjustarDevoluciones.bAceptarClick(Sender: TObject);
begin
- SalvarValores;
- FItems.DataTable.ApplyUpdates;
- ModificarAlbaran;
+ ShowHourglassCursor;
+ Application.ProcessMessages;
+ try
+ SalvarValores;
+ FItems.DataTable.ApplyUpdates;
+ ModificarAlbaran;
+ finally
+ HideHourglassCursor;
+ end;
Close;
end;
diff --git a/Source/Modulos/Devoluciones/Cliente/uEditorListaDevoluciones.dfm b/Source/Modulos/Devoluciones/Cliente/uEditorListaDevoluciones.dfm
index d7f7a1c..d501b88 100644
--- a/Source/Modulos/Devoluciones/Cliente/uEditorListaDevoluciones.dfm
+++ b/Source/Modulos/Devoluciones/Cliente/uEditorListaDevoluciones.dfm
@@ -1,6 +1,6 @@
inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
- Left = 321
- Top = 276
+ Left = 403
+ Top = 247
Width = 909
Height = 671
Caption = 'Control de devoluciones'
@@ -49,7 +49,7 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
end
object JvTabBar1: TJvTabBar [3]
Left = 0
- Top = 76
+ Top = 137
Width = 901
Height = 29
Cursor = crHandPoint
@@ -73,9 +73,9 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
end
inline frViewListaDevoluciones1: TfrViewListaDevoluciones [4]
Left = 0
- Top = 105
+ Top = 166
Width = 901
- Height = 513
+ Height = 452
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -87,7 +87,7 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
ReadOnly = False
inherited cxGrid: TcxGrid
Width = 901
- Height = 513
+ Height = 452
inherited cxGridView: TcxGridDBTableView
PopupMenu = GridPopupMenu
DataController.Summary.DefaultGroupSummaryItems = <
@@ -113,7 +113,74 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
end
end
end
- inherited EditorActionList: TActionList [5]
+ object TBXDockablePanel1: TTBXDockablePanel [5]
+ Left = 0
+ Top = 76
+ MaxClientHeight = 61
+ Align = alTop
+ Caption = 'TBXDockablePanel1'
+ FloatingWidth = 128
+ FloatingHeight = 128
+ SupportedDocks = [dkStandardDock, dkMultiDock]
+ TabOrder = 5
+ inline frViewParametrosCentro1: TfrViewParametrosCentro
+ Left = 0
+ Top = 19
+ Width = 425
+ Height = 42
+ Align = alLeft
+ TabOrder = 0
+ ReadOnly = False
+ inherited dxLayoutControl1: TdxLayoutControl
+ Width = 425
+ inherited ccbCentro: TJvCheckedComboBox
+ Left = 52
+ Width = 392
+ end
+ end
+ end
+ object TBXLabel1: TTBXLabel
+ Left = 0
+ Top = 0
+ Width = 901
+ Height = 19
+ Align = alTop
+ Caption = 'Par'#225'metros de consulta'
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -11
+ Font.Name = 'MS Sans Serif'
+ Font.Style = [fsBold]
+ Margins.Left = 5
+ Margins.Top = 5
+ ParentColor = True
+ ParentFont = False
+ Underline = True
+ end
+ object pnlAgrupaciones: TTBXAlignmentPanel
+ Left = 425
+ Top = 19
+ Width = 476
+ Height = 42
+ Align = alClient
+ AutoSize = True
+ TabOrder = 2
+ object TBXButton3: TTBXButton
+ Tag = 3
+ Left = 8
+ Top = 10
+ Width = 90
+ Height = 21
+ Action = actRefrescar
+ AutoSize = False
+ Caption = 'Consultar'
+ ImageIndex = 0
+ TabOrder = 0
+ Wrapping = twEndEllipsis
+ end
+ end
+ end
+ inherited EditorActionList: TActionList [6]
inherited actNuevo: TAction
Enabled = False
Visible = False
@@ -170,7 +237,7 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
OnUpdate = actAprobadoUpdate
end
end
- inherited SmallImages: TPngImageList [6]
+ inherited SmallImages: TPngImageList [7]
PngImages = <
item
PngImage.Data = {
@@ -750,7 +817,7 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
end>
Bitmap = {}
end
- inherited LargeImages: TPngImageList [7]
+ inherited LargeImages: TPngImageList [8]
PngImages = <
item
PngImage.Data = {
@@ -1571,11 +1638,11 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
end>
Bitmap = {}
end
- inherited JvFormStorage: TJvFormStorage [8]
+ inherited JvFormStorage: TJvFormStorage [9]
end
- inherited JvAppRegistryStorage: TJvAppRegistryStorage [9]
+ inherited JvAppRegistryStorage: TJvAppRegistryStorage [10]
end
- inherited dsDataTable: TDADataSource [10]
+ inherited dsDataTable: TDADataSource [11]
Top = 136
end
inherited GridPopupMenu: TPopupMenu
diff --git a/Source/Modulos/Devoluciones/Cliente/uEditorListaDevoluciones.pas b/Source/Modulos/Devoluciones/Cliente/uEditorListaDevoluciones.pas
index 75029cb..1ad3136 100644
--- a/Source/Modulos/Devoluciones/Cliente/uEditorListaDevoluciones.pas
+++ b/Source/Modulos/Devoluciones/Cliente/uEditorListaDevoluciones.pas
@@ -17,7 +17,8 @@ uses
uDADataTable, JvAppStorage, JvAppRegistryStorage, JvComponentBase,
JvFormPlacement, ImgList, PngImageList, StdActns, ActnList, ComCtrls,
TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, ExtCtrls,
- JvExControls, JvComponent, JvNavigationPane;
+ JvExControls, JvComponent, JvNavigationPane, TBXDkPanels,
+ uViewParametrosControlGrid, uViewParametrosCentro;
type
@@ -42,6 +43,11 @@ type
TBXItem37: TTBXItem;
actAprobado: TAction;
frViewListaDevoluciones1: TfrViewListaDevoluciones;
+ TBXDockablePanel1: TTBXDockablePanel;
+ frViewParametrosCentro1: TfrViewParametrosCentro;
+ TBXLabel1: TTBXLabel;
+ pnlAgrupaciones: TTBXAlignmentPanel;
+ TBXButton3: TTBXButton;
procedure FormShow(Sender: TObject);
procedure JvTabBar1TabSelected(Sender: TObject; Item: TJvTabBarItem);
procedure actModificarExecute(Sender: TObject);
@@ -107,14 +113,10 @@ begin
if not Assigned(ViewGrid) then
raise Exception.Create('No hay una vista asignada');
- FItems.DataTable.Active := True;
+ frViewParametrosCentro1.Refresh;
with (ViewGrid as IViewListaDevoluciones) do
- begin
VerPendientes;
- ContraerTodo;
- GotoFirst;
- end;
end;
procedure TfEditorListaDevoluciones.JvTabBar1TabSelected(
@@ -122,7 +124,9 @@ procedure TfEditorListaDevoluciones.JvTabBar1TabSelected(
begin
inherited;
ShowHourglassCursor;
+
Items.DataTable.Active := False;
+
Application.ProcessMessages;
ViewGrid._FocusedView.BeginUpdate;
Application.ProcessMessages;
@@ -146,31 +150,27 @@ begin
finally
dsDataTable.DataTable := Items.DataTable;
ViewGrid._FocusedView.EndUpdate;
- Items.DataTable.Active := True;
- ViewGrid.ContraerTodo;
- ViewGrid.GotoFirst;
HideHourglassCursor;
end;
end;
procedure TfEditorListaDevoluciones.actModificarExecute(
Sender: TObject);
-var
- bm : TBookMark ;
begin
- bm := FItems.DataTable.GetBookMark;
- FItems.DataTable.DisableControls;
+ ViewGrid._FocusedView.BeginUpdate;
+ ViewGrid.SaveGridStatus;
try
FItems.Show;
- try
- // No hay BookmarkIsValid
- FItems.DataTable.GotoBookMark(bm);
- except
- //
- end;
finally
- FItems.DataTable.FreeBookMark(BM);
- FItems.DataTable.EnableControls;
+ // Que salga el reloj de espera mientras el grid refresca datos y restaura la posición
+ ShowHourglassCursor;
+ Application.ProcessMessages;
+ try
+ ViewGrid._FocusedView.EndUpdate;
+ ViewGrid.RestoreGridStatus;
+ finally
+ HideHourglassCursor;
+ end;
end;
end;
@@ -218,10 +218,52 @@ end;
procedure TfEditorListaDevoluciones.actRefrescarExecute(
Sender: TObject);
+var
+ ACentrosList : TStringList;
+ AWhere : String;
+ i : integer;
begin
+ case (ViewGrid as IViewListaDevoluciones).VistaActiva of
+ tdvaPendiente,
+ tdvaAprobado : AWhere := ' and'
+ else
+ AWhere := '';
+ end;
+
+ AWhere := AWhere + ' CENTRO in (';
+
+ Items.DataTable.Active := False;
+ ACentrosList := frViewParametrosCentro1.CentrosSeleccionados;
+
+ ShowHourglassCursor;
+ try
+ if ACentrosList.Count = 0 then
+ ShowMessage('Debe seleccionar al menos un centro en los parámetros de la consulta.')
+ else begin
+ with Items.DataTable.Where do
+ begin
+ Clear;
+ for i := 0 to ACentrosList.Count - 1 do
+ begin
+ if i > 0 then
+ AWhere := AWhere + ', ';
+ AWhere := AWhere + '''' + ACentrosList[i] + '''';
+ end;
+ AWhere := AWhere + ')';
+
+ AddText(AWhere);
+ end;
+ Items.DataTable.Active := True;
+ end;
+ finally
+ HideHourglassCursor;
+ FreeAndNIL(ACentrosList);
+ end;
+
inherited;
- ViewGrid.ContraerTodo;
- ViewGrid.GotoFirst;
+
+ ViewGrid.ExpandirTodo;
+ ViewGrid.GotoFirst;
end;
procedure TfEditorListaDevoluciones.actPendienteExecute(
diff --git a/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.pas b/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.pas
index 6e72ff5..09bf22b 100644
--- a/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.pas
+++ b/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.pas
@@ -23,11 +23,16 @@ uses
dxPScxCommon, dxPScxGridLnk, cxMemo;
type
+ TvDevolucionesVistaActiva = (tdvaPendiente, tdvaAprobado, tdvaTodos);
+
IViewListaDevoluciones = interface(IViewGrid)
['{2179BA33-B039-4CC9-A423-F50FD2C7B880}']
procedure VerPendientes;
procedure VerAprobados;
procedure VerTodos;
+
+ function GetVistaActiva : TvDevolucionesVistaActiva;
+ property VistaActiva : TvDevolucionesVistaActiva read GetVistaActiva;
end;
TfrViewListaDevoluciones = class(TfrViewGrid, IViewListaDevoluciones)
@@ -149,6 +154,7 @@ type
FTipo : String;
FNivelFiltrado : TcxFilterCriteriaItemList;
procedure FilterChanged(Sender: TObject); override;
+ function GetVistaActiva : TvDevolucionesVistaActiva;
public
procedure Preview; override;
procedure Print; override;
@@ -156,6 +162,7 @@ type
procedure VerPendientes;
procedure VerAprobados;
procedure VerTodos;
+ property VistaActiva : TvDevolucionesVistaActiva read GetVistaActiva;
end;
@@ -588,4 +595,14 @@ begin
cxGridView.DataController.Filter.EndUpdate;
end;
+function TfrViewListaDevoluciones.GetVistaActiva: TvDevolucionesVistaActiva;
+begin
+ if FTipo = 'N' then
+ Result := tdvaPendiente
+ else if FTipo = 'S' then
+ Result := tdvaAprobado
+ else
+ Result := tdvaTodos;
+end;
+
end.
diff --git a/Source/Modulos/Parametros/Cliente/Parametros.cfg b/Source/Modulos/Parametros/Cliente/Parametros.cfg
new file mode 100644
index 0000000..53e7995
--- /dev/null
+++ b/Source/Modulos/Parametros/Cliente/Parametros.cfg
@@ -0,0 +1,45 @@
+-$A8
+-$B-
+-$C+
+-$D+
+-$E-
+-$F-
+-$G+
+-$H+
+-$I+
+-$J-
+-$K-
+-$L+
+-$M-
+-$N+
+-$O+
+-$P+
+-$Q-
+-$R-
+-$S-
+-$T-
+-$U-
+-$V+
+-$W-
+-$X+
+-$YD
+-$Z1
+-GD
+-cg
+-AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+-H+
+-W+
+-M
+-$M16384,1048576
+-K$00400000
+-N".\"
+-LE"..\..\..\..\Output\Cliente"
+-LN"..\..\..\Lib"
+-U"..\..\..\Lib"
+-O"..\..\..\Lib"
+-I"..\..\..\Lib"
+-R"..\..\..\Lib"
+-Z
+-w-UNSAFE_TYPE
+-w-UNSAFE_CODE
+-w-UNSAFE_CAST
diff --git a/Source/Modulos/Parametros/Cliente/Parametros.dof b/Source/Modulos/Parametros/Cliente/Parametros.dof
new file mode 100644
index 0000000..454c088
--- /dev/null
+++ b/Source/Modulos/Parametros/Cliente/Parametros.dof
@@ -0,0 +1,479 @@
+[FileVersion]
+Version=7.0
+[Compiler]
+A=8
+B=0
+C=1
+D=1
+E=0
+F=0
+G=1
+H=1
+I=1
+J=0
+K=0
+L=1
+M=0
+N=1
+O=1
+P=1
+Q=0
+R=0
+S=0
+T=0
+U=0
+V=1
+W=0
+X=1
+Y=1
+Z=1
+ShowHints=1
+ShowWarnings=1
+UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+NamespacePrefix=
+SymbolDeprecated=1
+SymbolLibrary=1
+SymbolPlatform=1
+UnitLibrary=1
+UnitPlatform=1
+UnitDeprecated=1
+HResultCompat=1
+HidingMember=1
+HiddenVirtual=1
+Garbage=1
+BoundsError=1
+ZeroNilCompat=1
+StringConstTruncated=1
+ForLoopVarVarPar=1
+TypedConstVarPar=1
+AsgToTypedConst=1
+CaseLabelRange=1
+ForVariable=1
+ConstructingAbstract=1
+ComparisonFalse=1
+ComparisonTrue=1
+ComparingSignedUnsigned=1
+CombiningSignedUnsigned=1
+UnsupportedConstruct=1
+FileOpen=1
+FileOpenUnitSrc=1
+BadGlobalSymbol=1
+DuplicateConstructorDestructor=1
+InvalidDirective=1
+PackageNoLink=1
+PackageThreadVar=1
+ImplicitImport=1
+HPPEMITIgnored=1
+NoRetVal=1
+UseBeforeDef=1
+ForLoopVarUndef=1
+UnitNameMismatch=1
+NoCFGFileFound=1
+MessageDirective=1
+ImplicitVariants=1
+UnicodeToLocale=1
+LocaleToUnicode=1
+ImagebaseMultiple=1
+SuspiciousTypecast=1
+PrivatePropAccessor=1
+UnsafeType=0
+UnsafeCode=0
+UnsafeCast=0
+[Linker]
+MapFile=3
+OutputObjs=0
+ConsoleApp=1
+DebugInfo=0
+RemoteSymbols=0
+MinStackSize=16384
+MaxStackSize=1048576
+ImageBase=4194304
+ExeDescription=
+[Directories]
+OutputDir=
+UnitOutputDir=.\
+PackageDLLOutputDir=..\..\..\..\Output\Cliente
+PackageDCPOutputDir=..\..\..\Lib
+SearchPath=..\..\..\Lib
+Packages=rtl;vcl;vclx;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;dclOfficeXP;indy;cxTreeListVCLD7;dxThemeD7;cxLibraryVCLD7;cxEditorsVCLD7;cxDataD7;cxExtEditorsVCLD7;cxGridVCLD7;cxPageControlVCLD7;cxSchedulerVCLD7;dxsbD7;dxComnD7;dxBarD7;dxBarDBNavD7;dxBarExtDBItemsD7;dxBarExtItemsD7;dxDockingD7;dxLayoutControlD7;dxNavBarD7;dxPSCoreD7;cxIntlPrintSys3D7;PluginSDK_D7R;PngComponentsD7;PNG_D7;tb2k_d7;tbx_d7;cxExportVCLD7;cxIntlSchedulerD7;TMSD7;CEToolsPkgd7;Jcl;JclVcl;JvCoreD7R;JvSystemD7R;JvStdCtrlsD7R;JvAppFrmD7R;JvBandsD7R;JvDBD7R;JvDlgsD7R;JvBDED7R;JvCmpD7R;JvCryptD7R;JvCtrlsD7R;JvCustomD7R;JvDockingD7R;JvDotNetCtrlsD7R;JvEDID7R;JvGlobusD7R;JvHMID7R;JvInterpreterD7R;JvJansD7R;JvManagedThreadsD7R;JvMMD7R;JvNetD7R;JvPageCompsD7R;JvPluginD7R;JvPrintPreviewD7R;JvRuntimeDesignD7R;JvTimeFrameworkD7R;JvUIBD7R;JvValidatorsD7R;JvWizardD7R;JvXPCtrlsD7R;dxPSTeeChartD7;dxPScxCommonD7;dxPSLnksD7;dxPScxExtCommonD7;dxPScxGridLnkD7;dxPScxPCProdD7;dxPScxScheduler2LnkD7;dxPScxTLLnkD7;dxPSDBTeeChartD7;dxPsPrVwAdvD7;cxVerticalGridVCLD7;EasyListviewD7;VirtualTreesD7;cxIntl5D7;ccpack70;ccpack70dsg;RemObjects_WebBroker_D7;RemObjects_Indy_D7;RemObjects_RODX_D7;RemObjects_BPDX_D7;PascalScript_RO_D7;DataAbstract_Core_D7;DataAbstract_DBXDriver_D7;DataAbstract_Scripting_D7;FR7;SMImportD7;SMExportD7;FRIBX7;DataAbstract_IDE_D7;GUISDK_D7;fsTee7;fs7;fqb70;frx7;frxADO7;frxBDE7;frxcs7;frxDB7;frxDBX7;frxe7;frxIBX7;frxTee7;fsADO7;fsBDE7;fsDB7;fsIBX7
+Conditionals=
+DebugSourceDirs=
+UsePackages=0
+[Parameters]
+RunParams=
+HostApplication=
+Launcher=
+UseLauncher=0
+DebugCWD=
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=C:\Archivos de programa\Borland\Delphi7\Bin\
+[Version Info]
+IncludeVerInfo=1
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=3082
+CodePage=1252
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+[Excluded Packages]
+c:\archivos de programa\borland\delphi7\Bin\designdgm70.bpl=Borland Module Diagram Editview
+T:\BPL_D7\dxPSCoreD7.bpl=ExpressPrinting System by Developer Express Inc.
+[HistoryLists\hlUnitAliases]
+Count=1
+Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+[HistoryLists\hlSearchPath]
+Count=2
+Item0=..\Lib
+Item1=..\..\..\Lib
+[HistoryLists\hlUnitOutputDirectory]
+Count=1
+Item0=.\
+[HistoryLists\hlOutputDirectorry]
+Count=2
+Item0=..\..\Output\Cliente
+Item1=..\..\Output\Servidor
+[HistoryLists\hlBPLOutput]
+Count=3
+Item0=..\Lib
+Item1=..\..\..\..\Output\Cliente
+Item2=..\..\Output\Cliente
+[HistoryLists\hlDCPOutput]
+Count=2
+Item0=..\Lib
+Item1=..\..\..\Lib
+[Exception Log]
+EurekaLog Version=519
+Activate=1
+Activate Handle=1
+Save Log File=1
+Foreground Tab=0
+Freeze Activate=0
+Freeze Timeout=0
+Freeze Message=The application seems to be frozen.
+SMTP From=eurekalog@email.com
+SMTP Host=
+SMTP Port=25
+SMTP UserID=
+SMTP Password=
+Append to Log=0
+Show TerminateBtn=1
+TerminateBtn Operation=1
+Errors Number=32
+Errors Terminate=3
+Email Address=
+Email Object=
+Email Send Options=0
+Output Path=
+Encrypt Password=
+AutoCloseDialogSecs=0
+WebSendMode=0
+SupportULR=
+HTMLLayout Count=15
+HTMLLine0="%3Chtml%3E"
+HTMLLine1=" %3Chead%3E"
+HTMLLine2=" %3C/head%3E"
+HTMLLine3=" %3Cbody TopMargin=10 LeftMargin=10%3E"
+HTMLLine4=" %3Ctable width="100%%" border="0"%3E"
+HTMLLine5=" %3Ctr%3E"
+HTMLLine6=" %3Ctd nowrap%3E"
+HTMLLine7=" %3Cfont face="Lucida Console, Courier" size="2"%3E"
+HTMLLine8=" %3C%%HTML_TAG%%%3E"
+HTMLLine9=" %3C/font%3E"
+HTMLLine10=" %3C/td%3E"
+HTMLLine11=" %3C/tr%3E"
+HTMLLine12=" %3C/table%3E"
+HTMLLine13=" %3C/body%3E"
+HTMLLine14="%3C/html%3E"
+AutoCrashOperation=1
+AutoCrashNumber=10
+AutoCrashMinutes=1
+WebURL=
+WebUserID=
+WebPassword=
+WebPort=0
+AttachedFiles=
+Count=0
+EMail Message Line Count=0
+loNoDuplicateErrors=0
+loAppendReproduceText=0
+loDeleteLogAtVersionChange=0
+loAddComputerNameInLogFileName=0
+loSaveModulesSection=1
+loSaveCPUSection=1
+soAppStartDate=1
+soAppName=1
+soAppVersionNumber=1
+soAppParameters=1
+soAppCompilationDate=1
+soExcDate=1
+soExcAddress=1
+soExcModule=1
+soExcType=1
+soExcMessage=1
+soActCtlsFormClass=1
+soActCtlsFormText=1
+soActCtlsControlClass=1
+soActCtlsControlText=1
+soCmpName=1
+soCmpUser=1
+soCmpTotalMemory=1
+soCmpFreeMemory=1
+soCmpTotalDisk=1
+soCmpFreeDisk=1
+soCmpSysUpTime=1
+soCmpProcessor=1
+soCmpDisplayMode=1
+soOSType=1
+soOSBuildN=1
+soOSUpdate=1
+soOSLanguage=1
+soNetIP=1
+soNetSubmask=1
+soNetGateway=1
+soNetDNS1=1
+soNetDNS2=1
+soNetDHCP=1
+sndShowSendDialog=1
+sndShowSuccessFailureMsg=0
+sndSendEntireLog=0
+sndSendXMLLogCopy=0
+sndSendScreenshot=0
+sndUseOnlyActiveWindow=0
+sndSendLastHTMLPage=1
+sndSendInSeparatedThread=0
+sndAddDateInFileName=0
+sndCompressAllFiles=0
+edoShowExceptionDialog=1
+edoSendEmailChecked=1
+edoAttachScreenshotChecked=1
+edoShowCopyToClipOption=1
+edoShowDetailsButton=1
+edoShowInDetailedMode=0
+edoShowInTopMostMode=0
+edoUseEurekaLogLookAndFeel=1
+csoShowDLLs=1
+csoShowBPLs=1
+csoShowBorlandThreads=1
+csoShowWindowsThreads=1
+csoShowProcedureOffset=0
+boActivateCrashDetection=0
+boPauseBorlandThreads=0
+boDoNotPauseMainThread=0
+boPauseWindowsThreads=0
+boUseMainModuleOptions=1
+boCopyLogInCaseOfError=1
+boSaveCompressedCopyInCaseOfError=0
+Count mtInformationMsgCaption=1
+mtInformationMsgCaption0="Information."
+Count mtQuestionMsgCaption=1
+mtQuestionMsgCaption0="Question."
+Count mtDialog_Caption=1
+mtDialog_Caption0="Error."
+Count mtDialog_ErrorMsgCaption=2
+mtDialog_ErrorMsgCaption0="An error has occurred during program execution."
+mtDialog_ErrorMsgCaption1="Please read the following information for further details."
+Count mtDialog_GeneralCaption=1
+mtDialog_GeneralCaption0="General"
+Count mtDialog_GeneralHeader=1
+mtDialog_GeneralHeader0="General Information"
+Count mtDialog_CallStackCaption=1
+mtDialog_CallStackCaption0="Call Stack"
+Count mtDialog_CallStackHeader=1
+mtDialog_CallStackHeader0="Call Stack Information"
+Count mtDialog_ModulesCaption=1
+mtDialog_ModulesCaption0="Modules"
+Count mtDialog_ModulesHeader=1
+mtDialog_ModulesHeader0="Modules Information"
+Count mtDialog_CPUCaption=1
+mtDialog_CPUCaption0="CPU"
+Count mtDialog_CPUHeader=1
+mtDialog_CPUHeader0="CPU Information"
+Count mtDialog_CustomDataCaption=1
+mtDialog_CustomDataCaption0="Other"
+Count mtDialog_CustomDataHeader=1
+mtDialog_CustomDataHeader0="Other Information"
+Count mtDialog_OKButtonCaption=1
+mtDialog_OKButtonCaption0="%26OK"
+Count mtDialog_TerminateButtonCaption=1
+mtDialog_TerminateButtonCaption0="%26Terminate"
+Count mtDialog_RestartButtonCaption=1
+mtDialog_RestartButtonCaption0="%26Restart"
+Count mtDialog_DetailsButtonCaption=1
+mtDialog_DetailsButtonCaption0="%26Details"
+Count mtDialog_SendMessage=1
+mtDialog_SendMessage0="%26Send this error via Internet"
+Count mtDialog_ScreenshotMessage=1
+mtDialog_ScreenshotMessage0="%26Attach a Screenshot image"
+Count mtDialog_CopyMessage=1
+mtDialog_CopyMessage0="%26Copy to Clipboard"
+Count mtDialog_SupportMessage=1
+mtDialog_SupportMessage0="Go to the Support Page"
+Count mtLog_AppHeader=1
+mtLog_AppHeader0="Application"
+Count mtLog_AppStartDate=1
+mtLog_AppStartDate0="Start Date"
+Count mtLog_AppName=1
+mtLog_AppName0="Name/Description"
+Count mtLog_AppVersionNumber=1
+mtLog_AppVersionNumber0="Version Number"
+Count mtLog_AppParameters=1
+mtLog_AppParameters0="Parameters"
+Count mtLog_AppCompilationDate=1
+mtLog_AppCompilationDate0="Compilation Date"
+Count mtLog_ExcHeader=1
+mtLog_ExcHeader0="Exception"
+Count mtLog_ExcDate=1
+mtLog_ExcDate0="Date"
+Count mtLog_ExcAddress=1
+mtLog_ExcAddress0="Address"
+Count mtLog_ExcModule=1
+mtLog_ExcModule0="Module"
+Count mtLog_ExcType=1
+mtLog_ExcType0="Type"
+Count mtLog_ExcMessage=1
+mtLog_ExcMessage0="Message"
+Count mtLog_ActCtrlsHeader=1
+mtLog_ActCtrlsHeader0="Active Controls"
+Count mtLog_ActCtrlsFormClass=1
+mtLog_ActCtrlsFormClass0="Form Class"
+Count mtLog_ActCtrlsFormText=1
+mtLog_ActCtrlsFormText0="Form Text"
+Count mtLog_ActCtrlsControlClass=1
+mtLog_ActCtrlsControlClass0="Control Class"
+Count mtLog_ActCtrlsControlText=1
+mtLog_ActCtrlsControlText0="Control Text"
+Count mtLog_CmpHeader=1
+mtLog_CmpHeader0="Computer"
+Count mtLog_CmpName=1
+mtLog_CmpName0="Name"
+Count mtLog_CmpUser=1
+mtLog_CmpUser0="User"
+Count mtLog_CmpTotalMemory=1
+mtLog_CmpTotalMemory0="Total Memory"
+Count mtLog_CmpFreeMemory=1
+mtLog_CmpFreeMemory0="Free Memory"
+Count mtLog_CmpTotalDisk=1
+mtLog_CmpTotalDisk0="Total Disk"
+Count mtLog_CmpFreeDisk=1
+mtLog_CmpFreeDisk0="Free Disk"
+Count mtLog_CmpSystemUpTime=1
+mtLog_CmpSystemUpTime0="System Up Time"
+Count mtLog_CmpProcessor=1
+mtLog_CmpProcessor0="Processor"
+Count mtLog_CmpDisplayMode=1
+mtLog_CmpDisplayMode0="Display Mode"
+Count mtLog_OSHeader=1
+mtLog_OSHeader0="Operating System"
+Count mtLog_OSType=1
+mtLog_OSType0="Type"
+Count mtLog_OSBuildN=1
+mtLog_OSBuildN0="Build #"
+Count mtLog_OSUpdate=1
+mtLog_OSUpdate0="Update"
+Count mtLog_OSLanguage=1
+mtLog_OSLanguage0="Language"
+Count mtLog_NetHeader=1
+mtLog_NetHeader0="Network"
+Count mtLog_NetIP=1
+mtLog_NetIP0="IP Address"
+Count mtLog_NetSubmask=1
+mtLog_NetSubmask0="Submask"
+Count mtLog_NetGateway=1
+mtLog_NetGateway0="Gateway"
+Count mtLog_NetDNS1=1
+mtLog_NetDNS10="DNS 1"
+Count mtLog_NetDNS2=1
+mtLog_NetDNS20="DNS 2"
+Count mtLog_NetDHCP=1
+mtLog_NetDHCP0="DHCP"
+Count mtLog_CustInfoHeader=1
+mtLog_CustInfoHeader0="Custom Information"
+Count mtCallStack_Address=1
+mtCallStack_Address0="Address"
+Count mtCallStack_Name=1
+mtCallStack_Name0="Module"
+Count mtCallStack_Unit=1
+mtCallStack_Unit0="Unit"
+Count mtCallStack_Class=1
+mtCallStack_Class0="Class"
+Count mtCallStack_Procedure=1
+mtCallStack_Procedure0="Procedure/Method"
+Count mtCallStack_Line=1
+mtCallStack_Line0="Line"
+Count mtCallStack_MainThread=1
+mtCallStack_MainThread0="Main"
+Count mtCallStack_ExceptionThread=1
+mtCallStack_ExceptionThread0="Exception Thread"
+Count mtCallStack_RunningThread=1
+mtCallStack_RunningThread0="Running Thread"
+Count mtCallStack_CallingThread=1
+mtCallStack_CallingThread0="Calling Thread"
+Count mtCallStack_ThreadID=1
+mtCallStack_ThreadID0="ID"
+Count mtCallStack_ThreadPriority=1
+mtCallStack_ThreadPriority0="Priority"
+Count mtCallStack_ThreadClass=1
+mtCallStack_ThreadClass0="Class"
+Count mtSendDialog_Caption=1
+mtSendDialog_Caption0="Send."
+Count mtSendDialog_Message=1
+mtSendDialog_Message0="Message"
+Count mtSendDialog_Resolving=1
+mtSendDialog_Resolving0="Resolving DNS..."
+Count mtSendDialog_Connecting=1
+mtSendDialog_Connecting0="Connecting with server..."
+Count mtSendDialog_Connected=1
+mtSendDialog_Connected0="Connected with server."
+Count mtSendDialog_Sending=1
+mtSendDialog_Sending0="Sending message..."
+Count mtReproduceDialog_Caption=1
+mtReproduceDialog_Caption0="Request"
+Count mtReproduceDialog_Request=1
+mtReproduceDialog_Request0="Please describe the steps to reproduce the error:"
+Count mtReproduceDialog_OKButtonCaption=1
+mtReproduceDialog_OKButtonCaption0="%26OK"
+Count mtModules_Handle=1
+mtModules_Handle0="Handle"
+Count mtModules_Name=1
+mtModules_Name0="Name"
+Count mtModules_Description=1
+mtModules_Description0="Description"
+Count mtModules_Version=1
+mtModules_Version0="Version"
+Count mtModules_Size=1
+mtModules_Size0="Size"
+Count mtModules_LastModified=1
+mtModules_LastModified0="Modified"
+Count mtModules_Path=1
+mtModules_Path0="Path"
+Count mtCPU_Registers=1
+mtCPU_Registers0="Registers"
+Count mtCPU_Stack=1
+mtCPU_Stack0="Stack"
+Count mtCPU_MemoryDump=1
+mtCPU_MemoryDump0="Memory Dump"
+Count mtSend_SuccessMsg=1
+mtSend_SuccessMsg0="The message was sent successfully."
+Count mtSend_FailureMsg=1
+mtSend_FailureMsg0="Sorry, sending the message didn't work."
+
+
diff --git a/Source/Modulos/Parametros/Cliente/Parametros.dpk b/Source/Modulos/Parametros/Cliente/Parametros.dpk
new file mode 100644
index 0000000..ee8633b
--- /dev/null
+++ b/Source/Modulos/Parametros/Cliente/Parametros.dpk
@@ -0,0 +1,58 @@
+package Parametros;
+
+{$R *.res}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO ON}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION ON}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES OFF}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$IMPLICITBUILD OFF}
+
+requires
+ rtl,
+ vcl,
+ dbrtl,
+ dsnap,
+ cxLibraryVCLD7,
+ dxThemeD7,
+ adortl,
+ DataAbstract_D7,
+ BaseD7,
+ ControlesBaseD7,
+ dxLayoutControlD7,
+ dxComnD7,
+ JvCoreD7R,
+ vcldb,
+ vcljpg,
+ vclx,
+ Jcl,
+ JclVcl,
+ JvStdCtrlsD7R,
+ JvSystemD7R,
+ tbx_d7,
+ tb2k_d7;
+
+contains
+ uDataModuleParametros in 'uDataModuleParametros.pas' {dmParametros: TDAClientDataModule},
+ schParametrosClient_Intf in '..\Reglas\schParametrosClient_Intf.pas',
+ uBizParametros in '..\Reglas\uBizParametros.pas',
+ uViewParametrosCentro in 'uViewParametrosCentro.pas' {frViewParametrosCentro: TCustomView},
+ uViewParametrosColeccion in 'uViewParametrosColeccion.pas' {frViewParametrosColeccion: TCustomView};
+
+end.
diff --git a/Source/Modulos/Parametros/Cliente/Parametros.drc b/Source/Modulos/Parametros/Cliente/Parametros.drc
new file mode 100644
index 0000000..a5d5271
--- /dev/null
+++ b/Source/Modulos/Parametros/Cliente/Parametros.drc
@@ -0,0 +1,14 @@
+/* VER150
+ Generated by the Borland Delphi Pascal Compiler
+ because -GD or --drc was supplied to the compiler.
+
+ This file contains compiler-generated resources that
+ were bound to the executable.
+ If this file is empty, then no compiler-generated
+ resources were bound to the produced executable.
+*/
+
+STRINGTABLE
+BEGIN
+END
+
diff --git a/Source/Modulos/Parametros/Cliente/Parametros.res b/Source/Modulos/Parametros/Cliente/Parametros.res
new file mode 100644
index 0000000..ec5f233
Binary files /dev/null and b/Source/Modulos/Parametros/Cliente/Parametros.res differ
diff --git a/Source/Modulos/Parametros/Cliente/uDataModuleParametros.ddp b/Source/Modulos/Parametros/Cliente/uDataModuleParametros.ddp
new file mode 100644
index 0000000..4370276
Binary files /dev/null and b/Source/Modulos/Parametros/Cliente/uDataModuleParametros.ddp differ
diff --git a/Source/Modulos/Parametros/Cliente/uDataModuleParametros.dfm b/Source/Modulos/Parametros/Cliente/uDataModuleParametros.dfm
new file mode 100644
index 0000000..7fc1c6a
--- /dev/null
+++ b/Source/Modulos/Parametros/Cliente/uDataModuleParametros.dfm
@@ -0,0 +1,278 @@
+object dmParametros: TdmParametros
+ OldCreateOrder = True
+ OnCreate = DAClientDataModuleCreate
+ RemoteService = RORemoteService
+ Adapter = dmBase.DABINAdapter
+ SchemaCall.MethodName = 'GetSchemaAsXML'
+ SchemaCall.Params = <
+ item
+ Name = 'Result'
+ ParamType = fResult
+ DataType = rtString
+ end>
+ Left = 532
+ Top = 343
+ Height = 297
+ Width = 620
+ object RORemoteService: TRORemoteService
+ ServiceName = 'srvParametros'
+ Message = dmBase.ROMessage
+ Channel = dmBase.ROChannel
+ Left = 40
+ Top = 32
+ end
+ object tbl_ListaCentros: TDACDSDataTable
+ RemoteUpdatesOptions = []
+ Fields = <
+ item
+ Name = 'CODFILIAL'
+ DataType = datString
+ Size = 6
+ BlobType = dabtUnknown
+ DisplayWidth = 0
+ Alignment = taLeftJustify
+ InPrimaryKey = False
+ Calculated = False
+ Lookup = False
+ LookupCache = False
+ end
+ item
+ Name = 'CODBARRA'
+ DataType = datString
+ Size = 17
+ BlobType = dabtUnknown
+ DisplayWidth = 0
+ Alignment = taLeftJustify
+ InPrimaryKey = False
+ Calculated = False
+ Lookup = False
+ LookupCache = False
+ end
+ item
+ Name = 'FILIAL'
+ DataType = datString
+ Size = 25
+ BlobType = dabtUnknown
+ DisplayWidth = 0
+ Alignment = taLeftJustify
+ InPrimaryKey = False
+ Calculated = False
+ Lookup = False
+ LookupCache = False
+ end>
+ Params = <>
+ MasterMappingMode = mmDataRequest
+ StreamingOptions = [soDisableEventsWhileStreaming]
+ SchemaCall.MethodName = 'GetDatasetSchema'
+ SchemaCall.Params = <
+ item
+ Name = 'Result'
+ ParamType = fResult
+ DataType = rtBinary
+ end
+ item
+ Name = 'aDatasetName'
+ ParamType = fIn
+ DataType = rtString
+ Value = 'ListaCentros'
+ end>
+ DataRequestCall.MethodName = 'GetDatasetDataEx'
+ DataRequestCall.Params = <
+ item
+ Name = 'Result'
+ ParamType = fResult
+ DataType = rtBinary
+ end
+ item
+ Name = 'DatasetName'
+ ParamType = fIn
+ DataType = rtString
+ Value = 'ListaCentros'
+ end
+ item
+ Name = 'Params'
+ ParamType = fIn
+ DataType = rtUserDefined
+ UserClassName = 'TDADatasetParamArray'
+ end
+ item
+ Name = 'UserFilter'
+ ParamType = fIn
+ DataType = rtString
+ Value = ''
+ end
+ item
+ Name = 'IncludeSchema'
+ ParamType = fIn
+ DataType = rtBoolean
+ Value = False
+ end
+ item
+ Name = 'MaxRecords'
+ ParamType = fIn
+ DataType = rtInteger
+ Value = -1
+ end>
+ DataUpdateCall.MethodName = 'UpdateData'
+ DataUpdateCall.Params = <
+ item
+ Name = 'Result'
+ ParamType = fResult
+ DataType = rtBinary
+ end
+ item
+ Name = 'Delta'
+ ParamType = fIn
+ DataType = rtBinary
+ end>
+ ScriptCall.MethodName = 'GetDatasetScripts'
+ ScriptCall.Params = <
+ item
+ Name = 'Result'
+ ParamType = fResult
+ DataType = rtString
+ Value = ''
+ end
+ item
+ Name = 'DatasetNames'
+ ParamType = fIn
+ DataType = rtString
+ Value = 'ListaCentros'
+ end>
+ ReadOnly = True
+ RemoteService = RORemoteService
+ Adapter = dmBase.DABINAdapter
+ DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
+ MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
+ LogicalName = 'ListaCentros'
+ IndexDefs = <>
+ Left = 160
+ Top = 96
+ end
+ object ds_ListaCentros: TDADataSource
+ DataTable = tbl_ListaCentros
+ Left = 160
+ Top = 32
+ end
+ object tbl_ListaColecciones: TDACDSDataTable
+ RemoteUpdatesOptions = []
+ Fields = <
+ item
+ Name = 'COLECAO'
+ DataType = datString
+ Size = 6
+ BlobType = dabtUnknown
+ DisplayWidth = 0
+ Alignment = taLeftJustify
+ InPrimaryKey = False
+ Calculated = False
+ Lookup = False
+ LookupCache = False
+ end
+ item
+ Name = 'DESC_COLECAO'
+ DataType = datString
+ Size = 40
+ BlobType = dabtUnknown
+ DisplayWidth = 0
+ Alignment = taLeftJustify
+ InPrimaryKey = False
+ Calculated = False
+ Lookup = False
+ LookupCache = False
+ end>
+ Params = <>
+ MasterMappingMode = mmDataRequest
+ StreamingOptions = [soDisableEventsWhileStreaming]
+ SchemaCall.MethodName = 'GetDatasetSchema'
+ SchemaCall.Params = <
+ item
+ Name = 'Result'
+ ParamType = fResult
+ DataType = rtBinary
+ end
+ item
+ Name = 'aDatasetName'
+ ParamType = fIn
+ DataType = rtString
+ Value = 'ListaColecciones'
+ end>
+ DataRequestCall.MethodName = 'GetDatasetDataEx'
+ DataRequestCall.Params = <
+ item
+ Name = 'Result'
+ ParamType = fResult
+ DataType = rtBinary
+ end
+ item
+ Name = 'DatasetName'
+ ParamType = fIn
+ DataType = rtString
+ Value = 'ListaColecciones'
+ end
+ item
+ Name = 'Params'
+ ParamType = fIn
+ DataType = rtUserDefined
+ UserClassName = 'TDADatasetParamArray'
+ end
+ item
+ Name = 'UserFilter'
+ ParamType = fIn
+ DataType = rtString
+ Value = ''
+ end
+ item
+ Name = 'IncludeSchema'
+ ParamType = fIn
+ DataType = rtBoolean
+ Value = False
+ end
+ item
+ Name = 'MaxRecords'
+ ParamType = fIn
+ DataType = rtInteger
+ Value = -1
+ end>
+ DataUpdateCall.MethodName = 'UpdateData'
+ DataUpdateCall.Params = <
+ item
+ Name = 'Result'
+ ParamType = fResult
+ DataType = rtBinary
+ end
+ item
+ Name = 'Delta'
+ ParamType = fIn
+ DataType = rtBinary
+ end>
+ ScriptCall.MethodName = 'GetDatasetScripts'
+ ScriptCall.Params = <
+ item
+ Name = 'Result'
+ ParamType = fResult
+ DataType = rtString
+ Value = ''
+ end
+ item
+ Name = 'DatasetNames'
+ ParamType = fIn
+ DataType = rtString
+ Value = 'ListaColecciones'
+ end>
+ ReadOnly = True
+ RemoteService = RORemoteService
+ Adapter = dmBase.DABINAdapter
+ DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
+ MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
+ LogicalName = 'ListaColecciones'
+ IndexDefs = <>
+ Left = 296
+ Top = 96
+ end
+ object dsListaColecciones: TDADataSource
+ DataTable = tbl_ListaColecciones
+ Left = 296
+ Top = 32
+ end
+end
diff --git a/Source/Modulos/Parametros/Cliente/uDataModuleParametros.pas b/Source/Modulos/Parametros/Cliente/uDataModuleParametros.pas
new file mode 100644
index 0000000..0744d2a
--- /dev/null
+++ b/Source/Modulos/Parametros/Cliente/uDataModuleParametros.pas
@@ -0,0 +1,76 @@
+unit uDataModuleParametros;
+
+interface
+
+uses {vcl:} SysUtils, Classes, DB, DBClient,
+ {RemObjects:} uDAClientDataModule, uDADataTable, uDAScriptingProvider,
+ uDACDSDataTable, uDABINAdapter, uDataModuleBase, uROClient,
+ uROServiceComponent, uRORemoteService, uBizParametros;
+
+type
+ TdmParametros = class(TDAClientDataModule)
+ RORemoteService: TRORemoteService;
+ tbl_ListaCentros: TDACDSDataTable;
+ ds_ListaCentros: TDADataSource;
+ tbl_ListaColecciones: TDACDSDataTable;
+ dsListaColecciones: TDADataSource;
+ procedure DAClientDataModuleCreate(Sender: TObject);
+ public
+ function GetCentros : IBizCentros;
+ function GetColecciones : IBizColecciones;
+ end;
+
+var
+ dmParametros: TdmParametros;
+
+implementation
+
+{$R *.DFM}
+
+uses
+ Forms, Windows, Controls, VARELA_Intf, uEditorPreview,
+ uDataTableUtils, uROTypes, cxControls, uDAInterfaces;
+
+procedure TdmParametros.DAClientDataModuleCreate(Sender: TObject);
+begin
+ RORemoteService.Channel := dmBase.Channel;
+ RORemoteService.Message := dmBase.Message;
+end;
+
+function TdmParametros.GetCentros: IBizCentros;
+var
+ dtLista: TDACDSDataTable;
+begin
+ ShowHourglassCursor;
+ try
+ dtLista := TDACDSDataTable.Create(NIL);
+ CloneDataTable(tbl_ListaCentros, dtLista);
+ dtLista.BusinessRulesID := BIZ_CENTROS;
+ Result := (dtLista as IBizCentros);
+ finally
+ HideHourglassCursor;
+ end;
+end;
+
+function TdmParametros.GetColecciones: IBizColecciones;
+var
+ dtLista: TDACDSDataTable;
+begin
+ ShowHourglassCursor;
+ try
+ dtLista := TDACDSDataTable.Create(NIL);
+ CloneDataTable(tbl_ListaColecciones, dtLista);
+ dtLista.BusinessRulesID := BIZ_COLECCIONES;
+ Result := (dtLista as IBizColecciones);
+ finally
+ HideHourglassCursor;
+ end;
+end;
+
+initialization
+ dmParametros := TdmParametros.Create(nil);
+
+finalization
+ FreeAndNil(dmParametros);
+
+end.
diff --git a/Source/Modulos/Parametros/Cliente/uViewParametrosCentro.ddp b/Source/Modulos/Parametros/Cliente/uViewParametrosCentro.ddp
new file mode 100644
index 0000000..4370276
Binary files /dev/null and b/Source/Modulos/Parametros/Cliente/uViewParametrosCentro.ddp differ
diff --git a/Source/Modulos/Parametros/Cliente/uViewParametrosCentro.dfm b/Source/Modulos/Parametros/Cliente/uViewParametrosCentro.dfm
new file mode 100644
index 0000000..5c280e3
--- /dev/null
+++ b/Source/Modulos/Parametros/Cliente/uViewParametrosCentro.dfm
@@ -0,0 +1,36 @@
+inherited frViewParametrosCentro: TfrViewParametrosCentro
+ Width = 587
+ Height = 42
+ object dxLayoutControl1: TdxLayoutControl
+ Left = 0
+ Top = 0
+ Width = 587
+ Height = 42
+ Align = alTop
+ ParentBackground = True
+ TabOrder = 0
+ AutoContentSizes = [acsWidth, acsHeight]
+ object ccbCentro: TJvCheckedComboBox
+ Left = 49
+ Top = 10
+ Width = 392
+ Height = 21
+ CapSelectAll = '&Select all'
+ CapDeSelectAll = '&Deselect all'
+ NoFocusColor = clWindow
+ QuoteStyle = qsSingle
+ DropDownLines = 20
+ TabOrder = 0
+ end
+ object dxLayoutControl1Group_Root: TdxLayoutGroup
+ ShowCaption = False
+ Hidden = True
+ ShowBorder = False
+ object dxLayoutControl1Item1: TdxLayoutItem
+ Caption = 'Centro:'
+ Control = ccbCentro
+ ControlOptions.ShowBorder = False
+ end
+ end
+ end
+end
diff --git a/Source/Modulos/Parametros/Cliente/uViewParametrosCentro.pas b/Source/Modulos/Parametros/Cliente/uViewParametrosCentro.pas
new file mode 100644
index 0000000..55d2ffe
--- /dev/null
+++ b/Source/Modulos/Parametros/Cliente/uViewParametrosCentro.pas
@@ -0,0 +1,91 @@
+unit uViewParametrosCentro;
+
+interface
+
+uses
+ Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+ Dialogs, dxLayoutControl, StdCtrls, Mask, JvExMask, JvToolEdit,
+ JvCombobox, cxControls, uViewParametrosControlGrid, TBXDkPanels,
+ uBizParametros;
+
+type
+ IViewParametrosCentro = interface(IViewParametrosControlGrid)
+ ['{AE4FC794-6D44-40A0-A138-09286870CBB0}']
+
+ function GetCentrosSeleccionados: TStringList;
+ property CentrosSeleccionados : TStringList read GetCentrosSeleccionados;
+ end;
+
+ TfrViewParametrosCentro = class(TfrViewParametrosControlGrid, IViewParametrosCentro)
+ dxLayoutControl1Group_Root: TdxLayoutGroup;
+ dxLayoutControl1: TdxLayoutControl;
+ dxLayoutControl1Item1: TdxLayoutItem;
+ ccbCentro: TJvCheckedComboBox;
+ private
+ FCentros : IBizCentros;
+ procedure RellenarListaCentros;
+ function GetCentrosSeleccionados: TStringList;
+ public
+ procedure Execute; override;
+ procedure Refresh; override;
+ property CentrosSeleccionados : TStringList read GetCentrosSeleccionados;
+ end;
+
+implementation
+
+uses
+ uDataModuleParametros, uDADataTable;
+
+{$R *.dfm}
+
+{ TfrViewParametrosCentro }
+
+procedure TfrViewParametrosCentro.Execute;
+begin
+ // inherited; <- no descomentar
+end;
+
+function TfrViewParametrosCentro.GetCentrosSeleccionados: TStringList;
+var
+ i : integer;
+begin
+ Result := TStringList.Create;
+
+ FCentros.DataTable.First;
+ for i := 0 to ccbCentro.Items.Count - 1 do
+ begin
+ if ccbCentro.Checked[i] then
+ Result.Add(FCentros.CODBARRA);
+ FCentros.DataTable.Next;
+ end;
+end;
+
+procedure TfrViewParametrosCentro.Refresh;
+begin
+ // inherited; <- no descomentar
+ RellenarListaCentros;
+end;
+
+procedure TfrViewParametrosCentro.RellenarListaCentros;
+var
+ i : Integer;
+begin
+ FCentros := dmParametros.GetCentros;
+ ccbCentro.Items.BeginUpdate;
+
+ ShowHourglassCursor;
+ try
+ ccbCentro.Items.Clear;
+ FCentros.DataTable.Active := True;
+ for i := 0 to FCentros.DataTable.RecordCount - 1 do
+ begin
+ ccbCentro.Items.Add(FCentros.FILIAL);
+ FCentros.DataTable.Next;
+ end;
+ finally
+ ccbCentro.Items.EndUpdate;
+ HideHourglassCursor;
+ end;
+end;
+
+end.
diff --git a/Source/Modulos/Parametros/Cliente/uViewParametrosColeccion.ddp b/Source/Modulos/Parametros/Cliente/uViewParametrosColeccion.ddp
new file mode 100644
index 0000000..4370276
Binary files /dev/null and b/Source/Modulos/Parametros/Cliente/uViewParametrosColeccion.ddp differ
diff --git a/Source/Modulos/Parametros/Cliente/uViewParametrosColeccion.dfm b/Source/Modulos/Parametros/Cliente/uViewParametrosColeccion.dfm
new file mode 100644
index 0000000..d268eee
--- /dev/null
+++ b/Source/Modulos/Parametros/Cliente/uViewParametrosColeccion.dfm
@@ -0,0 +1,36 @@
+inherited frViewParametrosColeccion: TfrViewParametrosColeccion
+ Width = 587
+ Height = 42
+ object dxLayoutControl1: TdxLayoutControl
+ Left = 0
+ Top = 0
+ Width = 587
+ Height = 42
+ Align = alTop
+ ParentBackground = True
+ TabOrder = 0
+ AutoContentSizes = [acsWidth, acsHeight]
+ object ccbColeccion: TJvCheckedComboBox
+ Left = 65
+ Top = 10
+ Width = 512
+ Height = 21
+ CapSelectAll = '&Select all'
+ CapDeSelectAll = '&Deselect all'
+ NoFocusColor = clWindow
+ QuoteStyle = qsSingle
+ DropDownLines = 20
+ TabOrder = 0
+ end
+ object dxLayoutControl1Group_Root: TdxLayoutGroup
+ ShowCaption = False
+ Hidden = True
+ ShowBorder = False
+ object dxLayoutControl1Item1: TdxLayoutItem
+ Caption = 'Colecci'#243'n:'
+ Control = ccbColeccion
+ ControlOptions.ShowBorder = False
+ end
+ end
+ end
+end
diff --git a/Source/Modulos/Parametros/Cliente/uViewParametrosColeccion.pas b/Source/Modulos/Parametros/Cliente/uViewParametrosColeccion.pas
new file mode 100644
index 0000000..f8ee182
--- /dev/null
+++ b/Source/Modulos/Parametros/Cliente/uViewParametrosColeccion.pas
@@ -0,0 +1,91 @@
+unit uViewParametrosColeccion;
+
+interface
+
+uses
+ Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+ Dialogs, dxLayoutControl, StdCtrls, Mask, JvExMask, JvToolEdit,
+ JvCombobox, cxControls, uViewParametrosControlGrid, TBXDkPanels,
+ uBizParametros;
+
+type
+ IViewParametrosColeccion = interface(IViewParametrosControlGrid)
+ ['{5523284E-4445-4026-AFAC-B243C19F0DA7}']
+
+ function GetColeccionesSeleccionadas: TStringList;
+ property ColeccionesSeleccionadas : TStringList read GetColeccionesSeleccionadas;
+ end;
+
+ TfrViewParametrosColeccion = class(TfrViewParametrosControlGrid, IViewParametrosColeccion)
+ dxLayoutControl1Group_Root: TdxLayoutGroup;
+ dxLayoutControl1: TdxLayoutControl;
+ ccbColeccion: TJvCheckedComboBox;
+ dxLayoutControl1Item1: TdxLayoutItem;
+ private
+ FColecciones : IBizColecciones;
+ procedure RellenarListaColecciones;
+ function GetColeccionesSeleccionadas: TStringList;
+ public
+ procedure Execute; override;
+ procedure Refresh; override;
+ property ColeccionesSeleccionadas : TStringList read GetColeccionesSeleccionadas;
+ end;
+
+implementation
+
+uses
+ uDataModuleParametros, uDADataTable;
+
+{$R *.dfm}
+
+{ TfrViewParametrosColeccion }
+
+procedure TfrViewParametrosColeccion.Execute;
+begin
+ // inherited; <- no descomentar
+end;
+
+function TfrViewParametrosColeccion.GetColeccionesSeleccionadas: TStringList;
+var
+ i : integer;
+begin
+ Result := TStringList.Create;
+
+ FColecciones.DataTable.First;
+ for i := 0 to ccbColeccion.Items.Count - 1 do
+ begin
+ if ccbColeccion.Checked[i] then
+ Result.Add(FColecciones.COLECAO);
+ FColecciones.DataTable.Next;
+ end;
+end;
+
+procedure TfrViewParametrosColeccion.Refresh;
+begin
+ // inherited; <- no descomentar
+ RellenarListaColecciones;
+end;
+
+procedure TfrViewParametrosColeccion.RellenarListaColecciones;
+var
+ i : Integer;
+begin
+ FColecciones := dmParametros.GetColecciones;
+ ccbColeccion.Items.BeginUpdate;
+
+ ShowHourglassCursor;
+ try
+ ccbColeccion.Items.Clear;
+ FColecciones.DataTable.Active := True;
+ for i := 0 to FColecciones.DataTable.RecordCount - 1 do
+ begin
+ ccbColeccion.Items.Add(FColecciones.DESC_COLECAO);
+ FColecciones.DataTable.Next;
+ end;
+ finally
+ ccbColeccion.Items.EndUpdate;
+ HideHourglassCursor;
+ end;
+end;
+
+end.
diff --git a/Source/Modulos/Parametros/Reglas/schParametrosClient_Intf.pas b/Source/Modulos/Parametros/Reglas/schParametrosClient_Intf.pas
new file mode 100644
index 0000000..fb835f0
--- /dev/null
+++ b/Source/Modulos/Parametros/Reglas/schParametrosClient_Intf.pas
@@ -0,0 +1,196 @@
+unit schParametrosClient_Intf;
+
+interface
+
+uses
+ Classes, DB, SysUtils, uROClasses, uDADataTable;
+
+const
+ { Data table rules ids
+ Feel free to change them to something more human readable
+ but make sure they are unique in the context of your application }
+ RID_ListaCentros = '{CE7EAA4D-6A5B-418E-931E-61BC59E87921}';
+ RID_ListaColecciones = '{30AF285C-6577-445D-A759-78E8EC8275BF}';
+
+ { Data table names }
+ nme_ListaCentros = 'ListaCentros';
+ nme_ListaColecciones = 'ListaColecciones';
+
+ { ListaCentros fields }
+ fld_ListaCentrosCODFILIAL = 'CODFILIAL';
+ fld_ListaCentrosCODBARRA = 'CODBARRA';
+ fld_ListaCentrosFILIAL = 'FILIAL';
+
+ { ListaCentros field indexes }
+ idx_ListaCentrosCODFILIAL = 0;
+ idx_ListaCentrosCODBARRA = 1;
+ idx_ListaCentrosFILIAL = 2;
+
+ { ListaColecciones fields }
+ fld_ListaColeccionesCOLECAO = 'COLECAO';
+ fld_ListaColeccionesDESC_COLECAO = 'DESC_COLECAO';
+
+ { ListaColecciones field indexes }
+ idx_ListaColeccionesCOLECAO = 0;
+ idx_ListaColeccionesDESC_COLECAO = 1;
+
+type
+ { IListaCentros }
+ IListaCentros = interface(IDAStronglyTypedDataTable)
+ ['{FF4F6460-CEBC-40C5-A2B9-7ED81AE90A7A}']
+ { Property getters and setters }
+ function GetCODFILIALValue: String;
+ procedure SetCODFILIALValue(const aValue: String);
+ function GetCODBARRAValue: String;
+ procedure SetCODBARRAValue(const aValue: String);
+ function GetFILIALValue: String;
+ procedure SetFILIALValue(const aValue: String);
+
+
+ { Properties }
+ property CODFILIAL: String read GetCODFILIALValue write SetCODFILIALValue;
+ property CODBARRA: String read GetCODBARRAValue write SetCODBARRAValue;
+ property FILIAL: String read GetFILIALValue write SetFILIALValue;
+ end;
+
+ { TListaCentrosDataTableRules }
+ TListaCentrosDataTableRules = class(TDADataTableRules, IListaCentros)
+ private
+ protected
+ { Property getters and setters }
+ function GetCODFILIALValue: String; virtual;
+ procedure SetCODFILIALValue(const aValue: String); virtual;
+ function GetCODBARRAValue: String; virtual;
+ procedure SetCODBARRAValue(const aValue: String); virtual;
+ function GetFILIALValue: String; virtual;
+ procedure SetFILIALValue(const aValue: String); virtual;
+
+ { Properties }
+ property CODFILIAL: String read GetCODFILIALValue write SetCODFILIALValue;
+ property CODBARRA: String read GetCODBARRAValue write SetCODBARRAValue;
+ property FILIAL: String read GetFILIALValue write SetFILIALValue;
+
+ public
+ constructor Create(aDataTable: TDADataTable); override;
+ destructor Destroy; override;
+
+ end;
+
+ { IListaColecciones }
+ IListaColecciones = interface(IDAStronglyTypedDataTable)
+ ['{6EACE103-97D5-4D08-9BA5-DC24826BD4C8}']
+ { Property getters and setters }
+ function GetCOLECAOValue: String;
+ procedure SetCOLECAOValue(const aValue: String);
+ function GetDESC_COLECAOValue: String;
+ procedure SetDESC_COLECAOValue(const aValue: String);
+
+
+ { Properties }
+ property COLECAO: String read GetCOLECAOValue write SetCOLECAOValue;
+ property DESC_COLECAO: String read GetDESC_COLECAOValue write SetDESC_COLECAOValue;
+ end;
+
+ { TListaColeccionesDataTableRules }
+ TListaColeccionesDataTableRules = class(TDADataTableRules, IListaColecciones)
+ private
+ protected
+ { Property getters and setters }
+ function GetCOLECAOValue: String; virtual;
+ procedure SetCOLECAOValue(const aValue: String); virtual;
+ function GetDESC_COLECAOValue: String; virtual;
+ procedure SetDESC_COLECAOValue(const aValue: String); virtual;
+
+ { Properties }
+ property COLECAO: String read GetCOLECAOValue write SetCOLECAOValue;
+ property DESC_COLECAO: String read GetDESC_COLECAOValue write SetDESC_COLECAOValue;
+
+ public
+ constructor Create(aDataTable: TDADataTable); override;
+ destructor Destroy; override;
+
+ end;
+
+implementation
+
+uses Variants;
+
+{ TListaCentrosDataTableRules }
+constructor TListaCentrosDataTableRules.Create(aDataTable: TDADataTable);
+begin
+ inherited;
+end;
+
+destructor TListaCentrosDataTableRules.Destroy;
+begin
+ inherited;
+end;
+
+function TListaCentrosDataTableRules.GetCODFILIALValue: String;
+begin
+ result := DataTable.Fields[idx_ListaCentrosCODFILIAL].AsString;
+end;
+
+procedure TListaCentrosDataTableRules.SetCODFILIALValue(const aValue: String);
+begin
+ DataTable.Fields[idx_ListaCentrosCODFILIAL].AsString := aValue;
+end;
+
+function TListaCentrosDataTableRules.GetCODBARRAValue: String;
+begin
+ result := DataTable.Fields[idx_ListaCentrosCODBARRA].AsString;
+end;
+
+procedure TListaCentrosDataTableRules.SetCODBARRAValue(const aValue: String);
+begin
+ DataTable.Fields[idx_ListaCentrosCODBARRA].AsString := aValue;
+end;
+
+function TListaCentrosDataTableRules.GetFILIALValue: String;
+begin
+ result := DataTable.Fields[idx_ListaCentrosFILIAL].AsString;
+end;
+
+procedure TListaCentrosDataTableRules.SetFILIALValue(const aValue: String);
+begin
+ DataTable.Fields[idx_ListaCentrosFILIAL].AsString := aValue;
+end;
+
+
+{ TListaColeccionesDataTableRules }
+constructor TListaColeccionesDataTableRules.Create(aDataTable: TDADataTable);
+begin
+ inherited;
+end;
+
+destructor TListaColeccionesDataTableRules.Destroy;
+begin
+ inherited;
+end;
+
+function TListaColeccionesDataTableRules.GetCOLECAOValue: String;
+begin
+ result := DataTable.Fields[idx_ListaColeccionesCOLECAO].AsString;
+end;
+
+procedure TListaColeccionesDataTableRules.SetCOLECAOValue(const aValue: String);
+begin
+ DataTable.Fields[idx_ListaColeccionesCOLECAO].AsString := aValue;
+end;
+
+function TListaColeccionesDataTableRules.GetDESC_COLECAOValue: String;
+begin
+ result := DataTable.Fields[idx_ListaColeccionesDESC_COLECAO].AsString;
+end;
+
+procedure TListaColeccionesDataTableRules.SetDESC_COLECAOValue(const aValue: String);
+begin
+ DataTable.Fields[idx_ListaColeccionesDESC_COLECAO].AsString := aValue;
+end;
+
+
+initialization
+ RegisterDataTableRules(RID_ListaCentros, TListaCentrosDataTableRules);
+ RegisterDataTableRules(RID_ListaColecciones, TListaColeccionesDataTableRules);
+
+end.
diff --git a/Source/Modulos/Parametros/Reglas/schParametrosServer_Intf.pas b/Source/Modulos/Parametros/Reglas/schParametrosServer_Intf.pas
new file mode 100644
index 0000000..9bd380b
--- /dev/null
+++ b/Source/Modulos/Parametros/Reglas/schParametrosServer_Intf.pas
@@ -0,0 +1,203 @@
+unit schParametrosServer_Intf;
+
+interface
+
+uses
+ Classes, DB, SysUtils, uROClasses, uDADataTable, uDABusinessProcessor, schParametrosClient_Intf;
+
+const
+ { Delta rules ids
+ Feel free to change them to something more human readable
+ but make sure they are unique in the context of your application }
+ RID_ListaCentrosDelta = '{5AAFEEF2-8098-4A72-BC66-D67CF1CE1D1A}';
+ RID_ListaColeccionesDelta = '{98EF7287-301A-462F-AF86-9EDE8B21DFA7}';
+
+type
+ { IListaCentrosDelta }
+ IListaCentrosDelta = interface(IListaCentros)
+ ['{5AAFEEF2-8098-4A72-BC66-D67CF1CE1D1A}']
+ { Property getters and setters }
+ function GetOldCODFILIALValue : String;
+ function GetOldCODBARRAValue : String;
+ function GetOldFILIALValue : String;
+
+ { Properties }
+ property OldCODFILIAL : String read GetOldCODFILIALValue;
+ property OldCODBARRA : String read GetOldCODBARRAValue;
+ property OldFILIAL : String read GetOldFILIALValue;
+ end;
+
+ { TListaCentrosBusinessProcessorRules }
+ TListaCentrosBusinessProcessorRules = class(TDABusinessProcessorRules, IListaCentros, IListaCentrosDelta)
+ private
+ protected
+ { Property getters and setters }
+ function GetCODFILIALValue: String; virtual;
+ function GetOldCODFILIALValue: String; virtual;
+ procedure SetCODFILIALValue(const aValue: String); virtual;
+ function GetCODBARRAValue: String; virtual;
+ function GetOldCODBARRAValue: String; virtual;
+ procedure SetCODBARRAValue(const aValue: String); virtual;
+ function GetFILIALValue: String; virtual;
+ function GetOldFILIALValue: String; virtual;
+ procedure SetFILIALValue(const aValue: String); virtual;
+
+ { Properties }
+ property CODFILIAL : String read GetCODFILIALValue write SetCODFILIALValue;
+ property OldCODFILIAL : String read GetOldCODFILIALValue;
+ property CODBARRA : String read GetCODBARRAValue write SetCODBARRAValue;
+ property OldCODBARRA : String read GetOldCODBARRAValue;
+ property FILIAL : String read GetFILIALValue write SetFILIALValue;
+ property OldFILIAL : String read GetOldFILIALValue;
+
+ public
+ constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
+ destructor Destroy; override;
+
+ end;
+
+ { IListaColeccionesDelta }
+ IListaColeccionesDelta = interface(IListaColecciones)
+ ['{98EF7287-301A-462F-AF86-9EDE8B21DFA7}']
+ { Property getters and setters }
+ function GetOldCOLECAOValue : String;
+ function GetOldDESC_COLECAOValue : String;
+
+ { Properties }
+ property OldCOLECAO : String read GetOldCOLECAOValue;
+ property OldDESC_COLECAO : String read GetOldDESC_COLECAOValue;
+ end;
+
+ { TListaColeccionesBusinessProcessorRules }
+ TListaColeccionesBusinessProcessorRules = class(TDABusinessProcessorRules, IListaColecciones, IListaColeccionesDelta)
+ private
+ protected
+ { Property getters and setters }
+ function GetCOLECAOValue: String; virtual;
+ function GetOldCOLECAOValue: String; virtual;
+ procedure SetCOLECAOValue(const aValue: String); virtual;
+ function GetDESC_COLECAOValue: String; virtual;
+ function GetOldDESC_COLECAOValue: String; virtual;
+ procedure SetDESC_COLECAOValue(const aValue: String); virtual;
+
+ { Properties }
+ property COLECAO : String read GetCOLECAOValue write SetCOLECAOValue;
+ property OldCOLECAO : String read GetOldCOLECAOValue;
+ property DESC_COLECAO : String read GetDESC_COLECAOValue write SetDESC_COLECAOValue;
+ property OldDESC_COLECAO : String read GetOldDESC_COLECAOValue;
+
+ public
+ constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
+ destructor Destroy; override;
+
+ end;
+
+implementation
+
+uses
+ Variants, uROBinaryHelpers;
+
+{ TListaCentrosBusinessProcessorRules }
+constructor TListaCentrosBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
+begin
+ inherited;
+end;
+
+destructor TListaCentrosBusinessProcessorRules.Destroy;
+begin
+ inherited;
+end;
+
+function TListaCentrosBusinessProcessorRules.GetCODFILIALValue: String;
+begin
+ result := BusinessProcessor.CurrentChange.NewValueByName[fld_ListaCentrosCODFILIAL];
+end;
+
+function TListaCentrosBusinessProcessorRules.GetOldCODFILIALValue: String;
+begin
+ result := BusinessProcessor.CurrentChange.OldValueByName[fld_ListaCentrosCODFILIAL];
+end;
+
+procedure TListaCentrosBusinessProcessorRules.SetCODFILIALValue(const aValue: String);
+begin
+ BusinessProcessor.CurrentChange.NewValueByName[fld_ListaCentrosCODFILIAL] := aValue;
+end;
+
+function TListaCentrosBusinessProcessorRules.GetCODBARRAValue: String;
+begin
+ result := BusinessProcessor.CurrentChange.NewValueByName[fld_ListaCentrosCODBARRA];
+end;
+
+function TListaCentrosBusinessProcessorRules.GetOldCODBARRAValue: String;
+begin
+ result := BusinessProcessor.CurrentChange.OldValueByName[fld_ListaCentrosCODBARRA];
+end;
+
+procedure TListaCentrosBusinessProcessorRules.SetCODBARRAValue(const aValue: String);
+begin
+ BusinessProcessor.CurrentChange.NewValueByName[fld_ListaCentrosCODBARRA] := aValue;
+end;
+
+function TListaCentrosBusinessProcessorRules.GetFILIALValue: String;
+begin
+ result := BusinessProcessor.CurrentChange.NewValueByName[fld_ListaCentrosFILIAL];
+end;
+
+function TListaCentrosBusinessProcessorRules.GetOldFILIALValue: String;
+begin
+ result := BusinessProcessor.CurrentChange.OldValueByName[fld_ListaCentrosFILIAL];
+end;
+
+procedure TListaCentrosBusinessProcessorRules.SetFILIALValue(const aValue: String);
+begin
+ BusinessProcessor.CurrentChange.NewValueByName[fld_ListaCentrosFILIAL] := aValue;
+end;
+
+
+{ TListaColeccionesBusinessProcessorRules }
+constructor TListaColeccionesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
+begin
+ inherited;
+end;
+
+destructor TListaColeccionesBusinessProcessorRules.Destroy;
+begin
+ inherited;
+end;
+
+function TListaColeccionesBusinessProcessorRules.GetCOLECAOValue: String;
+begin
+ result := BusinessProcessor.CurrentChange.NewValueByName[fld_ListaColeccionesCOLECAO];
+end;
+
+function TListaColeccionesBusinessProcessorRules.GetOldCOLECAOValue: String;
+begin
+ result := BusinessProcessor.CurrentChange.OldValueByName[fld_ListaColeccionesCOLECAO];
+end;
+
+procedure TListaColeccionesBusinessProcessorRules.SetCOLECAOValue(const aValue: String);
+begin
+ BusinessProcessor.CurrentChange.NewValueByName[fld_ListaColeccionesCOLECAO] := aValue;
+end;
+
+function TListaColeccionesBusinessProcessorRules.GetDESC_COLECAOValue: String;
+begin
+ result := BusinessProcessor.CurrentChange.NewValueByName[fld_ListaColeccionesDESC_COLECAO];
+end;
+
+function TListaColeccionesBusinessProcessorRules.GetOldDESC_COLECAOValue: String;
+begin
+ result := BusinessProcessor.CurrentChange.OldValueByName[fld_ListaColeccionesDESC_COLECAO];
+end;
+
+procedure TListaColeccionesBusinessProcessorRules.SetDESC_COLECAOValue(const aValue: String);
+begin
+ BusinessProcessor.CurrentChange.NewValueByName[fld_ListaColeccionesDESC_COLECAO] := aValue;
+end;
+
+
+initialization
+ RegisterBusinessProcessorRules(RID_ListaCentrosDelta, TListaCentrosBusinessProcessorRules);
+ RegisterBusinessProcessorRules(RID_ListaColeccionesDelta, TListaColeccionesBusinessProcessorRules);
+
+end.
diff --git a/Source/Modulos/Parametros/Reglas/uBizParametros.pas b/Source/Modulos/Parametros/Reglas/uBizParametros.pas
new file mode 100644
index 0000000..b7ec883
--- /dev/null
+++ b/Source/Modulos/Parametros/Reglas/uBizParametros.pas
@@ -0,0 +1,49 @@
+{*******************************************************}
+{ }
+{ Administración de puntos de venta }
+{ }
+{ Copyright (C) 2007 Rodax Software S.L. }
+{ }
+{*******************************************************}
+
+unit uBizParametros;
+
+interface
+
+uses
+ Classes, DB, SysUtils, uROClasses, uDADataTable, uDBSelectionList,
+ schParametrosClient_Intf;
+
+
+const
+ BIZ_CENTROS = 'Client.Centros';
+ BIZ_COLECCIONES = 'Client.Colecciones';
+
+type
+ IBizCentros = interface(IListaCentros)
+ ['{1B5A35E8-1243-4222-BB86-558574C0F2AE}']
+ end;
+
+ IBizColecciones = interface(IListaColecciones)
+ ['{BF62BD66-69B4-4134-954E-724C7C65CB5C}']
+ end;
+
+ TBizCentrosDataTableRules = class(TListaCentrosDataTableRules, IBizCentros)
+ end;
+
+ TBizColeccionesDataTableRules = class(TListaColeccionesDataTableRules, IBizColecciones)
+ end;
+
+implementation
+
+uses
+ uDataModuleParametros;
+
+{ TBizCentrosDataTableRules }
+
+initialization
+ RegisterDataTableRules(BIZ_CENTROS, TBizCentrosDataTableRules);
+ RegisterDataTableRules(BIZ_COLECCIONES, TBizColeccionesDataTableRules);
+
+end.
+
diff --git a/Source/Modulos/Parametros/Servidor/srvParametros_Impl.ddp b/Source/Modulos/Parametros/Servidor/srvParametros_Impl.ddp
new file mode 100644
index 0000000..4370276
Binary files /dev/null and b/Source/Modulos/Parametros/Servidor/srvParametros_Impl.ddp differ
diff --git a/Source/Modulos/Parametros/Servidor/srvParametros_Impl.dfm b/Source/Modulos/Parametros/Servidor/srvParametros_Impl.dfm
new file mode 100644
index 0000000..18d51f9
--- /dev/null
+++ b/Source/Modulos/Parametros/Servidor/srvParametros_Impl.dfm
@@ -0,0 +1,143 @@
+object srvParametros: TsrvParametros
+ OldCreateOrder = True
+ SessionManager = dmServer.SessionManager
+ AcquireConnection = True
+ ServiceSchema = schParametros
+ ServiceAdapter = DABINAdapter
+ Left = 718
+ Top = 370
+ Height = 300
+ Width = 300
+ object schParametros: TDASchema
+ ConnectionManager = dmServer.ConnectionManager
+ DataDictionary = dmServer.DataDictionary
+ Diagrams = dmServer.DADiagrams
+ Datasets = <
+ item
+ Params = <>
+ Statements = <
+ item
+ Connection = 'GFT_VARELA'
+ TargetTable = 'RDX_INFORMES'
+ SQL =
+ 'SELECT'#10' RDX_FILIALES.CODFILIAL, RDX_FILIALES.CODBARRA, FILI' +
+ 'AIS.FILIAL'#10'FROM'#10' RDX_FILIALES INNER JOIN FILIAIS ON (RDX_FILI' +
+ 'ALES.CODFILIAL = FILIAIS.COD_FILIAL)'#10'WHERE'#10' RDX_FILIALES.COD' +
+ 'FILIAL <> '#39'000001'#39
+ StatementType = stSQL
+ ColumnMappings = <
+ item
+ DatasetField = 'CODFILIAL'
+ TableField = 'CODFILIAL'
+ end
+ item
+ DatasetField = 'CODBARRA'
+ TableField = 'CODBARRA'
+ end
+ item
+ DatasetField = 'FILIAL'
+ TableField = 'FILIAL'
+ end>
+ end>
+ Name = 'ListaCentros'
+ Fields = <
+ item
+ Name = 'CODFILIAL'
+ DataType = datString
+ Size = 6
+ BlobType = dabtUnknown
+ DisplayWidth = 0
+ Alignment = taLeftJustify
+ InPrimaryKey = False
+ Calculated = False
+ Lookup = False
+ LookupCache = False
+ end
+ item
+ Name = 'CODBARRA'
+ DataType = datString
+ Size = 17
+ BlobType = dabtUnknown
+ DisplayWidth = 0
+ Alignment = taLeftJustify
+ InPrimaryKey = False
+ Calculated = False
+ Lookup = False
+ LookupCache = False
+ end
+ item
+ Name = 'FILIAL'
+ DataType = datString
+ Size = 25
+ BlobType = dabtUnknown
+ DisplayWidth = 0
+ Alignment = taLeftJustify
+ InPrimaryKey = False
+ Calculated = False
+ Lookup = False
+ LookupCache = False
+ end>
+ BusinessRulesClient.ScriptLanguage = rslPascalScript
+ BusinessRulesServer.ScriptLanguage = rslPascalScript
+ end
+ item
+ Params = <>
+ Statements = <
+ item
+ Connection = 'GFT_VARELA'
+ TargetTable = 'RDX_INFORMES'
+ SQL =
+ 'SELECT'#10' COLECOES.COLECAO, COLECOES.DESC_COLECAO'#10'FROM'#10' CO' +
+ 'LECOES'#10'WHERE'#10' COLECOES.COLECAO NOT IN ('#39'IND'#39', '#39'PRI'#39', '#39'009'#39')'#10 +
+ 'ORDER BY COLECOES.COLECAO DESC'
+ StatementType = stSQL
+ ColumnMappings = <
+ item
+ DatasetField = 'COLECAO'
+ TableField = 'COLECAO'
+ end
+ item
+ DatasetField = 'DESC_COLECAO'
+ TableField = 'DESC_COLECAO'
+ end>
+ end>
+ Name = 'ListaColecciones'
+ Fields = <
+ item
+ Name = 'COLECAO'
+ DataType = datString
+ Size = 6
+ BlobType = dabtUnknown
+ DisplayWidth = 0
+ Alignment = taLeftJustify
+ InPrimaryKey = False
+ Calculated = False
+ Lookup = False
+ LookupCache = False
+ end
+ item
+ Name = 'DESC_COLECAO'
+ DataType = datString
+ Size = 40
+ BlobType = dabtUnknown
+ DisplayWidth = 0
+ Alignment = taLeftJustify
+ InPrimaryKey = False
+ Calculated = False
+ Lookup = False
+ LookupCache = False
+ end>
+ BusinessRulesClient.ScriptLanguage = rslPascalScript
+ BusinessRulesServer.ScriptLanguage = rslPascalScript
+ end>
+ Commands = <>
+ RelationShips = <>
+ UpdateRules = <>
+ Left = 40
+ Top = 24
+ end
+ object DABINAdapter: TDABINAdapter
+ Left = 40
+ Top = 96
+ end
+end
diff --git a/Source/Modulos/Parametros/Servidor/srvParametros_Impl.pas b/Source/Modulos/Parametros/Servidor/srvParametros_Impl.pas
new file mode 100644
index 0000000..364b265
--- /dev/null
+++ b/Source/Modulos/Parametros/Servidor/srvParametros_Impl.pas
@@ -0,0 +1,48 @@
+unit srvParametros_Impl;
+
+{----------------------------------------------------------------------------}
+{ This unit was automatically generated by the RemObjects SDK after reading }
+{ the RODL file associated with this project . }
+{ }
+{ This is where you are supposed to code the implementation of your objects. }
+{----------------------------------------------------------------------------}
+
+interface
+
+uses
+ {vcl:} Classes, SysUtils,
+ {RemObjects:} uROClientIntf, uROTypes, uROServer, uROServerIntf, uROSessions,
+ {Ancestor Implementation:} DARemoteService_Impl,
+ {Used RODLs:} DataAbstract_Intf,
+ {Generated:} VARELA_Intf, uDAScriptingProvider, uDABusinessProcessor,
+ uDAClasses, uDADataTable, uDABINAdapter;
+
+
+type
+ { TsrvParametros }
+ TsrvParametros = class(TDARemoteService, IsrvParametros)
+ DABINAdapter: TDABINAdapter;
+ schParametros: TDASchema;
+ private
+ protected
+ { IsrvParametros methods }
+ end;
+
+implementation
+
+{$R *.dfm}
+uses
+ {Generated:} VARELA_Invk, uDataModuleServer;
+
+procedure Create_srvParametros(out anInstance : IUnknown);
+begin
+ anInstance := TsrvParametros.Create(NIL);
+end;
+
+{ srvParametros }
+initialization
+ TROClassFactory.Create('srvParametros', Create_srvParametros, TsrvParametros_Invoker);
+
+finalization
+
+end.
diff --git a/Source/Modulos/Recepciones/Cliente/Recepciones.dof b/Source/Modulos/Recepciones/Cliente/Recepciones.dof
index f5bd34e..a44450d 100644
--- a/Source/Modulos/Recepciones/Cliente/Recepciones.dof
+++ b/Source/Modulos/Recepciones/Cliente/Recepciones.dof
@@ -149,8 +149,8 @@ Count=1
Item0=.\
[HistoryLists\hlOutputDirectorry]
Count=2
-Item0=..\..\Output\Servidor
-Item1=..\..\Output\Cliente
+Item0=..\..\Output\Cliente
+Item1=..\..\Output\Servidor
[HistoryLists\hlBPLOutput]
Count=3
Item0=..\Lib
diff --git a/Source/Modulos/Recepciones/Cliente/Recepciones.dpk b/Source/Modulos/Recepciones/Cliente/Recepciones.dpk
index 72cafaf..d44a89d 100644
--- a/Source/Modulos/Recepciones/Cliente/Recepciones.dpk
+++ b/Source/Modulos/Recepciones/Cliente/Recepciones.dpk
@@ -56,6 +56,7 @@ requires
vcldb,
JvGlobusD7R,
ControlesBaseD7,
+ Parametros,
cxGridVCLD7,
cxPageControlVCLD7,
cxExtEditorsVCLD7,
@@ -81,4 +82,5 @@ contains
uViewListaRecepcionesAlbaran in 'uViewListaRecepcionesAlbaran.pas' {frViewListaRecepcionesAlbaran: TCustomView},
uEditorListaRecepcionesAlbaran in 'uEditorListaRecepcionesAlbaran.pas' {fEditorListaRecepcionesAlbaran: TCustomEditor};
+
end.
diff --git a/Source/Modulos/Recepciones/Cliente/uEditorAjustarRecepciones.ddp b/Source/Modulos/Recepciones/Cliente/uEditorAjustarRecepciones.ddp
new file mode 100644
index 0000000..4370276
Binary files /dev/null and b/Source/Modulos/Recepciones/Cliente/uEditorAjustarRecepciones.ddp differ
diff --git a/Source/Modulos/Recepciones/Cliente/uEditorAjustarRecepciones.pas b/Source/Modulos/Recepciones/Cliente/uEditorAjustarRecepciones.pas
index 133e0a3..633791b 100644
--- a/Source/Modulos/Recepciones/Cliente/uEditorAjustarRecepciones.pas
+++ b/Source/Modulos/Recepciones/Cliente/uEditorAjustarRecepciones.pas
@@ -200,6 +200,7 @@ end;
procedure TfEditorAjustarRecepciones.bAceptarClick(Sender: TObject);
begin
ShowHourglassCursor;
+ Application.ProcessMessages;
try
SalvarValores;
FItems.DataTable.ApplyUpdates;
diff --git a/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm b/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm
index a3a9c51..8d22c05 100644
--- a/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm
+++ b/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm
@@ -1,20 +1,20 @@
inherited fEditorListaRecepciones: TfEditorListaRecepciones
- Left = 283
- Top = 206
- Width = 909
- Height = 671
+ Left = 448
+ Top = 221
+ Width = 824
+ Height = 698
Caption = 'Control de recepciones'
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
- Width = 901
+ Width = 816
Caption = 'Control de recepciones'
inherited Image1: TImage
- Left = 874
+ Left = 789
end
end
inherited TBXDock: TTBXDock
- Width = 901
+ Width = 816
inherited tbxMain: TTBXToolbar
object TBXSubmenuItem2: TTBXSubmenuItem [5]
Caption = 'Cambiar el estado'
@@ -44,13 +44,13 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
end
end
inherited StatusBar: TStatusBar
- Top = 618
- Width = 901
+ Top = 645
+ Width = 816
end
object JvTabBar1: TJvTabBar [3]
Left = 0
- Top = 76
- Width = 901
+ Top = 137
+ Width = 816
Height = 29
Cursor = crHandPoint
CloseButton = False
@@ -73,9 +73,9 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
end
inline frViewListaRecepciones1: TfrViewListaRecepciones [4]
Left = 0
- Top = 105
- Width = 901
- Height = 513
+ Top = 166
+ Width = 816
+ Height = 479
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -86,8 +86,8 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
TabOrder = 4
ReadOnly = False
inherited cxGrid: TcxGrid
- Width = 901
- Height = 513
+ Width = 816
+ Height = 479
inherited cxGridView: TcxGridDBTableView
PopupMenu = GridPopupMenu
DataController.Summary.DefaultGroupSummaryItems = <
@@ -113,7 +113,74 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
end
end
end
- inherited EditorActionList: TActionList [5]
+ object TBXDockablePanel1: TTBXDockablePanel [5]
+ Left = 0
+ Top = 76
+ MaxClientHeight = 61
+ Align = alTop
+ Caption = 'TBXDockablePanel1'
+ FloatingWidth = 128
+ FloatingHeight = 128
+ SupportedDocks = [dkStandardDock, dkMultiDock]
+ TabOrder = 5
+ inline frViewParametrosCentro1: TfrViewParametrosCentro
+ Left = 0
+ Top = 19
+ Width = 425
+ Height = 42
+ Align = alLeft
+ TabOrder = 0
+ ReadOnly = False
+ inherited dxLayoutControl1: TdxLayoutControl
+ Width = 425
+ inherited ccbCentro: TJvCheckedComboBox
+ Left = 52
+ Width = 392
+ end
+ end
+ end
+ object TBXLabel1: TTBXLabel
+ Left = 0
+ Top = 0
+ Width = 816
+ Height = 19
+ Align = alTop
+ Caption = 'Par'#225'metros de consulta'
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -11
+ Font.Name = 'MS Sans Serif'
+ Font.Style = [fsBold]
+ Margins.Left = 5
+ Margins.Top = 5
+ ParentColor = True
+ ParentFont = False
+ Underline = True
+ end
+ object pnlAgrupaciones: TTBXAlignmentPanel
+ Left = 425
+ Top = 19
+ Width = 391
+ Height = 42
+ Align = alClient
+ AutoSize = True
+ TabOrder = 2
+ object TBXButton3: TTBXButton
+ Tag = 3
+ Left = 8
+ Top = 10
+ Width = 90
+ Height = 21
+ Action = actRefrescar
+ AutoSize = False
+ Caption = 'Consultar'
+ ImageIndex = 0
+ TabOrder = 0
+ Wrapping = twEndEllipsis
+ end
+ end
+ end
+ inherited EditorActionList: TActionList [6]
inherited actNuevo: TAction
Enabled = False
Visible = False
@@ -170,7 +237,7 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
OnUpdate = actAprobadoUpdate
end
end
- inherited SmallImages: TPngImageList [6]
+ inherited SmallImages: TPngImageList [7]
PngImages = <
item
PngImage.Data = {
@@ -748,9 +815,10 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
Name = 'PngImage26'
Background = clWindow
end>
+ Left = 331
Bitmap = {}
end
- inherited LargeImages: TPngImageList [7]
+ inherited LargeImages: TPngImageList [8]
PngImages = <
item
PngImage.Data = {
@@ -1569,13 +1637,19 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
Name = 'PngImage21'
Background = clWindow
end>
+ Left = 251
+ Top = 88
Bitmap = {}
end
- inherited JvFormStorage: TJvFormStorage [8]
+ inherited JvFormStorage: TJvFormStorage [9]
+ Left = 416
+ Top = 224
end
- inherited JvAppRegistryStorage: TJvAppRegistryStorage [9]
+ inherited JvAppRegistryStorage: TJvAppRegistryStorage [10]
+ Left = 368
+ Top = 168
end
- inherited dsDataTable: TDADataSource [10]
+ inherited dsDataTable: TDADataSource [11]
Top = 136
end
inherited GridPopupMenu: TPopupMenu
diff --git a/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.pas b/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.pas
index 57e019e..0b7b8f5 100644
--- a/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.pas
+++ b/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.pas
@@ -17,7 +17,8 @@ uses
uDADataTable, JvAppStorage, JvAppRegistryStorage, JvComponentBase,
JvFormPlacement, ImgList, PngImageList, StdActns, ActnList, ComCtrls,
TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, ExtCtrls,
- JvExControls, JvComponent, JvNavigationPane, StdCtrls;
+ JvExControls, JvComponent, JvNavigationPane, StdCtrls, TBXDkPanels,
+ uViewParametrosCentro, uViewParametrosControlGrid;
const
CM_SETFOCUSEDRECORD = WM_USER + 1002;
@@ -44,6 +45,11 @@ type
TBXItem37: TTBXItem;
actAprobado: TAction;
frViewListaRecepciones1: TfrViewListaRecepciones;
+ TBXDockablePanel1: TTBXDockablePanel;
+ frViewParametrosCentro1: TfrViewParametrosCentro;
+ TBXLabel1: TTBXLabel;
+ pnlAgrupaciones: TTBXAlignmentPanel;
+ TBXButton3: TTBXButton;
procedure FormShow(Sender: TObject);
procedure JvTabBar1TabSelected(Sender: TObject; Item: TJvTabBarItem);
procedure actModificarExecute(Sender: TObject);
@@ -74,7 +80,7 @@ implementation
uses uEditorBase, cxGridTableView, cxGridCustomTableView, cxControls,
uDBSelectionList, cxGridDBTableView, cxGridDBDataDefinitions,
- uDataModuleRecepciones, uEditorDBBase;
+ uDataModuleRecepciones, uEditorDBBase, uDAInterfaces;
{$R *.dfm}
@@ -110,14 +116,11 @@ begin
if not Assigned(ViewGrid) then
raise Exception.Create('No hay una vista asignada');
- FItems.DataTable.Active := True;
+ //FItems.DataTable.Active := True;
+ frViewParametrosCentro1.Refresh;
with (ViewGrid as IViewListaRecepciones) do
- begin
VerPendientes;
- ContraerTodo;
- GotoFirst;
- end;
end;
procedure TfEditorListaRecepciones.JvTabBar1TabSelected(
@@ -125,7 +128,9 @@ procedure TfEditorListaRecepciones.JvTabBar1TabSelected(
begin
inherited;
ShowHourglassCursor;
+
Items.DataTable.Active := False;
+
Application.ProcessMessages;
ViewGrid._FocusedView.BeginUpdate;
Application.ProcessMessages;
@@ -149,33 +154,27 @@ begin
finally
dsDataTable.DataTable := Items.DataTable;
ViewGrid._FocusedView.EndUpdate;
- Items.DataTable.Active := True;
- ViewGrid.ContraerTodo;
- ViewGrid.GotoFirst;
HideHourglassCursor;
end;
end;
procedure TfEditorListaRecepciones.actModificarExecute(
Sender: TObject);
-var
- bm : TBookMark ;
begin
- bm := FItems.DataTable.GetBookMark;
- FItems.DataTable.DisableControls;
+ ViewGrid._FocusedView.BeginUpdate;
+ ViewGrid.SaveGridStatus;
try
FItems.Show;
- try
- // No hay BookmarkIsValid
- FItems.DataTable.GotoBookMark(bm);
- except
- //
- end;
finally
- FItems.DataTable.FreeBookMark(BM);
- FItems.DataTable.EnableControls;
- if ViewGrid._FocusedView.Controller.SelectedRowCount > 0 then
- ViewGrid._FocusedView.Controller.SelectedRows[0].Focused := True;
+ // Que salga el reloj de espera mientras el grid refresca datos y restaura la posición
+ ShowHourglassCursor;
+ Application.ProcessMessages;
+ try
+ ViewGrid._FocusedView.EndUpdate;
+ ViewGrid.RestoreGridStatus;
+ finally
+ HideHourglassCursor;
+ end;
end;
end;
@@ -223,10 +222,52 @@ end;
procedure TfEditorListaRecepciones.actRefrescarExecute(
Sender: TObject);
+var
+ ACentrosList : TStringList;
+ AWhere : String;
+ i : integer;
begin
+ case (ViewGrid as IViewListaRecepciones).VistaActiva of
+ trvaPendiente,
+ trvaAprobado : AWhere := ' and'
+ else
+ AWhere := '';
+ end;
+
+ AWhere := AWhere + ' CENTRO in (';
+
+ Items.DataTable.Active := False;
+ ACentrosList := frViewParametrosCentro1.CentrosSeleccionados;
+
+ ShowHourglassCursor;
+ try
+ if ACentrosList.Count = 0 then
+ ShowMessage('Debe seleccionar al menos un centro en los parámetros de la consulta.')
+ else begin
+ with Items.DataTable.Where do
+ begin
+ Clear;
+ for i := 0 to ACentrosList.Count - 1 do
+ begin
+ if i > 0 then
+ AWhere := AWhere + ', ';
+ AWhere := AWhere + '''' + ACentrosList[i] + '''';
+ end;
+ AWhere := AWhere + ')';
+
+ AddText(AWhere);
+ end;
+ Items.DataTable.Active := True;
+ end;
+ finally
+ HideHourglassCursor;
+ FreeAndNIL(ACentrosList);
+ end;
+
inherited;
- ViewGrid.ContraerTodo;
- ViewGrid.GotoFirst;
+
+ ViewGrid.ExpandirTodo;
+ ViewGrid.GotoFirst;
end;
procedure TfEditorListaRecepciones.actPendienteExecute(
diff --git a/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.ddp b/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.ddp
new file mode 100644
index 0000000..4370276
Binary files /dev/null and b/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.ddp differ
diff --git a/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.pas b/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.pas
index f558e97..0f0d07a 100644
--- a/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.pas
+++ b/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.pas
@@ -23,11 +23,16 @@ uses
dxPScxCommon, dxPScxGridLnk, cxMemo;
type
+ TvRecepcionVistaActiva = (trvaPendiente, trvaAprobado, trvaTodos);
+
IViewListaRecepciones = interface(IViewGrid)
['{E4401ABB-E95D-43AC-9155-BA57DC2B88C2}']
procedure VerPendientes;
procedure VerAprobados;
procedure VerTodos;
+
+ function GetVistaActiva : TvRecepcionVistaActiva;
+ property VistaActiva : TvRecepcionVistaActiva read GetVistaActiva;
end;
TfrViewListaRecepciones = class(TfrViewGrid, IViewListaRecepciones)
@@ -148,6 +153,7 @@ type
FTipo : String;
FNivelFiltrado : TcxFilterCriteriaItemList;
procedure FilterChanged(Sender: TObject); override;
+ function GetVistaActiva : TvRecepcionVistaActiva;
public
procedure Preview; override;
procedure Print; override;
@@ -155,6 +161,7 @@ type
procedure VerPendientes;
procedure VerAprobados;
procedure VerTodos;
+ property VistaActiva : TvRecepcionVistaActiva read GetVistaActiva;
end;
@@ -575,4 +582,14 @@ begin
cxGridView.DataController.Filter.EndUpdate;
end;
+function TfrViewListaRecepciones.GetVistaActiva: TvRecepcionVistaActiva;
+begin
+ if FTipo = 'N' then
+ Result := trvaPendiente
+ else if FTipo = 'S' then
+ Result := trvaAprobado
+ else
+ Result := trvaTodos;
+end;
+
end.
diff --git a/Source/Modulos/Stock/Cliente/Stock.dof b/Source/Modulos/Stock/Cliente/Stock.dof
index c6b3d5c..326e1c7 100644
--- a/Source/Modulos/Stock/Cliente/Stock.dof
+++ b/Source/Modulos/Stock/Cliente/Stock.dof
@@ -149,8 +149,8 @@ Count=1
Item0=.\
[HistoryLists\hlOutputDirectorry]
Count=2
-Item0=..\..\Output\Servidor
-Item1=..\..\Output\Cliente
+Item0=..\..\Output\Cliente
+Item1=..\..\Output\Servidor
[HistoryLists\hlBPLOutput]
Count=3
Item0=..\Lib
diff --git a/Source/Modulos/Stock/Cliente/Stock.dpk b/Source/Modulos/Stock/Cliente/Stock.dpk
index 8137cef..66d429f 100644
--- a/Source/Modulos/Stock/Cliente/Stock.dpk
+++ b/Source/Modulos/Stock/Cliente/Stock.dpk
@@ -63,7 +63,8 @@ requires
JclVcl,
JvSystemD7R,
JvPageCompsD7R,
- JvStdCtrlsD7R;
+ JvStdCtrlsD7R,
+ Parametros;
contains
uPluginControllerStock in 'uPluginControllerStock.pas' {ModuleStock: TModuleController},
diff --git a/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.ddp b/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.ddp
new file mode 100644
index 0000000..4370276
Binary files /dev/null and b/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.ddp differ
diff --git a/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.dfm b/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.dfm
index 0854c3a..ee5fffe 100644
--- a/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.dfm
+++ b/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.dfm
@@ -1,6 +1,6 @@
inherited fEditorControlStockEDI: TfEditorControlStockEDI
- Left = 423
- Top = 209
+ Left = 467
+ Top = 265
Width = 687
Height = 607
Caption = 'Control de stock de centros'
@@ -243,8 +243,8 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
Width = 242
end
inherited ccbCentro: TJvCheckedComboBox
- Left = 419
- Width = 191
+ Left = 354
+ Width = 249
end
end
end
@@ -526,8 +526,8 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
Width = 242
end
inherited ccbCentro: TJvCheckedComboBox
- Left = 419
- Width = 191
+ Left = 354
+ Width = 249
end
end
end
@@ -803,7 +803,7 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
Width = 242
end
inherited ccbCentro: TJvCheckedComboBox
- Left = 532
+ Left = 354
Width = 65
end
end
diff --git a/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.pas b/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.pas
index 5d7faa5..74a8780 100644
--- a/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.pas
+++ b/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.pas
@@ -72,7 +72,7 @@ implementation
uses
cxControls, uEditorUtils, DateUtils, uCustomEditor, uEditorBase,
- uDataModuleStock;
+ uDataModuleStock, uDAInterfaces;
{$R *.dfm}
diff --git a/Source/Modulos/Stock/Servidor/srvStock_Impl.ddp b/Source/Modulos/Stock/Servidor/srvStock_Impl.ddp
new file mode 100644
index 0000000..4370276
Binary files /dev/null and b/Source/Modulos/Stock/Servidor/srvStock_Impl.ddp differ
diff --git a/Source/Modulos/Traspasos/Cliente/uEditorListaTraspasos.pas b/Source/Modulos/Traspasos/Cliente/uEditorListaTraspasos.pas
index 0518340..0f6e376 100644
--- a/Source/Modulos/Traspasos/Cliente/uEditorListaTraspasos.pas
+++ b/Source/Modulos/Traspasos/Cliente/uEditorListaTraspasos.pas
@@ -156,24 +156,21 @@ end;
procedure TfEditorListaTraspasos.actModificarExecute(
Sender: TObject);
-var
- bm : TBookMark ;
begin
- bm := FItems.DataTable.GetBookMark;
- FItems.DataTable.DisableControls;
+ ViewGrid._FocusedView.BeginUpdate;
+ ViewGrid.SaveGridStatus;
try
FItems.Show;
- try
- // No hay BookmarkIsValid
- FItems.DataTable.GotoBookMark(bm);
- except
- //
- end;
finally
- FItems.DataTable.FreeBookMark(BM);
- FItems.DataTable.EnableControls;
- if ViewGrid._FocusedView.Controller.SelectedRowCount > 0 then
- ViewGrid._FocusedView.Controller.SelectedRows[0].Focused := True;
+ // Que salga el reloj de espera mientras el grid refresca datos y restaura la posición
+ ShowHourglassCursor;
+ Application.ProcessMessages;
+ try
+ ViewGrid._FocusedView.EndUpdate;
+ ViewGrid.RestoreGridStatus;
+ finally
+ HideHourglassCursor;
+ end;
end;
end;
diff --git a/Source/Servidor/AdminPV_Server.cfg b/Source/Servidor/AdminPV_Server.cfg
index aa248f0..7d0152a 100644
--- a/Source/Servidor/AdminPV_Server.cfg
+++ b/Source/Servidor/AdminPV_Server.cfg
@@ -40,7 +40,6 @@
-O"..\Lib;..\Base"
-I"..\Lib;..\Base"
-R"..\Lib;..\Base"
--DEUREKALOG;EUREKALOG_VER5
-w-UNSAFE_TYPE
-w-UNSAFE_CODE
-w-UNSAFE_CAST
diff --git a/Source/Servidor/AdminPV_Server.dof b/Source/Servidor/AdminPV_Server.dof
index e594807..1804a4b 100644
--- a/Source/Servidor/AdminPV_Server.dof
+++ b/Source/Servidor/AdminPV_Server.dof
@@ -96,7 +96,7 @@ PackageDLLOutputDir=..\Lib
PackageDCPOutputDir=..\Lib
SearchPath=..\Lib;..\Base
Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;dclOfficeXP;cxLibraryVCLD7;dxThemeD7;cxTreeListVCLD7;cxEditorsVCLD7;cxDataD7;cxExtEditorsVCLD7;cxGridVCLD7;cxPageControlVCLD7;cxSchedulerVCLD7;dxComnD7;dxsbD7;dxBarD7;dxBarDBNavD7;dxBarExtDBItemsD7;dxBarExtItemsD7;dxDockingD7;dxLayoutControlD7;dxNavBarD7;dxPSCoreD7;cxExportVCLD7;cxIntl5D7;cxIntlPrintSys3D7;cxIntlSchedulerD7;fsIBX7;fs7;fqb70;frx7;frxADO7;frxBDE7;frxcs7;frxDB7;frxDBX7;frxe7;frxIBX7;fsADO7;fsBDE7;fsDB7;cxVerticalGridVCLD7;EasyListviewD7
-Conditionals=EUREKALOG;EUREKALOG_VER5
+Conditionals=
DebugSourceDirs=
UsePackages=0
[Parameters]
@@ -114,7 +114,7 @@ IncludeVerInfo=1
AutoIncBuild=0
MajorVer=1
MinorVer=2
-Release=4
+Release=5
Build=0
Debug=0
PreRelease=0
@@ -126,7 +126,7 @@ CodePage=1252
[Version Info Keys]
CompanyName=Rodax Software S.L.
FileDescription=
-FileVersion=1.2.4.0
+FileVersion=1.2.5.0
InternalName=
LegalCopyright=
LegalTrademarks=
@@ -137,24 +137,21 @@ Comments=
[Excluded Packages]
c:\archivos de programa\borland\delphi7\Bin\designdgm70.bpl=Borland Module Diagram Editview
T:\BPL_D7\dxPSCoreD7.bpl=ExpressPrinting System by Developer Express Inc.
-[HistoryLists\hlConditionals]
-Count=1
-Item0=EUREKALOG;EUREKALOG_VER5
[HistoryLists\hlUnitAliases]
Count=1
Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
[HistoryLists\hlSearchPath]
Count=3
-Item0=..\Lib;..\Base
-Item1=..\Lib
+Item0=..\Lib
+Item1=..\Lib;..\Base
Item2=..\..\..\Lib
[HistoryLists\hlUnitOutputDirectory]
Count=1
Item0=.\
[HistoryLists\hlOutputDirectorry]
Count=2
-Item0=..\..\Output\Servidor
-Item1=..\..\Output\Cliente
+Item0=..\..\Output\Cliente
+Item1=..\..\Output\Servidor
[HistoryLists\hlBPLOutput]
Count=3
Item0=..\Lib
@@ -166,7 +163,7 @@ Item0=..\Lib
Item1=..\..\..\Lib
[Exception Log]
EurekaLog Version=519
-Activate=1
+Activate=0
Activate Handle=1
Save Log File=1
Foreground Tab=0
diff --git a/Source/Servidor/AdminPV_Server.dpr b/Source/Servidor/AdminPV_Server.dpr
index 259c4d7..b806b31 100644
--- a/Source/Servidor/AdminPV_Server.dpr
+++ b/Source/Servidor/AdminPV_Server.dpr
@@ -3,7 +3,6 @@ program AdminPV_Server;
{#ROGEN:VARELA.rodl} // RemObjects: Careful, do not remove!
uses
- ExceptionLog,
uROComInit,
Forms,
fServerForm in 'fServerForm.pas' {ServerForm},
@@ -56,7 +55,10 @@ uses
srvStock_Impl in '..\Modulos\Stock\Servidor\srvStock_Impl.pas' {srvStock: TDARemoteService},
schStockClient_Intf in '..\Modulos\Stock\Reglas\schStockClient_Intf.pas',
schStockServer_Intf in '..\Modulos\Stock\Reglas\schStockServer_Intf.pas',
- uAcercaDe in 'uAcercaDe.pas' {fAcercaDe};
+ uAcercaDe in 'uAcercaDe.pas' {fAcercaDe},
+ srvParametros_Impl in '..\Modulos\Parametros\Servidor\srvParametros_Impl.pas' {srvParametros: TDARemoteService},
+ schParametrosClient_Intf in '..\Modulos\Parametros\Reglas\schParametrosClient_Intf.pas',
+ schParametrosServer_Intf in '..\Modulos\Parametros\Reglas\schParametrosServer_Intf.pas';
{$R *.res}
{$R RODLFile.res}
diff --git a/Source/Servidor/AdminPV_Server.res b/Source/Servidor/AdminPV_Server.res
index d153b31..59ee163 100644
Binary files a/Source/Servidor/AdminPV_Server.res and b/Source/Servidor/AdminPV_Server.res differ
diff --git a/Source/Servidor/RODLFILE.res b/Source/Servidor/RODLFILE.res
index 90553d0..296eb18 100644
Binary files a/Source/Servidor/RODLFILE.res and b/Source/Servidor/RODLFILE.res differ
diff --git a/Source/Servidor/Services/EDI_Inventary/uDataModuleEDI_Inventary.dfm b/Source/Servidor/Services/EDI_Inventary/uDataModuleEDI_Inventary.dfm
index 7f26043..f9577a6 100644
--- a/Source/Servidor/Services/EDI_Inventary/uDataModuleEDI_Inventary.dfm
+++ b/Source/Servidor/Services/EDI_Inventary/uDataModuleEDI_Inventary.dfm
@@ -589,6 +589,42 @@ object dmEDIInventary: TdmEDIInventary
BusinessRulesServer.ScriptLanguage = rslPascalScript
end>
Commands = <
+ item
+ Params = <
+ item
+ Name = 'RETURN_VALUE'
+ DataType = datInteger
+ BlobType = dabtUnknown
+ Value = ''
+ ParamType = daptResult
+ end>
+ Statements = <
+ item
+ Connection = 'GFT_VARELA'
+ SQL = 'RDX_P_SET_ULTIMOINVENTARIO'
+ StatementType = stStoredProcedure
+ ColumnMappings = <>
+ end>
+ Name = 'RDX_P_SET_ULTIMOINVENTARIO'
+ end
+ item
+ Params = <
+ item
+ Name = 'RETURN_VALUE'
+ DataType = datInteger
+ BlobType = dabtUnknown
+ Value = ''
+ ParamType = daptResult
+ end>
+ Statements = <
+ item
+ Connection = 'GFT_VARELA'
+ SQL = 'RDX_P_CARGAR_INVENTARIOEDI'
+ StatementType = stStoredProcedure
+ ColumnMappings = <>
+ end>
+ Name = 'RDX_P_CARGAR_INVENTARIOEDI'
+ end
item
Params = <
item
diff --git a/Source/Servidor/Services/EDI_Inventary/uDataModuleEDI_Inventary.pas b/Source/Servidor/Services/EDI_Inventary/uDataModuleEDI_Inventary.pas
index 31658a1..e6b95a2 100644
--- a/Source/Servidor/Services/EDI_Inventary/uDataModuleEDI_Inventary.pas
+++ b/Source/Servidor/Services/EDI_Inventary/uDataModuleEDI_Inventary.pas
@@ -16,6 +16,8 @@ type
function InsertarLineas(const ALinData : TEDIFileData; var NumRegNuevos : integer) : Boolean;
function InsertarCantidades(const ACantData : TEDIFileData; var NumRegNuevos : integer) : Boolean;
procedure InsertarLog(OK : Boolean; Error_msg : String = '');
+ function GenerarInventarioEDI: Boolean;
+ function MarcarRegistrosUltimoInventarioEDI: Boolean;
public
function CargarFicheros(const FicheroCAB: String; const FicheroLIN: String;
const FicheroCANT: String; var NumRegNuevos: Integer ): Boolean;
@@ -46,37 +48,72 @@ var
NumRegNuevosLin : Integer;
NumRegNuevosCant : Integer;
begin
- Result := False;
- Cab_Reader := TCABINV_Reader.Create;
- Lin_Reader := TLININV_Reader.Create;
- Cant_Reader := TCANTINV_Reader.Create;
+ Result := True;
+ Cab_Reader := TCABINV_Reader.Create;
try
Cab_Reader.Filename := FicheroCAB;
Cab_Reader.ReadFile;
- InsertarCabecera (Cab_Reader.FileData, NumRegNuevosCab);
+ Result := InsertarCabecera (Cab_Reader.FileData, NumRegNuevosCab);
finally
FreeAndNIL(Cab_Reader);
end;
- try
- Lin_Reader.Filename := FicheroLIN;
- Lin_Reader.ReadFile;
- InsertarLineas (Lin_Reader.FileData, NumRegNuevosLin);
- finally
- FreeAndNIL(Lin_Reader);
+ if Result then
+ begin
+ Lin_Reader := TLININV_Reader.Create;
+ try
+ Lin_Reader.Filename := FicheroLIN;
+ Lin_Reader.ReadFile;
+ Result := InsertarLineas (Lin_Reader.FileData, NumRegNuevosLin);
+ finally
+ FreeAndNIL(Lin_Reader);
+ end;
+
+ if Result then
+ begin
+ Cant_Reader := TCANTINV_Reader.Create;
+ try
+ Cant_Reader.Filename := FicheroCANT;
+ Cant_Reader.ReadFile;
+ Result := InsertarCantidades(Cant_Reader.FileData, NumRegNuevosCant);
+ finally
+ Cant_Reader.Free;
+ end;
+ end;
end;
- try
- Cant_Reader.Filename := FicheroCANT;
- Cant_Reader.ReadFile;
- InsertarCantidades(Cant_Reader.FileData, NumRegNuevosCant);
- finally
- Cant_Reader.Free;
+ if Result then
+ begin
+ NumRegNuevos := NumRegNuevosCant;
+ Result := GenerarInventarioEDI;
+ if Result then
+ Result := MarcarRegistrosUltimoInventarioEDI;
end;
+end;
- NumRegNuevos := NumRegNuevosCant;
- Result := True;
+function TdmEDIInventary.GenerarInventarioEDI: Boolean;
+var
+ ACommand: IDASQLCommand;
+ AConnection : IDAConnection;
+begin
+ Result := False;
+ AConnection := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionName);
+ ACommand := schEDIInventary.NewCommand(AConnection, 'RDX_P_CARGAR_INVENTARIOEDI');
+
+ AConnection.BeginTransaction;
+ try
+ ACommand.Execute;
+ AConnection.CommitTransaction;
+ Result := True;
+ except
+ on E : Exception do
+ begin
+ AConnection.RollbackTransaction;
+ if Pos('PRIMARY KEY', E.Message) = 0 then
+ InsertarLog(False, e.Message + ' (GenerarInventarioEDI)');
+ end
+ end;
end;
function TdmEDIInventary.InsertarCabecera(const ACabData: TEDIFileData;
@@ -248,6 +285,30 @@ begin
end;
end;
+function TdmEDIInventary.MarcarRegistrosUltimoInventarioEDI: Boolean;
+var
+ ACommand: IDASQLCommand;
+ AConnection : IDAConnection;
+begin
+ Result := False;
+ AConnection := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionName);
+ ACommand := schEDIInventary.NewCommand(AConnection, 'RDX_P_SET_ULTIMOINVENTARIO');
+
+ AConnection.BeginTransaction;
+ try
+ ACommand.Execute;
+ AConnection.CommitTransaction;
+ Result := True;
+ except
+ on E : Exception do
+ begin
+ AConnection.RollbackTransaction;
+ if Pos('PRIMARY KEY', E.Message) = 0 then
+ InsertarLog(False, e.Message + ' (MarcarRegistrosUltimoInventarioEDI)');
+ end
+ end;
+end;
+
initialization
dmEDIInventary := TdmEDIInventary.Create(nil);
diff --git a/Source/Servidor/Services/EDI_Sales/uDataModuleEDI_Sales.dfm b/Source/Servidor/Services/EDI_Sales/uDataModuleEDI_Sales.dfm
index 10a3d34..9385b90 100644
--- a/Source/Servidor/Services/EDI_Sales/uDataModuleEDI_Sales.dfm
+++ b/Source/Servidor/Services/EDI_Sales/uDataModuleEDI_Sales.dfm
@@ -1646,6 +1646,24 @@ object dmEDISales: TdmEDISales
BusinessRulesServer.ScriptLanguage = rslPascalScript
end>
Commands = <
+ item
+ Params = <
+ item
+ Name = 'RETURN_VALUE'
+ DataType = datInteger
+ BlobType = dabtUnknown
+ Value = ''
+ ParamType = daptResult
+ end>
+ Statements = <
+ item
+ Connection = 'GFT_VARELA'
+ SQL = 'RDX_P_CARGAR_VENTASEDI'
+ StatementType = stStoredProcedure
+ ColumnMappings = <>
+ end>
+ Name = 'RDX_P_CARGAR_VENTASEDI'
+ end
item
Params = <
item
diff --git a/Source/Servidor/Services/EDI_Sales/uDataModuleEDI_Sales.pas b/Source/Servidor/Services/EDI_Sales/uDataModuleEDI_Sales.pas
index 2230a76..1208366 100644
--- a/Source/Servidor/Services/EDI_Sales/uDataModuleEDI_Sales.pas
+++ b/Source/Servidor/Services/EDI_Sales/uDataModuleEDI_Sales.pas
@@ -14,7 +14,8 @@ type
function InsertarCabecera(const ACabData : TEDIFileData; var NumRegNuevos : integer) : Boolean;
function InsertarLugares(const ALugData : TEDIFileData; var NumRegNuevos : integer) : Boolean;
function InsertarArticulos(const AArtData : TEDIFileData; var NumRegNuevos : integer) : Boolean;
- procedure InsertarLog(OK : Boolean; Error_msg : String = '');
+ function GenerarVentasEDI: Boolean;
+ procedure InsertarLog(OK : Boolean; Error_msg : String = '');
public
function CargarFicheros(const FicheroCAB: String; const FicheroLUG: String;
const FicheroART: String; var NumRegNuevos: Integer ): Boolean;
@@ -45,36 +46,70 @@ var
NumRegNuevosLug : Integer;
NumRegNuevosArt : Integer;
begin
- Result := False;
- Cab_Reader := TCABVEN_Reader.Create;
- Lug_Reader := TLUGVEN_Reader.Create;
- Art_Reader := TARTVEN_Reader.Create;
+ Result := True;
+ Cab_Reader := TCABVEN_Reader.Create;
try
Cab_Reader.Filename := FicheroCAB;
Cab_Reader.ReadFile;
- InsertarCabecera (Cab_Reader.FileData, NumRegNuevosCab);
+ Result := InsertarCabecera (Cab_Reader.FileData, NumRegNuevosCab);
finally
FreeAndNIL(Cab_Reader);
end;
- try
- Lug_Reader.Filename := FicheroLUG;
- Lug_Reader.ReadFile;
- InsertarLugares (Lug_Reader.FileData, NumRegNuevosLug);
- finally
- FreeAndNIL(Lug_Reader);
+ if Result then
+ begin
+ Lug_Reader := TLUGVEN_Reader.Create;
+ try
+ Lug_Reader.Filename := FicheroLUG;
+ Lug_Reader.ReadFile;
+ Result := InsertarLugares (Lug_Reader.FileData, NumRegNuevosLug);
+ finally
+ FreeAndNIL(Lug_Reader);
+ end;
+
+ if Result then
+ begin
+ Art_Reader := TARTVEN_Reader.Create;
+ try
+ Art_Reader.Filename := FicheroART;
+ Art_Reader.ReadFile;
+ Result := InsertarArticulos(Art_Reader.FileData, NumRegNuevosArt);
+ finally
+ FreeAndNil(Art_Reader);
+ end;
+ end;
end;
- try
- Art_Reader.Filename := FicheroART;
- Art_Reader.ReadFile;
- InsertarArticulos(Art_Reader.FileData, NumRegNuevosArt);
- finally
- FreeAndNil(Art_Reader);
+ if Result then
+ begin
+ NumRegNuevos := NumRegNuevosArt;
+ Result := GenerarVentasEDI;
+ end;
+end;
+
+function TdmEDISales.GenerarVentasEDI: Boolean;
+var
+ ACommand: IDASQLCommand;
+ AConnection : IDAConnection;
+begin
+ Result := False;
+ AConnection := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionName);
+ ACommand := schEDISales.NewCommand(AConnection, 'RDX_P_CARGAR_VENTASEDI');
+
+ AConnection.BeginTransaction;
+ try
+ ACommand.Execute;
+ AConnection.CommitTransaction;
+ Result := True;
+ except
+ on E : Exception do
+ begin
+ AConnection.RollbackTransaction;
+ if Pos('PRIMARY KEY', E.Message) = 0 then
+ InsertarLog(False, e.Message + ' (GenerarVentasEDI)');
+ end
end;
- NumRegNuevos := NumRegNuevosArt;
- Result := True;
end;
function TdmEDISales.InsertarArticulos(const AArtData: TEDIFileData;
diff --git a/Source/Servidor/VARELA.RODL b/Source/Servidor/VARELA.RODL
index d037274..fa93edd 100644
--- a/Source/Servidor/VARELA.RODL
+++ b/Source/Servidor/VARELA.RODL
@@ -348,6 +348,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/Source/Servidor/VARELA_Intf.pas b/Source/Servidor/VARELA_Intf.pas
index 2558a75..961eb29 100644
--- a/Source/Servidor/VARELA_Intf.pas
+++ b/Source/Servidor/VARELA_Intf.pas
@@ -34,6 +34,7 @@ const
IsrvDevoluciones_IID : TGUID = '{87C31D12-C353-437F-A7A3-10882373AB54}';
IsrvTraspasos_IID : TGUID = '{47DA82A0-51AD-477A-85B3-CE9EEAAB29D6}';
IsrvStock_IID : TGUID = '{F617B727-5B8B-4645-BBB2-3D645AB31981}';
+ IsrvParametros_IID : TGUID = '{E5177628-952A-4217-80C0-36F59E423EC4}';
{ Event ID's }
@@ -53,6 +54,7 @@ type
IsrvDevoluciones = interface;
IsrvTraspasos = interface;
IsrvStock = interface;
+ IsrvParametros = interface;
TLoginInfo = class;
@@ -357,6 +359,23 @@ type
end;
+ { IsrvParametros }
+ IsrvParametros = interface(IDARemoteService)
+ ['{E5177628-952A-4217-80C0-36F59E423EC4}']
+ end;
+
+ { CosrvParametros }
+ CosrvParametros = class
+ class function Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvParametros;
+ end;
+
+ { TsrvParametros_Proxy }
+ TsrvParametros_Proxy = class(TDARemoteService_Proxy, IsrvParametros)
+ protected
+ function __GetInterfaceName:string; override;
+
+ end;
+
implementation
uses
@@ -1065,6 +1084,18 @@ begin
result := 'srvStock';
end;
+{ CosrvParametros }
+
+class function CosrvParametros.Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvParametros;
+begin
+ result := TsrvParametros_Proxy.Create(aMessage, aTransportChannel);
+end;
+
+function TsrvParametros_Proxy.__GetInterfaceName:string;
+begin
+ result := 'srvParametros';
+end;
+
initialization
RegisterROClass(TLoginInfo);
RegisterProxyClass(IEDI_Inventary_IID, TEDI_Inventary_Proxy);
@@ -1081,6 +1112,7 @@ initialization
RegisterProxyClass(IsrvDevoluciones_IID, TsrvDevoluciones_Proxy);
RegisterProxyClass(IsrvTraspasos_IID, TsrvTraspasos_Proxy);
RegisterProxyClass(IsrvStock_IID, TsrvStock_Proxy);
+ RegisterProxyClass(IsrvParametros_IID, TsrvParametros_Proxy);
finalization
@@ -1099,5 +1131,6 @@ finalization
UnregisterProxyClass(IsrvDevoluciones_IID);
UnregisterProxyClass(IsrvTraspasos_IID);
UnregisterProxyClass(IsrvStock_IID);
+ UnregisterProxyClass(IsrvParametros_IID);
end.
diff --git a/Source/Servidor/VARELA_Invk.pas b/Source/Servidor/VARELA_Invk.pas
index 75efea6..db96198 100644
--- a/Source/Servidor/VARELA_Invk.pas
+++ b/Source/Servidor/VARELA_Invk.pas
@@ -121,6 +121,12 @@ type
published
end;
+ TsrvParametros_Invoker = class(TDARemoteService_Invoker)
+ private
+ protected
+ published
+ end;
+
implementation
uses