Merge branch 'dev' into 6939-change-README

2024-05-17 12:08:10 +00:00 · 2024-05-17 12:08:10 +00:00 · d9d604b904
parent 611dea6185 2b0ab1816f
commit d9d604b904
74 changed files with 977 additions and 636 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,4 @@
+
 # Changelog

 All notable changes to this project will be documented in this file.
--- a/1
+++ b/1
@ -161,7 +161,6 @@ pipeline {
                                    def packageJson = readJSON file: 'package.json'
                                    env.VERSION = packageJson.version
                                }
-                                echo "BRANCH_NAME: ${env.BRANCH_NAME}"
                                sh 'gulp build'
                                sh 'docker-compose build front'
                            }
--- a/README.md
+++ b/README.md
@ -59,6 +59,12 @@ For end-to-end tests run from project's root.
 $ npm run test:e2e
 ```

+## Generate changeLog test → master
+```
+$ bash changelog.sh
+```
+
+
 ## Visual Studio Code extensions

 Open Visual Studio Code, press Ctrl+P and paste the following commands.
--- a/changelog.sh
+++ b/changelog.sh
@ -0,0 +1,34 @@
+features_types=(chore feat style)
+changes_types=(refactor perf)
+fix_types=(fix revert)
+file="CHANGELOG.md"
+file_tmp="temp_log.txt"
+file_current_tmp="temp_current_log.txt"
+
+setType(){
+    echo "### $1" >> $file_tmp
+    arr=("$@")
+    echo "" > $file_current_tmp
+    for i in "${arr[@]}"
+    do
+        git log --grep="$i" --oneline --no-merges --format="- %s %d by:%an" master..test >> $file_current_tmp
+    done
+    # remove duplicates
+    sort -o $file_current_tmp -u $file_current_tmp
+    cat $file_current_tmp >> $file_tmp
+    echo "" >> $file_tmp
+    # remove tmp current file
+    [ -e $file_current_tmp ] && rm $file_current_tmp
+}
+
+echo "# Version XX.XX - XXXX-XX-XX" >> $file_tmp
+echo "" >> $file_tmp
+
+setType "Added 🆕" "${features_types[@]}"
+setType "Changed 📦" "${changes_types[@]}"
+setType "Fixed 🛠️" "${fix_types[@]}"
+
+cat $file >> $file_tmp
+mv $file_tmp $file
+
+
--- a/db/routines/dipole/procedures/expedition_add.sql
+++ b/db/routines/dipole/procedures/expedition_add.sql
@ -34,7 +34,7 @@ BEGIN
 					vPrinterFk,
 					IFNULL(right(`t`.`routeFk`, 3),0),
 					if (@vVolume := vn.ticketTotalVolume(t.id) > 1.5, @vVolume, IFNULL( rm.beachFk, 0)),
-					LEFT(IFNULL(et.description ,replace(`z`.`name`, 'ZONA ', 'Z')),14) truckName,
+					LEFT(IFNULL(rs.description ,replace(`z`.`name`, 'ZONA ', 'Z')),14) truckName,
 					t.clientFk ,
 					ifnull(c.mobile, ifnull(a.mobile, ifnull(c.phone, a.phone))),
 					LEFT(p.name, 20),
@ -46,7 +46,7 @@ BEGIN
 					JOIN vn.address a ON a.id = t.addressFk
 					JOIN vn.province p ON p.id = a.provinceFk
 					LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
-					LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk
+					LEFT JOIN vn.roadmapStop rs ON rs.id = rm.expeditionTruckFk
 					LEFT JOIN vn.beach b ON b.code = rm.beachFk
 					LEFT JOIN vn.`zone`z ON z.id = t.zoneFk
 					JOIN vn.agencyMode am ON t.agencyModeFk = am.id
--- a/db/routines/srt/functions/expedition_getDayMinute.sql
+++ b/db/routines/srt/functions/expedition_getDayMinute.sql
@ -15,14 +15,14 @@ BEGIN
 	
 	DECLARE vDayMinute INT;

-	SELECT HOUR(IFNULL(et.ETD, z.`hour`)) * 60 + MINUTE(IFNULL(et.ETD, z.`hour`)) INTO vDayMinute 
+	SELECT HOUR(IFNULL(rs.ETD, z.`hour`)) * 60 + MINUTE(IFNULL(rs.ETD, z.`hour`)) INTO vDayMinute 
 		FROM vn.expedition e  
 			JOIN vn.ticket t ON e.ticketFk = t.id
 			JOIN vn.`zone` z ON z.id = t.zoneFk  
 			LEFT JOIN vn.route r ON r.id = t.routeFk 
 			LEFT JOIN vn.agencyMode am ON am.id = r.agencyModeFk 
 			LEFT JOIN vn.routesMonitor rm ON t.routeFk = rm.routeFk 
-			LEFT JOIN vn.expeditionTruck et ON rm.expeditionTruckFk = et.id 
+			LEFT JOIN vn.roadmapStop rs ON rm.expeditionTruckFk = rs.id 
 		WHERE e.id = vExpeditionFk;
 	
 	RETURN vDayMinute;
--- a/db/routines/srt/procedures/expedition_reset.sql
+++ b/db/routines/srt/procedures/expedition_reset.sql
@ -296,8 +296,8 @@ BEGIN
    
    SET @dm := (24 * 60) - 10;
   
-    UPDATE vn.expeditionTruck et 
-   		SET et.eta = timestampadd(MINUTE ,@dm := 1 + @dm,util.VN_CURDATE())
+    UPDATE vn.roadmapStop rs 
+   		SET rs.eta = timestampadd(MINUTE ,@dm := 1 + @dm,util.VN_CURDATE())
   		WHERE description LIKE 'PRU%' ;
   	
   	DELETE FROM srt.movingLog ;
--- a/db/routines/srt/views/bufferDayMinute.sql
+++ b/db/routines/srt/views/bufferDayMinute.sql
@ -3,10 +3,10 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 	VIEW `srt`.`bufferDayMinute`
 AS SELECT `b`.`id` AS `bufferFk`,
 	`e`.`id` AS `expeditionFk`,
-	`srt`.`dayMinute`(IFNULL(`et`.`eta`, `z`.`hour`)) AS `dayMinute`,
+	`srt`.`dayMinute`(IFNULL(`rs`.`eta`, `z`.`hour`)) AS `dayMinute`,
 	`e`.`position` AS `position`,
 	IFNULL(
-		`et`.`eta`,
+		`rs`.`eta`,
 		`util`.`VN_CURDATE`() + INTERVAL `srt`.`dayMinute`(`z`.`hour`) MINUTE
 	) AS `ETD`,
 	`e2`.`ticketFk` AS `ticketFk`,
@ -34,7 +34,7 @@ FROM (
 				)
 				LEFT JOIN `vn`.`routesMonitor` `rm` ON(`t`.`routeFk` = `rm`.`routeFk`)
 			)
-			LEFT JOIN `vn`.`expeditionTruck` `et` ON(`rm`.`expeditionTruckFk` = `et`.`id`)
+			LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rm`.`expeditionTruckFk` = `rs`.`id`)
 		)
 		LEFT JOIN `vn`.`zone` `z` ON(`z`.`id` = `t`.`zoneFk`)
 	)
--- a/db/routines/srt/views/bufferStock.sql
+++ b/db/routines/srt/views/bufferStock.sql
@ -4,22 +4,22 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 AS SELECT `e`.`id` AS `expeditionFk`,
 	`e`.`bufferFk` AS `bufferFk`,
 	`e`.`position` AS `position`,
-	`srt`.`dayMinute`(IFNULL(`et`.`eta`, `z`.`hour`)) AS `dayMinute`,
+	`srt`.`dayMinute`(IFNULL(`rs`.`eta`, `z`.`hour`)) AS `dayMinute`,
 	IFNULL(
-		`et`.`eta`,
+		`rs`.`eta`,
 		`util`.`VN_CURDATE`() + INTERVAL `srt`.`dayMinute`(`z`.`hour`) + 120 MINUTE
 	) AS `eta`,
 	`ve`.`ticketFk` AS `ticketFk`,
 	IFNULL(`t`.`routeFk`, `t`.`agencyModeFk`) AS `routeFk`,
 	`z`.`name` AS `zonaTicket`,
-	`et`.`description` AS `truck`,
+	`rs`.`description` AS `truck`,
 	`es`.`description` AS `expeditionState`,
 	`b`.`hasWorkerWaiting` AS `hasWorkerWaiting`,
 	`b`.`isActive` AS `isActive`,
 	IF(
-		`et`.`id` IS NULL,
+		`rs`.`id` IS NULL,
 		`c`.`bufferDefault`,
-		`et`.`bufferFk`
+		`rs`.`bufferFk`
 	) AS `bufferTruck`,
 	`bt`.`typeName` AS `typeName`,
 	`rm`.`bufferFk` AS `routeBuffer`
@ -45,7 +45,7 @@ FROM (
 					)
 					LEFT JOIN `vn`.`routesMonitor` `rm` ON(`t`.`routeFk` = `rm`.`routeFk`)
 				)
-				LEFT JOIN `vn`.`expeditionTruck` `et` ON(`rm`.`expeditionTruckFk` = `et`.`id`)
+				LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rm`.`expeditionTruckFk` = `rs`.`id`)
 			)
 			JOIN `srt`.`config` `c`
 		)
--- a/db/routines/srt/views/upperStickers.sql
+++ b/db/routines/srt/views/upperStickers.sql
@ -4,13 +4,13 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 AS SELECT `e`.`id` AS `expeditionFk`,
 	`e`.`id` MOD 10000 AS `expedition`,
 	IFNULL(
-		`et`.`eta`,
+		`rs`.`eta`,
 		`util`.`VN_CURDATE`() + INTERVAL `srt`.`dayMinute`(`z`.`hour`) + 120 MINUTE
 	) AS `ETD`,
 	`ve`.`ticketFk` AS `ticketFk`,
 	right(IFNULL(`t`.`routeFk`, `t`.`agencyModeFk`), 3) AS `routeFk`,
 	`z`.`name` AS `zonaTicket`,
-	`et`.`description` AS `truck`,
+	`rs`.`description` AS `truck`,
 	`epo`.`workerCode` AS `worker`,
 	`p`.`name` AS `labeler`,
 	`ve`.`counter` AS `expeditionCounter`,
@ -32,7 +32,7 @@ FROM (
 					)
 					LEFT JOIN `vn`.`routesMonitor` `rm` ON(`t`.`routeFk` = `rm`.`routeFk`)
 				)
-				LEFT JOIN `vn`.`expeditionTruck` `et` ON(`rm`.`expeditionTruckFk` = `et`.`id`)
+				LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rm`.`expeditionTruckFk` = `rs`.`id`)
 			)
 			JOIN `dipole`.`expedition_PrintOut` `epo` ON(`epo`.`expeditionFk` = `e`.`id`)
 		)
--- a/db/routines/vn/functions/xdiario_new.sql
+++ b/db/routines/vn/functions/xdiario_new.sql
@ -1,5 +1,6 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`xdiario_new`(vAsiento INT,
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`xdiario_new`(
+	vBookNumber INT,
 	vDated DATE,
 	vSubaccount VARCHAR(12),
 	vAccount VARCHAR(12),
@ -12,18 +13,18 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`xdiario_new`(vAsient
 	vVat DOUBLE,
 	vRe DOUBLE,
 	vAux TINYINT,
-	vCompany INT
+	vCompanyFk INT
 )
 	RETURNS int(11)
 	NOT DETERMINISTIC
 	NO SQL
 BEGIN
-	IF vAsiento IS NULL THEN
-        CALL vn.ledger_next(vAsiento);
+	IF vBookNumber IS NULL THEN
+		CALL ledger_next(YEAR(vDated), vBookNumber);
 	END IF;

 	INSERT INTO XDiario
-	SET ASIEN = vAsiento,
+		SET ASIEN = vBookNumber,
 			FECHA = vDated,
 			SUBCTA = vSubaccount,
 			CONTRA = vAccount,
@ -37,8 +38,8 @@ BEGIN
 			RECEQUIV = vRe,
 			AUXILIAR = IF(vAux = FALSE, NULL, '*'),
 			MONEDAUSO = 2,
-		empresa_id = vCompany;
+			empresa_id = vCompanyFk;

-	RETURN vAsiento;
+	RETURN vBookNumber;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/clean.sql
+++ b/db/routines/vn/procedures/clean.sql
@ -86,7 +86,7 @@ BEGIN
 		WHERE cs.description = 'Anulado'
 			AND c.created < v2Months;

-	DELETE FROM expeditionTruck WHERE eta < v3Months;
+	DELETE FROM roadmapStop WHERE eta < v3Months;
 	DELETE FROM XDiario WHERE FECHA < v3Months OR FECHA IS NULL;

 	-- Borrar travels sin entradas
--- a/db/routines/vn/procedures/conveyorExpedition_Add.sql
+++ b/db/routines/vn/procedures/conveyorExpedition_Add.sql
@ -24,7 +24,7 @@ BEGIN
                10 * p.height as height,
                IFNULL(t.routeFk,am.agencyFk) routeFk,
                hour(e.created) * 60 + minute(e.created),
-                IFNULL(et.description , a.name),
+                IFNULL(rs.description , a.name),
                IFNULL(t.routeFk,am.agencyFk) criterion,
                IFNULL(p.conveyorBuildingClassFk , pc.defaultConveyorBuildingClass)              
 		FROM vn.expedition e
@ -34,7 +34,7 @@ BEGIN
            LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk
            LEFT JOIN vn.agency a ON a.id = am.agencyFk 
            LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk 
-            LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk 
+            LEFT JOIN vn.roadmapStop rs ON rs.id = rm.expeditionTruckFk 
            JOIN vn.packagingConfig pc 
 		WHERE t.warehouseFk IN (60,1,44)
            AND e.created BETWEEN vStarted AND vEnded
--- a/db/routines/vn/procedures/duaTaxBooking.sql
+++ b/db/routines/vn/procedures/duaTaxBooking.sql
@ -6,16 +6,16 @@ BEGIN
 	DECLARE vDiff DECIMAL(10,2);
 	DECLARE vApunte BIGINT;
 	
-	SELECT ASIEN, IFNULL(bookEntried, util.VN_CURDATE()) INTO vBookNumber, vBookDated
+	SELECT ASIEN, IFNULL(bookEntried, util.VN_CURDATE())
+			INTO vBookNumber, vBookDated
 		FROM dua
 		WHERE id = vDuaFk;

 	IF vBookNumber IS NULL OR NOT vBookNumber THEN
-		CALL ledger_next(vBookNumber);
+		CALL ledger_next(YEAR(vBookDated), vBookNumber);
 	END IF;

 	-- Apunte de la aduana
-
 	INSERT INTO XDiario(
 			ASIEN,
 			FECHA,
@ -26,9 +26,7 @@ BEGIN
 			empresa_id,
 			CLAVE,
 			FACTURA)
-
-	SELECT 
-			vBookNumber,
+		SELECT vBookNumber,
 				d.bookEntried,
 				'4700000999',
 				CONCAT('DUA ',d.`code`),
@ -42,7 +40,6 @@ BEGIN
 				WHERE dt.duaFk = vDuaFk;

 	-- Apuntes por tipo de IVA y proveedor	
-		
 	INSERT INTO XDiario(
 			ASIEN,
 			FECHA,
@ -70,16 +67,13 @@ BEGIN
 			TERNIF,
 			TERNOM,
 			empresa_id,
-		FECREGCON
-	)
-
-	SELECT 
-			vBookNumber ASIEN,
+			FECREGCON)
+		SELECT vBookNumber ASIEN,
 				vBookDated FECHA,
 				tr.account SUBCTA,
 				'4330002067' CONTRA,
-			sum(dt.tax) EURODEBE,
-			sum(dt.base) BASEEURO, 
+				SUM(dt.tax) EURODEBE,
+				SUM(dt.base) BASEEURO, 
 				CONCAT('DUA nº',d.code) CONCEPTO,
 				d.id FACTURA,
 				dt.rate IVA,
@ -131,6 +125,5 @@ BEGIN
 	UPDATE dua
 		SET ASIEN = vBookNumber
 		WHERE id = vDuaFk;
-            
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/expeditionTruck_Add.sql
+++ b/db/routines/vn/procedures/expeditionTruck_Add.sql
@ -2,7 +2,7 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`expeditionTruck_Add`(vHour VARCHAR(5), vDescription VARCHAR(45))
 BEGIN

-	INSERT INTO vn.expeditionTruck(eta,description)
+	INSERT INTO vn.roadmapStop(eta,description)
 		VALUES(CONCAT(util.VN_CURDATE(), ' ', vHour), vDescription);

 END$$
--- a/db/routines/vn/procedures/expeditionTruck_List.sql
+++ b/db/routines/vn/procedures/expeditionTruck_List.sql
@ -5,7 +5,7 @@ BEGIN
 	SELECT 	id truckFk, 
 			eta, 
 			description Destino
-		FROM expeditionTruck
+		FROM roadmapStop
 		WHERE eta BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
 		ORDER BY eta;
 END$$
--- a/db/routines/vn/procedures/expedition_StateGet.sql
+++ b/db/routines/vn/procedures/expedition_StateGet.sql
@ -53,8 +53,8 @@ BEGIN
 			am.name zonaRuta,
 			t.routeFk ruta,
 			rm.beachFk ubicacion,
-			et.eta ,
-			et.description camion,
+			rs.eta ,
+			rs.description camion,
 			vTicketsPendientes AS ticketsPendientes,
 			vEtiquetasTotales AS etiquetasTotales,
 			vEtiquetasEscaneadas AS etiquetasEscaneadas,
@ -67,7 +67,7 @@ BEGIN
 			LEFT JOIN vn.route r ON r.id = t.routeFk 
 			LEFT JOIN vn.agencyMode am ON am.id = r.agencyModeFk 
 			LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id 
-			LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk 
+			LEFT JOIN vn.roadmapStop rs ON rs.id = rm.expeditionTruckFk 
 		WHERE e.id = vExpeditionFk;
 	
 END$$
--- a/db/routines/vn/procedures/expedition_getState.sql
+++ b/db/routines/vn/procedures/expedition_getState.sql
@ -37,8 +37,8 @@ BEGIN
 			am.name zonaRuta,
 			t.routeFk ruta,
 			rm.beachFk ubicacion,
-			et.eta ,
-			et.description camion,
+			rs.eta ,
+			rs.description camion,
 			vTicketsPendientes AS ticketsPendientes,
 			vEtiquetasTotales AS etiquetasTotales,
 			vEtiquetasEscaneadas AS etiquetasEscaneadas
@ -50,7 +50,7 @@ BEGIN
 			LEFT JOIN vn.route r ON r.id = t.routeFk 
 			LEFT JOIN vn.agencyMode am ON am.id = r.agencyModeFk 
 			LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id 
-			LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk 
+			LEFT JOIN vn.roadmapStop rs ON rs.id = rm.expeditionTruckFk 
 		WHERE e.id = vExpeditionFk;
 	
 END$$
--- a/db/routines/vn/procedures/invoiceInTax_getFromEntries.sql
+++ b/db/routines/vn/procedures/invoiceInTax_getFromEntries.sql
@ -1,24 +1,24 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTax_getFromEntries`(IN vInvoiceInFk INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceInTax_getFromEntries`(
+	IN vInvoiceInFk INT
+)
 BEGIN
 	DECLARE vRate DOUBLE DEFAULT 1;
-	DECLARE vDated DATE;
 	DECLARE vExpenseFk VARCHAR(10);

-	SELECT MAX(rr.dated) INTO vDated
-		FROM referenceRate rr
-			JOIN invoiceIn ii ON ii.id = vInvoiceInFk
-		WHERE rr.dated <= ii.issued 
-			AND rr.currencyFk = ii.currencyFk ;
-
-	IF vDated THEN
-		SELECT `value` INTO vRate
-			FROM referenceRate
-			WHERE dated = vDated;
-	END IF;
+	WITH rate AS(
+	SELECT MAX(rr.dated) dated, ii.currencyFk 
+		FROM vn.invoiceIn ii 
+			JOIN vn.referenceRate rr ON rr.currencyFk = ii.currencyFk
+		WHERE ii.id = vInvoiceInFk
+			AND rr.dated <= ii.issued
+	) SELECT `value` INTO vRate
+		FROM vn.referenceRate rr
+			JOIN rate r ON r.dated = rr.dated 
+				AND r.currencyFk = rr.currencyFk;

 	SELECT id INTO vExpenseFk 
-		FROM vn.expense 
+		FROM expense 
 		WHERE `name` = 'Adquisición mercancia Extracomunitaria' 
 		GROUP BY id 
 		LIMIT 1;
@ -26,19 +26,25 @@ BEGIN
 	DELETE FROM invoiceInTax 
 		WHERE invoiceInFk = vInvoiceInFk;

-	INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenseFk, foreignValue, taxTypeSageFk, transactionTypeSageFk)
-		SELECT ii.id,
-			SUM(b.buyingValue * b.quantity) / IFNULL(vRate,1) taxableBase,
+	INSERT INTO invoiceInTax(
+			invoiceInFk, 
+			taxableBase, 
+			expenseFk, 
+			foreignValue, 
+			taxTypeSageFk, 
+			transactionTypeSageFk
+		)SELECT ii.id,
+				SUM(b.buyingValue * b.quantity) / vRate taxableBase,
 				vExpenseFk,
-			IF(ii.currencyFk = 1,NULL,SUM(b.buyingValue * b.quantity )) divisa,
+				IF(ii.currencyFk = 1, 
+					NULL, 
+					SUM(b.buyingValue * b.quantity )),
 				taxTypeSageFk,
 				transactionTypeSageFk
 			FROM invoiceIn ii
 				JOIN entry e ON e.invoiceInFk = ii.id
 				JOIN supplier s ON s.id = e.supplierFk
 				JOIN buy b ON b.entryFk = e.id
-				LEFT JOIN referenceRate rr ON rr.currencyFk = ii.currencyFk 
-					AND rr.dated = ii.issued
 			WHERE ii.id = vInvoiceInFk 
 			HAVING taxableBase IS NOT NULL;
 END$$
--- a/db/routines/vn/procedures/invoiceIn_booking.sql
+++ b/db/routines/vn/procedures/invoiceIn_booking.sql
@ -2,6 +2,7 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceIn_booking`(vSelf INT)
 BEGIN
 	DECLARE vBookNumber INT;
+	DECLARE vFiscalYear INT;

 	CREATE OR REPLACE TEMPORARY TABLE tInvoiceIn
 		ENGINE = MEMORY
@ -56,7 +57,8 @@ BEGIN
 				LEFT JOIN sage.taxType tt ON tt.id = ti.CodigoIva
 			WHERE ii.id = vSelf;

-	CALL vn.ledger_next(vBookNumber);
+	SELECT YEAR(bookEntried) INTO vFiscalYear FROM tInvoiceIn LIMIT 1;
+	CALL ledger_next(vFiscalYear, vBookNumber);

 	-- Apunte del proveedor
 	INSERT INTO XDiario(
--- a/db/routines/vn/procedures/invoiceOutBooking.sql
+++ b/db/routines/vn/procedures/invoiceOutBooking.sql
@ -1,16 +1,18 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceOutBooking`(IN vInvoice INT)
 BEGIN
-/* Asienta la factura emitida
+/**
+ * Asienta una factura emitida
 *
-* param vInvoice factura_id
+ * @param vInvoice Id invoiceOut
 */
 	DECLARE vBookNumber INT;
 	DECLARE vExpenseConcept VARCHAR(50);
 	DECLARE vSpainCountryFk INT;
 	DECLARE vOldBookNumber INT;
+	DECLARE vFiscalYear INT;

-	SELECT id INTO vSpainCountryFk FROM country WHERE code = 'ES';
+	SELECT id INTO vSpainCountryFk FROM country WHERE `code` = 'ES';

 	SELECT ASIEN
 			INTO vOldBookNumber
@ -26,31 +28,30 @@ BEGIN

 	DROP TEMPORARY TABLE IF EXISTS rs;
 	CREATE TEMPORARY TABLE rs
-		SELECT 
-				c.accountingAccount AS clientBookingAccount,
-				io.amount as totalAmount,
-				CONCAT('n/fra ', io.ref) as simpleConcept,
-				CONCAT('n/fra ', io.ref, ' ', c.name) as Concept,
-				io.serial AS SERIE,
-				io.issued AS FECHA_EX,
-				io.issued AS FECHA_OP,
-				io.issued AS FECHA,
-				1 AS NFACTICK,
-				IF(ic.correctingFk,'D','') AS  TIPOOPE,
-				io.siiTrascendencyInvoiceOutFk AS TIPOCLAVE,
-				io.cplusTaxBreakFk AS TIPOEXENCI,
-				io.cplusSubjectOpFk AS TIPONOSUJE,
-				io.siiTypeInvoiceOutFk AS TIPOFACT,
-				ic.cplusRectificationTypeFk AS TIPORECTIF,
+		SELECT c.accountingAccount clientBookingAccount,
+				io.amount totalAmount,
+				CONCAT('n/fra ', io.ref) simpleConcept,
+				CONCAT('n/fra ', io.ref, ' ', c.name) Concept,
+				io.serial SERIE,
+				io.issued FECHA_EX,
+				io.issued FECHA_OP,
+				io.issued FECHA,
+				1 NFACTICK,
+				IF(ic.correctingFk,'D','') TIPOOPE,
+				io.siiTrascendencyInvoiceOutFk TIPOCLAVE,
+				io.cplusTaxBreakFk TIPOEXENCI,
+				io.cplusSubjectOpFk TIPONOSUJE,
+				io.siiTypeInvoiceOutFk TIPOFACT,
+				ic.cplusRectificationTypeFk TIPORECTIF,
 				io.companyFk,
-				RIGHT(io.ref, LENGTH(io.ref) - 1) AS invoiceNum,
-                IF(c.countryFk = vSpainCountryFk, vSpainCountryFk, IF(ct.isUeeMember,2,4)) AS TERIDNIF,
-				CONCAT(IF(ct.isUeeMember AND c.countryFk <> vSpainCountryFk,ct.code,''),c.fi) AS TERNIF,
-				c.socialName AS TERNOM,
-                ior.serial AS SERIE_RT,
-                RIGHT(ior.ref, LENGTH(ior.ref) - 1) AS FACTU_RT,
-                ior.issued AS FECHA_RT,
-                IF(ior.id,TRUE,FALSE) AS RECTIFICA
+				RIGHT(io.ref, LENGTH(io.ref) - 1) invoiceNum,
+				IF(c.countryFk = vSpainCountryFk, vSpainCountryFk, IF(ct.isUeeMember,2,4)) TERIDNIF,
+				CONCAT(IF(ct.isUeeMember AND c.countryFk <> vSpainCountryFk,ct.code,''),c.fi) TERNIF,
+				c.socialName TERNOM,
+				ior.serial SERIE_RT,
+				RIGHT(ior.ref, LENGTH(ior.ref) - 1) FACTU_RT,
+				ior.issued FECHA_RT,
+				IF(ior.id,TRUE,FALSE) RECTIFICA
 		FROM invoiceOut io
 			JOIN invoiceOutSerial ios ON ios.code = io.serial
 			JOIN client c ON c.id = io.clientFk
@ -59,8 +60,8 @@ BEGIN
 			LEFT JOIN invoiceOut ior ON ior.id = ic.correctedFk
 			WHERE io.id = vInvoice;

-	CALL vn.ledger_next(vBookNumber);
-    
+	SELECT YEAR(FECHA) INTO vFiscalYear FROM rs LIMIT 1;
+	CALL ledger_next(vFiscalYear, vBookNumber);
 	-- Linea del cliente
 	INSERT INTO XDiario(
 			ASIEN,
@ -70,17 +71,15 @@ BEGIN
 			CONCEPTO,
 			FECHA_EX,
 			FECHA_OP,
-								empresa_id
-								)
-		SELECT 
-				vBookNumber AS ASIEN,
+			empresa_id)
+		SELECT vBookNumber,
 				rs.FECHA,
-				rs.clientBookingAccount AS SUBCTA,
-				rs.totalAmount AS EURODEBE,
-				rs.simpleConcept AS CONCEPTO,
+				rs.clientBookingAccount,
+				rs.totalAmount,
+				rs.simpleConcept,
 				rs.FECHA_EX,
 				rs.FECHA_OP,
-				rs.companyFk AS empresa_id
+				rs.companyFk
 			FROM rs;

 		-- Lineas de gasto
@ -93,18 +92,16 @@ BEGIN
 				CONCEPTO, 
 				FECHA_EX,
 				FECHA_OP,
-									empresa_id
-									)
-		SELECT 
-				vBookNumber AS ASIEN,
+				empresa_id)
+			SELECT vBookNumber,
 					rs.FECHA,
-				ioe.expenseFk AS SUBCTA,
-				rs.clientBookingAccount AS CONTRA,
-				ioe.amount AS EUROHABER,
-				rs.Concept AS CONCEPTO,
+					ioe.expenseFk,
+					rs.clientBookingAccount,
+					ioe.amount,
+					rs.Concept,
 					rs.FECHA_EX,
 					rs.FECHA_OP,
-				rs.companyFk AS empresa_id
+					rs.companyFk
 				FROM rs
 					JOIN invoiceOutExpense ioe
 				WHERE ioe.invoiceOutFk = vInvoice;
@ -146,20 +143,18 @@ BEGIN
 			TIPONOSUJE,
 			TIPOFACT,
 			TIPORECTIF,
-								empresa_id
-								)
-		SELECT 
-				vBookNumber AS ASIEN,
+			empresa_id)
+		SELECT vBookNumber ASIEN,
 				rs.FECHA,
-				iot.pgcFk AS SUBCTA,
-				rs.clientBookingAccount AS CONTRA,
-				iot.vat AS EUROHABER,
-				iot.taxableBase AS BASEEURO,
-				CONCAT(vExpenseConcept,' : ',rs.Concept) AS CONCEPTO,
-				rs.invoiceNum AS FACTURA,
-                IF(pe2.equFk,0,pgc.rate) AS IVA,
-				IF(pe2.equFk,0,pgce.rate) AS RECEQUIV,
-				IF(pgc.mod347,'','*') AS AUXILIAR,
+				iot.pgcFk SUBCTA,
+				rs.clientBookingAccount CONTRA,
+				iot.vat EUROHABER,
+				iot.taxableBase BASEEURO,
+				CONCAT(vExpenseConcept,' : ',rs.Concept) CONCEPTO,
+				rs.invoiceNum FACTURA,
+				IF(pe2.equFk,0,pgc.rate) IVA,
+				IF(pe2.equFk,0,pgce.rate) RECEQUIV,
+				IF(pgc.mod347,'','*') AUXILIAR,
 				rs.SERIE,
 				rs.SERIE_RT,
 				rs.FACTU_RT,
@ -172,13 +167,13 @@ BEGIN
 				rs.TERIDNIF,
 				rs.TERNIF,
 				rs.TERNOM,
-				pgc.mod340 AS L340,   
-				pgc.siiTrascendencyInvoiceOutFk AS TIPOCLAVE,
-				pgc.cplusTaxBreakFk as TIPOEXENCI,
+				pgc.mod340 L340,
+				pgc.siiTrascendencyInvoiceOutFk TIPOCLAVE,
+				pgc.cplusTaxBreakFk TIPOEXENCI,
 				rs.TIPONOSUJE,
 				rs.TIPOFACT,
 				rs.TIPORECTIF,
-				rs.companyFk AS empresa_id
+				rs.companyFk
 			FROM rs
 				JOIN invoiceOutTax iot 
 				JOIN pgc ON pgc.code = iot.pgcFk
--- a/db/routines/vn/procedures/itemShelvingRadar.sql
+++ b/db/routines/vn/procedures/itemShelvingRadar.sql
@ -2,7 +2,7 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingRadar`(
 	vSectorFk INT
 )
-proc:BEGIN
+BEGIN
 /**
 * Calcula la información detallada respecto un sector.
 *
@ -16,36 +16,23 @@ proc:BEGIN
 	DECLARE vSonSectorFk INT;
 	DECLARE vWorkerFk INT;

-	SELECT s.workerFk 
-		INTO vWorkerFk 
-		FROM vn.sector s
+	SELECT s.workerFk INTO vWorkerFk 
+		FROM sector s
 		WHERE s.id = vSectorFk;

-	SELECT w.id, s.warehouseFk INTO vBuyerFk, vWarehouseFk
-		FROM vn.worker w 
-			JOIN vn.sector s ON s.code = w.code
-			WHERE s.id = vSectorFk;
-	
-	SELECT s.id INTO vSectorFk
-		FROM vn.sector s
-		WHERE s.warehouseFk = vWarehouseFk
-			AND s.isMain;
-
 	SELECT COUNT(*) INTO hasFatherSector
-		FROM vn.sector
+		FROM sector
 		WHERE sonFk = vSectorFk;

 	SELECT warehouseFk, sonFk INTO vWarehouseFk, vSonSectorFk
-		FROM vn.sector
+		FROM sector
 		WHERE id = vSectorFk;

 	CALL cache.visible_refresh(vCalcVisibleFk, TRUE, vWarehouseFk);
 	CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE());

-	DROP TEMPORARY TABLE IF EXISTS tmp.itemShelvingRadar;
-	
 	IF hasFatherSector THEN
-		CREATE TEMPORARY TABLE tmp.itemShelvingRadar
+		CREATE OR REPLACE TEMPORARY TABLE tItemShelvingRadar
 			(PRIMARY KEY (itemFk))
 			ENGINE = MEMORY 
 			SELECT * 
@ -57,54 +44,74 @@ proc:BEGIN
 							IFNULL(a.available, 0) available,
 							SUM(IF(s.sonFk = vSectorFk, IFNULL(iss.visible, 0), 0)) upstairs,
 							SUM(IF(iss.sectorFk = vSectorFk, IFNULL(iss.visible, 0), 0)) downstairs,
-							IF(it.isPackaging, NULL, IFNULL(v.visible,0)) as visible,
-							vSectorFk sectorFk
-						FROM vn.itemShelvingStock iss
-							JOIN vn.sector s ON s.id = iss.sectorFk
-							JOIN vn.item i on i.id = iss.itemFk
-							JOIN vn.itemType it ON it.id = i.typeFk AND vBuyerFk IN (0,it.workerFk)
-							LEFT JOIN cache.available a ON a.item_id = iss.itemFk AND a.calc_id = vCalcAvailableFk
-							LEFT JOIN cache.visible v  ON v.item_id = iss.itemFk AND v.calc_id = vCalcVisibleFk
+							IF(it.isPackaging, NULL, IFNULL(v.visible, 0)) visible,
+							vSectorFk sectorFk,
+							ish.isChecked,
+							sub.isAllChecked
+						FROM itemShelvingStock iss
+							JOIN itemShelving ish ON ish.shelvingFk = iss.shelvingFk
+							LEFT JOIN (
+								SELECT itemFk,
+										IF(
+											COUNT(*) = SUM(IF(isChecked >= 0, 1, 0)),
+											TRUE,
+											FALSE
+										) isAllChecked
+									FROM itemShelving is2
+									GROUP BY itemFk
+							) sub ON sub.itemFk = ish.itemFk
+							JOIN sector s ON s.id = iss.sectorFk
+							JOIN item i ON i.id = iss.itemFk
+							JOIN itemType it ON it.id = i.typeFk
+							LEFT JOIN cache.available a ON a.item_id = iss.itemFk
+								AND a.calc_id = vCalcAvailableFk
+							LEFT JOIN cache.visible v  ON v.item_id = iss.itemFk
+								AND v.calc_id = vCalcVisibleFk
 							WHERE vSectorFk IN (iss.sectorFk, s.sonFk)
 							GROUP BY iss.itemFk
-							
 					UNION ALL
-						
 					SELECT v.item_id,
 							i.longName,
 							i.size,
-							i.subName producer,
-							IFNULL(a.available,0) as available,
-							0 upstairs,
-							0 downstairs,
-							IF(it.isPackaging, NULL, v.visible) visible,
-							vSectorFk as sectorFk
+							i.subName,
+							IFNULL(a.available, 0),
+							0,
+							0,
+							IF(it.isPackaging, NULL, v.visible),
+							vSectorFk,
+							NULL,
+							NULL
 						FROM cache.visible v  
-							JOIN vn.item i on i.id = v.item_id
-							JOIN vn.itemType it ON it.id = i.typeFk AND vBuyerFk IN (0,it.workerFk)
-							LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = v.item_id AND iss.warehouseFk = vWarehouseFk
-							LEFT JOIN cache.available a ON a.item_id = v.item_id AND a.calc_id = vCalcAvailableFk
+							JOIN item i ON i.id = v.item_id
+							JOIN itemType it ON it.id = i.typeFk
+							LEFT JOIN itemShelvingStock iss ON iss.itemFk = v.item_id
+								AND iss.warehouseFk = vWarehouseFk
+							LEFT JOIN cache.available a ON a.item_id = v.item_id
+								AND a.calc_id = vCalcAvailableFk
 						WHERE v.calc_id = vCalcVisibleFk
 							AND iss.itemFk IS NULL
 							AND it.isInventory
-				) sub GROUP BY itemFk;
+				) sub
+				GROUP BY itemFk;
 					
 		SELECT ishr.*, 
-				CAST(visible - upstairs - downstairs AS DECIMAL(10,0)) AS nicho,
-				CAST(downstairs - IFNULL(notPickedYed,0) AS DECIMAL(10,0)) as pendiente
-				FROM tmp.itemShelvingRadar ishr
-					JOIN vn.item i ON i.id = ishr.itemFk
-					LEFT JOIN (SELECT s.itemFk, sum(s.quantity) as notPickedYed
-								FROM vn.ticket t
-									JOIN vn.ticketStateToday tst ON tst.ticketFk = t.id
-									JOIN vn.sale s ON s.ticketFk = t.id
+				CAST(visible - upstairs - downstairs AS DECIMAL(10, 0)) nicho,
+				CAST(downstairs - IFNULL(notPickedYed, 0) AS DECIMAL(10, 0)) pendiente
+			FROM tItemShelvingRadar ishr
+				JOIN item i ON i.id = ishr.itemFk
+				LEFT JOIN (
+					SELECT s.itemFk, SUM(s.quantity) notPickedYed
+							FROM ticket t
+								JOIN ticketStateToday tst ON tst.ticketFk = t.id
+								JOIN alertLevel al ON al.id = tst.alertLevel
+								JOIN sale s ON s.ticketFk = t.id
 							WHERE t.warehouseFk = vWarehouseFk
-									AND tst.alertLevel = 0
+								AND al.code = 'FREE'
 							GROUP BY s.itemFk
 				) sub ON sub.itemFk = ishr.itemFk
 			ORDER BY i.typeFk, i.longName;
 	ELSE
-		CREATE TEMPORARY TABLE tmp.itemShelvingRadar
+		CREATE OR REPLACE TEMPORARY TABLE tItemShelvingRadar
 			(PRIMARY KEY (itemFk))
 			ENGINE = MEMORY 
 			SELECT iss.itemFk,
@ -125,70 +132,76 @@ proc:BEGIN
 					IFNULL(v.visible, 0) visible,
 					b.isPickedOff,
 					iss.sectorFk
-				FROM vn.itemShelvingStock iss
-					JOIN vn.item i on i.id = iss.itemFk
-					LEFT JOIN cache.last_buy lb ON lb.item_id = iss.itemFk AND lb.warehouse_id = vWarehouseFk
-						LEFT JOIN vn.buy b ON b.id = lb.buy_id
-					LEFT JOIN cache.available a ON a.item_id = iss.itemFk AND a.calc_id = vCalcAvailableFk
-					LEFT JOIN cache.visible v  ON v.item_id = iss.itemFk AND v.calc_id = vCalcVisibleFk
-					LEFT JOIN (SELECT itemFk, sum(saldo) as  onTheWay
-									FROM vn.itemPlacementSupplyList 
+				FROM itemShelvingStock iss
+					JOIN item i ON i.id = iss.itemFk
+					LEFT JOIN cache.last_buy lb ON lb.item_id = iss.itemFk
+						AND lb.warehouse_id = vWarehouseFk
+						LEFT JOIN buy b ON b.id = lb.buy_id
+					LEFT JOIN cache.available a ON a.item_id = iss.itemFk
+						AND a.calc_id = vCalcAvailableFk
+					LEFT JOIN cache.visible v  ON v.item_id = iss.itemFk
+						AND v.calc_id = vCalcVisibleFk
+					LEFT JOIN (
+						SELECT itemFk, SUM(saldo) onTheWay
+							FROM itemPlacementSupplyList 
 							WHERE saldo > 0 
 							GROUP BY itemFk
 					) ips ON ips.itemFk = i.id
-					WHERE IFNULL(iss.sectorFk,0) IN (0, vSectorFk) 
-						OR iss.sectorFk = vSectorFk;            
+					WHERE iss.sectorFk = vSectorFk
+						OR iss.sectorFk IS NULL;            

-		DROP TEMPORARY TABLE IF EXISTS tmp.itemOutTime;
-		CREATE TEMPORARY TABLE tmp.itemOutTime
+		CREATE OR REPLACE TEMPORARY TABLE tmp.itemOutTime
 			SELECT *, SUM(amount) quantity
-				FROM 
-					(SELECT io.itemFk,
+				FROM (
+					SELECT io.itemFk,
 							io.quantity amount, 
-								IF(HOUR(t.shipped), HOUR(t.shipped), HOUR(z.`hour`)) as hours, 
-								IF(MINUTE(t.shipped), MINUTE(t.shipped), MINUTE(z.`hour`)) as minutes
-							FROM itemTicketOut io
-								JOIN tmp.itemShelvingRadar isr ON isr.itemFk = io.itemFk
-								JOIN vn.ticket t on t.id= io.ticketFk
-								JOIN vn.ticketState ts on ts.ticketFk = io.ticketFk
-								JOIN vn.state s ON s.id = ts.stateFk
-								LEFT JOIN vn.zone z ON z.id = t.zoneFk
-								LEFT JOIN (SELECT DISTINCT saleFk 
-											FROM vn.saleTracking st 
+							IF(HOUR(t.shipped), HOUR(t.shipped), HOUR(z.`hour`)) `hours`, 
+							IF(MINUTE(t.shipped), MINUTE(t.shipped), MINUTE(z.`hour`)) `minutes`
+						FROM itemTicketOut `io`
+							JOIN tItemShelvingRadar isr ON isr.itemFk = io.itemFk
+							JOIN ticket t ON t.id= io.ticketFk
+							JOIN ticketState ts ON ts.ticketFk = io.ticketFk
+							JOIN `state` s ON s.id = ts.stateFk
+							LEFT JOIN `zone` z ON z.id = t.zoneFk
+							LEFT JOIN (
+								SELECT DISTINCT saleFk 
+									FROM saleTracking st 
 									WHERE st.created > util.VN_CURDATE() 
 										AND st.isChecked
-										)  stPrevious  ON `stPrevious`.`saleFk` = io.saleFk
+							) stPrevious ON stPrevious.saleFk = io.saleFk
 						WHERE t.warehouseFk = vWarehouseFk
-								AND s.isPicked = 0 
+							AND NOT s.isPicked
 							AND NOT io.reserved 
 							AND stPrevious.saleFk IS NULL
 							AND io.shipped >= util.VN_CURDATE() 
 							AND io.shipped < util.VN_CURDATE() + INTERVAL 1 DAY
 				) sub
-				GROUP BY itemFk, hours, minutes;
+				GROUP BY itemFk, `hours`, `minutes`;
 	
-		INSERT INTO tmp.itemShelvingRadar (itemFk)
+		INSERT INTO tItemShelvingRadar (itemFk)
 			SELECT itemFk FROM tmp.itemOutTime
 				ON DUPLICATE KEY UPDATE dayEndVisible = dayEndVisible + quantity, 
-									firstNegative = if (firstNegative < 0, firstNegative, firstNegative + quantity),
-									`hour` = ifnull(if (firstNegative > 0 , `hour`, hours),0),
-									`minute` = ifnull(if (firstNegative > 0, `minute`, minutes),0);
+					firstNegative = IF(firstNegative < 0, firstNegative, firstNegative + quantity),
+					`hour` = IFNULL(IF(firstNegative > 0 , `hour`, `hours`), 0),
+					`minute` = IFNULL(IF(firstNegative > 0, `minute`, `minutes`), 0);

-		UPDATE tmp.itemShelvingRadar isr
-			JOIN (SELECT s.itemFk, sum(s.quantity) amount
+		UPDATE tItemShelvingRadar isr
+				JOIN (
+					SELECT s.itemFk, SUM(s.quantity) amount
 						FROM sale s
 							JOIN ticket t ON t.id = s.ticketFk
-						JOIN ticketLastState tls ON tls.ticketFk = t.id
+							JOIN ticketState ts ON ts.ticketFk = t.id
 						WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
-						AND tls.name = 'Prep Camara'
-					GROUP BY s.itemFk) sub ON sub.itemFk = isr.itemFk
+							AND ts.code = 'COOLER_PREPARATION'
+						GROUP BY s.itemFk
+				) sub ON sub.itemFk = isr.itemFk
 			SET isr.dayEndVisible = dayEndVisible + sub.amount,
 				firstNegative = firstNegative + sub.amount;

-		SELECT * FROM tmp.itemShelvingRadar;
+		SELECT * FROM tItemShelvingRadar;
 	END IF;

-	DROP TEMPORARY TABLE tmp.itemShelvingRadar;
+	DROP TEMPORARY TABLE tItemShelvingRadar;
 	
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/item_getSimilar.sql
+++ b/db/routines/vn/procedures/item_getSimilar.sql
@ -21,6 +21,9 @@ BEGIN

 	CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vDated);

+	-- Añadido temporalmente para que no se cuelgue la db
+	SET vShowType = TRUE;
+
 	WITH itemTags AS (
 		SELECT i.id,
 				typeFk,
--- a/db/routines/vn/procedures/ledger_doCompensation.sql
+++ b/db/routines/vn/procedures/ledger_doCompensation.sql
@ -1,5 +1,13 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ledger_doCompensation`(vDated DATE, vCompensationAccount VARCHAR(10) , vBankFk VARCHAR(10), vConcept VARCHAR(255), vAmount DECIMAL(10,2), vCompanyFk INT, vOriginalAccount VARCHAR(10))
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ledger_doCompensation`(
+	vDated DATE, 
+	vCompensationAccount VARCHAR(10), 
+	vBankFk VARCHAR(10), 
+	vConcept VARCHAR(255), 
+	vAmount DECIMAL(10,2), 
+	vCompanyFk INT, 
+	vOriginalAccount VARCHAR(10)
+)
 BEGIN
 /**
 * Compensa un pago o un recibo insertando en contabilidad
@ -9,7 +17,7 @@ BEGIN
 * @param vBankFk banco de la compensacion
 * @param vConcept descripcion
 * @param vAmount cantidad que se compensa
- * @param vCompany empresa
+ * @param vCompanyFk empresa
 * @param vOriginalAccount cuenta contable desde la cual se compensa 
 * 
 */ 
@ -20,9 +28,11 @@ BEGIN
 	DECLARE vIsOriginalAClient BOOL;
 	DECLARE vPayMethodCompensation INT;

-	CALL ledger_next(vNewBookEntry);
+	CALL ledger_next(YEAR(vDated), vNewBookEntry);

-	SELECT COUNT(id) INTO vIsOriginalAClient FROM client WHERE accountingAccount LIKE vOriginalAccount COLLATE utf8_general_ci;
+	SELECT COUNT(id) INTO vIsOriginalAClient 
+		FROM client 
+		WHERE accountingAccount LIKE vOriginalAccount COLLATE utf8_general_ci;

 	SELECT id, COUNT(id) INTO vClientFk, vIsClientCompensation 
 		FROM client 
@ -62,17 +72,38 @@ BEGIN
 		IF vIsOriginalAClient THEN
 			SET vAmount = -vAmount;
 		END IF;
-		INSERT INTO receipt(invoiceFk, amountPaid, payed, bankFk, companyFk, clientFk, isConciliate) 
-			VALUES (vConcept, vAmount, vDated, vBankFk, vCompanyFk, vClientFk, TRUE);
+		
+		INSERT INTO receipt
+			SET invoiceFk = vConcept, 
+				amountPaid = vAmount, 
+				payed = vDated, 
+				bankFk = vBankFk, 
+				companyFk = vCompanyFk, 
+				clientFk = vClientFk, 
+				isConciliate = TRUE;
 	ELSE
 		IF NOT vIsOriginalAClient THEN
 			SET vAmount = -vAmount;
 		END IF;
-	    SELECT id INTO vSupplierFk FROM supplier WHERE `account` LIKE vCompensationAccount COLLATE utf8_general_ci;
-		SELECT id INTO vPayMethodCompensation FROM payMethod WHERE `code` = 'compensation';

-		INSERT INTO payment (received, dueDated, supplierFk, amount, bankFk, payMethodFk, concept, companyFk, isConciliated)
-			VALUES(vDated, vDated, vSupplierFk, vAmount, vBankFk, vPayMethodCompensation, vConcept, vCompanyFk, TRUE);
+		SELECT id INTO vSupplierFk 
+			FROM supplier 
+			WHERE `account` LIKE vCompensationAccount COLLATE utf8_general_ci;
+
+		SELECT id INTO vPayMethodCompensation 
+			FROM payMethod 
+			WHERE `code` = 'compensation';
+
+		INSERT INTO payment 
+			SET received = vDated, 
+				dueDated = vDated, 
+				supplierFk = vSupplierFk,
+				amount = vAmount,
+				bankFk = vBankFk,
+				payMethodFk = vPayMethodCompensation, 
+				concept = vConcept,
+				companyFk = vCompanyFk,
+				isConciliated = TRUE;
 	END IF;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/ledger_next.sql
+++ b/db/routines/vn/procedures/ledger_next.sql
@ -1,9 +1,13 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ledger_next`(OUT vNewBookEntry INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ledger_next`(
+	IN vFiscalYear INT,
+	OUT vNewBookEntry INT
+)
 BEGIN
+	UPDATE ledgerCompany  
+		SET bookEntry = LAST_INSERT_ID(bookEntry + 1)
+		WHERE fiscalYear = vFiscalYear;

-   UPDATE vn.ledgerConfig  SET lastBookEntry = LAST_INSERT_ID(lastBookEntry + 1);
 		SET vNewBookEntry = LAST_INSERT_ID();
-    
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/reportLabelCollection_get.sql
+++ b/db/routines/vn/procedures/reportLabelCollection_get.sql
@ -20,7 +20,7 @@ BEGIN
 			CONCAT(tc.collectionFk, ' ', LEFT(cc.code, 4)) color,
 			CONCAT(tc.collectionFk, ' ', SUBSTRING('ABCDEFGH',tc.wagon, 1), '-', tc.level) levelV,
 			tc.ticketFk,
-			LEFT(COALESCE(et.description, zo.name, am.name),12) agencyDescription,
+			LEFT(COALESCE(rs.description, zo.name, am.name),12) agencyDescription,
 			am.name,
 			t.clientFk,
 			CONCAT(CAST(SUM(sv.volume) AS DECIMAL(5, 2)), 'm³') m3 ,
@ -47,7 +47,7 @@ BEGIN
 			LEFT JOIN ticketTrolley tt ON tt.ticket = t.id
 			LEFT JOIN zone zo ON t.zoneFk = zo.id
 			LEFT JOIN routesMonitor rm ON rm.routeFk = t.routeFk
-			LEFT JOIN expeditionTruck et ON et.id = rm.expeditionTruckFk
+			LEFT JOIN roadmapStop rs ON rs.id = rm.expeditionTruckFk
 		WHERE IF(vIsCollection, tc.collectionFk = vParam, tc.ticketFk = vParam)
 		GROUP BY t.id
 		ORDER BY cc.code;
--- a/db/routines/vn/procedures/routeMonitor_calculate.sql
+++ b/db/routines/vn/procedures/routeMonitor_calculate.sql
@ -106,8 +106,8 @@ BEGIN
 		SET rm.m3boxes = sub.m3boxes;

 	UPDATE routesMonitor rm
-			JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk
-		SET rm.etd = et.eta;
+			JOIN vn.roadmapStop rs ON rs.id = rm.expeditionTruckFk
+		SET rm.etd = rs.eta;

 	DROP TEMPORARY TABLE tmp.routesMonitor;
 END$$
--- a/db/routines/vn/procedures/worker_checkMultipleDevice.sql
+++ b/db/routines/vn/procedures/worker_checkMultipleDevice.sql
@ -0,0 +1,24 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`worker_checkMultipleDevice`(
+	vSelf INT
+)
+BEGIN
+/**
+ * Verify if a worker has multiple assigned devices,
+ * except for freelancers.
+ *
+ * @param vUserFk worker id.
+ */
+	DECLARE vHasPda BOOLEAN;
+	DECLARE vIsFreelance BOOLEAN;
+	DECLARE vMaxDevicesPerUser INT;
+	
+	SELECT COUNT(*) INTO vHasPda FROM deviceProductionUser WHERE userFk = vSelf; 
+	SELECT IFNULL(isFreelance, FALSE) INTO vIsFreelance FROM worker WHERE id = vSelf;
+	SELECT IFNULL(maxDevicesPerUser, FALSE)  INTO vMaxDevicesPerUser FROM deviceProductionConfig LIMIT 1;
+
+	IF NOT vIsFreelance AND vHasPda > vMaxDevicesPerUser THEN
+		CALL util.throw('You can only have one PDA');
+	END IF;
+END$$
+DELIMITER ;
--- a/db/routines/vn/triggers/deviceProductionUser_afterInsert.sql
+++ b/db/routines/vn/triggers/deviceProductionUser_afterInsert.sql
@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`deviceProductionUser_afterInsert`
+	AFTER INSERT ON `deviceProductionUser`
+	FOR EACH ROW
+BEGIN
+	CALL worker_checkMultipleDevice(NEW.userFk);
+END$$
+DELIMITER ;
--- a/db/routines/vn/triggers/deviceProductionUser_beforeUpdate.sql
+++ b/db/routines/vn/triggers/deviceProductionUser_beforeUpdate.sql
@ -3,6 +3,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`deviceProductionUser_
 	BEFORE UPDATE ON `deviceProductionUser`
 	FOR EACH ROW
 BEGIN
+	
+	CALL worker_checkMultipleDevice(NEW.userFk);
 	SET NEW.editorFk = account.myUser_getId();
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/payment_beforeInsert.sql
+++ b/db/routines/vn/triggers/payment_beforeInsert.sql
@ -3,30 +3,31 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`payment_beforeInsert`
 	BEFORE INSERT ON `payment`
 	FOR EACH ROW
 BEGIN
-		DECLARE cuenta_banco,cuenta_proveedor DOUBLE;
+	DECLARE vBankAccount DOUBLE;
+	DECLARE vSupplierAccount DOUBLE;
 	DECLARE vNewBookEntry INT;
-		DECLARE bolCASH BOOLEAN;
-		DECLARE isSupplierActive BOOLEAN;
+	DECLARE vIsCash BOOLEAN;
+	DECLARE vIsSupplierActive BOOLEAN;

 	-- PAK 10/02/15 No se asientan los pagos directamente, salvo en el caso de las cajas de CASH
-		SELECT (at2.code = 'cash') INTO bolCASH
+	SELECT (at2.code = 'cash') INTO vIsCash
 		FROM accounting a
 			JOIN accountingType at2 ON at2.id = a.accountingTypeFk
 		WHERE a.id = NEW.bankFk;

-		IF bolCASH  THEN
-
-			SELECT account INTO cuenta_banco
+	IF vIsCash  THEN
+		SELECT account INTO vBankAccount
 			FROM accounting
 			WHERE id = NEW.bankFk;
 			
-			SELECT account INTO cuenta_proveedor
+		SELECT account INTO vSupplierAccount
 			FROM supplier
 			WHERE id = NEW.supplierFk;

-			CALL ledger_next(vNewBookEntry);
+		CALL ledger_next(YEAR(NEW.received), NEW.companyFk, vNewBookEntry);

-			INSERT INTO XDiario (	ASIEN,
+		INSERT INTO XDiario (
+				ASIEN,
 				FECHA,
 				SUBCTA,
 				CONTRA,
@ -42,18 +43,19 @@ BEGIN
 					EURODEBE,
 					EUROHABER,
 					NEW.companyFk
-					FROM (	SELECT 	cuenta_banco SUBCTA,
-									cuenta_proveedor CONTRA,
+				FROM (SELECT vBankAccount SUBCTA,
+							vSupplierAccount CONTRA,
 							0 EURODEBE,
 							NEW.amount + NEW.bankingFees EUROHABER
 						UNION ALL
-							SELECT 	cuenta_proveedor SUBCTA,
-									cuenta_banco CONTRA,
+						SELECT vSupplierAccount SUBCTA,
+							vBankAccount CONTRA,
 							NEW.amount EURODEBE,
 							0 EUROHABER) gf;

 		IF NEW.bankingFees <> 0 THEN
-				INSERT INTO XDiario (	ASIEN,
+			INSERT INTO XDiario (	
+					ASIEN,
 					FECHA,
 					SUBCTA,
 					CONTRA,
@ -65,7 +67,7 @@ BEGIN
 						NEW.received,
 						IF(c.id = 1,6260000002,
 						IF(CEE = 1,6260000003,6260000004)),
-							cuenta_banco,
+						vBankAccount,
 						NEW.concept,
 						NEW.bankingFees,
 						0,
@ -78,17 +80,16 @@ BEGIN

 	SET NEW.dueDated = IFNULL(NEW.dueDated, NEW.received);

-		SELECT isActive INTO isSupplierActive
+	SELECT isActive INTO vIsSupplierActive
 		FROM supplier
 		WHERE id = NEW.supplierFk;
 		
-		IF isSupplierActive = FALSE THEN
+	IF vIsSupplierActive = FALSE THEN
 		CALL util.throw('SUPPLIER_INACTIVE');
 	END IF;

 	IF ISNULL(NEW.workerFk) THEN
 		SET NEW.workerFk = account.myUser_getId();
 	END IF;
-	
 END$$
 DELIMITER ;
--- a/db/routines/vn/triggers/ticketTracking_afterDelete.sql
+++ b/db/routines/vn/triggers/ticketTracking_afterDelete.sql
@ -19,11 +19,6 @@ BEGIN
 			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();

-	CALL util.debugAdd('deletedState',
-		CONCAT('interFk: ', OLD.id,
-			' ticketFk: ', OLD.ticketFk,
-			' stateFk: ', OLD.stateFk));
-
 	SELECT i.ticketFk, i.id, s.`name`
 		INTO vTicketFk, vTicketTrackingFk, vStateName 
 		FROM ticketTracking i 
--- a/db/routines/vn/views/expeditionCommon.sql
+++ b/db/routines/vn/views/expeditionCommon.sql
@ -1,9 +1,9 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`expeditionCommon`
-AS SELECT `et`.`id` AS `truckFk`,
-	`et`.`eta` AS `eta`,
-	IFNULL(ucase(`et`.`description`), 'SIN ESCANEAR') AS `description`,
+AS SELECT `rs`.`id` AS `truckFk`,
+	`rs`.`eta` AS `eta`,
+	IFNULL(ucase(`rs`.`description`), 'SIN ESCANEAR') AS `description`,
 	`es`.`palletFk` AS `palletFk`,
 	`t`.`routeFk` AS `routeFk`,
 	`es`.`id` AS `scanFk`,
@ -17,8 +17,8 @@ FROM (
 			(
 				(
 					(
-						`vn`.`expeditionTruck` `et`
-						LEFT JOIN `vn`.`routesMonitor` `r` ON(`et`.`id` = `r`.`expeditionTruckFk`)
+						`vn`.`roadmapStop` `rs`
+						LEFT JOIN `vn`.`routesMonitor` `r` ON(`rs`.`id` = `r`.`expeditionTruckFk`)
 					)
 					LEFT JOIN `vn`.`ticket` `t` ON(`r`.`routeFk` = `t`.`routeFk`)
 				)
@ -28,4 +28,4 @@ FROM (
 		)
 		LEFT JOIN `vn`.`expeditionPallet` `ep` ON(`es`.`palletFk` = `ep`.`id`)
 	)
-WHERE `et`.`eta` >= `util`.`VN_CURDATE`()
+WHERE `rs`.`eta` >= `util`.`VN_CURDATE`()
--- a/db/routines/vn/views/expeditionPallet_Print.sql
+++ b/db/routines/vn/views/expeditionPallet_Print.sql
@ -1,12 +1,12 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`expeditionPallet_Print`
-AS SELECT `et2`.`description` AS `truck`,
+AS SELECT `rs2`.`description` AS `truck`,
 	`t`.`routeFk` AS `routeFk`,
 	`r`.`description` AS `zone`,
 	COUNT(`es`.`id`) AS `eti`,
 	`ep`.`id` AS `palletFk`,
-	`et`.`id` <=> `rm`.`expeditionTruckFk` AS `isMatch`,
+	`rs`.`id` <=> `rm`.`expeditionTruckFk` AS `isMatch`,
 	`t`.`warehouseFk` AS `warehouseFk`,
 	IF(
 		`r`.`created` > `util`.`VN_CURDATE`() + INTERVAL 1 DAY,
@ -20,8 +20,8 @@ FROM (
 					(
 						(
 							(
-								`vn`.`expeditionTruck` `et`
-								JOIN `vn`.`expeditionPallet` `ep` ON(`ep`.`truckFk` = `et`.`id`)
+								`vn`.`roadmapStop` `rs`
+								JOIN `vn`.`expeditionPallet` `ep` ON(`ep`.`truckFk` = `rs`.`id`)
 							)
 							JOIN `vn`.`expeditionScan` `es` ON(`es`.`palletFk` = `ep`.`id`)
 						)
@ -33,7 +33,7 @@ FROM (
 			)
 			LEFT JOIN `vn`.`routesMonitor` `rm` ON(`rm`.`routeFk` = `r`.`id`)
 		)
-		LEFT JOIN `vn`.`expeditionTruck` `et2` ON(`et2`.`id` = `rm`.`expeditionTruckFk`)
+		LEFT JOIN `vn`.`roadmapStop` `rs2` ON(`rs2`.`id` = `rm`.`expeditionTruckFk`)
 	)
 GROUP BY `ep`.`id`,
 	`t`.`routeFk`
--- a/db/routines/vn/views/expeditionRoute_Monitor.sql
+++ b/db/routines/vn/views/expeditionRoute_Monitor.sql
@ -15,7 +15,7 @@ FROM (
 						`vn`.`route` `r`
 						LEFT JOIN `vn`.`routesMonitor` `rm` ON(`r`.`id` = `rm`.`routeFk`)
 					)
-					LEFT JOIN `vn`.`expeditionTruck` `et` ON(`et`.`id` = `rm`.`expeditionTruckFk`)
+					LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rs`.`id` = `rm`.`expeditionTruckFk`)
 				)
 				JOIN `vn`.`ticket` `t` ON(`t`.`routeFk` = `r`.`id`)
 			)
--- a/db/routines/vn/views/expeditionScan_Monitor.sql
+++ b/db/routines/vn/views/expeditionScan_Monitor.sql
@ -1,9 +1,9 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`expeditionScan_Monitor`
-AS SELECT `et`.`id` AS `truckFk`,
-	`et`.`eta` AS `ETD`,
-	`et`.`description` AS `description`,
+AS SELECT `rs`.`id` AS `truckFk`,
+	`rs`.`eta` AS `ETD`,
+	`rs`.`description` AS `description`,
 	`ep`.`id` AS `palletFk`,
 	`ep`.`position` AS `position`,
 	`ep`.`built` AS `built`,
@ -12,8 +12,8 @@ AS SELECT `et`.`id` AS `truckFk`,
 	`es`.`scanned` AS `scanned`
 FROM (
 		(
-			`vn`.`expeditionTruck` `et`
-			LEFT JOIN `vn`.`expeditionPallet` `ep` ON(`ep`.`truckFk` = `et`.`id`)
+			`vn`.`roadmapStop` `rs`
+			LEFT JOIN `vn`.`expeditionPallet` `ep` ON(`ep`.`truckFk` = `rs`.`id`)
 		)
 		LEFT JOIN `vn`.`expeditionScan` `es` ON(`es`.`palletFk` = `ep`.`id`)
 	)
--- a/db/routines/vn/views/expeditionSticker.sql
+++ b/db/routines/vn/views/expeditionSticker.sql
@ -14,7 +14,7 @@ AS SELECT `e`.`id` AS `expeditionFk`,
 	IF(
 		`t`.`routeFk`,
 		IFNULL(
-			`et`.`description`,
+			`rs`.`description`,
 			REPLACE(`am`.`name`, 'ZONA ', 'Z')
 		),
 		`z`.`name`
@ -45,7 +45,7 @@ FROM (
 									)
 									LEFT JOIN `vn`.`routesMonitor` `rm` ON(`rm`.`routeFk` = `t`.`routeFk`)
 								)
-								LEFT JOIN `vn`.`expeditionTruck` `et` ON(`et`.`id` = `rm`.`expeditionTruckFk`)
+								LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rs`.`id` = `rm`.`expeditionTruckFk`)
 							)
 							LEFT JOIN `vn`.`beach` `b` ON(`b`.`code` = `rm`.`beachFk`)
 						)
--- a/db/routines/vn/views/expeditionTicket_NoBoxes.sql
+++ b/db/routines/vn/views/expeditionTicket_NoBoxes.sql
@ -4,7 +4,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 AS SELECT `t`.`id` AS `ticketFk`,
 	`t`.`warehouseFk` AS `warehouseFk`,
 	`t`.`routeFk` AS `routeFk`,
-	`et`.`description` AS `description`
+	`rs`.`description` AS `description`
 FROM (
 		(
 			(
@ -13,7 +13,7 @@ FROM (
 			)
 			JOIN `vn`.`routesMonitor` `rm` ON(`rm`.`routeFk` = `t`.`routeFk`)
 		)
-		JOIN `vn`.`expeditionTruck` `et` ON(`et`.`id` = `rm`.`expeditionTruckFk`)
+		JOIN `vn`.`roadmapStop` `rs` ON(`rs`.`id` = `rm`.`expeditionTruckFk`)
 	)
 WHERE `e`.`id` IS NULL
-	AND `et`.`eta` > `util`.`VN_CURDATE`()
+	AND `rs`.`eta` > `util`.`VN_CURDATE`()
--- a/db/routines/vn/views/expeditionTruck_Control_Detail_Pallet.sql
+++ b/db/routines/vn/views/expeditionTruck_Control_Detail_Pallet.sql
@ -7,13 +7,13 @@ AS SELECT `e`.`truckFk` AS `id`,
 	`e`.`palletFk` AS `pallet`,
 	`e`.`routeFk` AS `route`,
 	COUNT(DISTINCT `e`.`scanFk`) AS `scans`,
-	`et`.`description` AS `destinos`,
+	`rs`.`description` AS `destinos`,
 	sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) AS `fallos`,
 	`e`.`expeditionTruckFk` AS `expeditionTruckFk`,
 	max(`e`.`lastPacked`) AS `lastPacked`
 FROM (
 		`vn`.`expeditionCommon` `e`
-		LEFT JOIN `vn`.`expeditionTruck` `et` ON(`et`.`id` = `e`.`expeditionTruckFk`)
+		LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rs`.`id` = `e`.`expeditionTruckFk`)
 	)
 GROUP BY `e`.`truckFk`,
 	`e`.`palletFk`,
--- a/db/routines/vn/views/routesControl.sql
+++ b/db/routines/vn/views/routesControl.sql
@ -6,8 +6,8 @@ AS SELECT `t`.`routeFk` AS `routeFk`,
 	COUNT(`es`.`id`) AS `scanned`,
 	COUNT(DISTINCT `es`.`palletFk`) AS `pallets`,
 	max(`es`.`scanned`) AS `lastScanned`,
-	max(`et`.`description`) AS `description`,
-	max(`et`.`eta`) AS `eta`
+	max(`rs`.`description`) AS `description`,
+	max(`rs`.`eta`) AS `eta`
 FROM (
 		(
 			(
@ -19,9 +19,9 @@ FROM (
 			)
 			LEFT JOIN `vn`.`expeditionPallet` `ep` ON(`ep`.`id` = `es`.`palletFk`)
 		)
-		LEFT JOIN `vn`.`expeditionTruck` `et` ON(`et`.`id` = `ep`.`truckFk`)
+		LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rs`.`id` = `ep`.`truckFk`)
 	)
 WHERE `t`.`shipped` >= `util`.`VN_CURDATE`()
 	AND `t`.`routeFk` <> 0
 GROUP BY `t`.`routeFk`
-ORDER BY max(`et`.`eta`)
+ORDER BY max(`rs`.`eta`)
--- a/db/routines/vn/views/saleVolume.sql
+++ b/db/routines/vn/views/saleVolume.sql
@ -37,7 +37,7 @@ FROM (
 			)
 			JOIN `vn`.`volumeConfig` `vc`
 		)
-		JOIN `vn`.`itemCost` `ic` ON(
+		JOIN `vn`.`itemCost` `ic` FORCE INDEX (`PRIMARY`) ON(
 			`ic`.`itemFk` = `s`.`itemFk`
 			AND `ic`.`warehouseFk` = `t`.`warehouseFk`
 		)
--- a/db/versions/11010-blackChrysanthemum/00-firstScript.sql
+++ b/db/versions/11010-blackChrysanthemum/00-firstScript.sql
@ -0,0 +1,21 @@
+ALTER TABLE vn.deviceProductionUser DROP INDEX IF EXISTS deviceProductionUser_UN;
+
+ALTER TABLE vn.deviceProductionUser DROP FOREIGN KEY IF EXISTS deviceProductionUser_FK;
+
+ALTER TABLE vn.deviceProductionUser DROP PRIMARY KEY;
+
+ALTER TABLE vn.deviceProductionUser ADD IF NOT EXISTS id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY FIRST;
+
+ALTER TABLE vn.deviceProductionUser ADD CONSTRAINT deviceProductionUser_deviceProduction_FK FOREIGN KEY IF NOT EXISTS (deviceProductionFk) REFERENCES vn.deviceProduction(id);
+
+ALTER TABLE vn.deviceProductionUser ADD CONSTRAINT deviceProductionUser_unique UNIQUE KEY IF NOT EXISTS (deviceProductionFk);
+
+ALTER TABLE vn.deviceProductionUser ADD IF NOT EXISTS simSerialNumber TEXT NULL;
+
+ALTER TABLE vn.deviceProductionConfig ADD IF NOT EXISTS maxDevicesPerUser INT UNSIGNED NULL;
+
+UPDATE vn.deviceProductionConfig SET maxDevicesPerUser=1 WHERE id=1;
+
+INSERT IGNORE INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Worker','getAvailablePda','READ','ALLOW','ROLE','hr');
+
--- a/db/versions/11022-crimsonArborvitae/00-firstScript.sql
+++ b/db/versions/11022-crimsonArborvitae/00-firstScript.sql
@ -0,0 +1,15 @@
+-- Place your SQL code here
+ALTER TABLE IF EXISTS vn.expeditionTruck RENAME vn.roadmapStop;
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn`.`expeditionTruck`
+AS SELECT `rs`.`id` AS `id`,
+	`rs`.`roadmapFk` AS `roadmapFk`,
+	`rs`.`warehouseFk` AS `warehouseFk`,
+	`rs`.`eta` AS `eta`,
+	`rs`.`description` AS `description`,
+	`rs`.`bufferFk` AS `bufferFk`,
+	`rs`.`created` AS `created`,
+	`rs`.`userFk` AS `userFk`
+FROM `vn`.`roadmapStop` `rs`;
--- a/db/versions/11040-grayMonstera/00-firstScript.sql
+++ b/db/versions/11040-grayMonstera/00-firstScript.sql
@ -0,0 +1,16 @@
+UPDATE vn.route
+    SET vehicleFk = NULL
+    WHERE vehicleFk NOT IN (SELECT id FROM vn.vehicle);
+
+ALTER TABLE vn.route
+ADD CONSTRAINT route_vehicleFk FOREIGN KEY (vehicleFk) REFERENCES vn.vehicle(id);
+
+ALTER TABLE vn.route
+MODIFY COLUMN firstEditorFk int(10) unsigned NULL;
+
+UPDATE vn.route
+    SET firstEditorFk = NULL
+    WHERE firstEditorFk NOT IN (SELECT id FROM account.user);
+
+ALTER TABLE vn.route
+ADD CONSTRAINT route_firstEditorFk FOREIGN KEY (firstEditorFk) REFERENCES account.user(id);
--- a/db/versions/11054-orangeBamboo/00-firstScript.sql
+++ b/db/versions/11054-orangeBamboo/00-firstScript.sql
@ -0,0 +1,16 @@
+	CREATE OR REPLACE TABLE vn.ledgerCompany (
+		`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+		`fiscalYear` int(10) unsigned NOT NULL COMMENT 'Año del ejercicio contable',
+		`bookEntry` int(10) unsigned NOT NULL DEFAULT 1 COMMENT 'Contador asiento contable',
+		PRIMARY KEY (`id`),
+		UNIQUE KEY `ledgerCompany_unique` (`fiscalYear`)
+	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci 
+	COMMENT='Contador para asientos contables';
+
+	INSERT IGNORE INTO vn.ledgerCompany (fiscalYear, bookEntry)
+		SELECT YEAR(util.VN_CURDATE()), lastBookEntry 
+			FROM vn.ledgerConfig;
+	
+	ALTER TABLE  vn.ledgerConfig CHANGE IF EXISTS lastBookEntry lastBookEntry__ int(11) NOT NULL 
+		COMMENT '@deprecated 2024-05-28 refs #7400 Modificar contador asientos contables';
+		
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -6,6 +6,7 @@ services:
      context: front
    environment:
      - TZ
+      - NODE_ENV
    ports:
      - 80
    deploy:
--- a/front/Dockerfile
+++ b/front/Dockerfile
@ -4,7 +4,9 @@ ENV TZ Europe/Madrid

 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends nginx \
+    && apt-get install -y --no-install-recommends \
+        nginx \
+        gettext-base \
    && rm -rf /var/lib/apt/lists/* \
    && ln -sf /dev/stdout /var/log/nginx/access.log \
    && ln -sf /dev/stderr /var/log/nginx/error.log
@ -14,5 +16,7 @@ COPY nginx.conf sites-available/salix
 RUN rm sites-enabled/default && ln -s ../sites-available/salix sites-enabled/salix

 COPY dist /salix/dist
+COPY env.template.js /salix/dist
+COPY nginx-entrypoint.sh /

-CMD ["nginx", "-g", "daemon off;"]
+ENTRYPOINT [ "sh", "/nginx-entrypoint.sh" ]
--- a/front/env.template.js
+++ b/front/env.template.js
@ -0,0 +1,3 @@
+window.process = {
+    env: {NODE_ENV: '${NODE_ENV}'}
+};
--- a/front/nginx-entrypoint.sh
+++ b/front/nginx-entrypoint.sh
@ -0,0 +1,7 @@
+#!/bin/sh
+
+WWW_DIR=/salix/dist
+INJECT_FILE_SRC="${WWW_DIR}/env.template.js"
+INJECT_FILE_DST="${WWW_DIR}/env.js"
+envsubst < "${INJECT_FILE_SRC}" > "${INJECT_FILE_DST}"
+[ -z "$@" ] && nginx -g 'daemon off;' || $@
--- a/front/salix/index.ejs
+++ b/front/salix/index.ejs
@ -5,6 +5,8 @@
 		<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=no"/>
 		<meta name="mobile-web-app-capable" content="yes"/>
 		<link rel="manifest" href="<%= require('./manifest.json') %>"/>
+        <script type="text/javascript" src="/env.js">
+		</script>
 		<title vn-title translate></title>
 	</head>
 	<body>
--- a/gulpfile.js
+++ b/gulpfile.js
@ -139,6 +139,9 @@ function webpack(done) {
 webpack.description = `Transpiles application into files`;

 function webpackDevServer(done) {
+    const replace = require('gulp-replace');
+    const rename = require('gulp-rename');
+
    const webpack = require('webpack');
    const merge = require('webpack-merge');
    const WebpackDevServer = require('webpack-dev-server');
@ -148,6 +151,12 @@ function webpackDevServer(done) {

    let devServer = wpConfig.devServer;

+    // local env
+    gulp.src(srcDir + '/env.template.js')
+        .pipe(replace('${NODE_ENV}', 'development'))
+        .pipe(rename('env.js'))
+        .pipe(gulp.dest(buildDir));
+
    for (let entryName in wpConfig.entry) {
        let entry = wpConfig.entry[entryName];
        if (!Array.isArray(entry))
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@ -225,5 +225,6 @@
 	"ticketCommercial": "The ticket {{ ticket }} for the salesperson {{ salesMan }} is in preparation. (automatically generated message)",
 	"This password can only be changed by the user themselves": "This password can only be changed by the user themselves",
 	"They're not your subordinate": "They're not your subordinate",
-	"InvoiceIn is already booked": "InvoiceIn is already booked"
+	"InvoiceIn is already booked": "InvoiceIn is already booked",
+	"This workCenter is already assigned to this agency": "This workCenter is already assigned to this agency"
 }
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@ -356,5 +356,6 @@
 	"InvoiceIn is already booked": "La factura recibida está contabilizada",
 	"This workCenter is already assigned to this agency": "Este centro de trabajo ya está asignado a esta agencia",
 	"Select ticket or client": "Elija un ticket o un client",
-	"It was not able to create the invoice": "No se pudo crear la factura"
+	"It was not able to create the invoice": "No se pudo crear la factura",
+	"This PDA is already assigned to another user": "This PDA is already assigned to another user"
 }
--- a/modules/client/back/methods/client/clientDebtStatementPdf.js
+++ b/modules/client/back/methods/client/clientDebtStatementPdf.js
@ -40,7 +40,8 @@ module.exports = Self => {
        http: {
            path: '/:id/client-debt-statement-pdf',
            verb: 'GET'
-        }
+        },
+        accessScopes: ['DEFAULT', 'read:multimedia']
    });

    Self.clientDebtStatementPdf = (ctx, id) => Self.printReport(ctx, id, 'client-debt-statement');
--- a/modules/client/back/methods/client/createReceipt.js
+++ b/modules/client/back/methods/client/createReceipt.js
@ -3,6 +3,7 @@ const UserError = require('vn-loopback/util/user-error');
 module.exports = function(Self) {
    Self.remoteMethodCtx('createReceipt', {
        description: 'Creates receipt and its compensation if necessary',
+        accessType: 'READ',
        accepts: [{
            arg: 'clientFk',
            type: 'number',
@ -45,7 +46,8 @@ module.exports = function(Self) {
        http: {
            verb: 'post',
            path: '/:clientFk/createReceipt'
-        }
+        },
+        accessScopes: ['DEFAULT', 'read:multimedia']
    });

    Self.createReceipt = async(ctx, options) => {
--- a/modules/client/back/methods/client/creditRequestPdf.js
+++ b/modules/client/back/methods/client/creditRequestPdf.js
@ -35,7 +35,8 @@ module.exports = Self => {
        http: {
            path: '/:id/credit-request-pdf',
            verb: 'GET'
-        }
+        },
+        accessScopes: ['DEFAULT', 'read:multimedia']
    });

    Self.creditRequestPdf = (ctx, id) => Self.printReport(ctx, id, 'credit-request');
--- a/modules/client/back/methods/client/incotermsAuthorizationPdf.js
+++ b/modules/client/back/methods/client/incotermsAuthorizationPdf.js
@ -47,7 +47,8 @@ module.exports = Self => {
        http: {
            path: '/:id/incoterms-authorization-pdf',
            verb: 'GET'
-        }
+        },
+        accessScopes: ['DEFAULT', 'read:multimedia']
    });

    Self.incotermsAuthorizationPdf = (ctx, id) => Self.printReport(ctx, id, 'incoterms-authorization');
--- a/modules/client/back/methods/client/letterDebtorPdf.js
+++ b/modules/client/back/methods/client/letterDebtorPdf.js
@ -41,7 +41,8 @@ module.exports = Self => {
        http: {
            path: '/:id/letter-debtor-pdf',
            verb: 'GET'
-        }
+        },
+        accessScopes: ['DEFAULT', 'read:multimedia']
    });

    Self.letterDebtorPdf = (ctx, id) => Self.printReport(ctx, id, 'letter-debtor');
--- a/modules/client/back/methods/receipt/balanceCompensationPdf.js
+++ b/modules/client/back/methods/receipt/balanceCompensationPdf.js
@ -29,7 +29,8 @@ module.exports = Self => {
        http: {
            path: '/:id/balance-compensation-pdf',
            verb: 'GET'
-        }
+        },
+        accessScopes: ['DEFAULT', 'read:multimedia']
    });

    Self.balanceCompensationPdf = (ctx, id) => Self.printReport(ctx, id, 'balance-compensation');
--- a/modules/client/back/methods/receipt/receiptPdf.js
+++ b/modules/client/back/methods/receipt/receiptPdf.js
@ -34,7 +34,8 @@ module.exports = Self => {
        http: {
            path: '/:id/receipt-pdf',
            verb: 'GET'
-        }
+        },
+        accessScopes: ['DEFAULT', 'read:multimedia']
    });

    Self.receiptPdf = (ctx, id) => Self.printReport(ctx, id, 'receipt');
--- a/modules/invoiceOut/back/methods/invoiceOut/invoiceOutPdf.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/invoiceOutPdf.js
@ -31,7 +31,8 @@ module.exports = Self => {
        http: {
            path: '/:reference/invoice-out-pdf',
            verb: 'GET'
-        }
+        },
+        accessScopes: ['DEFAULT', 'read:multimedia']
    });

    Self.invoiceOutPdf = async(ctx, reference) => {
--- a/modules/item/back/methods/item/labelPdf.js
+++ b/modules/item/back/methods/item/labelPdf.js
@ -51,7 +51,8 @@ module.exports = Self => {
        http: {
            path: '/:id/label-pdf',
            verb: 'GET'
-        }
+        },
+        accessScopes: ['DEFAULT', 'read:multimedia']
    });

    Self.labelPdf = (ctx, id) => Self.printReport(ctx, id, 'item-label');
--- a/modules/ticket/back/methods/ticket/docuwareDownload.js
+++ b/modules/ticket/back/methods/ticket/docuwareDownload.js
@ -28,7 +28,8 @@ module.exports = Self => {
        http: {
            path: `/:id/docuwareDownload`,
            verb: 'GET'
-        }
+        },
+        accessScopes: ['DEFAULT', 'read:multimedia']
    });

    Self.docuwareDownload = async id => {
--- a/modules/worker/back/methods/worker/getAvailablePda.js
+++ b/modules/worker/back/methods/worker/getAvailablePda.js
@ -0,0 +1,23 @@
+module.exports = Self => {
+    Self.remoteMethod('getAvailablePda', {
+        description: 'returns devices without user',
+        accessType: 'READ',
+        accepts: [],
+        returns: {
+            type: 'array',
+            root: true
+        },
+        http: {
+            path: `/getAvailablePda`,
+            verb: 'GET'
+        }
+    });
+    Self.getAvailablePda = async() => {
+        return Self.app.models.DeviceProduction.rawSql(
+            `SELECT d.*
+                FROM deviceProduction d
+                    LEFT JOIN deviceProductionUser du ON du.deviceProductionFk = d.id
+                WHERE du.deviceProductionFk IS NULL`
+        );
+    };
+};
--- a/modules/worker/back/methods/worker/specs/getAvailablePda.spec.js
+++ b/modules/worker/back/methods/worker/specs/getAvailablePda.spec.js
@ -0,0 +1,13 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('worker getAvailablePda()', () => {
+    it('should return a Pda that has no user assigned', async() => {
+        const [{id}] = await models.Worker.getAvailablePda();
+
+        const deviceProductionUser = await models.DeviceProductionUser.findOne({
+            where: {deviceProductionFk: id}
+        });
+
+        expect(!deviceProductionUser).toBeTruthy();
+    });
+});
--- a/modules/worker/back/models/device-production-user.js
+++ b/modules/worker/back/models/device-production-user.js
@ -0,0 +1,8 @@
+const UserError = require('vn-loopback/util/user-error');
+module.exports = Self => {
+    Self.rewriteDbError(function(err) {
+        if (err.code === 'ER_DUP_ENTRY')
+            return new UserError(`This PDA is already assigned to another user`);
+        return err;
+    });
+};
--- a/modules/worker/back/models/device-production-user.json
+++ b/modules/worker/back/models/device-production-user.json
@ -14,6 +14,10 @@
        }
    },
    "properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
        "deviceProductionFk": {
            "type": "number",
            "id": true
@ -21,6 +25,9 @@
        "userFk": {
            "type": "number"
        },
+        "simSerialNumber": {
+            "type": "string"
+        },
        "created": {
            "type": "date"
        }
@ -36,5 +43,10 @@
            "model": "User",
            "foreignKey": "userFk"
        }
+    },
+    "scope": {
+        "include":{
+           "relation": "deviceProduction"
+        }
    }
 }
--- a/modules/worker/back/models/worker.js
+++ b/modules/worker/back/models/worker.js
@ -20,6 +20,7 @@ module.exports = Self => {
    require('../methods/worker/search')(Self);
    require('../methods/worker/isAuthorized')(Self);
    require('../methods/worker/setPassword')(Self);
+    require('../methods/worker/getAvailablePda')(Self);

    Self.validateAsync('fi', tinIsValid, {
        message: 'Invalid TIN'
--- a/package.json
+++ b/package.json
@ -82,6 +82,8 @@
        "gulp-print": "^2.0.1",
        "gulp-wrap": "^0.15.0",
        "gulp-yaml": "^1.0.1",
+        "gulp-rename": "^2.0.0",
+        "gulp-replace": "^1.1.4",
        "html-loader": "^0.4.5",
        "html-loader-jest": "^0.2.1",
        "html-webpack-plugin": "^5.5.1",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -202,6 +202,12 @@ devDependencies:
  gulp-print:
    specifier: ^2.0.1
    version: 2.0.1
+  gulp-rename:
+    specifier: ^2.0.0
+    version: 2.0.0
+  gulp-replace:
+    specifier: ^1.1.4
+    version: 1.1.4
  gulp-wrap:
    specifier: ^0.15.0
    version: 0.15.0(ejs@2.3.1)
@ -2632,6 +2638,10 @@ packages:
    resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==}
    dev: true

+  /@types/expect@1.20.4:
+    resolution: {integrity: sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==}
+    dev: true
+
  /@types/express-serve-static-core@4.17.42:
    resolution: {integrity: sha512-ckM3jm2bf/MfB3+spLPWYPUH573plBFwpOhqQ2WottxYV85j1HQFlxmnTq57X1yHY9awZPig06hL/cLMgNWHIQ==}
    dependencies:
@ -2790,6 +2800,13 @@ packages:
    resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==}
    dev: false

+  /@types/vinyl@2.0.12:
+    resolution: {integrity: sha512-Sr2fYMBUVGYq8kj3UthXFAu5UN6ZW+rYr4NACjZQJvHvj+c8lYv0CahmZ2P/r7iUkN44gGUBwqxZkrKXYPb7cw==}
+    dependencies:
+      '@types/expect': 1.20.4
+      '@types/node': 20.11.16
+    dev: true
+
  /@types/yargs-parser@21.0.3:
    resolution: {integrity: sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==}
    dev: true
@ -3770,6 +3787,11 @@ packages:
    engines: {node: '>=8'}
    dev: true

+  /binaryextensions@2.3.0:
+    resolution: {integrity: sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==}
+    engines: {node: '>=0.8'}
+    dev: true
+
  /bindings@1.5.0:
    resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==}
    requiresBuild: true
@ -7090,6 +7112,22 @@ packages:
      map-stream: 0.0.7
    dev: true

+  /gulp-rename@2.0.0:
+    resolution: {integrity: sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /gulp-replace@1.1.4:
+    resolution: {integrity: sha512-SVSF7ikuWKhpAW4l4wapAqPPSToJoiNKsbDoUnRrSgwZHH7lH8pbPeQj1aOVYQrbZKhfSVBxVW+Py7vtulRktw==}
+    engines: {node: '>=10'}
+    dependencies:
+      '@types/node': 20.11.16
+      '@types/vinyl': 2.0.12
+      istextorbinary: 3.3.0
+      replacestream: 4.0.3
+      yargs-parser: 21.1.1
+    dev: true
+
  /gulp-util@3.0.8:
    resolution: {integrity: sha512-q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw==}
    engines: {node: '>=0.10'}
@ -8324,6 +8362,14 @@ packages:
      istanbul-lib-report: 3.0.1
    dev: true

+  /istextorbinary@3.3.0:
+    resolution: {integrity: sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      binaryextensions: 2.3.0
+      textextensions: 3.3.0
+    dev: true
+
  /jackspeak@2.3.6:
    resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==}
    engines: {node: '>=14'}
@ -12065,6 +12111,14 @@ packages:
      remove-trailing-separator: 1.1.0
    dev: true

+  /replacestream@4.0.3:
+    resolution: {integrity: sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==}
+    dependencies:
+      escape-string-regexp: 1.0.5
+      object-assign: 4.1.1
+      readable-stream: 2.3.8
+    dev: true
+
  /request@2.88.2:
    resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==}
    engines: {node: '>= 6'}
@ -13563,6 +13617,11 @@ packages:
    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
    dev: true

+  /textextensions@3.3.0:
+    resolution: {integrity: sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==}
+    engines: {node: '>=8'}
+    dev: true
+
  /throat@5.0.0:
    resolution: {integrity: sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==}
    dev: true
--- a/print/templates/reports/collection-label/sql/labelsData.sql
+++ b/print/templates/reports/collection-label/sql/labelsData.sql
@ -3,7 +3,7 @@ SELECT c.itemPackingTypeFk code,
        SUBSTRING('ABCDEFGH', tc.wagon, 1) wagon,
        tc.`level`,
        t.id ticketFk,
-        COALESCE(et.description, zo.name, am.name) agencyDescription,
+        COALESCE(rs.description, zo.name, am.name) agencyDescription,
        cc.code color,
        t.clientFk,
        CAST(SUM(sv.volume) AS DECIMAL(5, 2)) volume,
@ -35,7 +35,7 @@ SELECT c.itemPackingTypeFk code,
        LEFT JOIN vn.ticketTrolley tt ON tt.ticket = t.id
        LEFT JOIN vn.`zone` zo ON t.zoneFk = zo.id
        LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
-        LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk
+        LEFT JOIN vn.roadmapStop rs ON rs.id = rm.expeditionTruckFk
        LEFT JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id
        JOIN vn.productionConfig pc
    WHERE t.id IN (?)
--- a/print/templates/reports/expedition-pallet-label/sql/labelData.sql
+++ b/print/templates/reports/expedition-pallet-label/sql/labelData.sql
@ -1,19 +1,19 @@
 SELECT ep.id palletFk,
 		t.routeFk,
-		et2.description truck,
+		rs2.description truck,
 		r.description `zone`,
 		COUNT(es.id) labels,
 		t.warehouseFk warehouseFk,
 		dayname(r.created) `dayName`,
-		et.id <=> rm.expeditionTruckFk isMatch
-	FROM vn.expeditionTruck et
-		JOIN vn.expeditionPallet ep ON ep.truckFk = et.id
+		rs.id <=> rm.expeditionTruckFk isMatch
+	FROM vn.roadmapStop rs
+		JOIN vn.expeditionPallet ep ON ep.truckFk = rs.id
 		JOIN vn.expeditionScan es ON es.palletFk = ep.id
 		JOIN vn.expedition e ON e.id = es.expeditionFk
 		JOIN vn.ticket t ON t.id = e.ticketFk
 		JOIN vn.route r ON r.id = t.routeFk
 		LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id
-		LEFT JOIN vn.expeditionTruck et2 ON et2.id = rm.expeditionTruckFk
+		LEFT JOIN vn.roadmapStop rs2 ON rs2.id = rm.expeditionTruckFk
 	WHERE ep.id = ?
 	GROUP BY ep.id, t.routeFk
 	ORDER BY t.routeFk
--- a/webpack.config.js
+++ b/webpack.config.js
@ -70,6 +70,7 @@ let baseConfig = {
        ]
    },
    optimization: {
+        nodeEnv: false,
        runtimeChunk: true,
        splitChunks: {
            chunks: 'all',
@ -99,9 +100,6 @@ let baseConfig = {
            filename: 'index.html',
            chunks: ['salix']
        }),
-        new webpack.DefinePlugin({
-            'process.env.NODE_ENV': JSON.stringify(env)
-        })
    ],
    devtool: 'source-map',
    stats: {