From a1784470cc8e9bb0c020865a60c113c7040c1cb4 Mon Sep 17 00:00:00 2001
From: Bernat <bernat.verdnatura@gmail.com>
Date: Wed, 20 Nov 2019 12:42:10 +0100
Subject: [PATCH 1/4] update scheme db

---
 .../10110-postCampaign/00-bionicConfig.sql    | 13 +++
 .../01-bionicCalcReverse.sql                  | 92 +++++++++++++++++++
 .../reports/driver-route/driver-route.js      |  2 +-
 3 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 db/changes/10110-postCampaign/00-bionicConfig.sql
 create mode 100644 db/changes/10110-postCampaign/01-bionicCalcReverse.sql

diff --git a/db/changes/10110-postCampaign/00-bionicConfig.sql b/db/changes/10110-postCampaign/00-bionicConfig.sql
new file mode 100644
index 0000000000..559eeaf11e
--- /dev/null
+++ b/db/changes/10110-postCampaign/00-bionicConfig.sql
@@ -0,0 +1,13 @@
+CREATE TABLE IF NOT EXISTS `vn`.`bionicConfig` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `generalInflationCoeficient` double(10,2) NOT NULL,
+  `minimumDensityVolumetricWeight` double(10,2) NOT NULL,
+  `verdnaturaVolumeBox` int(11) NOT NULL,
+  `itemCarryBox` int(11) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+
+INSERT INTO `vn`.`bionicConfig` (`generalInflationCoeficient`, `minimumDensityVolumetricWeight`, `verdnaturaVolumeBox`, `itemCarryBox`)
+    VALUES
+        (1.30, 167.00, 138000, 71);
diff --git a/db/changes/10110-postCampaign/01-bionicCalcReverse.sql b/db/changes/10110-postCampaign/01-bionicCalcReverse.sql
new file mode 100644
index 0000000000..e3f6b13871
--- /dev/null
+++ b/db/changes/10110-postCampaign/01-bionicCalcReverse.sql
@@ -0,0 +1,92 @@
+DROP function IF EXISTS `vn`.`bionicCalcReverse`;
+
+DELIMITER $$
+CREATE DEFINER=`root`@`%` FUNCTION `vn`.`bionicCalcReverse`(vWarehouse INT,
+    vMargin DECIMAL(10,3),
+    vRetailedPrice DECIMAL(10,3),
+    vM3 DECIMAL(10,3),
+    vAddress INT,
+    vAgencyMode INT) RETURNS decimal(10,3)
+    DETERMINISTIC
+BEGIN
+	DECLARE vGeneralInflationCoeficient INT;
+    DECLARE vVerdnaturaVolumeBox BIGINT;
+    DECLARE vClientFk INT;
+    DECLARE vComponentRecovery VARCHAR(50) DEFAULT 'debtCollection';
+	DECLARE vComponentMana VARCHAR(50) DEFAULT 'autoMana';
+	DECLARE vComponentPort VARCHAR(50) DEFAULT 'delivery';
+	DECLARE vComponentMargin VARCHAR(50) DEFAULT 'margin';
+	DECLARE vComponentCost VARCHAR(50) DEFAULT 'purchaseValue';
+    DECLARE vComponentCostValue DECIMAL(10,2);
+	DECLARE vItem INT DEFAULT 98;
+    DECLARE vItemCarryBox INT;
+	
+    SELECT generalInflationCoeFicient, verdnaturaVolumeBox, itemCarryBox
+			INTO vGeneralInflationCoeficient, vVerdnaturaVolumeBox, vItemCarryBox
+		FROM bionicConfig;
+    
+    SELECT clientFk INTO vClientFk FROM address WHERE id = vAddress;
+
+	-- Creamos la tabla tmp.bionicComponent
+    DROP TEMPORARY TABLE IF EXISTS tmp.bionicComponent;
+    CREATE TEMPORARY TABLE tmp.bionicComponent(
+		`warehouseFk` smallint(5) unsigned NOT NULL,
+		`itemFk` int(11) NOT NULL,
+		`componentFk` int(10) unsigned NOT NULL,
+		`value` decimal(10,4) NOT NULL,
+		UNIQUE KEY `itemWarehouseComponent` (`itemFk`,`warehouseFk`,`componentFk`) USING HASH,
+		KEY `itemWarehouse` (`itemFk`,`warehouseFk`) USING BTREE
+	) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+   -- Margin
+	INSERT INTO tmp.bionicComponent (warehouseFk, itemFk, componentFk, `value`)
+		SELECT vWarehouse, vItem, id, vMargin
+			FROM component
+			WHERE code = vComponentMargin;
+
+   -- Recobro
+	INSERT INTO tmp.bionicComponent (warehouseFk, itemFk, componentFk, `value`)
+		SELECT vWarehouse, vItem, c.id, ROUND(LEAST(cr.recobro,0.25), 3) 
+			FROM bi.claims_ratio cr
+				JOIN component c ON c.code = vComponentRecovery
+				WHERE cr.Id_Cliente = vClientFk AND cr.recobro > 0.009;
+                            
+	-- Componente de maná automático, en función del maná acumulado por el comercial.
+	INSERT INTO tmp.bionicComponent (warehouseFk, itemFk, componentFk, `value`)
+		SELECT vWarehouse, vItem, co.id, ROUND(ms.prices_modifier_rate, 3)
+			FROM client c 
+				JOIN bs.mana_spellers ms ON c.salesPersonFk = ms.Id_Trabajador
+                JOIN component co ON co.code = vComponentMana
+			WHERE ms.prices_modifier_activated AND c.id = vClientFk LIMIT 1;
+ 
+	-- Reparto
+	INSERT INTO tmp.bionicComponent (warehouseFk, itemFk, componentFk, `value`)
+		SELECT vWarehouse, vItem, co.id, vGeneralInflationCoeficient
+				* ROUND(
+						vM3
+						* az.price
+						* az.inflation
+						/ vVerdnaturaVolumeBox, 4
+						)
+			FROM agencyMode ag
+				JOIN address a ON a.id = vAddress AND ag.id = vAgencyMode
+				JOIN agencyProvince ap ON ap.agencyFk = ag.agencyFk 
+					AND ap.warehouseFk = vWarehouse AND ap.provinceFk = a.provinceFk
+				JOIN agencyModeZone az ON az.agencyModeFk = vAgencyMode 
+					AND az.zone = ap.zone AND az.itemFk = 71 AND az.warehouseFk = vWarehouse
+				JOIN component co ON co.code = vComponentPort;
+    
+    -- Coste
+	SELECT vRetailedPrice - SUM(`value`) INTO vComponentCostValue
+		FROM tmp.bionicComponent;
+
+	INSERT INTO tmp.bionicComponent (warehouseFk, itemFk, componentFk, `value`)
+		SELECT vWarehouse, vItem, id,vComponentCostValue
+			FROM component 
+            WHERE code = vComponentCost;
+        
+    RETURN vComponentCostValue;
+END$$
+
+DELIMITER ;
+
diff --git a/print/templates/reports/driver-route/driver-route.js b/print/templates/reports/driver-route/driver-route.js
index 908f493708..498666cc63 100755
--- a/print/templates/reports/driver-route/driver-route.js
+++ b/print/templates/reports/driver-route/driver-route.js
@@ -59,7 +59,7 @@ module.exports = {
                     LEFT JOIN ticket t ON t.routeFk = r.id
                     LEFT JOIN address a ON a.id = t.addressFk
                     LEFT JOIN client c ON c.id = t.clientFk
-                    LEFT JOIN worker w ON w.id = vn2008.Averiguar_ComercialCliente_Id(t.clientFk, CURDATE())
+                    LEFT JOIN worker w ON w.id = client_getSalesPerson(t.clientFk, CURDATE())
                     LEFT JOIN account.user u ON u.id = w.userFk
                     LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id AND tob.observationTypeFk = 3
                     LEFT JOIN province p ON a.provinceFk = p.id

From 525e1157810a828b0ce3debaa714782550db2d98 Mon Sep 17 00:00:00 2001
From: Bernat <bernat.verdnatura@gmail.com>
Date: Thu, 21 Nov 2019 07:24:31 +0100
Subject: [PATCH 2/4] #1711 Eliminar referencias al esquema vn2008

---
 .../10110-postCampaign/00-bionicConfig.sql    |   13 -
 .../00-buyNotifyPassport.sql                  |   34 +
 .../10110-postCampaign/00-clientGetMana.sql   |   74 +
 .../10110-postCampaign/01-buyAfterUpsert.sql  |   59 +
 db/dump/fixtures.sql                          |   19 +-
 db/dump/structure.sql                         | 2989 ++++-------------
 6 files changed, 808 insertions(+), 2380 deletions(-)
 delete mode 100644 db/changes/10110-postCampaign/00-bionicConfig.sql
 create mode 100644 db/changes/10110-postCampaign/00-buyNotifyPassport.sql
 create mode 100644 db/changes/10110-postCampaign/00-clientGetMana.sql
 create mode 100644 db/changes/10110-postCampaign/01-buyAfterUpsert.sql

diff --git a/db/changes/10110-postCampaign/00-bionicConfig.sql b/db/changes/10110-postCampaign/00-bionicConfig.sql
deleted file mode 100644
index 559eeaf11e..0000000000
--- a/db/changes/10110-postCampaign/00-bionicConfig.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-CREATE TABLE IF NOT EXISTS `vn`.`bionicConfig` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `generalInflationCoeficient` double(10,2) NOT NULL,
-  `minimumDensityVolumetricWeight` double(10,2) NOT NULL,
-  `verdnaturaVolumeBox` int(11) NOT NULL,
-  `itemCarryBox` int(11) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-
-INSERT INTO `vn`.`bionicConfig` (`generalInflationCoeficient`, `minimumDensityVolumetricWeight`, `verdnaturaVolumeBox`, `itemCarryBox`)
-    VALUES
-        (1.30, 167.00, 138000, 71);
diff --git a/db/changes/10110-postCampaign/00-buyNotifyPassport.sql b/db/changes/10110-postCampaign/00-buyNotifyPassport.sql
new file mode 100644
index 0000000000..d8b35ade35
--- /dev/null
+++ b/db/changes/10110-postCampaign/00-buyNotifyPassport.sql
@@ -0,0 +1,34 @@
+DROP procedure IF EXISTS `vn`.`buy_notifyPassport`;
+
+DELIMITER $$
+CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`buy_notifyPassport`(
+	IN vBuyFk INT,
+	IN vItemFk INT,
+    IN vStickers SMALLINT,
+    IN vPacking SMALLINT
+)
+BEGIN
+	INSERT INTO vn.mail(`subject`,`body`,`sender`) 
+		SELECT 'Solicitar pasaporte',
+				CONCAT(
+					'Etiquetas: ', IFNULL(vStickers, 0),
+                    ', Packing: ', IFNULL(vPacking, 0),
+                    ', Nombre: ', IFNULL(i.`name`, 0),
+                    ', buy_edi: ', IFNULL(e.id, 0),
+                    ', Nombre botánico: ', IFNULL(g.latin_genus_name, ''), ' ', IFNULL(s.latin_species_name, ''),
+                    ', Productor: ',IFNULL(es.company_name, IFNULL(p.`name`, ''))
+				)
+				,'ekt@verdnatura.es' 
+			FROM item i
+				LEFT JOIN itemBotanical ib ON ib.itemFk = i.id
+				LEFT JOIN edi.genus g ON g.genus_id = ib.genusFk
+				LEFT JOIN edi.specie s ON IFNULL(s.specie_id, ib.specieFk) = ib.specieFk
+				LEFT JOIN producer p ON p.id = i.producerFk
+				LEFT JOIN buy b ON b.id = vBuyFk
+				LEFT JOIN edi.ekt e ON b.ektFk = e.id
+				LEFT JOIN edi.supplier es ON es.supplier_id = e.pro
+			WHERE i.id = vItemFk; 
+END$$
+
+DELIMITER ;
+
diff --git a/db/changes/10110-postCampaign/00-clientGetMana.sql b/db/changes/10110-postCampaign/00-clientGetMana.sql
new file mode 100644
index 0000000000..7666d0c1cc
--- /dev/null
+++ b/db/changes/10110-postCampaign/00-clientGetMana.sql
@@ -0,0 +1,74 @@
+DROP function IF EXISTS `vn`.`clientGetMana`;
+
+DELIMITER $$
+CREATE DEFINER=`root`@`%` FUNCTION `vn`.`clientGetMana`(vClient INT) RETURNS decimal(10,2)
+    DETERMINISTIC
+BEGIN
+/**
+ * Devuelve el maná del cliente.
+ *
+ * @param vClient Id del cliente
+ * @return Maná del cliente
+ */
+	DECLARE vMana DECIMAL(10,2);
+	DECLARE vFromDated DATE;
+    DECLARE vHasMana BOOLEAN;
+	DECLARE vManaComponent INT;
+	DECLARE vAutoManaComponent INT;
+    DECLARE vManaBank INT DEFAULT 66;
+    
+    SELECT id INTO vManaComponent FROM component WHERE code = 'mana';
+    SELECT id INTO vAutoManaComponent FROM component WHERE code = 'autoMana';
+    
+	SELECT COUNT(*) INTO vHasMana
+		FROM `client` c
+		WHERE c.id = vClient AND c.typeFk = 'normal';
+	
+	IF NOT vHasMana THEN
+		RETURN 0;
+	END IF;
+	
+	SELECT max(dated) INTO vFromDated
+	FROM clientManaCache;
+
+	SELECT sum(mana) INTO vMana
+		FROM 
+			(
+			SELECT mana
+				FROM clientManaCache
+				WHERE clientFk = vClient
+				AND dated = vFromDated			
+			UNION ALL
+			SELECT s.quantity * value
+				 FROM ticket t
+					JOIN address a ON a.id = t.addressFk
+					JOIN sale s on s.ticketFk = t.id
+					JOIN saleComponent sc on sc.saleFk = s.id
+						WHERE sc.componentFk IN (vManaComponent, vAutoManaComponent)
+							AND t.shipped > vFromDated 
+							AND t.shipped < TIMESTAMPADD(DAY,1,CURDATE())
+							AND a.clientFk = vClient
+			UNION ALL
+			SELECT - amountPaid
+				FROM receipt r
+					JOIN `client` c ON c.id = r.clientFk
+				WHERE r.bankFk = vManaBank
+					AND r.payed > vFromDated
+					AND r.payed <= CURDATE()
+					AND c.id = vClient
+			UNION ALL
+			SELECT  g.Importe
+				FROM vn2008.Greuges g
+					JOIN vn2008.Clientes c using(Id_Cliente)
+				WHERE g.Greuges_type_id = 3 -- Maná
+					AND g.Fecha > vFromDated
+					AND g.Fecha <= CURDATE()
+					AND c.Id_Cliente = vClient
+			) sub;
+
+	RETURN IFNULL(vMana,0);
+
+END$$
+
+DELIMITER ;
+
diff --git a/db/changes/10110-postCampaign/01-buyAfterUpsert.sql b/db/changes/10110-postCampaign/01-buyAfterUpsert.sql
new file mode 100644
index 0000000000..2e3b80752a
--- /dev/null
+++ b/db/changes/10110-postCampaign/01-buyAfterUpsert.sql
@@ -0,0 +1,59 @@
+
+DROP procedure IF EXISTS `vn`.`buy_afterUpsert`;
+
+DELIMITER $$
+CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`buy_afterUpsert`(vSelf INT)
+BEGIN
+/**
+ * Triggered actions when a buy is updated or inserted.
+ *
+ * @param vSelf The buy reference
+ */
+	DECLARE vEntryFk INT;
+	DECLARE vItemFk INT;
+	DECLARE vStickers INT;
+	DECLARE vPacking INT;
+	DECLARE vWarehouse INT;
+	DECLARE vWarehouseOut INT;
+	DECLARE vIsMerchandise BOOL;
+	DECLARE vIsFeedStock BOOL;
+
+	SELECT entryFk, itemFk, stickers, packing
+		INTO vEntryFk, vItemFk, vStickers, vPacking
+		FROM buy
+		WHERE id = vSelf;
+
+	SELECT t.warehouseInFk, t.warehouseOutFk
+		INTO vWarehouse, vWarehouseOut
+		FROM entry e
+			JOIN travel t ON t.id = e.travelFk
+		WHERE e.id = vEntryFk;
+
+	SELECT k.merchandise INTO vIsMerchandise
+		FROM itemCategory k
+			JOIN itemType it ON it.categoryFk = k.id
+			JOIN item i ON i.typeFk = it.id
+		WHERE i.id = vItemFk;
+	IF vIsMerchandise THEN
+		REPLACE bi.rotacion	SET
+			Id_Article = vItemFk,
+			warehouse_id = vWarehouse,
+			cm3 = buy_getUnitVolume(vSelf);
+	END IF;
+
+	SELECT isFeedStock INTO vIsFeedStock
+		FROM warehouse WHERE id = vWarehouseOut AND id <> 13;
+
+	IF vIsFeedStock AND vn2008.has_notify_passport(vItemFk, vSelf) THEN
+		CALL vn.buy_notifyPassport(vSelf, vItemFk, vStickers, vPacking);
+		INSERT IGNORE INTO producer(`name`)
+			SELECT es.company_name
+				FROM buy b
+					JOIN edi.ekt be ON be.id = b.ektFk
+					JOIN edi.supplier es ON es.supplier_id = be.pro
+				WHERE b.id = 1;
+	END IF;
+END$$
+
+DELIMITER ;
+
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 21413d3297..c9dbd8a8a1 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -10,6 +10,11 @@ INSERT INTO `account`.`mailConfig` (`id`, `domain`)
     VALUES
         ('1', 'verdnatura.es');
 
+INSERT INTO `vn`.`bionicConfig` (`generalInflationCoeficient`, `minimumDensityVolumetricWeight`, `verdnaturaVolumeBox`, `itemCarryBox`)
+    VALUES
+        (1.30, 167.00, 138000, 71);
+
+
 INSERT INTO `account`.`user`(`id`,`name`, `nickname`, `password`,`role`,`active`,`email`, `lang`)
     SELECT id, name, CONCAT(name, 'Nick'),MD5('nightmare'), id, 1, CONCAT(name, '@mydomain.com'), 'es'
         FROM `account`.`role`;
@@ -562,14 +567,14 @@ INSERT INTO `vn`.`config`(`id`, `mdbServer`, `fakeEmail`, `defaultersMaxAmount`,
     VALUES
         (1, 'beta-server', 'nightmare@mydomain.com', '200', DATE_ADD(CURDATE(),INTERVAL -1 MONTH));
 
-INSERT INTO `vn`.`greugeType`(`id`, `name`)
+INSERT INTO `vn`.`greugeType`(`id`, `name`, `code`)
     VALUES
-        (1, 'Diff'),
-        (2, 'Recover'),
-        (3, 'Manna'),
-        (4, 'Reclaim'),
-        (5, 'Heritage'),
-        (6, 'Miscellaneous');
+        (1, 'Diff',             'diff'),
+        (2, 'Recover',          'recover'),
+        (3, 'Mana',             'mana'),
+        (4, 'Reclaim',          'reclaim'),
+        (5, 'Heritage',         'heritage'),
+        (6, 'Miscellaneous',    'miscellaneous');
 
 INSERT INTO `vn`.`greuge`(`id`, `clientFk`, `description`, `amount`, `shipped`, `created`, `greugeTypeFk`, `ticketFk`)
     VALUES
diff --git a/db/dump/structure.sql b/db/dump/structure.sql
index e3484d4108..cb75fc2db6 100644
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@@ -175,7 +175,7 @@ CREATE TABLE `mailAlias` (
   `isPublic` tinyint(4) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   UNIQUE KEY `alias` (`alias`)
-) ENGINE=InnoDB AUTO_INCREMENT=82 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Mail aliases';
+) ENGINE=InnoDB AUTO_INCREMENT=83 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Mail aliases';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -365,7 +365,7 @@ CREATE TABLE `user` (
   KEY `nickname` (`nickname`),
   KEY `lang` (`lang`),
   CONSTRAINT `user_ibfk_2` FOREIGN KEY (`role`) REFERENCES `role` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=16879 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Global users';
+) ENGINE=InnoDB AUTO_INCREMENT=16888 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Global users';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -1977,7 +1977,7 @@ CREATE TABLE `analisis_ventas` (
   `Importe` double NOT NULL,
   PRIMARY KEY (`id`),
   KEY `Año` (`Año`,`Semana`)
-) ENGINE=InnoDB AUTO_INCREMENT=112778678 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=113827238 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2458,7 +2458,7 @@ CREATE TABLE `rutasBoard` (
   KEY `rutasBoard_ix1` (`year`),
   KEY `rutasBoard_ix2` (`month`),
   KEY `rutasBoard_ix3` (`warehouse_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=198546 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=202638 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5396,6 +5396,29 @@ SET character_set_client = utf8;
  1 AS `lastYearWeekSales`*/;
 SET character_set_client = @saved_cs_client;
 
+--
+-- Table structure for table `m3`
+--
+
+DROP TABLE IF EXISTS `m3`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `m3` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `fecha` date NOT NULL,
+  `provinceFk` smallint(5) unsigned DEFAULT NULL,
+  `warehouseFk` smallint(6) unsigned NOT NULL DEFAULT '0',
+  `m3` decimal(10,2) DEFAULT NULL,
+  `year` int(11) DEFAULT NULL,
+  `month` int(11) DEFAULT NULL,
+  `week` int(11) DEFAULT NULL,
+  `day` int(11) DEFAULT NULL,
+  `dayName` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `euros` decimal(10,2) DEFAULT '0.00',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=370910 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Temporary table structure for view `m3Silla`
 --
@@ -5415,29 +5438,6 @@ SET character_set_client = utf8;
  1 AS `Euros`*/;
 SET character_set_client = @saved_cs_client;
 
---
--- Table structure for table `m3__`
---
-
-DROP TABLE IF EXISTS `m3__`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `m3__` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `fecha` date NOT NULL,
-  `provinceFk` smallint(5) unsigned DEFAULT NULL,
-  `warehouseFk` smallint(6) unsigned NOT NULL DEFAULT '0',
-  `m3` decimal(10,2) DEFAULT NULL,
-  `year` int(11) DEFAULT NULL,
-  `month` int(11) DEFAULT NULL,
-  `week` int(11) DEFAULT NULL,
-  `day` int(11) DEFAULT NULL,
-  `dayName` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `euros` decimal(10,2) DEFAULT '0.00',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=368864 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
 --
 -- Temporary table structure for view `m3analisis`
 --
@@ -5688,7 +5688,7 @@ CREATE TABLE `payMethodClient` (
   KEY `FkDateClientPayMethod` (`dated`,`clientFk`),
   CONSTRAINT `FkClientPayMethod` FOREIGN KEY (`clientFk`) REFERENCES `vn`.`client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `FkPayMethodClient` FOREIGN KEY (`payMethodFk`) REFERENCES `vn`.`payMethod` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=5829757 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+) ENGINE=InnoDB AUTO_INCREMENT=5862523 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5763,7 +5763,7 @@ CREATE TABLE `productivity` (
   `m3PCA` double NOT NULL DEFAULT '0',
   `m3Artificial` decimal(10,2) NOT NULL DEFAULT '0.00',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=61099748 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=61353576 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7016,7 +7016,7 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `m3Add__` */;
+/*!50003 DROP PROCEDURE IF EXISTS `m3Add` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -7026,7 +7026,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `m3Add__`()
+CREATE DEFINER=`root`@`%` PROCEDURE `m3Add`()
 BEGIN
 
 	DECLARE datSTART DATE;
@@ -8918,7 +8918,7 @@ CREATE TABLE `cache_calc` (
   KEY `cache_id` (`cache_id`),
   KEY `cacheName` (`cacheName`),
   KEY `expires` (`expires`)
-) ENGINE=InnoDB AUTO_INCREMENT=436254 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=437035 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8986,7 +8986,7 @@ CREATE TABLE `prod_graphic_source` (
   `alert_level` int(11) NOT NULL DEFAULT '0',
   `Agencia` varchar(45) CHARACTER SET utf8 NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2234381 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2240007 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10033,7 +10033,7 @@ CREATE TABLE `deliveryInformation` (
   KEY `fgbSupplyResponse_idx2` (`FirstOrderDateTime`),
   KEY `fgbSupplyResponse_idx3` (`LatestOrderDateTime`),
   CONSTRAINT `fgbSupplyResponse` FOREIGN KEY (`supplyResponseID`) REFERENCES `supplyResponse` (`ID`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=24314205 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=24393221 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10091,7 +10091,7 @@ CREATE TABLE `ekt` (
   KEY `barcode` (`barcode`),
   KEY `fec` (`fec`),
   KEY `putOrderFk` (`putOrderFk`)
-) ENGINE=InnoDB AUTO_INCREMENT=1111068 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1112531 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10112,7 +10112,7 @@ CREATE TABLE `exchange` (
   KEY `buy_edi_id` (`ektFk`),
   CONSTRAINT `exchange_ibfk_1` FOREIGN KEY (`mailFk`) REFERENCES `mail` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `exchange_ibfk_2` FOREIGN KEY (`ektFk`) REFERENCES `ekt` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=651748 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=653193 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10374,7 +10374,7 @@ CREATE TABLE `mail` (
   UNIQUE KEY `mail_id` (`messageId`),
   KEY `sender_id` (`senderFk`),
   CONSTRAINT `mail_ibfk_2` FOREIGN KEY (`senderFk`) REFERENCES `mailSender` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=681655 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=683079 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10630,7 +10630,7 @@ CREATE TABLE `supplyResponse` (
   PRIMARY KEY (`ID`),
   UNIQUE KEY `ID_UNIQUE` (`ID`),
   KEY `IX_TransNumber` (`TransactionNumber`) COMMENT 'Agregado por Ernesto 11.6.2019\nSe ejecutaba 1 consulta por segundo desde MAIL y consumia un 20% de CPU de todo el servidor !!!!!\nCPU usada es mas estable que Indice en SendererID, cpu vs espacio que ocupa?\n'
-) ENGINE=InnoDB AUTO_INCREMENT=8917792 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=8947741 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11327,7 +11327,7 @@ CREATE TABLE `image` (
   PRIMARY KEY (`id`),
   UNIQUE KEY `collection` (`collectionFk`,`name`),
   CONSTRAINT `image_ibfk_1` FOREIGN KEY (`collectionFk`) REFERENCES `imageCollection` (`name`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=171273 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=171831 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12008,7 +12008,7 @@ CREATE TABLE `order` (
   CONSTRAINT `order_ibfk_5` FOREIGN KEY (`address_id`) REFERENCES `vn`.`address` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `order_ibfk_8` FOREIGN KEY (`delivery_method_id`) REFERENCES `vn`.`deliveryMethod` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `order_ibfk_9` FOREIGN KEY (`agency_id`) REFERENCES `vn`.`agencyMode` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=2244750 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2247959 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -12127,7 +12127,7 @@ CREATE TABLE `orderRow` (
   KEY `warehouse_shipment` (`warehouseFk`,`shipment`),
   CONSTRAINT `orderRow_ibfk_2` FOREIGN KEY (`itemFk`) REFERENCES `vn`.`item` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `orderRow_ibfk_3` FOREIGN KEY (`orderFk`) REFERENCES `order` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=13453850 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=13471735 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -12551,7 +12551,7 @@ CREATE TABLE `tpvTransaction` (
   CONSTRAINT `receipt_id` FOREIGN KEY (`receiptFk`) REFERENCES `vn`.`receipt` (`Id`) ON DELETE SET NULL ON UPDATE CASCADE,
   CONSTRAINT `tpvTransaction_ibfk_1` FOREIGN KEY (`clientFk`) REFERENCES `vn`.`client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `tpvTransaction_ibfk_2` FOREIGN KEY (`merchantFk`) REFERENCES `tpvMerchant` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=372339 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Transactions realized through the virtual TPV';
+) ENGINE=InnoDB AUTO_INCREMENT=372874 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Transactions realized through the virtual TPV';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12586,7 +12586,7 @@ CREATE TABLE `visit` (
   PRIMARY KEY (`id`),
   KEY `firstAgent` (`firstAgentFk`),
   CONSTRAINT `visit_ibfk_1` FOREIGN KEY (`firstAgentFk`) REFERENCES `visitAgent` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=2005986 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2008312 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12606,7 +12606,7 @@ CREATE TABLE `visitAccess` (
   KEY `visit_access_idx_agent` (`agentFk`),
   KEY `stamp` (`stamp`),
   CONSTRAINT `visitAccess_ibfk_1` FOREIGN KEY (`agentFk`) REFERENCES `visitAgent` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=4478440 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=4484736 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12631,7 +12631,7 @@ CREATE TABLE `visitAgent` (
   KEY `firstAccess` (`firstAccessFk`),
   CONSTRAINT `visitAgent_ibfk_1` FOREIGN KEY (`visitFk`) REFERENCES `visit` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `visitAgent_ibfk_2` FOREIGN KEY (`firstAccessFk`) REFERENCES `visitAccess` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=2652592 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2655432 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12651,7 +12651,7 @@ CREATE TABLE `visitUser` (
   KEY `date_time` (`stamp`),
   KEY `user_id` (`userFk`),
   CONSTRAINT `visitUser_ibfk_1` FOREIGN KEY (`accessFk`) REFERENCES `visitAccess` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=3922066 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3927228 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -16389,7 +16389,7 @@ CREATE TABLE `cdr` (
   KEY `dstchannel` (`dst_channel`),
   KEY `disposition` (`disposition`),
   KEY `src` (`src`)
-) ENGINE=InnoDB AUTO_INCREMENT=315692 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=316007 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -17490,7 +17490,7 @@ CREATE TABLE `income_employee` (
   KEY `fperson_id` (`person_id`),
   CONSTRAINT `fincometype_id` FOREIGN KEY (`id_incomeType`) REFERENCES `incometype_employee` (`id_incometype`) ON DELETE NO ACTION ON UPDATE NO ACTION,
   CONSTRAINT `fperson_id` FOREIGN KEY (`person_id`) REFERENCES `person` (`person_id`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB AUTO_INCREMENT=73578 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=73581 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -18209,7 +18209,7 @@ CREATE TABLE `outbound` (
   KEY `warehouseFk` (`warehouseFk`,`itemFk`,`dated`),
   KEY `expired` (`expired`),
   KEY `isSync` (`isSync`)
-) ENGINE=InnoDB AUTO_INCREMENT=4273151 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 ALTER DATABASE `stock` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
@@ -20180,7 +20180,7 @@ CREATE TABLE `XDiario` (
   PRIMARY KEY (`id`),
   KEY `empresa_id` (`empresa_id`),
   CONSTRAINT `XDiario_ibfk_1` FOREIGN KEY (`empresa_id`) REFERENCES `company` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=4053991 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=4055070 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -20357,23 +20357,6 @@ SET character_set_client = utf8;
  1 AS `code`*/;
 SET character_set_client = @saved_cs_client;
 
---
--- Temporary table structure for view `accounting`
---
-
-DROP TABLE IF EXISTS `accounting`;
-/*!50001 DROP VIEW IF EXISTS `accounting`*/;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-/*!50001 CREATE VIEW `accounting` AS SELECT 
- 1 AS `id`,
- 1 AS `bank`,
- 1 AS `account`,
- 1 AS `accountingTypeFk`,
- 1 AS `entityFk`,
- 1 AS `isActive`*/;
-SET character_set_client = @saved_cs_client;
-
 --
 -- Table structure for table `accountingType`
 --
@@ -20388,6 +20371,23 @@ CREATE TABLE `accountingType` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='descripcio dels valors de la columna "cash" de la taula vn2008.Bancios';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Temporary table structure for view `accounting__`
+--
+
+DROP TABLE IF EXISTS `accounting__`;
+/*!50001 DROP VIEW IF EXISTS `accounting__`*/;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `accounting__` AS SELECT 
+ 1 AS `id`,
+ 1 AS `bank`,
+ 1 AS `account`,
+ 1 AS `accountingTypeFk`,
+ 1 AS `entityFk`,
+ 1 AS `isActive`*/;
+SET character_set_client = @saved_cs_client;
+
 --
 -- Table structure for table `activeContrat`
 --
@@ -20460,7 +20460,7 @@ CREATE TABLE `address` (
   CONSTRAINT `address_ibfk_1` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
   CONSTRAINT `address_ibfk_3` FOREIGN KEY (`provinceFk`) REFERENCES `province` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `address_ibfk_4` FOREIGN KEY (`agencyModeFk`) REFERENCES `agencyMode` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=29594 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=29607 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -20580,7 +20580,7 @@ CREATE TABLE `addressObservation` (
   KEY `addressObservationFgn_idx` (`observationTypeFk`),
   CONSTRAINT `addressFgn` FOREIGN KEY (`addressFk`) REFERENCES `address` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `addressObservationFgn` FOREIGN KEY (`observationTypeFk`) REFERENCES `observationType` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=4196 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Observaciones de los consignatarios';
+) ENGINE=InnoDB AUTO_INCREMENT=4198 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Observaciones de los consignatarios';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -20684,7 +20684,7 @@ CREATE TABLE `agencyMode` (
   PRIMARY KEY (`id`),
   KEY `Agencias` (`name`),
   KEY `Vista` (`deliveryMethodFk`)
-) ENGINE=InnoDB AUTO_INCREMENT=1235 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1236 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -20980,6 +20980,23 @@ SET character_set_client = utf8;
  1 AS `currencyFk`*/;
 SET character_set_client = @saved_cs_client;
 
+--
+-- Table structure for table `bionicConfig`
+--
+
+DROP TABLE IF EXISTS `bionicConfig`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `bionicConfig` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `generalInflationCoeficient` double(10,2) NOT NULL,
+  `minimumDensityVolumetricWeight` double(10,2) NOT NULL,
+  `verdnaturaVolumeBox` int(11) NOT NULL,
+  `itemCarryBox` int(11) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `bookingPlanner`
 --
@@ -21102,7 +21119,7 @@ CREATE TABLE `buy` (
   CONSTRAINT `buy_ibfk_3` FOREIGN KEY (`containerFk`) REFERENCES `vn2008`.`container` (`container_id`) ON UPDATE CASCADE,
   CONSTRAINT `buy_id` FOREIGN KEY (`entryFk`) REFERENCES `entry` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE,
   CONSTRAINT `buy_itemfk` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=352192921 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB AUTO_INCREMENT=352686632 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -21412,7 +21429,7 @@ CREATE TABLE `claim` (
   CONSTRAINT `claim_ibfk_3` FOREIGN KEY (`claimStateFk`) REFERENCES `claimState` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `claim_ibfk_4` FOREIGN KEY (`claimDepartmentFk`) REFERENCES `vn2008`.`cl_dep` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `claim_ibfk_5` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=71448 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Reclamaciones, tabla principal';
+) ENGINE=InnoDB AUTO_INCREMENT=71547 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Reclamaciones, tabla principal';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -21434,7 +21451,7 @@ CREATE TABLE `claimBeginning` (
   KEY `cl_main_id` (`claimFk`),
   CONSTRAINT `claimBeginning_ibfk_7` FOREIGN KEY (`saleFk`) REFERENCES `sale` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `claimBeginning_ibfk_8` FOREIGN KEY (`claimFk`) REFERENCES `claim` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=156853 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalle de las reclamaciones';
+) ENGINE=InnoDB AUTO_INCREMENT=157005 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalle de las reclamaciones';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -21544,7 +21561,7 @@ CREATE TABLE `claimDevelopment` (
   CONSTRAINT `claimDevelopment_ibfk_7` FOREIGN KEY (`claimReasonFk`) REFERENCES `claimReason` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `claimDevelopment_ibfk_8` FOREIGN KEY (`claimResultFk`) REFERENCES `claimResult` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `claimDevelopment_ibfk_9` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=61379 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Causas de las reclamaciones';
+) ENGINE=InnoDB AUTO_INCREMENT=61439 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Causas de las reclamaciones';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -21605,7 +21622,7 @@ CREATE TABLE `claimEnd` (
   CONSTRAINT `claimEnd_ibfk_1` FOREIGN KEY (`saleFk`) REFERENCES `sale` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `claimEnd_ibfk_3` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `claimEnd_ibfk_4` FOREIGN KEY (`claimFk`) REFERENCES `claim` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=119692 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Acciones en respuesta a las reclamaciones';
+) ENGINE=InnoDB AUTO_INCREMENT=119821 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Acciones en respuesta a las reclamaciones';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -21649,7 +21666,7 @@ CREATE TABLE `claimLog` (
   KEY `userFk` (`userFk`),
   CONSTRAINT `claimOriginFk` FOREIGN KEY (`originFk`) REFERENCES `claim` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `claimUserFk` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=6455 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=6658 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -21927,7 +21944,7 @@ CREATE TABLE `client` (
   CONSTRAINT `client_ibfk_5` FOREIGN KEY (`provinceFk`) REFERENCES `province` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `tipos_de_cliente` FOREIGN KEY (`clientTypeFk`) REFERENCES `clientType` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `typeFk` FOREIGN KEY (`typeFk`) REFERENCES `clientType` (`code`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB AUTO_INCREMENT=16879 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=16888 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -22096,7 +22113,7 @@ CREATE TABLE `clientCredit` (
   KEY `credit_ClienteFk` (`clientFk`),
   CONSTRAINT `credit_ClienteFk` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `workers_fk` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=85110 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=85166 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -22185,7 +22202,7 @@ CREATE TABLE `clientLog` (
   KEY `userFk` (`userFk`),
   CONSTRAINT `clientLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `clientLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=239932 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=240238 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -22220,7 +22237,7 @@ CREATE TABLE `clientObservation` (
   KEY `Id_Cliente` (`clientFk`),
   CONSTRAINT `clientObservation_ibfk_1` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `clientObservation_ibfk_2` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=78725 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket';
+) ENGINE=InnoDB AUTO_INCREMENT=78785 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -22331,7 +22348,7 @@ CREATE TABLE `clientSample` (
   PRIMARY KEY (`id`),
   KEY `empresa_id` (`companyFk`),
   CONSTRAINT `clientSample_ibfk_1` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=18542 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=18548 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -23040,7 +23057,7 @@ CREATE TABLE `creditClassification` (
   KEY `creditClassifClientFk_idx` (`client`),
   KEY `creditClassifdateEnd_idx` (`dateEnd`),
   CONSTRAINT `creditClassifClientFk` FOREIGN KEY (`client`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=3268 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3269 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_general_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
@@ -23085,7 +23102,7 @@ CREATE TABLE `creditInsurance` (
   PRIMARY KEY (`id`),
   KEY `CreditInsurance_Fk1_idx` (`creditClassification`),
   CONSTRAINT `CreditInsurance_Fk1` FOREIGN KEY (`creditClassification`) REFERENCES `creditClassification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=3147 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalla los clientes que tienen seguro de credito';
+) ENGINE=InnoDB AUTO_INCREMENT=3152 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalla los clientes que tienen seguro de credito';
 /*!40101 SET character_set_client = @saved_cs_client */;
 ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_general_ci ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
@@ -23394,7 +23411,7 @@ CREATE TABLE `dms` (
   UNIQUE KEY `emp_id` (`companyFk`,`hardCopyNumber`,`warehouseFk`),
   KEY `trabajador_id` (`workerFk`),
   KEY `warehouse_id` (`warehouseFk`)
-) ENGINE=InnoDB AUTO_INCREMENT=1386776 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='document managment system';
+) ENGINE=InnoDB AUTO_INCREMENT=1388177 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='document managment system';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -23581,7 +23598,7 @@ CREATE TABLE `dua` (
   CONSTRAINT `dua_fk1` FOREIGN KEY (`gestdocFk`) REFERENCES `dms` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
   CONSTRAINT `dua_fk2` FOREIGN KEY (`awbFk`) REFERENCES `vn2008`.`awb` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `dua_fk4` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=4307 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=4311 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -23642,7 +23659,7 @@ CREATE TABLE `duaInvoiceIn` (
   KEY `duaInvoiceIn_fk2_idx` (`invoiceInFk`),
   CONSTRAINT `duaInvoiceIn_fk1` FOREIGN KEY (`duaFk`) REFERENCES `dua` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `duaInvoiceIn_fk2` FOREIGN KEY (`invoiceInFk`) REFERENCES `vn2008`.`recibida` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=5267 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Facturas asociadas a la declaración aduanera, básicamente la del agente transitario';
+) ENGINE=InnoDB AUTO_INCREMENT=5268 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Facturas asociadas a la declaración aduanera, básicamente la del agente transitario';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -23667,7 +23684,7 @@ CREATE TABLE `duaTax` (
   CONSTRAINT `duaTax_fk1` FOREIGN KEY (`duaFk`) REFERENCES `dua` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `duaTax_fk2` FOREIGN KEY (`supplierFk`) REFERENCES `supplier` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `duaTax_fk3` FOREIGN KEY (`taxClassFk`) REFERENCES `taxClass` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=10147 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=10154 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -23803,7 +23820,7 @@ CREATE TABLE `entry` (
   CONSTRAINT `entry_ibfk_1` FOREIGN KEY (`supplierFk`) REFERENCES `supplier` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `entry_ibfk_6` FOREIGN KEY (`travelFk`) REFERENCES `travel` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `entry_ibfk_7` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=181977 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='InnoDB free: 88064 kB; (`Id_Proveedor`) REFER `vn2008/Provee';
+) ENGINE=InnoDB AUTO_INCREMENT=182103 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='InnoDB free: 88064 kB; (`Id_Proveedor`) REFER `vn2008/Provee';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -24004,7 +24021,7 @@ CREATE TABLE `entryLog` (
   KEY `entryLog_ibfk_2` (`userFk`),
   CONSTRAINT `entryLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `entry` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `entryLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=176820 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=177180 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -24251,7 +24268,7 @@ CREATE TABLE `expedition` (
   KEY `index4` (`ticketFk`),
   CONSTRAINT `Id_Agencia` FOREIGN KEY (`agencyModeFk`) REFERENCES `agencyMode` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `ticket_id` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=3420411 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3424451 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -24529,7 +24546,7 @@ CREATE TABLE `greuge` (
   KEY `Greuges_cliente_idx` (`clientFk`),
   CONSTRAINT `Id_Ticket_Greuge_Ticket` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `greuges_type_fk` FOREIGN KEY (`greugeTypeFk`) REFERENCES `greugeType` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=3807112 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=COMPACT;
+) ENGINE=InnoDB AUTO_INCREMENT=3810881 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=COMPACT;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -24564,6 +24581,7 @@ DROP TABLE IF EXISTS `greugeType`;
 CREATE TABLE `greugeType` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(45) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -24732,7 +24750,7 @@ CREATE TABLE `inventoryFailure` (
   CONSTRAINT `inventoryFailure_fk3` FOREIGN KEY (`guiltyFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `inventoryFailure_fk4` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `inventoryFailure_fk5` FOREIGN KEY (`causeFk`) REFERENCES `inventoryFailureCause` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=27119 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=27230 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -25010,7 +25028,7 @@ CREATE TABLE `invoiceOut` (
   CONSTRAINT `invoiceOut_ibfk_4` FOREIGN KEY (`cplusTaxBreakFk`) REFERENCES `cplusTaxBreak` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `invoice_bank_id` FOREIGN KEY (`bankFk`) REFERENCES `bank` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `invoice_customer_id` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=521491 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=521528 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -25136,7 +25154,7 @@ CREATE TABLE `invoiceOutExpence` (
   KEY `invoiceOutExpence_FK_2_idx` (`expenceFk`),
   CONSTRAINT `invoiceOutExpence_FK_1` FOREIGN KEY (`invoiceOutFk`) REFERENCES `invoiceOut` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `invoiceOutExpence_FK_2` FOREIGN KEY (`expenceFk`) REFERENCES `expence` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=135660 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Desglosa la base imponible de una factura en funcion del tipo de gasto/venta';
+) ENGINE=InnoDB AUTO_INCREMENT=135697 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Desglosa la base imponible de una factura en funcion del tipo de gasto/venta';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -25179,7 +25197,7 @@ CREATE TABLE `invoiceOutTax` (
   KEY `pgcFk` (`pgcFk`),
   CONSTRAINT `invoiceOutFk` FOREIGN KEY (`invoiceOutFk`) REFERENCES `invoiceOut` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `invoiceOutTax_ibfk_1` FOREIGN KEY (`pgcFk`) REFERENCES `pgc` (`code`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=1177056 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1177113 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -25285,7 +25303,7 @@ CREATE TABLE `item` (
   CONSTRAINT `item_ibfk_5` FOREIGN KEY (`typeFk`) REFERENCES `itemType` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `item_ibfk_6` FOREIGN KEY (`sectorFk`) REFERENCES `sector` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
   CONSTRAINT `producer_id` FOREIGN KEY (`producerFk`) REFERENCES `producer` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=376303 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=376585 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -25412,7 +25430,7 @@ CREATE TABLE `itemBarcode` (
   UNIQUE KEY `Id_Article_2` (`itemFk`,`code`),
   KEY `Id_Article` (`itemFk`),
   CONSTRAINT `itemBarcode_ibfk_1` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=42918 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=42923 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -25610,7 +25628,7 @@ CREATE TABLE `itemLog` (
   KEY `itemLogUserFk_idx` (`userFk`),
   CONSTRAINT `itemLogItemFk` FOREIGN KEY (`originFk`) REFERENCES `item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `itemLogUserFk` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=98195 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=99157 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -25637,7 +25655,7 @@ CREATE TABLE `itemPlacement` (
   CONSTRAINT `Articles_nicho_wh_fk` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `Articles_nichos_fk` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `itemPlacement_fk3` FOREIGN KEY (`sectorFk`) REFERENCES `sector` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=1159689 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1160906 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -25687,7 +25705,7 @@ CREATE TABLE `itemPlacementSupply` (
   CONSTRAINT `itemPlacementSupply_fk2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `itemPlacementSupply_fk3` FOREIGN KEY (`repoUserFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `itemPlacementSupply_fk4` FOREIGN KEY (`sectorFk`) REFERENCES `sector` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=80270 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Lista de nichos de picking que hay que reponer';
+) ENGINE=InnoDB AUTO_INCREMENT=80804 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Lista de nichos de picking que hay que reponer';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -25806,7 +25824,7 @@ CREATE TABLE `itemShelving` (
   CONSTRAINT `itemShelving_fk1` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `itemShelving_fk2` FOREIGN KEY (`shelvingFk`) REFERENCES `shelving` (`code`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `itemShelving_fk3` FOREIGN KEY (`packagingFk`) REFERENCES `packaging` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=138716 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Tabla utilizada para localizar los artículos dentro de los carros. Usado para la gestión del almacén en el altillo ';
+) ENGINE=InnoDB AUTO_INCREMENT=139217 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Tabla utilizada para localizar los artículos dentro de los carros. Usado para la gestión del almacén en el altillo ';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -25923,7 +25941,7 @@ CREATE TABLE `itemShelvingPlacementSupply` (
   KEY `itemShelvingPlacementSupply_fk3_idx` (`userFk`),
   CONSTRAINT `itemShelvingPlacementSupply_fk1` FOREIGN KEY (`itemShelvingFk`) REFERENCES `itemShelving` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `itemShelvingPlacementSupply_fk2` FOREIGN KEY (`itemPlacementSupplyFk`) REFERENCES `itemPlacementSupply` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=75118 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalle de los itemShelving afectados por las ordenes de reposicion de nicho';
+) ENGINE=InnoDB AUTO_INCREMENT=75648 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalle de los itemShelving afectados por las ordenes de reposicion de nicho';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -25995,7 +26013,7 @@ CREATE TABLE `itemShelvingSale` (
   CONSTRAINT `itemShelvingSale_fk1` FOREIGN KEY (`itemShelvingFk`) REFERENCES `itemShelving` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `itemShelvingSale_fk2` FOREIGN KEY (`saleFk`) REFERENCES `sale` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `itemShelvingSale_fk3` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=41364 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalle del producto que se retira de los carros, relacionando la linea de movimiento correspondiente';
+) ENGINE=InnoDB AUTO_INCREMENT=42087 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalle del producto que se retira de los carros, relacionando la linea de movimiento correspondiente';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -26122,7 +26140,7 @@ CREATE TABLE `itemTag` (
   KEY `itemFk_2` (`itemFk`,`tagFk`,`intValue`),
   CONSTRAINT `itemTagItemFk` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `itemTagTagFk` FOREIGN KEY (`tagFk`) REFERENCES `tag` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=1398362 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1400544 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -26266,7 +26284,7 @@ CREATE TABLE `itemTaxCountry` (
   CONSTRAINT `countryFK_paises` FOREIGN KEY (`countryFk`) REFERENCES `country` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `itemFK_Article` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `taxClassFK_Iva_Group` FOREIGN KEY (`taxClassFk`) REFERENCES `taxClass` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=887149 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Define la clase de iva por artículo y pais';
+) ENGINE=InnoDB AUTO_INCREMENT=888991 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Define la clase de iva por artículo y pais';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -26341,7 +26359,7 @@ CREATE TABLE `itemType` (
   CONSTRAINT `itemType_ibfk_1` FOREIGN KEY (`categoryFk`) REFERENCES `itemCategory` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `itemType_ibfk_2` FOREIGN KEY (`roleCodeFk`) REFERENCES `account`.`role` (`name`) ON UPDATE CASCADE,
   CONSTRAINT `warehouseFk5` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=284 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Protege la tabla tipos de updates para los 4 parámetros de los compradores, en funcion del valor del campo CodigoRojo de tblContadores.';
+) ENGINE=InnoDB AUTO_INCREMENT=285 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Protege la tabla tipos de updates para los 4 parámetros de los compradores, en funcion del valor del campo CodigoRojo de tblContadores.';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -26390,22 +26408,6 @@ CREATE TABLE `itemTypeI18n` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
---
--- Table structure for table `itemTypeI18nFr`
---
-
-DROP TABLE IF EXISTS `itemTypeI18nFr`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `itemTypeI18nFr` (
-  `id` int(11) NOT NULL,
-  `code` text COLLATE utf8_unicode_ci,
-  `es` text COLLATE utf8_unicode_ci,
-  `fr` text COLLATE utf8_unicode_ci,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
 --
 -- Temporary table structure for view `itemTypeL10n`
 --
@@ -26591,7 +26593,7 @@ CREATE TABLE `mandate` (
   CONSTRAINT `mandato_fgkey1` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE,
   CONSTRAINT `mandato_fgkey2` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE,
   CONSTRAINT `mandato_fgkey3` FOREIGN KEY (`mandateTypeFk`) REFERENCES `mandateType` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=17277 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=17280 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -26737,7 +26739,7 @@ CREATE TABLE `message` (
   KEY `sender` (`sender`),
   KEY `recipient` (`recipient`),
   KEY `uuid` (`uuid`(8))
-) ENGINE=InnoDB AUTO_INCREMENT=2054567 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2056489 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -26759,7 +26761,7 @@ CREATE TABLE `messageInbox` (
   PRIMARY KEY (`id`),
   KEY `uuid` (`uuid`(8)),
   KEY `finalRecipient` (`finalRecipient`)
-) ENGINE=InnoDB AUTO_INCREMENT=2230247 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2232309 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -26989,7 +26991,7 @@ CREATE TABLE `packageChecked` (
   PRIMARY KEY (`id`),
   UNIQUE KEY `entryFk_UNIQUE` (`itemFk`),
   KEY `fkItem_idx` (`itemFk`)
-) ENGINE=InnoDB AUTO_INCREMENT=3144 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3224 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -27092,7 +27094,7 @@ CREATE TABLE `parking` (
   UNIQUE KEY `code_UNIQUE` (`code`),
   KEY `parking_fk1_idx` (`sectorFk`),
   CONSTRAINT `parking_fk1` FOREIGN KEY (`sectorFk`) REFERENCES `sector` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=26789 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Tabla con los parkings del altillo';
+) ENGINE=InnoDB AUTO_INCREMENT=27698 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Tabla con los parkings del altillo';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -27695,7 +27697,7 @@ CREATE TABLE `producer` (
   `isVisible` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   UNIQUE KEY `name_UNIQUE` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=14462 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=14545 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -27798,7 +27800,7 @@ CREATE TABLE `province` (
   CONSTRAINT `province_ibfk_1` FOREIGN KEY (`countryFk`) REFERENCES `country` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `province_zone_fk` FOREIGN KEY (`zoneFk`) REFERENCES `vn2008`.`zones` (`zone_id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `warehouse_Id` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=209 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=216 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -28028,7 +28030,7 @@ CREATE TABLE `receipt` (
   CONSTRAINT `receipt_ibfk_1` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `receipt_ibfk_2` FOREIGN KEY (`bankFk`) REFERENCES `bank` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `recibo_customer_id` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=609571 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=609864 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -28214,7 +28216,7 @@ CREATE TABLE `route` (
   KEY `route_ibfk_2_idx` (`workerFk`),
   CONSTRAINT `route_ibfk_1` FOREIGN KEY (`gestdocFk`) REFERENCES `dms` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
   CONSTRAINT `route_ibfk_2` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=60062 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=60130 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -28305,7 +28307,7 @@ CREATE TABLE `routeComplement` (
   KEY `fgn_routeActionFk_idx` (`routeActionFk`),
   CONSTRAINT `fgn_routeActionFk` FOREIGN KEY (`routeActionFk`) REFERENCES `routeAction` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `fgn_workerFk` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=1051 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1057 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -28408,7 +28410,7 @@ CREATE TABLE `routeLog` (
   KEY `userFk` (`userFk`),
   CONSTRAINT `routeLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `route` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `routeLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=194875 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=197166 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -28519,7 +28521,7 @@ CREATE TABLE `sale` (
   KEY `itemFk_ticketFk` (`itemFk`,`ticketFk`),
   CONSTRAINT `movement_ticket_id` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `sale_ibfk_1` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=26397790 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=26414808 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -28760,7 +28762,7 @@ CREATE TABLE `saleTracking` (
   KEY `fgnStateFk_idx` (`stateFk`),
   KEY `saleTracking_idx5` (`created`),
   CONSTRAINT `fgnStateFk` FOREIGN KEY (`stateFk`) REFERENCES `state` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=20981803 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=21026302 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -28930,7 +28932,7 @@ CREATE TABLE `sector` (
   UNIQUE KEY `code_UNIQUE` (`code`),
   KEY `sector_fk1_idx` (`warehouseFk`),
   CONSTRAINT `sector_fk1` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -28952,7 +28954,7 @@ CREATE TABLE `sharingCart` (
   KEY `Suplent` (`workerSubstitute`),
   CONSTRAINT `Suplent_key` FOREIGN KEY (`workerSubstitute`) REFERENCES `worker` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `Trabajador_key` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=2223 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2226 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -29161,7 +29163,7 @@ CREATE TABLE `sms` (
   `status` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=154883 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=155196 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -29350,7 +29352,7 @@ CREATE TABLE `stockBuyed` (
   UNIQUE KEY `date_UNIQUE` (`date`,`user`),
   KEY `stockBuyed_user_idx` (`user`),
   CONSTRAINT `stockBuyedUserFk` FOREIGN KEY (`user`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=847019 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=847937 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -29413,7 +29415,7 @@ CREATE TABLE `supplier` (
   CONSTRAINT `pay_dem_id` FOREIGN KEY (`payDemFk`) REFERENCES `payDem` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `pay_met_id` FOREIGN KEY (`payMethodFk`) REFERENCES `payMethod` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `province_id` FOREIGN KEY (`provinceFk`) REFERENCES `province` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=2953 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2956 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -29438,7 +29440,7 @@ CREATE TABLE `supplierAccount` (
   KEY `fk_proveedores_proveedores_account_idx` (`supplierFk`),
   KEY `fk_Proveedores_account_entity1_idx` (`bankEntityFk`),
   KEY `fk_banco_prov_account_idx` (`bankFk`)
-) ENGINE=InnoDB AUTO_INCREMENT=876 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=878 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -29795,7 +29797,7 @@ CREATE TABLE `ticket` (
   CONSTRAINT `ticket_ibfk_9` FOREIGN KEY (`routeFk`) REFERENCES `route` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `tickets_fk10` FOREIGN KEY (`refFk`) REFERENCES `invoiceOut` (`ref`) ON UPDATE CASCADE,
   CONSTRAINT `tickets_zone_fk` FOREIGN KEY (`zoneFk`) REFERENCES `zone` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=2481940 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2484593 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -30070,7 +30072,7 @@ CREATE TABLE `ticketLog` (
   KEY `logTicketuserFk` (`userFk`),
   CONSTRAINT `ticketLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `ticketLog_user` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=8090850 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=8112788 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -30107,7 +30109,7 @@ CREATE TABLE `ticketObservation` (
   KEY `observation_type_id` (`observationTypeFk`),
   CONSTRAINT `ticketObservation_ibfk_1` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `ticketObservation_ibfk_2` FOREIGN KEY (`observationTypeFk`) REFERENCES `observationType` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=1508239 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket';
+) ENGINE=InnoDB AUTO_INCREMENT=1509900 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -30162,7 +30164,7 @@ CREATE TABLE `ticketPackaging` (
   CONSTRAINT `ticketPackaging_fk1` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `ticketPackaging_fk2` FOREIGN KEY (`packagingFk`) REFERENCES `packaging` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `ticketPackaging_fk3` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=77239 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=77383 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -30225,7 +30227,7 @@ CREATE TABLE `ticketParking` (
   KEY `ticketParking_fk1_idx` (`parkingFk`),
   CONSTRAINT `ticketParking_fk1` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `ticketParking_fk2` FOREIGN KEY (`parkingFk`) REFERENCES `parking` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=10892 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Almacena los distintos lugares donde puede estar aparcado cada uno de los prepedidos';
+) ENGINE=InnoDB AUTO_INCREMENT=11492 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Almacena los distintos lugares donde puede estar aparcado cada uno de los prepedidos';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -30291,7 +30293,7 @@ CREATE TABLE `ticketRequest` (
   CONSTRAINT `fgnAtender` FOREIGN KEY (`atenderFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `fgnRequester` FOREIGN KEY (`requesterFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `fgnTicket` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=52095 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=52123 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -30550,7 +30552,7 @@ CREATE TABLE `ticketWeekly` (
   `weekDay` tinyint(1) DEFAULT NULL COMMENT 'funcion de mysql Lunes = 0, Domingo = 6',
   PRIMARY KEY (`ticketFk`),
   CONSTRAINT `Id_Ticket_fk` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=2477090 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2481744 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -30695,7 +30697,7 @@ CREATE TABLE `town` (
   KEY `name_idx` (`name`),
   KEY `townProvinceFk` (`provinceFk`),
   CONSTRAINT `townProvinceFk` FOREIGN KEY (`provinceFk`) REFERENCES `province` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=241171 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=241176 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -30876,7 +30878,7 @@ CREATE TABLE `travel` (
   CONSTRAINT `travel_ibfk_2` FOREIGN KEY (`warehouseOutFk`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `travel_ibfk_3` FOREIGN KEY (`agencyFk`) REFERENCES `agencyMode` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `travel_ibfk_4` FOREIGN KEY (`cargoSupplierFk`) REFERENCES `vn2008`.`Proveedores_cargueras` (`Id_Proveedor`) ON DELETE SET NULL ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=142064 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB AUTO_INCREMENT=142120 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -31518,7 +31520,7 @@ CREATE TABLE `workerDocument` (
   KEY `workerDocument_ibfk_2` (`document`),
   CONSTRAINT `workerDocument_ibfk_1` FOREIGN KEY (`worker`) REFERENCES `worker` (`userFk`) ON UPDATE CASCADE,
   CONSTRAINT `workerDocument_ibfk_2` FOREIGN KEY (`document`) REFERENCES `dms` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=12892 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=12895 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -31583,7 +31585,7 @@ CREATE TABLE `workerJourney` (
   UNIQUE KEY `userFk_UNIQUE` (`userFk`,`dated`),
   KEY `fk_workerJourney_user_idx` (`userFk`),
   CONSTRAINT `fk_workerJourney_user` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=61483385 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=61848937 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -31622,7 +31624,7 @@ CREATE TABLE `workerLog` (
   KEY `userFk_idx` (`userFk`),
   CONSTRAINT `userFk` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION,
   CONSTRAINT `workerFk` FOREIGN KEY (`originFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=16021 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=16022 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -31685,7 +31687,7 @@ CREATE TABLE `workerTimeControl` (
   KEY `warehouseFkfk1_idx` (`warehouseFk`),
   CONSTRAINT `warehouseFk_1` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `workerTimeControl_fk1` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=8295889 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Fichadas';
+) ENGINE=InnoDB AUTO_INCREMENT=8297369 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Fichadas';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -32046,7 +32048,7 @@ CREATE TABLE `zone` (
   KEY `zone_name_idx` (`name`),
   CONSTRAINT `fk_zone_1` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE,
   CONSTRAINT `fk_zone_2` FOREIGN KEY (`agencyModeFk`) REFERENCES `agencyMode` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB AUTO_INCREMENT=458 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=460 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -32088,7 +32090,7 @@ CREATE TABLE `zoneGeo` (
   KEY `name_idx` (`name`),
   KEY `parentFk` (`parentFk`),
   KEY `path` (`path`)
-) ENGINE=InnoDB AUTO_INCREMENT=597460 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=597478 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -32737,9 +32739,9 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
@@ -32788,10 +32790,10 @@ BEGIN
 			SELECT SUM(total) amount
 				FROM tmp.ticketTotal
 			UNION ALL
-			SELECT SUM(Entregado)
-				FROM vn2008.Recibos
-				WHERE Id_Cliente = vClient
-					AND Fechacobro > vDateEnd
+			SELECT SUM(amountPaid)
+				FROM receipt
+				WHERE clientFk = vClient
+					AND payed > vDateEnd
 			UNION ALL
 			SELECT SUM(amount)
 				FROM bi.customer_risk r
@@ -35212,6 +35214,71 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP FUNCTION IF EXISTS `workerTimeControl_add` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` FUNCTION `workerTimeControl_add`( vUserFk INT,  vWarehouseFk INT,  vTimed DATETIME,  vIsManual BOOL) RETURNS int(11)
+    DETERMINISTIC
+BEGIN
+	DECLARE vDirection VARCHAR(6);
+	DECLARE vLastIn DATETIME;
+	DECLARE vDayStayMax INT;
+    DECLARE vHasDirectionOut INT;
+
+    SELECT dayStayMax INTO vDayStayMax
+		FROM vn.workerTimeControlParams;
+        
+    SELECT vn.timeWorkerControl_getDirection(vUserFk,vTimed) INTO vDirection;
+
+	IF vDirection = 'out' THEN
+	
+		SELECT MAX(timed) INTO vLastIn
+			FROM vn.workerTimeControl 
+			WHERE userFk = vUserFk 
+				AND direction = 'in'
+				AND timed < vTimed;
+	
+		UPDATE  vn.workerTimeControl wtc
+			SET wtc.direction = 'middle'
+			WHERE userFk = vUserFk
+				AND direction = 'out'
+				AND timed BETWEEN vLastIn AND vTimed;
+	
+	ELSE IF vDirection = 'in' THEN
+			
+            SELECT COUNT(*) INTO vHasDirectionOut 
+				FROM vn.workerTimeControl wtc
+				WHERE userFk = vUserFk 
+					AND direction = 'out'
+					AND timed BETWEEN vTimed AND TIMESTAMPADD(SECOND, 50400, vTimed);          
+
+			UPDATE  vn.workerTimeControl wtc
+				SET wtc.direction = IF (vHasDirectionOut,'middle','out')
+				WHERE userFk = vUserFk
+					AND direction = 'in'
+					AND timed BETWEEN vTimed AND TIMESTAMPADD(SECOND, 50400, vTimed);  
+           
+		 END IF;
+     END IF;
+	
+	INSERT INTO workerTimeControl(userFk, timed, warehouseFk, direction, manual)
+		VALUES(vUserFk, vTimed, vWarehouseFk, vDirection, vIsManual);
+        
+
+RETURN LAST_INSERT_ID();
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP FUNCTION IF EXISTS `zoneGeo_new` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -36450,9 +36517,9 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
@@ -36472,7 +36539,6 @@ proc: BEGIN
  *		packing, grouping, groupingMode, buyFk, typeFk)
  * @return tmp.ticketComponentPrice (warehouseFk, itemFk, rate, grouping, price)
  */
- 
 	DECLARE vClientFk INT;
     DECLARE vGeneralInflationCoefficient INT DEFAULT 1;
     DECLARE vMinimumDensityWeight INT DEFAULT 167;
@@ -36509,7 +36575,7 @@ proc: BEGIN
 			IF((@rate3 := IFNULL(pf.rate3, b.price3)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate3) * 1.0 rate3,
             IFNULL(pf.rate3, 0) AS minPrice,
 			IFNULL(pf.packing, b.packing) packing,
-			IFNULL(pf.`grouping`, b.`grouping`) grouping,
+			IFNULL(pf.`grouping`, b.`grouping`) `grouping`,
 			ABS(IFNULL(pf.box, b.groupingMode)) groupingMode,
             tl.buyFk, 
             i.typeFk,
@@ -36654,7 +36720,7 @@ proc: BEGIN
 		SELECT tcc.warehouseFk,  
 				tcc.itemFk, 
 				1 rate,
-				IF(tcc.groupingMode = 1, tcc.`grouping`, 1) grouping, 
+				IF(tcc.groupingMode = 1, tcc.`grouping`, 1) `grouping`, 
 				CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) price,
                 CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) / weightGrouping priceKg                
 			FROM tmp.ticketComponentCalculate tcc
@@ -36664,12 +36730,12 @@ proc: BEGIN
 				AND tcc.groupingMode < 2 AND (tcc.packing > tcc.`grouping` or tcc.groupingMode = 0)
 			GROUP BY tcs.warehouseFk, tcs.itemFk;
 
-	INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, grouping, price, priceKg)
+	INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
         SELECT 
 				tcc.warehouseFk, 
 				tcc.itemFk, 
 				2 rate, 
-				tcc.packing grouping, 
+				tcc.packing `grouping`, 
 				SUM(tcs.sumCost) price,
                 SUM(tcs.sumCost) / weightGrouping priceKg   
 			FROM tmp.ticketComponentCalculate tcc
@@ -36679,12 +36745,12 @@ proc: BEGIN
 				AND tcc.packing > 0 AND tcc.available >= tcc.packing)
 			GROUP BY tcs.warehouseFk, tcs.itemFk;
 
-	INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, grouping, price, priceKg)
+	INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
 		 SELECT 				
 		 		tcc.warehouseFk, 
 				tcc.itemFk, 
 				3 rate, 
-				tcc.available grouping, 
+				tcc.available `grouping`, 
 				SUM(tcs.sumCost) price,
                 SUM(tcs.sumCost) / weightGrouping priceKg   
 			FROM tmp.ticketComponentCalculate tcc
@@ -36712,268 +36778,6 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `catalog_componentCalculate__` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `catalog_componentCalculate__`(
-    vZoneFk INT,
-    vAddressFk INT,
-    vShipped DATE)
-proc: BEGIN
-/**
- * Calcula los componentes de los articulos de tmp.ticketLot
- *
- * @param vZoneFk para calcular el transporte
- * @param vAgencyModeFk Id del modo de agencia
- * @param tmp.ticketLot (warehouseFk,available,itemFk,buyFk)
- *
- * @return tmp.ticketComponent(itemFk, warehouseFk, available, rate2, rate3, minPrice,
- *		packing, grouping, groupingMode, buyFk, typeFk)
- * @return tmp.ticketComponentPrice (warehouseFk, itemFk, rate, grouping, price)
- */
- 
-	DECLARE vClientFk INT;
-    DECLARE vGeneralInflationCoefficient INT DEFAULT 1;
-    DECLARE vMinimumDensityWeight INT DEFAULT 167;
-	DECLARE vBoxFreightItem INT DEFAULT 71;
-    DECLARE vBoxVolume BIGINT; -- DEFAULT 138000;
-	DECLARE vSpecialPriceComponent INT DEFAULT 10;
-	DECLARE vDeliveryComponent INT DEFAULT 15;
-	DECLARE vRecoveryComponent INT DEFAULT 17;
-	DECLARE vSellByPacketComponent INT DEFAULT 22;
-	DECLARE vBuyValueComponent INT DEFAULT 28;
-	DECLARE vMarginComponent INT DEFAULT 29;
-	DECLARE vDiscountLastItemComponent INT DEFAULT 32;
-	DECLARE vExtraBaggedComponent INT DEFAULT 38;
-	DECLARE vManaAutoComponent INT DEFAULT 39;
-    
-    
-    SELECT volume INTO vBoxVolume
-		FROM vn.packaging
-        WHERE id = '94';
-        
-    SELECT clientFk INTO vClientFK 
-		FROM address 
-        WHERE id = vAddressFk;
-
-    SET @rate2 := 0;
-    SET @rate3 := 0;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentCalculate;
-	CREATE TEMPORARY TABLE tmp.ticketComponentCalculate
-	(PRIMARY KEY (itemFk, warehouseFk))
-	ENGINE = MEMORY
-		SELECT 
-			tl.itemFk, tl.warehouseFk, tl.available,
-			IF((@rate2 := IFNULL(pf.rate2, b.price2)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate2) * 1.0 rate2,
-			IF((@rate3 := IFNULL(pf.rate3, b.price3)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate3) * 1.0 rate3,
-            IFNULL(pf.rate3, 0) AS minPrice,
-			IFNULL(pf.packing, b.packing) packing,
-			IFNULL(pf.`grouping`, b.`grouping`) grouping,
-			ABS(IFNULL(pf.box, b.groupingMode)) groupingMode,
-            tl.buyFk, i.typeFk
-        FROM tmp.ticketLot tl
-		JOIN buy b ON b.id = tl.buyFk
-		JOIN item i ON i.id = tl.itemFk
-        JOIN itemType it ON it.id = i.typeFk
-        LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
-		LEFT JOIN specialPrice sp ON sp.itemFk = i.id AND sp.clientFk = vClientFk
-		LEFT JOIN (
-			SELECT * FROM (
-				SELECT pf.itemFk, pf.`grouping`, pf.packing, pf.box, pf.rate2, pf.rate3, z.warehouseFk
-					FROM priceFixed pf
-					JOIN zone z ON z.warehouseFk = pf.warehouseFk OR pf.warehouseFk = 0 
-						WHERE vShipped BETWEEN pf.started AND pf.ended ORDER BY pf.itemFk, pf.warehouseFk DESC
-			) tpf
-			GROUP BY tpf.itemFk, tpf.warehouseFk
-		) pf ON pf.itemFk = tl.itemFk AND pf.warehouseFk = tl.warehouseFk
-        WHERE b.buyingValue + b.freightValue + b.packageValue + b.comissionValue > 0.01 AND ic.display <> 0;
-        
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent;
-    CREATE TEMPORARY TABLE tmp.ticketComponent (
-		`warehouseFk` INT UNSIGNED NOT NULL,
-		`itemFk` INT NOT NULL,
-		`componentFk` INT UNSIGNED NOT NULL,
-		`cost` DECIMAL(10,4) NOT NULL,
-		INDEX `itemWarehouse` USING BTREE (`itemFk` ASC, `warehouseFk` ASC),
-		UNIQUE INDEX `itemWarehouseComponent` (`itemFk` ASC, `warehouseFk` ASC, `componentFk` ASC));
-
-	INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
-		SELECT 
-				tcc.warehouseFk, 
-				tcc.itemFk, 
-				vBuyValueComponent, 
-				b.buyingValue + b.freightValue + b.packageValue + b.comissionValue
-			FROM tmp.ticketComponentCalculate tcc 
-				JOIN buy b ON b.id = tcc.buyFk;
-                
-	INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
-		SELECT 
-				tcc.warehouseFk, 
-				tcc.itemFk, 
-				vMarginComponent, 
-				tcc.rate3 - b.buyingValue - b.freightValue - b.packageValue - b.comissionValue
-			FROM tmp.ticketComponentCalculate tcc 
-				JOIN buy b ON b.id = tcc.buyFk;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentBase;
-	CREATE TEMPORARY TABLE tmp.ticketComponentBase ENGINE = MEMORY
-		SELECT tc.itemFk, ROUND(SUM(tc.cost), 4) AS base, tc.warehouseFk
-			FROM tmp.ticketComponent tc
-			GROUP BY tc.itemFk, warehouseFk;
-
-	INSERT INTO tmp.ticketComponent
-		SELECT tcb.warehouseFk, tcb.itemFk, vRecoveryComponent, ROUND(tcb.base * LEAST(cr.recobro, 0.25), 3)
-			FROM tmp.ticketComponentBase tcb
-			JOIN bi.claims_ratio cr ON cr.Id_Cliente = vClientFk
-				WHERE cr.recobro > 0.009;
-            
-    INSERT INTO tmp.ticketComponent
-		SELECT tcb.warehouseFk, tcb.itemFk, vManaAutoComponent, ROUND(base * (0.01 + prices_modifier_rate), 3) as manaAuto
-			FROM tmp.ticketComponentBase tcb
-				JOIN `client` c on c.id = vClientFk
-				JOIN bs.mana_spellers ms ON c.salesPersonFk = ms.Id_Trabajador 
-			WHERE ms.prices_modifier_activated
-			HAVING manaAuto <> 0;
-	
-	INSERT INTO tmp.ticketComponent
-		SELECT tcb.warehouseFk, 
-                tcb.itemFk, 
-                cr.id, 
-                GREATEST(IFNULL(ROUND(tcb.base * cr.tax, 4), 0), tcc.minPrice - tcc.rate3)
-			FROM tmp.ticketComponentBase tcb
-				JOIN componentRate cr
-				JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tcb.itemFk AND tcc.warehouseFk = tcb.warehouseFk 
-				LEFT JOIN specialPrice sp ON sp.clientFk = vClientFk AND sp.itemFk = tcc.itemFk
-			WHERE cr.id = vDiscountLastItemComponent AND cr.tax <> 0 AND tcc.minPrice < tcc.rate3 AND sp.value IS NULL;
-	
-	INSERT INTO tmp.ticketComponent
-		SELECT tcc.warehouseFk, tcc.itemFk, vSellByPacketComponent, tcc.rate2 - tcc.rate3 
-			FROM tmp.ticketComponentCalculate tcc
-				JOIN buy b ON b.id = tcc.buyFk
-			LEFT JOIN specialPrice sp ON sp.clientFk = vClientFk AND sp.itemFk = tcc.itemFk
-		WHERE sp.value IS NULL;
-             
-	INSERT INTO tmp.ticketComponent
-		SELECT tcc.warehouseFK, 
-				tcc.itemFk,
-				vDeliveryComponent, 
-				vGeneralInflationCoefficient
-				* ROUND((
-					i.compression
-					* r.cm3 
-					* IF(am.deliveryMethodFk = 1, (GREATEST(i.density, vMinimumDensityWeight) / vMinimumDensityWeight), 1)
-					* IFNULL((z.price - z.bonus)
-					* 1/*amz.inflation*/ , 50)) / vBoxVolume, 4
-				) cost
-		FROM tmp.ticketComponentCalculate tcc
-			JOIN item i ON i.id = tcc.itemFk
-            JOIN zone z ON z.id = vZoneFk
-			JOIN agencyMode am ON am.id = z.agencyModeFk
-			LEFT JOIN bi.rotacion r ON r.warehouse_id = tcc.warehouseFk 
-				AND r.Id_Article = tcc.itemFk
-			HAVING cost <> 0; 
-            
-    IF (SELECT COUNT(*) FROM vn.addressForPackaging WHERE addressFk = vAddressFk) THEN
-		INSERT INTO tmp.ticketComponent
-			SELECT tcc.warehouseFk, b.itemFk, vExtraBaggedComponent, ap.packagingValue cost
-				FROM tmp.ticketComponentCalculate tcc
-					JOIN vn.addressForPackaging ap
-				WHERE ap.addressFk = vAddressFk;
-    END IF;
-	
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentCopy;
-    CREATE TEMPORARY TABLE tmp.ticketComponentCopy ENGINE = MEMORY
-		SELECT * FROM tmp.ticketComponent;
-        
-	INSERT INTO tmp.ticketComponent
-		SELECT tcc.warehouseFk, 
-				tcc.itemFk, 
-				vSpecialPriceComponent, 
-				sp.value - SUM(tcc.cost) sumCost
-			FROM tmp.ticketComponentCopy tcc
-				JOIN componentRate cr ON cr.id = tcc.componentFk
-				JOIN specialPrice sp ON sp.clientFk = vClientFK AND sp.itemFk = tcc.itemFk
-			WHERE cr.classRate IS NULL
-			GROUP BY tcc.itemFk, tcc.warehouseFk
-			HAVING ABS(sumCost) > 0.001;
-	
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentSum;
-	CREATE TEMPORARY TABLE tmp.ticketComponentSum
-		(INDEX (itemFk, warehouseFk))
-		ENGINE = MEMORY
-		SELECT SUM(cost) sumCost, tc.itemFk, tc.warehouseFk, cr.classRate
-			FROM tmp.ticketComponent tc
-				JOIN componentRate cr ON cr.id = tc.componentFk
-			GROUP BY tc.itemFk, tc.warehouseFk, cr.classRate;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentRate;
-	CREATE TEMPORARY TABLE tmp.ticketComponentRate ENGINE = MEMORY
-		SELECT tcc.warehouseFk,  
-				tcc.itemFk, 
-				1 rate,
-				IF(tcc.groupingMode = 1, tcc.`grouping`, 1) grouping, 
-				CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) price
-			FROM tmp.ticketComponentCalculate tcc
-				JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk 
-					AND tcs.warehouseFk = tcc.warehouseFk
-			WHERE IFNULL(tcs.classRate, 1) = 1 
-				AND tcc.groupingMode < 2 AND (tcc.packing > tcc.`grouping` or tcc.groupingMode = 0)
-			GROUP BY tcs.warehouseFk, tcs.itemFk;
-
-	INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, grouping, price)
-        SELECT 
-				tcc.warehouseFk, 
-				tcc.itemFk, 
-				2 rate, 
-				tcc.packing grouping, 
-				SUM(tcs.sumCost) price
-			FROM tmp.ticketComponentCalculate tcc
-				JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk 
-					AND tcs.warehouseFk = tcc.warehouseFk
-			WHERE tcc.available IS NULL OR (IFNULL(tcs.classRate, 2) = 2 
-				AND tcc.packing > 0 AND tcc.available >= tcc.packing)
-			GROUP BY tcs.warehouseFk, tcs.itemFk;
-
-	INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, grouping, price)
-		 SELECT 				
-		 		tcc.warehouseFk, 
-				tcc.itemFk, 
-				3 rate, 
-				tcc.available grouping, 
-				SUM(tcs.sumCost) price
-			FROM tmp.ticketComponentCalculate tcc
-				JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk 
-					AND tcs.warehouseFk = tcc.warehouseFk
-			WHERE IFNULL(tcs.classRate, 3) = 3 
-			GROUP BY tcs.warehouseFk, tcs.itemFk;
-        
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentPrice;
-	CREATE TEMPORARY TABLE tmp.ticketComponentPrice ENGINE = MEMORY 
-		SELECT * FROM (
-			SELECT * FROM tmp.ticketComponentRate ORDER BY price
-		) t
-		GROUP BY itemFk, warehouseFk, `grouping`;
-
-    DROP TEMPORARY TABLE 
-		tmp.ticketComponentCalculate,
-		tmp.ticketComponentSum,
-		tmp.ticketComponentBase,
-		tmp.ticketComponentRate,
-    	tmp.ticketComponentCopy;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `clean` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -43492,6 +43296,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingSaleAdd`(vItemShelvingFk INT, saleFk INT, vQuantity INT)
 BEGIN
 
+IF saleFk  <> 0 THEN
 	INSERT INTO vn.itemShelvingSale(	itemShelvingFk, 
 												saleFk, 
                                                 quantity, 
@@ -43500,7 +43305,10 @@ BEGIN
 					saleFk,
                     vQuantity,
                     getUser());
-
+ELSE 
+	UPDATE vn.itemShelving SET quantity = (quantity - vQuantity), available = (available - vQuantity), visible = (visible - vQuantity)
+    WHERE id = vItemShelvingFk;
+END IF;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -45194,6 +45002,54 @@ BEGIN
 		VALUES(saleFk,valueFk,getWorker(),encajando);
 
 
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `parking_add` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `parking_add`(vFromColumn INT, vToColumn INT, vFromRow INT, vToRow INT, vSectorFk INT)
+BEGIN
+
+	DECLARE vColumn INT;
+    DECLARE vRow INT;
+    DECLARE vMaxId INT;
+    
+    SET vColumn = vFromColumn;
+    SET vRow = vFromRow;
+    
+	SELECT MAX(id) INTO vMaxId
+		FROM vn.parking;
+
+	WHILE vColumn <= vToColumn DO
+    
+		WHILE vRow <= vToRow DO
+    
+			INSERT IGNORE INTO vn.parking(`column`, `row`, sectorFk, `code`)
+				VALUES (vColumn, vRow, vSectorFk, CONCAT(LPAD(vColumn,3,'0'),'-',LPAD(vRow, 2,'0')));
+			
+			SET vRow = vRow + 1;
+            
+		END WHILE;
+        
+        SET vRow = vFromRow;
+    
+		SET vColumn = vColumn + 1;
+    
+    END WHILE;
+    
+    SELECT * FROM vn.parking WHERE id > vMaxId;
+
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -49028,9 +48884,9 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
@@ -49040,7 +48896,7 @@ CREATE DEFINER=`root`@`%` PROCEDURE `ticketComponentCalculate`(
 proc: BEGIN
 -- OBSOLETO usar catalog_componentCalculate
 /**
- * Calcula los componentes de un ticket
+ * Calcula los componentes de un ticket
  *
  * @param vAddressFk Id del consignatario
  * @param vAgencyModeFk Id del modo de agencia
@@ -49087,7 +48943,7 @@ proc: BEGIN
 			IF((@rate3 := IFNULL(pf.rate3, b.price3)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate3) * 1.0 rate3,
             IFNULL(pf.rate3, 0) AS minPrice,
 			IFNULL(pf.packing, b.packing) packing,
-			IFNULL(pf.`grouping`, b.`grouping`) grouping,
+			IFNULL(pf.`grouping`, b.`grouping`) `grouping`,
 			ABS(IFNULL(pf.box, b.groupingMode)) groupingMode,
             tl.buyFk, 
             i.typeFk,
@@ -49234,7 +49090,7 @@ proc: BEGIN
 		SELECT tcc.warehouseFk,  
 				tcc.itemFk, 
 				1 rate,
-				IF(tcc.groupingMode = 1, tcc.`grouping`, 1) grouping, 
+				IF(tcc.groupingMode = 1, tcc.`grouping`, 1) `grouping`, 
 				CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) price,
                 CAST(SUM(tcs.sumCost)  / weightGrouping AS DECIMAL(10,2)) priceKg      
 			FROM tmp.ticketComponentCalculate tcc
@@ -49244,12 +49100,12 @@ proc: BEGIN
 				AND tcc.groupingMode < 2 AND (tcc.packing > tcc.`grouping` or tcc.groupingMode = 0)
 			GROUP BY tcs.warehouseFk, tcs.itemFk;
 
-	INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, grouping, price, priceKg)
+	INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
         SELECT 
 				tcc.warehouseFk, 
 				tcc.itemFk, 
 				2 rate, 
-				tcc.packing grouping, 
+				tcc.packing `grouping`, 
 				SUM(tcs.sumCost) price,
                 SUM(tcs.sumCost) / weightGrouping priceKg
 			FROM tmp.ticketComponentCalculate tcc
@@ -49259,12 +49115,12 @@ proc: BEGIN
 				AND tcc.packing > 0 AND tcc.available >= tcc.packing)
 			GROUP BY tcs.warehouseFk, tcs.itemFk;
 
-	INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, grouping, price, priceKg)
+	INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
 		 SELECT 				
 		 		tcc.warehouseFk, 
 				tcc.itemFk, 
 				3 rate, 
-				tcc.available grouping, 
+				tcc.available `grouping`, 
 				SUM(tcs.sumCost) price,
                 SUM(tcs.sumCost) / weightGrouping priceKg
 			FROM tmp.ticketComponentCalculate tcc
@@ -49292,317 +49148,6 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `ticketComponentCalculateKK` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketComponentCalculateKK`(IN `vAddressFk` INT, IN `vAgencyModeFk` INT)
-proc: BEGIN
-/**
- * Calcula los componentes de un ticket
- *
- * @param vAddressFk Id del consignatario
- * @param vAgencyModeFk Id del modo de agencia
- * @return tmp.ticketComponent, tmp.ticketComponentPrice
- */
-	DECLARE vClientFk INT;
-    DECLARE vGeneralInflationCoefficient INT DEFAULT 1;
-    DECLARE vMinimumDensityWeight INT DEFAULT 167;
-	DECLARE vBoxFreightItem INT DEFAULT 71;
-    DECLARE vBoxVolume BIGINT; -- DEFAULT 138000;
-	DECLARE vSpecialPriceComponent INT DEFAULT 10;
-	DECLARE vExtraFreightComponent INT DEFAULT 14;
-	DECLARE vDeliveryComponent INT DEFAULT 15;
-	DECLARE vRecoveryComponent INT DEFAULT 17;
-	DECLARE vSellByPacketComponent INT DEFAULT 22;
-	DECLARE vBuyValueComponent INT DEFAULT 28;
-	DECLARE vMarginComponent INT DEFAULT 29;
-	DECLARE vDiscountLastItemComponent INT DEFAULT 32;
-	DECLARE vExtraBaggedComponent INT DEFAULT 38;
-	DECLARE vManaAutoComponent INT DEFAULT 39;
-	DECLARE vFreightBonusComponent INT DEFAULT 41;
-    
-    
-    SELECT volume INTO vBoxVolume
-		FROM vn.packaging
-        WHERE id = '94';
-        
-    SELECT clientFk INTO vClientFK 
-		FROM address 
-        WHERE id = vAddressFk;
-    
-    SET @rate2 := 0;
-    SET @rate3 := 0;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentCalculate;
-	CREATE TEMPORARY TABLE tmp.ticketComponentCalculate
-	(PRIMARY KEY (itemFk, warehouseFk))
-	ENGINE = MEMORY
-		SELECT 
-			tl.itemFk, tl.warehouseFk, tl.available,
-			IF((@rate2 := IFNULL(pf.rate2, b.price2)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate2) * 1.0 rate2,
-			IF((@rate3 := IFNULL(pf.rate3, b.price3)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate3) * 1.0 rate3,
-            IFNULL(pf.rate3, 0) AS minPrice,
-			IFNULL(pf.packing, b.packing) packing,
-			IFNULL(pf.`grouping`, b.`grouping`) `grouping`,
-			ABS(IFNULL(pf.box, b.groupingMode)) groupingMode,
-            tl.buyFk, i.typeFk
-        FROM tmp.ticketLot tl
-		JOIN buy b ON b.id = tl.buyFk
-		JOIN item i ON i.id = tl.itemFk
-        JOIN itemType it ON it.id = i.typeFk
-        LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
-		LEFT JOIN specialPrice sp ON sp.itemFk = i.id AND sp.clientFk = vClientFk
-		LEFT JOIN (
-			SELECT * FROM (
-				SELECT pf.itemFk, pf.`grouping`, pf.packing, pf.box, pf.rate2, pf.rate3, aho.warehouseFk
-					FROM priceFixed pf
-					JOIN tmp.agencyHourGetShipped aho ON pf.warehouseFk = aho.warehouseFk OR pf.warehouseFk = 0 
-						WHERE aho.shipped BETWEEN pf.started AND pf.ended ORDER BY pf.itemFk, pf.warehouseFk DESC
-			) tpf
-			GROUP BY tpf.itemFk, tpf.warehouseFk
-		) pf ON pf.itemFk = tl.itemFk AND pf.warehouseFk = tl.warehouseFk
-        WHERE b.buyingValue + b.freightValue + b.packageValue + b.comissionValue > 0.01 AND ic.display <> 0;
-        
-    
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent;
-    CREATE TEMPORARY TABLE tmp.ticketComponent (
-		`warehouseFk` INT UNSIGNED NOT NULL,
-		`itemFk` INT NOT NULL,
-		`componentFk` INT UNSIGNED NOT NULL,
-		`cost` DECIMAL(10,4) NOT NULL,
-		INDEX `itemWarehouse` USING BTREE (`itemFk` ASC, `warehouseFk` ASC),
-		UNIQUE INDEX `itemWarehouseComponent` (`itemFk` ASC, `warehouseFk` ASC, `componentFk` ASC));
-
-
-	
-	INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
-		SELECT 
-				tcc.warehouseFk, 
-				tcc.itemFk, 
-				vBuyValueComponent, 
-				b.buyingValue + b.freightValue + b.packageValue + b.comissionValue
-			FROM tmp.ticketComponentCalculate tcc 
-				JOIN buy b ON b.id = tcc.buyFk;
-                
-	INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
-		SELECT 
-				tcc.warehouseFk, 
-				tcc.itemFk, 
-				vMarginComponent, 
-				tcc.rate3 - b.buyingValue - b.freightValue - b.packageValue - b.comissionValue
-			FROM tmp.ticketComponentCalculate tcc 
-				JOIN buy b ON b.id = tcc.buyFk;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentBase;
-	CREATE TEMPORARY TABLE tmp.ticketComponentBase ENGINE = MEMORY
-		SELECT tc.itemFk, ROUND(SUM(tc.cost), 4) AS base, tc.warehouseFk
-			FROM tmp.ticketComponent tc
-			GROUP BY tc.itemFk, warehouseFk;
-
-	INSERT INTO tmp.ticketComponent
-		SELECT tcb.warehouseFk, tcb.itemFk, vRecoveryComponent, ROUND(tcb.base * LEAST(cr.recobro, 0.25), 3)
-			FROM tmp.ticketComponentBase tcb
-			JOIN bi.claims_ratio cr ON cr.Id_Cliente = vClientFk
-				WHERE cr.recobro > 0.009;
-            
-    INSERT INTO tmp.ticketComponent
-		SELECT tcb.warehouseFk, tcb.itemFk, vManaAutoComponent, ROUND(base * (0.01 + prices_modifier_rate), 3) as manaAuto
-			FROM tmp.ticketComponentBase tcb
-				JOIN `client` c on c.id = vClientFk
-				JOIN bs.mana_spellers ms ON c.salesPersonFk = ms.Id_Trabajador 
-			WHERE ms.prices_modifier_activated
-			HAVING manaAuto <> 0;
-	
-	INSERT INTO tmp.ticketComponent
-		SELECT 
-				tcb.warehouseFk, 
-                tcb.itemFk, 
-                cr.id, 
-                GREATEST(IFNULL(ROUND(tcb.base * cr.tax, 4), 0), tcc.minPrice - tcc.rate3)
-			FROM tmp.ticketComponentBase tcb
-				JOIN componentRate cr
-				JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tcb.itemFk AND tcc.warehouseFk = tcb.warehouseFk 
-				LEFT JOIN specialPrice sp ON sp.clientFk = vClientFk AND sp.itemFk = tcc.itemFk
-			WHERE cr.id = vDiscountLastItemComponent AND cr.tax <> 0 AND tcc.minPrice < tcc.rate3 AND sp.value IS NULL;
-	
-	INSERT INTO tmp.ticketComponent
-		SELECT tcc.warehouseFk, tcc.itemFk, vSellByPacketComponent, tcc.rate2 - tcc.rate3 
-			FROM tmp.ticketComponentCalculate tcc
-				JOIN buy b ON b.id = tcc.buyFk
-			LEFT JOIN specialPrice sp ON sp.clientFk = vClientFk AND sp.itemFk = tcc.itemFk
-		WHERE sp.value IS NULL;
- 
-	INSERT INTO tmp.ticketComponent
-		SELECT 
-				tcc.warehouseFK, 
-				tcc.itemFk,
-				vDeliveryComponent, 
-				vGeneralInflationCoefficient
-				* ROUND((
-					i.compression
-					* r.cm3 
-					* IF(am.deliveryMethodFk = 1, (GREATEST(i.density, vMinimumDensityWeight) / vMinimumDensityWeight), 1)
-					* IFNULL(amz.price
-					* amz.inflation, 50)) / vBoxVolume, 4
-				) cost
-		FROM tmp.ticketComponentCalculate tcc
-			JOIN item i ON i.id = tcc.itemFk
-			JOIN agencyMode am ON am.id = vAgencyModeFk
-			JOIN `address` a ON a.id = vAddressFk
-			JOIN agencyProvince ap ON ap.agencyFk = am.agencyFk 
-				AND ap.warehouseFk = tcc.warehouseFk AND ap.provinceFk = a.provinceFk
-			JOIN agencyModeZone amz ON amz.agencyModeFk = vAgencyModeFk 
-				AND amz.zone = ap.zone AND amz.itemFk = 71 AND amz.warehouseFk = tcc.warehouseFk
-			LEFT JOIN bi.rotacion r ON r.warehouse_id = tcc.warehouseFk 
-				AND r.Id_Article = tcc.itemFk
-			HAVING cost <> 0;
-
-	INSERT INTO tmp.ticketComponent
-		SELECT 
-				tcc.warehouseFk, 
-				tcc.itemFk, 
-				vFreightBonusComponent,
-				vGeneralInflationCoefficient
-				* ROUND(
-					r.cm3 
-					* IF(am.deliveryMethodFk = 1, (GREATEST(i.density, vMinimumDensityWeight) / vMinimumDensityWeight), 1)
-					* awb.bonus 
-					* amz.inflation / vBoxVolume, 4
-				) cost
-		FROM tmp.ticketComponentCalculate tcc
-			JOIN item i ON i.id = tcc.itemFk
-			JOIN agencyMode am ON am.id = vAgencyModeFk
-			JOIN `address` a ON a.id = vAddressFk
-			JOIN agencyProvince ap ON ap.agencyFk = a.id 
-				AND ap.warehouseFk = tcc.warehouseFk AND ap.provinceFk = a.provinceFk
-			JOIN agencyModeZone amz ON amz.agencyModeFk = vAgencyModeFk 
-				AND amz.zone = ap.zone AND amz.itemFk = vBoxFreightItem AND amz.warehouseFk = tcc.warehouseFk
-			JOIN agencyWeekDayBonus awb ON awb.warehouseFk = amz.warehouseFk AND awb.zone = amz.zone AND am.id = awb.agencyFk
-			LEFT JOIN bi.rotacion r ON r.warehouse_id = tcc.warehouseFk 
-				AND r.Id_Article = tcc.itemFk
-			JOIN tmp.agencyHourGetShipped aho ON aho.warehouseFk = awb.warehouseFk 
-				AND WEEKDAY(aho.landed) = awb.weekDay
-		HAVING cost <> 0
-		LIMIT 1;
-
-    IF (SELECT COUNT(*) FROM vn.addressForPackaging WHERE addressFk = vAddressFk) THEN
-		INSERT INTO tmp.ticketComponent
-			SELECT tcc.warehouseFk, b.itemFk, vExtraBaggedComponent, ap.packagingValue cost
-				FROM tmp.ticketComponentCalculate tcc
-					JOIN vn.addressForPackaging ap
-				WHERE ap.addressFk = vAddressFk;
-    END IF;
-    
-	INSERT INTO tmp.ticketComponent
-		SELECT tcb.warehouseFk, tcb.itemFk, vExtraFreightComponent, tcb.base * (IFNULL(pe.percentage,pp.percentage)/100)
-			FROM tmp.ticketComponentBase tcb
-				JOIN tmp.agencyHourGetShipped aho ON aho.warehouseFk = tcb.warehouseFk
-				LEFT JOIN preparationPercentage pp ON pp.weekDay = WEEKDAY(aho.shipped) 
-					AND tcb.warehouseFk = IFNULL(pp.warehouseFk, tcb.warehouseFk)
-				LEFT JOIN preparationException pe ON pe.exceptionDay = aho.shipped 
-					AND tcb.warehouseFk = IFNULL(pe.warehouseFk, tcb.warehouseFk)
-			WHERE IFNULL(pe.percentage, pp.percentage);
-	
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentCopy;
-    CREATE TEMPORARY TABLE tmp.ticketComponentCopy ENGINE = MEMORY
-		SELECT * FROM tmp.ticketComponent;
-        
-	INSERT INTO tmp.ticketComponent
-		SELECT 
-				tcc.warehouseFk, 
-				tcc.itemFk, 
-				vSpecialPriceComponent, 
-				sp.value - SUM(tcc.cost) sumCost
-			FROM tmp.ticketComponentCopy tcc
-				JOIN componentRate cr ON cr.id = tcc.componentFk
-				JOIN specialPrice sp ON sp.clientFk = vClientFK AND sp.itemFk = tcc.itemFk
-			WHERE cr.classRate IS NULL
-			GROUP BY tcc.itemFk, tcc.warehouseFk
-			HAVING ABS(sumCost) > 0.001;
-	
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentSum;
-	CREATE TEMPORARY TABLE tmp.ticketComponentSum
-		(INDEX (itemFk, warehouseFk))
-		ENGINE = MEMORY
-		SELECT SUM(cost) sumCost, tc.itemFk, tc.warehouseFk, cr.classRate
-			FROM tmp.ticketComponent tc
-				JOIN componentRate cr ON cr.id = tc.componentFk
-			GROUP BY tc.itemFk, tc.warehouseFk, cr.classRate;
-
-		select 1;
-		
-		
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentRate;
-	CREATE TEMPORARY TABLE tmp.ticketComponentRate ENGINE = MEMORY
-		SELECT 
-				tcc.warehouseFk,  
-				tcc.itemFk, 
-				1 rate,
-				IF(tcc.groupingMode = 1, tcc.`grouping`, 1) `grouping`, 
-				SUM(tcs.sumCost) price
-			FROM tmp.ticketComponentCalculate tcc
-				JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk 
-					AND tcs.warehouseFk = tcc.warehouseFk
-			WHERE IFNULL(tcs.classRate, 1) = 1 
-				AND tcc.groupingMode < 2 AND (tcc.packing > tcc.`grouping` or tcc.groupingMode = 0)
-			GROUP BY tcs.warehouseFk, tcs.itemFk;
-
-	INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price)
-        SELECT 
-				tcc.warehouseFk, 
-				tcc.itemFk, 
-				2 rate, 
-				tcc.packing `grouping`, 
-				SUM(tcs.sumCost) price
-			FROM tmp.ticketComponentCalculate tcc
-				JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk 
-					AND tcs.warehouseFk = tcc.warehouseFk
-			WHERE tcc.available IS NULL OR (IFNULL(tcs.classRate, 2) = 2 
-				AND tcc.packing > 0 AND tcc.available >= tcc.packing)
-			GROUP BY tcs.warehouseFk, tcs.itemFk;
-
-	INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price)
-		 SELECT 				
-		 		tcc.warehouseFk, 
-				tcc.itemFk, 
-				3 rate, 
-				tcc.available `grouping`, 
-				SUM(tcs.sumCost) price
-			FROM tmp.ticketComponentCalculate tcc
-				JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk 
-					AND tcs.warehouseFk = tcc.warehouseFk
-			WHERE IFNULL(tcs.classRate, 3) = 3 
-			GROUP BY tcs.warehouseFk, tcs.itemFk;
-        
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentPrice;
-
-select 2;
-
-	CREATE TEMPORARY TABLE tmp.ticketComponentPrice ENGINE = MEMORY 
-		SELECT * FROM (
-			SELECT * FROM tmp.ticketComponentRate ORDER BY price
-		) t
-		GROUP BY itemFk, warehouseFk, `grouping`;
-
-    DROP TEMPORARY TABLE 
-		tmp.ticketComponentCalculate,
-		tmp.ticketComponentSum,
-		tmp.ticketComponentBase,
-		tmp.ticketComponentRate,
-    	tmp.ticketComponentCopy;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `ticketComponentMakeUpdate` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -54402,6 +53947,26 @@ DELIMITER ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_add`(IN vUserFk INT, IN vWarehouseFk INT, IN vTimed DATETIME, IN vIsManual BOOL)
+BEGIN
+	SELECT vn.workerTimeControl_add(vUserFk,vWarehouseFk,vTimed,vIsManual);
+    CALL vn.workerTimeControlSOWP(vUserFk, vTimed);
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `workerTimeControl_add__` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_add__`(IN vUserFk INT, IN vWarehouseFk INT, IN vTimed DATETIME, IN vIsManual BOOL)
 BEGIN
 
 	DECLARE vDirection VARCHAR(6);
@@ -54455,51 +54020,6 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `workerTimeControl_add__` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `workerTimeControl_add__`(IN vUserFk INT, IN vWarehouseFk INT, IN vTimed DATETIME, IN vIsManual BOOL)
-BEGIN
-
-	DECLARE vDirection VARCHAR(6);
-	DECLARE vLastIn DATETIME;
-	
-
-	SELECT vn.timeWorkerControl_getDirection(vUserFk,vTimed) INTO vDirection;
-
-	IF vDirection = 'out' THEN
-	
-		SELECT MAX(timed) INTO vLastIn
-			FROM vn.workerTimeControl 
-			WHERE userFk = vUserFk 
-				AND direction = 'in'
-				AND timed < vTimed;
-	
-		UPDATE  vn.workerTimeControl wtc
-			SET wtc.direction = 'middle'
-			WHERE userFk = vUserFk
-				AND direction = 'out'
-				AND timed BETWEEN vLastIn AND vTimed;
-	
-	END IF;
-	
-	INSERT INTO workerTimeControl(userFk, timed, warehouseFk, direction, manual)
-			VALUES(vUserFk, vTimed, vWarehouseFk, vDirection, vIsManual);
-
-    CALL vn.workerTimeControlSOWP(vUserFk, vTimed);
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `workerTimeControl_check` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -57117,7 +56637,7 @@ CREATE TABLE `Cajas` (
   KEY `fk_Cajas_Proveedores_account1_idx` (`Proveedores_account_Id`),
   CONSTRAINT `Cajas_ibfk_2` FOREIGN KEY (`Id_Banco`) REFERENCES `vn`.`bank` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `Cajas_ibfk_3` FOREIGN KEY (`Id_Trabajador`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=743086 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=743475 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -57370,7 +56890,7 @@ CREATE TABLE `Colas` (
   KEY `Id_Trabajador` (`Id_Trabajador`),
   CONSTRAINT `Colas_ibfk_3` FOREIGN KEY (`Id_Prioridad`) REFERENCES `vn`.`queuePriority` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `Colas_ibfk_4` FOREIGN KEY (`Id_Impresora`) REFERENCES `Impresoras` (`Id_Impresora`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=16828 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=21582 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -57567,7 +57087,7 @@ CREATE TABLE `Contactos` (
   PRIMARY KEY (`Id_Contacto`),
   KEY `Telefono` (`Telefono`),
   KEY `Movil` (`Movil`)
-) ENGINE=InnoDB AUTO_INCREMENT=2761 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2762 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -57791,7 +57311,7 @@ CREATE TABLE `Entradas_dits` (
   CONSTRAINT `Entradas_dits_ibfk_1` FOREIGN KEY (`Id_Ticket`) REFERENCES `vn`.`entry` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `fgkey_entradas_1` FOREIGN KEY (`idaccion_dits`) REFERENCES `accion_dits` (`idaccion_dits`) ON DELETE NO ACTION ON UPDATE CASCADE,
   CONSTRAINT `fgkey_entradas_3` FOREIGN KEY (`Id_Trabajador`) REFERENCES `vn`.`worker` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=3981946 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3986463 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -57809,7 +57329,7 @@ CREATE TABLE `Entradas_kop` (
   PRIMARY KEY (`Id_Entradas_kop`),
   KEY `entradas_entradas_kop_idx` (`Id_Entrada`),
   CONSTRAINT `entradas_entradas_kop` FOREIGN KEY (`Id_Entrada`) REFERENCES `vn`.`entry` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Relaciona las entradas con los origenes de compra';
+) ENGINE=InnoDB AUTO_INCREMENT=109 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Relaciona las entradas con los origenes de compra';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -58736,7 +58256,7 @@ CREATE TABLE `Reservas` (
   PRIMARY KEY (`Id_Reserva`),
   KEY `Id_1` (`Id_Ticket`),
   KEY `Id_Article` (`Id_Article`)
-) ENGINE=InnoDB AUTO_INCREMENT=205 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=252 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -58920,7 +58440,7 @@ CREATE TABLE `Split_lines` (
   KEY `Id_Compra` (`Id_Compra`),
   CONSTRAINT `Id_Compra` FOREIGN KEY (`Id_Compra`) REFERENCES `vn`.`buy` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `Split_lines_ibfk_1` FOREIGN KEY (`Id_Split`) REFERENCES `Splits` (`Id_Split`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=370266 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=370625 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -58938,7 +58458,7 @@ CREATE TABLE `Splits` (
   `Notas` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`Id_Split`),
   KEY `Id_Entrada` (`Id_Entrada`)
-) ENGINE=InnoDB AUTO_INCREMENT=37005 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=37014 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -59032,7 +58552,7 @@ CREATE TABLE `Tickets_dits` (
   CONSTRAINT `Tickets_dits_ibfk_1` FOREIGN KEY (`Id_Ticket`) REFERENCES `vn`.`ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `fgkey1` FOREIGN KEY (`idaccion_dits`) REFERENCES `accion_dits` (`idaccion_dits`) ON DELETE NO ACTION ON UPDATE CASCADE,
   CONSTRAINT `fgkey3` FOREIGN KEY (`Id_Trabajador`) REFERENCES `vn`.`worker` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=65246637 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=65253509 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -59310,7 +58830,7 @@ CREATE TABLE `Vehiculos_consumo` (
   CONSTRAINT `fk_Vehiculos_consumo_Vehiculos` FOREIGN KEY (`Id_Vehiculo`) REFERENCES `vn`.`vehicle` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `fuelTypeFk` FOREIGN KEY (`fuelTypeFk`) REFERENCES `vn`.`fuelType` (`code`) ON DELETE NO ACTION ON UPDATE NO ACTION,
   CONSTRAINT `proveedoresFk` FOREIGN KEY (`proveedoresFk`) REFERENCES `vn`.`supplier` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB AUTO_INCREMENT=12896 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='En esta tabla apuntan el importe de los tickets de la gasolinera solred, con quien tenemos un contrato y nos facturan mensualmente';
+) ENGINE=InnoDB AUTO_INCREMENT=12909 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='En esta tabla apuntan el importe de los tickets de la gasolinera solred, con quien tenemos un contrato y nos facturan mensualmente';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -59459,7 +58979,7 @@ CREATE TABLE `account_conciliacion` (
   KEY `fg_accconciliacion_key1_idx` (`Id_Proveedores_account`),
   KEY `index_id_calculated` (`id_calculated`),
   CONSTRAINT `fg_key1_accountconc` FOREIGN KEY (`Id_Proveedores_account`) REFERENCES `vn`.`supplierAccount` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=37876 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=37944 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -59767,7 +59287,7 @@ CREATE TABLE `albaran` (
   CONSTRAINT `fk_albaran_empresa1` FOREIGN KEY (`empresa_id`) REFERENCES `vn`.`company` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `fk_albaran_recibida` FOREIGN KEY (`recibida_id`) REFERENCES `recibida` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
   CONSTRAINT `fk_albaran_warehouse1` FOREIGN KEY (`warehouse_id`) REFERENCES `vn`.`warehouse` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=3742 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3745 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -59846,7 +59366,7 @@ CREATE TABLE `awb` (
   CONSTRAINT `awbInvoiceIn` FOREIGN KEY (`invoiceInFk`) REFERENCES `recibida` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
   CONSTRAINT `awbTransitoryFk` FOREIGN KEY (`transitario_id`) REFERENCES `vn`.`supplier` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `awb_ibfk_1` FOREIGN KEY (`iva_id`) REFERENCES `vn`.`taxCode` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=3606 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3610 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -60012,7 +59532,7 @@ CREATE TABLE `awb_component` (
   CONSTRAINT `awb_component_` FOREIGN KEY (`awb_component_type_id`) REFERENCES `awb_component_type` (`awb_component_type_id`) ON UPDATE CASCADE,
   CONSTRAINT `awb_role_fk` FOREIGN KEY (`awb_role_id`) REFERENCES `awb_role` (`awb_role_id`) ON UPDATE CASCADE,
   CONSTRAINT `awb_unit_fk` FOREIGN KEY (`awb_unit_id`) REFERENCES `awb_unit` (`awb_unit_id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=32804 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=32915 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -60127,7 +59647,7 @@ CREATE TABLE `awb_gestdoc` (
   KEY `awb_gestdoc_gestdoc_fk` (`gestdoc_id`),
   CONSTRAINT `awb_gestdoc_awb_fk` FOREIGN KEY (`awb_id`) REFERENCES `awb` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `awb_gestdoc_gestdoc_fk` FOREIGN KEY (`gestdoc_id`) REFERENCES `vn`.`dms` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=3187 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3191 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -61841,7 +61361,7 @@ CREATE TABLE `intrastat_data` (
   KEY `recibida` (`recibida_id`),
   CONSTRAINT `intrastat_data_ibfk_1` FOREIGN KEY (`intrastat_id`) REFERENCES `vn`.`intrastat` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `intrastat_data_ibfk_2` FOREIGN KEY (`recibida_id`) REFERENCES `recibida` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=84537 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=84827 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -62126,7 +61646,7 @@ CREATE TABLE `mail` (
   PRIMARY KEY (`id`),
   KEY `sent_idx` (`sent`),
   KEY `creation_idx` (`DATE_ODBC`)
-) ENGINE=InnoDB AUTO_INCREMENT=1935466 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1938221 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -62358,7 +61878,7 @@ CREATE TABLE `pago` (
   CONSTRAINT `pago_moneda` FOREIGN KEY (`id_moneda`) REFERENCES `vn`.`currency` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `pago_pay_met` FOREIGN KEY (`pay_met_id`) REFERENCES `vn`.`payMethod` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `proveedor_pago` FOREIGN KEY (`id_proveedor`) REFERENCES `vn`.`supplier` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=52643 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=52653 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -62854,7 +62374,7 @@ CREATE TABLE `price_fixed` (
   KEY `date_end` (`date_end`),
   KEY `warehouse_id` (`warehouse_id`),
   CONSTRAINT `price_fixed_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `vn`.`item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=64835 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=64846 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -63034,7 +62554,7 @@ CREATE TABLE `recibida` (
   CONSTRAINT `recibida_ibfk_5` FOREIGN KEY (`cplusInvoiceType472Fk`) REFERENCES `vn`.`cplusInvoiceType472` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `recibida_ibfk_6` FOREIGN KEY (`cplusRectificationTypeFk`) REFERENCES `vn`.`cplusRectificationType` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `recibida_ibfk_7` FOREIGN KEY (`cplusTrascendency472Fk`) REFERENCES `vn`.`cplusTrascendency472` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=89106 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=89245 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -63272,7 +62792,7 @@ CREATE TABLE `recibida_iva` (
   CONSTRAINT `recibida_iva_ibfk_2` FOREIGN KEY (`iva_id`) REFERENCES `vn`.`taxCode` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE,
   CONSTRAINT `recibida_iva_ibfk_5` FOREIGN KEY (`recibida_id`) REFERENCES `recibida` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `recibida_iva_ibfk_6` FOREIGN KEY (`gastos_id`) REFERENCES `vn`.`expence` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB AUTO_INCREMENT=166766 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=167139 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -63295,7 +62815,7 @@ CREATE TABLE `recibida_vencimiento` (
   KEY `banco_id` (`banco_id`),
   CONSTRAINT `recibida_vencimiento_ibfk_6` FOREIGN KEY (`banco_id`) REFERENCES `vn`.`bank` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `recibida_vencimiento_ibfk_7` FOREIGN KEY (`recibida_id`) REFERENCES `recibida` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=164779 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=165073 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -63565,7 +63085,7 @@ CREATE TABLE `scan` (
   `name` varchar(45) CHARACTER SET utf8 DEFAULT NULL,
   `odbc_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=112863 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Se borra automaticamente 8 dias en el pasado desde vn2008.clean';
+) ENGINE=InnoDB AUTO_INCREMENT=113055 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Se borra automaticamente 8 dias en el pasado desde vn2008.clean';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -63607,7 +63127,7 @@ CREATE TABLE `scan_line` (
   PRIMARY KEY (`scan_line_id`),
   KEY `id_scan_id_idx` (`scan_id`),
   CONSTRAINT `id_scan_id` FOREIGN KEY (`scan_id`) REFERENCES `scan` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=1440144 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1443192 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -64123,7 +63643,7 @@ CREATE TABLE `travel_dits` (
   KEY `fgkey2_idx` (`Id_Ticket`),
   KEY `fgkey3_idx` (`Id_Trabajador`),
   CONSTRAINT `travel_dits_ibfk_1` FOREIGN KEY (`Id_Trabajador`) REFERENCES `vn`.`worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=246042 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=246368 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -65553,15 +65073,16 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` FUNCTION `Averiguar_ComercialCliente`(v_customer INT, v_date DATE) RETURNS varchar(3) CHARSET utf8
     DETERMINISTIC
 BEGIN
+-- DEPRECATED USE vn.client_getSalesPersonCode
 /**
  * Dado un id cliente y una fecha, devuelve su comercial.
  * Para más información ir a Averiguar_ComercialCliente_Id()
@@ -65591,15 +65112,17 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` FUNCTION `Averiguar_ComercialCliente_Id`(v_customer INT, v_date DATE) RETURNS int(11)
     DETERMINISTIC
 BEGIN
+
+	-- DEPRECATED USE vn.client_getSalesPerson
 /**
  * Dado un id cliente y una fecha, devuelve su comercial para ese dia, teniendo 
  * en cuenta la jerarquía de las tablas: 1º la de sharingclient, 2º la de 
@@ -65677,15 +65200,16 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` FUNCTION `Averiguar_ComercialCliente_IdTicket`(v_ticket INT) RETURNS varchar(3) CHARSET utf8
     DETERMINISTIC
 BEGIN
+-- DEPRECATED USE vn.client_getSalesPersonCodeByTicket
 /**
  * Dado un id ticket, devuelve su comercial.
  * Para más información ir a Averiguar_ComercialCliente_Id()
@@ -65712,15 +65236,16 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`%` FUNCTION `Averiguar_ComercialCliente_IdTicket_Id`(v_ticket INT) RETURNS int(11)
     DETERMINISTIC
 BEGIN
+-- DEPRECATED USE vn.client_getSalesPersonByTicket
 /**
  * Dado un id ticket, devuelve su comercial.
  * Para más información ir a Averiguar_ComercialCliente_Id()
@@ -70253,592 +69778,6 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `bionic_calc_componentTestKk` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `bionic_calc_componentTestKk`(IN `v_consigna` INT, IN `v_agencia` INT)
-proc: BEGIN
-
-	DECLARE v_customer INT;
-    DECLARE COEFICIENTE_DE_INFLACION_GENERAL INT DEFAULT 1.3;
-    DECLARE DENSIDAD_MINIMA_PESO_VOLUMETRICO INT DEFAULT 167;
-    DECLARE VOLUMEN_CAJA_VERDNATURA BIGINT DEFAULT 138000;
-    -- DECLARE vValorEmbolsado DOUBLE DEFAULT 0.04;
-    
-    SELECT Id_Cliente INTO v_customer FROM Consignatarios WHERE Id_Consigna = v_consigna;
-    SET @rate2 := 0;
-    SET @rate3 := 0;
-
-	DROP TEMPORARY TABLE IF EXISTS t_bionic_temp;
-	CREATE TEMPORARY TABLE t_bionic_temp
-	(PRIMARY KEY (item_id,warehouse_id))
-	ENGINE = MEMORY
-		SELECT 
-			b.item_id, b.warehouse_id,available,
-			IF((@rate2 := IFNULL(pf.rate_2,c.Tarifa2)) < a.PVP AND a.`Min`, a.PVP, @rate2) * 1.0 rate_2,
-			IF((@rate3 := IFNULL(pf.rate_3,c.Tarifa3)) < a.PVP AND a.`Min`, a.PVP, @rate3) * 1.0 rate_3,
-            ifnull(pf.rate_3,0) AS min_price,
-			IFNULL(pf.Packing,c.Packing) packing,
-			IFNULL(pf.`grouping`,c.`grouping`) `grouping`,
-			ABS(IFNULL(pf.caja,c.caja)) box,
-            b.buy_id, a.tipo_id
-        FROM tmp.bionic_lot b 
-		JOIN vn2008.Compres c ON b.buy_id = c.Id_Compra
-		JOIN vn2008.Articles a ON b.item_id = a.Id_Article
-        JOIN vn2008.Tipos t ON t.tipo_id = a.tipo_id
-        LEFT JOIN vn2008.reinos r ON r.id = t.reino_id
-		LEFT JOIN vn2008.PreciosEspeciales p ON a.Id_Article = p.Id_Article AND p.Id_Cliente = v_customer
-		LEFT JOIN (
-			SELECT * FROM (
-				SELECT p.item_id, p.`grouping`, p.Packing,p.caja, p.rate_2, p.rate_3, ah.warehouseFk AS warehouse_id
-					FROM vn2008.price_fixed p
-					JOIN tmp.agencyHourGetShipped ah ON ah.warehouseFk = p.warehouse_id OR p.warehouse_id = 0 
-						WHERE ah.shipped BETWEEN p.date_start AND p.date_end ORDER BY p.item_id, p.warehouse_id DESC
-			) t
-			GROUP BY item_id, warehouse_id
-		) pf ON pf.item_id = b.item_id AND pf.warehouse_id = b.warehouse_id
-        -- descartamos articulos con coste menor de 0.01
-        WHERE Costefijo + Portefijo + Embalajefijo + Comisionfija > 0.01 AND r.display <> 0;
-        
-    -- Creamos la tabla tmp.bionic_component
-    DROP TEMPORARY TABLE IF EXISTS tmp.bionic_component;
-    CREATE TEMPORARY TABLE tmp.bionic_component LIKE
-		template_bionic_component;
-        
-	-- Componentes del precio, valores absolutos
-	INSERT INTO tmp.bionic_component ( warehouse_id, item_id, component_id, cost)
-	SELECT  b.warehouse_id, b.item_id, 29, rate_3 - Costefijo - Portefijo - Embalajefijo - Comisionfija
-		FROM t_bionic_temp b 
-        JOIN vn2008.Compres c ON b.buy_id = c.Id_Compra;
-	
-    INSERT INTO tmp.bionic_component ( warehouse_id, item_id, component_id, cost)
-	SELECT  b.warehouse_id, b.item_id, 28, Costefijo + Portefijo + Embalajefijo + Comisionfija
-		FROM t_bionic_temp b
-        JOIN vn2008.Compres c ON b.buy_id = c.Id_Compra; 
-
-	-- Ahora los valores en funcion de la base
-
-	DROP TEMPORARY TABLE IF EXISTS t_components_base;
-
-	CREATE TEMPORARY TABLE t_components_base
-	SELECT bc.item_id, ROUND(SUM(cost), 4) AS base, bc.warehouse_id
-		FROM tmp.bionic_component bc
-			GROUP BY bc.item_id,warehouse_id;
-
-	-- La ratio se calcula teniendo en cuenta el valor de las reclamaciones y el saldo de greuge
-	
-	INSERT INTO tmp.bionic_component
-	SELECT cb.warehouse_id, item_id, 17, ROUND(base * LEAST(recobro,0.25), 3)
-		FROM t_components_base cb
-		JOIN bi.claims_ratio ON Id_Cliente = v_customer
-			WHERE recobro > 0.009;
-            
-	-- PAK 2016-08-31  Componente de maná automático, en función del maná acumulado por el comercial.
-   
-    INSERT INTO tmp.bionic_component
-	SELECT cb.warehouse_id, item_id, 39, ROUND(base * (0.01 + prices_modifier_rate), 3) as manaAuto
-		FROM t_components_base cb
-        JOIN Clientes c on c.Id_Cliente = v_customer
-		JOIN bs.mana_spellers ms ON c.Id_Trabajador = ms.Id_Trabajador 
-		WHERE ms.prices_modifier_activated
-        AND c.Id_Trabajador != 196 -- Ruben Espinosa
-        HAVING manaAuto <> 0 ;
-      
-         
-/*      
-	-- Vendedor variable
-	INSERT INTO tmp.bionic_component
-	SELECT  cb.warehouse_id, item_id, Id_Componente, IFNULL(ROUND(base * tax,4), 0)
-		FROM t_components_base cb
-		JOIN bi.tarifa_componentes
-			WHERE tarifa_componentes_series_id = 2 and IFNULL(tax, 0) > 0;
- */  
- 
- 
--- ******* Inicio Bloque para componentes con tarifa_class diferente de NULL
-	-- Descuento por ultimas unidades
-	INSERT INTO tmp.bionic_component
-	SELECT  cb.warehouse_id, b.item_id, Id_Componente, GREATEST(IFNULL(ROUND(base * tax,4), 0), b.min_price - b.rate_3)
-		FROM t_components_base cb
-			JOIN bi.tarifa_componentes
-			JOIN t_bionic_temp b ON  b.item_id = cb.item_id AND b.warehouse_id = cb.warehouse_id 
-			LEFT JOIN PreciosEspeciales pe ON pe.Id_Cliente = v_customer AND pe.Id_Article = b.item_id
-		WHERE Id_Componente = 32 AND tax <> 0 AND b.min_price < b.rate_3 AND PrecioEspecial IS NULL;
-            
-	-- Incremento por paquete suelto
-	INSERT INTO tmp.bionic_component
-	SELECT b.warehouse_id, b.item_id, 22, rate_2 - rate_3 
-		FROM t_bionic_temp b
-        JOIN vn2008.Compres c ON b.buy_id = c.Id_Compra
-        LEFT JOIN PreciosEspeciales pe ON pe.Id_Cliente = v_customer AND pe.Id_Article = b.item_id
-	WHERE PrecioEspecial IS NULL;
- 
--- ******* Fin Bloque para componentes con tarifa_class diferente de NULL
-
-	-- Reparto
-	INSERT INTO tmp.bionic_component
-    SELECT b.warehouse_id
-			, b.item_id
-            , 15
-            , COEFICIENTE_DE_INFLACION_GENERAL
-				* ROUND(
-						r.cm3  
-                        * art.compression
-						* IF(a.Vista = 1, (GREATEST(art.density,DENSIDAD_MINIMA_PESO_VOLUMETRICO) / DENSIDAD_MINIMA_PESO_VOLUMETRICO ) , 1)
-						* IFNULL(az.price
-						* az.inflacion ,50)
-						/ VOLUMEN_CAJA_VERDNATURA, 4
-						) cost
-    FROM t_bionic_temp b
-		JOIN vn2008.Articles art ON art.Id_Article = b.item_id
-		JOIN vn2008.Agencias a ON a.Id_Agencia = v_agencia
-        JOIN vn2008.Consignatarios c ON c.Id_Consigna = v_consigna
-		JOIN vn2008.Agencias_province ap ON ap.agency_id = a.agency_id AND ap.warehouse_id = b.warehouse_id AND ap.province_id = c.province_id
-        JOIN vn2008.Agencias_zonas az ON az.Id_Agencia = v_agencia AND az.zona = ap.zona AND az.Id_Article = 71 AND az.warehouse_id = b.warehouse_id
-		LEFT JOIN bi.rotacion r ON r.warehouse_id = b.warehouse_id AND r.Id_Article = b.item_id
-		HAVING cost <> 0;
-	
--- Reparto bonificado
-	INSERT INTO tmp.bionic_component
-    SELECT b.warehouse_id
-			, b.item_id
-            , 41
-            , COEFICIENTE_DE_INFLACION_GENERAL
-				* ROUND(
-						r.cm3 
-                        * art.compression
-						* IF(a.Vista = 1, (GREATEST(art.density,DENSIDAD_MINIMA_PESO_VOLUMETRICO) / DENSIDAD_MINIMA_PESO_VOLUMETRICO ) , 1)
-						* awb.bonus 
-						* az.inflacion 
-						/ VOLUMEN_CAJA_VERDNATURA, 4
-						) cost
-    FROM t_bionic_temp b
-		JOIN vn2008.Articles art ON art.Id_Article = b.item_id
-		JOIN vn2008.Agencias a ON a.Id_Agencia = v_agencia
-        JOIN vn2008.Consignatarios c ON c.Id_Consigna = v_consigna
-		JOIN vn2008.Agencias_province ap ON ap.agency_id = a.agency_id AND ap.warehouse_id = b.warehouse_id AND ap.province_id = c.province_id
-        JOIN vn2008.Agencias_zonas az ON az.Id_Agencia = v_agencia AND az.zona = ap.zona AND az.Id_Article = 71 AND az.warehouse_id = b.warehouse_id
-		JOIN vn2008.agency_weekday_bonus awb ON awb.warehouse_id = az.warehouse_id AND awb.zona = az.zona AND a.agency_id = awb.agency_id
-        LEFT JOIN bi.rotacion r ON r.warehouse_id = b.warehouse_id AND r.Id_Article = b.item_id
-        JOIN tmp.agencyHourGetShipped ah ON ah.warehouseFk = awb.warehouse_id AND weekday(ah.landed) = awb.weekDay
-		HAVING cost <> 0
-        LIMIT 1;
-      
--- PAK 12-05-2015
-    -- EMBOLSADO 
-    IF (SELECT COUNT(*) FROM vn.addressForPackaging WHERE addressFk = v_consigna) THEN
-    
-    -- IF v_consigna IN (13690, 3402, 5661, 4233) THEN
-   
-		INSERT INTO tmp.bionic_component
-			SELECT b.warehouse_id, b.item_id, 38, ap.packagingValue cost
-				FROM t_bionic_temp b
-					JOIN vn.addressForPackaging ap
-				WHERE ap.addressFk = v_consigna;
-        
-    END IF;
-    
-	-- JGF 14-08-2015 
-	-- Modificacion de precio por dia de preparacion del pedido
-	INSERT INTO tmp.bionic_component
-	SELECT cb.warehouse_id, cb.item_id, 14, cb.base * (IFNULL(pe.percentage,pp.percentage)/100)
-		FROM t_components_base cb
-		JOIN tmp.agencyHourGetShipped ah ON ah.warehouseFk = cb.warehouse_id
-        LEFT JOIN vn2008.preparation_percentage pp ON pp.week_day = weekday(ah.shipped) AND cb.warehouse_id = IFNULL(pp.warehouse_id,cb.warehouse_id)
-        LEFT JOIN vn2008.preparation_exception pe ON pe.exception_day = ah.shipped AND cb.warehouse_id = IFNULL(pe.warehouse_id,cb.warehouse_id)
-	WHERE IFNULL(pe.percentage,pp.percentage);
-
-	-- Creamos la tabla tmp.bionic_component_copy por que mysql no puede reabrir una tabla temporal
-    DROP TEMPORARY TABLE IF EXISTS tmp.bionic_component_copy;
-    CREATE TEMPORARY TABLE tmp.bionic_component_copy
-		SELECT * FROM tmp.bionic_component;
-        
-	-- JGF 19-01-2016 
-	-- Precios especiales
-	INSERT INTO tmp.bionic_component
-	SELECT b.warehouse_id, b.item_id, 10, pe.PrecioEspecial - SUM(cost) sum_cost
-			FROM tmp.bionic_component_copy b
-				JOIN bi.tarifa_componentes t ON b.component_id = t.Id_Componente
-				JOIN PreciosEspeciales pe ON pe.Id_Cliente = v_customer AND pe.Id_Article = b.item_id
-			WHERE t.tarifa_class IS NULL
-			GROUP BY b.item_id, b.warehouse_id
-			HAVING ABS(sum_cost) > 0.001;
-
-	-- Lotes
-	DROP TEMPORARY TABLE IF EXISTS t_component_sum;
-	CREATE TEMPORARY TABLE t_component_sum
-	(INDEX (item_id, warehouse_id))
-	ENGINE = MEMORY
-	SELECT SUM(cost) sum_cost, b.item_id, b.warehouse_id, t.tarifa_class
-			FROM tmp.bionic_component b
-			JOIN bi.tarifa_componentes t ON b.component_id = t.Id_Componente
-				GROUP BY b.item_id, b.warehouse_id, t.tarifa_class;
-  
-  -- ***** Inicia Modifica t_bionic_rate las diferentes tarifas
-	-- Tarifa por unidad minima
-	DROP TEMPORARY TABLE IF EXISTS t_bionic_rate;
-	CREATE TEMPORARY TABLE t_bionic_rate
-    ENGINE = MEMORY
-		SELECT b.warehouse_id,  item_id, 1 rate,
-		IF(box = 1, `grouping`, 1) `grouping`, SUM(sum_cost) price
-			FROM t_bionic_temp b
-				JOIN t_component_sum cs USING(item_id, warehouse_id)
-			WHERE IFNULL(cs.tarifa_class,1) = 1 AND box < 2 AND (packing > `grouping` or box = 0)
-			GROUP BY warehouse_id, item_id;
-
-	-- Tarifa por caja
-	INSERT INTO t_bionic_rate (warehouse_id, item_id, rate, `grouping`, price)
-        SELECT b.warehouse_id, item_id, 2 rate, packing `grouping`,
-				SUM(sum_cost) price
-			FROM t_bionic_temp b
-				JOIN t_component_sum cs USING(item_id, warehouse_id)
-			WHERE available IS NULL OR (IFNULL(cs.tarifa_class,2) = 2 AND packing > 0 AND available >= packing)
-			GROUP BY warehouse_id, item_id;
-
-	-- Tarifa para toda la cantidad disponible
-	INSERT INTO t_bionic_rate (warehouse_id, item_id, rate, `grouping`, price)
-		 SELECT b.warehouse_id, item_id, 3 rate, available `grouping`,
-				SUM(sum_cost) price
-			FROM t_bionic_temp b
-				JOIN t_component_sum cs USING(item_id, warehouse_id)
-			WHERE IFNULL(cs.tarifa_class,3) = 3 
-			GROUP BY warehouse_id, item_id;
-            
-  -- ***** Fin Modifica t_bionic_rate las diferentes tarifas    
-        
-	DROP TEMPORARY TABLE IF EXISTS tmp.bionic_price;
-	CREATE TEMPORARY TABLE tmp.bionic_price 
-		LIKE template_bionic_price;
-
-	INSERT INTO tmp.bionic_price (warehouse_id, item_id, rate, `grouping`, price)
-		SELECT * FROM (
-			SELECT * FROM t_bionic_rate ORDER BY price
-		) t
-		GROUP BY item_id, warehouse_id, `grouping`;
-
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.travel_tree;
-	CREATE TEMPORARY TABLE tmp.travel_tree
-    ENGINE = MEMORY
-		SELECT * FROM tmp.agencyHourGetShipped;
-    
-	-- Limpieza
-
-	DROP TEMPORARY TABLE tmp.agencyHourGetShipped;
-    DROP TEMPORARY TABLE t_bionic_temp;
-    DROP TEMPORARY TABLE t_component_sum;
-    DROP TEMPORARY TABLE t_components_base;
-    DROP TEMPORARY TABLE t_bionic_rate;
-    DROP TEMPORARY TABLE tmp.bionic_component_copy;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `bionic_calc_component__` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `bionic_calc_component__`(IN `v_consigna` INT, IN `v_agencia` INT)
-proc: BEGIN
-
-	DECLARE v_customer INT;
-    DECLARE COEFICIENTE_DE_INFLACION_GENERAL INT DEFAULT 1.0;
-    DECLARE DENSIDAD_MINIMA_PESO_VOLUMETRICO INT DEFAULT 167;
-    DECLARE VOLUMEN_CAJA_VERDNATURA BIGINT; -- DEFAULT 138000;
-    -- DECLARE vValorEmbolsado DOUBLE DEFAULT 0.04;
-    
-	CALL util.THROW('OBSOLETO');
-    
-    SELECT Volumen INTO VOLUMEN_CAJA_VERDNATURA
-		FROM Cubos
-        WHERE Id_Cubo = '94';
-        
-    SELECT Id_Cliente INTO v_customer FROM Consignatarios WHERE Id_Consigna = v_consigna;
-    SET @rate2 := 0;
-    SET @rate3 := 0;
-
-	DROP TEMPORARY TABLE IF EXISTS t_bionic_temp;
-	CREATE TEMPORARY TABLE t_bionic_temp
-	(PRIMARY KEY (item_id,warehouse_id))
-	ENGINE = MEMORY
-		SELECT 
-			b.item_id, b.warehouse_id,available,
-			IF((@rate2 := IFNULL(pf.rate_2,c.Tarifa2)) < a.PVP AND a.`Min`, a.PVP, @rate2) * 1.0 rate_2,
-			IF((@rate3 := IFNULL(pf.rate_3,c.Tarifa3)) < a.PVP AND a.`Min`, a.PVP, @rate3) * 1.0 rate_3,
-            ifnull(pf.rate_3,0) AS min_price,
-			IFNULL(pf.Packing,c.Packing) packing,
-			IFNULL(pf.`grouping`,c.`grouping`) `grouping`,
-			ABS(IFNULL(pf.caja,c.caja)) box,
-            b.buy_id, a.tipo_id
-        FROM tmp.bionic_lot b 
-		JOIN vn2008.Compres c ON b.buy_id = c.Id_Compra
-		JOIN vn2008.Articles a ON b.item_id = a.Id_Article
-        JOIN vn2008.Tipos t ON t.tipo_id = a.tipo_id
-        LEFT JOIN vn2008.reinos r ON r.id = t.reino_id
-		LEFT JOIN vn2008.PreciosEspeciales p ON a.Id_Article = p.Id_Article AND p.Id_Cliente = v_customer
-		LEFT JOIN (
-			SELECT * FROM (
-				SELECT p.item_id, p.`grouping`, p.Packing, p.caja, p.rate_2, p.rate_3, zgs.warehouseFk AS warehouse_id
-					FROM vn2008.price_fixed p
-					JOIN tmp.zoneGetShipped zgs ON zgs.warehouseFk = p.warehouse_id OR p.warehouse_id = 0 
-						WHERE zgs.shipped BETWEEN p.date_start AND p.date_end ORDER BY p.item_id, p.warehouse_id DESC
-			) t
-			GROUP BY item_id, warehouse_id
-		) pf ON pf.item_id = b.item_id AND pf.warehouse_id = b.warehouse_id
-        -- descartamos articulos con coste menor de 0.01
-        WHERE Costefijo + Portefijo + Embalajefijo + Comisionfija > 0.01 AND r.display <> 0;
-        
-    -- Creamos la tabla tmp.bionic_component
-    DROP TEMPORARY TABLE IF EXISTS tmp.bionic_component;
-    CREATE TEMPORARY TABLE tmp.bionic_component LIKE
-		template_bionic_component;
-        
-	-- Componentes del precio, valores absolutos
-	INSERT INTO tmp.bionic_component ( warehouse_id, item_id, component_id, cost)
-	SELECT  b.warehouse_id, b.item_id, 29, rate_3 - Costefijo - Portefijo - Embalajefijo - Comisionfija
-		FROM t_bionic_temp b 
-        JOIN vn2008.Compres c ON b.buy_id = c.Id_Compra;
-	
-    INSERT INTO tmp.bionic_component ( warehouse_id, item_id, component_id, cost)
-	SELECT  b.warehouse_id, b.item_id, 28, Costefijo + Portefijo + Embalajefijo + Comisionfija
-		FROM t_bionic_temp b
-        JOIN vn2008.Compres c ON b.buy_id = c.Id_Compra; 
-
-	-- Ahora los valores en funcion de la base
-
-	DROP TEMPORARY TABLE IF EXISTS t_components_base;
-
-	CREATE TEMPORARY TABLE t_components_base
-	SELECT bc.item_id, ROUND(SUM(cost), 4) AS base, bc.warehouse_id
-		FROM tmp.bionic_component bc
-			GROUP BY bc.item_id,warehouse_id;
-
-	-- La ratio se calcula teniendo en cuenta el valor de las reclamaciones y el saldo de greuge
-	
-	INSERT INTO tmp.bionic_component
-	SELECT cb.warehouse_id, item_id, 17, ROUND(base * LEAST(recobro,0.25), 3)
-		FROM t_components_base cb
-		JOIN bi.claims_ratio ON Id_Cliente = v_customer
-			WHERE recobro > 0.009;
-            
-	-- PAK 2016-08-31  Componente de maná automático, en función del maná acumulado por el comercial.
-   
-    INSERT INTO tmp.bionic_component
-	SELECT cb.warehouse_id, item_id, 39, ROUND(base * (0.01 + prices_modifier_rate), 3) as manaAuto
-		FROM t_components_base cb
-        JOIN Clientes c on c.Id_Cliente = v_customer
-		JOIN bs.mana_spellers ms ON c.Id_Trabajador = ms.Id_Trabajador 
-		WHERE ms.prices_modifier_activated
-        AND c.Id_Trabajador != 196 -- Ruben Espinosa
-        HAVING manaAuto <> 0 ;
-      
-         
-/*      
-	-- Vendedor variable
-	INSERT INTO tmp.bionic_component
-	SELECT  cb.warehouse_id, item_id, Id_Componente, IFNULL(ROUND(base * tax,4), 0)
-		FROM t_components_base cb
-		JOIN bi.tarifa_componentes
-			WHERE tarifa_componentes_series_id = 2 and IFNULL(tax, 0) > 0;
- */  
- 
- 
--- ******* Inicio Bloque para componentes con tarifa_class diferente de NULL
-	-- Descuento por ultimas unidades
-	INSERT INTO tmp.bionic_component
-	SELECT  cb.warehouse_id, b.item_id, Id_Componente, GREATEST(IFNULL(ROUND(base * tax,4), 0), b.min_price - b.rate_3)
-		FROM t_components_base cb
-			JOIN bi.tarifa_componentes
-			JOIN t_bionic_temp b ON  b.item_id = cb.item_id AND b.warehouse_id = cb.warehouse_id 
-			LEFT JOIN PreciosEspeciales pe ON pe.Id_Cliente = v_customer AND pe.Id_Article = b.item_id
-		WHERE Id_Componente = 32 AND tax <> 0 AND b.min_price < b.rate_3 AND PrecioEspecial IS NULL;
-            
-	-- Incremento por paquete suelto
-	INSERT INTO tmp.bionic_component
-	SELECT b.warehouse_id, b.item_id, 22, rate_2 - rate_3 
-		FROM t_bionic_temp b
-        JOIN vn2008.Compres c ON b.buy_id = c.Id_Compra
-        LEFT JOIN PreciosEspeciales pe ON pe.Id_Cliente = v_customer AND pe.Id_Article = b.item_id
-	WHERE PrecioEspecial IS NULL;
- 
--- ******* Fin Bloque para componentes con tarifa_class diferente de NULL
-
-	-- Reparto
-	INSERT INTO tmp.bionic_component
-    SELECT b.warehouse_id
-			, b.item_id
-            , 15
-            , COEFICIENTE_DE_INFLACION_GENERAL
-				* ROUND(
-						r.cm3  
-                        * art.compression
-						* IF(a.Vista = 1, (GREATEST(art.density,DENSIDAD_MINIMA_PESO_VOLUMETRICO) / DENSIDAD_MINIMA_PESO_VOLUMETRICO ) , 1)
-						* IFNULL(az.price
-						* az.inflacion ,50)
-						/ VOLUMEN_CAJA_VERDNATURA, 4
-						) cost
-    FROM t_bionic_temp b
-		JOIN vn2008.Articles art ON art.Id_Article = b.item_id
-		JOIN vn2008.Agencias a ON a.Id_Agencia = v_agencia
-        JOIN vn2008.Consignatarios c ON c.Id_Consigna = v_consigna
-		JOIN vn2008.Agencias_province ap ON ap.agency_id = a.agency_id AND ap.warehouse_id = b.warehouse_id AND ap.province_id = c.province_id
-        JOIN vn2008.Agencias_zonas az ON az.Id_Agencia = v_agencia AND az.zona = ap.zona AND az.Id_Article = 71 AND az.warehouse_id = b.warehouse_id
-		LEFT JOIN bi.rotacion r ON r.warehouse_id = b.warehouse_id AND r.Id_Article = b.item_id
-		HAVING cost <> 0;
-	
--- Reparto bonificado
-	INSERT INTO tmp.bionic_component
-    SELECT b.warehouse_id
-			, b.item_id
-            , 41
-            , COEFICIENTE_DE_INFLACION_GENERAL
-				* ROUND(
-						r.cm3 
-                        * art.compression
-						* IF(a.Vista = 1, (GREATEST(art.density,DENSIDAD_MINIMA_PESO_VOLUMETRICO) / DENSIDAD_MINIMA_PESO_VOLUMETRICO ) , 1)
-						-- * awb.bonus 
-						* az.inflacion 
-						/ VOLUMEN_CAJA_VERDNATURA, 4
-						) cost
-    FROM t_bionic_temp b
-		JOIN vn2008.Articles art ON art.Id_Article = b.item_id
-		JOIN vn2008.Agencias a ON a.Id_Agencia = v_agencia
-        JOIN vn2008.Consignatarios c ON c.Id_Consigna = v_consigna
-		JOIN vn2008.Agencias_province ap ON ap.agency_id = a.agency_id AND ap.warehouse_id = b.warehouse_id AND ap.province_id = c.province_id
-        JOIN vn2008.Agencias_zonas az ON az.Id_Agencia = v_agencia AND az.zona = ap.zona AND az.Id_Article = 71 AND az.warehouse_id = b.warehouse_id
-		-- JOIN vn2008.agency_weekday_bonus awb ON awb.warehouse_id = az.warehouse_id AND awb.zona = az.zona AND a.agency_id = awb.agency_id
-        LEFT JOIN bi.rotacion r ON r.warehouse_id = b.warehouse_id AND r.Id_Article = b.item_id
-        JOIN tmp.agencyHourGetShipped ah ON ah.warehouseFk = awb.warehouse_id AND weekday(ah.landed) = awb.weekDay
-		HAVING cost <> 0
-        LIMIT 1;
-      
--- PAK 12-05-2015
-    -- EMBOLSADO 
-    IF (SELECT COUNT(*) FROM vn.addressForPackaging WHERE addressFk = v_consigna) THEN
-    
-    -- IF v_consigna IN (13690, 3402, 5661, 4233) THEN
-   
-		INSERT INTO tmp.bionic_component
-			SELECT b.warehouse_id, b.item_id, 38, ap.packagingValue cost
-				FROM t_bionic_temp b
-					JOIN vn.addressForPackaging ap
-				WHERE ap.addressFk = v_consigna;
-        
-    END IF;
-    
-	-- JGF 14-08-2015 
-	-- Modificacion de precio por dia de preparacion del pedido
-	INSERT INTO tmp.bionic_component
-	SELECT cb.warehouse_id, cb.item_id, 14, cb.base * (IFNULL(pe.percentage,pp.percentage)/100)
-		FROM t_components_base cb
-		JOIN tmp.agencyHourGetShipped ah ON ah.warehouseFk = cb.warehouse_id
-        LEFT JOIN vn2008.preparation_percentage pp ON pp.week_day = weekday(ah.shipped) AND cb.warehouse_id = IFNULL(pp.warehouse_id,cb.warehouse_id)
-        LEFT JOIN vn2008.preparation_exception pe ON pe.exception_day = ah.shipped AND cb.warehouse_id = IFNULL(pe.warehouse_id,cb.warehouse_id)
-	WHERE IFNULL(pe.percentage,pp.percentage);
-
-	-- Creamos la tabla tmp.bionic_component_copy por que mysql no puede reabrir una tabla temporal
-    DROP TEMPORARY TABLE IF EXISTS tmp.bionic_component_copy;
-    CREATE TEMPORARY TABLE tmp.bionic_component_copy
-		SELECT * FROM tmp.bionic_component;
-        
-	-- JGF 19-01-2016 
-	-- Precios especiales
-	INSERT INTO tmp.bionic_component
-	SELECT b.warehouse_id, b.item_id, 10, pe.PrecioEspecial - SUM(cost) sum_cost
-			FROM tmp.bionic_component_copy b
-				JOIN bi.tarifa_componentes t ON b.component_id = t.Id_Componente
-				JOIN PreciosEspeciales pe ON pe.Id_Cliente = v_customer AND pe.Id_Article = b.item_id
-			WHERE t.tarifa_class IS NULL
-			GROUP BY b.item_id, b.warehouse_id
-			HAVING ABS(sum_cost) > 0.001;
-
-	-- Lotes
-	DROP TEMPORARY TABLE IF EXISTS t_component_sum;
-	CREATE TEMPORARY TABLE t_component_sum
-	(INDEX (item_id, warehouse_id))
-	ENGINE = MEMORY
-	SELECT SUM(cost) sum_cost, b.item_id, b.warehouse_id, t.tarifa_class
-			FROM tmp.bionic_component b
-			JOIN bi.tarifa_componentes t ON b.component_id = t.Id_Componente
-				GROUP BY b.item_id, b.warehouse_id, t.tarifa_class;
-  
-  -- ***** Inicia Modifica t_bionic_rate las diferentes tarifas
-	-- Tarifa por unidad minima
-	DROP TEMPORARY TABLE IF EXISTS t_bionic_rate;
-	CREATE TEMPORARY TABLE t_bionic_rate
-    ENGINE = MEMORY
-		SELECT b.warehouse_id,  item_id, 1 rate,
-		IF(box = 1, `grouping`, 1) `grouping`, SUM(sum_cost) price
-			FROM t_bionic_temp b
-				JOIN t_component_sum cs USING(item_id, warehouse_id)
-			WHERE IFNULL(cs.tarifa_class,1) = 1 AND box < 2 AND (packing > `grouping` or box = 0)
-			GROUP BY warehouse_id, item_id;
-
-	-- Tarifa por caja
-	INSERT INTO t_bionic_rate (warehouse_id, item_id, rate, `grouping`, price)
-        SELECT b.warehouse_id, item_id, 2 rate, packing `grouping`,
-				SUM(sum_cost) price
-			FROM t_bionic_temp b
-				JOIN t_component_sum cs USING(item_id, warehouse_id)
-			WHERE available IS NULL OR (IFNULL(cs.tarifa_class,2) = 2 AND packing > 0 AND available >= packing)
-			GROUP BY warehouse_id, item_id;
-
-	-- Tarifa para toda la cantidad disponible
-	INSERT INTO t_bionic_rate (warehouse_id, item_id, rate, `grouping`, price)
-		 SELECT b.warehouse_id, item_id, 3 rate, available `grouping`,
-				SUM(sum_cost) price
-			FROM t_bionic_temp b
-				JOIN t_component_sum cs USING(item_id, warehouse_id)
-			WHERE IFNULL(cs.tarifa_class,3) = 3 
-			GROUP BY warehouse_id, item_id;
-            
-  -- ***** Fin Modifica t_bionic_rate las diferentes tarifas    
-        
-	DROP TEMPORARY TABLE IF EXISTS tmp.bionic_price;
-	CREATE TEMPORARY TABLE tmp.bionic_price 
-		LIKE template_bionic_price;
-
-	INSERT INTO tmp.bionic_price (warehouse_id, item_id, rate, `grouping`, price)
-		SELECT * FROM (
-			SELECT * FROM t_bionic_rate ORDER BY price
-		) t
-		GROUP BY item_id, warehouse_id, `grouping`;
-
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.travel_tree;
-	CREATE TEMPORARY TABLE tmp.travel_tree
-    ENGINE = MEMORY
-		SELECT * FROM tmp.agencyHourGetShipped;
-    
-	-- Limpieza
-
-	DROP TEMPORARY TABLE tmp.agencyHourGetShipped;
-    DROP TEMPORARY TABLE t_bionic_temp;
-    DROP TEMPORARY TABLE t_component_sum;
-    DROP TEMPORARY TABLE t_components_base;
-    DROP TEMPORARY TABLE t_bionic_rate;
-    DROP TEMPORARY TABLE tmp.bionic_component_copy;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `bionic_calc_dateKk` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -74078,122 +73017,6 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `buy_transferKk` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `buy_transferKk`(IN `v_buy` INT, IN `v_fv_entry` INT, IN `v_pca_entry` INT)
-proc: BEGIN
-/**
- * Traslada la cantidad restante de una compra de Holanda
- * al almacén de Silla.
- **/
-	DECLARE v_wh INT;
-	DECLARE v_entry INT;
-	DECLARE v_fv INT;
-	DECLARE v_amount INT;
-	DECLARE v_item INT;
-	DECLARE v_holland_wh INT DEFAULT 7;
-	
-	-- Comprueba que es mercancía que llega al almacén de Holanda
-    
-	SELECT t.warehouse_id, IF(tp.warehouseFk=1,1,0) AS v_fv INTO v_wh,v_fv
-		FROM Compres c
-			JOIN Entradas e ON c.Id_Entrada = e.Id_Entrada
-			JOIN travel t ON t.id = e.travel_id
-			JOIN Articles a ON a.Id_Article = c.Id_Article
-			JOIN Tipos tp ON tp.tipo_id = a.tipo_id
-		WHERE c.Id_Compra = v_buy;
-        
-	IF v_wh != v_holland_wh THEN
-		LEAVE proc;
-	END IF;
-
-	-- Calcula a que almacén de Silla debe transladar la mercancía
-
-	SET v_entry = IF(v_fv, v_fv_entry, v_pca_entry);
-	SET v_entry = COALESCE(v_entry, v_pca_entry, v_fv_entry);
-
-	IF v_entry IS NULL THEN
-		LEAVE proc;
-	END IF;
-	
-	-- Calcula la cantidad a trasladar
-
-	SELECT Id_Article INTO v_item
-		FROM Compres WHERE Id_Compra = v_buy;
-
-	SELECT IFNULL(SUM(amount), 0) INTO v_amount
-		FROM (
-			SELECT SUM(c.Cantidad) amount
-				FROM Compres c 
-					JOIN Entradas e ON e.Id_Entrada = c.Id_Entrada 
-					JOIN travel t ON t.id = e.travel_id
-				WHERE c.Id_Article = v_item
-					AND t.landing = CURDATE()
-					AND t.warehouse_id = v_holland_wh
-			UNION ALL
-			SELECT -SUM(c.Cantidad)
-				FROM Compres c
-					JOIN Entradas e ON e.Id_Entrada = c.Id_Entrada
-					JOIN travel t ON t.id = e.travel_id
-				WHERE c.Id_Article = v_item
-					AND t.shipment = CURDATE()
-					AND t.warehouse_id_out = v_holland_wh
-			UNION ALL
-			SELECT -SUM(Cantidad)
-				 FROM Movimientos m
-					JOIN Tickets t ON t.Id_Ticket = m.Id_Ticket
-				 WHERE m.Id_Article = v_item
-					AND t.Fecha = CURDATE()
-					AND t.warehouse_id = v_holland_wh
-		) t;
-
-	IF v_amount <= 0 THEN
-		LEAVE proc;
-	END IF;
-
-	-- Crea la nueva línea de compra con el translado
-
-	INSERT INTO Compres (
-		Id_Article, Etiquetas, Cantidad, Id_Entrada,
-		Id_Cubo, Packing, `grouping`, caja, Costefijo, Portefijo, 
-		Embalajefijo, Comisionfija, novincular, buy_edi_id)
-		SELECT 
-			c.Id_Article,
-			v_amount DIV c.Packing,
-			v_amount,
-			v_entry,
-			c.Id_Cubo,
-			c.Packing,
-			c.`grouping`,
-			c.caja,
-			@cost := IFNULL(c.Costefijo, 0) + IFNULL(c.Comisionfija, 0) + IFNULL(c.Portefijo, 0),
-			@porte := ROUND((@cm3:= cm3_2(c.Id_Cubo, c.Id_Article)) * a.m3 / 1000000 / c.Packing, 3),
-			c.EmbalajeFijo,
-			@comision := ROUND(c.Costefijo * e.comision / 100, 3),
-			c.novincular,
-			c.buy_edi_id
-			FROM Compres c
-				JOIN Cubos cu ON cu.Id_Cubo = c.Id_Cubo 
-				JOIN Entradas e ON e.Id_Entrada = v_entry
-				JOIN travel t ON t.id = e.travel_id
-				JOIN Agencias a ON t.agency_id = a.Id_Agencia
-			WHERE c.Id_Compra = v_buy;
-
-	CALL buy_tarifas (LAST_INSERT_ID());
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `cacheReset` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -78687,158 +77510,6 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `F5__` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `F5__`(IN `idT` BIGINT)
-BEGIN
-SELECT  C.calidad,
-		LEFT(Article, 4) as Subtipo, 
-		barcode,
-       'ASEGURADO' AS asegurado,
-/*CASE A.tipo_id 
-WHEN 75 THEN IF(M.Id_Article IN (120,2388,20100,16,10,130,104851,1,56,238,104850,104849,2),'RAMAJE',R.Reino)  
-WHEN 68 THEN IF(M.Id_Article IN (11539,10,14),'RAMAJE',R.Reino) 
-WHEN 69 THEN IF(M.Id_Article IN (41),'RAMAJE',R.Reino) 
-WHEN 72 THEN IF(M.Id_Article IN (238),'RAMAJE',R.Reino) 
-WHEN 2 THEN 'CYMBIDIUMS & ANTHURIUMS' 
-WHEN 122 THEN 'CYMBIDIUMS & ANTHURIUMS' 
-WHEN 12 THEN 'CYMBIDIUMS & ANTHURIUMS' 
-WHEN 13 THEN 'CYMBIDIUMS & ANTHURIUMS' 
-WHEN 14 THEN 'CYMBIDIUMS & ANTHURIUMS' 
-WHEN 15 THEN 'CYMBIDIUMS & ANTHURIUMS'
-WHEN 71 THEN IF(LEFT(Article,2) = 'HC','Flor',R.Reino) 
-WHEN 19 THEN IF(LEFT(Article,3) IN ('HEL','GIN'),'CYMBIDIUMS & ANTHURIUMS',R.Reino) 
-WHEN 70 THEN IF(Article like '%red beauty%' or Article like '%clarinervium%','CYMBIDIUMS & ANTHURIUMS',R.Reino) 
-WHEN 86 THEN 'Flor'
-ELSE R.Reino
-END as*/ Reino,
- /*
-CASE A.tipo_id 
-WHEN 75 THEN IF(M.Id_Article IN (120,2388,20100,16,10,130,104851,1,56,238,104850,104849,2),-1,R.orden)
-WHEN 68 THEN IF(M.Id_Article IN (11539,10,14),-1,R.orden) 
-WHEN 69 THEN IF(M.Id_Article IN (41),-1,R.orden) 
-WHEN 72 THEN IF(M.Id_Article IN (238),-1,R.orden) 
-WHEN 2 THEN 0 
-WHEN 122 THEN 0 
-WHEN 12 THEN 0 
-WHEN 13 THEN 0 
-WHEN 14 THEN 0 
-WHEN 15 THEN 0
-WHEN 71 THEN IF(LEFT(Article,2) = 'HC',1,R.orden) 
-WHEN 19 THEN IF(LEFT(Article,3) IN ('HEL','GIN'),0,R.orden) 
-WHEN 70 THEN IF(Article like '%red beauty%' or Article like '%clarinervium%',0,R.orden) 
-WHEN 86 THEN 1
-ELSE R.orden
-END as*/R.orden,
-		CS.Consignatario,
-		T.Id_Cliente,
-		NULL AS Id_Trabajador,
-		T.Id_Ticket,
-		T.Fecha,
-		M.Id_Article,
-		M.Cantidad,
-		M.quantity,
-		M.Cantidad / IF(nz(Gro.`Grouping`) = 0,1,nz(Gro.`Grouping`)) as Paquetes,
-		IF(sis.vHasBeenPrepared, CONCAT('    ----- PREPARADO -----              ',  M.Concepte), M.Concepte) as Concepte,
-		A.Medida,
-		A.Color,
-		A.Categoria,
-		O.Abreviatura as Origen, 
-		T.Localizacion,
-		CT.CodigoTrabajador as Vendedor,
-		T.Bultos,
-		T.Observaciones,
-		Ag.Agencia Tipo,
-		NULL AS CodigoTrabajador,
-		M.OK,
-		M.Reservado,
-		A.Tallos,
-		Gro.`Grouping`,
-		IF(`transaction`,right(concat('000000' ,M.Id_Article),6),M.Id_Movimiento) Id_Movimiento,
-		IF(sis.vHasBeenPrepared,'RES',an.Nicho) as Nicho,
-		'PEDIDO ASEGURADO' AS MSG,
-		T.Id_Ruta,
-		RT.Id_Vehiculo,
-		observation_type_id,
-		group_concat(IF(observation_type_id = 1,text,'') SEPARATOR '') 'sacador',
-		group_concat(IF(observation_type_id = 2,text,'') SEPARATOR '') 'encajador',
-		A.Foto,
-		M.Id_Movimiento movement_id,
-		lpad(IF(sis.vHasBeenPrepared,99999,ifnull(cooler_path_detail_id, an.Nicho)),5,'0') as path, 
-		M.Descuento,M.Preu, mm.valor as Preparado, mm.original_quantity 
-        , p.`name` producer, 
-        T.warehouse_id, 
-        ST.id as idStowaway,
-        STP.shipFk as isStowaway,
-        CS.POBLACION -- JGF 2016-02-16
-FROM 
-
-    Tickets T
-    LEFT JOIN Movimientos M USING(Id_Ticket)
-    LEFT JOIN (SELECT DISTINCT saleFk, TRUE as vHasBeenPrepared
-					FROM vn.saleItemShelving sis
-						JOIN vn.sale s ON s.id = sis.saleFk
-                    WHERE s.ticketFk = idT 
-						AND sis.quantity > 0
-			   ) sis ON sis.saleFk = M.Id_Movimiento                    
-    LEFT JOIN Articles A on A.Id_Article = M.Id_Article 
-	LEFT JOIN Articles_nicho an ON A.Id_Article = an.Id_Article AND an.warehouse_id = T.warehouse_id
-    LEFT JOIN producer p on p.producer_id = A.producer_id -- JGF 2016-02-16
-	LEFT JOIN cooler_path_detail c on left(an.Nicho,3) = pasillo 
-    LEFT JOIN Origen O ON A.id_origen = O.id  
-    LEFT JOIN Clientes C USING(Id_Cliente)
-    LEFT JOIN Trabajadores CT ON C.Id_Trabajador = CT.Id_Trabajador
-    INNER JOIN Consignatarios CS ON T.Id_Consigna = CS.Id_Consigna
-	INNER JOIN Agencias Ag ON Ag.Id_Agencia = T.Id_Agencia
-    LEFT JOIN (
-                SELECT Id_Article, code as barcode
-                FROM barcodes 
-                GROUP BY Id_Article
-              )  BC ON BC.Id_Article = A.Id_Article
-    LEFT JOIN Tipos TP USING(tipo_id) 
-    LEFT JOIN reinos R ON TP.reino_id = R.id  
-    LEFT JOIN Rutas RT USING(Id_Ruta) 
-    LEFT JOIN ticket_observation tobs ON T.Id_Ticket = tobs.Id_ticket 
-                    AND (tobs.observation_type_id = 1 or tobs.observation_type_id = 2)
-
-	LEFT JOIN (
-				SELECT Id_Article, `Grouping`
-				FROM (
-						SELECT landing, Id_Article, CASE caja 
-                                                       WHEN 0 THEN 1 
-                                                       WHEN 2 THEN Packing
-                                                       ELSE `Grouping`
-													END	as `Grouping`
-						FROM Compres C
-						JOIN Entradas E USING(Id_Entrada)
-						JOIN travel TR ON TR.id = travel_id
-						WHERE warehouse_id = (SELECT warehouse_id FROM Tickets WHERE Id_Ticket = idT)
-						AND landing between (SELECT FechaInventario FROM tblContadores LIMIT 1) AND (SELECT date(Fecha) FROM Tickets WHERE Id_Ticket = idT)
-						ORDER BY landing DESC
-					) GR1
-				GROUP BY Id_Article
-
-			  ) Gro ON Gro.Id_Article = M.Id_Article
-	LEFT JOIN Movimientos_mark mm ON mm.Id_Movimiento = M.Id_Movimiento
-    LEFT JOIN vn.stowaway ST ON ST.shipFk = idT
-    LEFT JOIN vn.stowaway STP on STP.id = idT
-
-    WHERE T.Id_Ticket = idT 
-    group by M.Id_Movimiento;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!50003 DROP PROCEDURE IF EXISTS `Facturas_Saltos` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -81690,9 +80361,9 @@ DELIMITER ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
@@ -81821,7 +80492,7 @@ BEGIN
     END IF;  
 
 	-- Mercancia en transito
-	INSERT INTO inv(warehouseFk, Id_Article, cantidad, Almacen)
+	/*INSERT INTO inv(warehouseFk, Id_Article, cantidad, Almacen)
 		SELECT tr.warehouse_id, C.Id_Article, C.Cantidad, CONCAT(wOut.`name`,' - ', wIn.`name`)
 		FROM Compres C
 			JOIN Articles A USING(Id_Article)
@@ -81830,12 +80501,14 @@ BEGIN
 			JOIN Tipos t USING(tipo_id)
 			JOIN warehouse wIn ON wIn.id = tr.warehouse_id
 			JOIN warehouse wOut ON wOut.id = tr.warehouse_id_out
-		WHERE vInventoried >= shipment AND vInventoried < landing
+            JOIN recibida r on r.id = E.recibida_id
+		WHERE vDated >= shipment AND vDated < landing
 			AND NOT redada
 			AND wIn.valuatedInventory
 			AND t.inventory
-		ON DUPLICATE KEY UPDATE inv.cantidad = inv.cantidad + (C.Cantidad);
- 
+            AND r.dateOperation <=vDated
+		ON DUPLICATE KEY UPDATE inv.cantidad = inv.cantidad + (C.Cantidad);*/
+
 	CALL vn.buyUltimate(NULL,vDateDayEnd);
 
 	UPDATE inv i
@@ -81850,28 +80523,30 @@ BEGIN
 	IF vIsDetailed THEN
 
 		SELECT inv.warehouseFk, a.Id_Article, a.Article, a.Medida, inv.Cantidad, tp.Id_Tipo,
-				tp.reino_id, inv.coste, cast(inv.total as decimal(10,2)) total, an.nicho, Almacen
+				tp.reino_id, inv.coste, cast(inv.total as decimal(10,2)) total, Almacen
 			FROM inv 
 				JOIN warehouse w on w.id = warehouseFk
 				JOIN Articles a ON a.Id_Article = inv.Id_Article
 				JOIN Tipos tp ON tp.tipo_id = a.tipo_id
-				JOIN Articles_nicho an ON an.Id_Article = a.Id_Article AND an.warehouse_id = w.id
 			WHERE w.valuatedInventory
 			and inv.total > 0
 			order by inv.total desc;
 
 	ELSE
 
-		SELECT i.Almacen, r.reino as Reino, cast(i.total as decimal) as Euros, tr.Codigotrabajador as Comprador,
-				A.Id_Article
+		SELECT i.Almacen, r.reino as Reino, cast(i.total as decimal(10,2)) as Euros, tr.Codigotrabajador as Comprador,A.Id_Article
 			FROM inv i
+				JOIN warehouse w on w.id = warehouseFk
 				JOIN Articles A USING(Id_Article)
 				JOIN Tipos t USING(tipo_id)
 				LEFT JOIN Trabajadores tr ON tr.Id_trabajador = t.Id_trabajador
-				JOIN reinos r ON r.id = t.reino_id;
+				JOIN reinos r ON r.id = t.reino_id
+			WHERE w.valuatedInventory
+				AND i.total > 0;
 
 	END IF;
 	DROP TEMPORARY TABLE tmp.buyUltimate;
+    DROP TEMPORARY TABLE inv;
 end ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -88227,60 +86902,6 @@ JOIN
 ) t ON t.Id_Ruta = rm.Id_Ruta
 SET rm.bultos = t.bultos;
 
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `salePreparingList__` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `salePreparingList__`(IN idT BIGINT)
-BEGIN
-
-	SELECT  t.clientFk, 
-			t.shipped, 
-            a.nickname, 
-			s.ticketFk,
-			s.itemFk, 
-			s.quantity, 
-			s.concept, 
-			s.reserved,
-			s.id saleFk,
-            i.size,
-			i.inkFk,
-			i.stems,
-			i.image,
-			i.subName,
-			b.`grouping`,
-			ip.code as placement, 
-			lpad(ifnull(cooler_path_detail_id, ip.code),5,'0') as path, 
-			stPrevious.isChecked as isPrevious,
-            stPrepared.isChecked as isPrepared,
-            stControled.isChecked as isControled
-     
-	FROM vn.ticket t
-		JOIN vn.address a ON a.id = t.addressFk
-		JOIN vn.sale s ON s.ticketFk = t.id
-        JOIN vn.item i ON i.id = s.itemFk
-        LEFT JOIN vn.itemPlacement ip ON i.id = ip.itemFk AND i.warehouseFk = t.warehouseFk
-        LEFT JOIN vn2008.cooler_path_detail cpd on left(ip.code,3) = cpd.pasillo 
-        LEFT JOIN bi.Last_buy_id lb ON lb.Id_Article = i.id AND lb.warehouse_id = t.warehouseFk
-        LEFT JOIN vn.buy b ON b.id = lb.Id_Compra
-		LEFT JOIN vn.saleTracking stPrepared ON stPrepared.saleFk = s.id AND stPrepared.stateFk = 8
-        LEFT JOIN vn.saleTracking stControled ON stControled.saleFk = s.id AND stControled.stateFk = 14
-        LEFT JOIN vn.saleTracking stPrevious ON stPrevious.saleFk = s.id AND stPrevious.stateFk = 26
-        
-    WHERE t.id = idT 
-    GROUP BY s.id;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -90068,6 +88689,249 @@ BEGIN
 		DROP TEMPORARY TABLE ticketToShow;
     END IF;
     
+	IF (SELECT COUNT(*) FROM ticketRange) THEN 
+
+		-- Generamos varias auxiliares (ya podian los de mysql haber solucionado esto)
+
+		DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
+		CREATE TEMPORARY TABLE tmp.client_list
+			(INDEX (Id_Cliente))
+			ENGINE = MEMORY
+				SELECT DISTINCT Id_Cliente FROM ticketRange;
+
+		DROP TEMPORARY TABLE IF EXISTS cr5;
+		CREATE TEMPORARY TABLE cr5
+			(INDEX (Id_Cliente))
+			ENGINE = MEMORY
+				SELECT Id_Cliente FROM tmp.client_list;
+			
+		DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
+		CREATE TEMPORARY TABLE tmp.ticket
+			ENGINE = MEMORY
+			SELECT t.Id_Ticket ticketFk
+				FROM Tickets t
+					STRAIGHT_JOIN tmp.client_list c ON t.Id_Cliente = c.Id_Cliente
+				WHERE Fecha BETWEEN dateStart AND  maxDate 
+				AND Factura IS NULL;
+
+		CALL vn.ticketGetTotal;
+
+		-- Generamos otra tabla temporal con los Tickets_iva
+				
+		DROP TEMPORARY TABLE IF EXISTS tt3;
+		CREATE TEMPORARY TABLE tt3
+			ENGINE = MEMORY
+			SELECT t.ticketFk, tt.total, tr.* 
+				FROM tmp.ticket t
+					LEFT JOIN tmp.ticketTotal tt ON t.ticketFk = tt.ticketFk
+					JOIN ticketRange tr ON tr.Id_Ticket = t.ticketFk;
+
+		-- Generamos la lista de tickets y sus datos 
+				
+		DROP TEMPORARY TABLE IF EXISTS Radartest;
+		CREATE TEMPORARY TABLE Radartest
+			SELECT IF(C.Id_Trabajador = worker, 1, 0) as Propio,
+				Credito,
+				CAST(Riesgo AS DECIMAL (10,2)) Riesgo,
+				-- Greuge,
+				T.Id_Ticket,
+				T.warehouse_id as wh,
+				DATE(T.Fecha) Fecha,
+                IF (TIME_FORMAT(T.Fecha, '%H:%i')='00:00', '23:59', TIME_FORMAT(T.Fecha, '%H:%i'))Hora,
+				T.Alias,
+				-- T.Vista,
+				REPEAT(' ',50) as problem,
+				T.Agencia Tipo,
+				-- C.Id_Trabajador,
+				T.workerId AS Id_Trabajador,
+				T.Solucion,
+				T.Localizacion,
+				IFNULL(state,'LIBRE') as Estado, 
+				alertLevel,
+				alertCode,
+				CAST(T.Importe AS DECIMAL (10,2)) Importe,
+				C.Descuento,
+				C.calidad,
+				C.Id_Cliente,
+				p.`name` provincia,
+                HOUR(z.hour) zoneHour,
+                MINUTE(z.hour) zoneMinute
+			FROM Clientes C
+				JOIN (
+					SELECT T.* ,  A.Vista, A.Agencia, s.`name` as state, alertLevel,
+							s.`code` AS alertCode, tt3.Id_Trabajador AS workerId,
+							tt3.total as Importe,
+							0 AS inacabable
+							-- (-1 < ifnull(order_id,-1)) as isbionic
+						FROM Tickets T
+							LEFT JOIN vn.ticketState ts on ts.ticket = T.Id_Ticket
+							LEFT JOIN vn2008.state s on s.id = ts.state
+							JOIN tt3 ON tt3.ticketFk = T.Id_Ticket
+							JOIN Agencias A ON A.Id_Agencia = T.Id_Agencia
+						-- WHERE T.Etiquetasemitidas = FALSE
+						GROUP BY T.Id_Ticket
+				) AS T ON T.Id_Cliente = C.Id_Cliente
+				LEFT JOIN Consignatarios co ON co.Id_Consigna = T.Id_Consigna
+				LEFT JOIN province p ON p.province_id = co.province_id
+                LEFT JOIN vn.zone z ON z.id = T.zoneFk
+				LEFT JOIN (
+					SELECT TOTAL.Id_Cliente, ROUND(SUM(amount),2) as Riesgo
+						FROM (
+							SELECT cl.Id_Cliente, amount
+								FROM bi.customer_risk cr
+									JOIN tmp.client_list cl ON cr.customer_id = cl.Id_Cliente
+							UNION ALL
+							SELECT t.Id_Cliente, tt.total
+								FROM tmp.ticketTotal tt
+									JOIN Tickets t ON t.Id_Ticket = tt.ticketFk
+									JOIN cr5 C ON C.Id_Cliente = t.Id_Cliente
+								WHERE t.Fecha BETWEEN dateStart AND  maxDate  
+									AND t.Factura is null
+						) as TOTAL GROUP BY TOTAL.Id_Cliente
+				) AS Peligros ON Peligros.Id_Cliente = C.Id_Cliente;
+
+		-- Actualizamos el Riesgo con los tickets futuros
+
+		SET @cliente:= 0;
+		SET @riesgo := 0;
+				
+		UPDATE Radartest
+			SET Riesgo = IF(@cliente <> @cliente:= Id_Cliente,
+				-Importe + @riesgo:= - Riesgo + Importe,
+				-Importe + @riesgo:= @riesgo + Importe
+			)
+			ORDER BY Id_Cliente, Fecha DESC;
+			
+		DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
+		
+		CREATE TEMPORARY TABLE tmp.ticket_list
+		SELECT Id_Ticket, Id_Cliente FROM Radartest;
+		
+		CALL prepare_client_list;
+		CALL production_buffer_problems;
+
+		UPDATE Radartest r
+			JOIN (    
+				SELECT Id_Ticket, GROUP_CONCAT(problem) problem
+				FROM tmp.buffer_problems
+				GROUP BY Id_Ticket
+			) p on p.Id_Ticket = r.Id_Ticket
+			SET r.problem = p.problem;
+
+		SELECT R.*, Riesgo + Credito as Risk , CodigoTrabajador 
+			FROM Radartest R
+				JOIN vn2008.Trabajadores trab on R.Id_Trabajador=trab.Id_Trabajador;
+		
+		DROP TEMPORARY TABLE tmp.client_list;
+		DROP TEMPORARY TABLE cr5;
+		DROP TEMPORARY TABLE tmp.ticket; 
+	END IF;
+
+	DROP TEMPORARY TABLE ticketRange;
+	DROP TEMPORARY TABLE subordinate;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `ticketRadar__` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `ticketRadar__`(IN `today` DATETIME, IN `worker` INT, IN `scopeDays` SMALLINT, vCategoryFk INT)
+    NO SQL
+BEGIN
+	DECLARE yesterday DATETIME;
+	DECLARE maxDate DATETIME;
+	DECLARE dateStart DATE;
+
+	SET dateStart = TIMESTAMPADD(MONTH, -2, CURDATE());
+	SELECT TIMESTAMPADD(DAY, -1, today) INTO yesterday;
+
+	-- Lo quitamos despues de campaña
+	SELECT TIMESTAMP(TIMESTAMPADD(DAY, scopeDays, yesterday),'23:59:59') INTO maxDate;
+	-- SELECT TIMESTAMP(TIMESTAMPADD(DAY, 14, yesterday),'23:59:59') INTO maxDate;
+	-- Creamos una tabla con los Comerciales de los que se mostraran los tickets
+
+	CALL subordinate(worker, TRUE);
+
+	-- Se genera una tabla con los tickets representados
+
+	DROP TEMPORARY TABLE IF EXISTS ticketRange;
+	CREATE TEMPORARY TABLE ticketRange
+		(INDEX (Id_Ticket))
+		ENGINE = MEMORY
+		SELECT T.Id_Ticket, T.Id_Cliente, C.Id_Trabajador
+			FROM Tickets T
+				LEFT JOIN vn.ticketState tls on tls.ticket = T.Id_Ticket
+				JOIN Clientes C on C.Id_Cliente = T.Id_Cliente 
+				JOIN subordinate s1 ON C.Id_Trabajador = s1.Id_Trabajador
+			WHERE Fecha >=  yesterday
+				AND Fecha <=  maxDate AND T.Factura Is NULL
+				AND IFNULL(tls.alertLevel,0) < 3;
+
+	INSERT INTO ticketRange
+		SELECT Id_Ticket, s.Id_Cliente, s.Id_Trabajador
+			FROM sharingclient s
+				JOIN Tickets T USING(Id_Cliente)
+				LEFT JOIN vn.ticketState tls on tls.ticket = T.Id_Ticket
+				JOIN subordinate s2 ON s.Id_Trabajador = s2.Id_Trabajador
+			WHERE maxDate >= datSTART 
+				AND datEND >= yesterday
+				AND date(Fecha) >= IF(yesterday > datSTART, yesterday, datSTART)
+				AND date(Fecha) <= IF(datEND > maxDate, maxDate, datEND)
+				AND IFNULL(tls.alertLevel,0) < 3;
+
+	INSERT INTO ticketRange
+		SELECT Id_Ticket, C.Id_Cliente, s.Id_Suplente
+			FROM Clientes C       
+				JOIN Tickets T USING(Id_Cliente)
+				LEFT JOIN vn.ticketState tls on tls.ticket = T.Id_Ticket
+				JOIN sharingcart s ON s.Id_Trabajador = C.Id_Trabajador
+				JOIN subordinate su on su.Id_Trabajador = Id_Suplente
+			WHERE maxDate >= datSTART 
+				AND datEND >= yesterday
+				AND date(Fecha) >= IF(yesterday > datSTART, yesterday, datSTART)
+				AND date(Fecha) <= IF(datEND > maxDate, maxDate, datEND)
+				AND IFNULL(tls.alertLevel,0) < 3;
+
+	INSERT INTO ticketRange
+		SELECT Id_Ticket, C.Id_Cliente, C.Id_Trabajador
+			FROM Clientes C       
+				JOIN Tickets T USING(Id_Cliente)
+				LEFT JOIN vn.ticketState tls on tls.ticket = T.Id_Ticket
+				JOIN workerTeamCollegues w ON w.collegueId = C.Id_Trabajador
+			WHERE Fecha >=  yesterday
+				AND Fecha <=  maxDate AND T.Factura Is NULL 
+				AND IFNULL(tls.alertLevel,0) < 3
+				AND w.workerId = worker;
+                
+	IF vCategoryFk THEN
+		DROP TEMPORARY TABLE IF EXISTS ticketToShow;
+		CREATE TEMPORARY TABLE ticketToShow
+		(INDEX (ticketFk))
+		ENGINE = MEMORY
+		SELECT DISTINCT s.ticketFk 
+			FROM ticketRange tr
+				JOIN vn.sale s ON s.ticketFk = tr.Id_Ticket
+                JOIN vn.item i ON i.id = s.itemFk
+                JOIN vn.itemType it ON it.id = i.typeFk
+			WHERE it.categoryFk = vCategoryFk;
+
+        DELETE tr.* FROM ticketRange tr
+			LEFT JOIN ticketToShow ttr ON tr.Id_Ticket = ttr.ticketFk
+			WHERE ttr.ticketFk IS NULL;
+            
+		DROP TEMPORARY TABLE ticketToShow;
+    END IF;
+    
 	IF (SELECT COUNT(*) FROM ticketRange) THEN 
 
 		-- Generamos varias auxiliares (ya podian los de mysql haber solucionado esto)
@@ -91092,214 +89956,6 @@ BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tmp.buyUltimateFromInterval;
 	DROP TEMPORARY TABLE tblTARIFAS;
     
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `trasladoKk` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `trasladoKk`(IN i_entrada INTEGER)
-BEGIN
-	DECLARE dateShipment DATE;
-	DECLARE dateLanding DATE;
-	DECLARE warehouseShipment INTEGER;
-	DECLARE warehouseLanding INTEGER;
-    DECLARE v_calc_available INTEGER;
-	DECLARE v_calc_visible INTEGER;
-
-	SELECT shipment, landing, warehouse_id_out, warehouse_id
-	INTO  dateShipment, dateLanding, warehouseShipment, warehouseLanding
-	FROM travel t JOIN Entradas e ON t.id = e.travel_id
-	WHERE Id_Entrada = i_entrada;
-
-	CALL buy_tarifas_table(i_entrada);
-
-	-- Traslado en almacen origen
-
-	DROP TEMPORARY TABLE IF EXISTS buy_edi_temp;
-
-	CREATE TEMPORARY TABLE buy_edi_temp
-		(KEY (Id_Article)) ENGINE = MEMORY
-	
-		SELECT * 
-			FROM (SELECT c.Id_Article, c.Id_Compra
-					FROM Compres c INNER JOIN Entradas e USING(Id_Entrada)
-					INNER JOIN travel t ON t.id = e.travel_id
-						WHERE t.landing BETWEEN date_inv() AND dateShipment
-							AND c.Novincular = FALSE
-							AND c.Tarifa2 >= 0
-						ORDER BY (warehouseShipment = t.warehouse_id) DESC, t.landing DESC) t
-		GROUP BY Id_Article;
-
-	IF dateShipment >= CURDATE() THEN
-
-        CALL availableTraslate(warehouseShipment, dateShipment,NULL);
-		CALL `cache`.visible_refresh(v_calc_visible,TRUE,warehouseShipment);
-		DROP TEMPORARY TABLE IF EXISTS tmp_item;
-		CREATE TEMPORARY TABLE tmp_item (UNIQUE INDEX i USING HASH (item_id)) ENGINE = MEMORY
-			SELECT item_id, visible,0 available FROM `cache`.visible WHERE calc_id = v_calc_visible;
-		INSERT INTO tmp_item(item_id, available)
-			SELECT a.item_id, a.available FROM availableTraslate a
-			ON DUPLICATE KEY UPDATE available = a.available;
-	ELSE
-		CALL item_stock(warehouseShipment, dateShipment,NULL);
-	END IF;
-
-	DROP TEMPORARY TABLE IF EXISTS Traslados;
-	CREATE TEMPORARY TABLE Traslados ENGINE MEMORY
-		SELECT tp.Id_Tipo AS Tipo,
-        
-				tp.reino_id,
-                
-				ar.tipo_id,
-                
-				ar.Id_Article AS article_id,
-
-				ar.Article,
-
-				ar.Medida,
-
-				ar.Categoria,
-
-				ar.Color,
-
-				Origen.abreviatura as Origen,
-
-				CE.Cantidad,
-
-				ar.Tallos,
-
-				CAST(AIM.visible AS DECIMAL(10,0)) as vis1,
-
-				CAST(AIM.available AS DECIMAL(10,0)) as dis1,
-
-				0 as vis2,
-
-				0 as dis2,
-				
-				IFNULL(CE.`grouping`,C.`grouping`) as `grouping`,
-                
-				IFNULL(CE.Packing,C.Packing) as Packing,
-				
-				IFNULL(CE.caja,C.caja) as caja,
-
-				IFNULL(C.Productor, P2.Alias) AS Productor,
-
-				C.Id_Cubo,
-
-				1 Tinta,
-
-				CE.Id_Compra,
-
-				CE.Etiquetas,
-
-				C.buy_edi_id,
-                
-                tp.Id_Trabajador,
-                
-                CB.Volumen,
-                
-                CB.x, CB.y, CB.z,
-                
-                IFNULL(C.Costefijo,0) Costefijo,
-                
-                IFNULL(C.Comisionfija,0) Comisionfija,
-                
-                IFNULL(C.Portefijo,0) Portefijo,
-                
-                A.m3,
-                
-                E.comision,
-                
-                CB.Retornable,
-                
-                IFNULL(CEB.Valor,CB.Valor) Valor,
-                
-                t3, t2, tp.promo,
-                
-                C.`grouping` groupingOrigin,
-                
-                C.Packing PackingOrigin,
-                
-                C.Id_Compra CompraOrigin,
-                
-                CB.costeRetorno
-                
-			FROM Articles ar
-				LEFT JOIN tmp_item AIM  ON AIM.item_id = ar.Id_Article
-				LEFT JOIN Tipos tp ON tp.tipo_id = ar.tipo_id
-				LEFT JOIN Origen ON Origen.id = ar.id_origen
-				LEFT JOIN buy_edi_temp lb ON lb.Id_Article = ar.Id_Article              
-				LEFT JOIN Compres C ON C.Id_Compra = lb.Id_Compra
-				LEFT JOIN Cubos CB ON CB.Id_Cubo = C.Id_Cubo
-				LEFT JOIN Entradas E2 ON E2.Id_Entrada = C.Id_Entrada
-				LEFT JOIN Proveedores P2 ON P2.Id_Proveedor = E2.Id_Proveedor
-				LEFT JOIN Entradas E ON E.Id_Entrada = i_entrada
-				LEFT JOIN travel TR ON TR.id = E.travel_id
-				LEFT JOIN Agencias A ON A.Id_Agencia = TR.agency_id
-				LEFT JOIN Compres CE ON CE.Id_Article = ar.Id_Article AND CE.Id_Entrada = i_entrada
-				LEFT JOIN Cubos CEB ON CEB.Id_Cubo = CE.Id_Cubo
-				LEFT JOIN tblTARIFAS ON TRUE
-		WHERE tp.reino_id <> 6 AND tp.reino_id <> 8
-		AND E.Redada = FALSE;
-	
-    CREATE INDEX tindex USING HASH ON Traslados (article_id);
-
--- Inventario en el warehouse destino
-	IF dateShipment >= CURDATE() THEN
-
-		CALL cache.visible_refresh(v_calc_visible, TRUE, warehouseLanding);
-		CALL availableTraslate(warehouseLanding, dateLanding,warehouseShipment);
-
-		UPDATE Traslados t
-			LEFT JOIN availableTraslate a ON t.article_id = a.item_id
-			LEFT JOIN `cache`.visible v ON v.calc_id = v_calc_visible AND t.article_id = v.item_id
-		SET vis2 = v.visible, dis2 = a.available;
-        
-	END IF;
--- ---------------------------------------------
-
-    SELECT t.*,
-			
-            Cantidad - MOD(Cantidad , `grouping`) as Subcantidad,
-
-			MOD(Cantidad , `grouping`) as Soll,
-            
-			ROUND((IF(Volumen > 0,Volumen,x * y * IF(z = 0, Medida + 10, z))) / Packing,0) as cm3,
-
-			Costefijo + Comisionfija + Portefijo AS Cost,
-
-			@porte := ROUND((IF(Volumen > 0,Volumen,x * y * IF(z = 0, Medida + 10, z))) * m3 / 1000000 / Packing ,3) AS Porte,
-
-			@comision := ROUND((Costefijo + Comisionfija + Portefijo) * comision / 100 ,3) AS Comision,
-
-			ROUND(@embalaje := (costeRetorno + IF(Retornable != 0, 0, Valor)) / packing ,3) AS Embalaje,
-
-			@coste := IFNULL((Costefijo + Comisionfija + Portefijo),0) + IFNULL(@embalaje,0) + IFNULL(@porte,0) + IFNULL(@comision,0)  AS Coste,
-
-			@t3 := ROUND(@coste / ( (100 - t3 - t.promo)/100),2) AS Tarifa3,
-			
-			ROUND(@t3 * (1 + ((t2 - t3)/100)),2) AS Tarifa2,
-            
-            0 selected
-			
-		FROM Traslados t 
-			WHERE vis1 <> 0 OR dis1 <> 0 OR vis2 <> 0 OR dis2 <> 0
-            ORDER BY tipo_id, Article, Medida, Categoria, Origen;
-
-	DROP TEMPORARY TABLE IF EXISTS Traslados;
-    DROP TEMPORARY TABLE IF EXISTS tmp_item;
-
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -91589,98 +90245,6 @@ BEGIN
 	
     END IF;
 
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `traslado_label__` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `traslado_label__`(IN intArticle INTEGER,IN i_entrada_FV INTEGER, IN i_entrada_PCA INTEGER)
-BEGIN
-
-DECLARE intEntrada INTEGER;
-DECLARE i_FV INTEGER;
-
-SELECT FV INTO  i_FV 
-FROM Articles a
-JOIN Tipos tp ON tp.tipo_id = a.tipo_id
-WHERE a.Id_Article = intArticle;
-
-SET intEntrada  = IF(i_FV, i_entrada_FV,i_entrada_PCA);
-
-SET intEntrada = IF(intEntrada = 0, i_entrada_PCA + i_entrada_FV, intEntrada);
-
-
-	IF intEntrada > 0 THEN
-
-		CALL buy_tarifas_table(intEntrada);
-
-		INSERT INTO Compres (Id_Article, Etiquetas, Cantidad, Id_Entrada, Id_Cubo, Packing,`grouping`,caja,
-			Costefijo, Portefijo, Embalajefijo, Comisionfija, novincular,buy_edi_id)
-		SELECT 
-			land.Id_Article,
-			land.Etiquetas - IFNULL(ship.Etiquetas,0) - (IFNULL(Ventas,0) / land.Packing),
-			land.Cantidad - IFNULL(ship.Cantidad,0) - IFNULL(Ventas,0),
-			intEntrada,
-			land.Id_Cubo,
-			land.Packing,
-			land.`grouping`,
-			land.caja,
-			@cost := ROUND(IFNULL(land.Costefijo, 0) + IFNULL(land.Comisionfija, 0) + IFNULL(land.Portefijo, 0),
-					3) Costefij,
-			@porte := ROUND((@cm3:= cm3_2(land.Id_Cubo, land.Id_Article)) * a.m3 / 1000000 / land.Packing,
-					3) Porte,
-			land.EmbalajeFijo AS Embalaje,
-			@comision := ROUND(land.Costefijo * e2.comision / 100, 3) Comision,
-			land.novincular,land.buy_edi_id
-	FROM (
-		select c_land.Id_Cubo,c_land.Packing,c_land.`grouping`,c_land.Costefijo,c_land.Comisionfija,c_land.Portefijo,c_land.caja,SUM(c_land.Etiquetas) Etiquetas,c_land.EmbalajeFijo,
-				c_land.novincular,c_land.buy_edi_id,c_land.Id_Article,SUM(c_land.Cantidad) Cantidad
-			from 
-			-- Entradas que llegan a vnh
-			Compres c_land 
-				JOIN
-			Entradas e_land ON c_land.Id_Entrada = e_land.Id_Entrada AND c_land.Id_Article = intArticle
-				JOIN
-			travel t_land ON t_land.id = e_land.travel_id
-				JOIN
-			Cubos cu ON cu.Id_Cubo = c_land.Id_Cubo 
-				WHERE
-			-- Entradas que llegan a vnh
-			(t_land.warehouse_id = 7 AND t_land.landing = CURDATE())
-		) land 
-	LEFT JOIN -- Entradas que salen de vnh
-			(SELECT SUM(c_ship.Etiquetas) Etiquetas,c_ship.Packing,SUM(c_ship.Cantidad) Cantidad
-            FROM Compres c_ship
-			LEFT JOIN Entradas e_ship ON c_ship.Id_Entrada = e_ship.Id_Entrada AND c_ship.Id_Article = intArticle
-			LEFT JOIN travel t_ship ON t_ship.id = e_ship.travel_id
-            WHERE t_ship.warehouse_id_out = 7 AND t_ship.shipment = CURDATE() 
-				-- Entrada destino
-            ) ship ON TRUE
-	JOIN Entradas e2 ON e2.Id_Entrada = intEntrada
-	JOIN travel t ON t.id = e2.travel_id
-	JOIN Agencias a ON t.agency_id = a.Id_Agencia
-            -- Ventas ese dia en VNH
-	LEFT JOIN
-            (SELECT sum(Cantidad) as Ventas
-             FROM Movimientos m
-			 JOIN Tickets t on t.Id_Ticket = m.Id_Ticket
-             WHERE t.Fecha = CURDATE() AND m.Id_Article = intArticle AND t.warehouse_id = 7) v on true
-		GROUP BY land.Id_Article;
-	CALL buy_tarifas(LAST_INSERT_ID());
-
-	END IF;
-
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -91758,301 +90322,6 @@ BEGIN
     DROP TEMPORARY TABLE t_item_last_buy;
 	DROP TEMPORARY TABLE tblTARIFAS;
   
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `traslado_ticket__` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `traslado_ticket__`(IN i_entrada INTEGER, IN i_ticket INTEGER)
-BEGIN
-
-	DECLARE intWarehouse INT;
-	DECLARE datTicket DATE;
-
-	SELECT warehouse_id, Fecha INTO intWarehouse,datTicket FROM Tickets WHERE Id_Ticket = i_ticket;
-
-	CALL buy_tarifas_table(i_entrada); 
-  
-	CALL item_last_buy_(intWarehouse,datTicket);
-
-
-	INSERT INTO Compres( Id_Article,
-                       Cantidad,
-                       Novincular,
-                       Id_Entrada,
-                       Id_Cubo,
-                       Packing,
-                       `grouping`,
-                       caja,
-                       Portefijo,
-                       Comisionfija,
-                       Embalajefijo,
-                       Costefijo,
-                       Productor,
-                       Tarifa2,
-                       Tarifa3
-                       )
-
-	SELECT   M.Id_Article,
-			 IF(T.Id_Cliente IN (1625, 1118, 400), -1, 1) * M.Cantidad,
-			 
-			 IF(T.Id_Cliente IN (1625, 1118, 400), TRUE, FALSE),
-			 i_entrada,
-			 IFNULL(C.Id_Cubo,'--'),
-			 C.Packing,
-			 C.`grouping`,  
-			 C.caja,
-			@pf := ROUND(@cm3:=cm3_2(IFNULL(C.Id_Cubo,'--'), b.item_id) * AG.m3 / 1000000 /   C.Packing ,3) AS Porte,
-			@cf := IFNULL(ROUND(C.Costefijo * E.comision / 100 ,3),0) AS Comision,
-			@ef := ROUND(IF(CB.Retornable = FALSE,CB.Valor/ C.Packing,0) ,3) AS Embalaje,
-			@cost := ROUND(IFNULL(C.Costefijo,0) + @cf + @ef + @pf,3),
-			C.Productor,
-			@t3 :=  ROUND(@cost / ((100 - TC.t3)/100),2) Tarifa3,
-			@t2 :=  IF(@cost / ((100 - TC.t2)/100) <= @t3,@t3+0.01,@cost / ((100 - TC.t2)/100)) Tarifa2
-
-	  FROM Movimientos M
-		LEFT JOIN Tickets T USING(Id_Ticket)
-        LEFT JOIN t_item_last_buy b ON M.Id_Article = b.item_id AND T.warehouse_id = b.warehouse_id
-		LEFT JOIN Compres C ON C.Id_Compra = b.buy_id
-		LEFT JOIN Cubos CB ON CB.Id_Cubo = C.Id_Cubo
-		LEFT JOIN Entradas E ON E.Id_Entrada = i_entrada
-		LEFT JOIN travel TR ON TR.id = E.travel_id
-		LEFT JOIN Agencias AG ON AG.Id_Agencia = TR.agency_id
-		LEFT JOIN Proveedores P ON P.Id_Proveedor = E.Id_Proveedor
-		JOIN tblTARIFAS TC
-		LEFT JOIN tblContadores ON TRUE
-		JOIN (SELECT m3 as ZEL_PORT FROM Agencias WHERE Id_Agencia = 618) Z
-    WHERE M.Id_Ticket = i_ticket;
-    
-
-    DROP TEMPORARY TABLE t_item_last_buy;
-
-  
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode              = @saved_sql_mode */ ;
-/*!50003 SET character_set_client  = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `traslado__` */;
-/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `traslado__`(IN i_entrada INTEGER)
-BEGIN
--- Lo esta probando JFP 2018-12-13
-	DECLARE dateShipment DATE;
-	DECLARE dateLanding DATE;
-	DECLARE warehouseShipment INTEGER;
-	DECLARE warehouseLanding INTEGER;
-	DECLARE v_calc_visible INTEGER;
-    DECLARE vInventoryDate DATE;
-
-	SET vInventoryDate := date_inv();
-	SELECT shipment, landing, warehouse_id_out, warehouse_id
-	INTO  dateShipment, dateLanding, warehouseShipment, warehouseLanding
-	FROM travel t JOIN Entradas e ON t.id = e.travel_id
-	WHERE Id_Entrada = i_entrada;
-
-	CALL buy_tarifas_table(i_entrada);
-
-	-- Traslado en almacen origen
-
-	DROP TEMPORARY TABLE IF EXISTS buy_edi_temp;
-	CREATE TEMPORARY TABLE buy_edi_temp
-			(KEY (Id_Article), INDEX(Id_Compra)) ENGINE = MEMORY
-		SELECT * 
-			FROM (SELECT c.Id_Article, c.Id_Compra
-					FROM Compres c INNER JOIN Entradas e USING(Id_Entrada)
-					INNER JOIN travel t ON t.id = e.travel_id
-						WHERE t.landing BETWEEN vInventoryDate AND dateShipment
-							AND c.Novincular = FALSE
-							AND c.Tarifa2 >= 0
-						ORDER BY (warehouseShipment = t.warehouse_id) DESC, t.landing DESC) t
-		GROUP BY Id_Article;
-
-	CALL vn.buyUltimateFromInterval(warehouseLanding,vInventoryDate,dateLanding);
-        
-	IF dateShipment >= CURDATE() THEN
-
-        CALL availableTraslate(warehouseShipment, dateShipment,NULL);
-		CALL `cache`.visible_refresh(v_calc_visible,TRUE,warehouseShipment);
-        
-		DROP TEMPORARY TABLE IF EXISTS tmp_item;
-		CREATE TEMPORARY TABLE tmp_item (UNIQUE INDEX i USING HASH (item_id)) ENGINE = MEMORY
-			SELECT item_id, visible,0 available FROM `cache`.visible WHERE calc_id = v_calc_visible;
-		INSERT INTO tmp_item(item_id, available)
-			SELECT a.item_id, a.available FROM availableTraslate a
-			ON DUPLICATE KEY UPDATE available = a.available;
-	ELSE
-		CALL item_stock(warehouseShipment, dateShipment,NULL);
-	END IF;
-
-	DROP TEMPORARY TABLE IF EXISTS Traslados;
-	CREATE TEMPORARY TABLE Traslados ENGINE MEMORY
-		SELECT tp.Id_Tipo AS Tipo,
-        
-				tp.reino_id,
-                
-				ar.tipo_id,
-                
-				ar.Id_Article AS article_id,
-
-				ar.Article,
-
-				ar.Medida,
-
-				ar.Categoria,
-
-				ar.Color,
-
-				Origen.abreviatura as Origen,
-
-				CE.Cantidad,
-
-				ar.Tallos,
-
-				CAST(AIM.visible AS DECIMAL(10,0)) as vis1,
-
-				CAST(AIM.available AS DECIMAL(10,0)) as dis1,
-
-				0 as vis2,
-
-				0 as dis2,
-				
-				COALESCE(/*cl.`grouping`, */CE.`grouping`, C.`grouping`) as `grouping`,
-                
-				COALESCE(/*cl.Packing, */CE.Packing, C.Packing) as Packing,
-				
-				COALESCE(cl.caja, CE.caja, C.caja) as caja,
-
-				IFNULL(C.Productor, P2.Alias) AS Productor,
-
-				C.Id_Cubo,
-
-				1 Tinta,
-
-				CE.Id_Compra,
-
-				CE.Etiquetas,
-
-				C.buy_edi_id,
-                
-                tp.Id_Trabajador,
-                
-                CB.Volumen,
-                
-                CB.x, CB.y, CB.z,
-                
-                IFNULL(C.Costefijo,0) Costefijo,
-                
-                IFNULL(C.Comisionfija,0) Comisionfija,
-                
-                IFNULL(C.Portefijo,0) Portefijo,
-                
-                A.m3,
-                
-                E.comision,
-                
-                CB.Retornable,
-                
-                IFNULL(CEB.Valor,CB.Valor) Valor,
-                
-                t3, t2, tp.promo,
-                
-                C.`grouping` groupingOrigin,
-                
-                C.Packing PackingOrigin,
-                
-                C.Id_Compra CompraOrigin,
-                
-                CB.costeRetorno
-                
-			FROM Articles ar
-				LEFT JOIN tmp_item AIM  ON AIM.item_id = ar.Id_Article
-				LEFT JOIN Tipos tp ON tp.tipo_id = ar.tipo_id
-				LEFT JOIN Origen ON Origen.id = ar.id_origen
-				LEFT JOIN buy_edi_temp lb ON lb.Id_Article = ar.Id_Article              
-				LEFT JOIN Compres C ON C.Id_Compra = lb.Id_Compra
-				LEFT JOIN Cubos CB ON CB.Id_Cubo = C.Id_Cubo
-				LEFT JOIN Entradas E2 ON E2.Id_Entrada = C.Id_Entrada
-				LEFT JOIN Proveedores P2 ON P2.Id_Proveedor = E2.Id_Proveedor
-				LEFT JOIN Entradas E ON E.Id_Entrada = i_entrada
-				LEFT JOIN travel TR ON TR.id = E.travel_id
-				LEFT JOIN Agencias A ON A.Id_Agencia = TR.agency_id
-				LEFT JOIN Compres CE ON CE.Id_Article = ar.Id_Article AND CE.Id_Entrada = i_entrada
-				LEFT JOIN Cubos CEB ON CEB.Id_Cubo = CE.Id_Cubo
-				LEFT JOIN tblTARIFAS ON TRUE
-                LEFT JOIN tmp.buyUltimateFromInterval bufi ON bufi.itemFk = ar.Id_Article
-                LEFT JOIN Compres cl ON cl.Id_Compra = bufi.buyFk
-		WHERE tp.reino_id <> 6 AND tp.reino_id <> 8
-		AND E.Redada = FALSE;
-	
-    CREATE INDEX tindex USING HASH ON Traslados (article_id);
-
--- Inventario en el warehouse destino
-	IF dateShipment >= CURDATE() THEN
-
-		CALL cache.visible_refresh(v_calc_visible, TRUE, warehouseLanding);
-		CALL availableTraslate(warehouseLanding, dateLanding,warehouseShipment);
-
-		UPDATE Traslados t
-			LEFT JOIN availableTraslate a ON t.article_id = a.item_id
-			LEFT JOIN `cache`.visible v ON v.calc_id = v_calc_visible AND t.article_id = v.item_id
-		SET vis2 = v.visible, dis2 = a.available;
-        
-	END IF;
--- ---------------------------------------------
-
-    SELECT t.*,
-			
-            Cantidad - MOD(Cantidad , `grouping`) as Subcantidad,
-
-			MOD(Cantidad , `grouping`) as Soll,
-            
-			ROUND((IF(Volumen > 0,Volumen,x * y * IF(z = 0, Medida + 10, z))) / Packing,0) as cm3,
-
-			Costefijo + Comisionfija + Portefijo AS Cost,
-
-			@porte := ROUND((IF(Volumen > 0,Volumen,x * y * IF(z = 0, Medida + 10, z))) * m3 / 1000000 / Packing ,3) AS Porte,
-
-			@comision := ROUND((Costefijo + Comisionfija + Portefijo) * comision / 100 ,3) AS Comision,
-
-			ROUND(@embalaje := (costeRetorno + IF(Retornable != 0, 0, Valor)) / packing ,3) AS Embalaje,
-
-			@coste := IFNULL((Costefijo + Comisionfija + Portefijo),0) + IFNULL(@embalaje,0) + IFNULL(@porte,0) + IFNULL(@comision,0)  AS Coste,
-
-			@t3 := ROUND(@coste / ( (100 - t3 - t.promo)/100),2) AS Tarifa3,
-			
-			ROUND(@t3 * (1 + ((t2 - t3)/100)),2) AS Tarifa2,
-            
-            0 selected
-			
-		FROM Traslados t 
-			WHERE vis1 <> 0 OR dis1 <> 0 OR vis2 <> 0 OR dis2 <> 0
-            ORDER BY tipo_id, Article, Medida, Categoria, Origen;
-
-	DROP TEMPORARY TABLE IF EXISTS Traslados;
-    DROP TEMPORARY TABLE IF EXISTS tmp_item;
-	DROP TEMPORARY TABLE IF EXISTS tmp.buyUltimateFromInterval;
-
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -93852,7 +92121,7 @@ CREATE TABLE `inter` (
   CONSTRAINT `inter_ibfk_1` FOREIGN KEY (`Id_Ticket`) REFERENCES `vn`.`ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `inter_state` FOREIGN KEY (`state_id`) REFERENCES `vn`.`state` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `responsable` FOREIGN KEY (`Id_Supervisor`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=21606889 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=21652202 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -94360,7 +92629,7 @@ USE `bs`;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `m3Silla` AS select `m3__`.`fecha` AS `fecha`,`m3__`.`year` AS `year`,`m3__`.`month` AS `month`,`m3__`.`week` AS `week`,`m3__`.`day` AS `day`,`m3__`.`dayName` AS `dayName`,cast(sum(`m3__`.`m3`) as decimal(10,0)) AS `Volumen`,cast(sum(`m3__`.`euros`) as decimal(10,0)) AS `Euros` from `m3__` where (`m3__`.`warehouseFk` in (1,44)) group by `m3__`.`fecha` */;
+/*!50001 VIEW `m3Silla` AS select `m3`.`fecha` AS `fecha`,`m3`.`year` AS `year`,`m3`.`month` AS `month`,`m3`.`week` AS `week`,`m3`.`day` AS `day`,`m3`.`dayName` AS `dayName`,cast(sum(`m3`.`m3`) as decimal(10,0)) AS `Volumen`,cast(sum(`m3`.`euros`) as decimal(10,0)) AS `Euros` from `m3` where (`m3`.`warehouseFk` in (1,44)) group by `m3`.`fecha` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -95134,10 +93403,10 @@ USE `vn`;
 /*!50001 SET collation_connection      = @saved_col_connection */;
 
 --
--- Final view structure for view `accounting`
+-- Final view structure for view `accounting__`
 --
 
-/*!50001 DROP VIEW IF EXISTS `accounting`*/;
+/*!50001 DROP VIEW IF EXISTS `accounting__`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
 /*!50001 SET @saved_col_connection     = @@collation_connection */;
@@ -95146,7 +93415,7 @@ USE `vn`;
 /*!50001 SET collation_connection      = utf8_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
 /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `accounting` AS select `b`.`Id_Banco` AS `id`,`b`.`Banco` AS `bank`,`b`.`Cuenta` AS `account`,`b`.`cash` AS `accountingTypeFk`,`b`.`entity_id` AS `entityFk`,`b`.`activo` AS `isActive` from `vn2008`.`Bancos` `b` */;
+/*!50001 VIEW `accounting__` AS select `b`.`Id_Banco` AS `id`,`b`.`Banco` AS `bank`,`b`.`Cuenta` AS `account`,`b`.`cash` AS `accountingTypeFk`,`b`.`entity_id` AS `entityFk`,`b`.`activo` AS `isActive` from `vn2008`.`Bancos` `b` */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
@@ -101706,4 +99975,4 @@ USE `vncontrol`;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2019-11-19 13:08:44
+-- Dump completed on 2019-11-21  7:08:17

From d1dfa126c0048694b0adea8fa3971bbbab1a3bb7 Mon Sep 17 00:00:00 2001
From: Bernat <bernat.verdnatura@gmail.com>
Date: Thu, 21 Nov 2019 09:08:43 +0100
Subject: [PATCH 3/4] #1711 Eliminar referencias al esquema vn2008

---
 .../worker/back/methods/device/checkUuid.js   | 61 -------------------
 .../methods/device/specs/checkUuid.spec.js    | 11 ----
 modules/worker/back/models/device.js          |  2 -
 3 files changed, 74 deletions(-)
 delete mode 100644 modules/worker/back/methods/device/checkUuid.js
 delete mode 100644 modules/worker/back/methods/device/specs/checkUuid.spec.js

diff --git a/modules/worker/back/methods/device/checkUuid.js b/modules/worker/back/methods/device/checkUuid.js
deleted file mode 100644
index 73c6cb57c2..0000000000
--- a/modules/worker/back/methods/device/checkUuid.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-Author : Enrique Blasco BLanquer
-Date: 27 de mayo de 2019
-*/
-module.exports = Self => {
-    Self.remoteMethodCtx('checkUuid', {
-        description: 'Check UUID from user',
-        accessType: 'WRITE',
-        accepts: [{
-            arg: 'data',
-            type: 'object',
-            required: true,
-            description: 'uuid,model',
-            http: {source: 'body'}
-        }],
-        returns: [{
-            type: 'Object',
-            root: true
-        }],
-        http: {
-            path: `/checkUuid`,
-            verb: 'POST'
-        }
-    });
-
-    Self.checkUuid = async(ctx, data) => {
-        const myUserId = ctx.req.accessToken.userId;
-        // 1 Check is a registered user with a uuid
-        let deviceUser = await Self.findOne({where: {userFk: myUserId, sn: data.uuid}});
-
-        if (deviceUser != null)
-            return {'state': true, 'mng': ''};
-        else {
-            // 2 If it does not exist it can be for two reasons:
-            // 2.1 It is the first time that the application enters so we have to register a new user associated with the user
-            // 2.2 Has the user associated with a different uuid, so we deny access.
-
-            let device = await Self.findOne({where: {userFk: myUserId}});
-            if (device != null) {
-                // The device is already registered by another user, access is denied
-                return {'state': false, 'mng': 'Ya estas regisgtrado en otro dispositivo, contacta con los dioses de informática.'};
-            } else {
-                // Check that the device is free
-                let aDevice = await Self.findOne({where: {sn: data.uuid}});
-                if (aDevice != null)
-                    return {'state': false, 'mng': 'El dispositivo esta siendo usado por otro usuario'};
-                else {
-                    // It's the first time you access the application, insert
-                    /* await Self.rawSql('INSERT INTO vn2008.device (sn, model) VALUES (?,?);', [data.uuid, data.model]);*/
-                    await Self.create({
-                        sn: data.uuid,
-                        model: data.model,
-                        userFk: myUserId
-                    });
-
-                    return {'state': true, 'mng': 'Nuevo dispositivo registrado'};
-                }
-            }
-        }
-    };
-};
diff --git a/modules/worker/back/methods/device/specs/checkUuid.spec.js b/modules/worker/back/methods/device/specs/checkUuid.spec.js
deleted file mode 100644
index c2784809c2..0000000000
--- a/modules/worker/back/methods/device/specs/checkUuid.spec.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const app = require('vn-loopback/server/server');
-
-describe('device checkUuid()', () => {
-    it('should return an state equal to false', async() => {
-        let ctx = {req: {accessToken: {userId: 9}}};
-        let data = {'uuid': '123', 'model': 'ihpne kike molon'};
-        let result = await app.models.Device.checkUuid(ctx, data);
-
-        expect(result.name).toBeFalsy();
-    });
-});
diff --git a/modules/worker/back/models/device.js b/modules/worker/back/models/device.js
index ada0ba33b5..cda7a958fe 100644
--- a/modules/worker/back/models/device.js
+++ b/modules/worker/back/models/device.js
@@ -1,8 +1,6 @@
 const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
-    require('../methods/device/checkUuid')(Self);
-
     Self.rewriteDbError(function(err) {
         if (err.code === 'ER_DUP_ENTRY')
             return new UserError(``);

From 0473f1de821b28339b0b587f5cba25dbb720178e Mon Sep 17 00:00:00 2001
From: Bernat <bernat.verdnatura@gmail.com>
Date: Thu, 21 Nov 2019 09:09:17 +0100
Subject: [PATCH 4/4] #1711 Eliminar referencias al esquema vn2008

---
 .../10110-postCampaign/00-clientGetMana.sql   |  25 +--
 .../10110-postCampaign/01-notifyPassport.sql  |  16 ++
 db/dump/structure.sql                         | 145 +++++++++---------
 3 files changed, 102 insertions(+), 84 deletions(-)
 create mode 100644 db/changes/10110-postCampaign/01-notifyPassport.sql

diff --git a/db/changes/10110-postCampaign/00-clientGetMana.sql b/db/changes/10110-postCampaign/00-clientGetMana.sql
index 7666d0c1cc..df1b2adbcf 100644
--- a/db/changes/10110-postCampaign/00-clientGetMana.sql
+++ b/db/changes/10110-postCampaign/00-clientGetMana.sql
@@ -5,18 +5,21 @@ CREATE DEFINER=`root`@`%` FUNCTION `vn`.`clientGetMana`(vClient INT) RETURNS dec
     DETERMINISTIC
 BEGIN
 /**
- * Devuelve el maná del cliente.
+ * Devuelve el mana del cliente.
  *
  * @param vClient Id del cliente
- * @return Maná del cliente
+ * @return Mana del cliente
  */
 	DECLARE vMana DECIMAL(10,2);
 	DECLARE vFromDated DATE;
     DECLARE vHasMana BOOLEAN;
 	DECLARE vManaComponent INT;
 	DECLARE vAutoManaComponent INT;
-    DECLARE vManaBank INT DEFAULT 66;
+    DECLARE vManaBank INT;
+    DECLARE vManaGreugeType INT;
     
+    SELECT id INTO vManaGreugeType FROM greugeType WHERE code = 'mana';
+    SELECT id INTO vManaBank FROM bank WHERE code = 'mana';
     SELECT id INTO vManaComponent FROM component WHERE code = 'mana';
     SELECT id INTO vAutoManaComponent FROM component WHERE code = 'autoMana';
     
@@ -57,17 +60,15 @@ BEGIN
 					AND r.payed <= CURDATE()
 					AND c.id = vClient
 			UNION ALL
-			SELECT  g.Importe
-				FROM vn2008.Greuges g
-					JOIN vn2008.Clientes c using(Id_Cliente)
-				WHERE g.Greuges_type_id = 3 -- Maná
-					AND g.Fecha > vFromDated
-					AND g.Fecha <= CURDATE()
-					AND c.Id_Cliente = vClient
+			SELECT  g.amount
+				FROM greuge g
+					JOIN client c ON c.id = g.clientFk
+				WHERE g.greugeTypeFk = vManaGreugeType
+					AND g.shipped > vFromDated
+					AND g.shipped <= CURDATE()
+					AND c.id = vClient
 			) sub;
-
 	RETURN IFNULL(vMana,0);
-
 END$$
 
 DELIMITER ;
diff --git a/db/changes/10110-postCampaign/01-notifyPassport.sql b/db/changes/10110-postCampaign/01-notifyPassport.sql
new file mode 100644
index 0000000000..c3f0669364
--- /dev/null
+++ b/db/changes/10110-postCampaign/01-notifyPassport.sql
@@ -0,0 +1,16 @@
+DROP procedure IF EXISTS `vn2008`.`notify_passport`;
+
+DELIMITER $$
+CREATE DEFINER=`root`@`%` PROCEDURE `vn2008`.`notify_passport`(
+	IN vItemFk INT,
+    IN vStickers SMALLINT,
+    IN vPacking SMALLINT,
+    IN vBuyFk INT
+)
+BEGIN
+	-- DPRECATED use vn.buy_notifyPassport
+		CALL vn.buy_notifyPassport(vBuyFk, vItemFk, vStickers, vPacking);
+END$$
+
+DELIMITER ;
+
diff --git a/db/dump/structure.sql b/db/dump/structure.sql
index cb75fc2db6..cda45dec75 100644
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@@ -8918,7 +8918,7 @@ CREATE TABLE `cache_calc` (
   KEY `cache_id` (`cache_id`),
   KEY `cacheName` (`cacheName`),
   KEY `expires` (`expires`)
-) ENGINE=InnoDB AUTO_INCREMENT=437035 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=437042 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10033,7 +10033,7 @@ CREATE TABLE `deliveryInformation` (
   KEY `fgbSupplyResponse_idx2` (`FirstOrderDateTime`),
   KEY `fgbSupplyResponse_idx3` (`LatestOrderDateTime`),
   CONSTRAINT `fgbSupplyResponse` FOREIGN KEY (`supplyResponseID`) REFERENCES `supplyResponse` (`ID`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=24393221 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=24393824 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10091,7 +10091,7 @@ CREATE TABLE `ekt` (
   KEY `barcode` (`barcode`),
   KEY `fec` (`fec`),
   KEY `putOrderFk` (`putOrderFk`)
-) ENGINE=InnoDB AUTO_INCREMENT=1112531 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1112639 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10112,7 +10112,7 @@ CREATE TABLE `exchange` (
   KEY `buy_edi_id` (`ektFk`),
   CONSTRAINT `exchange_ibfk_1` FOREIGN KEY (`mailFk`) REFERENCES `mail` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `exchange_ibfk_2` FOREIGN KEY (`ektFk`) REFERENCES `ekt` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=653193 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=653301 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10374,7 +10374,7 @@ CREATE TABLE `mail` (
   UNIQUE KEY `mail_id` (`messageId`),
   KEY `sender_id` (`senderFk`),
   CONSTRAINT `mail_ibfk_2` FOREIGN KEY (`senderFk`) REFERENCES `mailSender` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=683079 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=683172 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10630,7 +10630,7 @@ CREATE TABLE `supplyResponse` (
   PRIMARY KEY (`ID`),
   UNIQUE KEY `ID_UNIQUE` (`ID`),
   KEY `IX_TransNumber` (`TransactionNumber`) COMMENT 'Agregado por Ernesto 11.6.2019\nSe ejecutaba 1 consulta por segundo desde MAIL y consumia un 20% de CPU de todo el servidor !!!!!\nCPU usada es mas estable que Indice en SendererID, cpu vs espacio que ocupa?\n'
-) ENGINE=InnoDB AUTO_INCREMENT=8947741 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=8947858 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11327,7 +11327,7 @@ CREATE TABLE `image` (
   PRIMARY KEY (`id`),
   UNIQUE KEY `collection` (`collectionFk`,`name`),
   CONSTRAINT `image_ibfk_1` FOREIGN KEY (`collectionFk`) REFERENCES `imageCollection` (`name`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=171831 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=171862 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12008,7 +12008,7 @@ CREATE TABLE `order` (
   CONSTRAINT `order_ibfk_5` FOREIGN KEY (`address_id`) REFERENCES `vn`.`address` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `order_ibfk_8` FOREIGN KEY (`delivery_method_id`) REFERENCES `vn`.`deliveryMethod` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `order_ibfk_9` FOREIGN KEY (`agency_id`) REFERENCES `vn`.`agencyMode` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=2247959 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2247972 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -12127,7 +12127,7 @@ CREATE TABLE `orderRow` (
   KEY `warehouse_shipment` (`warehouseFk`,`shipment`),
   CONSTRAINT `orderRow_ibfk_2` FOREIGN KEY (`itemFk`) REFERENCES `vn`.`item` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `orderRow_ibfk_3` FOREIGN KEY (`orderFk`) REFERENCES `order` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=13471735 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=13471768 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -12551,7 +12551,7 @@ CREATE TABLE `tpvTransaction` (
   CONSTRAINT `receipt_id` FOREIGN KEY (`receiptFk`) REFERENCES `vn`.`receipt` (`Id`) ON DELETE SET NULL ON UPDATE CASCADE,
   CONSTRAINT `tpvTransaction_ibfk_1` FOREIGN KEY (`clientFk`) REFERENCES `vn`.`client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `tpvTransaction_ibfk_2` FOREIGN KEY (`merchantFk`) REFERENCES `tpvMerchant` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=372874 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Transactions realized through the virtual TPV';
+) ENGINE=InnoDB AUTO_INCREMENT=372875 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Transactions realized through the virtual TPV';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12586,7 +12586,7 @@ CREATE TABLE `visit` (
   PRIMARY KEY (`id`),
   KEY `firstAgent` (`firstAgentFk`),
   CONSTRAINT `visit_ibfk_1` FOREIGN KEY (`firstAgentFk`) REFERENCES `visitAgent` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=2008312 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2008351 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12606,7 +12606,7 @@ CREATE TABLE `visitAccess` (
   KEY `visit_access_idx_agent` (`agentFk`),
   KEY `stamp` (`stamp`),
   CONSTRAINT `visitAccess_ibfk_1` FOREIGN KEY (`agentFk`) REFERENCES `visitAgent` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=4484736 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=4484795 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12631,7 +12631,7 @@ CREATE TABLE `visitAgent` (
   KEY `firstAccess` (`firstAccessFk`),
   CONSTRAINT `visitAgent_ibfk_1` FOREIGN KEY (`visitFk`) REFERENCES `visit` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `visitAgent_ibfk_2` FOREIGN KEY (`firstAccessFk`) REFERENCES `visitAccess` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=2655432 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2655475 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12651,7 +12651,7 @@ CREATE TABLE `visitUser` (
   KEY `date_time` (`stamp`),
   KEY `user_id` (`userFk`),
   CONSTRAINT `visitUser_ibfk_1` FOREIGN KEY (`accessFk`) REFERENCES `visitAccess` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=3927228 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3927275 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -20180,7 +20180,7 @@ CREATE TABLE `XDiario` (
   PRIMARY KEY (`id`),
   KEY `empresa_id` (`empresa_id`),
   CONSTRAINT `XDiario_ibfk_1` FOREIGN KEY (`empresa_id`) REFERENCES `company` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=4055070 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=4055076 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -20933,6 +20933,7 @@ CREATE TABLE `bank` (
   `entityFk` int(10) unsigned NOT NULL,
   `isActive` tinyint(4) NOT NULL DEFAULT '1',
   `currencyFk` tinyint(3) unsigned DEFAULT '1',
+  `code` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `BancosBanco` (`bank`),
   KEY `fk_Bancos_entity1_idx` (`entityFk`),
@@ -21119,7 +21120,7 @@ CREATE TABLE `buy` (
   CONSTRAINT `buy_ibfk_3` FOREIGN KEY (`containerFk`) REFERENCES `vn2008`.`container` (`container_id`) ON UPDATE CASCADE,
   CONSTRAINT `buy_id` FOREIGN KEY (`entryFk`) REFERENCES `entry` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE,
   CONSTRAINT `buy_itemfk` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=352686632 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB AUTO_INCREMENT=352686690 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -22113,7 +22114,7 @@ CREATE TABLE `clientCredit` (
   KEY `credit_ClienteFk` (`clientFk`),
   CONSTRAINT `credit_ClienteFk` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `workers_fk` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=85166 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=85167 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -22202,7 +22203,7 @@ CREATE TABLE `clientLog` (
   KEY `userFk` (`userFk`),
   CONSTRAINT `clientLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `clientLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=240238 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=240239 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -23411,7 +23412,7 @@ CREATE TABLE `dms` (
   UNIQUE KEY `emp_id` (`companyFk`,`hardCopyNumber`,`warehouseFk`),
   KEY `trabajador_id` (`workerFk`),
   KEY `warehouse_id` (`warehouseFk`)
-) ENGINE=InnoDB AUTO_INCREMENT=1388177 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='document managment system';
+) ENGINE=InnoDB AUTO_INCREMENT=1388197 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='document managment system';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -23820,7 +23821,7 @@ CREATE TABLE `entry` (
   CONSTRAINT `entry_ibfk_1` FOREIGN KEY (`supplierFk`) REFERENCES `supplier` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `entry_ibfk_6` FOREIGN KEY (`travelFk`) REFERENCES `travel` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `entry_ibfk_7` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=182103 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='InnoDB free: 88064 kB; (`Id_Proveedor`) REFER `vn2008/Provee';
+) ENGINE=InnoDB AUTO_INCREMENT=182107 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='InnoDB free: 88064 kB; (`Id_Proveedor`) REFER `vn2008/Provee';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -24021,7 +24022,7 @@ CREATE TABLE `entryLog` (
   KEY `entryLog_ibfk_2` (`userFk`),
   CONSTRAINT `entryLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `entry` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `entryLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=177180 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=177189 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -25430,7 +25431,7 @@ CREATE TABLE `itemBarcode` (
   UNIQUE KEY `Id_Article_2` (`itemFk`,`code`),
   KEY `Id_Article` (`itemFk`),
   CONSTRAINT `itemBarcode_ibfk_1` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=42923 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=42930 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -25628,7 +25629,7 @@ CREATE TABLE `itemLog` (
   KEY `itemLogUserFk_idx` (`userFk`),
   CONSTRAINT `itemLogItemFk` FOREIGN KEY (`originFk`) REFERENCES `item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `itemLogUserFk` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=99157 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=99171 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -25655,7 +25656,7 @@ CREATE TABLE `itemPlacement` (
   CONSTRAINT `Articles_nicho_wh_fk` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `Articles_nichos_fk` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `itemPlacement_fk3` FOREIGN KEY (`sectorFk`) REFERENCES `sector` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=1160906 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1160939 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -25705,7 +25706,7 @@ CREATE TABLE `itemPlacementSupply` (
   CONSTRAINT `itemPlacementSupply_fk2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `itemPlacementSupply_fk3` FOREIGN KEY (`repoUserFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `itemPlacementSupply_fk4` FOREIGN KEY (`sectorFk`) REFERENCES `sector` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=80804 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Lista de nichos de picking que hay que reponer';
+) ENGINE=InnoDB AUTO_INCREMENT=80805 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Lista de nichos de picking que hay que reponer';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -26013,7 +26014,7 @@ CREATE TABLE `itemShelvingSale` (
   CONSTRAINT `itemShelvingSale_fk1` FOREIGN KEY (`itemShelvingFk`) REFERENCES `itemShelving` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `itemShelvingSale_fk2` FOREIGN KEY (`saleFk`) REFERENCES `sale` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `itemShelvingSale_fk3` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=42087 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalle del producto que se retira de los carros, relacionando la linea de movimiento correspondiente';
+) ENGINE=InnoDB AUTO_INCREMENT=42119 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalle del producto que se retira de los carros, relacionando la linea de movimiento correspondiente';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -26140,7 +26141,7 @@ CREATE TABLE `itemTag` (
   KEY `itemFk_2` (`itemFk`,`tagFk`,`intValue`),
   CONSTRAINT `itemTagItemFk` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `itemTagTagFk` FOREIGN KEY (`tagFk`) REFERENCES `tag` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=1400544 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1400546 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -26739,7 +26740,7 @@ CREATE TABLE `message` (
   KEY `sender` (`sender`),
   KEY `recipient` (`recipient`),
   KEY `uuid` (`uuid`(8))
-) ENGINE=InnoDB AUTO_INCREMENT=2056489 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2056575 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -26761,7 +26762,7 @@ CREATE TABLE `messageInbox` (
   PRIMARY KEY (`id`),
   KEY `uuid` (`uuid`(8)),
   KEY `finalRecipient` (`finalRecipient`)
-) ENGINE=InnoDB AUTO_INCREMENT=2232309 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2232395 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -26991,7 +26992,7 @@ CREATE TABLE `packageChecked` (
   PRIMARY KEY (`id`),
   UNIQUE KEY `entryFk_UNIQUE` (`itemFk`),
   KEY `fkItem_idx` (`itemFk`)
-) ENGINE=InnoDB AUTO_INCREMENT=3224 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3231 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -27697,7 +27698,7 @@ CREATE TABLE `producer` (
   `isVisible` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   UNIQUE KEY `name_UNIQUE` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=14545 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=14549 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -28030,7 +28031,7 @@ CREATE TABLE `receipt` (
   CONSTRAINT `receipt_ibfk_1` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `receipt_ibfk_2` FOREIGN KEY (`bankFk`) REFERENCES `bank` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `recibo_customer_id` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=609864 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=609865 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -28216,7 +28217,7 @@ CREATE TABLE `route` (
   KEY `route_ibfk_2_idx` (`workerFk`),
   CONSTRAINT `route_ibfk_1` FOREIGN KEY (`gestdocFk`) REFERENCES `dms` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
   CONSTRAINT `route_ibfk_2` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=60130 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=60147 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -28410,7 +28411,7 @@ CREATE TABLE `routeLog` (
   KEY `userFk` (`userFk`),
   CONSTRAINT `routeLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `route` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `routeLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=197166 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=197397 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -28521,7 +28522,7 @@ CREATE TABLE `sale` (
   KEY `itemFk_ticketFk` (`itemFk`,`ticketFk`),
   CONSTRAINT `movement_ticket_id` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `sale_ibfk_1` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=26414808 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=26414860 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -28762,7 +28763,7 @@ CREATE TABLE `saleTracking` (
   KEY `fgnStateFk_idx` (`stateFk`),
   KEY `saleTracking_idx5` (`created`),
   CONSTRAINT `fgnStateFk` FOREIGN KEY (`stateFk`) REFERENCES `state` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=21026302 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=21026634 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -29163,7 +29164,7 @@ CREATE TABLE `sms` (
   `status` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=155196 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=155221 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -29352,7 +29353,7 @@ CREATE TABLE `stockBuyed` (
   UNIQUE KEY `date_UNIQUE` (`date`,`user`),
   KEY `stockBuyed_user_idx` (`user`),
   CONSTRAINT `stockBuyedUserFk` FOREIGN KEY (`user`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=847937 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=848177 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -29797,7 +29798,7 @@ CREATE TABLE `ticket` (
   CONSTRAINT `ticket_ibfk_9` FOREIGN KEY (`routeFk`) REFERENCES `route` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `tickets_fk10` FOREIGN KEY (`refFk`) REFERENCES `invoiceOut` (`ref`) ON UPDATE CASCADE,
   CONSTRAINT `tickets_zone_fk` FOREIGN KEY (`zoneFk`) REFERENCES `zone` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=2484593 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2484620 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -30072,7 +30073,7 @@ CREATE TABLE `ticketLog` (
   KEY `logTicketuserFk` (`userFk`),
   CONSTRAINT `ticketLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `ticketLog_user` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=8112788 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=8113130 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -30109,7 +30110,7 @@ CREATE TABLE `ticketObservation` (
   KEY `observation_type_id` (`observationTypeFk`),
   CONSTRAINT `ticketObservation_ibfk_1` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `ticketObservation_ibfk_2` FOREIGN KEY (`observationTypeFk`) REFERENCES `observationType` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=1509900 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket';
+) ENGINE=InnoDB AUTO_INCREMENT=1509914 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -30227,7 +30228,7 @@ CREATE TABLE `ticketParking` (
   KEY `ticketParking_fk1_idx` (`parkingFk`),
   CONSTRAINT `ticketParking_fk1` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `ticketParking_fk2` FOREIGN KEY (`parkingFk`) REFERENCES `parking` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=11492 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Almacena los distintos lugares donde puede estar aparcado cada uno de los prepedidos';
+) ENGINE=InnoDB AUTO_INCREMENT=11497 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Almacena los distintos lugares donde puede estar aparcado cada uno de los prepedidos';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -30293,7 +30294,7 @@ CREATE TABLE `ticketRequest` (
   CONSTRAINT `fgnAtender` FOREIGN KEY (`atenderFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `fgnRequester` FOREIGN KEY (`requesterFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `fgnTicket` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=52123 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=52125 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -31687,7 +31688,7 @@ CREATE TABLE `workerTimeControl` (
   KEY `warehouseFkfk1_idx` (`warehouseFk`),
   CONSTRAINT `warehouseFk_1` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `workerTimeControl_fk1` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=8297369 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Fichadas';
+) ENGINE=InnoDB AUTO_INCREMENT=8297378 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Fichadas';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -56637,7 +56638,7 @@ CREATE TABLE `Cajas` (
   KEY `fk_Cajas_Proveedores_account1_idx` (`Proveedores_account_Id`),
   CONSTRAINT `Cajas_ibfk_2` FOREIGN KEY (`Id_Banco`) REFERENCES `vn`.`bank` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `Cajas_ibfk_3` FOREIGN KEY (`Id_Trabajador`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=743475 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=743478 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -56890,7 +56891,7 @@ CREATE TABLE `Colas` (
   KEY `Id_Trabajador` (`Id_Trabajador`),
   CONSTRAINT `Colas_ibfk_3` FOREIGN KEY (`Id_Prioridad`) REFERENCES `vn`.`queuePriority` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `Colas_ibfk_4` FOREIGN KEY (`Id_Impresora`) REFERENCES `Impresoras` (`Id_Impresora`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=21582 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=21605 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -57311,7 +57312,7 @@ CREATE TABLE `Entradas_dits` (
   CONSTRAINT `Entradas_dits_ibfk_1` FOREIGN KEY (`Id_Ticket`) REFERENCES `vn`.`entry` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `fgkey_entradas_1` FOREIGN KEY (`idaccion_dits`) REFERENCES `accion_dits` (`idaccion_dits`) ON DELETE NO ACTION ON UPDATE CASCADE,
   CONSTRAINT `fgkey_entradas_3` FOREIGN KEY (`Id_Trabajador`) REFERENCES `vn`.`worker` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=3986463 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3986582 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -58552,7 +58553,7 @@ CREATE TABLE `Tickets_dits` (
   CONSTRAINT `Tickets_dits_ibfk_1` FOREIGN KEY (`Id_Ticket`) REFERENCES `vn`.`ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `fgkey1` FOREIGN KEY (`idaccion_dits`) REFERENCES `accion_dits` (`idaccion_dits`) ON DELETE NO ACTION ON UPDATE CASCADE,
   CONSTRAINT `fgkey3` FOREIGN KEY (`Id_Trabajador`) REFERENCES `vn`.`worker` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=65253509 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=65253575 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -61646,7 +61647,7 @@ CREATE TABLE `mail` (
   PRIMARY KEY (`id`),
   KEY `sent_idx` (`sent`),
   KEY `creation_idx` (`DATE_ODBC`)
-) ENGINE=InnoDB AUTO_INCREMENT=1938221 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1938230 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -62374,7 +62375,7 @@ CREATE TABLE `price_fixed` (
   KEY `date_end` (`date_end`),
   KEY `warehouse_id` (`warehouse_id`),
   CONSTRAINT `price_fixed_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `vn`.`item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=64846 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=64851 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -63643,7 +63644,7 @@ CREATE TABLE `travel_dits` (
   KEY `fgkey2_idx` (`Id_Ticket`),
   KEY `fgkey3_idx` (`Id_Trabajador`),
   CONSTRAINT `travel_dits_ibfk_1` FOREIGN KEY (`Id_Trabajador`) REFERENCES `vn`.`worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=246368 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=246370 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -79693,7 +79694,7 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `inventario_multiple_inventarios` */;
+/*!50003 DROP PROCEDURE IF EXISTS `inventario_multiple_inventariosKk` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -79703,7 +79704,7 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `inventario_multiple_inventarios`(wh SMALLINT, date_ticket DATETIME)
+CREATE DEFINER=`root`@`%` PROCEDURE `inventario_multiple_inventariosKk`(wh SMALLINT, date_ticket DATETIME)
 BEGIN
 	DECLARE date_order DATETIME;
 	DECLARE date_end DATETIME DEFAULT CURDATE();
@@ -79714,8 +79715,16 @@ BEGIN
 	ALTER TABLE article_inventory
 		ADD visible FLOAT(7,2) NOT NULL;
 
-	SELECT FechaInventario, TIMESTAMP(TIMESTAMPADD(DAY, 15, date_ticket),'23:59:59')
-			INTO date_start, date_end
+	-- Campaña
+
+	SELECT
+			IF(@camp := DATEDIFF(campaign, date_ticket) BETWEEN 0 AND campaign_life ,
+			TIMESTAMPADD(DAY, -campaign_life, campaign) ,
+			FechaInventario),
+			IF(@camp BETWEEN 0 AND campaign_life,
+			TIMESTAMP(campaign, '23:59:59'),
+			TIMESTAMP(TIMESTAMPADD(DAY, 15, date_ticket),'23:59:59'))
+		INTO date_start, date_end
 		FROM tblContadores;
 
 	SET date_order = TIMESTAMP(DATE(date_ticket), '00:00:00');
@@ -79752,17 +79761,17 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `inventario_multiple_inventariosKk` */;
+/*!50003 DROP PROCEDURE IF EXISTS `inventario_multiple_inventarios__` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client  = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `inventario_multiple_inventariosKk`(wh SMALLINT, date_ticket DATETIME)
+CREATE DEFINER=`root`@`%` PROCEDURE `inventario_multiple_inventarios__`(wh SMALLINT, date_ticket DATETIME)
 BEGIN
 	DECLARE date_order DATETIME;
 	DECLARE date_end DATETIME DEFAULT CURDATE();
@@ -79773,16 +79782,8 @@ BEGIN
 	ALTER TABLE article_inventory
 		ADD visible FLOAT(7,2) NOT NULL;
 
-	-- Campaña
-
-	SELECT
-			IF(@camp := DATEDIFF(campaign, date_ticket) BETWEEN 0 AND campaign_life ,
-			TIMESTAMPADD(DAY, -campaign_life, campaign) ,
-			FechaInventario),
-			IF(@camp BETWEEN 0 AND campaign_life,
-			TIMESTAMP(campaign, '23:59:59'),
-			TIMESTAMP(TIMESTAMPADD(DAY, 15, date_ticket),'23:59:59'))
-		INTO date_start, date_end
+	SELECT FechaInventario, TIMESTAMP(TIMESTAMPADD(DAY, 15, date_ticket),'23:59:59')
+			INTO date_start, date_end
 		FROM tblContadores;
 
 	SET date_order = TIMESTAMP(DATE(date_ticket), '00:00:00');
@@ -92121,7 +92122,7 @@ CREATE TABLE `inter` (
   CONSTRAINT `inter_ibfk_1` FOREIGN KEY (`Id_Ticket`) REFERENCES `vn`.`ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `inter_state` FOREIGN KEY (`state_id`) REFERENCES `vn`.`state` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `responsable` FOREIGN KEY (`Id_Supervisor`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=21652202 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=21652681 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -99975,4 +99976,4 @@ USE `vncontrol`;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2019-11-21  7:08:17
+-- Dump completed on 2019-11-21  7:34:03