2020-09-02 14:45:55 +00:00
474 changed files with 5716 additions and 5989 deletions
--- a/5
+++ b/5
@ -8,6 +8,11 @@ RUN apt-get update \
        ca-certificates \
        gnupg2 \
        libfontconfig \
+    && apt-get -y install xvfb gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 \
+      libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 \
+      libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 \
+      libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 \
+      libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget \
    && curl -sL https://deb.nodesource.com/setup_12.x | bash - \
    && apt-get install -y --no-install-recommends \
        nodejs \
--- a/back/model-config.json
+++ b/back/model-config.json
@ -2,6 +2,9 @@
    "Account": {
        "dataSource": "vn"
    },
+    "AccountingType": {
+        "dataSource": "vn"
+    },
    "Bank": {
        "dataSource": "vn"
    },
--- a/back/models/accounting-type.json
+++ b/back/models/accounting-type.json
@ -0,0 +1,30 @@
+{
+    "name": "AccountingType",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "accountingType"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "Number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "description": {
+            "type": "String",
+            "required": true
+        },
+        "receiptDescription": {
+            "type": "String",
+            "required": true
+        }
+    },
+    "acls": [{
+        "accessType": "READ",
+        "principalType": "ROLE",
+        "principalId": "$everyone",
+        "permission": "ALLOW"
+    }]
+}
--- a/back/models/bank.json
+++ b/back/models/bank.json
@ -2,39 +2,49 @@
    "name": "Bank",
    "base": "VnModel",
    "options": {
-      "mysql": {
-        "table": "bank"
-      }
+        "mysql": {
+            "table": "bank"
+        }
    },
    "properties": {
-      "id": {
-        "type": "Number",
-        "id": true,
-        "description": "Identifier"
-      },
-      "bank": {
-        "type": "string",
-        "required": true
-      },
-      "account": {
-        "type": "string",
-        "required": true
-      },
-      "cash": {
-        "type": "string",
-        "required": true
-      },
-      "entityFk": {
-        "type": "string",
-        "required": true
-      },
-      "isActive": {
-        "type": "string",
-        "required": true
-      },
-      "currencyFk": {
-        "type": "string",
-        "required": true
-      }
+        "id": {
+            "type": "Number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "bank": {
+            "type": "String",
+            "required": true
+        },
+        "account": {
+            "type": "String",
+            "required": true
+        },
+        "accountingTypeFk": {
+            "type": "Number",
+            "required": true,
+            "mysql": {
+                "columnName": "cash"
+            }
+        },
+        "entityFk": {
+            "type": "Number",
+            "required": true
+        },
+        "isActive": {
+            "type": "Boolean",
+            "required": true
+        },
+        "currencyFk": {
+            "type": "Number",
+            "required": true
+        }
+    },
+    "relations": {
+		"accountingType": {
+			"type": "belongsTo",
+			"model": "AccountingType",
+			"foreignKey": "accountingTypeFk"
+        }
    }
-  }
+}
--- a/back/models/image.js
+++ b/back/models/image.js
@ -55,8 +55,9 @@ module.exports = Self => {
            };

            await fs.mkdir(dstDir, {recursive: true});
-            await sharp(srcFilePath)
+            await sharp(srcFilePath, {failOnError: false})
                .resize(collection.maxWidth, collection.maxHeight, resizeOpts)
+                .png()
                .toFile(dstFile);

            const sizes = collection.sizes();
@ -69,8 +70,9 @@ module.exports = Self => {
                };

                await fs.mkdir(dstDir, {recursive: true});
-                await sharp(srcFilePath)
+                await sharp(srcFilePath, {failOnError: false})
                    .resize(size.width, size.height, resizeOpts)
+                    .png()
                    .toFile(dstFile);
            }

@ -88,7 +90,9 @@ module.exports = Self => {
                );
            }

-            await fs.unlink(srcFilePath);
+            if (fs.existsSync(srcFilePath))
+                await fs.unlink(srcFilePath);
+
            await tx.commit();
            return newImage;
        } catch (e) {
--- a/db/changes/10180-holyWeek/00-ACL.sql
+++ b/db/changes/10180-holyWeek/00-ACL.sql
@ -1 +0,0 @@
-INSERT IGNORE INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('WorkerLog', '*', 'READ', 'ALLOW', 'ROLE', 'hr');
--- a/db/changes/10180-holyWeek/00-claim.sql
+++ b/db/changes/10180-holyWeek/00-claim.sql
@ -1,2 +0,0 @@
-ALTER TABLE `vn`.`claim` 
-ADD COLUMN `hasToPickUp` TINYINT(1) NOT NULL AFTER `ticketFk`;
--- a/db/changes/10180-holyWeek/00-claimState.sql
+++ b/db/changes/10180-holyWeek/00-claimState.sql
@ -1,28 +0,0 @@
-ALTER TABLE `vn`.`claimState` 
-DROP FOREIGN KEY `roleFgn`;
-ALTER TABLE `vn`.`claimState` 
-ADD COLUMN `code` VARCHAR(45) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' NULL AFTER `id`,
-CHANGE COLUMN `roleFk` `roleFk` INT(10) UNSIGNED NOT NULL DEFAULT '1' ;
-ALTER TABLE `vn`.`claimState` 
-ADD CONSTRAINT `roleFgn`
-  FOREIGN KEY (`roleFk`)
-  REFERENCES `account`.`role` (`id`)
-  ON UPDATE CASCADE;
-
-UPDATE `vn`.`claimState` SET `code` = 'pending' WHERE (`id` = '1');
-UPDATE `vn`.`claimState` SET `code` = 'canceled' WHERE (`id` = '4');
-UPDATE `vn`.`claimState` SET `code` = 'resolved' WHERE (`id` = '3');
-UPDATE `vn`.`claimState` SET `code` = 'disputed' WHERE (`id` = '5');
-UPDATE `vn`.`claimState` SET `code` = 'mana' WHERE (`id` = '6');
-UPDATE `vn`.`claimState` SET `code` = 'managed' WHERE (`id` = '2');
-
-ALTER TABLE `vn`.`claimState` 
-ADD COLUMN `priority` INT NOT NULL DEFAULT 1 AFTER `roleFk`;
-
-UPDATE `vn`.`claimState` SET `priority` = '1' WHERE (`id` = '1');
-UPDATE `vn`.`claimState` SET `priority` = '5' WHERE (`id` = '2');
-UPDATE `vn`.`claimState` SET `priority` = '7' WHERE (`id` = '3');
-UPDATE `vn`.`claimState` SET `priority` = '6' WHERE (`id` = '4');
-UPDATE `vn`.`claimState` SET `priority` = '3' WHERE (`id` = '5');
-UPDATE `vn`.`claimState` SET `priority` = '4' WHERE (`id` = '6');
-UPDATE `vn`.`claimState` SET `priority` = '2' WHERE (`id` = '7');
--- a/db/changes/10180-holyWeek/00-ticketWeekly.sql
+++ b/db/changes/10180-holyWeek/00-ticketWeekly.sql
@ -1,13 +0,0 @@
-ALTER TABLE `vn`.`ticketWeekly` 
-ADD COLUMN `agencyModeFk` INT(11) NULL DEFAULT NULL AFTER `weekDay`,
-ADD INDEX `agencyModeFk_idx` (`agencyModeFk` ASC);
-
-ALTER TABLE `vn`.`ticketWeekly` 
-ADD CONSTRAINT `agencyModeFk`
-  FOREIGN KEY (`agencyModeFk`)
-  REFERENCES `vn`.`agencyMode` (`id`)
-  ON DELETE SET NULL
-  ON UPDATE CASCADE;
-
-ALTER TABLE `vn`.`ticketWeekly` 
-CHANGE COLUMN `weekDay` `weekDay` TINYINT(1) NOT NULL COMMENT 'funcion de mysql Lunes = 0, Domingo = 6' ;
--- a/db/changes/10180-holyWeek/00-ticket_cloneWeekly.sql
+++ b/db/changes/10180-holyWeek/00-ticket_cloneWeekly.sql
@ -1,130 +0,0 @@
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_cloneWeekly`(IN vWeek INT)
-BEGIN
-	DECLARE vIsDone BOOL;
-	DECLARE vLanding DATE;
-	DECLARE vShipment DATE;
-	DECLARE vWarehouse INT;
-    DECLARE vTicket INT;
-    DECLARE vWeekDay INT;
-    DECLARE vClient INT;
-    DECLARE vEmpresa INT;
-    DECLARE vAddressFk INT;
-    DECLARE vAgencyModeFk INT;
-    DECLARE vNewTicket INT;
-    DECLARE vYear INT;
-    
-    DECLARE rsTicket CURSOR FOR
-	SELECT tw.ticketFk, weekDay, t.clientFk, t.warehouseFk, t.companyFk, t.addressFk, tw.agencyModeFk
-		FROM ticketWeekly tw 
-		JOIN ticket t ON tt.ticketFk = t.id;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vIsDone = TRUE;
-
-    SET vYear = YEAR(CURDATE()) + IF(vWeek < WEEK(CURDATE()),1, 0);
-    
-	OPEN rsTicket;
-
-	myLoop: LOOP
-    BEGIN
-		DECLARE vError TEXT;
-        DECLARE vSalesPersonEmail VARCHAR(150);
-        DECLARE vMailSent BOOL;
-        DECLARE vSubject VARCHAR(150);
-        DECLARE vMessage TEXT;
-		DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
-			BEGIN 
-				GET DIAGNOSTICS CONDITION 1
-					vError = MESSAGE_TEXT;
-              
-			END;
-
-		SET vIsDone = FALSE;
-		FETCH rsTicket INTO vTicket, vWeekDay, vClient, vWarehouse, vEmpresa, vAddressFk, vAgencyModeFk;
-
-		IF vIsDone THEN
-
-			LEAVE myLoop;
-		END IF;
-		SELECT date INTO vShipment 
-			FROM `time`
-			WHERE `year` = vYear AND `week` = vWeek
-				AND WEEKDAY(date) = vWeekDay;
-
-        -- busca si el ticket ya ha sido clonado
-        IF (SELECT COUNT(*) FROM vn.ticket tOrig
-				JOIN vn.sale saleOrig ON tOrig.id = saleOrig.ticketFk
-                JOIN vn.saleCloned sc ON sc.saleOriginalFk = saleOrig.id
-                JOIN vn.sale saleClon ON saleClon.id = sc.saleClonedFk
-                JOIN vn.ticket tClon ON tClon.id = saleClon.ticketFk
-			WHERE tOrig.id = vTicket AND DATE(tClon.shipped) = vShipment) > 0 
-		THEN
-			ITERATE myLoop;
-		END IF;
-		CALL vn.zone_getLanded(vShipment, vAddressFk, vAgencyModeFk, vWarehouse);
-
-		SELECT landed INTO vLanding from tmp.zoneGetLanded LIMIT 1;
-
-		CALL vn.ticketCreateWithoutZone(vClient, vShipment, vWarehouse, vEmpresa, vAddressFk, vAgencyModeFk, NULL, vLanding, account.userGetId(), vNewTicket);
-
-		IF (vLanding IS NULL) THEN
-			
-			SELECT e.email INTO vSalesPersonEmail
-				FROM vn.client c
-					JOIN vn.worker sp ON sp.id = c.salesPersonFk
-					JOIN account.emailUser e ON e.userFk = sp.userFk
-				WHERE c.id = vClient;
-		
-			SET vSubject = CONCAT('Turnos - No se ha podido clonar correctamente el ticket ', vTicket,
-						' para el dia: ', vShipment);
-			SET vMessage = CONCAT('No se ha podido clonar el ticket ', vTicket, 
-				' para el dia: ', vShipment, 
-				' porque no hay una zona de envío disponible. Se ha creado el ticket: ', vNewTicket, 
-				' pero ha que revisar las fechas y la agencia');
-				
-			SELECT COUNT(*) INTO vMailSent
-				FROM vn.mail 
-				WHERE sender = vSalesPersonEmail 
-					AND subject = vSubject;
-
-			IF NOT vMailSent THEN
-				INSERT INTO vn.mail (sender,`subject`,body)  
-					VALUES (vSalesPersonEmail, vSubject, vMessage);
-			END IF;
-			CALL vn.ticketStateUpdate (vNewTicket, 'FIXING');
-		END IF;
-        
-		INSERT INTO vn.sale (ticketFk, itemFk, concept, quantity, price, discount, priceFixed, isPriceFixed)
-			SELECT vNewTicket, saleOrig.itemFk , saleOrig.concept , saleOrig.quantity, saleOrig.price , saleOrig.discount, saleOrig.priceFixed, saleOrig.isPriceFixed
-				FROM vn.ticket tOrig
-				JOIN vn.sale saleOrig ON tOrig.id = saleOrig.ticketFk
-                LEFT JOIN vn.saleCloned sc ON sc.saleOriginalFk = saleOrig.id
-                LEFT JOIN vn.sale saleClon ON saleClon.id = sc.saleClonedFk
-                LEFT JOIN vn.ticket tClon ON tClon.id = saleClon.ticketFk AND DATE(tClon.shipped) = vShipment
-			WHERE tOrig.id = vTicket AND saleClon.id IS NULL;
-		
-		INSERT IGNORE INTO vn.saleCloned(saleOriginalFk, saleClonedFk)
-			SELECT saleOriginal.id, saleClon.id 
-				FROM vn.sale saleOriginal
-					JOIN vn.sale saleClon ON saleOriginal.itemFk = saleClon.itemFk AND saleOriginal.quantity = saleClon.quantity
-				WHERE saleOriginal.ticketFk = vTicket AND saleClon.ticketFk = vNewTicket;
-				
-		INSERT INTO ticketRequest (description, ordered, shipped, salesPersonCode, buyerCode, quantity, price,
-					itemFk ,clientFk, response, total, buyed, saleFk)
-			SELECT tr.description, tr.ordered, tr.shipped, tr.salesPersonCode, tr.buyerCode, tr.quantity, tr.price,
-					tr.itemFk, tr.clientFk, tr.response, tr.total, tr.buyed, tr.saleFk
-				FROM sale s JOIN ticketRequest tr ON tr.saleFk = s.id
-					JOIN sale s2 ON s.concept = s2.concept AND s.quantity = s2.quantity AND m.Id_Article = m2.Id_Article
-					WHERE s.ticketFk = vTicket AND s2.ticketFk = vNewTicket;
-
-		CALL vn.ticketCalculateClon(vNewTicket, vTicket);
-	END;
-	END LOOP;
-
-	CLOSE rsTicket;
-
-END$$
-
-DELIMITER ;
-
--- a/db/changes/10180-holyWeek/00-time_createTable.sql
+++ b/db/changes/10180-holyWeek/00-time_createTable.sql
@ -1,20 +0,0 @@
-USE `util`;
-DROP procedure IF EXISTS `time_createTable`;
-
-DELIMITER $$
-USE `util`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `time_createTable`(vStarted DATE, vEnded DATE)
-BEGIN
-	DECLARE vCurrentDate DATE;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.time;
-	CREATE TEMPORARY TABLE tmp.time (dated DATE PRIMARY KEY) ENGINE = MEMORY;
-	SET vCurrentDate = vStarted;
-	WHILE vCurrentDate <= vEnded DO
-		INSERT INTO tmp.time (dated) VALUES (vCurrentDate);
-		SET vCurrentDate = DATE_ADD(vCurrentDate, INTERVAL 1 DAY);
-	END WHILE;
-    
-END$$
-
-DELIMITER ;
--- a/db/changes/10180-holyWeek/00-workerLog.sql
+++ b/db/changes/10180-holyWeek/00-workerLog.sql
@ -1,6 +0,0 @@
-ALTER TABLE `vn`.`workerLog` 
-ADD COLUMN `changedModel` VARCHAR(45) NULL DEFAULT NULL AFTER `description`,
-ADD COLUMN `oldInstance` TEXT NULL DEFAULT NULL AFTER `changedModel`,
-ADD COLUMN `newInstance` TEXT NULL DEFAULT NULL AFTER `oldInstance`,
-ADD COLUMN `changedModelId` INT(11) NULL DEFAULT NULL AFTER `newInstance`,
-ADD COLUMN `changedModelValue` VARCHAR(45) NULL DEFAULT NULL AFTER `changedModelId`;
--- a/db/changes/10180-holyWeek/01-componentRenameMismatchXImbalance.sql
+++ b/db/changes/10180-holyWeek/01-componentRenameMismatchXImbalance.sql
@ -1 +0,0 @@
-UPDATE `vn`.`component` SET `code` = 'imbalance' WHERE (`id` = '36');
--- a/db/changes/10180-holyWeek/01-migrateFromTicketToTicketWeekly.sql
+++ b/db/changes/10180-holyWeek/01-migrateFromTicketToTicketWeekly.sql
@ -1,6 +0,0 @@
-UPDATE vn.ticketWeekly tw 
-    JOIN vn.ticket t ON t.id = tw.ticketFk
-    JOIN vn.agencyMode am ON am.id = t.agencyModeFk
-SET tw.agencyModeFk = t.agencyModeFk
-WHERE am.name NOT LIKE '%turno%';
-
--- a/db/changes/10180-holyWeek/01-zoneConfigAlterTable.sql
+++ b/db/changes/10180-holyWeek/01-zoneConfigAlterTable.sql
@ -1,2 +0,0 @@
-ALTER TABLE `vn`.`zoneConfig` 
-ADD COLUMN `forwardDays` INT(10) NOT NULL DEFAULT 7 COMMENT 'days forward to show zone_upcomingDeliveries' AFTER `scope`;
--- a/db/changes/10180-holyWeek/02-catalog_calculate.sql
+++ b/db/changes/10180-holyWeek/02-catalog_calculate.sql
@ -1,148 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `catalog_calculate`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `catalog_calculate`(
-    vLanded DATE,
-    vAddressFk INT,
-    vAgencyModeFk INT)
-proc: BEGIN
-/**
- * Calcula los articulos disponibles y sus precios
- * 
- * @table tmp.item(itemFk) Listado de artÃculos a calcular
- * @param vLanded Fecha de recepcion de mercancia
- * @param vAddressFk Id del consignatario
- * @param vAgencyModeFk Id de la agencia
- * @return tmp.ticketCalculateItem(itemFk, available, producer, 
- *			item, size, stems, category, inkFk, image, origin, price)
- * @return tmp.ticketLot(warehouseFk, itemFk, available, buyFk)
- * @return tmp.ticketComponent
- * @return tmp.ticketComponentPrice
- * @return tmp.zoneGetShipped
- */
- 
-    DECLARE vAvailableCalc INT;
-    DECLARE vShipped DATE;
-    DECLARE vWarehouseFk SMALLINT;
-    DECLARE vZoneFk INT;
-    DECLARE vDone BOOL;
-    DECLARE cTravelTree CURSOR FOR
-        SELECT zoneFk, warehouseFk, shipped FROM tmp.zoneGetShipped;
-
-    DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-    
-    -- Establece los almacenes y las fechas que van a entrar al disponible
-        
-	CALL vn.zone_getShipped (vLanded, vAddressFk, vAgencyModeFk, FALSE);
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
-    CREATE TEMPORARY TABLE tmp.ticketLot(
-      `warehouseFk` smallint(5) unsigned NOT NULL,
-      `itemFk` int(11) NOT NULL,
-      `available` double DEFAULT NULL,
-      `buyFk` int(11) DEFAULT NULL,
-      `fix` tinyint(3) unsigned DEFAULT '0',
-      `zoneFk` int(11) NOT NULL,
-      KEY `itemFk` (`itemFk`),
-      KEY `item_warehouse` (`itemFk`,`warehouseFk`) USING HASH
-    ) ENGINE=MEMORY DEFAULT CHARSET=utf8;
-                
-	CALL catalog_componentPrepare();
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketCalculateItem;
-	CREATE TEMPORARY TABLE tmp.ticketCalculateItem(
-		itemFk INT(11) NOT NULL, 
-		available INT(11),
-		producer VARCHAR(50), 
-		item VARCHAR(50), 
-		size INT(10) UNSIGNED,  
-		stems INT(11),  
-		category VARCHAR(3), 
-		inkFk VARCHAR(3),  
-		image VARCHAR(50),
-		origin VARCHAR(3), 
-		price DECIMAL(10,2),
-		priceKg DECIMAL(10,2),
-    KEY `itemFk` (`itemFk`)
-    ) ENGINE = MEMORY DEFAULT CHARSET=utf8;
-		            
-    OPEN cTravelTree;
-
-    l: LOOP
-        SET vDone = FALSE;
-        FETCH cTravelTree INTO vZoneFk, vWarehouseFk, vShipped;
-
-        IF vDone THEN
-            LEAVE l;
-        END IF;
-
-        CALL `cache`.available_refresh (vAvailableCalc, FALSE, vWarehouseFk, vShipped);
-        CALL buyUltimate (vWarehouseFk, vShipped);
-                    
-        INSERT INTO tmp.ticketLot (warehouseFk, itemFk, available, buyFk, zoneFk)
-			SELECT vWarehouseFk,
-					i.item_id,
-					IFNULL(i.available, 0),
-					bu.buyFk,
-                    vZoneFk
-				FROM `cache`.available i
-					JOIN tmp.item br ON br.itemFk = i.item_id
-					LEFT JOIN item it ON it.id = i.item_id
-					LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = i.item_id
-				WHERE i.calc_id = vAvailableCalc
-					AND i.available > 0;
-                    
-        DROP TEMPORARY TABLE tmp.buyUltimate;
-        
-        CALL vn.catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
-
-        INSERT INTO tmp.ticketCalculateItem (
-					itemFk, 
-					available, 
-                    producer, 
-                    item, 
-                    size, 
-                    stems, 
-                    category, 
-                    inkFk,
-                    image,
-                    origin,
-                    price,
-                    priceKg)
-        SELECT 
-				tl.itemFk, 
-				SUM(tl.available) available,
-				p.name producer, 
-				i.name item, 
-				i.size size,  
-				i.stems,  
-				i.category, 
-				i.inkFk,  
-				i.image,
-				o.code origin, 
-                bl.price,
-                bl.priceKg
-			FROM tmp.ticketLot tl
-				JOIN item i ON tl.itemFk = i.id
-				LEFT JOIN producer p ON p.id = i.producerFk AND p.isVisible
-				JOIN origin o ON o.id = i.originFk
-				JOIN (
-					SELECT MIN(price) price, itemFk, priceKg
-						FROM tmp.ticketComponentPrice
-                            WHERE warehouseFk = vWarehouseFk
-						GROUP BY itemFk
-				) bl ON bl.itemFk = tl.itemFk
-			WHERE tl.zoneFk = vZoneFk AND tl.warehouseFk = vWarehouseFk
-			GROUP BY tl.itemFk;
-            -- on duplicatekey update
-
-    END LOOP;
-
-    CLOSE cTravelTree;
-        
-END$$
-
-DELIMITER ;
-
--- a/db/changes/10180-holyWeek/02-catalog_componentCalculate.sql
+++ b/db/changes/10180-holyWeek/02-catalog_componentCalculate.sql
@ -1,262 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `catalog_componentCalculate`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `catalog_componentCalculate`(
-    vZoneFk INT,
-    vAddressFk INT,
-    vShipped DATE,
-    vWarehouseFk INT)
-proc: BEGIN
-/**
- * Calcula los componentes de los articulos de tmp.ticketLot
- *
- * @param vZoneFk para calcular el transporte
- * @param vAddressFk Consignatario 
- * @param vShipped dia de salida del pedido
- * @param tmp.ticketLot (warehouseFk, available, itemFk, buyFk, zoneFk)
- *
- * @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 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,
-            IF(i.hasKgPrice, b.weight / b.packing, NULL) weightGrouping
-        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, zw.warehouseFk
-					FROM priceFixed pf
-					JOIN zoneWarehouse zw ON zw.zoneFk = vZoneFk AND (zw.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
-			AND tl.zoneFk = vZoneFk AND tl.warehouseFk = vWarehouseFk;
-
-	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
-				JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tc.itemFk AND tcc.warehouseFk = tc.warehouseFk
-			GROUP BY tc.itemFk, warehouseFk;
-                
-	INSERT INTO tmp.ticketComponent
-		SELECT tcb.warehouseFk, tcb.itemFk, vRecoveryComponent, ROUND(tcb.base * LEAST(cr.priceIncreasing, 0.25), 3)
-			FROM tmp.ticketComponentBase tcb
-			JOIN claimRatio cr ON cr.clientFk = vClientFk
-				WHERE cr.priceIncreasing > 0.009;
-            
-    INSERT INTO tmp.ticketComponent
-		SELECT tcb.warehouseFk, tcb.itemFk, vManaAutoComponent, ROUND(base * (0.01 + wm.pricesModifierRate), 3) as manaAuto
-			FROM tmp.ticketComponentBase tcb
-				JOIN `client` c on c.id = vClientFk
-				JOIN workerMana wm ON c.salesPersonFk = wm.workerFk 
-			WHERE wm.isPricesModifierActivated
-			HAVING manaAuto <> 0;
-	
-	INSERT INTO tmp.ticketComponent
-		SELECT tcb.warehouseFk, 
-                tcb.itemFk, 
-                c.id, 
-                GREATEST(IFNULL(ROUND(tcb.base * c.tax, 4), 0), tcc.minPrice - tcc.rate3)
-			FROM tmp.ticketComponentBase tcb
-				JOIN component c
-				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 c.id = vDiscountLastItemComponent AND c.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;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.zone;
-	CREATE TEMPORARY TABLE IF NOT EXISTS tmp.zone (INDEX (id))
-			ENGINE = MEMORY
-        SELECT vZoneFk id;
-        
-	CALL zone_getOptionsForShipment(vShipped, TRUE);
-        
-	INSERT INTO tmp.ticketComponent
-		SELECT tcc.warehouseFK, 
-				tcc.itemFk,
-				vDeliveryComponent, 
-				vGeneralInflationCoefficient
-				* ROUND((
-					i.compression
-					* ic.cm3 
-					* IF(am.deliveryMethodFk = 1, (GREATEST(i.density, vMinimumDensityWeight) / vMinimumDensityWeight), 1)
-					* IFNULL((zo.price - zo.bonus)
-					* 1/*amz.inflation*/ , 50)) / vBoxVolume, 4
-				) cost
-		FROM tmp.ticketComponentCalculate tcc
-			JOIN item i ON i.id = tcc.itemFk
-            JOIN tmp.zoneOption zo ON zo.zoneFk = vZoneFk
-            JOIN zone z ON z.id = vZoneFk
-			JOIN agencyMode am ON am.id = z.agencyModeFk
-			LEFT JOIN itemCost ic ON ic.warehouseFk = tcc.warehouseFk 
-				AND ic.itemFk = tcc.itemFk
-			HAVING cost <> 0; 
-    
-    DROP TEMPORARY TABLE tmp.zoneOption;
-    
-    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 component c ON c.id = tcc.componentFk
-				JOIN specialPrice sp ON sp.clientFk = vClientFK AND sp.itemFk = tcc.itemFk
-			WHERE c.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, c.classRate
-			FROM tmp.ticketComponent tc
-				JOIN component c ON c.id = tc.componentFk
-			GROUP BY tc.itemFk, tc.warehouseFk, c.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,
-                CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) / weightGrouping priceKg                
-			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, priceKg)
-        SELECT 
-				tcc.warehouseFk, 
-				tcc.itemFk, 
-				2 rate, 
-				tcc.packing `grouping`, 
-				SUM(tcs.sumCost) price,
-                SUM(tcs.sumCost) / weightGrouping priceKg   
-			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, priceKg)
-		 SELECT 				
-		 		tcc.warehouseFk, 
-				tcc.itemFk, 
-				3 rate, 
-				tcc.available `grouping`, 
-				SUM(tcs.sumCost) price,
-                SUM(tcs.sumCost) / weightGrouping priceKg   
-			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;
-        
-	INSERT INTO tmp.ticketComponentPrice (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
-		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 ;
-
--- a/db/changes/10180-holyWeek/02-catalog_componentPrepare.sql
+++ b/db/changes/10180-holyWeek/02-catalog_componentPrepare.sql
@ -1,33 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `catalog_componentPrepare`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE PROCEDURE `catalog_componentPrepare` ()
-BEGIN
-              
-    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 `fkItemWarehouseComponent` (`itemFk` ASC, `warehouseFk` ASC, `componentFk` ASC)
-	)ENGINE=MEMORY DEFAULT CHARSET=utf8;
-        
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentPrice;
-    CREATE TEMPORARY TABLE tmp.ticketComponentPrice (  
-		`warehouseFk` INT UNSIGNED NOT NULL,
-		`itemFk` INT NOT NULL,
-		`rate` INT NOT NULL,
-		`grouping` INT UNSIGNED NOT NULL,
-		`price` DECIMAL(10,4) NOT NULL,
-        `priceKg` DECIMAL(10,4),
-		INDEX `itemWarehouse` USING BTREE (`itemFk` ASC, `warehouseFk` ASC),
-		UNIQUE `fkItemWarehouseRate` (`itemFk` ASC, `warehouseFk` ASC, `rate` ASC)
-	)ENGINE=MEMORY DEFAULT CHARSET=utf8;    
-END$$
-
-DELIMITER ;
-
--- a/db/changes/10180-holyWeek/02-catalog_componentPurge.sql
+++ b/db/changes/10180-holyWeek/02-catalog_componentPurge.sql
@ -1,16 +0,0 @@
-
-USE `vn`;
-DROP procedure IF EXISTS `vn`.`catalog_componentPurge`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `catalog_componentPurge`()
-BEGIN
-	DROP TEMPORARY TABLE 
-        tmp.ticketComponentPrice,
-        tmp.ticketComponent,
-        tmp.ticketLot;
-END$$
-
-DELIMITER ;
-;
--- a/db/changes/10180-holyWeek/02-order_confirmWithUser.sql
+++ b/db/changes/10180-holyWeek/02-order_confirmWithUser.sql
@ -1,250 +0,0 @@
-USE `hedera`;
-DROP procedure IF EXISTS `order_confirmWithUser`;
-
-DELIMITER $$
-USE `hedera`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `order_confirmWithUser`(IN `vOrder` INT, IN `vUserId` INT)
-BEGIN
-/**
- * Confirms an order, creating each of its tickets on the corresponding
- * date, store and user.
- *
- * @param vOrder The order identifier
- * @param vUser The user identifier
- */
-	DECLARE vOk BOOL;
-	DECLARE vDone BOOL DEFAULT FALSE;
-	DECLARE vWarehouse INT;
-	DECLARE vShipment DATETIME;
-	DECLARE vTicket INT;
-	DECLARE vNotes VARCHAR(255);
-	DECLARE vItem INT;
-	DECLARE vConcept VARCHAR(30);
-	DECLARE vAmount INT;
-	DECLARE vPrice DECIMAL(10,2);
-	DECLARE vSale INT;
-	DECLARE vRate INT;
-	DECLARE vRowId INT;
-	DECLARE vDelivery DATE;
-	DECLARE vAddress INT;
-	DECLARE vIsConfirmed BOOL;
-	DECLARE vClientId INT;
-	DECLARE vCompanyId INT;
-	DECLARE vAgencyModeId INT;
-	DECLARE TICKET_FREE INT DEFAULT 2;
-
-	DECLARE cDates CURSOR FOR
-		SELECT zgs.shipped, r.warehouse_id
-			FROM `order` o
-				JOIN order_row r ON r.order_id = o.id
-				LEFT JOIN tmp.zoneGetShipped zgs ON zgs.warehouseFk = r.warehouse_id
-			WHERE o.id = vOrder AND r.amount != 0
-			GROUP BY r.warehouse_id;
-
-	DECLARE cRows CURSOR FOR 
-		SELECT r.id, r.item_id, i.name, r.amount, r.price, r.rate
-			FROM order_row r
-				JOIN vn.item i ON i.id = r.item_id
-			WHERE r.amount != 0
-				AND r.warehouse_id = vWarehouse
-				AND r.order_id = vOrder
-			ORDER BY r.rate DESC;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND
-		SET vDone = TRUE;
-
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		ROLLBACK;
-		RESIGNAL;
-	END;
-
-	-- Carga los datos del pedido
-
-	SELECT o.date_send, o.address_id, o.note,
-			o.confirmed, a.clientFk, o.company_id, o.agency_id
-		INTO vDelivery, vAddress, vNotes, 
-			vIsConfirmed, vClientId, vCompanyId, vAgencyModeId
-		FROM hedera.`order` o
-			JOIN vn.address a ON a.id = o.address_id
-		WHERE o.id = vOrder;
-			
-	-- Comprueba que el pedido no está confirmado
-
-	IF vIsConfirmed THEN
-		CALL util.throw ('ORDER_ALREADY_CONFIRMED');
-	END IF;
-
-	-- Comprueba que el pedido no está vacío
-
-	SELECT COUNT(*) > 0 INTO vOk
-		FROM order_row WHERE order_id = vOrder AND amount > 0;
-
-	IF NOT vOk THEN
-		CALL util.throw ('ORDER_EMPTY');
-	END IF;
-
-	-- Carga las fechas de salida de cada almacén
-
-	CALL vn.zone_getShipped (vDelivery, vAddress, vAgencyModeId, FALSE);
-
-	-- Trabajador que realiza la acción
-
-	IF vUserId IS NULL THEN
-		SELECT employeeFk INTO vUserId FROM orderConfig;
-	END IF;
-
-	-- Crea los tickets del pedido
-
-	START TRANSACTION;
-
-	OPEN cDates;
-
-	lDates:
-	LOOP
-		SET vTicket = NULL;
-		SET vDone = FALSE;
-		FETCH cDates INTO vShipment, vWarehouse;
-		
-		IF vDone THEN
-			LEAVE lDates;
-		END IF;
-
-		-- Busca un ticket existente que coincida con los parametros
-
-		SELECT t.id INTO vTicket
-			FROM vn.ticket t
-				LEFT JOIN vn.ticketState tls on tls.ticket = t.id
-				JOIN `order` o
-					ON o.address_id = t.addressFk
-						AND vWarehouse = t.warehouseFk
-						AND o.agency_id = t.agencyModeFk
-						AND o.date_send = t.landed 
-						AND vShipment = DATE(t.shipped)
-			WHERE o.id = vOrder
-				AND t.invoiceOutFk IS NULL
-				AND IFNULL(tls.alertLevel,0) = 0
-                AND t.clientFk <> 1118
-			LIMIT 1;
-		
-		-- Crea el ticket en el caso de no existir uno adecuado
-
-		IF vTicket IS NULL
-		THEN
-			CALL vn.ticketCreateWithUser(
-				vClientId,
-				IFNULL(vShipment, CURDATE()),
-				vWarehouse,
-				vCompanyId,
-				vAddress,
-				vAgencyModeId,
-				NULL,
-				vDelivery,
-				vUserId,
-				vTicket
-			);
-		ELSE
-			INSERT INTO vncontrol.inter
-				SET Id_Ticket = vTicket,
-					Id_Trabajador = vUserId,
-					state_id = TICKET_FREE;
-		END IF;
-		
-		INSERT IGNORE INTO vn.orderTicket
-			SET orderFk = vOrder,
-				ticketFk = vTicket;
-
-		-- Añade las notas
-
-		IF vNotes IS NOT NULL AND vNotes != ''
-		THEN
-			INSERT INTO vn.ticketObservation SET
-					ticketFk = vTicket,
-					observationTypeFk = 4 /* salesperson */ ,
-					`description` = vNotes
-				ON DUPLICATE KEY UPDATE
-					`description` = CONCAT(VALUES(`description`),'. ', `description`);
-		END IF;
-
-		-- Añade los movimientos y sus componentes
-
-		OPEN cRows;
-
-		lRows:
-		LOOP
-			SET vDone = FALSE;
-			FETCH cRows INTO vRowId, vItem, vConcept, vAmount, vPrice, vRate;
-
-			IF vDone THEN
-				LEAVE lRows;
-			END IF;
-			SET vSale = NULL;
-			SELECT s.id INTO vSale
-				FROM vn.sale s
-				WHERE ticketFk = vTicket
-					AND price = vPrice
-					AND itemFk = vItem
-				LIMIT 1;
-			IF vSale THEN
-				UPDATE vn.sale
-					SET quantity = quantity + vAmount
-					WHERE id = vSale;
-			ELSE
-				INSERT INTO vn.sale 
-				SET
-					itemFk = vItem,
-					ticketFk = vTicket,
-					concept = vConcept,
-					quantity = vAmount,
-					price = vPrice,
-					priceFixed = 0,
-					isPriceFixed = TRUE;
-
-				SET vSale = LAST_INSERT_ID();
-
-				INSERT INTO vn.saleComponent
-					(saleFk, componentFk, `value`)
-					SELECT vSale, cm.component_id, cm.price
-						FROM order_component cm
-							JOIN vn.component c ON c.id = cm.component_id
-						WHERE cm.order_row_id = vRowId
-						GROUP BY vSale, cm.component_id;
-			END IF;
-			UPDATE order_row SET Id_Movimiento = vSale 
-				WHERE id = vRowId;
-
-		END LOOP;
-
-		CLOSE cRows;
-
-		-- Fija el coste
-
-		DROP TEMPORARY TABLE IF EXISTS tComponents;
-		CREATE TEMPORARY TABLE tComponents
-			(INDEX (saleFk))
-			ENGINE = MEMORY
-			SELECT SUM(sc.`value`) valueSum, sc.saleFk
-				FROM vn.saleComponent sc
-					JOIN vn.component c ON c.id = sc.componentFk
-					JOIN vn.componentType ct ON ct.id = c.typeFk AND ct.isBase
-					JOIN vn.sale s ON s.id = sc.saleFk
-				WHERE s.ticketFk = vTicket
-				GROUP BY sc.saleFk;
-
-		UPDATE vn.sale s
-			JOIN tComponents mc ON mc.saleFk = s.id
-			SET s.priceFixed = valueSum;
-
-		DROP TEMPORARY TABLE tComponents;
-	END LOOP;
-
-	CLOSE cDates;
-
-	DELETE FROM basketOrder WHERE orderFk = vOrder;
-	UPDATE `order` SET confirmed = TRUE, confirm_date = NOW() 
-		WHERE id = vOrder;
-
-	COMMIT;
-END$$
-
-DELIMITER ;
--- a/db/changes/10180-holyWeek/02-sale_calculateComponent.sql
+++ b/db/changes/10180-holyWeek/02-sale_calculateComponent.sql
@ -1,103 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `sale_calculateComponent`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `sale_calculateComponent`(vSale INT, vOption INT)
-proc: BEGIN
-/**
- * Actualiza los componentes
- *
- * @param vSale Delivery date
- * @param vOption indica en que componente pone el descuadre, NULL en casos habituales
- */  
-	DECLARE vShipped DATE; 
-	DECLARE vWarehouseFk SMALLINT;
-    DECLARE vAgencyModeFk INT;
-    DECLARE vAddressFk INT;
-    DECLARE vTicketFk BIGINT;
-    DECLARE vItemFk BIGINT;
-    DECLARE vLanded DATE; 
-    DECLARE vIsEditable BOOLEAN;
-    DECLARE vZoneFk INTEGER;
-    
-	SELECT t.refFk IS NULL AND (IFNULL(ts.alertLevel, 0) = 0 OR s.price = 0), 
-				s.ticketFk, 
-				s.itemFk , 
-				t.zoneFk, 
-				t.warehouseFk, 
-				t.shipped, 
-				t.addressFk, 
-				t.agencyModeFk, 
-				t.landed
-			INTO vIsEditable, 
-				vTicketFk, 
-				vItemFk, 
-				vZoneFk, 
-				vWarehouseFk, 
-				vShipped, 
-				vAddressFk, 
-				vAgencyModeFk, 
-				vLanded
-		FROM ticket t
-			JOIN sale s ON s.ticketFk = t.id
-			LEFT JOIN ticketState ts ON ts.ticketFk = t.id
-		WHERE s.id = vSale;
-
-	IF vLanded IS NULL OR vZoneFk IS NULL THEN
-
-		CALL zone_getLanded(vShipped, vAddressFk, vAgencyModeFk, vWarehouseFk);
-
-		IF (SELECT COUNT(*) FROM tmp.zoneGetLanded LIMIT 1) = 0 THEN
-			CALL util.throw('There is no zone for these parameters');
-		END IF;
-
-		UPDATE ticket t
-			SET t.landed = (SELECT landed FROM tmp.zoneGetLanded LIMIT 1) 
-			WHERE t.id = vTicketFk AND t.landed IS NULL;
-
-		IF vZoneFk IS NULL THEN
-			SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetLanded LIMIT 1;
-			UPDATE ticket t
-				SET t.zoneFk = vZoneFk
-				WHERE t.id = vTicketFk AND t.zoneFk IS NULL;
-		END IF;
-		DROP TEMPORARY TABLE tmp.zoneGetLanded;
-		
-	END IF;
-
-	-- rellena la tabla buyUltimate con la ultima compra	
-    CALL buyUltimate (vWarehouseFk, vShipped);  
-    
-	DELETE FROM tmp.buyUltimate WHERE itemFk != vItemFk;
-    
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
-    CREATE TEMPORARY TABLE tmp.ticketLot 
-		SELECT vWarehouseFk warehouseFk, NULL available, vItemFk itemFk, buyFk, vZoneFk zoneFk
-				FROM tmp.buyUltimate
-				WHERE itemFk = vItemFk;
-                    
-	CALL catalog_componentPrepare();           
-	CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
-
-    DROP TEMPORARY TABLE IF EXISTS tmp.sale;
-	CREATE TEMPORARY TABLE tmp.sale
-					(PRIMARY KEY (saleFk)) ENGINE = MEMORY
-		SELECT vSale saleFk,vWarehouseFk warehouseFk;
-
-    IF vOption IS NULL THEN
-		SET vOption = IF(vIsEditable, 1, 6);
-    END IF;
-    
-	CALL ticketComponentUpdateSale(vOption); 
-
-	INSERT INTO ticketLog (originFk, userFk, `action`, description)
-		VALUES (vTicketFk, account.userGetId(), 'update', CONCAT('Bionizo linea id ', vSale));
-	
-    CALL catalog_componentPurge();
-	DROP TEMPORARY TABLE tmp.buyUltimate;
-    DROP TEMPORARY TABLE tmp.sale;
-END$$
-
-DELIMITER ;
-
--- a/db/changes/10180-holyWeek/02-ticketCalculateClon.sql
+++ b/db/changes/10180-holyWeek/02-ticketCalculateClon.sql
@ -1,93 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticketCalculateClon`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculateClon`(IN vTicketNew INT, vTicketOld INT)
-BEGIN
-/*
- * Recalcula los componentes un ticket clonado,
- * las lineas a precio cero fuerza para que tengan precio, el resto lo respeta
- * @param vTicketNew nuevo ticket clonado
- * @param vTicketOld icket original, a partir del qual se clonara el nuevo
-*/
-	DECLARE vShipped DATE;
-	DECLARE vClient INT;
-	DECLARE vWarehouse SMALLINT;
-	DECLARE vAgencyMode INT;
-	DECLARE vAddress INT;
-	DECLARE vLanded DATE;
-	DECLARE vAgency INT;
-	DECLARE vZoneFk INT;
-
-	REPLACE INTO orderTicket(orderFk,ticketFk)
-		SELECT orderFk, vTicketNew 
-			FROM orderTicket 
-            WHERE ticketFk = vTicketOld;
-    
-	SELECT t.clientFk, t.warehouseFk, date(t.shipped), t.addressFk, t.agencyModeFk, t.landed, a.agencyFk, t.zoneFk
-		INTO vClient, vWarehouse, vShipped, vAddress, vAgencyMode, vLanded, vAgency, vZoneFk
-	FROM agencyMode a
-		JOIN ticket t ON t.agencyModeFk = a.id
-	WHERE t.id = vTicketNew;
-
-	IF vLanded IS NULL THEN
-		CALL zone_getLanded(vShipped, vAddress, vAgency, vWarehouse);
-		UPDATE ticket t
-				JOIN tmp.zoneGetLanded zgl ON t.warehouseFk = zgl.warehouseFk 
-			SET t.landed = zgl.landed,
-				t.zone = zgl.zoneFk
-			WHERE t.id = vTicketNew;
-		
-		SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetLanded LIMIT 1;
-		DROP TEMPORARY TABLE IF EXISTS tmp.zoneGetLanded;
-	END IF;
-
-	-- rellena la tabla tmp.buyUltimate con la ultima compra
-	CALL buyUltimate(vWarehouse, vShipped);  
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
-	CREATE TEMPORARY TABLE tmp.ticketLot 
-		SELECT vWarehouse warehouseFk, NULL available, s.itemFk, bu.buyFk, vZoneFk zoneFk
-			FROM sale s
-				LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
-			WHERE s.ticketFk = vTicketOld GROUP BY s.itemFk;
-					
-	CALL catalog_componentPrepare();            
-	CALL catalog_componentCalculate(vZoneFk, vAddress, vAgencyMode, vWarehouse);
-
-	-- Bionizamos lineas con Preu = 0
-	DROP TEMPORARY TABLE IF EXISTS tmp.sale;
-	CREATE TEMPORARY TABLE tmp.sale
-				(PRIMARY KEY (saleFk)) ENGINE = MEMORY
-			SELECT s.id saleFk, vWarehouse warehouseFk 
-				FROM sale s
-					JOIN ticket t on t.id = s.ticketFk WHERE s.ticketFk =  vTicketNew AND s.price = 0;
-				
-	CALL ticketComponentUpdateSale(1);
-
-	-- Bionizamos lineas con Preu > 0
-	DROP TEMPORARY TABLE IF EXISTS tmp.sale;
-	CREATE TEMPORARY TABLE tmp.sale
-				(PRIMARY KEY (saleFk)) ENGINE = MEMORY
-			SELECT s.id saleFk, vWarehouse warehouseFk 
-				FROM sale s 
-					JOIN ticket t on t.id = s.ticketFk WHERE s.ticketFk =  vTicketNew
-					AND s.price > 0;
-				
-	CALL ticketComponentUpdateSale(6);
-
-	-- Log
-	CALL `logAdd`(vTicketNew, 'update', ' ticket' , 'Bioniza Ticket');
-
-	-- Limpieza
-	CALL catalog_componentPurge();
-	DROP TEMPORARY TABLE IF EXISTS 
-		tmp.buyUltimate, 
-		tmp.sale, 
-		tmp.zoneGetLanded;
-    
-END$$
-
-DELIMITER ;
-
--- a/db/changes/10180-holyWeek/02-ticketCalculateSaleForcePrice.sql
+++ b/db/changes/10180-holyWeek/02-ticketCalculateSaleForcePrice.sql
@ -1,61 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticketCalculateSaleForcePrice`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculateSaleForcePrice`(IN vSale BIGINT)
-proc: BEGIN
-
-	DECLARE vShipped DATE; 
-	DECLARE vWarehouseFk SMALLINT;
-    DECLARE vAddressFk INT;
-    DECLARE vTicket BIGINT;
-    DECLARE vItem BIGINT;
-    DECLARE vZoneFk INT;    
-    
-    SELECT ticketFk, itemFk 
-			INTO vTicket, vItem 
-		FROM sale 
-        WHERE id = vSale;
-    	
-	SELECT t.warehouseFk, DATE(t.shipped), t.addressFk, t.zoneFk
-			INTO vWarehouseFk, vShipped, vAddressFk, vZoneFk
-		FROM agencyMode a 
-			JOIN ticket t ON t.agencyModeFk = a.id
-		WHERE t.id = vTicket;
-  
-    IF vZoneFk IS NULL THEN
-		CALL util.throw('ticket without zone');
-    END IF;
-    
-    CALL buyUltimate (vWarehouseFk, vShipped);  
-    
-	DELETE FROM tmp.buyUltimate WHERE itemFk != vItem;
-    
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
-    CREATE TEMPORARY TABLE tmp.ticketLot 
-		SELECT vWarehouseFk warehouseFk, NULL available, vItem itemFk, buyFk, vZoneFk zoneFk
-				FROM tmp.buyUltimate
-				WHERE itemFk = vItem;
-                    
-	CALL catalog_componentPrepare();
-	CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
-    
-    DROP TEMPORARY TABLE IF EXISTS tmp.sale;
-	CREATE TEMPORARY TABLE tmp.sale
-					(PRIMARY KEY (saleFk)) ENGINE = MEMORY
-		SELECT vSale saleFk,vWarehouseFk warehouseFk;
-                
-	CALL ticketComponentUpdateSale(1); 
-
-	INSERT INTO vn.ticketLog (originFk, userFk, `action`, description)
-		VALUES (vTicket, account.userGetId(), 'update', CONCAT('Bionizo linea id ', vSale));
-	
-    CALL catalog_componentPurge();
-	DROP TEMPORARY TABLE tmp.buyUltimate;
-    DROP TEMPORARY TABLE tmp.sale;
-    
-END$$
-
-DELIMITER ;
-
--- a/db/changes/10180-holyWeek/02-ticketComponentUpdateSale.sql
+++ b/db/changes/10180-holyWeek/02-ticketComponentUpdateSale.sql
@ -1,154 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticketComponentUpdateSale`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketComponentUpdateSale`(vOption INT)
-BEGIN
-/**
- * A partir de la tabla tmp.sale, crea los Movimientos_componentes
- * y modifica el campo Preu de la tabla Movimientos
- *
- * @param i_option integer tipo de actualizacion
- * @param table tmp.sale  tabla memory con el campo saleFk, warehouseFk
- **/
-	DECLARE vComponentFk INT;
-    DECLARE vRenewComponents BOOLEAN;
-    DECLARE vKeepPrices BOOLEAN;
-    
-    CASE vOption
-		WHEN 1 THEN  
-			SET vRenewComponents = TRUE;
-            SET vKeepPrices = FALSE;
-		WHEN 2 THEN
-			SELECT id INTO vComponentFk FROM component WHERE `code` = 'debtCollection'; 
-			SET vRenewComponents = TRUE;
-            SET vKeepPrices = TRUE;
-		WHEN 3 THEN 
-			SELECT id INTO vComponentFk FROM component WHERE `code` = 'mana'; 
-			SET vRenewComponents = TRUE;
-            SET vKeepPrices = TRUE;	
-		WHEN 4 THEN 
-			SELECT id INTO vComponentFk FROM component WHERE `code` = 'buyerDiscount'; 
-			SET vRenewComponents = TRUE;
-            SET vKeepPrices = TRUE;
-       /* WHEN 5 THEN 
-			SET vComponentFk = 35;
-			SET vRenewComponents = TRUE;
-            SET vKeepPrices = TRUE;*/
-		WHEN 6 THEN 
-    		SELECT id INTO vComponentFk FROM component WHERE `code` = 'imbalance';
-			SET vRenewComponents = TRUE;
-            SET vKeepPrices = TRUE;
-        WHEN 7 THEN
-		    REPLACE INTO saleComponent(saleFk, componentFk, value)
-				SELECT s.id, 28, ROUND(((s.price * (100 - s.discount) / 100) - SUM(IFNULL(sc.value, 0))) * 0.8, 3) 
-				    FROM sale s
-                        JOIN tmp.sale tmps ON tmps.saleFk = s.id
-				        LEFT JOIN saleComponent sc ON sc.saleFk = s.id 
-                            AND sc.componentFk NOT IN (28, 29)
-                    GROUP BY s.id;
-			
-			REPLACE INTO saleComponent(saleFk, componentFk, value)
-				SELECT s.id, 29, ROUND(((s.price * (100 - s.discount) / 100) - SUM(IFNULL(sc.value, 0))) * 0.2, 3) 
-				    FROM sale s
-                        JOIN tmp.sale tmps ON tmps.saleFk = s.id
-				        LEFT JOIN saleComponent sc ON sc.saleFk = s.id 
-                            AND sc.componentFk NOT IN (28, 29)
-                GROUP BY s.id;
-                
-			SET vRenewComponents = FALSE;
-            SET vKeepPrices = FALSE;
-		WHEN 8 THEN
-            DELETE sc.* 
-				FROM tmp.sale tmps JOIN saleComponent sc ON sc.saleFk = tmps.saleFk;
-			
-			REPLACE INTO saleComponent(saleFk, componentFk, value)
-				SELECT s.id, 28, ROUND(((s.price * (100 - s.discount) / 100)), 3) 
-                    FROM sale s
-                        JOIN tmp.sale tmps ON tmps.saleFk = s.id;
-				
-			SET vRenewComponents = FALSE;
-            SET vKeepPrices = FALSE;
-		WHEN 9 THEN  
-			SET vRenewComponents = TRUE;
-            SET vKeepPrices = TRUE;
-    END CASE;
-
-    IF vRenewComponents THEN
-        DELETE sc.* 
-            FROM tmp.sale tmps 
-                JOIN saleComponent sc ON sc.saleFk = tmps.saleFk
-                JOIN `component` c ON c.id = sc.componentFk
-        WHERE c.isRenewable;
-				
-        REPLACE INTO saleComponent(saleFk, componentFk, value)
-            SELECT s.id, tc.componentFk, tc.cost
-                FROM sale s 
-                    JOIN tmp.sale tmps ON tmps.saleFk = s.id
-                    JOIN tmp.ticketComponent tc ON tc.itemFk = s.itemFk AND tc.warehouseFk = tmps.warehouseFk
-                    LEFT JOIN saleComponent sc ON sc.saleFk = s.id 
-                        AND sc.componentFk = tc.componentFk 
-                    LEFT JOIN `component` c ON c.id = tc.componentFk 
-                WHERE IF(sc.componentFk IS NULL AND NOT c.isRenewable, FALSE, TRUE);
-    END IF;
-
-    IF vKeepPrices THEN
-		REPLACE INTO saleComponent(saleFk, componentFk, value)
-		    SELECT s.id, vComponentFk, ROUND((s.price * (100 - s.discount) / 100) - SUM(sc.value), 3) dif
-		        FROM sale s
-                    JOIN tmp.sale tmps ON tmps.saleFk = s.id
-                    LEFT JOIN saleComponent sc ON sc.saleFk = s.id
-		    WHERE  sc.saleFk <> vComponentFk
-		    GROUP BY s.id
-		    HAVING dif <> 0;
-    ELSE
-		UPDATE sale s
-			JOIN item i on i.id = s.itemFk
-			JOIN itemType it on it.id = i.typeFk
-				JOIN (SELECT SUM(sc.value) sumValue, sc.saleFk 
-						FROM saleComponent sc
-							JOIN tmp.sale tmps ON tmps.saleFk = sc.saleFk
-						GROUP BY sc.saleFk) sc ON sc.saleFk = s.id
-				SET s.price = sumValue
-			WHERE it.code != 'PRT' ; 
-            
-		REPLACE INTO saleComponent(saleFk, componentFk, value)
-			SELECT s.id, 21, ROUND((s.price * (100 - s.discount) / 100) - SUM(value), 3) saleValue
-				FROM sale s
-					JOIN tmp.sale tmps ON tmps.saleFk = s.id
-					LEFT JOIN saleComponent sc ON sc.saleFk = s.id
-				WHERE sc.componentFk != 21
-				GROUP BY s.id 
-				HAVING ROUND(saleValue, 4) <> 0;
-    END IF;
-    
-    UPDATE sale s
-		JOIN (
-			SELECT SUM(sc.value) sumValue, sc.saleFk 
-				FROM saleComponent sc
-					JOIN tmp.sale tmps ON tmps.saleFk = sc.saleFk
-					JOIN `component` c ON c.id = sc.componentFk
-					JOIN componentType ct on ct.id = c.typeFk AND ct.isBase
-				GROUP BY sc.saleFk) sc ON sc.saleFk = s.id
-		SET s.priceFixed = sumValue, s.isPriceFixed = 1;
-
-    DELETE sc.*
-		FROM saleComponent sc
-			JOIN tmp.sale tmps ON tmps.saleFk = sc.saleFk
-			JOIN sale s on s.id = sc.saleFk
-			JOIN item i ON i.id = s.itemFk
-			JOIN itemType it ON it.id = i.typeFk
-		WHERE it.code = 'PRT'; 
-		
-	INSERT INTO saleComponent(saleFk, componentFk, value)
-		SELECT s.id, 15, s.price   
-			FROM sale s
-				JOIN tmp.sale tmps ON tmps.saleFk = s.id
-				JOIN item i ON i.id = s.itemFK
-				JOIN itemType it ON it.id = i.typeFk
-		WHERE it.code = 'PRT' AND s.price > 0;
-END$$
-
-DELIMITER ;
-
--- a/db/changes/10180-holyWeek/02-ticket_componentMakeUpdate.sql
+++ b/db/changes/10180-holyWeek/02-ticket_componentMakeUpdate.sql
@ -1,107 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticket_componentMakeUpdate`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_componentMakeUpdate`(	
-	vTicketFk INT,
-	vClientFk INT,
-	vAgencyModeFk INT,
-	vAddressFk INT,
-	vZoneFk INT,
-	vWarehouseFk TINYINT,
-	vCompanyFk SMALLINT,
-	vShipped DATETIME,
-	vLanded DATE,
-	vIsDeleted BOOLEAN,
-	vHasToBeUnrouted BOOLEAN,
-	vOption INT)
-BEGIN
-/**
- * Modifica en el ticket los campos que se le pasan por parámetro
- * y cambia sus componentes
- * 
- * @param vTicketFk Id del ticket a modificar
- * @param vClientFk nuevo cliente
- * @param vAgencyModeFk nueva agencia
- * @param vAddressFk nuevo consignatario
- * @param vZoneFk nueva zona
- * @param vWarehouseFk nuevo almacen
- * @param vCompanyFk nueva empresa
- * @param vShipped nueva fecha del envio de mercancia
- * @param vLanded nueva fecha de recepcion de mercancia
- * @param vIsDeleted si se borra el ticket
- * @param vHasToBeUnrouted si se le elimina la ruta  al ticket
- * @param vOption opcion para el case del proc ticketComponentUpdateSale
- */
-	DECLARE vPrice DECIMAL(10,2);
-	DECLARE vBonus DECIMAL(10,2);
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		ROLLBACK;
-		RESIGNAL;
-	END;
-
-	CALL ticket_componentPreview (vTicketFk, vLanded, vAddressFk, vZoneFk, vWarehouseFk);
-
-	START TRANSACTION;
-
-	IF (SELECT addressFk FROM ticket WHERE id = vTicketFk) <> vAddressFk THEN
-			
-		UPDATE ticket t 
-				JOIN address a ON a.id = vAddressFk
-			SET t.nickname = a.nickname
-			WHERE t.id = vTicketFk;
-			
-	END IF;
-
-	CALL zone_getShippedWarehouse(vlanded, vAddressFk, vAgencyModeFk);
-
-	SELECT zoneFk, price, bonus INTO vZoneFk, vPrice, vBonus 
-		FROM tmp.zoneGetShipped
-		WHERE shipped = vShipped AND warehouseFk = vWarehouseFk LIMIT 1;
-			
-	UPDATE ticket t
-		SET 
-			t.clientFk = vClientFk,
-			t.agencyModeFk = vAgencyModeFk,
-			t.addressFk = vAddressFk,
-			t.zoneFk = vZoneFk,
-			t.zonePrice = vPrice,
-			t.zoneBonus = vBonus,
-			t.warehouseFk = vWarehouseFk,
-			t.companyFk = vCompanyFk,
-			t.landed = vLanded,
-			t.shipped = vShipped,
-			t.isDeleted = vIsDeleted
-		WHERE
-			t.id = vTicketFk;
-			
-	IF vHasToBeUnrouted THEN
-		UPDATE ticket t SET t.routeFk = NULL
-			WHERE t.id = vTicketFk;
-	END IF;
-			
-	IF vOption <> 8 THEN
-		DROP TEMPORARY TABLE IF EXISTS tmp.sale;
-		CREATE TEMPORARY TABLE tmp.sale
-			(PRIMARY KEY (saleFk))
-			ENGINE = MEMORY
-			SELECT id AS saleFk, vWarehouseFk warehouseFk
-				FROM sale s WHERE s.ticketFk = vTicketFk;
-
-		DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent;
-		CREATE TEMPORARY TABLE tmp.ticketComponent
-			SELECT * FROM tmp.ticketComponentPreview;
-
-		CALL ticketComponentUpdateSale (vOption);
-
-		DROP TEMPORARY TABLE tmp.sale;
-		DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent;
-	END IF;
-	COMMIT;
-
-	DROP TEMPORARY TABLE tmp.zoneGetShipped, tmp.ticketComponentPreview;
-END$$
-
-DELIMITER ;
--- a/db/changes/10180-holyWeek/02-ticket_componentPreview.sql
+++ b/db/changes/10180-holyWeek/02-ticket_componentPreview.sql
@ -1,111 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticket_componentPreview`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_componentPreview`(
-	vTicketFk INT,
-    vLanded DATE, 
-    vAddressFk INT,
-    vZoneFk INT,
-    vWarehouseFk SMALLINT)
-BEGIN
-/**
- * Calcula los componentes de los articulos de un ticket
- *
- * @param vTicketFk id del ticket
- * @param vLanded nueva fecha de entrega
- * @param vAddressFk nuevo consignatario
- * @param vZoneFk nueva zona
- * @param vWarehouseFk nuevo warehouse
- *
- * @return tmp.ticketComponentPreview (warehouseFk, itemFk, componentFk, cost)
- */
-	DECLARE vHasDataChanged BOOL DEFAULT FALSE;    
-	DECLARE vHasAddressChanged BOOL;
-	DECLARE vHasZoneChanged BOOL DEFAULT FALSE;
-	DECLARE vHasWarehouseChanged BOOL DEFAULT FALSE;
-
-	DECLARE vShipped DATE;
-	DECLARE vAddressTypeRateFk INT DEFAULT NULL;
-	DECLARE vAgencyModeTypeRateFk INT DEFAULT NULL;
-
-	DECLARE vHasChangeAll BOOL DEFAULT FALSE;
-
-	SELECT DATE(landed) <> vLanded, 
-			addressFk <> vAddressFk, 
-			zoneFk <> vZoneFk,
-			warehouseFk <> vWarehouseFk
-		INTO
-			vHasDataChanged,
-			vHasAddressChanged,
-			vHasZoneChanged,
-			vHasWarehouseChanged
-		FROM vn.ticket t
-		WHERE t.id = vTicketFk;
-
-	IF vHasDataChanged OR vHasWarehouseChanged THEN
-		SET vHasChangeAll = TRUE;
-	END IF;
-
-	IF vHasAddressChanged THEN
-		SET vAddressTypeRateFk = 5;
-	END IF;
-
-	IF vHasZoneChanged THEN
-		SET vAgencyModeTypeRateFk = 6;
-	END IF;
-
-	SELECT TIMESTAMPADD(DAY, -travelingDays, vLanded) INTO vShipped 
-		FROM zone
-		WHERE id = vZoneFk;
-		
-	CALL buyUltimate(vWarehouseFk, vShipped);
-		
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
-	CREATE TEMPORARY TABLE tmp.ticketLot ENGINE = MEMORY ( 
-	SELECT 
-			vWarehouseFk AS warehouseFk,
-			NULL AS available,
-			s.itemFk,
-			bu.buyFk,
-			vZoneFk zoneFk
-		FROM sale s
-			LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
-		WHERE s.ticketFk = vTicketFk
-		GROUP BY bu.warehouseFk, bu.itemFk);
-
-	CALL catalog_componentPrepare();
-	CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
-
-	REPLACE INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
-		SELECT t.warehouseFk, s.itemFk, sc.componentFk, sc.value
-			FROM saleComponent sc
-				JOIN sale s ON s.id = sc.saleFk
-				JOIN ticket t ON t.id = s.ticketFk
-				JOIN `component` c ON c.id = sc.componentFk
-			WHERE s.ticketFk = vTicketFk 
-				AND (c.isRenewable = FALSE 
-					OR 
-					(NOT vHasChangeAll
-						AND (NOT (c.typeFk <=> vAddressTypeRateFk
-						OR c.typeFk <=> vAgencyModeTypeRateFk))));
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentPreview;
-	CREATE TEMPORARY TABLE tmp.ticketComponentPreview
-		SELECT * FROM tmp.ticketComponent;
-
-	CALL catalog_componentPurge();
-	DROP TEMPORARY TABLE tmp.buyUltimate;
-
-	IF vShipped IS NULL THEN
-		CALL util.throw('NO_ZONE_AVAILABLE');
-	END IF;
-
-	IF vShipped < CURDATE() THEN
-		CALL util.throw('ERROR_PAST_SHIPMENT');
-	END IF;
-END$$
-
-DELIMITER ;
-
--- a/db/changes/10180-holyWeek/02-ticket_priceDifference.sql
+++ b/db/changes/10180-holyWeek/02-ticket_priceDifference.sql
@ -1,50 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticket_priceDifference`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_priceDifference`(
-	vTicketFk INT,
-    vLanded DATE, 
-    vAddressFk INT,
-    vZoneFk INT,
-    vWarehouseFk INT)
-BEGIN
-/**
- * Devuelve las diferencias de precio de los movimientos de un ticket.
- * 
- * @param vTicketFk Id del ticket
- * @param vLanded Fecha de recepcion
- * @param vAddressFk Id del consignatario
- * @param vZoneFk Id de la zona
- * @param vWarehouseFk Id del almacén
- */
-	CALL vn.ticket_componentPreview(vTicketFk, vLanded, vAddressFk, vZoneFk, vWarehouseFk);
-
-	SELECT 	s.itemFk, 
-			i.name, 
-			i.size, 
-			i.category, 
-			IFNULL(s.quantity, 0) AS quantity, 
-			IFNULL(s.price, 0) AS price, 
-			ROUND(SUM(tc.cost), 2) AS newPrice,
-			s.quantity * (s.price - ROUND(SUM(tc.cost), 2)) difference,
-			s.id AS saleFk
-		FROM sale s
-			JOIN item i ON i.id = s.itemFk 
-			JOIN ticket t ON t.id = s.ticketFk 
-			LEFT JOIN  tmp.ticketComponentPreview tc ON tc.itemFk = s.itemFk 
-				AND tc.warehouseFk = t.warehouseFk
-			LEFT JOIN saleComponent sc ON sc.saleFk = s.id 
-				AND sc.componentFk = tc.componentFk
-			LEFT JOIN `component` c ON c.id = tc.componentFk 
-		WHERE t.id = vTicketFk 
-			AND IF(sc.componentFk IS NULL 
-			AND c.classRate IS NOT NULL, FALSE, TRUE) 
-		GROUP BY s.id ORDER BY s.id;
-
-	DROP TEMPORARY TABLE tmp.ticketComponentPreview;
-END$$
-
-DELIMITER ;
-
--- a/db/changes/10180-holyWeek/02-ticket_recalcComponents.sql
+++ b/db/changes/10180-holyWeek/02-ticket_recalcComponents.sql
@ -1,94 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticket_recalcComponents`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_recalcComponents`(IN vTicketFk BIGINT, vIsTicketEditable BOOLEAN)
-proc: BEGIN
-
-/**
- * Este procedimiento recalcula los componentes de un ticket, 
- * eliminando los componentes existentes e insertandolos de nuevo
- *
- * @param vTicketFk Id del ticket
- * @param vIsTicketEditable si no se quiere forzar llamar con NULL
- */
-	DECLARE vShipped DATE;
-	DECLARE vWarehouseFk SMALLINT;
-    DECLARE vAgencyModeFk INT;
-    DECLARE vAddressFk INT;
-    DECLARE vLanded DATE;
-    DECLARE vZoneFk INTEGER;
-	
-	IF vIsTicketEditable IS NULL THEN
-		SELECT IFNULL(ts.alertLevel,0) = 0 AND IFNULL(t.refFk,'') = ''
-				INTO vIsTicketEditable
-			FROM ticket t LEFT JOIN ticketState ts ON t.id = ts.ticket
-			WHERE id = vTicketFk;
-	END IF;
-
-	SELECT t.warehouseFk, 
-			t.shipped, 
-			t.addressFk, 
-            t.agencyModeFk, 
-			t.landed,
-			t.zoneFk
-			INTO vWarehouseFk, vShipped, vAddressFk, vAgencyModeFk, vLanded, vZoneFk
-		FROM ticket t LEFT JOIN ticketState ts ON t.id = ts.ticket
-		WHERE t.id = vTicketFk;
-
-	IF vLanded IS NULL OR vZoneFk IS NULL THEN
-
-		CALL zone_getLanded(vShipped, vAddressFk, vAgencyModeFk, vWarehouseFk);
-
-		IF (SELECT COUNT(*) FROM tmp.zoneGetLanded LIMIT 1) = 0 THEN
-			CALL util.throw('There is no zone for these parameters');
-		END IF;
-
-		UPDATE ticket t
-			SET t.landed = (SELECT landed FROM tmp.zoneGetLanded LIMIT 1) 
-			WHERE t.id = vTicketFk AND t.landed IS NULL;
-
-		IF vZoneFk IS NULL THEN
-			SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetLanded LIMIT 1;
-			UPDATE ticket t
-				SET t.zoneFk = vZoneFk
-				WHERE t.id = vTicketFk AND t.zoneFk IS NULL;
-		END IF;
-		DROP TEMPORARY TABLE tmp.zoneGetLanded;
-		
-	END IF;
-
-	-- rellena la tabla buyUltimate con la ultima compra	
-	CALL buyUltimate (vWarehouseFk, vShipped);  
-	
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
-    CREATE TEMPORARY TABLE tmp.ticketLot 
-	SELECT vWarehouseFk warehouseFk, NULL available,
-		s.itemFk, bu.buyFk, vZoneFk zoneFk
-			FROM sale s
-				LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
-			WHERE s.ticketFk = vTicketFk 
-			GROUP BY s.itemFk;
-	                
-	CALL catalog_componentPrepare();
-	CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.sale;
-	CREATE TEMPORARY TABLE tmp.sale
-				(PRIMARY KEY (saleFk)) ENGINE = MEMORY
-			SELECT id saleFk, vWarehouseFk warehouseFk
-				FROM sale s
-				WHERE s.ticketFk = vTicketFk;  
-                  
-	-- si el ticket esta facturado, respeta los precios                               
-	CALL ticketComponentUpdateSale(IF(vIsTicketEditable, 1, 6)); 
-    
-    CALL catalog_componentPurge();
-	DROP TEMPORARY TABLE 
-		tmp.buyUltimate, 
-		tmp.sale;
-END$$
-
-DELIMITER ;
-
--- a/db/changes/10180-holyWeek/02-ticket_recalcComponentsForcePrice__.sql
+++ b/db/changes/10180-holyWeek/02-ticket_recalcComponentsForcePrice__.sql
@ -1,2 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticket_recalcComponentsForcePrice`;
--- a/db/changes/10180-holyWeek/02-ticket_withoutComponents.sql
+++ b/db/changes/10180-holyWeek/02-ticket_withoutComponents.sql
@ -1,72 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticket_withoutComponents`;
-DROP procedure IF EXISTS `ticket_checkNoComponents`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_checkNoComponents`(vShippedFrom DATETIME, vShippedTo DATETIME)
-BEGIN
-
-/**
- * Comprueba que los tickets entre un rango de fechas tienen componentes
- *
- * @param vDatedFrom Id del ticket
- * @param vIsTicketEditable si no se quiere forzar llamar con NULL
- */
-	DECLARE v_done BOOL DEFAULT FALSE;
-	DECLARE vSaleFk INTEGER;
-	DECLARE vCur CURSOR FOR
-	SELECT s.id
-		FROM ticket t
-			JOIN client clt ON clt.id = t.clientFk
-			JOIN sale s ON s.ticketFk = t.id
-			JOIN item i ON i.id = s.itemFk
-			JOIN itemType tp ON tp.id = i.typeFk
-			JOIN itemCategory ic ON ic.id = tp.categoryFk
-			LEFT JOIN tmp.coste c ON c.id = s.id
-		WHERE t.shipped  >= vDatedFrom AND  t.shipped  <= vDatedTo
-			AND c.id IS NULL
-			AND clt.isActive != 0
-			AND ic.merchandise != 0
-		GROUP BY s.id;
-	   
-	  DECLARE CONTINUE HANDLER FOR NOT FOUND
-		SET v_done = TRUE; 
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.coste;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.coste;
-	CREATE TEMPORARY TABLE tmp.coste
-		 (primary key (id)) ENGINE = MEMORY
-		SELECT s.id
-		FROM ticket t
-			JOIN client clt ON clt.id = t.clientFk
-			JOIN sale s ON s.ticketFk = t.id
-			JOIN item i ON i.id = s.itemFk
-			JOIN itemType tp ON tp.id = i.typeFk
-			JOIN itemCategory ic ON ic.id = tp.categoryFk
-			JOIN saleComponent sc ON sc.saleFk = s.id
-			JOIN component c ON c.id = sc.componentFk
-			JOIN componentType ct ON ct.id = c.typeFk AND ct.id = 1
-		WHERE t.shipped  >= vDatedFrom
-			AND ic.merchandise != 0;
-		
-	OPEN vCur;
-
-	l: LOOP
-		SET v_done = FALSE;
-		FETCH vCur INTO vSaleFk;
-
-		IF v_done THEN
-			LEAVE l;
-		END IF;
-
-		CALL sale_calculateComponent(vSaleFk, 1);
-	END LOOP;
-
-	CLOSE vCur; 
-	DROP TEMPORARY TABLE tmp.coste;	
- END$$
-
-DELIMITER ;
-
--- a/db/changes/10180-holyWeek/03-ekt_load.sql
+++ b/db/changes/10180-holyWeek/03-ekt_load.sql
@ -1,162 +0,0 @@
-
-USE `edi`;
-DROP procedure IF EXISTS `ekt_load`;
-
-DELIMITER $$
-USE `edi`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ekt_load`(IN `vSelf` INT)
-BEGIN
-	DECLARE vRef INT;
-	DECLARE vBuy INT;
-	DECLARE vItem INT;
-	DECLARE vQty INT;
-	DECLARE vPackage INT;
-	DECLARE vIsLot BOOLEAN;
-    DECLARE vForceToPacking INT DEFAULT 2;
-
-	-- Carga los datos necesarios del EKT
-
-	SELECT ref, qty, package INTO vRef, vQty, vPackage
-		FROM ekt e
-			LEFT JOIN item i ON e.ref = i.id
-		WHERE e.id = vSelf;
-
-	-- Inserta el cubo si no existe
-
-	IF vPackage = 800 
-	THEN
-		SET vPackage = 800 + vQty;
-
-		INSERT IGNORE INTO vn2008.Cubos SET
-			Id_Cubo = vPackage,
-			x = 7200 / vQty,
-			y = 1;
-	ELSE
-		INSERT IGNORE INTO vn2008.Cubos (Id_Cubo, X, Y, Z)
-			SELECT bucket_id, ROUND(x_size/10), ROUND(y_size/10), ROUND(z_size/10)
-				FROM bucket WHERE bucket_id = vPackage;
-		
-		IF ROW_COUNT() > 0
-		THEN
-			INSERT INTO vn2008.mail SET
-				`subject` = 'Cubo añadido',
-				`text` = CONCAT('Se ha añadido el cubo: ', vPackage),
-				`to` = 'ekt@verdnatura.es';
-		END IF;
-	END IF;
-
-	-- Intenta obtener el artículo en base a los atributos holandeses
-
-	INSERT IGNORE INTO item_track SET
-		item_id = vRef;
-
-	SELECT c.Id_Compra, c.Id_Article INTO vBuy, vItem
-		FROM vn2008.buy_edi e 
-			JOIN item_track t ON t.item_id = e.ref
-			LEFT JOIN vn2008.buy_edi l ON l.ref = e.ref
-			LEFT JOIN vn2008.Compres c ON c.buy_edi_id = l.id
-			JOIN vn2008.config cfg
-		WHERE e.id = vSelf
-			AND l.id != vSelf
-			AND c.Id_Article != cfg.generic_item
-			AND IF(t.s1, l.s1 = e.s1, TRUE)
-			AND IF(t.s2, l.s2 = e.s2, TRUE)
-			AND IF(t.s3, l.s3 = e.s3, TRUE)
-			AND IF(t.s4, l.s4 = e.s4, TRUE)
-			AND IF(t.s5, l.s5 = e.s5, TRUE)
-			AND IF(t.s6, l.s6 = e.s6, TRUE)
-			AND IF(t.kop, l.kop = e.kop, TRUE)
-			AND IF(t.pac, l.pac = e.pac, TRUE)
-			AND IF(t.cat, l.cat = e.cat, TRUE)
-			AND IF(t.ori, l.ori = e.ori, TRUE)
-			AND IF(t.pro, l.pro = e.pro, TRUE)
-			AND IF(t.sub, l.sub = e.sub, TRUE)
-			AND IF(t.package, l.package = e.package, TRUE)
-			AND c.Id_Article < 170000
-		ORDER BY l.now DESC, c.Id_Compra ASC LIMIT 1;
-
-	-- Determina si el articulo se vende por lotes
-
-	IF vItem
-	THEN
-		SELECT COUNT(*) > 0 INTO vIsLot
-			FROM vn2008.Articles a
-				LEFT JOIN vn2008.Tipos t ON t.tipo_id = a.tipo_id
-			WHERE a.Id_Article = vItem
-				AND t.`transaction`;
-
-		-- Si el articulo se vende por lotes se inserta un nuevo artículo
-
-		IF vIsLot
-		THEN
-			INSERT INTO vn2008.Articles (
-				 Article
-				,Medida
-				,Categoria
-				,Id_Origen
-				,iva_group_id
-				,Foto
-				,Color
-				,Codintrastat
-				,tipo_id
-				,Tallos
-			)
-			SELECT
-				 i.`name`
-				,IFNULL(e.s1, e.pac)
-				,e.cat
-				,IFNULL(o.id, 17)
-				,IFNULL(a.iva_group_id, 1)
-				,a.Foto
-				,a.Color
-				,a.Codintrastat
-				,IFNULL(a.tipo_id, 10)
-				,IF(a.tipo_id = 15, 0, 1)
-				FROM vn2008.buy_edi e
-					LEFT JOIN item i ON i.id = e.ref
-					LEFT JOIN vn2008.Origen o ON o.Abreviatura = e.ori
-					LEFT JOIN vn2008.Articles a ON a.Id_Article = vItem
-				WHERE e.id = vSelf;
-					
-			SET vItem = LAST_INSERT_ID();
-		END IF;
-	END IF;
-
-	-- Inserta la compra asociada al EKT
-
-	INSERT INTO vn2008.Compres
-	(
-		 Id_Entrada
-		,buy_edi_id
-		,Costefijo
-		,Id_Article
-		,`grouping`
-		,caja
-		,Packing
-		,Cantidad
-		,Productor
-		,Etiquetas
-		,Id_Cubo
-        ,`weight`
-	)
-	SELECT
-		 cfg.edi_entry
-		,vSelf
-		,(@t := IF(a.Tallos, a.Tallos, 1)) * e.pri
-		,IFNULL(vItem, cfg.generic_item)
-		,IFNULL(c.`grouping`, e.pac)
-		,vForceToPacking
-		,@pac := e.pac / @t
-		,@pac * e.qty
-		,s.company_name
-		,e.qty
-		,IFNULL(c.Id_Cubo, e.package)
-        ,a.density * (vn.item_getVolume(a.Id_Article, IFNULL(c.Id_Cubo, e.package)) / 1000000)
-		FROM vn2008.buy_edi e 
-			LEFT JOIN vn2008.Compres c ON c.Id_Compra = vBuy
-			LEFT JOIN vn2008.Articles a ON a.Id_Article = c.Id_Article
-			LEFT JOIN supplier s ON e.pro = s.supplier_id
-			JOIN vn2008.config cfg
-		WHERE e.id = vSelf
-		LIMIT 1;
-END
--- a/db/changes/10180-holyWeek/03-itemDiary.sql
+++ b/db/changes/10180-holyWeek/03-itemDiary.sql
@ -1,130 +0,0 @@
-DROP procedure IF EXISTS `vn`.`item_getBalance`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `item_getBalance`(IN vItemId INT, IN vWarehouse INT)
-BEGIN
-    DECLARE vDateInventory DATETIME;
-    DECLARE vCurdate DATE DEFAULT CURDATE();
-    DECLARE vDayEnd DATETIME DEFAULT util.dayEnd(vCurdate);
-    
-    SELECT inventoried INTO vDateInventory FROM config;
-    SET @a = 0;
-	SET @currentLineFk = 0;
-    SET @shipped = '';
-    
-    SELECT DATE(@shipped:= shipped) shipped,
-		alertLevel,
-		stateName,
-		origin,
-		reference,
-		clientFk,
-		name,
-		`in`,
-		`out`,
-		@a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance,
-		@currentLineFk := IF (@shipped < CURDATE() 
-							OR (@shipped = CURDATE() AND (isPicked OR alertLevel >= 2)),
-						lineFk,@currentLineFk) lastPreparedLineFk,
-            isTicket,
-            lineFk,isPicked
-        FROM
-            ( SELECT  tr.landed as shipped,
-                    b.quantity as `in`,
-                    NULL as `out`,
-                    al.alertLevel as alertLevel,
-                    st.name AS stateName,
-                    s.name as name,
-                    e.ref as reference,
-                    e.id as origin,
-                    s.id as clientFk,
-                    IF(al.alertLevel = 3, TRUE, FALSE) isPicked,
-                    FALSE AS isTicket,
-                    b.id lineFk,
-                    NULL `order`
-                FROM buy b
-                    JOIN entry e ON e.id = b.entryFk
-                    JOIN travel tr ON tr.id = e.travelFk
-                    JOIN supplier s ON s.id = e.supplierFk
-                    JOIN alertLevel al ON al.alertLevel = 
-						CASE
-							WHEN tr.shipped < CURDATE() THEN 3
-							WHEN tr.shipped = CURDATE() AND tr.isReceived = TRUE THEN 3
-                            ELSE 0
-						END
-                    JOIN state st ON st.code = al.code
-                WHERE tr.landed >= vDateInventory
-                    AND vWarehouse = tr.warehouseInFk 
-                    AND b.itemFk = vItemId
-                    AND e.isInventory = FALSE
-					AND e.isRaid = FALSE
-            UNION ALL
-
-            SELECT tr.shipped,
-                    NULL as `in`,
-                    b.quantity as `out`,
-                    al.alertLevel as alertLevel,
-                    st.name AS stateName,
-                    s.name as name,
-                    e.ref as reference,
-                    e.id as origin,
-                    s.id as clientFk,
-                    IF(al.alertLevel = 3, TRUE, FALSE) isPicked,
-                    FALSE AS isTicket,
-                    b.id,
-                    NULL `order`
-                FROM buy b
-                    JOIN entry e ON e.id = b.entryFk
-                    JOIN travel tr ON tr.id = e.travelFk
-                    JOIN warehouse w ON w.id = tr.warehouseOutFk
-                    JOIN supplier s ON s.id = e.supplierFk
-                    JOIN alertLevel al ON al.alertLevel = 
-						CASE
-							WHEN tr.shipped < CURDATE() THEN 3
-							WHEN tr.shipped = CURDATE() AND tr.isReceived = TRUE THEN 3
-                            ELSE 0
-						END
-                    JOIN state st ON st.code = al.code
-                WHERE tr.shipped >= vDateInventory
-                    AND vWarehouse =tr.warehouseOutFk
-                    AND s.id <> 4
-                    AND b.itemFk = vItemId
-                    AND e.isInventory = FALSE
-                    AND w.isFeedStock = FALSE
-					AND e.isRaid = FALSE
-            UNION ALL
-
-            SELECT DATE(t.shipped),
-                NULL as `in`,
-                s.quantity as `out`,
-                al.alertLevel as alertLevel,
-                st.name AS stateName,
-                t.nickname as name,
-                t.refFk as reference,
-                t.id as origin,
-                t.clientFk,
-                stk.id as isPicked,
-                TRUE as isTicket,
-                s.id,
-				st.`order`
-				FROM sale s
-                    JOIN ticket t ON t.id = s.ticketFk
-                    LEFT JOIN ticketState ts ON ts.ticket = t.id
-                    LEFT JOIN state st ON st.code = ts.code
-                    JOIN client c ON c.id = t.clientFk
-                    JOIN alertLevel al ON al.alertLevel = 
-						CASE
-							WHEN t.shipped < curdate() THEN 3
-							WHEN t.shipped > util.dayEnd(curdate()) THEN 0
-                            ELSE IFNULL(ts.alertLevel, 0)
-						END
-					LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
-                    LEFT JOIN saleTracking stk ON stk.saleFk = s.id AND stk.stateFk = stPrep.id
-                WHERE t.shipped >= vDateInventory
-                    AND s.itemFk = vItemId
-                    AND vWarehouse =t.warehouseFk
-				ORDER BY shipped, alertLevel DESC, isTicket, `order` DESC, isPicked DESC, `in` DESC, `out` DESC
-            ) AS itemDiary;
-        
-END$$
-delimiter ;
--- a/db/changes/10180-holyWeek/03-ticketCalculateSaleForcePrice2__.sql
+++ b/db/changes/10180-holyWeek/03-ticketCalculateSaleForcePrice2__.sql
@ -1,2 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticketCalculateSaleForcePrice2`;
--- a/db/changes/10180-holyWeek/03-ticketCalculateSaleForcePrice__.sql
+++ b/db/changes/10180-holyWeek/03-ticketCalculateSaleForcePrice__.sql
@ -1,2 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticketCalculateSaleForcePrice`;
--- a/db/changes/10180-holyWeek/03-ticketCalculateSale__.sql
+++ b/db/changes/10180-holyWeek/03-ticketCalculateSale__.sql
@ -1,68 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticketCalculateSale`;
-DROP procedure IF EXISTS `ticketCalculateSale__`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculateSale__`(IN vSale BIGINT)
-proc: BEGIN
-- OBSOLETO USAR: sale_calculateComponent(vSale, NULL)
-	DECLARE vShipped DATE; 
-	DECLARE vWarehouseFk SMALLINT;
-    DECLARE vAgencyModeFk INT;
-    DECLARE vAddressFk INT;
-    DECLARE vTicket BIGINT;
-    DECLARE vItem BIGINT;
-    DECLARE vLanded DATE; 
-    DECLARE vTicketFree BOOLEAN DEFAULT TRUE;
-    DECLARE vZoneFk INTEGER;
-    
-	SELECT  NOT (t.refFk IS NOT NULL OR ts.alertLevel > 0) OR s.price = 0, s.ticketFk, s.itemFk , t.zoneFk
-			INTO vTicketFree, vTicket, vItem, vZoneFk
-		FROM vn.ticket t
-			JOIN vn.sale s ON s.ticketFk = t.id
-			LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
-		WHERE s.id = vSale
-		LIMIT 1;
-    	
-	SELECT t.warehouseFk, DATE(t.shipped), t.addressFk, t.agencyModeFk, t.landed
-			INTO vWarehouseFk, vShipped, vAddressFk, vAgencyModeFk, vLanded
-		FROM agencyMode a 
-			JOIN ticket t ON t.agencyModeFk = a.id
-		WHERE t.id = vTicket;
-
-    IF IFNULL(vZoneFk,0) = 0 THEN
-		CALL util.throw('ticket dont have zone');
-    END IF;
-    
-    CALL buyUltimate (vWarehouseFk, vShipped);  
-    
-	DELETE FROM tmp.buyUltimate WHERE itemFk != vItem;
-    
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
-    CREATE TEMPORARY TABLE tmp.ticketLot 
-		SELECT vWarehouseFk warehouseFk, NULL available, vItem itemFk, buyFk, vZoneFk zoneFk
-				FROM tmp.buyUltimate
-				WHERE itemFk = vItem;
-                
-    CALL vn.catalog_componentCalculate;            
-	CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
-
-    DROP TEMPORARY TABLE IF EXISTS tmp.sale;
-	CREATE TEMPORARY TABLE tmp.sale
-					(PRIMARY KEY (saleFk)) ENGINE = MEMORY
-		SELECT vSale saleFk,vWarehouseFk warehouseFk;
-                
-	CALL ticketComponentUpdateSale(IF(vTicketFree,1,6)); 
-
-	INSERT INTO vn.ticketLog (originFk, userFk, `action`, description)
-		VALUES (vTicket, account.userGetId(), 'update', CONCAT('Bionizo linea id ', vSale));
-	
-	CALL catalog_componentPurge();
-	DROP TEMPORARY TABLE tmp.buyUltimate;
-    DROP TEMPORARY TABLE IF EXISTS tmp.sale;
-
-END$$
-
-DELIMITER ;
-
--- a/db/changes/10180-holyWeek/03-ticket_componentUpdate__.sql
+++ b/db/changes/10180-holyWeek/03-ticket_componentUpdate__.sql
@ -1,83 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `vn`.`ticket_componentUpdate`;
-DROP procedure IF EXISTS `vn`.`ticket_componentUpdate__`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_componentUpdate__`(
-	 vTicketFk INT,
-     vClientFk INT,
-     vAgencyModeFk INT,
-     vAddressFk INT,
-     vZoneFk INT,
-     vWarehouseFk TINYINT,
-     vCompanyFk SMALLINT,
-     vShipped DATETIME,
-     vLanded DATE,
-     vIsDeleted BOOLEAN,
-     vHasToBeUnrouted BOOLEAN,
-     vOption INT)
-BEGIN
-    DECLARE vPrice DECIMAL(10,2);
-    DECLARE vBonus DECIMAL(10,2);
-    DECLARE EXIT HANDLER FOR SQLEXCEPTION
-    BEGIN
-		ROLLBACK;
-        RESIGNAL;
-	END;
-
-	START TRANSACTION;
-    
-   IF (SELECT addressFk FROM ticket WHERE id = vTicketFk) <> vAddressFk THEN
-			
-		UPDATE ticket t 
-				JOIN address a ON a.id = vAddressFk
-			SET t.nickname = a.nickname
-			WHERE t.id = vTicketFk;
-            
-    END IF;
-    
-    CALL vn.zone_getShippedWarehouse(vlanded, vAddressFk, vAgencyModeFk);
-    
-	SELECT zoneFk, price, bonus INTO vZoneFk, vPrice, vBonus 
-		FROM tmp.zoneGetShipped
-		WHERE shipped = vShipped AND warehouseFk = vWarehouseFk LIMIT 1;
-            
-	UPDATE ticket t
-		SET 
-			t.clientFk = vClientFk,
-			t.agencyModeFk = vAgencyModeFk,
-			t.addressFk = vAddressFk,
-            t.zoneFk = vZoneFk,
-            t.zonePrice = vPrice,
-            t.zoneBonus = vBonus,
-			t.warehouseFk = vWarehouseFk,
-            t.companyFk = vCompanyFk,
-			t.landed = vLanded,
-			t.shipped = vShipped,
-            t.isDeleted = vIsDeleted
-		WHERE
-			t.id = vTicketFk;
-            
-	IF vHasToBeUnrouted THEN
-		UPDATE ticket t SET t.routeFk = NULL
-			WHERE t.id = vTicketFk;
-    END IF;
-            
-	IF vOption <> 8 THEN
-		DROP TEMPORARY TABLE IF EXISTS tmp.sale;
-		CREATE TEMPORARY TABLE tmp.sale
-			(PRIMARY KEY (saleFk))
-            ENGINE = MEMORY
-			SELECT id AS saleFk, vWarehouseFk warehouseFk
-				FROM sale s WHERE s.ticketFk = vTicketFk;
-
-		CALL ticketComponentUpdateSale (vOption);
-
-        DROP TEMPORARY TABLE tmp.sale;
-	END IF;
-	COMMIT;
-END$$
-
-DELIMITER ;
-;
--- a/db/changes/10180-holyWeek/03-zone_UpcomingDeliveries.sql
+++ b/db/changes/10180-holyWeek/03-zone_UpcomingDeliveries.sql
@ -1,80 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `zone_upcomingDeliveries`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `zone_upcomingDeliveries`()
-BEGIN
-	DECLARE vForwardDays INT;
-    
-    SELECT forwardDays INTO vForwardDays FROM zoneConfig;
-	CALL util.time_createTable(CURDATE(), DATE_ADD(CURDATE(), INTERVAL vForwardDays DAY));
-
-	DROP TEMPORARY TABLE IF EXISTS tLandings;
-	CREATE TEMPORARY TABLE tLandings
-		(INDEX (eventFk))
-		ENGINE = MEMORY
-		SELECT e.id eventFk,
-				@travelingDays := IFNULL(e.travelingDays, z.travelingDays) travelingDays,
-				TIMESTAMPADD(DAY, @travelingDays, ti.dated) landed,
-				ti.dated shipped
-			FROM zone z
-				JOIN zoneEvent e ON e.zoneFk = z.id
-				JOIN tmp.time ti ON ti.dated BETWEEN curdate() AND TIMESTAMPADD(DAY, vForwardDays, curdate());
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.zoneOption;			
-	CREATE TEMPORARY TABLE tmp.zoneOption
-		ENGINE = MEMORY
-		SELECT *
-			FROM (
-				SELECT z.id zoneFk,
-						TIME(IFNULL(e.`hour`, z.`hour`)) `hour`,
-						l.travelingDays,
-						IFNULL(e.price, z.price) price,
-						IFNULL(e.bonus, z.bonus) bonus,
-						l.landed,
-						l.shipped
-					FROM zone z
-						JOIN zoneEvent e ON e.zoneFk = z.id
-						JOIN tLandings l ON l.eventFk = e.id
-					WHERE (
-							e.`type` = 'day'
-							AND e.`dated` = l.landed
-						) OR (
-							e.`type` != 'day'
-							AND e.weekDays & (1 << WEEKDAY(l.landed))
-							AND (e.`started` IS NULL OR l.landed >= e.`started`)
-							AND (e.`ended` IS NULL OR l.landed <= e.`ended`)
-						)
-					ORDER BY
-						zoneFk,
-						CASE
-							WHEN e.`type` = 'day'
-								THEN 1
-							WHEN e.`type` = 'range'
-								THEN 2
-								ELSE 3
-						END
-			) t
-			GROUP BY zoneFk, landed;
-
-	DELETE t FROM tmp.zoneOption t
-		JOIN zoneExclusion e
-			ON e.zoneFk = t.zoneFk AND e.`dated` = t.landed;
-			
-	SELECT MAX(zo.`hour`) `hour`, zg.`name`, zo.shipped
-		FROM tmp.zoneOption zo
-			JOIN `zone` z ON z.id = zo.zoneFk
-			JOIN agencyMode am ON am.id = z.agencyModeFk
-			JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
-			JOIN zoneIncluded zi ON zi.zoneFk = z.id
-            JOIN zoneGeo zg ON zg.id = zi.geoFk AND zg.type = 'province'
-		WHERE dm.code = 'DELIVERY'
-        GROUP BY shipped, zg.`name`
-		ORDER BY shipped, zg.`name`;
-	
-    DROP TEMPORARY TABLE tmp.time, tLandings;
-END$$
-
-DELIMITER ;
-
--- a/db/changes/10190-PostErte/00-route.sql
+++ b/db/changes/10190-PostErte/00-route.sql
@ -1,8 +0,0 @@
-ALTER TABLE `vn`.`route` 
-DROP FOREIGN KEY `fk_route_1`;
-ALTER TABLE `vn`.`route` 
-ADD CONSTRAINT `fk_route_1`
-  FOREIGN KEY (`zoneFk`)
-  REFERENCES `vn`.`zone` (`id`)
-  ON DELETE SET NULL
-  ON UPDATE CASCADE;
--- a/db/changes/10190-PostErte/00-saleCalculateComponent.sql
+++ b/db/changes/10190-PostErte/00-saleCalculateComponent.sql
@ -1,99 +0,0 @@
-
-DROP procedure IF EXISTS `vn`.`sale_calculateComponent`;
-
-DELIMITER $$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`sale_calculateComponent`(vSale INT, vOption INT)
-proc: BEGIN
-/**
- * Actualiza los componentes
- *
- * @param vSale Delivery date
- * @param vOption indica en que componente pone el descuadre, NULL en casos habituales
- */  
-	DECLARE vShipped DATE; 
-	DECLARE vWarehouseFk SMALLINT;
-    DECLARE vAgencyModeFk INT;
-    DECLARE vAddressFk INT;
-    DECLARE vTicketFk BIGINT;
-    DECLARE vItemFk BIGINT;
-    DECLARE vLanded DATE; 
-    DECLARE vIsEditable BOOLEAN;
-    DECLARE vZoneFk INTEGER;
-    
-	SELECT t.refFk IS NULL AND (IFNULL(ts.alertLevel, 0) = 0 OR s.price = 0), 
-				s.ticketFk, 
-				s.itemFk , 
-				t.zoneFk, 
-				t.warehouseFk, 
-				t.shipped, 
-				t.addressFk, 
-				t.agencyModeFk, 
-				t.landed
-			INTO vIsEditable, 
-				vTicketFk, 
-				vItemFk, 
-				vZoneFk, 
-				vWarehouseFk, 
-				vShipped, 
-				vAddressFk, 
-				vAgencyModeFk, 
-				vLanded
-		FROM ticket t
-			JOIN sale s ON s.ticketFk = t.id
-			LEFT JOIN ticketState ts ON ts.ticketFk = t.id
-		WHERE s.id = vSale;
-
-	IF vLanded IS NULL OR vZoneFk IS NULL THEN
-
-		CALL zone_getLanded(vShipped, vAddressFk, vAgencyModeFk, vWarehouseFk, TRUE);
-
-		IF (SELECT COUNT(*) FROM tmp.zoneGetLanded LIMIT 1) = 0 THEN
-			CALL util.throw('There is no zone for these parameters');
-		END IF;
-
-		UPDATE ticket t
-			SET t.landed = (SELECT landed FROM tmp.zoneGetLanded LIMIT 1) 
-			WHERE t.id = vTicketFk AND t.landed IS NULL;
-
-		IF vZoneFk IS NULL THEN
-			SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetLanded LIMIT 1;
-			UPDATE ticket t
-				SET t.zoneFk = vZoneFk
-				WHERE t.id = vTicketFk AND t.zoneFk IS NULL;
-		END IF;
-		DROP TEMPORARY TABLE tmp.zoneGetLanded;
-		
-	END IF;
-
-	-- rellena la tabla buyUltimate con la ultima compra	
-    CALL buyUltimate (vWarehouseFk, vShipped);  
-    
-	DELETE FROM tmp.buyUltimate WHERE itemFk != vItemFk;
-    
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
-    CREATE TEMPORARY TABLE tmp.ticketLot 
-		SELECT vWarehouseFk warehouseFk, NULL available, vItemFk itemFk, buyFk, vZoneFk zoneFk
-				FROM tmp.buyUltimate
-				WHERE itemFk = vItemFk;
-                    
-	CALL catalog_componentPrepare();           
-	CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
-
-    DROP TEMPORARY TABLE IF EXISTS tmp.sale;
-	CREATE TEMPORARY TABLE tmp.sale
-					(PRIMARY KEY (saleFk)) ENGINE = MEMORY
-		SELECT vSale saleFk,vWarehouseFk warehouseFk;
-
-    IF vOption IS NULL THEN
-		SET vOption = IF(vIsEditable, 1, 6);
-    END IF;
-    
-	CALL ticketComponentUpdateSale(vOption); 
-    CALL catalog_componentPurge();
-    
-	DROP TEMPORARY TABLE tmp.buyUltimate;
-    DROP TEMPORARY TABLE tmp.sale;
-END$$
-
-DELIMITER ;
-
--- a/db/changes/10190-PostErte/01-ticketCalculateClon.sql
+++ b/db/changes/10190-PostErte/01-ticketCalculateClon.sql
@ -1,93 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticketCalculateClon`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculateClon`(IN vTicketNew INT, vTicketOld INT)
-BEGIN
-/*
- * Recalcula los componentes un ticket clonado,
- * las lineas a precio cero fuerza para que tengan precio, el resto lo respeta
- * @param vTicketNew nuevo ticket clonado
- * @param vTicketOld icket original, a partir del qual se clonara el nuevo
-*/
-	DECLARE vShipped DATE;
-	DECLARE vClient INT;
-	DECLARE vWarehouse SMALLINT;
-	DECLARE vAgencyMode INT;
-	DECLARE vAddress INT;
-	DECLARE vLanded DATE;
-	DECLARE vAgency INT;
-	DECLARE vZoneFk INT;
-
-	REPLACE INTO orderTicket(orderFk,ticketFk)
-		SELECT orderFk, vTicketNew 
-			FROM orderTicket 
-            WHERE ticketFk = vTicketOld;
-    
-	SELECT t.clientFk, t.warehouseFk, date(t.shipped), t.addressFk, t.agencyModeFk, t.landed, a.agencyFk, t.zoneFk
-		INTO vClient, vWarehouse, vShipped, vAddress, vAgencyMode, vLanded, vAgency, vZoneFk
-	FROM agencyMode a
-		JOIN ticket t ON t.agencyModeFk = a.id
-	WHERE t.id = vTicketNew;
-
-	IF vLanded IS NULL THEN
-		CALL zone_getLanded(vShipped, vAddress, vAgency, vWarehouse, TRUE);
-		UPDATE ticket t
-				JOIN tmp.zoneGetLanded zgl ON t.warehouseFk = zgl.warehouseFk 
-			SET t.landed = zgl.landed,
-				t.zone = zgl.zoneFk
-			WHERE t.id = vTicketNew;
-		
-		SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetLanded LIMIT 1;
-		DROP TEMPORARY TABLE IF EXISTS tmp.zoneGetLanded;
-	END IF;
-
-	-- rellena la tabla tmp.buyUltimate con la ultima compra
-	CALL buyUltimate(vWarehouse, vShipped);  
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
-	CREATE TEMPORARY TABLE tmp.ticketLot 
-		SELECT vWarehouse warehouseFk, NULL available, s.itemFk, bu.buyFk, vZoneFk zoneFk
-			FROM sale s
-				LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
-			WHERE s.ticketFk = vTicketOld GROUP BY s.itemFk;
-					
-	CALL catalog_componentPrepare();            
-	CALL catalog_componentCalculate(vZoneFk, vAddress, vAgencyMode, vWarehouse);
-
-	-- Bionizamos lineas con Preu = 0
-	DROP TEMPORARY TABLE IF EXISTS tmp.sale;
-	CREATE TEMPORARY TABLE tmp.sale
-				(PRIMARY KEY (saleFk)) ENGINE = MEMORY
-			SELECT s.id saleFk, vWarehouse warehouseFk 
-				FROM sale s
-					JOIN ticket t on t.id = s.ticketFk WHERE s.ticketFk =  vTicketNew AND s.price = 0;
-				
-	CALL ticketComponentUpdateSale(1);
-
-	-- Bionizamos lineas con Preu > 0
-	DROP TEMPORARY TABLE IF EXISTS tmp.sale;
-	CREATE TEMPORARY TABLE tmp.sale
-				(PRIMARY KEY (saleFk)) ENGINE = MEMORY
-			SELECT s.id saleFk, vWarehouse warehouseFk 
-				FROM sale s 
-					JOIN ticket t on t.id = s.ticketFk WHERE s.ticketFk =  vTicketNew
-					AND s.price > 0;
-				
-	CALL ticketComponentUpdateSale(6);
-
-	-- Log
-	CALL `logAdd`(vTicketNew, 'update', ' ticket' , 'Bioniza Ticket');
-
-	-- Limpieza
-	CALL catalog_componentPurge();
-	DROP TEMPORARY TABLE IF EXISTS 
-		tmp.buyUltimate, 
-		tmp.sale, 
-		tmp.zoneGetLanded;
-    
-END$$
-
-DELIMITER ;
-
--- a/db/changes/10190-PostErte/01-ticket_cloneWeekly.sql
+++ b/db/changes/10190-PostErte/01-ticket_cloneWeekly.sql
@ -1,132 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticket_cloneWeekly`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_cloneWeekly`(IN vWeek INT)
-BEGIN
-	DECLARE vIsDone BOOL;
-	DECLARE vLanding DATE;
-	DECLARE vShipment DATE;
-	DECLARE vWarehouse INT;
-    DECLARE vTicket INT;
-    DECLARE vWeekDay INT;
-    DECLARE vClient INT;
-    DECLARE vEmpresa INT;
-    DECLARE vAddressFk INT;
-    DECLARE vAgencyModeFk INT;
-    DECLARE vNewTicket INT;
-    DECLARE vYear INT;
-    
-    DECLARE rsTicket CURSOR FOR
-	SELECT tw.ticketFk, weekDay, t.clientFk, t.warehouseFk, t.companyFk, t.addressFk, tw.agencyModeFk
-		FROM ticketWeekly tw 
-		JOIN ticket t ON tt.ticketFk = t.id;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vIsDone = TRUE;
-
-    SET vYear = YEAR(CURDATE()) + IF(vWeek < WEEK(CURDATE()),1, 0);
-    
-	OPEN rsTicket;
-
-	myLoop: LOOP
-    BEGIN
-		DECLARE vError TEXT;
-        DECLARE vSalesPersonEmail VARCHAR(150);
-        DECLARE vMailSent BOOL;
-        DECLARE vSubject VARCHAR(150);
-        DECLARE vMessage TEXT;
-		DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
-			BEGIN 
-				GET DIAGNOSTICS CONDITION 1
-					vError = MESSAGE_TEXT;
-			END;
-
-		SET vIsDone = FALSE;
-		FETCH rsTicket INTO vTicket, vWeekDay, vClient, vWarehouse, vEmpresa, vAddressFk, vAgencyModeFk;
-
-		IF vIsDone THEN
-
-			LEAVE myLoop;
-		END IF;
-		SELECT date INTO vShipment 
-			FROM `time`
-			WHERE `year` = vYear AND `week` = vWeek
-				AND WEEKDAY(date) = vWeekDay;
-
-        -- busca si el ticket ya ha sido clonado
-        IF (SELECT COUNT(*) FROM vn.ticket tOrig
-				JOIN vn.sale saleOrig ON tOrig.id = saleOrig.ticketFk
-                JOIN vn.saleCloned sc ON sc.saleOriginalFk = saleOrig.id
-                JOIN vn.sale saleClon ON saleClon.id = sc.saleClonedFk
-                JOIN vn.ticket tClon ON tClon.id = saleClon.ticketFk
-			WHERE tOrig.id = vTicket AND DATE(tClon.shipped) = vShipment) > 0 
-		THEN
-			ITERATE myLoop;
-		END IF;
-		CALL vn.zone_getLanded(vShipment, vAddressFk, vAgencyModeFk, vWarehouse, TRUE);
-
-		SELECT landed INTO vLanding from tmp.zoneGetLanded LIMIT 1;
-
-		CALL vn.ticketCreateWithoutZone(vClient, vShipment, vWarehouse, vEmpresa, vAddressFk, vAgencyModeFk, NULL, vLanding, account.userGetId(), vNewTicket);
-
-		IF (vLanding IS NULL) THEN
-			
-			SELECT e.email INTO vSalesPersonEmail
-				FROM vn.client c
-					JOIN vn.worker sp ON sp.id = c.salesPersonFk
-					JOIN account.emailUser e ON e.userFk = sp.userFk
-				WHERE c.id = vClient;
-		
-			SET vSubject = CONCAT('Turnos - No se ha podido clonar correctamente el ticket ', vTicket,
-						' para el dia: ', vShipment);
-			SET vMessage = CONCAT('No se ha podido clonar el ticket ', vTicket, 
-				' para el dia: ', vShipment, 
-				' porque no hay una zona de envío disponible. Se ha creado el ticket: ', vNewTicket, 
-				' pero ha que revisar las fechas y la agencia');
-				
-			SELECT COUNT(*) INTO vMailSent
-				FROM vn.mail 
-				WHERE sender = vSalesPersonEmail 
-					AND subject = vSubject;
-
-			IF NOT vMailSent THEN
-				INSERT INTO vn.mail (sender,`subject`,body)  
-					VALUES (vSalesPersonEmail, vSubject, vMessage);
-			END IF;
-			CALL vn.ticketStateUpdate (vNewTicket, 'FIXING');
-		END IF;
-        
-		INSERT INTO vn.sale (ticketFk, itemFk, concept, quantity, price, discount, priceFixed, isPriceFixed)
-			SELECT vNewTicket, saleOrig.itemFk , saleOrig.concept , saleOrig.quantity, saleOrig.price , saleOrig.discount, saleOrig.priceFixed, saleOrig.isPriceFixed
-				FROM vn.ticket tOrig
-				JOIN vn.sale saleOrig ON tOrig.id = saleOrig.ticketFk
-                LEFT JOIN vn.saleCloned sc ON sc.saleOriginalFk = saleOrig.id
-                LEFT JOIN vn.sale saleClon ON saleClon.id = sc.saleClonedFk
-                LEFT JOIN vn.ticket tClon ON tClon.id = saleClon.ticketFk AND DATE(tClon.shipped) = vShipment
-			WHERE tOrig.id = vTicket AND saleClon.id IS NULL;
-		
-		INSERT IGNORE INTO vn.saleCloned(saleOriginalFk, saleClonedFk)
-			SELECT saleOriginal.id, saleClon.id 
-				FROM vn.sale saleOriginal
-					JOIN vn.sale saleClon ON saleOriginal.itemFk = saleClon.itemFk AND saleOriginal.quantity = saleClon.quantity
-				WHERE saleOriginal.ticketFk = vTicket AND saleClon.ticketFk = vNewTicket;
-				
-		INSERT INTO ticketRequest (description, ordered, shipped, salesPersonCode, buyerCode, quantity, price,
-					itemFk ,clientFk, response, total, buyed, saleFk)
-			SELECT tr.description, tr.ordered, tr.shipped, tr.salesPersonCode, tr.buyerCode, tr.quantity, tr.price,
-					tr.itemFk, tr.clientFk, tr.response, tr.total, tr.buyed, tr.saleFk
-				FROM sale s JOIN ticketRequest tr ON tr.saleFk = s.id
-					JOIN sale s2 ON s.concept = s2.concept AND s.quantity = s2.quantity AND m.Id_Article = m2.Id_Article
-					WHERE s.ticketFk = vTicket AND s2.ticketFk = vNewTicket;
-
-		CALL vn.ticketCalculateClon(vNewTicket, vTicket);
-	END;
-	END LOOP;
-
-	CLOSE rsTicket;
-
-END$$
-
-DELIMITER ;
-
--- a/db/changes/10190-PostErte/01-ticket_recalcComponents.sql
+++ b/db/changes/10190-PostErte/01-ticket_recalcComponents.sql
@ -1,93 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticket_recalcComponents`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_recalcComponents`(IN vTicketFk BIGINT, vIsTicketEditable BOOLEAN)
-proc: BEGIN
-
-/**
- * Este procedimiento recalcula los componentes de un ticket, 
- * eliminando los componentes existentes e insertandolos de nuevo
- *
- * @param vTicketFk Id del ticket
- * @param vIsTicketEditable si no se quiere forzar llamar con NULL
- */
-	DECLARE vShipped DATE;
-	DECLARE vWarehouseFk SMALLINT;
-    DECLARE vAgencyModeFk INT;
-    DECLARE vAddressFk INT;
-    DECLARE vLanded DATE;
-    DECLARE vZoneFk INTEGER;
-	
-	IF vIsTicketEditable IS NULL THEN
-		SELECT IFNULL(ts.alertLevel,0) = 0 AND IFNULL(t.refFk,'') = ''
-				INTO vIsTicketEditable
-			FROM ticket t LEFT JOIN ticketState ts ON t.id = ts.ticket
-			WHERE id = vTicketFk;
-	END IF;
-
-	SELECT t.warehouseFk, 
-			t.shipped, 
-			t.addressFk, 
-            t.agencyModeFk, 
-			t.landed,
-			t.zoneFk
-			INTO vWarehouseFk, vShipped, vAddressFk, vAgencyModeFk, vLanded, vZoneFk
-		FROM ticket t LEFT JOIN ticketState ts ON t.id = ts.ticket
-		WHERE t.id = vTicketFk;
-
-	IF vLanded IS NULL OR vZoneFk IS NULL THEN
-
-		CALL zone_getLanded(vShipped, vAddressFk, vAgencyModeFk, vWarehouseFk, TRUE);
-
-		IF (SELECT COUNT(*) FROM tmp.zoneGetLanded LIMIT 1) = 0 THEN
-			CALL util.throw('There is no zone for these parameters');
-		END IF;
-
-		UPDATE ticket t
-			SET t.landed = (SELECT landed FROM tmp.zoneGetLanded LIMIT 1) 
-			WHERE t.id = vTicketFk AND t.landed IS NULL;
-
-		IF vZoneFk IS NULL THEN
-			SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetLanded LIMIT 1;
-			UPDATE ticket t
-				SET t.zoneFk = vZoneFk
-				WHERE t.id = vTicketFk AND t.zoneFk IS NULL;
-		END IF;
-		DROP TEMPORARY TABLE tmp.zoneGetLanded;
-		
-	END IF;
-
-	-- rellena la tabla buyUltimate con la ultima compra	
-	CALL buyUltimate (vWarehouseFk, vShipped);  
-	
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
-    CREATE TEMPORARY TABLE tmp.ticketLot 
-	SELECT vWarehouseFk warehouseFk, NULL available,
-		s.itemFk, bu.buyFk, vZoneFk zoneFk
-			FROM sale s
-				LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
-			WHERE s.ticketFk = vTicketFk 
-			GROUP BY s.itemFk;
-	                
-	CALL catalog_componentPrepare();
-	CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.sale;
-	CREATE TEMPORARY TABLE tmp.sale
-				(PRIMARY KEY (saleFk)) ENGINE = MEMORY
-			SELECT id saleFk, vWarehouseFk warehouseFk
-				FROM sale s
-				WHERE s.ticketFk = vTicketFk;  
-                  
-	-- si el ticket esta facturado, respeta los precios                               
-	CALL ticketComponentUpdateSale(IF(vIsTicketEditable, 1, 6)); 
-    
-    CALL catalog_componentPurge();
-	DROP TEMPORARY TABLE 
-		tmp.buyUltimate, 
-		tmp.sale;
-END$$
-
-DELIMITER ;
--- a/db/changes/10190-PostErte/01-zone_getLanded.sql
+++ b/db/changes/10190-PostErte/01-zone_getLanded.sql
@ -1,40 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `zone_getLanded`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `zone_getLanded`(vShipped DATE, vAddressFk INT, vAgencyModeFk INT, vWarehouseFk INT, vShowExpiredZones BOOLEAN)
-BEGIN
-/**
-* Devuelve una tabla temporal con el dia de recepcion para vShipped.
-*
-* @param vShipped Fecha de preparacion de mercancia
-* @param vAddressFk Id de consignatario, %NULL para recogida
-* @param vAgencyModeFk Id agencia
-* @param vWarehouseFk vWarehouseFk
-* @table tmp.zoneGetLanded Datos de recepciÃ³n
-*/
-
-	CALL zone_getFromGeo(address_getGeo(vAddressFk));
-    CALL zone_getOptionsForShipment(vShipped, vShowExpiredZones);
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.zoneGetLanded;
-	CREATE TEMPORARY TABLE tmp.zoneGetLanded
-			ENGINE = MEMORY
-		SELECT vWarehouseFk warehouseFk,
-            TIMESTAMPADD(DAY,zo.travelingDays, vShipped) landed,
-			zo.zoneFk
-		FROM tmp.zoneOption zo
-			JOIN zone z ON z.id = zo.zoneFk
-            JOIN zoneWarehouse zw ON zw.zoneFk = z.id
-		WHERE agencyModeFk = vAgencyModeFk
-			AND zw.warehouseFk = vWarehouseFk;
-            
-	DROP TEMPORARY TABLE
-		tmp.zone,
-        tmp.zoneOption;
-    
-END$$
-
-DELIMITER ;
-
--- a/db/changes/10200-normality/00-ACL.sql
+++ b/db/changes/10200-normality/00-ACL.sql
@ -0,0 +1,2 @@
+UPDATE `salix`.`ACL` SET `model` = 'Calendar' WHERE (`id` = '155');
+UPDATE `salix`.`ACL` SET `model` = 'Calendar' WHERE (`id` = '157');
--- a/db/changes/10200-normality/00-itemLastEntries.sql
+++ b/db/changes/10200-normality/00-itemLastEntries.sql
@ -1,8 +1,10 @@

+USE `vn`;
 DROP procedure IF EXISTS `vn`.`itemLastEntries`;

 DELIMITER $$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`itemLastEntries`(IN `vItem` INT, IN `vDays` DATE)
+USE `vn`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `itemLastEntries__`(IN `vItem` INT, IN `vDays` DATE)
 BEGIN
 	SELECT
 		w.id AS warehouseFk,
@ -39,4 +41,4 @@ BEGIN
 END$$

 DELIMITER ;
-
+;
--- a/db/changes/12200-Normalidad/00-zoneEstimatedDelivery.sql
+++ b/db/changes/12200-Normalidad/00-zoneEstimatedDelivery.sql
--- a/db/changes/10200-normality/01-calendar_employee.sql
+++ b/db/changes/10200-normality/01-calendar_employee.sql
@ -1,5 +0,0 @@
-ALTER TABLE `postgresql`.`calendar_employee` 
-ADD COLUMN `id` INT NULL AUTO_INCREMENT FIRST,
-ADD UNIQUE INDEX `id_UNIQUE` (`id` ASC) VISIBLE,
-ADD INDEX `id_index` (`id` ASC) VISIBLE;
-;
--- a/db/changes/12200-Normalidad/01-zoneETD.sql
+++ b/db/changes/12200-Normalidad/01-zoneETD.sql
--- a/db/changes/10200-normality/02-workerCalendar.sql
+++ b/db/changes/10200-normality/02-workerCalendar.sql
@ -1,12 +0,0 @@
-USE `vn`;
-CREATE 
-     OR REPLACE ALGORITHM = UNDEFINED 
-    DEFINER = `root`@`%` 
-    SQL SECURITY DEFINER
-VIEW `workerCalendar2` AS
-    SELECT 
-        `ce`.`id` AS `id`,
-        `ce`.`business_id` AS `businessFk`,
-        `ce`.`calendar_state_id` AS `absenceTypeFk`,
-        `ce`.`date` AS `dated`
-    FROM `postgresql`.`calendar_employee` `ce`;
--- a/db/changes/10210-summer/00-accountingType.sql
+++ b/db/changes/10210-summer/00-accountingType.sql
@ -0,0 +1,2 @@
+ALTER TABLE `vn`.`accountingType` 
+ADD COLUMN `receiptDescription` VARCHAR(50) NULL AFTER `description`;
--- a/db/dump/dumpedFixtures.sql
+++ b/db/dump/dumpedFixtures.sql
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@ -116,13 +116,13 @@ INSERT INTO `vn`.`shelving` (`code`, `parkingFk`, `isPrinted`, `priority`, `park
        ('GVC', '1', '0', '1', '0', '106'),
        ('HEJ', '2', '0', '1', '0', '106');

-INSERT INTO `vn`.`accountingType`(`id`, `description`)
+INSERT INTO `vn`.`accountingType`(`id`, `description`, `receiptDescription`)
    VALUES 
-        (1, 'Digital money'),
-        (2, 'Cash'),
-        (3, 'Card'),
-        (4, 'Stolen Money'),
-        (5, 'Miscellaneous');
+        (1, 'Digital money',    ''),
+        (2, 'Cash',             'Cash'),
+        (3, 'Card',             'Pay on receipt'),
+        (4, 'Stolen Money',     ''),
+        (5, 'Miscellaneous',    '');

 INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`)
    VALUES
@ -133,8 +133,8 @@ INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`)

 INSERT INTO `vn`.`bank`(`id`, `bank`, `account`, `cash`, `entityFk`, `isActive`, `currencyFk`)
    VALUES 
-        (1, 'Pay on receipt',   '0000000000', 4, 0, 1, 1),
-        (2, 'Cash',             '1111111111', 1, 0, 1, 1);
+        (1, 'Pay on receipt',   '0000000000', 3, 0, 1, 1),
+        (2, 'Cash',             '1111111111', 2, 0, 1, 1);

 INSERT INTO `vn`.`deliveryMethod`(`id`, `code`, `description`)
    VALUES
@ -556,11 +556,11 @@ INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeF
        (12, 1,     1,  1, 1,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            103, 'Phone Box',             123, NULL,       0, 1,  CURDATE()),
        (13, 1,     7,  1, 6,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            103, 'Phone Box',             123, NULL,       0, 3,  CURDATE()),
        (14, 1,     2,  1, NULL,    CURDATE(),                              CURDATE(),                                                        104, 'Malibu Point',          4,   NULL,       0, 9,  CURDATE()),
-        (15, 1,     7,  1, 6,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            105, 'Plastic Cell',          125, NULL,       0, 3,  CURDATE()),
+        (15, 1,     7,  1, 6,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            105, 'An incredibly long alias for testing purposes', 125, NULL, 0, 3, CURDATE()),
        (16, 1,     7,  1, 6,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            106, 'Many Places',           126, NULL,       0, 3,  CURDATE()),
        (17, 1,     7,  2, 6,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            106, 'Many Places',           126, NULL,       0, 3,  CURDATE()),
        (18, 1,     4,  4, 4,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            108, 'Cerebro',               128, NULL,       0, 12, CURDATE()),
-        (19, 1,     5,  5, 3,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            109, 'Somewhere in Thailand', 129, NULL,       1, 13, CURDATE()),
+        (19, 1,     5,  5, NULL,       CURDATE(),                              DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            109, 'Somewhere in Thailand', 129, NULL,       1, 13, CURDATE()),
        (20, 1,     5,  5, 3,       DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 109, 'Somewhere in Thailand', 129, NULL,       0, 13, DATE_ADD(CURDATE(), INTERVAL +1 MONTH)),
        (21, NULL,  5,  5, 5,       DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 109, 'Somewhere in Holland',  102, NULL,       0, 13, DATE_ADD(CURDATE(), INTERVAL +1 MONTH)),
        (22, NULL,  5,  5, 5,       DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 109, 'Somewhere in Japan',    103, NULL,       0, 13, DATE_ADD(CURDATE(), INTERVAL +1 MONTH)),
@ -601,11 +601,11 @@ INSERT INTO `vn`.`ticketTracking`(`ticketFk`, `stateFk`, `workerFk`, `created`)
        (12, 3,  19, NOW()),
        (13, 3,  19, NOW()),
        (14, 3,  19, NOW()),
-        (15, 3,  19, NOW()),
+        (15, 2,  19, NOW()),
        (16, 3,  19, NOW()),
-        (17, 3,  19, NOW()),
-        (18, 3,  19, NOW()),
-        (19, 3,  19, NOW()),
+        (17, 2,  19, NOW()),
+        (18, 2,  19, NOW()),
+        (19, 2,  19, NOW()),
        (20, 1,  19, DATE_ADD(NOW(), INTERVAL +1 MONTH)),
        (21, 1,  19, DATE_ADD(NOW(), INTERVAL +1 MONTH)),
        (22, 1,  19, DATE_ADD(NOW(), INTERVAL +1 MONTH)),
@ -735,36 +735,23 @@ INSERT INTO `vn`.`intrastat`(`id`, `description`, `taxClassFk`, `taxCodeFk`)

 INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `isOnOffer`, `expenceFk`, `isBargain`, `comment`, `relevancy`, `image`, `taxClassFk`, `subName`)
    VALUES
-        (1,  2, 70,   'AMA', 1,    1, NULL, 1,    06021010, 0, 2000000000, 0, NULL, 0, 66540, 1, NULL),
-        (2,  2, 70,   'AZL', 1,    2, NULL, 1,    06021010, 0, 2000000000, 0, NULL, 0, 65540, 1, NULL),
-        (3,  1, 60,   'AMR', 1,    3, NULL, 1,    05080000, 0, 4751000000, 0, NULL, 0, 61692, 1, NULL),
-        (4,  1, 60,   'AMR', 1,    1, NULL, 1,    05080000, 1, 4751000000, 0, NULL, 0, 66090, 2, NULL),
-        (5,  3, 30,   'GRE', 1,    2, NULL, 2,    06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, NULL),
-        (6,  5, 30,   'GRE', 1,    2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL),
-        (7,  5, 90,   'AZL', 1,    2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL),
-        (8,  2, 70,   'AMA', 1,    1, NULL, 1,    06021010, 0, 2000000000, 0, NULL, 0, 66540, 1, NULL),
-        (9,  2, 70,   'AZL', 1,    2, NULL, 1,    06021010, 0, 2000000000, 0, NULL, 0, 65540, 1, NULL),
-        (10, 1, 60,   'AMR', 1,    3, NULL, 1,    05080000, 0, 4751000000, 0, NULL, 0, 61692, 1, NULL),
-        (11, 1, 60,   'AMR', 1,    1, NULL, 1,    05080000, 1, 4751000000, 0, NULL, 0, 66090, 2, NULL),
-        (12, 3, 30,   'GRE', 1,    2, NULL, 2,    06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, NULL),
-        (13, 5, 30,   'GRE', 1,    2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL),
-        (14, 5, 90,   'AZL', 1,    2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, NULL),
+        (1,  2, 70,   'AMA', 1,    1, NULL, 1,    06021010, 0, 2000000000, 0, NULL, 0, 67, 1, NULL),
+        (2,  2, 70,   'AZL', 1,    2, NULL, 1,    06021010, 0, 2000000000, 0, NULL, 0, 66, 1, NULL),
+        (3,  1, 60,   'AMR', 1,    3, NULL, 1,    05080000, 0, 4751000000, 0, NULL, 0, 65, 1, NULL),
+        (4,  1, 60,   'AMR', 1,    1, NULL, 1,    05080000, 1, 4751000000, 0, NULL, 0, 69, 2, NULL),
+        (5,  3, 30,   'GRE', 1,    2, NULL, 2,    06021010, 1, 4751000000, 0, NULL, 0, 74, 2, NULL),
+        (6,  5, 30,   'GRE', 1,    2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 62, 2, NULL),
+        (7,  5, 90,   'AZL', 1,    2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 64, 2, NULL),
+        (8,  2, 70,   'AMA', 1,    1, NULL, 1,    06021010, 0, 2000000000, 0, NULL, 0, 75, 1, NULL),
+        (9,  2, 70,   'AZL', 1,    2, NULL, 1,    06021010, 0, 2000000000, 0, NULL, 0, 76, 1, NULL),
+        (10, 1, 60,   'AMR', 1,    3, NULL, 1,    05080000, 0, 4751000000, 0, NULL, 0, 77, 1, NULL),
+        (11, 1, 60,   'AMR', 1,    1, NULL, 1,    05080000, 1, 4751000000, 0, NULL, 0, 78, 2, NULL),
+        (12, 3, 30,   'GRE', 1,    2, NULL, 2,    06021010, 1, 4751000000, 0, NULL, 0, 82, 2, NULL),
+        (13, 5, 30,   'GRE', 1,    2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 83, 2, NULL),
+        (14, 5, 90,   'AZL', 1,    2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 84, 2, NULL),
        (15, 4, NULL,  NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350,  2, NULL),
        (16, 4, NULL,  NULL, NULL, 1, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350,  2, NULL),
-        (71, 4, NULL,  NULL, NULL, 1, NULL, NULL, 06021010, 1, 4751000000, 0, NULL, 0, 67350,  2, NULL);
-
-INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `checked`, `workerFk`)
-    VALUES
-        (1,  1, 1, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 1, 1, 18),
-        (2,  1, 1, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 18),
-        (3,  1, 1, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 2, 3, 1, 18),
-        (4,  1, 1, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 18),
-        (5,  1, 2, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 1, 1, 18),
-        (6,  7, 3, 71, DATE_ADD(CURDATE(), INTERVAL -2 MONTH), 1, 1, 1, 18),
-        (7,  2, 4, 71, DATE_ADD(CURDATE(), INTERVAL -3 MONTH), 1, 1, 1, 18),
-        (8,  3, 5, 71, DATE_ADD(CURDATE(), INTERVAL -4 MONTH), 1, 1, 1, 18),
-        (9,  3, 6, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 1, 1, 18),
-        (10, 7, 7, 71, CURDATE(),                              1, 1, 1, 18);
+        (71, 4, NULL,  NULL, NULL, 1, NULL, NULL, 06021010, 1, 4751000000, 0, NULL, 0, 88,  2, NULL);

 INSERT INTO `vn`.`packaging`(`id`, `volume`, `width`, `height`, `depth`, `isPackageReturnable`, `created`, `itemFk`, `price`)
    VALUES
@ -777,6 +764,19 @@ INSERT INTO `vn`.`packaging`(`id`, `volume`, `width`, `height`, `depth`, `isPack
        ('cc',          1640038.00, 56.00,  220.00, 128.00, 1, CURDATE(), 15,   90.00),
        ('pallet 100',  2745600.00, 100.00, 220.00, 120.00, 1, CURDATE(), 16,   0.00);

+INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `workerFk`, `packagingFk`)
+    VALUES
+        (1,  1, 1, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 1, 1, 1),
+        (2,  1, 1, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 1),
+        (3,  1, 1, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 2, 3, 1, 1),
+        (4,  1, 1, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 1),
+        (5,  1, 2, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 1, 1, 1),
+        (6,  7, 3, 71, DATE_ADD(CURDATE(), INTERVAL -2 MONTH), 1, 1, 1, 1),
+        (7,  2, 4, 71, DATE_ADD(CURDATE(), INTERVAL -3 MONTH), 1, 1, 1, 1),
+        (8,  3, 5, 71, DATE_ADD(CURDATE(), INTERVAL -4 MONTH), 1, 1, 1, 1),
+        (9,  3, 6, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 1, 1, 1),
+        (10, 7, 7, 71, CURDATE(),                              1, 1, 1, 1);
+
 INSERT INTO `vn`.`ticketPackaging`(`id`, `ticketFk`, `packagingFk`, `quantity`, `created`, `pvp`)
    VALUES
        (1, 1, 2, 2, CURDATE(), NULL),
@ -1199,8 +1199,8 @@ INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseO
        (4, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 50.00,  500,   'fourth travel',    0),
        (5, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 3, 2, 1, 50.00,  500,   'fifth travel',     1),
        (6, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 4, 2, 1, 50.00,  500,   'sixth travel',     1),
-        (7, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 5, 2, 1, 50.00,  500,   'seventh travel',   1),
-        (8, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 5, 2, 1, 50.00,  500,   'eight travel',   1);
+        (7, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 5, 2, 1, 50.00,  500,   'seventh travel',   2),
+        (8, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 5, 2, 1, 50.00,  500,   'eight travel',     1);

 INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `ref`,`isInventory`, `isRaid`, `notes`, `evaNotes`)
    VALUES
@ -1251,30 +1251,30 @@ INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`package
        (14, 7, 2, 5,       0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 1, NULL, 0.00, 7.30, 7.00,   0.00, NULL, 0, 1, 0, 4,     CURDATE()),
        (15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67,   0.00, NULL, 0, 1, 0, 4,     CURDATE());

-INSERT INTO `hedera`.`order`(`id`, `date_send`, `customer_id`, `delivery_method_id`, `agency_id`, `address_id`, `company_id`, `note`, `source_app`, `confirmed`, `date_make`, `first_row_stamp`, `confirm_date`)
+INSERT INTO `hedera`.`order`(`id`, `date_send`, `customer_id`, `delivery_method_id`, `agency_id`, `address_id`, `company_id`, `note`, `source_app`, `confirmed`,`total`, `date_make`, `first_row_stamp`, `confirm_date`)
    VALUES
-        (1,  DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 101, 3, 1, 121, 442, NULL, 'TPV',     1, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH)),
-        (2,  DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 104, 3, 1, 124, 442, NULL, 'WEB',     1, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH)),
-        (3,  DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 104, 1, 2, 124, 442, NULL, 'ANDROID', 1, DATE_ADD(CURDATE(), INTERVAL -2 MONTH), DATE_ADD(CURDATE(), INTERVAL -2 MONTH), DATE_ADD(CURDATE(), INTERVAL -2 MONTH)),
-        (4,  DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 104, 1, 2, 124, 442, NULL, 'SALIX',   1, DATE_ADD(CURDATE(), INTERVAL -3 MONTH), DATE_ADD(CURDATE(), INTERVAL -3 MONTH), DATE_ADD(CURDATE(), INTERVAL -3 MONTH)),
-        (5,  DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 104, 1, 3, 124, 442, NULL, 'SALIX',   1, DATE_ADD(CURDATE(), INTERVAL -4 MONTH), DATE_ADD(CURDATE(), INTERVAL -4 MONTH), DATE_ADD(CURDATE(), INTERVAL -4 MONTH)),
-        (6,  DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 101, 1, 3, 1,   442, NULL, 'SALIX',   1, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH)),
-        (7,  DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            101, 2, 7, 1,   442, NULL, 'SALIX',   0, CURDATE(),                              CURDATE(),                              CURDATE()),
-        (8,  DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            101, 2, 7, 121, 442, NULL, 'SALIX',   0, CURDATE(),                              CURDATE(),                              CURDATE()),
-        (9,  DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            104, 2, 7, 124, 442, NULL, 'SALIX',   0, CURDATE(),                              CURDATE(),                              CURDATE()),
-        (10, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            102, 3, 1, 2,   442, NULL, 'SALIX',   0, CURDATE(),                              CURDATE(),                              CURDATE()),
-        (11, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            102, 2, 7, 122, 442, NULL, 'SALIX',   0, CURDATE(),                              CURDATE(),                              CURDATE()),
-        (12, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            103, 3, 1, 3,   442, NULL, 'SALIX',   0, CURDATE(),                              CURDATE(),                              CURDATE()),
-        (13, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            103, 1, 2, 123, 442, NULL, 'SALIX',   0, CURDATE(),                              CURDATE(),                              CURDATE()),
-        (14, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            104, 1, 2, 4,   442, NULL, 'SALIX',   0, CURDATE(),                              CURDATE(),                              CURDATE()),
-        (15, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            105, 1, 3, 125, 442, NULL, 'SALIX',   0, CURDATE(),                              CURDATE(),                              CURDATE()),
-        (16, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            106, 2, 7, 126, 442, NULL, 'SALIX',   0, CURDATE(),                              CURDATE(),                              CURDATE()),
-        (17, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            107, 1, 4, 127, 442, NULL, 'SALIX',   0, CURDATE(),                              CURDATE(),                              CURDATE()),
-        (18, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            108, 1, 4, 128, 442, NULL, 'SALIX',   0, CURDATE(),                              CURDATE(),                              CURDATE()),
-        (19, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            109, 1, 5, 129, 442, NULL, 'SALIX',   0, CURDATE(),                              CURDATE(),                              CURDATE()),
-        (20, DATE_ADD(DATE_ADD(CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 109, 1, 5, 101, 442, NULL, 'SALIX',   0, DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(CURDATE(), INTERVAL +1 MONTH)),
-        (21, DATE_ADD(DATE_ADD(CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 109, 1, 5, 102, 442, NULL, 'SALIX',   0, DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(CURDATE(), INTERVAL +1 MONTH)),
-        (22, DATE_ADD(DATE_ADD(CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 109, 1, 5, 103, 442, NULL, 'SALIX',   0, DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(CURDATE(), INTERVAL +1 MONTH));
+        (1,  DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 101, 3, 1, 121, 442, NULL, 'TPV',     1,'155.89', DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH)),
+        (2,  DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 104, 3, 1, 124, 442, NULL, 'WEB',     1,'100.10', DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH)),
+        (3,  DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 104, 1, 2, 124, 442, NULL, 'ANDROID', 1,'107.25', DATE_ADD(CURDATE(), INTERVAL -2 MONTH), DATE_ADD(CURDATE(), INTERVAL -2 MONTH), DATE_ADD(CURDATE(), INTERVAL -2 MONTH)),
+        (4,  DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 104, 1, 2, 124, 442, NULL, 'SALIX',   1,'10.01', DATE_ADD(CURDATE(), INTERVAL -3 MONTH), DATE_ADD(CURDATE(), INTERVAL -3 MONTH), DATE_ADD(CURDATE(), INTERVAL -3 MONTH)),
+        (5,  DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 104, 1, 3, 124, 442, NULL, 'SALIX',   1,'10.01', DATE_ADD(CURDATE(), INTERVAL -4 MONTH), DATE_ADD(CURDATE(), INTERVAL -4 MONTH), DATE_ADD(CURDATE(), INTERVAL -4 MONTH)),
+        (6,  DATE_ADD(DATE_ADD(CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 101, 1, 3, 1,   442, NULL, 'SALIX',   1,'10.01', DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH)),
+        (7,  DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            101, 2, 7, 1,   442, NULL, 'SALIX',   0,'10.01', CURDATE(),                              CURDATE(),                              CURDATE()),
+        (8,  DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            101, 2, 7, 121, 442, NULL, 'SALIX',   0,'123.53', CURDATE(),                              CURDATE(),                              CURDATE()),
+        (9,  DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            104, 2, 7, 124, 442, NULL, 'SALIX',   0,'10.01', CURDATE(),                              CURDATE(),                              CURDATE()),
+        (10, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            102, 3, 1, 2,   442, NULL, 'SALIX',   0,'10.01', CURDATE(),                              CURDATE(),                              CURDATE()),
+        (11, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            102, 2, 7, 122, 442, NULL, 'SALIX',   0,'60.90', CURDATE(),                              CURDATE(),                              CURDATE()),
+        (12, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            103, 3, 1, 3,   442, NULL, 'SALIX',   0,'72.60', CURDATE(),                              CURDATE(),                              CURDATE()),
+        (13, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            103, 1, 2, 123, 442, NULL, 'SALIX',   0,'72.60', CURDATE(),                              CURDATE(),                              CURDATE()),
+        (14, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            104, 1, 2, 4,   442, NULL, 'SALIX',   0,'72.60', CURDATE(),                              CURDATE(),                              CURDATE()),
+        (15, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            105, 1, 3, 125, 442, NULL, 'SALIX',   0,'72.60', CURDATE(),                              CURDATE(),                              CURDATE()),
+        (16, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            106, 2, 7, 126, 442, NULL, 'SALIX',   0,'155.89', CURDATE(),                              CURDATE(),                              CURDATE()),
+        (17, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            107, 1, 4, 127, 442, NULL, 'SALIX',   0,'72.60', CURDATE(),                              CURDATE(),                              CURDATE()),
+        (18, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            108, 1, 4, 128, 442, NULL, 'SALIX',   0,'72.60', CURDATE(),                              CURDATE(),                              CURDATE()),
+        (19, DATE_ADD(CURDATE(), INTERVAL + 1 DAY),                            109, 1, 5, 129, 442, NULL, 'SALIX',   0,'16.50', CURDATE(),                              CURDATE(),                              CURDATE()),
+        (20, DATE_ADD(DATE_ADD(CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 109, 1, 5, 101, 442, NULL, 'SALIX',   0,'21.45', DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(CURDATE(), INTERVAL +1 MONTH)),
+        (21, DATE_ADD(DATE_ADD(CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 109, 1, 5, 102, 442, NULL, 'SALIX',   0,'0.00', DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(CURDATE(), INTERVAL +1 MONTH)),
+        (22, DATE_ADD(DATE_ADD(CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 109, 1, 5, 103, 442, NULL, 'SALIX',   0,'148.50', DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(CURDATE(), INTERVAL +1 MONTH));

 INSERT INTO `hedera`.`orderRow`(`id`, `orderFk`, `itemFk`, `warehouseFk`, `shipment`, `amount`, `price`, `rate`, `created`, `saleFk`)
    VALUES
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@ -189,8 +189,9 @@ export default {
        newPaymentBank: '.vn-dialog.shown vn-autocomplete[ng-model="$ctrl.receipt.bankFk"]',
        newPaymentAmount: '.vn-dialog.shown vn-input-number[ng-model="$ctrl.receipt.amountPaid"]',
        saveButton: '.vn-dialog.shown [response="accept"]',
-        firstBalanceLine: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(8)'
-
+        firstLineBalance: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(8)',
+        firstLineReference: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td-editable',
+        firstLineReferenceInput: 'vn-client-balance-index vn-tbody > vn-tr:nth-child(1) > vn-td-editable > div > field > vn-textfield'
    },
    webPayment: {
        confirmFirstPaymentButton: 'vn-client-web-payment vn-tr:nth-child(1) vn-icon-button[icon="done_all"]',
@ -371,7 +372,7 @@ export default {
    ticketsIndex: {
        openAdvancedSearchButton: 'vn-searchbar .append vn-icon[icon="arrow_drop_down"]',
        advancedSearchInvoiceOut: 'vn-ticket-search-panel vn-textfield[ng-model="filter.refFk"]',
-        newTicketButton: 'vn-ticket-index a',
+        newTicketButton: 'vn-ticket-index a[ui-sref="ticket.create"]',
        searchResult: 'vn-ticket-index vn-card > vn-table > div > vn-tbody > a.vn-tr',
        secondTicketCheckbox: 'vn-ticket-index vn-tbody > a:nth-child(2) > vn-td:nth-child(1) > vn-check',
        thirdTicketCheckbox: 'vn-ticket-index vn-tbody > a:nth-child(3) > vn-td:nth-child(1) > vn-check',
@ -544,6 +545,7 @@ export default {
        logButton: 'vn-left-menu a[ui-sref="ticket.card.log"]',
        changedBy: 'vn-ticket-log > vn-log vn-tr:nth-child(1) > vn-td:nth-child(2) > span',
        actionTaken: 'vn-ticket-log > vn-log vn-td:nth-child(1) > div > div:nth-child(3) > span.value',
+        changes: 'vn-ticket-log vn-data-viewer vn-tbody > vn-tr > vn-td:nth-child(7)',
        id: 'vn-ticket-log > vn-log vn-td.before > vn-one:nth-child(1) > div > span.value'
    },
    ticketService: {
@ -688,7 +690,7 @@ export default {
        confirmButton: '.vn-confirm.shown button[response="accept"]',
    },
    routeIndex: {
-        addNewRouteButton: 'vn-route-index > a[ui-sref="route.create"]'
+        addNewRouteButton: 'vn-route-index a[ui-sref="route.create"]'
    },
    createRouteView: {
        worker: 'vn-route-create vn-autocomplete[ng-model="$ctrl.route.workerFk"]',
@ -803,6 +805,22 @@ export default {
        navigateBackToIndex: 'vn-worker-descriptor [name="goToModuleIndex"]',
        acceptDeleteDialog: '.vn-confirm.shown button[response="accept"]'
    },
+    workerCalendar: {
+        year: 'vn-worker-calendar vn-autocomplete[ng-model="$ctrl.year"]',
+        totalHolidaysUsed: 'vn-worker-calendar div.totalBox > div',
+        januaryThirtyFirst: 'vn-worker-calendar vn-calendar:nth-child(2) section:nth-child(33) > div',
+        marchTwentyThird: 'vn-worker-calendar vn-calendar:nth-child(4) section:nth-child(29) > div',
+        mayFourth: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(8) > div',
+        mayEighth: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(12) > div',
+        mayTwelfth: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(16) > div',
+        mayThirteenth: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(17) > div',
+        mayFourteenth: 'vn-worker-calendar vn-calendar:nth-child(6) section:nth-child(18) > div',
+        holidays: 'vn-worker-calendar > vn-side-menu div:nth-child(3) > vn-chip:nth-child(1)',
+        absence: 'vn-worker-calendar > vn-side-menu div:nth-child(3) > vn-chip:nth-child(2)',
+        halfHoliday: 'vn-worker-calendar > vn-side-menu div:nth-child(3) > vn-chip:nth-child(3)',
+        furlough: 'vn-worker-calendar > vn-side-menu div:nth-child(3) > vn-chip:nth-child(4)',
+        halfFurlough: 'vn-worker-calendar > vn-side-menu div:nth-child(3) > vn-chip:nth-child(5)',
+    },
    invoiceOutIndex: {
        topbarSearch: 'vn-searchbar',
        searchButton: 'vn-searchbar vn-icon[icon="search"]',
@ -852,6 +870,13 @@ export default {
        createdThermograph: 'vn-travel-thermograph-index vn-tbody > vn-tr',
        upload: 'vn-travel-thermograph-create button[type=submit]'
    },
+    zoneIndex: {
+        searchResult: 'vn-zone-index a.vn-tr',
+    },
+    zoneDescriptor: {
+        menu: 'vn-zone-descriptor vn-icon-button[vn-popover="menu"]',
+        deleteZone: 'slot-menu vn-item[ng-click="$ctrl.onDelete()"]'
+    },
    zoneBasicData: {
        name: 'vn-zone-basic-data vn-textfield[ng-model="$ctrl.zone.name"]',
        agency: 'vn-zone-basic-data vn-autocomplete[ng-model="$ctrl.zone.agencyModeFk"]',
@ -870,7 +895,7 @@ export default {
        confirmed: 'vn-entry-summary vn-check[label="Confirmed"]',
    },
    entryDescriptor: {
-        agency: 'vn-entry-descriptor div.body vn-label-value:nth-child(2) span',
+        agency: 'vn-entry-descriptor div.body vn-label-value:nth-child(1) span',
        travelsQuicklink: 'vn-entry-descriptor vn-quick-link[icon="local_airport"] > a',
        entriesQuicklink: 'vn-entry-descriptor vn-quick-link[icon="icon-entry"] > a'
    }
--- a/e2e/paths/02-client/14_balance.spec.js
+++ b/e2e/paths/02-client/14_balance.spec.js
@ -53,15 +53,28 @@ describe('Client balance path', () => {
        expect(message.type).toBe('success');
    });

-    it('should check balance is now 0 and the company is now VNL becouse the user local settings were removed', async() => {
+    it('should edit the 1st line reference', async() => {
+        await page.waitToClick(selectors.clientBalance.firstLineReference);
+        await page.write(selectors.clientBalance.firstLineReferenceInput, 'Miscellaneous payment');
+        await page.keyboard.press('Enter');
+        const message = await page.waitForSnackbar();
+
+        expect(message.type).toBe('success');
+    });
+
+    it('should check balance is now 0, the reference was saved and the company is now VNL becouse the user local settings were removed', async() => {
        await page.waitForSpinnerLoad();
        let company = await page
            .waitToGetProperty(selectors.clientBalance.company, 'value');

+        let reference = await page
+            .waitToGetProperty(selectors.clientBalance.firstLineReference, 'innerText');
+
        let firstBalanceLine = await page
-            .waitToGetProperty(selectors.clientBalance.firstBalanceLine, 'innerText');
+            .waitToGetProperty(selectors.clientBalance.firstLineBalance, 'innerText');

        expect(company).toEqual('VNL');
+        expect(reference).toEqual('Miscellaneous payment');
        expect(firstBalanceLine).toContain('0.00');
    });

@ -76,7 +89,7 @@ describe('Client balance path', () => {

    it('should check balance is now -100', async() => {
        let result = await page
-            .waitToGetProperty(selectors.clientBalance.firstBalanceLine, 'innerText');
+            .waitToGetProperty(selectors.clientBalance.firstLineBalance, 'innerText');

        expect(result).toContain('-€100.00');
    });
@ -92,7 +105,7 @@ describe('Client balance path', () => {

    it('should check balance is now 50', async() => {
        let result = await page
-            .waitToGetProperty(selectors.clientBalance.firstBalanceLine, 'innerText');
+            .waitToGetProperty(selectors.clientBalance.firstLineBalance, 'innerText');

        expect(result).toEqual('€50.00');
    });
--- a/e2e/paths/03-worker/05_calendar.spec.js
+++ b/e2e/paths/03-worker/05_calendar.spec.js
@ -0,0 +1,137 @@
+import selectors from '../../helpers/selectors.js';
+import getBrowser from '../../helpers/puppeteer';
+
+describe('Worker calendar path', () => {
+    let reasonableTimeBetweenClicks = 400;
+    let browser;
+    let page;
+    beforeAll(async() => {
+        browser = await getBrowser();
+        page = browser.page;
+        await page.loginAndModule('hr', 'worker');
+        await page.accessToSearchResult('Hank Pym');
+        await page.accessToSection('worker.card.calendar');
+    });
+
+    afterAll(async() => {
+        await browser.close();
+    });
+
+    describe('as hr', () => {
+        it('should check 5 total holidays have been used so far before testing anything', async() => {
+            const result = await page.waitToGetProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText');
+
+            expect(result).toContain(' 5 ');
+        });
+
+        it('should set two days as holidays on the calendar', async() => {
+            await page.waitToClick(selectors.workerCalendar.holidays);
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.januaryThirtyFirst);
+
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.absence);
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.marchTwentyThird);
+
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.halfHoliday);
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.mayFourth);
+
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.furlough);
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.mayTwelfth);
+            await page.waitToClick(selectors.workerCalendar.mayThirteenth);
+            await page.waitToClick(selectors.workerCalendar.mayFourteenth);
+
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.halfFurlough);
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.mayEighth);
+        });
+
+        it('should check the total holidays increased by 1.5', async() => {
+            const result = await page.waitToGetProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText');
+
+            expect(result).toContain(' 6.5 ');
+        });
+    });
+
+    describe(`as salesBoss`, () => {
+        it(`should log in and get to Hank's calendar`, async() => {
+            await page.loginAndModule('salesBoss', 'worker');
+            await page.accessToSearchResult('Hank Pym');
+            await page.accessToSection('worker.card.calendar');
+        });
+
+        it('should undo what was done here', async() => {
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.holidays);
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.januaryThirtyFirst);
+
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.absence);
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.marchTwentyThird);
+
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.halfHoliday);
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.mayFourth);
+
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.furlough);
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.mayTwelfth);
+            await page.waitToClick(selectors.workerCalendar.mayThirteenth);
+            await page.waitToClick(selectors.workerCalendar.mayFourteenth);
+
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.halfFurlough);
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.mayEighth);
+        });
+
+        it('should check the total holidays used are back to what it was', async() => {
+            const result = await page.waitToGetProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText');
+
+            expect(result).toContain(' 5 ');
+        });
+    });
+
+    describe(`as Hank`, () => {
+        it(`should log in and get to his calendar`, async() => {
+            await page.loginAndModule('HankPym', 'worker');
+            await page.accessToSearchResult('Hank Pym');
+            await page.accessToSection('worker.card.calendar');
+        });
+
+        it('should make a futile attempt to add holidays', async() => {
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.holidays);
+            await page.waitFor(reasonableTimeBetweenClicks);
+            await page.waitToClick(selectors.workerCalendar.januaryThirtyFirst);
+        });
+
+        it('should check the total holidays used are now the initial ones', async() => {
+            const result = await page.waitToGetProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText');
+
+            expect(result).toContain(' 5 ');
+        });
+
+        it('should use the year selector to go to the previous year', async() => {
+            const date = new Date();
+            const lastYear = (date.getFullYear() - 1).toString();
+
+            await page.autocompleteSearch(selectors.workerCalendar.year, lastYear);
+
+            await page.waitFor(reasonableTimeBetweenClicks);
+            const result = await page.waitToGetProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText');
+
+            expect(result).toContain(' 0 ');
+        });
+    });
+});
--- a/e2e/paths/04-item/13_request.spec.js
+++ b/e2e/paths/04-item/13_request.spec.js
@ -31,7 +31,7 @@ describe('Item request path', () => {
    it('should the status of the request should now be accepted', async() => {
        let status = await page.waitToGetProperty(selectors.itemRequest.firstRequestStatus, 'innerText');

-        expect(status).toContain('Aceptada');
+        expect(status).toContain('Accepted');
    });

    it('should now click on the second declain request icon then type the reason', async() => {
@ -40,6 +40,6 @@ describe('Item request path', () => {
        await page.respondToDialog('accept');
        let status = await page.waitToGetProperty(selectors.itemRequest.firstRequestStatus, 'innerText');

-        expect(status).toContain('Denegada');
+        expect(status).toContain('Denied');
    });
 });
--- a/e2e/paths/05-ticket/18_index_payout.spec.js
+++ b/e2e/paths/05-ticket/18_index_payout.spec.js
@ -19,7 +19,7 @@ describe('Ticket index payout path', () => {
        await page.waitForState('ticket.index');
    });

-    it('should check three tickets 2 of a clinet and 1 of another', async() => {
+    it('should check the second ticket from a client and 1 of another', async() => {
        await page.keyboard.press('Enter');
        await page.waitToClick(selectors.ticketsIndex.secondTicketCheckbox);
        await page.waitToClick(selectors.ticketsIndex.sixthTicketCheckbox);
--- a/e2e/paths/11-zone/02_descriptor.spec.js
+++ b/e2e/paths/11-zone/02_descriptor.spec.js
@ -0,0 +1,42 @@
+import selectors from '../../helpers/selectors.js';
+import getBrowser from '../../helpers/puppeteer';
+
+describe('Zone descriptor path', () => {
+    let browser;
+    let page;
+
+    beforeAll(async() => {
+        browser = await getBrowser();
+        page = browser.page;
+        await page.loginAndModule('deliveryBoss', 'zone');
+        await page.accessToSearchResult('13');
+    });
+
+    afterAll(async() => {
+        await browser.close();
+    });
+
+    it('should eliminate the zone using the descriptor option', async() => {
+        await page.waitToClick(selectors.zoneDescriptor.menu);
+        await page.waitToClick(selectors.zoneDescriptor.deleteZone);
+        await page.respondToDialog('accept');
+        await page.waitForState('zone.index');
+    });
+
+    it('should search for the deleted zone to find no results', async() => {
+        await page.doSearch('13');
+        const count = await page.countElement(selectors.zoneIndex.searchResult);
+
+        expect(count).toEqual(0);
+    });
+
+    it('should check the ticket whom lost the zone and see evidence on the logs', async() => {
+        await page.waitToClick(selectors.globalItems.homeButton);
+        await page.selectModule('ticket');
+        await page.accessToSearchResult('20');
+        await page.accessToSection('ticket.card.log');
+        const lastChanges = await page.waitToGetProperty(selectors.ticketLog.changes, 'innerText');
+
+        expect(lastChanges).toContain('Arreglar');
+    });
+});
--- a/front/core/components/array-model/array-model.js
+++ b/front/core/components/array-model/array-model.js
@ -214,7 +214,7 @@ export default class ArrayModel extends ModelProxy {
 }
 ArrayModel.$inject = ['$q', '$filter', '$element', '$scope'];

-ngModule.component('vnArrayModel', {
+ngModule.vnComponent('vnArrayModel', {
    controller: ArrayModel,
    bindings: {
        orgData: '<?',
--- a/front/core/components/autocomplete/index.js
+++ b/front/core/components/autocomplete/index.js
@ -192,7 +192,7 @@ export default class Autocomplete extends Field {

        if (this.translateFields) {
            if (this.translateFields.indexOf(this.showField) > -1)
-                this.input.value = this.$translate.instant(display);
+                this.input.value = this.$t(display);
        }
    }

--- a/front/core/components/calendar/index.js
+++ b/front/core/components/calendar/index.js
@ -135,7 +135,10 @@ export default class Calendar extends FormInput {
            $days: [day],
            $type: 'day'
        });
-        // this.repaint();
+
+        // Repaint only if 'selection' event is not listening
+        if (!this.$events || this.$events && !this.$events['selection'])
+            this.repaint();
    }

    /*
--- a/front/core/components/chip/index.spec.js
+++ b/front/core/components/chip/index.spec.js
@ -8,7 +8,7 @@ describe('Component vnChip', () => {

    beforeEach(ngModule('vnCore'));

-    beforeEach(angular.mock.inject(($componentController, $rootScope) => {
+    beforeEach(inject(($componentController, $rootScope) => {
        $scope = $rootScope.$new();
        $element = angular.element(`<div>${template}</div>`);
        controller = $componentController('vnChip', {$element, $scope, $transclude: () => {}});
--- a/front/core/components/contextmenu/index.js
+++ b/front/core/components/contextmenu/index.js
@ -67,13 +67,13 @@ export default class Contextmenu {
    get cell() {
        if (!this.target) return null;

-        return this.target.closest('vn-td, .vn-td');
+        return this.target.closest('vn-td, .vn-td, vn-td-editable');
    }

    get cellIndex() {
        if (!this.row) return null;

-        const cells = this.row.querySelectorAll('vn-td, .vn-td');
+        const cells = this.row.querySelectorAll('vn-td, .vn-td, vn-td-editable');
        return Array.from(cells).findIndex(
            cellItem => cellItem == this.cell
        );
--- a/front/core/components/crud-model/crud-model.js
+++ b/front/core/components/crud-model/crud-model.js
@ -272,7 +272,7 @@ export default class CrudModel extends ModelProxy {
 }
 CrudModel.$inject = ['$q', '$http', '$element', '$scope'];

-ngModule.component('vnCrudModel', {
+ngModule.vnComponent('vnCrudModel', {
    controller: CrudModel,
    bindings: {
        orgData: '<?',
--- a/front/core/components/data-viewer/index.js
+++ b/front/core/components/data-viewer/index.js
@ -21,7 +21,7 @@ export default class DataViewer {
    }
 }

-ngModule.component('vnDataViewer', {
+ngModule.vnComponent('vnDataViewer', {
    template: require('./index.html'),
    transclude: true,
    controller: DataViewer,
--- a/front/core/components/date-picker/index.spec.js
+++ b/front/core/components/date-picker/index.spec.js
@ -9,7 +9,7 @@ describe('Component vnDatePicker', () => {

    beforeEach(ngModule('vnCore'));

-    beforeEach(angular.mock.inject(($compile, $rootScope, _$filter_) => {
+    beforeEach(inject(($compile, $rootScope, _$filter_) => {
        $filter = _$filter_;

        $element = $compile(`<vn-date-picker></vn-date-picker>`)($rootScope);
--- a/front/core/components/dialog/index.spec.js
+++ b/front/core/components/dialog/index.spec.js
@ -5,7 +5,7 @@ describe('Component vnDialog', () => {

    beforeEach(ngModule('vnCore'));

-    beforeEach(angular.mock.inject(($rootScope, $compile) => {
+    beforeEach(inject(($rootScope, $compile) => {
        $scope = $rootScope.$new();
        $element = $compile('<vn-dialog><tpl-body>Body</tpl-body></vn-dialog>')($scope);
        controller = $element.controller('vnDialog');
--- a/front/core/components/drop-down/index.js
+++ b/front/core/components/drop-down/index.js
@ -276,7 +276,7 @@ export default class DropDown extends Popover {
                if (this.translateFields) {
                    option = Object.assign({}, option);
                    for (let field of this.translateFields)
-                        option[field] = this.$translate.instant(option[field]);
+                        option[field] = this.$t(option[field]);
                }

                let li = this.document.createElement('li');
--- a/front/core/components/icon/icon.js
+++ b/front/core/components/icon/icon.js
@ -25,7 +25,7 @@ class Icon {
 }
 Icon.$inject = ['$attrs'];

-ngModule.component('vnIcon', {
+ngModule.vnComponent('vnIcon', {
    template: '<i class="{{::$ctrl.iconClass}} unselectable">{{::$ctrl.iconContent}}</i>',
    controller: Icon,
    bindings: {
--- a/front/core/components/input-file/index.spec.js
+++ b/front/core/components/input-file/index.spec.js
@ -7,7 +7,7 @@ describe('Component vnInputFile', () => {

    beforeEach(ngModule('vnCore'));

-    beforeEach(angular.mock.inject(($compile, $rootScope) => {
+    beforeEach(inject(($compile, $rootScope) => {
        $scope = $rootScope.$new();
        $element = $compile('<vn-input-file></vn-input-file>')($scope);
        controller = $element.controller('vnInputFile');
--- a/front/core/components/input-number/index.spec.js
+++ b/front/core/components/input-number/index.spec.js
@ -6,7 +6,7 @@ describe('Component vnInputNumber', () => {

    beforeEach(ngModule('vnCore'));

-    beforeEach(angular.mock.inject(($compile, $rootScope) => {
+    beforeEach(inject(($compile, $rootScope) => {
        $element = $compile(`<vn-input-number ng-model="model" />`)($rootScope);
        $ctrl = $element.controller('vnInputNumber');
    }));
--- a/front/core/components/input-time/index.spec.js
+++ b/front/core/components/input-time/index.spec.js
@ -7,7 +7,7 @@ describe('Component vnInputTime', () => {

    beforeEach(ngModule('vnCore'));

-    beforeEach(angular.mock.inject(($compile, $rootScope, _$filter_) => {
+    beforeEach(inject(($compile, $rootScope, _$filter_) => {
        $filter = _$filter_;

        $element = $compile(`<vn-input-time></vn-input-time>`)($rootScope);
--- a/front/core/components/label-value/index.js
+++ b/front/core/components/label-value/index.js
@ -42,7 +42,7 @@ export default class Controller extends Component {
    }
 }

-ngModule.component('vnLabelValue', {
+ngModule.vnComponent('vnLabelValue', {
    controller: Controller,
    template: require('./index.html'),
    transclude: true,
--- a/front/core/components/model-proxy/model-proxy.js
+++ b/front/core/components/model-proxy/model-proxy.js
@ -30,7 +30,7 @@ export class DataModel extends Component {
    clear() {}
 }

-ngModule.component('vnDataModel', {
+ngModule.vnComponent('vnDataModel', {
    controller: DataModel,
    bindings: {
        data: '=?',
@ -269,7 +269,7 @@ export default class ModelProxy extends DataModel {
    }
 }

-ngModule.component('vnModelProxy', {
+ngModule.vnComponent('vnModelProxy', {
    controller: ModelProxy,
    bindings: {
        orgData: '<?',
--- a/front/core/components/multi-check/multi-check.js
+++ b/front/core/components/multi-check/multi-check.js
@ -11,6 +11,7 @@ import './style.scss';
 export default class MultiCheck extends FormInput {
    constructor($element, $scope) {
        super($element, $scope);
+        this.checkAll = false;
        this._checked = false;
        this.checkField = 'checked';
        this.isIntermediate = false;
@ -114,7 +115,7 @@ export default class MultiCheck extends FormInput {
    }
 }

-ngModule.component('vnMultiCheck', {
+ngModule.vnComponent('vnMultiCheck', {
    template: require('./multi-check.html'),
    controller: MultiCheck,
    bindings: {
--- a/front/core/components/multi-check/multi-check.spec.js
+++ b/front/core/components/multi-check/multi-check.spec.js
@ -7,7 +7,7 @@ describe('Component vnMultiCheck', () => {

    beforeEach(ngModule('vnCore'));

-    beforeEach(angular.mock.inject($componentController => {
+    beforeEach(inject($componentController => {
        $element = angular.element(`<div class="shown"></div>`);
        controller = $componentController('vnMultiCheck', {$element: $element});
        controller._model = crudModel;
--- a/front/core/components/pagination/pagination.js
+++ b/front/core/components/pagination/pagination.js
@ -90,7 +90,7 @@ class Pagination extends Component {
    }
 }

-ngModule.component('vnPagination', {
+ngModule.vnComponent('vnPagination', {
    template: require('./pagination.html'),
    bindings: {
        model: '<',
--- a/front/core/components/scroll-up/scroll-up.js
+++ b/front/core/components/scroll-up/scroll-up.js
@ -22,7 +22,7 @@ export default class Controller extends Component {

 Controller.$inject = ['$element', '$scope', '$window'];

-ngModule.component('vnScrollUp', {
+ngModule.vnComponent('vnScrollUp', {
    template: require('./scroll-up.html'),
    controller: Controller,
    bindings: {
--- a/front/core/components/searchbar/searchbar.js
+++ b/front/core/components/searchbar/searchbar.js
@ -36,7 +36,7 @@ export default class Searchbar extends Component {
            }

            this.searchState = `${this.baseState}.index`;
-            this.placeholder = this.$translate.instant('Search by', {
+            this.placeholder = this.$t('Search by', {
                module: this.baseState
            });
        }
@ -189,7 +189,7 @@ export default class Searchbar extends Component {
    }

    doSearch(filter, source) {
-        if (filter === this.filter) return;
+        if (filter === this.filter && source != 'state') return;
        let promise = this.onSearch({$params: filter});
        promise = promise || this.$q.resolve();
        promise.then(data => this.onFilter(filter, source, data));
--- a/front/core/components/slot/portal.js
+++ b/front/core/components/slot/portal.js
@ -19,7 +19,7 @@ export default class Portal {
 }
 Portal.$inject = ['$transclude', 'vnSlotService'];

-ngModule.component('vnPortal', {
+ngModule.vnComponent('vnPortal', {
    controller: Portal,
    transclude: true,
    bindings: {
--- a/front/core/components/snackbar/snackbar.js
+++ b/front/core/components/snackbar/snackbar.js
@ -144,7 +144,7 @@ export default class Controller extends Component {
    }
 }

-ngModule.component('vnSnackbar', {
+ngModule.vnComponent('vnSnackbar', {
    template: require('./snackbar.html'),
    controller: Controller
 });
--- a/front/core/components/spinner/spinner.js
+++ b/front/core/components/spinner/spinner.js
@ -54,4 +54,4 @@ export const component = {
    },
    controller: Spinner
 };
-ngModule.component('vnSpinner', component);
+ngModule.vnComponent('vnSpinner', component);
--- a/front/core/components/spinner/spinner.spec.js
+++ b/front/core/components/spinner/spinner.spec.js
@ -6,7 +6,7 @@ describe('Component vnSpinner', () => {

    beforeEach(ngModule('vnCore'));

-    beforeEach(angular.mock.inject(($compile, $rootScope) => {
+    beforeEach(inject(($compile, $rootScope) => {
        $element = $compile(`<vn-spinner></vn-spinner>`)($rootScope);
        controller = $element.controller('vnSpinner');
    }));
--- a/front/core/components/step-control/step-control.js
+++ b/front/core/components/step-control/step-control.js
@ -74,7 +74,7 @@ export default class StepControl {

 StepControl.$inject = ['$state'];

-ngModule.component('vnStepControl', {
+ngModule.vnComponent('vnStepControl', {
    template: require('./step-control.html'),
    controller: StepControl,
    bindings: {
--- a/front/core/components/step-control/step-control.spec.js
+++ b/front/core/components/step-control/step-control.spec.js
@ -6,7 +6,7 @@ describe('Component vnStepControl', () => {

    beforeEach(ngModule('vnCore'));

-    beforeEach(angular.mock.inject(($componentController, _$state_) => {
+    beforeEach(inject(($componentController, _$state_) => {
        $state = _$state_;
        jest.spyOn($state, 'go');
        controller = $componentController('vnStepControl', {$state: $state});
--- a/front/core/components/table/index.js
+++ b/front/core/components/table/index.js
@ -42,7 +42,7 @@ export default class Table {

 Table.$inject = ['$scope', '$element', '$transclude'];

-ngModule.component('vnTable', {
+ngModule.vnComponent('vnTable', {
    template: require('./index.html'),
    transclude: true,
    controller: Table,
--- a/front/core/components/table/index.spec.js
+++ b/front/core/components/table/index.spec.js
@ -7,7 +7,7 @@ describe('Component vnTable', () => {

    beforeEach(ngModule('vnCore'));

-    beforeEach(angular.mock.inject(($componentController, $rootScope) => {
+    beforeEach(inject(($componentController, $rootScope) => {
        $scope = $rootScope.$new();
        $element = angular.element(`
        <vn-table model="model">
--- a/front/core/components/td-editable/index.js
+++ b/front/core/components/td-editable/index.js
@ -94,7 +94,7 @@ export default class Controller extends Component {
 }
 Controller.$inject = ['$element', '$scope', '$transclude', '$timeout'];

-ngModule.component('vnTdEditable', {
+ngModule.vnComponent('vnTdEditable', {
    template: require('./index.html'),
    controller: Controller,
    bindings: {
--- a/front/core/components/textarea/index.spec.js
+++ b/front/core/components/textarea/index.spec.js
@ -6,7 +6,7 @@ describe('Component vnTextarea', () => {

    beforeEach(ngModule('vnCore'));

-    beforeEach(angular.mock.inject(($compile, $rootScope) => {
+    beforeEach(inject(($compile, $rootScope) => {
        $element = $compile(`<vn-textarea></vn-textarea>`)($rootScope);
        $ctrl = $element.controller('vnTextarea');
    }));
--- a/front/core/components/th/index.js
+++ b/front/core/components/th/index.js
@ -75,7 +75,7 @@ export default class Th {

 Th.$inject = ['$element'];

-ngModule.component('vnTh', {
+ngModule.vnComponent('vnTh', {
    template: require('./index.html'),
    transclude: true,
    controller: Th,
--- a/front/core/components/th/index.spec.js
+++ b/front/core/components/th/index.spec.js
@ -7,7 +7,7 @@ describe('Component vnTh', () => {

    beforeEach(ngModule('vnCore'));

-    beforeEach(angular.mock.inject($componentController => {
+    beforeEach(inject($componentController => {
        $element = angular.element(`<div>${template}</div>`);
        controller = $componentController('vnTh', {$element: $element});
        controller.table = {
--- a/front/core/components/tooltip/tooltip.js
+++ b/front/core/components/tooltip/tooltip.js
@ -197,7 +197,7 @@ export default class Tooltip extends Component {
 }
 Tooltip.$inject = ['$element', '$scope', '$timeout'];

-ngModule.component('vnTooltip', {
+ngModule.vnComponent('vnTooltip', {
    template: require('./tooltip.html'),
    controller: Tooltip,
    transclude: true,
--- a/front/core/components/treeview/child.js
+++ b/front/core/components/treeview/child.js
@ -49,7 +49,7 @@ class Controller {
 }
 Controller.$inject = ['$element', '$scope', '$compile'];

-ngModule.component('vnTreeviewChild', {
+ngModule.vnComponent('vnTreeviewChild', {
    template: require('./child.html'),
    controller: Controller,
    bindings: {
--- a/front/core/components/treeview/childs.js
+++ b/front/core/components/treeview/childs.js
@ -2,7 +2,7 @@ import ngModule from '../../module';

 class Controller {}

-ngModule.component('vnTreeviewChilds', {
+ngModule.vnComponent('vnTreeviewChilds', {
    template: require('./childs.html'),
    controller: Controller,
    bindings: {
--- a/front/core/components/treeview/index.js
+++ b/front/core/components/treeview/index.js
@ -247,7 +247,7 @@ export default class Treeview extends Component {

 Treeview.$inject = ['$element', '$scope', '$transclude', '$window'];

-ngModule.component('vnTreeview', {
+ngModule.vnComponent('vnTreeview', {
    template: require('./index.html'),
    controller: Treeview,
    bindings: {
--- a/front/core/components/watcher/watcher.js
+++ b/front/core/components/watcher/watcher.js
@ -267,7 +267,7 @@ export default class Watcher extends Component {
 }
 Watcher.$inject = ['$element', '$scope', '$state', '$stateParams', '$transitions', '$http', 'vnApp', '$translate', '$attrs', '$q'];

-ngModule.component('vnWatcher', {
+ngModule.vnComponent('vnWatcher', {
    template: require('./watcher.html'),
    bindings: {
        url: '@?',
--- a/front/core/components/watcher/watcher.spec.js
+++ b/front/core/components/watcher/watcher.spec.js
@ -12,7 +12,7 @@ describe('Component vnWatcher', () => {

    beforeEach(ngModule('vnCore'));

-    beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_, _$state_, _$q_) => {
+    beforeEach(inject(($componentController, $rootScope, _$httpBackend_, _$state_, _$q_) => {
        $scope = $rootScope.$new();
        $element = angular.element('<div></div>');
        $state = _$state_;
--- a/front/core/directives/specs/zoom-image.spec.js
+++ b/front/core/directives/specs/zoom-image.spec.js
@ -7,7 +7,7 @@ describe('Directive zoomImage', () => {

    beforeEach(ngModule('vnCore'));

-    beforeEach(angular.mock.inject(($compile, $rootScope) => {
+    beforeEach(inject(($compile, $rootScope) => {
        compile = $compile;
        scope = $rootScope.$new();
    }));
--- a/front/core/lib/specs/module-loader.spec.js
+++ b/front/core/lib/specs/module-loader.spec.js
@ -5,7 +5,7 @@ describe('factory vnModuleLoader', () => {

    beforeEach(ngModule('vnCore'));

-    beforeEach(angular.mock.inject((_vnModuleLoader_, _$rootScope_, $httpBackend, _$window_, $q) => {
+    beforeEach(inject((_vnModuleLoader_, _$rootScope_, $httpBackend, _$window_, $q) => {
        vnModuleLoader = _vnModuleLoader_;
        $rootScope = _$rootScope_;
        $window = _$window_;
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				INSERT IGNORE INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('WorkerLog', '*', 'READ', 'ALLOW', 'ROLE', 'hr');
				`@ -1 +0,0 @@`
				UPDATE `vn`.`component` SET `code` = 'imbalance' WHERE (`id` = '36');