diff --git a/Database/scripts/factuges_replicador.sql b/Database/scripts/factuges_replicador.sql
index 6a1632dc..6d885674 100644
--- a/Database/scripts/factuges_replicador.sql
+++ b/Database/scripts/factuges_replicador.sql
@@ -93,8 +93,6 @@ INSERT INTO REPL_TABLES (TABLENAME, LOC_ID) VALUES ('PEDIDOS_CLIENTE', 1);
 INSERT INTO REPL_TABLES (TABLENAME, LOC_ID) VALUES ('PEDIDOS_CLIENTE_DETALLES', 1);
 INSERT INTO REPL_TABLES (TABLENAME, LOC_ID) VALUES ('PEDIDOS_PROVEEDOR', 1);
 INSERT INTO REPL_TABLES (TABLENAME, LOC_ID) VALUES ('PEDIDOS_PROVEEDOR_DETALLES', 1);
-INSERT INTO REPL_TABLES (TABLENAME, LOC_ID) VALUES ('PERMISOS', 1);
-INSERT INTO REPL_TABLES (TABLENAME, LOC_ID) VALUES ('PERMISOSEX', 1);
 INSERT INTO REPL_TABLES (TABLENAME, LOC_ID) VALUES ('PRESUPUESTOS_CLIENTE', 1);
 INSERT INTO REPL_TABLES (TABLENAME, LOC_ID) VALUES ('PRESUPUESTOS_CLIENTE_DETALLES', 1);
 INSERT INTO REPL_TABLES (TABLENAME, LOC_ID) VALUES ('PROVEEDORES_DATOS', 1);
@@ -107,7 +105,6 @@ INSERT INTO REPL_TABLES (TABLENAME, LOC_ID) VALUES ('REMESAS_PROVEEDOR', 1);
 INSERT INTO REPL_TABLES (TABLENAME, LOC_ID) VALUES ('TIENDA_WEB', 1);
 INSERT INTO REPL_TABLES (TABLENAME, LOC_ID) VALUES ('TIPOS_IVA', 1);
 INSERT INTO REPL_TABLES (TABLENAME, LOC_ID) VALUES ('UNIDADES_MEDIDA', 1);
-INSERT INTO REPL_TABLES (TABLENAME, LOC_ID) VALUES ('USUARIOS', 1);
 
 COMMIT WORK;
 
@@ -2232,96 +2229,6 @@ END
 ^
 
 
-/* Trigger: PERMISOSEX_DELETE_REPL */
-CREATE TRIGGER PERMISOSEX_DELETE_REPL FOR PERMISOSEX
-ACTIVE AFTER DELETE POSITION 0
-AS
-BEGIN
-  IF( USER <> 'REPL' ) THEN
-  BEGIN
-    INSERT INTO CHANGES(TABLEKEY,TABLENAME,OP,LOC_ID)
-      SELECT OLD.ID,'PERMISOSEX','D',LOC_ID
-      FROM REPL_TABLES WHERE TABLENAME='PERMISOSEX';
-  END
-END
-^
-
-
-/* Trigger: PERMISOSEX_INSERT_REPL */
-CREATE TRIGGER PERMISOSEX_INSERT_REPL FOR PERMISOSEX
-ACTIVE AFTER INSERT POSITION 0
-AS
-BEGIN
-  IF( USER <> 'REPL' ) THEN
-  BEGIN
-    INSERT INTO CHANGES(TABLEKEY,TABLENAME,OP,LOC_ID)
-      SELECT NEW.ID,'PERMISOSEX','I',LOC_ID
-      FROM REPL_TABLES WHERE TABLENAME='PERMISOSEX';
-  END
-END
-^
-
-
-/* Trigger: PERMISOSEX_UPDATE_REPL */
-CREATE TRIGGER PERMISOSEX_UPDATE_REPL FOR PERMISOSEX
-ACTIVE AFTER UPDATE POSITION 0
-AS
-BEGIN
-  IF( USER <> 'REPL' ) THEN
-  BEGIN
-    INSERT INTO CHANGES(TABLEKEY,TABLENAME,OP,LOC_ID)
-      SELECT NEW.ID,'PERMISOSEX','U',LOC_ID
-      FROM REPL_TABLES WHERE TABLENAME='PERMISOSEX';
-  END
-END
-^
-
-
-/* Trigger: PERMISOS_DELETE_REPL */
-CREATE TRIGGER PERMISOS_DELETE_REPL FOR PERMISOS
-ACTIVE AFTER DELETE POSITION 0
-AS
-BEGIN
-  IF( USER <> 'REPL' ) THEN
-  BEGIN
-    INSERT INTO CHANGES(TABLEKEY,TABLENAME,OP,LOC_ID)
-      SELECT OLD.ID,'PERMISOS','D',LOC_ID
-      FROM REPL_TABLES WHERE TABLENAME='PERMISOS';
-  END
-END
-^
-
-
-/* Trigger: PERMISOS_INSERT_REPL */
-CREATE TRIGGER PERMISOS_INSERT_REPL FOR PERMISOS
-ACTIVE AFTER INSERT POSITION 0
-AS
-BEGIN
-  IF( USER <> 'REPL' ) THEN
-  BEGIN
-    INSERT INTO CHANGES(TABLEKEY,TABLENAME,OP,LOC_ID)
-      SELECT NEW.ID,'PERMISOS','I',LOC_ID
-      FROM REPL_TABLES WHERE TABLENAME='PERMISOS';
-  END
-END
-^
-
-
-/* Trigger: PERMISOS_UPDATE_REPL */
-CREATE TRIGGER PERMISOS_UPDATE_REPL FOR PERMISOS
-ACTIVE AFTER UPDATE POSITION 0
-AS
-BEGIN
-  IF( USER <> 'REPL' ) THEN
-  BEGIN
-    INSERT INTO CHANGES(TABLEKEY,TABLENAME,OP,LOC_ID)
-      SELECT NEW.ID,'PERMISOS','U',LOC_ID
-      FROM REPL_TABLES WHERE TABLENAME='PERMISOS';
-  END
-END
-^
-
-
 /* Trigger: PRESUPUESTOS_CLI_DELETE_REPL */
 CREATE TRIGGER PRESUPUESTOS_CLI_DELETE_REPL FOR PRESUPUESTOS_CLIENTE
 ACTIVE AFTER DELETE POSITION 0
@@ -2862,49 +2769,4 @@ END
 ^
 
 
-/* Trigger: USUARIOS_DELETE_REPL */
-CREATE TRIGGER USUARIOS_DELETE_REPL FOR USUARIOS
-ACTIVE AFTER DELETE POSITION 0
-AS
-BEGIN
-  IF( USER <> 'REPL' ) THEN
-  BEGIN
-    INSERT INTO CHANGES(TABLEKEY,TABLENAME,OP,LOC_ID)
-      SELECT OLD.ID,'USUARIOS','D',LOC_ID
-      FROM REPL_TABLES WHERE TABLENAME='USUARIOS';
-  END
-END
-^
-
-
-/* Trigger: USUARIOS_INSERT_REPL */
-CREATE TRIGGER USUARIOS_INSERT_REPL FOR USUARIOS
-ACTIVE AFTER INSERT POSITION 0
-AS
-BEGIN
-  IF( USER <> 'REPL' ) THEN
-  BEGIN
-    INSERT INTO CHANGES(TABLEKEY,TABLENAME,OP,LOC_ID)
-      SELECT NEW.ID,'USUARIOS','I',LOC_ID
-      FROM REPL_TABLES WHERE TABLENAME='USUARIOS';
-  END
-END
-^
-
-
-/* Trigger: USUARIOS_UPDATE_REPL */
-CREATE TRIGGER USUARIOS_UPDATE_REPL FOR USUARIOS
-ACTIVE AFTER UPDATE POSITION 0
-AS
-BEGIN
-  IF( USER <> 'REPL' ) THEN
-  BEGIN
-    INSERT INTO CHANGES(TABLEKEY,TABLENAME,OP,LOC_ID)
-      SELECT NEW.ID,'USUARIOS','U',LOC_ID
-      FROM REPL_TABLES WHERE TABLENAME='USUARIOS';
-  END
-END
-^
-
-
 SET TERM ; ^
diff --git a/Database/scripts/replicador_sysdata.sql b/Database/scripts/replicador_sysdata.sql
index c657a69d..2eaccf53 100644
--- a/Database/scripts/replicador_sysdata.sql
+++ b/Database/scripts/replicador_sysdata.sql
@@ -318,16 +318,6 @@ INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (2
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (292, 1, 'PEDIDOS_PROVEEDOR_DETALLES', 'U', 'UPDATE PEDIDOS_PROVEEDOR_DETALLES SET ID=?,CANTIDAD=?,CONCEPTO=?,DESCUENTO=?,FECHA_ALTA=?,FECHA_MODIFICACION=?,ID_ARTICULO=?,ID_PEDIDO=?,IMPORTE_PORTE=?,IMPORTE_TOTAL=?,IMPORTE_UNIDAD=?,POSICION=?,TIPO_DETALLE=?', 1);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (293, 1, 'PEDIDOS_PROVEEDOR_DETALLES', 'U', ',VISIBLE=? WHERE ID=?', 2);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (294, 1, 'PEDIDOS_PROVEEDOR_DETALLES', 'D', 'DELETE FROM PEDIDOS_PROVEEDOR_DETALLES WHERE ID=?', 0);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (295, 1, 'PERMISOS', 'S', 'SELECT ID,CHECKSUM,ID_USUARIO,MODULO,NOMBRECOMP FROM PERMISOS', 1);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (296, 1, 'PERMISOS', 'S', ' WHERE ID=?', 2);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (297, 1, 'PERMISOS', 'I', 'INSERT INTO PERMISOS (ID,CHECKSUM,ID_USUARIO,MODULO,NOMBRECOMP) VALUES (?,?,?,?,?)', 0);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (298, 1, 'PERMISOS', 'U', 'UPDATE PERMISOS SET ID=?,CHECKSUM=?,ID_USUARIO=?,MODULO=?,NOMBRECOMP=? WHERE ID=?', 0);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (299, 1, 'PERMISOS', 'D', 'DELETE FROM PERMISOS WHERE ID=?', 0);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (300, 1, 'PERMISOSEX', 'S', 'SELECT ID,CHECKSUM,ID_USUARIO,MODULO,NOMBRECOMP,NOMBREFORM FROM PERMISOSEX', 1);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (301, 1, 'PERMISOSEX', 'S', ' WHERE ID=?', 2);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (302, 1, 'PERMISOSEX', 'I', 'INSERT INTO PERMISOSEX (ID,CHECKSUM,ID_USUARIO,MODULO,NOMBRECOMP,NOMBREFORM) VALUES (?,?,?,?,?,?)', 0);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (303, 1, 'PERMISOSEX', 'U', 'UPDATE PERMISOSEX SET ID=?,CHECKSUM=?,ID_USUARIO=?,MODULO=?,NOMBRECOMP=?,NOMBREFORM=? WHERE ID=?', 0);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (304, 1, 'PERMISOSEX', 'D', 'DELETE FROM PERMISOSEX WHERE ID=?', 0);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (305, 1, 'PRESUPUESTOS_CLIENTE', 'S', 'SELECT ID,BASE_IMPONIBLE,CLIENTE_FINAL,DESCUENTO,FECHA_ALTA,FECHA_DECISION,FECHA_MODIFICACION,FECHA_PRESUPUESTO,ID_CLIENTE,ID_EMPRESA,ID_FORMA_PAGO,ID_TIENDA,ID_VENDEDOR,IMPORTE_DESCUENTO,IMPORTE_IVA,IMPORTE_NETO', 1);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (306, 1, 'PRESUPUESTOS_CLIENTE', 'S', ',IMPORTE_PORTE,IMPORTE_TOTAL,INCIDENCIAS,INCIDENCIAS_ACTIVAS,IVA,MEMORIA,OBSERVACIONES,PORTADA,REFERENCIA,REFERENCIA_CLIENTE,SITUACION,USUARIO FROM PRESUPUESTOS_CLIENTE', 2);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (307, 1, 'PRESUPUESTOS_CLIENTE', 'S', ' WHERE ID=?', 3);
@@ -382,11 +372,6 @@ INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (3
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (375, 1, 'UNIDADES_MEDIDA', 'I', 'INSERT INTO UNIDADES_MEDIDA (ID,DESCRIPCION) VALUES (?,?)', 0);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (376, 1, 'UNIDADES_MEDIDA', 'U', 'UPDATE UNIDADES_MEDIDA SET ID=?,DESCRIPCION=? WHERE ID=?', 0);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (377, 1, 'UNIDADES_MEDIDA', 'D', 'DELETE FROM UNIDADES_MEDIDA WHERE ID=?', 0);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (378, 1, 'USUARIOS', 'S', 'SELECT ID,BLOQUEADO,CHECKSUM,EMAIL,ID_PERFIL,LOGIN,PASS,PASSEXPIRED,PRIVILEGED,TIPO,USERDAYSSUN,USERNAME FROM USUARIOS', 1);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (379, 1, 'USUARIOS', 'S', ' WHERE ID=?', 2);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (380, 1, 'USUARIOS', 'I', 'INSERT INTO USUARIOS (ID,BLOQUEADO,CHECKSUM,EMAIL,ID_PERFIL,LOGIN,PASS,PASSEXPIRED,PRIVILEGED,TIPO,USERDAYSSUN,USERNAME) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)', 0);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (381, 1, 'USUARIOS', 'U', 'UPDATE USUARIOS SET ID=?,BLOQUEADO=?,CHECKSUM=?,EMAIL=?,ID_PERFIL=?,LOGIN=?,PASS=?,PASSEXPIRED=?,PRIVILEGED=?,TIPO=?,USERDAYSSUN=?,USERNAME=? WHERE ID=?', 0);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (382, 1, 'USUARIOS', 'D', 'DELETE FROM USUARIOS WHERE ID=?', 0);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (383, 1, 'ALBARANES_CLIENTE', 'S', 'SELECT ID,BASE_IMPONIBLE,CALLE,CODIGO_POSTAL,DESCUENTO,FECHA_ALBARAN,FECHA_ALTA,FECHA_ENVIO,FECHA_MODIFICACION,FECHA_PREVISTA_ENVIO,FECHA_RECEPCION,ID_ALMACEN,ID_CLIENTE,ID_EMPRESA,ID_FACTURA,ID_FORMA_PAGO', 1);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (384, 1, 'ALBARANES_CLIENTE', 'S', ',ID_PEDIDO,ID_TIENDA,IMPORTE_DESCUENTO,IMPORTE_IVA,IMPORTE_NETO,IMPORTE_PORTE,IMPORTE_TOTAL,INCIDENCIAS,INCIDENCIAS_ACTIVAS,IVA,OBSERVACIONES,PERSONA_CONTACTO,POBLACION,PROVINCIA,REFERENCIA,REFERENCIA_CLIENTE', 2);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (385, 1, 'ALBARANES_CLIENTE', 'S', ',TELEFONO,USUARIO  ,TIPO FROM ALBARANES_CLIENTE', 3);
@@ -400,20 +385,20 @@ INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (4
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (417, 1, 'EMPRESAS_TIENDAS', 'U', ' WHERE ID=?', 2);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (418, 1, 'EMPRESAS_TIENDAS', 'D', 'DELETE FROM EMPRESAS_TIENDAS WHERE ID=?', 0);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (419, 1, 'RECIBOS_CLIENTE', 'S', 'SELECT ID,DESCRIPCION,FECHA_ALTA,FECHA_EMISION,FECHA_MODIFICACION,FECHA_VENCIMIENTO,ID_FACTURA,ID_RECIBO_COMPENSADO,ID_REMESA,IMPORTE,OBSERVACIONES,OTROS_GASTOS,REFERENCIA,USUARIO,ID_CLIENTE,ID_EMPRESA', 1);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (420, 1, 'RECIBOS_CLIENTE', 'S', ',ID_TIENDA FROM RECIBOS_CLIENTE', 2);
+INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (420, 1, 'RECIBOS_CLIENTE', 'S', ',ID_TIENDA, NIF_CIF, NOMBRE, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL FROM RECIBOS_CLIENTE', 2);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (421, 1, 'RECIBOS_CLIENTE', 'S', ' WHERE ID=?', 3);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (422, 1, 'RECIBOS_CLIENTE', 'I', 'INSERT INTO RECIBOS_CLIENTE (ID,DESCRIPCION,FECHA_ALTA,FECHA_EMISION,FECHA_MODIFICACION,FECHA_VENCIMIENTO,ID_FACTURA,ID_RECIBO_COMPENSADO,ID_REMESA,IMPORTE,OBSERVACIONES,OTROS_GASTOS,REFERENCIA,USUARIO', 1);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (423, 1, 'RECIBOS_CLIENTE', 'I', ',ID_CLIENTE,ID_EMPRESA,ID_TIENDA) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)', 2);
+INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (423, 1, 'RECIBOS_CLIENTE', 'I', ',ID_CLIENTE,ID_EMPRESA,ID_TIENDA,NIF_CIF,NOMBRE,CALLE,POBLACION,PROVINCIA,CODIGO_POSTAL) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)', 2);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (424, 1, 'RECIBOS_CLIENTE', 'U', 'UPDATE RECIBOS_CLIENTE SET ID=?,DESCRIPCION=?,FECHA_ALTA=?,FECHA_EMISION=?,FECHA_MODIFICACION=?,FECHA_VENCIMIENTO=?,ID_FACTURA=?,ID_RECIBO_COMPENSADO=?,ID_REMESA=?,IMPORTE=?,OBSERVACIONES=?,OTROS_GASTOS=?', 1);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (425, 1, 'RECIBOS_CLIENTE', 'U', ',REFERENCIA=?,USUARIO=?,ID_CLIENTE=?,ID_EMPRESA=?,ID_TIENDA=? WHERE ID=?', 2);
+INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (425, 1, 'RECIBOS_CLIENTE', 'U', ',REFERENCIA=?,USUARIO=?,ID_CLIENTE=?,ID_EMPRESA=?,ID_TIENDA=?,NIF_CIF=?,NOMBRE=?,CALLE=?,POBLACION=?,PROVINCIA=?,CODIGO_POSTAL=? WHERE ID=?', 2);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (426, 1, 'RECIBOS_CLIENTE', 'D', 'DELETE FROM RECIBOS_CLIENTE WHERE ID=?', 0);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (427, 1, 'RECIBOS_PROVEEDOR', 'S', 'SELECT ID,DESCRIPCION,FECHA_ALTA,FECHA_EMISION,FECHA_MODIFICACION,FECHA_VENCIMIENTO,ID_FACTURA,ID_RECIBO_COMPENSADO,ID_REMESA,IMPORTE,OBSERVACIONES,OTROS_GASTOS,REFERENCIA,REFERENCIA_PROVEEDOR,USUARIO,ID_EMPRESA', 1);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (428, 1, 'RECIBOS_PROVEEDOR', 'S', ',ID_PROVEEDOR,ID_TIENDA FROM RECIBOS_PROVEEDOR', 2);
+INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (428, 1, 'RECIBOS_PROVEEDOR', 'S', ',ID_PROVEEDOR,ID_TIENDA,NIF_CIF,NOMBRE,CALLE,POBLACION,PROVINCIA,CODIGO_POSTAL FROM RECIBOS_PROVEEDOR', 2);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (429, 1, 'RECIBOS_PROVEEDOR', 'S', ' WHERE ID=?', 3);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (430, 1, 'RECIBOS_PROVEEDOR', 'I', 'INSERT INTO RECIBOS_PROVEEDOR (ID,DESCRIPCION,FECHA_ALTA,FECHA_EMISION,FECHA_MODIFICACION,FECHA_VENCIMIENTO,ID_FACTURA,ID_RECIBO_COMPENSADO,ID_REMESA,IMPORTE,OBSERVACIONES,OTROS_GASTOS,REFERENCIA,REFERENCIA_PROVEEDOR', 1);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (431, 1, 'RECIBOS_PROVEEDOR', 'I', ',USUARIO,ID_EMPRESA,ID_PROVEEDOR,ID_TIENDA) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)', 2);
+INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (431, 1, 'RECIBOS_PROVEEDOR', 'I', ',USUARIO,ID_EMPRESA,ID_PROVEEDOR,ID_TIENDA,NIF_CIF,NOMBRE,CALLE,POBLACION,PROVINCIA,CODIGO_POSTAL) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)', 2);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (432, 1, 'RECIBOS_PROVEEDOR', 'U', 'UPDATE RECIBOS_PROVEEDOR SET ID=?,DESCRIPCION=?,FECHA_ALTA=?,FECHA_EMISION=?,FECHA_MODIFICACION=?,FECHA_VENCIMIENTO=?,ID_FACTURA=?,ID_RECIBO_COMPENSADO=?,ID_REMESA=?,IMPORTE=?,OBSERVACIONES=?,OTROS_GASTOS=?', 1);
-INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (433, 1, 'RECIBOS_PROVEEDOR', 'U', ',REFERENCIA=?,REFERENCIA_PROVEEDOR=?,USUARIO=?,ID_EMPRESA=?,ID_PROVEEDOR=?,ID_TIENDA=? WHERE ID=?', 2);
+INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (433, 1, 'RECIBOS_PROVEEDOR', 'U', ',REFERENCIA=?,REFERENCIA_PROVEEDOR=?,USUARIO=?,ID_EMPRESA=?,ID_PROVEEDOR=?,ID_TIENDA=?,NIF_CIF=?,NOMBRE=?,CALLE=?,POBLACION=?,PROVINCIA=?,CODIGO_POSTAL=? WHERE ID=?', 2);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (434, 1, 'RECIBOS_PROVEEDOR', 'D', 'DELETE FROM RECIBOS_PROVEEDOR WHERE ID=?', 0);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (435, 1, 'REFERENCIAS', 'S', 'SELECT ID,CODIGO,DESCRIPCION,ID_EMPRESA,VALOR,ID_TIENDA FROM REFERENCIAS', 1);
 INSERT INTO REPLDEFS (ID, FK_SOURCE, TABLENAME, OPTYPE, SQLSTMT, MORE) VALUES (436, 1, 'REFERENCIAS', 'S', ' WHERE ID=?', 2);
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 63747715..db0bee20 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -44,13 +44,6 @@
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">Libreria base de FactuGES</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
       <Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 878d4890..9374a523 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -53,7 +53,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">9</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.9.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.9.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.2.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.2.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       
       
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index a661d87e..ae839dac 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 2,1,9,0
-PRODUCTVERSION 2,1,9,0
+FILEVERSION 2,2,0,0
+PRODUCTVERSION 2,2,0,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.1.9.0\0"
+              VALUE "FileVersion", "2.2.0.0\0"
               VALUE "InternalName", "FactuGES\0"
               VALUE "ProductName", "FactuGES\0"
-              VALUE "ProductVersion", "2.1.9.0\0"
+              VALUE "ProductVersion", "2.2.0.0\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index 0fde2b86..874ce33d 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res
index 1641339f..8b251f31 100644
Binary files a/Source/GUIBase/GUIBase.res and b/Source/GUIBase/GUIBase.res differ
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 971dcb1e..2fa7b0d1 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 8e4b531c..fc939df8 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -28,8 +28,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType />
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">9</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.9.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.9.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 09 de abril de 2008 20:40</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.2.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.2.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       
       
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 4ec51495..5e682309 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 2,1,9,0
-PRODUCTVERSION 2,1,9,0
+FILEVERSION 2,2,0,0
+PRODUCTVERSION 2,2,0,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.1.9.0\0"
+              VALUE "FileVersion", "2.2.0.0\0"
               VALUE "ProductName", "FactuGES (Servidor)\0"
-              VALUE "ProductVersion", "2.1.9.0\0"
-              VALUE "CompileDate", "jueves, 24 de abril de 2008 11:59\0"
+              VALUE "ProductVersion", "2.2.0.0\0"
+              VALUE "CompileDate", "jueves, 24 de abril de 2008 19:19\0"
          END
     END
     BLOCK "VarFileInfo"