Jenkinsfile

@@ -235,6 +235,7 @@ pipeline {
                     if (index != -1)
                         message = message.substring(0, index)
 
+                    setEnv()
                     rocketSend(
                         channel: 'vn-database',
                         message: "*DB version uploaded:* ${message}"

back/methods/collection/getSectors.js

@@ -1,20 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethod('getSectors', {
-        description: 'Get all sectors',
-        accessType: 'READ',
-        returns: {
-            type: 'Object',
-            root: true
-        },
-        http: {
-            path: `/getSectors`,
-            verb: 'GET'
-        }
-    });
-
-    Self.getSectors = async() => {
-        const query = `CALL vn.sector_get()`;
-        const [result] = await Self.rawSql(query);
-        return result;
-    };
-};

back/methods/collection/spec/getSectors.spec.js

@@ -1,11 +0,0 @@
-const {models} = require('vn-loopback/server/server');
-
-describe('getSectors()', () => {
-    it('return list of sectors', async() => {
-        let response = await models.Collection.getSectors();
-
-        expect(response.length).toBeGreaterThan(0);
-        expect(response[0].id).toEqual(1);
-        expect(response[0].description).toEqual('First sector');
-    });
-});

back/methods/dms/uploadFile.js

@@ -88,7 +88,7 @@ module.exports = Self => {
                     warehouseFk: args.warehouseId,
                     reference: args.reference,
                     description: args.description,
-                    contentType: args.contentType,
+                    contentType: uploadedFile.type,
                     hasFile: args.hasFile
                 };
                 const extension = await models.DmsContainer.getFileExtension(uploadedFile.name);

back/methods/url/getUrl.js

@@ -22,7 +22,7 @@ module.exports = Self => {
         const {url} = await Self.app.models.Url.findOne({
             where: {
                 appName,
-                enviroment: process.env.NODE_ENV || 'development'
+                environment: process.env.NODE_ENV || 'development'
             }
         });
         return url;

back/models/collection.js

@@ -1,6 +1,5 @@
 module.exports = Self => {
     require('../methods/collection/getCollection')(Self);
-    require('../methods/collection/getSectors')(Self);
     require('../methods/collection/setSaleQuantity')(Self);
     require('../methods/collection/previousLabel')(Self);
     require('../methods/collection/getTickets')(Self);

db/dump/.dump/data.sql

@@ -1750,8 +1750,6 @@ USE `vn`;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
-INSERT INTO `agencyTermConfig` VALUES ('6240000000','4721000015',21.0000000000,'Adquisiciones intracomunitarias de servicios');
-
 INSERT INTO `alertLevel` VALUES ('FREE',0,1);
 INSERT INTO `alertLevel` VALUES ('ON_PREPARATION',1,1);
 INSERT INTO `alertLevel` VALUES ('PACKED',2,0);

db/dump/fixtures.after.sql

@@ -137,9 +137,6 @@ INSERT INTO vn.ticket (clientFk, warehouseFk, shipped, nickname, refFk, addressF
 INSERT INTO vn.sale (itemFk, ticketFk, concept, quantity, originalQuantity, price, discount, priceFixed, reserved, isPicked, isPriceFixed, created, isAdded)
     VALUES (1, 24, 'Ranged weapon longbow 2m', 1.00, NULL, 8.07, 0, 0.00, 0, 0, 0, '2022-07-06 00:00:00', 0);
 */
-INSERT INTO vn2008.zones (zone_id,name,printingOrder)
-    VALUES (1,'zone Test',1);
-
 -- XXX: lab
 
 INSERT INTO `vn`.`businessReasonEnd` (`id`, `reason`)

db/dump/fixtures.before.sql

@@ -653,6 +653,7 @@ INSERT INTO `vn`.`expense`(`id`, `name`, `isWithheld`)
         (7001000000, 'Mercaderia',                       0),
         (7050000000, 'Prestacion de servicios',          1);
 
+INSERT INTO `vn`.`agencyTermConfig` VALUES ('6240000000','4721000015',21.0000000000,'Adquisiciones intracomunitarias de servicios');
 
 INSERT INTO `vn`.`invoiceOutExpense`(`id`, `invoiceOutFk`, `amount`, `expenseFk`, `created`)
     VALUES
@@ -728,7 +729,7 @@ INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agen
 INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `landed`, `clientFk`,`nickname`, `addressFk`, `refFk`, `isDeleted`, `zoneFk`, `zonePrice`, `zoneBonus`, `created`, `weight`, `cmrFk`)
     VALUES
         (1 , 3,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave',                                      121, NULL,     0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      1,         1),
-        (2 , 1,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave',                                      1,   NULL,     0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      2,         2), 
+        (2 , 1,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave',                                      1,   NULL,     0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      2,         2),
         (3 , 1,     7,  1, 6,       DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 3,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH),      NULL,      3),
         (4 , 3,     2,  1, 2,       DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 9,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH),      NULL,      NULL),
         (5 , 3,     3,  3, 3,       DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 10,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH),      NULL,      NULL),
@@ -3067,3 +3068,6 @@ INSERT INTO `vn`.`cmr` (id,truckPlate,observations,senderInstruccions,paymentIns
 	VALUES (1,'123456A','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',442,1,2,1,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet'),
 	    (2,'123456N','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',69,3,4,2,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet'),
 	    (3,'123456B','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',567,5,6,69,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet');
+
+UPDATE vn.department
+    SET workerFk = null;

db/routines/bs/procedures/ventas_contables_add.sql

@@ -1,7 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_contables_add`(IN vYear INT, IN vMonth INT)
 BEGIN
-	
+
 	/**
 	 * Reemplaza las ventas contables del último año.
 	 * Es el origen de datos para el balance de Entradas
@@ -13,8 +13,8 @@ BEGIN
 
 	DECLARE TIPO_PATRIMONIAL INT DEFAULT 188;
 
-	DELETE FROM bs.ventas_contables 
+	DELETE FROM bs.ventas_contables
-		WHERE year = vYear 
+		WHERE year = vYear
 	    	AND month = vMonth;
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
@@ -25,7 +25,7 @@ BEGIN
 			FROM vn2008.Tickets t
 				JOIN vn.invoiceOut io ON io.id = t.Factura
 			WHERE year(io.issued) = vYear
-				AND month(io.issued) = vMonth;   
+				AND month(io.issued) = vMonth;
 
 	INSERT INTO bs.ventas_contables(year
 								  , month
@@ -35,7 +35,7 @@ BEGIN
 								  , tipo_id
 								  , empresa_id
 								  , gasto)
-	
+
 		SELECT  vYear
 			  , vMonth
 			  , round(sum(Cantidad * Preu * (100 - m.Descuento)/100))
@@ -47,13 +47,13 @@ BEGIN
 			  , tp.reino_id
 			  , a.tipo_id
 			  , t.empresa_id
-			  , 7000000000 
+			  , a.expenseFk
 				+ IF(e.empresa_grupo = e2.empresa_grupo
 									  ,1
 									  ,IF(e2.empresa_grupo,2,0)
-									  ) * 1000000  
+									  ) * 100000
-				+ tp.reino_id * 10000 as Gasto
+				+ tp.reino_id * 1000 as Gasto
-			FROM vn2008.Movimientos m 
+			FROM vn2008.Movimientos m
 				JOIN vn2008.Tickets t on t.Id_Ticket = m.Id_Ticket
 				JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.Id_Consigna
 				JOIN vn2008.Clientes c on c.Id_Cliente = cs.Id_Cliente
@@ -67,7 +67,7 @@ BEGIN
 				AND m.Descuento <> 100
 				AND a.tipo_id != TIPO_PATRIMONIAL
 			GROUP BY grupo, reino_id, tipo_id, empresa_id, Gasto;
-		
+
 	INSERT INTO bs.ventas_contables(year
 								  , month
 								  , venta
@@ -86,17 +86,17 @@ BEGIN
 				  ) as grupo
 			  , NULL
 			  , NULL
-			  , t.companyFk 
+			  , t.companyFk
 			  , 7050000000
-			FROM vn.ticketService ts 
+			FROM vn.ticketService ts
 				JOIN vn.ticket t ON ts.ticketFk = t.id
-				JOIN vn.address a on a.id = t.addressFk 
+				JOIN vn.address a on a.id = t.addressFk
-				JOIN vn.client cl on cl.id = a.clientFk 
+				JOIN vn.client cl on cl.id = a.clientFk
 				JOIN tmp.ticket_list tt on tt.Id_Ticket = t.id
-				JOIN vn.company c on c.id = t.companyFk 
+				JOIN vn.company c on c.id = t.companyFk
 				LEFT JOIN vn.company c2 on c2.clientFk = cl.id
-			GROUP BY grupo, t.companyFk ;	
+			GROUP BY grupo, t.companyFk ;
-		
+
 	DROP TEMPORARY TABLE tmp.ticket_list;
 END$$
 DELIMITER ;

db/routines/vn/functions/isPalletHomogeneus.sql

@@ -1,27 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`isPalletHomogeneus`(vExpedition INT)
-	RETURNS tinyint(1)
-	NOT DETERMINISTIC
-	READS SQL DATA
-BEGIN
-	DECLARE vScanId INT;
-	DECLARE vDistinctRoutesInThePallet INT;
-
-	SELECT scan_id INTO vScanId
-		FROM vn2008.scan_line
-		WHERE code = vExpedition
-		LIMIT 1;
-
-		SELECT COUNT(*) INTO vDistinctRoutesInThePallet
-		FROM (
-			SELECT DISTINCT t.Id_Ruta
-			FROM vn2008.scan_line sl
-				JOIN expedition e ON e.id = sl.code
-				JOIN vn2008.Tickets t ON t.Id_Ticket = e.ticketFk
-			WHERE sl.scan_id = vScanId
-				AND t.Id_Ruta
-		) t1;
-			
-	RETURN vDistinctRoutesInThePallet = 1;
-END$$
-DELIMITER ;

db/routines/vn/procedures/bankPolicy_notifyExpired.sql

@@ -16,7 +16,7 @@ BEGIN
 				LEFT JOIN vn.supplier s 
 					ON s.id = bp.supplierFk
 				LEFT JOIN vn.bank b
-					ON b.id = bp.bankFk
+					ON b.id = bp.accountingFk
 		    WHERE bp.insuranceExpired = util.VN_CURDATE();
 END$$
 DELIMITER ;

db/routines/vn/procedures/clean.sql

@@ -22,6 +22,7 @@ BEGIN
 	SET v2Years = util.VN_CURDATE() - INTERVAL 2 YEAR;
 	SET v5Years = util.VN_CURDATE() - INTERVAL 5 YEAR;
 
+	DELETE FROM workerActivity WHERE created < v2Years;
 	DELETE FROM ticketParking WHERE created < vDateShort;
 	DELETE FROM routesMonitor WHERE dated < vDateShort;
 	DELETE FROM workerTimeControlLog WHERE created < vDateShort;

db/routines/vn/procedures/duaInvoiceInBooking.sql

@@ -48,7 +48,7 @@ BEGIN
 
 		IF vCounter > 0 OR vASIEN > 0 THEN
 
-			UPDATE vn2008.XDiario x
+			UPDATE XDiario x
 				JOIN ledgerConfig lc ON lc.lastBookEntry = x.ASIEN
 				SET x.ASIEN = vASIEN;
 

db/routines/vn/procedures/invoiceInTax_afterUpsert.sql

@@ -8,6 +8,7 @@ BEGIN
  */
 	DECLARE vTaxRowLimit INT;
 	DECLARE vLines INT;
+	DECLARE vHasDistinctTransactions INT;
 
 	SELECT taxRowLimit INTO vTaxRowLimit FROM invoiceInConfig;
 	
@@ -18,6 +19,18 @@ BEGIN
 	
 	IF vLines >= vTaxRowLimit THEN 
 		CALL util.throw (CONCAT('The maximum number of lines is ', vTaxRowLimit));
-	END IF;	
+	END IF;
+
+	SELECT COUNT(DISTINCT transactionTypeSageFk) INTO vHasDistinctTransactions
+		FROM invoiceIn ii
+			JOIN invoiceInTax iit ON iit.invoiceInFk = ii.id
+			JOIN invoiceInSerial iis ON iis.code = ii.serial 
+		WHERE ii.id = vInvoiceInFk
+			AND iis.taxAreaFk = 'CEE'
+			AND transactionTypeSageFk;
+
+	IF vHasDistinctTransactions > 1 THEN 
+		CALL util.throw ('This invoice does not allow different types of transactions');
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/procedures/itemShelving_add.sql

@@ -19,6 +19,10 @@ BEGIN
 	DECLARE vItemFk INT;
 
 	SELECT barcodeToItem(vBarcode) INTO vItemFk;
+	
+	SET vPacking = COALESCE(vPacking, GREATEST(vn.itemPacking(vBarcode,vWarehouseFk), 1));
+
+	SET vQuantity = vQuantity * vPacking;
 
 	IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN
 

db/routines/vn/procedures/sale_getBoxPickingList.sql

@@ -28,7 +28,7 @@ BEGIN
 		MAKETIME(pb.HH,pb.mm,0) etd, 
 		pb.routeFk,
 		FLOOR(s.quantity / ish.packing) stickers,
-		ish.packing,
+		IF(i.isBoxPickingMode, ish.packing, i.packingOut) packing,
 		b.packagingFk
 		FROM sale s
 			JOIN item i ON i.id = s.itemFk

db/routines/vn/procedures/sectorCollectionSaleGroup_add.sql

@@ -8,6 +8,25 @@ BEGIN
  * @param vSaleGroupFk Identificador de vn.saleGroup
  * @param vSectorCollectionFk Identificador de vn.sectorCollection
  */
+ 	DECLARE vHasSaleGroup INT;
+	DECLARE vHasSectorCollection INT;
+
+	SELECT COUNT(id) INTO vHasSaleGroup
+		FROM saleGroup
+		WHERE id = vSaleGroupFk;
+
+	IF !vHasSaleGroup THEN 
+		CALL util.throw ("invalid saleGroup");
+	END IF;
+
+	SELECT COUNT(id) INTO vHasSectorCollection
+		FROM sectorCollection 
+		WHERE id = vSectorCollectionFk;
+
+	IF !vHasSectorCollection THEN 
+		CALL util.throw ("invalid sectorCollection");
+	END IF;
+
 	REPLACE sectorCollectionSaleGroup
 		SET sectorCollectionFk = vSectorCollectionFk, 
 			saleGroupFk = vSaleGroupFk;

db/routines/vn/procedures/sector_get.sql

@@ -1,13 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`sector_get`()
-BEGIN
-
-/**
- * Obtiene los sectores
-*/
-
-	SELECT s.id,s.description,s.warehouseFk
-		FROM vn.sector s;
-
-END$$
-DELIMITER ;

db/routines/vn/procedures/ticket_getTax.sql

@@ -9,6 +9,8 @@ BEGIN
  * @return tmp.ticketAmount (ticketFk, taxableBase, tax, code)
  * @return tmp.ticketTax (ticketFk, pgcFk, taxableBase, rate, code) Impuesto desglosado para cada ticket.
  */
+	-- Mantengo el drop porque si no da error en los tests de back de salix
+	-- Table 'addressCompany' was locked with a READ lock and can't be updated'
 	DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany;
 	CREATE TEMPORARY TABLE tmp.addressCompany
 		(INDEX (addressFk, companyFk))
@@ -17,24 +19,24 @@ BEGIN
 			FROM tmp.ticket tmpTicket
 				JOIN ticket t ON t.id = tmpTicket.ticketFk;
 
-	CALL addressTaxArea ();
+	CALL addressTaxArea();
  
 	IF vTaxArea IS NOT NULL THEN
 		UPDATE tmp.addressTaxArea
 			SET areaFk = vTaxArea;
 	END IF;
 
-	/* Solo se calcula la base imponible (taxableBase) y el impuesto se calculará posteriormente
+	-- Solo se calcula la base imponible (taxableBase) y
-	* No se debería cambiar el sistema por problemas con los decimales
+	-- el impuesto se calculará posteriormente
-	*/
+	-- No se debería cambiar el sistema por problemas con los decimales
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketTax;
+
-	CREATE TEMPORARY TABLE tmp.ticketTax
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketTax
 		(PRIMARY KEY (ticketFk, code, rate))
 		ENGINE = MEMORY
 		SELECT * FROM (
 			SELECT tmpTicket.ticketFk,
 					bp.pgcFk,
-					SUM(s.quantity * s.price * (100 - s.discount)/100 ) taxableBase,
+					SUM(s.quantity * s.price * (100 - s.discount) / 100 ) taxableBase,
 					pgc.rate,
 					tc.code,
 					bp.priority
@@ -43,22 +45,21 @@ BEGIN
 					JOIN item i ON i.id = s.itemFk
 					JOIN ticket t ON t.id = tmpTicket.ticketFk
 					JOIN supplier su ON su.id = t.companyFk
-					JOIN tmp.addressTaxArea ata
+					JOIN tmp.addressTaxArea ata ON ata.addressFk = t.addressFk
-						ON ata.addressFk = t.addressFk AND ata.companyFk = t.companyFk
+						AND ata.companyFk = t.companyFk
-					JOIN itemTaxCountry itc
+					JOIN itemTaxCountry itc ON itc.itemFk = i.id
-						ON itc.itemFk = i.id AND itc.countryFk = su.countryFk
+						AND itc.countryFk = su.countryFk
-					JOIN bookingPlanner bp
+					JOIN bookingPlanner bp ON bp.countryFk = su.countryFk
-						ON bp.countryFk = su.countryFk
+						AND bp.taxAreaFk = ata.areaFk
-							AND bp.taxAreaFk = ata.areaFk
+						AND bp.taxClassFk = itc.taxClassFk
-							AND bp.taxClassFk = itc.taxClassFk
 					JOIN pgc ON pgc.code = bp.pgcFk
 					JOIN taxClass tc ON tc.id = bp.taxClassFk
 				GROUP BY tmpTicket.ticketFk, pgc.code, pgc.rate
-				HAVING taxableBase <> 0) t3
+				HAVING taxableBase
+			) t3
 			ORDER BY priority;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketServiceTax;
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketServiceTax
-	CREATE TEMPORARY TABLE tmp.ticketServiceTax
 		(PRIMARY KEY (ticketFk, code, rate))
 		ENGINE = MEMORY
 		SELECT tt.ticketFk,
@@ -70,24 +71,22 @@ BEGIN
 				JOIN ticketService ts ON ts.ticketFk = tt.ticketFk
 				JOIN ticket t ON t.id = tt.ticketFk
 				JOIN supplier su ON su.id = t.companyFk
-				JOIN tmp.addressTaxArea ata
+				JOIN tmp.addressTaxArea ata ON ata.addressFk = t.addressFk
-					ON ata.addressFk = t.addressFk AND ata.companyFk = t.companyFk
+					AND ata.companyFk = t.companyFk
-				JOIN bookingPlanner bp
+				JOIN bookingPlanner bp ON bp.countryFk = su.countryFk
-					ON bp.countryFk = su.countryFk
+					AND bp.taxAreaFk = ata.areaFk
-						AND bp.taxAreaFk = ata.areaFk
+					AND bp.taxClassFk = ts.taxClassFk
-						AND bp.taxClassFk = ts.taxClassFk
 				JOIN pgc ON pgc.code = bp.pgcFk
 				JOIN taxClass tc ON tc.id = bp.taxClassFk
 			GROUP BY tt.ticketFk, pgc.code
-			HAVING taxableBase <> 0;
+			HAVING taxableBase;
 
 	INSERT INTO tmp.ticketTax (ticketFk, pgcFk, taxableBase, rate, code)
 		SELECT ts.ticketFk, ts.pgcFk, ts.taxableBase, ts.rate, ts.code
 			FROM tmp.ticketServiceTax ts
 	ON DUPLICATE KEY UPDATE ticketTax.taxableBase = VALUES (taxableBase) + ticketTax.taxableBase ;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketAmount;
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketAmount
-	CREATE TEMPORARY TABLE tmp.ticketAmount
 		(INDEX (ticketFk))
 		ENGINE = MEMORY
 		SELECT ticketFk, 
@@ -97,7 +96,8 @@ BEGIN
 			FROM tmp.ticketTax
 			GROUP BY ticketFk, code;
 
-	DROP TEMPORARY TABLE tmp.addressCompany;
+	DROP TEMPORARY TABLE
-	DROP TEMPORARY TABLE tmp.addressTaxArea;
+		tmp.addressCompany,
+		tmp.addressTaxArea;
 END$$
 DELIMITER ;

db/routines/vn/procedures/workerTimeControl_clockIn.sql

@@ -75,7 +75,7 @@ BEGIN
 
 	SET vDated = DATE(vTimed);
 
-	SELECT IF(pc.name = 'Conductor +3500kg',
+	SELECT IF(pc.code = 'driveCE',
 				wc.dayBreakDriver,
 				wc.dayBreak),
 			wc.shortWeekBreak,

db/routines/vn/triggers/saleLabel_afterUpdate.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`saleLabel_afterUpdate`
+	AFTER UPDATE ON `vn`.`saleLabel`
+	FOR EACH ROW
+IF NEW.stem >= (SELECT s.quantity FROM sale s WHERE s.id = NEW.saleFk) THEN
+	UPDATE sale s SET s.isPicked = TRUE WHERE s.id = NEW.saleFk;
+END IF$$
+DELIMITER ;

db/routines/vn/triggers/ticket_beforeUpdate.sql

@@ -4,7 +4,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticket_beforeUpdate`
 	FOR EACH ROW
 BEGIN
 	DECLARE vNewTime TIME;
-	DECLARE vHasTicketRefund BOOL;
 
 	SET NEW.editorFk = account.myUser_getId();
 
@@ -64,14 +63,5 @@ BEGIN
 
 		CALL vn.routeUpdateM3(NEW.routeFk);
 	END IF;
-
-	SELECT COUNT(*) INTO vHasTicketRefund 
-		FROM ticketRefund 
-		WHERE originalTicketFk = NEW.id 
-			OR refundTicketFk = NEW.id;
-	
-	IF vHasTicketRefund AND NEW.clientFk <> OLD.clientFk THEN
-		CALL util.throw('The ticket has a refund associated');
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/views/doc.sql

@@ -1,14 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`doc`
-AS SELECT `g`.`id` AS `id`,
-	`g`.`sref` AS `sref`,
-	`g`.`brief` AS `brief`,
-	`g`.`emp_id` AS `companyFk`,
-	`g`.`orden` AS `order`,
-	`g`.`file` AS `file`,
-	`g`.`original` AS `original`,
-	`g`.`trabajador_id` AS `workerFk`,
-	`g`.`odbc_date` AS `created`,
-	`g`.`warehouse_id` AS `warehouseFk`
-FROM `vn2008`.`gestdoc` `g`

db/routines/vn/views/exchangeInsuranceInPrevious.sql

@@ -1,9 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`exchangeInsuranceInPrevious`
-AS SELECT `ei`.`finished` AS `dated`,
-	`ei`.`amount` AS `amount`,
-	`ei`.`rate` AS `rate`
-FROM `vn`.`exchangeInsurance` `ei`
-WHERE `ei`.`amount` <> 0
-	AND `ei`.`financialProductTypefk` = 'SC'

db/routines/vn/views/unaryScanLineBuy.sql

@@ -1,6 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`unaryScanLineBuy`
-AS SELECT `u`.`scan_line_id` AS `unaryScanLineFk`,
-	`u`.`Id_Article` AS `itemFk`
-FROM `vn2008`.`unary_scan_line_buy` `u`

db/routines/vn/views/unaryScanLineExpedition.sql

@@ -1,6 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`unaryScanLineExpedition`
-AS SELECT `u`.`scan_line_id` AS `unaryScanLineFk`,
-	`u`.`expedition_id` AS `expeditionFk`
-FROM `vn2008`.`unary_scan_line_expedition` `u`

db/routines/vn2008/procedures/clean.sql

@@ -45,7 +45,6 @@ proc: BEGIN
 	DELETE FROM cl_main WHERE Fecha < vDate18;
 	DELETE FROM hedera.`order` WHERE date_send < vDate18;
 	DELETE FROM vn.message WHERE sendDate < vDate;
-	DELETE FROM travel_reserve WHERE odbc_date < vDate;
 
 	DELETE FROM cache.departure_limit WHERE Fecha < util.VN_CURDATE() - INTERVAL 1 MONTH;
 

db/routines/vn2008/triggers/movement_label_afterUpdate.sql

@@ -1,8 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn2008`.`movement_label_afterUpdate`
-	AFTER UPDATE ON `movement_label`
-	FOR EACH ROW
-IF NEW.stem >= (SELECT Cantidad FROM Movimientos WHERE Id_Movimiento = NEW.Id_Movimiento) THEN
-	UPDATE Movimientos SET OK = 1 WHERE Id_Movimiento = NEW.Id_Movimiento;
-END IF$$
-DELIMITER ;

db/routines/vn2008/views/credit.sql

@@ -1,9 +1,11 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
+    SQL SECURITY DEFINER
-	VIEW `vn2008`.`credit`
+    VIEW `vn2008`.`credit`
-AS SELECT `c`.`id` AS `id`,
+AS SELECT
-	`c`.`clientFk` AS `Id_Cliente`,
+    `c`.`id` AS `id`,
-	`c`.`workerFk` AS `Id_Trabajador`,
+    `c`.`clientFk` AS `Id_Cliente`,
-	`c`.`amount` AS `amount`,
+    `c`.`workerFk` AS `Id_Trabajador`,
-	`c`.`created` AS `odbc_date`
+    `c`.`amount` AS `amount`,
-FROM `vn`.`clientCredit` `c`
+    `c`.`created` AS `odbc_date`
+FROM
+    `vn`.`clientCredit` `c`

db/routines/vn2008/views/financialProductType.sql

@@ -0,0 +1,4 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+VIEW `vn2008`.`financialProductType`AS 
+    SELECT * FROM vn.financialProductType;

db/routines/vn2008/views/flight.sql

@@ -0,0 +1,13 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`flight` 
+AS SELECT
+	`f`.`id` AS `flight_id`,
+	`f`.`duration` AS `duration`,
+	`f`.`flightPath` AS `route`,
+	`f`.`days` AS `days`,
+	`f`.`airlineFk` AS `airline_id`,
+	`f`.`airportArrivalFk` AS `airport_out`,
+	`f`.`airportDepartureFk` AS `airport_in`
+FROM
+	`vn`.`flight` `f`;

db/routines/vn2008/views/gastos_resumen.sql

@@ -0,0 +1,11 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`gastos_resumen` 
+AS SELECT
+	`es`.`expenseFk` AS `Id_Gasto`,
+	`es`.`year` AS `year`,
+	`es`.`month` AS `month`,
+	`es`.`amount` AS `importe`,
+	`es`.`companyFk` AS `empresa_id`
+FROM
+	`vn`.`expenseManual` `es`;

db/routines/vn2008/views/integra2.sql

@@ -0,0 +1,9 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`integra2` 
+AS SELECT
+	`i2`.`postCode` AS `postal_code`,
+	`i2`.`frequency` AS `frequency`,
+	`i2`.`warehouseFk` AS `warehouse_id`
+FROM
+	`vn`.`integra2` `i2`;

db/routines/vn2008/views/integra2_province.sql

@@ -0,0 +1,8 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`integra2_province` 
+AS SELECT
+	`ip`.`provinceFk` AS `province_id`,
+	`ip`.`franchise` AS `franquicia`
+FROM
+	`vn`.`integra2Province` `ip`;

db/routines/vn2008/views/pago_sdc.sql

@@ -0,0 +1,16 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`pago_sdc`
+AS SELECT `ei`.`id` AS `pago_sdc_id`,
+	`ei`.`amount` AS `importe`,
+	`ei`.`dated` AS `fecha`,
+	`ei`.`dueDated` AS `vencimiento`,
+	`ei`.`entityFk` AS `entity_id`,
+	`ei`.`ref` AS `ref`,
+	`ei`.`rate` AS `rate`,
+	`ei`.`companyFk` AS `empresa_id`,
+	`ei`.`financialProductTypefk` AS `financialProductTypefk`,
+	`ei`.`upperBarrier` AS `upperBarrier`,
+	`ei`.`lowerBarrier` AS `lowerBarrier`,
+	`ei`.`strike` AS `strike`
+FROM `vn`.`exchangeInsurance` `ei`

db/routines/vn2008/views/versiones.sql

@@ -0,0 +1,8 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`versiones`
+AS SELECT `m`.`app` AS `programa`,
+	`m`.`version` AS `version`,
+	0 AS `critical`
+FROM `vn`.`mdbVersion` `m`
+WHERE `m`.`branchFk` = 'master'

db/routines/vn2008/views/warehouse_pickup.sql

@@ -0,0 +1,9 @@
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`warehouse_pickup` 
+AS SELECT
+	`wp`.`warehouseFk` AS `warehouse_id`,
+	`wp`.`agencyModeFk` AS `agency_id`
+FROM
+	`vn`.`warehousePickup` `wp`;

db/versions/10835-brownCarnation/00-firstScript.sql

@@ -81,10 +81,6 @@ ALTER TABLE IF EXISTS vn2008.MovimienRENAMEs_avisar__ COMMENT='refs #6371 deprec
 ALTER TABLE IF EXISTS vn2008.MovimienRENAMEs_revisar RENAME vn2008.MovimienRENAMEs_revisar__;
 ALTER TABLE IF EXISTS vn2008.MovimienRENAMEs_revisar__ COMMENT='refs #6371 deprecated 2024-01-11';
 
--- Para la tabla Proveedores_cargueras
-ALTER TABLE IF EXISTS vn2008.Proveedores_cargueras RENAME vn2008.Proveedores_cargueras__;
-ALTER TABLE IF EXISTS vn2008.Proveedores_cargueras__ COMMENT='refs #6371 deprecated 2024-01-11';
-
 -- Para la tabla Proveedores_comunicados
 ALTER TABLE IF EXISTS vn2008.Proveedores_comunicados RENAME vn2008.Proveedores_comunicados__;
 ALTER TABLE IF EXISTS vn2008.Proveedores_comunicados__ COMMENT='refs #6371 deprecated 2024-01-11';
@@ -101,10 +97,6 @@ ALTER TABLE IF EXISTS vn2008.Tickets_stack__ COMMENT='refs #6371 deprecated 2024
 ALTER TABLE IF EXISTS vn2008.Tipos_f11 RENAME vn2008.Tipos_f11__;
 ALTER TABLE IF EXISTS vn2008.Tipos_f11__ COMMENT='refs #6371 deprecated 2024-01-11';
 
--- Para la tabla Tramos
-ALTER TABLE IF EXISTS vn2008.Tramos RENAME vn2008.Tramos__;
-ALTER TABLE IF EXISTS vn2008.Tramos__ COMMENT='refs #6371 deprecated 2024-01-11';
-
 -- Para la tabla accion_dits
 ALTER TABLE IF EXISTS vn2008.accion_dits RENAME vn2008.accion_dits__;
 ALTER TABLE IF EXISTS vn2008.accion_dits__ COMMENT='refs #6371 deprecated 2024-01-11';
@@ -165,10 +157,6 @@ ALTER TABLE IF EXISTS vn2008.cyc__ COMMENT='refs #6371 deprecated 2024-01-11';
 ALTER TABLE IF EXISTS vn2008.cyc_declaration RENAME vn2008.cyc_declaration__;
 ALTER TABLE IF EXISTS vn2008.cyc_declaration__ COMMENT='refs #6371 deprecated 2024-01-11';
 
--- Para la tabla dock
-ALTER TABLE IF EXISTS vn2008.dock RENAME vn2008.dock__;
-ALTER TABLE IF EXISTS vn2008.dock__ COMMENT='refs #6371 deprecated 2024-01-11';
-
 -- Para la tabla edi_testigos
 ALTER TABLE IF EXISTS vn2008.edi_testigos RENAME vn2008.edi_testigos__;
 ALTER TABLE IF EXISTS vn2008.edi_testigos__ COMMENT='refs #6371 deprecated 2024-01-11';

db/versions/10862-navyHydrangea/00-alterAgencyTermConfig.sql

@@ -0,0 +1,3 @@
+USE vn;
+ALTER TABLE vn.agencyTermConfig
+    ADD CONSTRAINT agencyTermConfig_expense_FK FOREIGN KEY (expenseFk) REFERENCES vn.expense(id) ON DELETE RESTRICT ON UPDATE CASCADE;

db/versions/10862-navyHydrangea/00-alterGastosResumen.sql

@@ -0,0 +1,11 @@
+USE vn;
+
+ALTER TABLE vn2008.gastos_resumen MODIFY COLUMN Id_Gasto varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
+
+DELETE gr.*
+    FROM vn2008.gastos_resumen gr LEFT JOIN vn.expense e ON gr.Id_Gasto = e.id
+    WHERE e.id IS NULL;
+
+ALTER TABLE vn2008.gastos_resumen
+	ADD CONSTRAINT gastos_resumen_expense_FK
+	FOREIGN KEY (Id_Gasto) REFERENCES vn.expense(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/versions/10862-navyHydrangea/00-alterInvoiceOutTaxConfig.sql

@@ -0,0 +1,5 @@
+USE vn;
+ALTER TABLE vn.invoiceOutTaxConfig MODIFY COLUMN expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL;
+
+ALTER TABLE vn.invoiceOutTaxConfig
+    ADD CONSTRAINT invoiceOutTaxConfig_expense_FK FOREIGN KEY (expenseFk) REFERENCES vn.expense(id) ON DELETE RESTRICT ON UPDATE CASCADE;

db/versions/10862-navyHydrangea/00-alterItemGroupToOffer.sql

@@ -0,0 +1,5 @@
+USE edi;
+ALTER TABLE edi.item_groupToOffer MODIFY COLUMN expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT '7001000000' NULL;
+
+ALTER TABLE edi.item_groupToOffer
+    ADD CONSTRAINT item_groupToOffer_expense_FK FOREIGN KEY (expenseFk) REFERENCES vn.expense(id) ON DELETE RESTRICT ON UPDATE CASCADE;

db/versions/10862-navyHydrangea/01-ventasContablesPk.sql

@@ -0,0 +1,14 @@
+USE vn;
+-- Eliminar la clave primaria actual
+ALTER TABLE bs.ventas_contables DROP PRIMARY KEY;
+
+-- Agregar la nueva clave primaria incluyendo el campo `gasto`
+ALTER TABLE bs.ventas_contables ADD PRIMARY KEY (`year`, `month`, `grupo`, `reino_id`, `tipo_id`, `empresa_id`, `gasto`);
+
+DELETE vc.* FROM bs.ventas_contables vc LEFT JOIN vn.expense e ON e.id = vc.gasto WHERE e.id IS NULL;
+
+ALTER TABLE bs.ventas_contables
+    MODIFY COLUMN gasto VARCHAR(10)
+    CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
+
+ALTER TABLE bs.ventas_contables ADD CONSTRAINT ventas_contables_expense_FK FOREIGN KEY (gasto) REFERENCES vn.expense(id) ON DELETE RESTRICT ON UPDATE CASCADE;

db/versions/10862-navyHydrangea/02-updateExpenseRegularize.sql

@@ -0,0 +1,8 @@
+DELETE FROM vn.expense
+	WHERE id ='' AND id IS NULL AND isWithheld = FALSE;
+UPDATE vn.expense
+	SET id='7002090000'
+	WHERE id='7002009000';
+UPDATE vn.expense
+	SET id='7001090000'
+	WHERE id='7001009000';

db/versions/10862-navyHydrangea/03-updateExpense.sql

@@ -0,0 +1,44 @@
+UPDATE vn.expense
+SET id = CASE id
+    WHEN 7000010000 THEN 7001001000
+    WHEN 7000020000 THEN 7001002000
+    WHEN 7000030000 THEN 7001003000
+    WHEN 7000040000 THEN 7001004000
+    WHEN 7000050000 THEN 7001005000
+    WHEN 7000060000 THEN 7001006000
+    WHEN 7000070000 THEN 7001007000
+    WHEN 7002060000 THEN 7001206000
+    WHEN 7002070000 THEN 7001207000
+    WHEN 7002030000 THEN 7001203000
+    WHEN 7002040000 THEN 7001204000
+    WHEN 7002050000 THEN 7001205000
+    WHEN 7002020000 THEN 7001202000
+    WHEN 7002010000 THEN 7001201000
+    WHEN 7001060000 THEN 7001106000
+    WHEN 7001070000 THEN 7001107000
+    WHEN 7001030000 THEN 7001103000
+    WHEN 7001040000 THEN 7001104000
+    WHEN 7001050000 THEN 7001105000
+    WHEN 7001020000 THEN 7001102000
+    WHEN 7001010000 THEN 7001101000
+    WHEN 7000080000 THEN 7040008000
+    WHEN 7001080000 THEN 7000108000
+    WHEN 7002080000 THEN 7001208000
+    WHEN 7000090000 THEN 7001009000
+    WHEN 7002090000 THEN 7001209000
+    WHEN 7002100000 THEN 7001210000
+    WHEN 7001090000 THEN 7001109000
+    WHEN 7001100000 THEN 7001110000
+    WHEN 7000120000 THEN 7001012000
+    WHEN 7002120000 THEN 7001212000
+    WHEN 7000130000 THEN 7001013000
+    WHEN 7000140000 THEN 7001014000
+    ELSE id
+END
+WHERE id IN (7000010000, 7000020000, 7000030000, 7000040000, 7000050000,
+             7000060000, 7000070000, 7002060000, 7002070000, 7002030000,
+             7002040000, 7002050000, 7002020000, 7002010000, 7001060000,
+             7001070000, 7001030000, 7001040000, 7001050000, 7001020000,
+			7001010000, 7000080000, 7001080000, 7002080000, 7000090000,
+			7002090000, 7002100000, 7001090000, 7001100000,
+			7000120000, 7002120000, 7000130000, 7000140000);

db/versions/10862-navyHydrangea/04-updateExpenseConflict.sql

@@ -0,0 +1,6 @@
+UPDATE vn.expense
+SET id = CASE id
+    WHEN 7000100000 THEN 7001010000
+    ELSE id
+END
+WHERE id IN (7000100000);

db/versions/10885-wheatHydrangea/00-revokeUpdateClient.sql

@@ -0,0 +1,37 @@
+REVOKE UPDATE ON vn.ticket FROM employee;
+
+GRANT UPDATE (id,
+            warehouseFk,
+            shipped,
+            nickname,
+            refFk,
+            addressFk,
+            workerFk,
+            observations,
+            isSigned,
+            isLabeled,
+            isPrinted,
+            packages,
+            location,
+            hour,
+            created,
+            isBlocked,
+            solution,
+            routeFk,
+            priority,
+            hasPriority,
+            companyFk,
+            agencyModeFk,
+            landed,
+            isBoxed,
+            isDeleted,
+            zoneFk,
+            zonePrice,
+            zoneBonus,
+            totalWithVat,
+            totalWithoutVat,
+            weight,
+            clonedFrom,
+            cmrFk,
+            editorFk)
+        ON vn.ticket TO employee;

db/versions/10888-brownBirch/00-firstScript.sql

@@ -0,0 +1,6 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+    SQL SECURITY DEFINER
+VIEW `vn2008`.`credit`AS
+    SELECT 1; 
+
+GRANT SELECT ON TABLE vn2008.credit TO financialBoss;

db/versions/10890-redOrchid/00-firstScript.sql

@@ -0,0 +1,3 @@
+-- Place your SQL code here
+INSERT INTO salix.ACL  (model, property, accessType, permission, principalType, principalId) 
+VALUES( 'Ticket', 'myLastModified', '*', 'ALLOW', 'ROLE', 'production');

db/versions/10896-salmonOrchid/01-financialProductType.sql

@@ -0,0 +1 @@
+ALTER TABLE IF EXISTS `vn2008`.`financialProductType` RENAME `vn`.`financialProductType`;

db/versions/10896-salmonOrchid/02-flight.sql

@@ -0,0 +1,8 @@
+ALTER TABLE IF EXISTS `vn2008`.`flight` RENAME `vn`.`flight`;
+
+ALTER TABLE IF EXISTS `vn`.`flight` 
+CHANGE COLUMN IF EXISTS `flight_id` `id` varchar(10) NOT NULL,
+CHANGE COLUMN IF EXISTS `airline_id` `airlineFk` smallint(2) unsigned DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `route` `flightPath` varchar(20) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `airport_out` `airportArrivalFk` varchar(3) NOT NULL,
+CHANGE COLUMN IF EXISTS `airport_in` `airportDepartureFk` varchar(3) NOT NULL;

db/versions/10896-salmonOrchid/03-gastos_resumen.sql

@@ -0,0 +1,33 @@
+ALTER TABLE IF EXISTS vn2008.gastos_resumen DROP FOREIGN KEY IF EXISTS gastos_resumen_expense_FK;
+ALTER TABLE IF EXISTS `vn2008`.`gastos_resumen` RENAME `vn`.`expenseManual`;
+
+ALTER TABLE `vn`.`expenseManual` 
+CHANGE COLUMN IF EXISTS `Id_Gasto` `expenseFk` varchar(10) NOT NULL,
+CHANGE COLUMN IF EXISTS `importe` `amount` decimal(10,2) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `empresa_id` `companyFk` int(11) NOT NULL;
+
+ALTER TABLE vn.expenseManual COLLATE=utf8mb3_general_ci;
+
+ALTER TABLE vn.expenseManual MODIFY COLUMN IF EXISTS expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
+
+ALTER TABLE vn.expenseManual DROP PRIMARY KEY;
+
+ALTER TABLE vn.expenseManual MODIFY COLUMN companyFk int(10) unsigned NULL;
+
+ALTER TABLE vn.expenseManual ADD CONSTRAINT expenseManual_expense_FK FOREIGN KEY IF NOT EXISTS (expenseFk) REFERENCES vn.expense(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE vn.expenseManual ADD CONSTRAINT expenseManual_company_FK FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE vn.expenseManual ADD IF NOT EXISTS id INT unsigned NOT NULL FIRST;
+
+ALTER TABLE vn.expenseManual ADD CONSTRAINT expenseManual_pk PRIMARY KEY IF NOT EXISTS (id);
+
+ALTER TABLE vn.expenseManual ADD CONSTRAINT expenseManual_unique UNIQUE KEY IF NOT EXISTS (expenseFk,`year`,`month`,companyFk);
+
+ALTER TABLE vn.expenseManual MODIFY COLUMN IF EXISTS companyFk int(10) unsigned NOT NULL;
+
+UPDATE vn.expenseManual 
+	SET companyFK= NULL 
+	WHERE companyFk= 0;
+
+

db/versions/10896-salmonOrchid/04-integra2.sql

@@ -0,0 +1,10 @@
+ALTER TABLE IF EXISTS `vn2008`.`integra2` RENAME `vn`.`integra2`;
+
+ALTER TABLE IF EXISTS `vn`.`integra2` 
+CHANGE COLUMN IF EXISTS `postal_code` `postCode` varchar(10) NOT NULL,
+CHANGE COLUMN IF EXISTS `frequency` `frequency` decimal(10,2) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `warehouse_id` `warehouseFk` smallint(6) unsigned NOT NULL;
+
+ALTER TABLE IF EXISTS vn.integra2 ADD CONSTRAINT integra2_warehouse_FK 
+FOREIGN KEY (warehouseFk) REFERENCES vn.warehouse(id) ON DELETE CASCADE ON UPDATE CASCADE;
+

db/versions/10896-salmonOrchid/05-integra2_province.sql

@@ -0,0 +1,4 @@
+ALTER TABLE IF EXISTS `vn2008`.`integra2_province` RENAME `vn`.`integra2Province`;
+ALTER TABLE IF EXISTS `vn`.`integra2Province` 
+CHANGE COLUMN IF EXISTS `franquicia` `franchise` varchar(65) NOT NULL,
+CHANGE COLUMN IF EXISTS `province_id` `provinceFk` smallint(6) unsigned NOT NULL;

db/versions/10896-salmonOrchid/06-intervalos__delete.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS vn2008.intervalos__;

db/versions/10896-salmonOrchid/10-mail_templates__delete.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS vn2008.mail_templates__;

db/versions/10896-salmonOrchid/12-ticket_location__delete.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS vn2008.ticket_location__;

db/versions/10896-salmonOrchid/13-turn__delete.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS vn2008.turn__;

db/versions/10896-salmonOrchid/14-movement_label.sql

@@ -0,0 +1,8 @@
+DROP TRIGGER IF EXISTS `vn2008`.`movement_label_afterUpdate`;
+
+DROP VIEW IF EXISTS `vn`.`saleLabel`;
+
+ALTER TABLE IF EXISTS `vn2008`.`movement_label` RENAME `vn`.`saleLabel`;
+
+ALTER TABLE IF EXISTS `vn`.`saleLabel` 
+CHANGE COLUMN IF EXISTS `Id_movimiento` `saleFk` int(11) NOT NULL;

db/versions/10896-salmonOrchid/15-pago_sdc.sql

@@ -0,0 +1,11 @@
+DROP VIEW IF EXISTS `vn`.`exchangeInsurance`;
+
+ALTER TABLE IF EXISTS `vn2008`.`pago_sdc` RENAME `vn`.`exchangeInsurance`;
+
+ALTER TABLE IF EXISTS `vn`.`exchangeInsurance` 
+CHANGE COLUMN IF EXISTS `pago_sdc_id` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN IF EXISTS `importe` `amount` decimal(10,2) NOT NULL,
+CHANGE COLUMN IF EXISTS `fecha` `dated` date NOT NULL,
+CHANGE COLUMN IF EXISTS `vencimiento` `dueDated` date NOT NULL,
+CHANGE COLUMN IF EXISTS `entity_id` `entityFk` int(10) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `empresa_id` `companyFk`int(10) unsigned NOT NULL DEFAULT 442;

db/versions/10896-salmonOrchid/25-warehouse_pickup.sql

@@ -0,0 +1,7 @@
+ALTER TABLE IF EXISTS `vn2008`.`warehouse_pickup` RENAME `vn`.`warehousePickup`;
+
+ALTER TABLE IF EXISTS `vn`.`warehousePickup` 
+CHANGE COLUMN IF EXISTS `warehouse_id` `warehouseFk` smallint(5) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `agency_id` `agencyModeFk` int(11) DEFAULT NULL;
+
+ALTER TABLE `vn`.`warehousePickup` COMMENT='Agencia de recogida para cada almacén';

db/versions/10896-salmonOrchid/29-kk.sql

@@ -0,0 +1,155 @@
+ALTER TABLE IF EXISTS vn2008.template_bionic_component RENAME vn2008.template_bionic_component__;
+ALTER TABLE IF EXISTS vn2008.template_bionic_component__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.template_bionic_lot RENAME vn2008.template_bionic_lot__;
+ALTER TABLE IF EXISTS vn2008.template_bionic_lot__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.template_bionic_price RENAME vn2008.template_bionic_price__;
+ALTER TABLE IF EXISTS vn2008.template_bionic_price__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.tmpNEWTARIFAS RENAME vn2008.tmpNEWTARIFAS__;
+ALTER TABLE IF EXISTS vn2008.tmpNEWTARIFAS__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.unaryScanFilter RENAME vn2008.unaryScanFilter__;
+ALTER TABLE IF EXISTS vn2008.unaryScanFilter__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.unary_source RENAME vn2008.unary_source__;
+ALTER TABLE IF EXISTS vn2008.unary_source__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.viaxpress RENAME vn2008.viaxpress__;
+ALTER TABLE IF EXISTS vn2008.viaxpress__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.warehouse_filtro RENAME vn2008.warehouse_filtro__;
+ALTER TABLE IF EXISTS vn2008.warehouse_filtro__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.warehouse_group RENAME vn2008.warehouse_group__;
+ALTER TABLE IF EXISTS vn2008.warehouse_group__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.warehouse_joined RENAME vn2008.warehouse_joined__;
+ALTER TABLE IF EXISTS vn2008.warehouse_joined__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.warehouse_lc RENAME vn2008.warehouse_lc__;
+ALTER TABLE IF EXISTS vn2008.warehouse_lc__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.wh_selection RENAME vn2008.wh_selection__;
+ALTER TABLE IF EXISTS vn2008.wh_selection__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.trolley RENAME vn2008.trolley__;
+ALTER TABLE IF EXISTS vn2008.trolley__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.zones RENAME vn2008.zones__;
+ALTER TABLE IF EXISTS vn2008.zones__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.tblIVA RENAME vn2008.tblIVA__;
+ALTER TABLE IF EXISTS vn2008.tblIVA__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.filtros RENAME vn2008.filtros__;
+ALTER TABLE IF EXISTS vn2008.filtros__ COMMENT='refs #6372 @deprecated 2023-11-21;';
+
+ALTER TABLE IF EXISTS vn2008.form_query RENAME vn2008.form_query__;
+ALTER TABLE IF EXISTS vn2008.form_query__ COMMENT='refs #6372 @deprecated 2023-11-21;';
+
+ALTER TABLE IF EXISTS vn2008.guillen RENAME vn2008.guillen__;
+ALTER TABLE IF EXISTS vn2008.guillen__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.guillen_carry RENAME vn2008.guillen_carry__;
+ALTER TABLE IF EXISTS vn2008.guillen_carry__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.integra2_escala RENAME vn2008.integra2_escala__;
+ALTER TABLE IF EXISTS vn2008.integra2_escala__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.invoice_observation RENAME vn2008.invoice_observation__;
+ALTER TABLE IF EXISTS vn2008.invoice_observation__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.nichos RENAME vn2008.nichos__;
+ALTER TABLE IF EXISTS vn2008.nichos__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.payroll_bonificaciones RENAME vn2008.payroll_bonificaciones__;
+ALTER TABLE IF EXISTS vn2008.payroll_bonificaciones__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.payroll_datos RENAME vn2008.payroll_datos__;
+ALTER TABLE IF EXISTS vn2008.payroll_datos__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.payroll_embargos RENAME vn2008.payroll_embargos__;
+ALTER TABLE IF EXISTS vn2008.payroll_embargos__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.payroll_tipobasess RENAME vn2008.payroll_tipobasess__;
+ALTER TABLE IF EXISTS vn2008.payroll_tipobasess__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.preparation_exception RENAME vn2008.preparation_exception__;
+ALTER TABLE IF EXISTS vn2008.preparation_exception__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.payrroll_apEmpresarial RENAME vn2008.payrroll_apEmpresarial__;
+ALTER TABLE IF EXISTS vn2008.payrroll_apEmpresarial__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.rec_translator RENAME vn2008.rec_translator__;
+ALTER TABLE IF EXISTS vn2008.rec_translator__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.recibida_agricola RENAME vn2008.recibida_agricola__;
+ALTER TABLE IF EXISTS vn2008.recibida_agricola__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.rounding RENAME vn2008.rounding__;
+ALTER TABLE IF EXISTS vn2008.rounding__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.scanTree RENAME vn2008.scanTree__;
+ALTER TABLE IF EXISTS vn2008.scanTree__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.sort_merge_results_ernesto RENAME vn2008.sort_merge_results_ernesto__;
+ALTER TABLE IF EXISTS vn2008.sort_merge_results_ernesto__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.route RENAME vn2008.route__;
+ALTER TABLE IF EXISTS vn2008.route__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.travel_reserve RENAME vn2008.travel_reserve__;
+ALTER TABLE IF EXISTS vn2008.travel_reserve__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.wks RENAME vn2008.wks__;
+ALTER TABLE IF EXISTS vn2008.wks__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.unary RENAME vn2008.unary__;
+ALTER TABLE IF EXISTS vn2008.unary__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.unary_scan RENAME vn2008.unary_scan__;
+ALTER TABLE IF EXISTS vn2008.unary_scan__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.unary_scan_line RENAME vn2008.unary_scan_line__;
+ALTER TABLE IF EXISTS vn2008.unary_scan_line__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.unary_scan_line_buy RENAME vn2008.unary_scan_line_buy__;
+ALTER TABLE IF EXISTS vn2008.unary_scan_line_buy__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.unary_scan_line_expedition RENAME vn2008.unary_scan_line_expedition__;
+ALTER TABLE IF EXISTS vn2008.unary_scan_line_expedition__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.widget RENAME vn2008.widget__;
+ALTER TABLE IF EXISTS vn2008.widget__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.scan RENAME vn2008.scan__;
+ALTER TABLE IF EXISTS vn2008.scan__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.scan_line RENAME vn2008.scan_line__;
+ALTER TABLE IF EXISTS vn2008.scan_line__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.tipsa RENAME vn2008.tipsa__;
+ALTER TABLE IF EXISTS vn2008.tipsa__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.payroll_basess RENAME vn2008.payroll_basess__;
+ALTER TABLE IF EXISTS vn2008.payroll_basess__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.pago_sdc RENAME vn2008.pago_sdc__;
+ALTER TABLE IF EXISTS vn2008.pago_sdc__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.transport RENAME vn2008.transport__;
+ALTER TABLE IF EXISTS vn2008.transport__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.travel_pattern RENAME vn2008.travel_pattern__;
+ALTER TABLE IF EXISTS vn2008.travel_pattern__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.jerarquia RENAME vn2008.jerarquia__;
+ALTER TABLE IF EXISTS vn2008.jerarquia__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.language RENAME vn2008.language__;
+ALTER TABLE IF EXISTS vn2008.language__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.link RENAME vn2008.link__;
+ALTER TABLE IF EXISTS vn2008.link__ COMMENT='refs #6372 @deprecated 2023-12-13;';

db/versions/10896-salmonOrchid/30-permissions.sql

@@ -0,0 +1,32 @@
+-- flight
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+VIEW `vn2008`.`flight` AS 
+    SELECT 1;
+GRANT SELECT, INSERT, UPDATE ON TABLE vn2008.flight TO `logistic`;
+GRANT SELECT, INSERT, UPDATE ON TABLE vn.flight TO `logistic`;
+-- integra2_province
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+VIEW `vn2008`.`integra2_province` AS 
+    SELECT 1;
+GRANT SELECT ON TABLE vn2008.integra2_province TO `employee`;
+GRANT SELECT ON TABLE vn.integra2Province TO `employee`;
+-- link
+
+GRANT SELECT ON TABLE vn.company TO `administrative`;
+GRANT SELECT ON TABLE vn.company TO `hr`;
+
+-- warehouse_pickup
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+VIEW `vn2008`.`warehouse_pickup` AS 
+    SELECT 1;
+GRANT SELECT ON TABLE vn2008.warehouse_pickup TO `logistic`;
+GRANT SELECT ON TABLE vn.warehousePickup TO `logistic`;
+GRANT SELECT ON TABLE vn2008.warehouse_pickup TO `claimManager`;
+GRANT SELECT ON TABLE vn.warehousePickup TO `claimManager`;
+GRANT SELECT ON TABLE vn2008.warehouse_pickup TO `employee`;
+GRANT SELECT ON TABLE vn.warehousePickup TO `employee`;
+GRANT SELECT ON TABLE vn2008.warehouse_pickup TO `deliveryAssistant`;
+GRANT SELECT ON TABLE vn.warehousePickup TO `deliveryAssistant`;

db/versions/10898-workerActivity/00-table.sql

@@ -0,0 +1,13 @@
+-- Place your SQL code here
+CREATE TABLE vn.workerActivity (
+id INT PRIMARY KEY AUTO_INCREMENT,
+created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+model ENUM('COM', 'ENT', 'TPV', 'ENC', 'LAB', 'ETI') NOT NULL,
+workerFk INT(10) UNSIGNED NOT NULL,
+event ENUM('open', 'close', 'insert', 'delete', 'update', 'refresh') NOT NULL,
+description VARCHAR(255) DEFAULT NULL,
+CONSTRAINT fk_workerActivity_worker FOREIGN KEY (workerFk)
+	REFERENCES vn.worker (id)
+	ON DELETE CASCADE
+	ON UPDATE CASCADE
+);

db/versions/10903-pinkIvy/00-professionalCategoryAddCode.sql

@@ -0,0 +1,6 @@
+ALTER TABLE vn.professionalCategory DROP COLUMN IF EXISTS code;
+ALTER TABLE IF EXISTS vn.professionalCategory ADD COLUMN code VARCHAR(25) DEFAULT NULL;
+
+UPDATE vn.professionalCategory
+    SET code = 'driverCE'
+    WHERE name = 'Conductor C + E';

modules/client/back/methods/client/setRating.js

@@ -28,7 +28,6 @@ module.exports = Self => {
     Self.setRating = async function(ctx, id, rating, recommendedCredit, options) {
         let tx;
         const myOptions = {};
-
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
@@ -42,6 +41,7 @@ module.exports = Self => {
             const clientUpdated = await client.updateAttributes({
                 rating: rating,
                 recommendedCredit: recommendedCredit
+
             }, myOptions);
 
             if (tx) await tx.commit();

modules/client/back/methods/client/specs/setRating.spec.js

@@ -40,4 +40,26 @@ describe('Client setRating()', () => {
             throw e;
         }
     });
+
+    it('should change rating and recommendedCredit to 0', async() => {
+        const tx = await models.Ticket.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const clientId = 1101;
+            const newRating = 0;
+            const newRecommendedCredit = 0;
+
+            const updatedClient = await models.Client.setRating(ctx, clientId, newRating, newRecommendedCredit, options);
+
+            expect(updatedClient.rating).toEqual(newRating);
+            expect(updatedClient.recommendedCredit).toEqual(newRecommendedCredit);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
 });

modules/client/back/models/client.js

@@ -319,7 +319,8 @@ module.exports = Self => {
             await Self.changeCredit(ctx, finalState, changes);
 
         // Credit management changes
-        if (changes?.rating || changes?.recommendedCredit)
+
+        if (changes?.rating >= 0 || changes?.recommendedCredit >= 0)
             await Self.changeCreditManagement(ctx, finalState, changes);
 
         const oldInstance = {};

modules/invoiceOut/back/methods/invoiceOut/negativeBases.js

@@ -46,23 +46,19 @@ module.exports = Self => {
 
         const stmts = [];
         let stmt;
-        stmts.push(`DROP TEMPORARY TABLE IF EXISTS tmp.ticket`);
-
         stmts.push(new ParameterizedSQL(
-            `CREATE TEMPORARY TABLE tmp.ticket
+            `CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
                 (KEY (ticketFk))
                 ENGINE = MEMORY
                 SELECT id ticketFk
                     FROM ticket t
-                    WHERE shipped BETWEEN ? AND ?
+                    WHERE shipped BETWEEN ? AND util.dayEnd(?)
                         AND refFk IS NULL`, [args.from, args.to]));
         stmts.push(`CALL vn.ticket_getTax(NULL)`);
-        stmts.push(`DROP TEMPORARY TABLE IF EXISTS tmp.filter`);
         stmts.push(new ParameterizedSQL(
-            `CREATE TEMPORARY TABLE tmp.filter
+            `CREATE OR REPLACE TEMPORARY TABLE tmp.filter
                 ENGINE = MEMORY
-                SELECT
+                SELECT co.code company,
-                        co.code company,
                         cou.country,
                         c.id clientId,
                         c.socialName clientSocialName,
@@ -75,28 +71,26 @@ module.exports = Self => {
                         c.isTaxDataChecked,
                         w.id comercialId,
                         CONCAT(w.firstName, ' ', w.lastName) comercialName
-                        FROM vn.ticket t
+                    FROM vn.ticket t
-                            JOIN vn.company co ON co.id = t.companyFk
+                        JOIN vn.company co ON co.id = t.companyFk
-                            JOIN vn.sale s ON s.ticketFk = t.id
+                        JOIN vn.sale s ON s.ticketFk = t.id
-                            JOIN vn.client c ON c.id = t.clientFk
+                        JOIN vn.client c ON c.id = t.clientFk
-                            JOIN vn.country cou ON cou.id = c.countryFk
+                        JOIN vn.country cou ON cou.id = c.countryFk
-                            LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
+                        LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
-                            JOIN account.user u ON u.id = w.id
+                        JOIN account.user u ON u.id = w.id
-                            LEFT JOIN (
+                        LEFT JOIN (
-                                SELECT ticketFk, taxableBase
+                            SELECT ticketFk, taxableBase
-                                    FROM tmp.ticketAmount
+                                FROM tmp.ticketAmount
-                                    GROUP BY ticketFk
+                                GROUP BY ticketFk
-                                    HAVING taxableBase < 0
+                                HAVING taxableBase < 0
-                            ) negativeBase ON negativeBase.ticketFk = t.id
+                        ) negativeBase ON negativeBase.ticketFk = t.id
-                        WHERE t.shipped BETWEEN ? AND ?
+                    WHERE t.shipped BETWEEN ? AND util.dayEnd(?)
-                            AND t.refFk IS NULL
+                        AND t.refFk IS NULL
-                            AND c.typeFk IN ('normal','trust')
+                        AND c.typeFk IN ('normal','trust')
-                        GROUP BY t.clientFk, negativeBase.taxableBase
+                    GROUP BY t.clientFk, negativeBase.taxableBase
-                        HAVING amount < 0`, [args.from, args.to]));
+                    HAVING amount < 0`, [args.from, args.to]));
 
-        stmt = new ParameterizedSQL(`
+        stmt = new ParameterizedSQL(`SELECT * FROM tmp.filter`);
-            SELECT f.*
-            FROM tmp.filter f`);
 
         if (args.filter) {
             stmt.merge(conn.makeWhere(args.filter.where));

modules/item/back/methods/item-shelving/specs/addListByItem.spec.js

@@ -0,0 +1,55 @@
+const {models} = require('vn-loopback/server/server');
+const LoopBackContext = require('loopback-context');
+
+describe('ItemShelving upsertItem()', () => {
+    const warehouseFk = 1;
+    let ctx;
+    let options;
+    let tx;
+
+    beforeEach(async() => {
+        ctx = {
+            req: {
+                accessToken: {userId: 9},
+                headers: {origin: 'http://localhost'}
+            },
+            args: {}
+        };
+
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: ctx.req
+        });
+
+        options = {transaction: tx};
+        tx = await models.ItemShelving.beginTransaction({});
+        options.transaction = tx;
+    });
+
+    afterEach(async() => {
+        await tx.rollback();
+    });
+
+    it('should add two new records', async() => {
+        const shelvingFk = 'ZPP';
+        const items = [1, 1, 1, 2];
+
+        await models.ItemShelving.upsertItem(ctx, shelvingFk, items, warehouseFk, options);
+        const itemShelvings = await models.ItemShelving.find({where: {shelvingFk}}, options);
+
+        expect(itemShelvings.length).toEqual(2);
+    });
+
+    it('should update the visible items', async() => {
+        const shelvingFk = 'GVC';
+        const items = [2, 2];
+        const {visible: itemsBefore} = await models.ItemShelving.findOne({
+            where: {shelvingFk, itemFk: items[0]}
+        }, options);
+        await models.ItemShelving.upsertItem(ctx, shelvingFk, items, warehouseFk, options);
+        const {visible: itemsAfter} = await models.ItemShelving.findOne({
+            where: {shelvingFk, itemFk: items[0]}
+        }, options);
+
+        expect(itemsAfter).toEqual(itemsBefore + 2);
+    });
+});

modules/item/back/methods/item-shelving/upsertItem.js

@@ -0,0 +1,64 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('upsertItem', {
+        description: 'Add a record or update it if it already exists.',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'shelvingFk',
+            type: 'string',
+            required: true,
+        },
+        {
+            arg: 'items',
+            type: ['number'],
+            required: true,
+            description: 'array of item foreign keys'
+        },
+        {
+            arg: 'warehouseFk',
+            type: 'number',
+            required: true
+        }],
+
+        http: {
+            path: `/upsertItem`,
+            verb: 'POST'
+        }
+    });
+
+    Self.upsertItem = async(ctx, shelvingFk, items, warehouseFk, options) => {
+        const myOptions = {userId: ctx.req.accessToken.userId};
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        const discardItems = new Set();
+        const itemCounts = items.reduce((acc, item) => {
+            acc[item] = (acc[item] || 0) + 1;
+            return acc;
+        }, {});
+
+        try {
+            for (let item of items) {
+                if (!discardItems.has(item)) {
+                    let quantity = itemCounts[item];
+                    discardItems.add(item);
+
+                    await Self.rawSql('CALL vn.itemShelving_add(?, ?, ?, NULL, NULL, NULL, ?)',
+                        [shelvingFk, item, quantity, warehouseFk], myOptions
+                    );
+                }
+            }
+
+            if (tx) await tx.commit();
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};

modules/item/back/models/item-shelving.js

@@ -1,4 +1,5 @@
 module.exports = Self => {
     require('../methods/item-shelving/deleteItemShelvings')(Self);
+    require('../methods/item-shelving/upsertItem')(Self);
     require('../methods/item-shelving/getInventory')(Self);
 };

modules/ticket/back/methods/sale/specs/usesMana.spec.js

@@ -1,11 +1,7 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('sale usesMana()', () => {
-    const ctx = {
+    const ctx = {req: { accessToken: {userId: 18}}};
-        req: {
-            accessToken: {userId: 18}
-        }
-    };
 
     it('should return that the worker uses mana', async() => {
         const tx = await models.Sale.beginTransaction({});
@@ -45,4 +41,27 @@ describe('sale usesMana()', () => {
             throw e;
         }
     });
+
+    it('should return that the worker does not use mana because it is excluded', async() => {
+        const tx = await models.Sale.beginTransaction({});
+        const buyerId = 35;
+        const franceDepartmentId = 133;
+        const buyerCtx = {req: {accessToken: {userId: buyerId}}};
+
+        try {
+            const options = {transaction: tx}
+
+            await models.WorkerManaExcluded.create({workerFk: buyerId}, options);
+            await models.Business.updateAll({workerFk: buyerId}, {departmentFk: franceDepartmentId}, options);
+
+            const usesMana = await models.Sale.usesMana(buyerCtx, options);
+
+            expect(usesMana).toBe(false);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
 });

modules/ticket/back/methods/sale/usesMana.js

@@ -21,6 +21,9 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
+        const isManaExcluded = await models.WorkerManaExcluded.findById(userId, null, myOptions);
+        if (isManaExcluded) return false;
+
         const salesDepartment = await models.Department.findOne({where: {code: 'VT'}, fields: 'id'}, myOptions);
         const departments = await models.Department.getLeaves(ctx, salesDepartment.id, null, myOptions);
         const workerDepartment = await models.WorkerDepartment.findById(userId, null, myOptions);

modules/ticket/back/methods/ticket/myLastModified.js

@@ -0,0 +1,25 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('myLastModified', {
+        description: 'Get list of last tickets which user has modified',
+        accessType: 'READ',
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/myLastModified`,
+            verb: 'GET'
+        }
+    });
+
+    Self.myLastModified = async ctx => {
+        const userId = ctx.req.accessToken.userId;
+        const query =
+            `SELECT ticketFk, MAX(created) created
+                FROM ticketTracking tt 
+                WHERE tt.userFk = ?
+                GROUP BY ticketFk
+                LIMIT 5;`;
+        return await Self.rawSql(query, [userId]);
+    };
+};

modules/ticket/back/methods/ticket/saveSign.js

@@ -33,8 +33,8 @@ module.exports = Self => {
         const models = Self.app.models;
         const myOptions = {userId: ctx.req.accessToken.userId};
         let tx;
-        let ticket;
+        let dms;
-        let externalTickets = [];
+        let gestDocCreated = false;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -44,11 +44,6 @@ module.exports = Self => {
             myOptions.transaction = tx;
         }
 
-        const dmsTypeTicket = await models.DmsType.findOne({
-            where: {code: 'ticket'},
-            fields: ['id']
-        }, myOptions);
-
         async function setLocation(ticketId) {
             await models.Delivery.create({
                 ticketFk: ticketId,
@@ -58,106 +53,102 @@ module.exports = Self => {
             }, myOptions);
         }
 
-        async function hasSignDms(ticketId) {
+        async function gestDocExists(ticketId) {
             const ticketDms = await models.TicketDms.findOne({
                 where: {ticketFk: ticketId},
-                include: [
+                fields: ['dmsFk']
-                    {
-                        relation: 'dms',
-                        fields: ['id'],
-                        scope: {
-                            where: {dmsTypeFk: dmsTypeTicket.id}
-                        }
-                    }
-                ]
             }, myOptions);
-            if (ticketDms?.dms()?.id) return true;
+
+            if (!ticketDms) return false;
+
+            const ticket = await models.Ticket.findById(ticketId, {fields: ['isSigned']}, myOptions);
+            if (ticket.isSigned == true)
+                return true;
+            else
+                await models.Dms.destroyAll({where: {reference: ticketId}}, myOptions);
+
+            return false;
         }
 
-        async function createGestDoc() {
+        async function createGestDoc(id) {
+            const ticket = await models.Ticket.findById(id,
+                {
+                    include: [
+                        {
+                            relation: 'warehouse',
+                            scope: {
+                                fields: ['id']
+                            }
+                        }, {
+                            relation: 'client',
+                            scope: {
+                                fields: ['name']
+                            }
+                        }, {
+                            relation: 'route',
+                            scope: {
+                                fields: ['id']
+                            }
+                        }
+                    ]
+                }, myOptions);
+            const dmsType = await models.DmsType.findOne({where: {code: 'Ticket'}, fields: ['id']}, myOptions);
             const ctxUploadFile = Object.assign({}, ctx);
+            if (ticket.route() === null)
+                throw new UserError('Ticket without route');
             ctxUploadFile.args = {
                 warehouseId: ticket.warehouseFk,
                 companyId: ticket.companyFk,
-                dmsTypeId: dmsTypeTicket.id,
+                dmsTypeId: dmsType.id,
-                reference: ticket.id,
+                reference: '',
                 description: `Firma del cliente - Ruta ${ticket.route().id}`,
-                contentType: 'image/png',
+                hasFile: false
-                hasFile: true
             };
-            const dms = await models.Dms.uploadFile(ctxUploadFile, myOptions);
+            dms = await models.Dms.uploadFile(ctxUploadFile, myOptions);
-            await models.TicketDms.create({ticketFk: ticket.id, dmsFk: dms[0].id}, myOptions);
+            gestDocCreated = true;
         }
 
         try {
             for (const ticketId of tickets) {
-                ticket = await models.Ticket.findById(ticketId, {
+                const ticketState = await models.TicketState.findOne(
-                    include: [{
+                    {where: {ticketFk: ticketId},
-                        relation: 'address',
+                        fields: ['alertLevel']
-                        scope: {
+                    }, myOptions);
-                            include: {
-                                relation: 'province',
-                                scope: {
-                                    include: {
-                                        relation: 'country',
-                                        scope: {
-                                            fields: ['code']
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }, {
-                        relation: 'route',
-                        scope: {
-                            fields: ['id']
-                        }
-                    }]
-                }, myOptions);
 
-                const ticketState = await models.TicketState.findOne({
+                const packedAlertLevel = await models.AlertLevel.findOne({where: {code: 'PACKED'},
-                    where: {ticketFk: ticketId},
-                    fields: ['alertLevel']
-                }, myOptions);
-
-                const packedAlertLevel = await models.AlertLevel.findOne({
-                    where: {code: 'PACKED'},
                     fields: ['id']
                 }, myOptions);
 
                 if (!ticketState)
                     throw new UserError('Ticket does not exist');
-                if (!ticket.route())
-                    throw new UserError('Ticket without route');
                 if (ticketState.alertLevel < packedAlertLevel.id)
                     throw new UserError('This ticket cannot be signed because it has not been boxed');
-                if (await ticket.isSigned)
+                if (await gestDocExists(ticketId))
                     throw new UserError('Ticket is already signed');
 
                 if (location) await setLocation(ticketId);
-                if (!await hasSignDms(ticketId))
+                if (!gestDocCreated) await createGestDoc(ticketId);
-                    await createGestDoc(ticketId);
+                await models.TicketDms.create({ticketFk: ticketId, dmsFk: dms[0].id}, myOptions);
+                const ticket = await models.Ticket.findById(ticketId, null, myOptions);
                 await ticket.updateAttribute('isSigned', true, myOptions);
 
                 const deliveryState = await models.State.findOne({
-                    where: {code: 'DELIVERED'}
+                    where: {
+                        code: 'DELIVERED'
+                    }
                 }, myOptions);
 
                 await models.Ticket.state(ctx, {
                     ticketFk: ticketId,
                     stateFk: deliveryState.id
                 }, myOptions);
-
-                if (ticket?.address()?.province()?.country()?.code != 'ES') {
-                    await models.Ticket.saveCmr(ctx, [ticketId], myOptions);
-                    externalTickets.push(ticketId);
-                }
             }
+
             if (tx) await tx.commit();
+            return;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;
         }
-        await models.Route.cmrEmail(ctx, externalTickets);
     };
 };

modules/ticket/back/methods/ticket/specs/myLastModified.spec.js

@@ -0,0 +1,10 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('myLastModified()', () => {
+    it('return list of last tickets which user has modified', async() => {
+        let ctx = {req: {accessToken: {userId: 100}}};
+        let response = await models.Ticket.myLastModified(ctx);
+
+        expect(response.length).toBeGreaterThan(0);
+    });
+});

modules/ticket/back/methods/ticket/specs/transferClient.spec.js

@@ -1,49 +1,60 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('Ticket transferClient()', () => {
-    const userId = 9;
+    const originalTicketId = 8;
-    const activeCtx = {
+    const refundTicketId = 24;
-        accessToken: {userId: userId},
+    const clientId = 1;
-    };
+    let ctx;
-    const ctx = {req: activeCtx};
+    let options;
+    let tx;
+    beforeEach(async() => {
+        ctx = {
+            req: {
+                accessToken: {userId: 9},
+                headers: {origin: 'http://localhost'}
+            },
+            args: {}
+        };
+
+        options = {transaction: tx};
+        tx = await models.Ticket.beginTransaction({});
+        options.transaction = tx;
+    });
+
+    afterEach(async() => {
+        await tx.rollback();
+    });
 
     it('should throw an error as the ticket is not editable', async() => {
-        const tx = await models.Ticket.beginTransaction({});
-        let error;
-
         try {
-            const options = {transaction: tx};
             const ticketId = 4;
             const clientId = 1;
             await models.Ticket.transferClient(ctx, ticketId, clientId, options);
-
-            await tx.rollback();
         } catch (e) {
-            await tx.rollback();
+            expect(e.message).toEqual(`This ticket is locked`);
-            error = e;
         }
-
-        expect(error.message).toEqual(`This ticket is locked`);
     });
 
-    it('should be assigned a different clientFk', async() => {
+    it('should be assigned a different clientFk in the original ticket', async() => {
-        const tx = await models.Ticket.beginTransaction({});
+        await models.Ticket.transferClient(ctx, 2, clientId, options);
-        let updatedTicket;
+        const afterTransfer = await models.Ticket.findById(2, null, options);
-        const ticketId = 10;
-        const clientId = 1;
 
-        try {
+        expect(afterTransfer.clientFk).toEqual(clientId);
-            const options = {transaction: tx};
+    });
 
-            await models.Ticket.transferClient(ctx, ticketId, clientId, options);
+    it('should be assigned a different clientFk in the original and refund ticket and claim', async() => {
-            updatedTicket = await models.Ticket.findById(ticketId, {fields: ['clientFk']}, options);
+        await models.Ticket.transferClient(ctx, originalTicketId, clientId, options);
 
-            await tx.rollback();
+        const [originalTicket, refundTicket] = await models.Ticket.find({
-        } catch (e) {
+            where: {id: {inq: [originalTicketId, refundTicketId]}}
-            await tx.rollback();
+        }, options);
-            throw e;
-        }
 
-        expect(updatedTicket.clientFk).toEqual(clientId);
+        const claim = await models.Claim.findOne({
+            where: {ticketFk: originalTicketId}
+        }, options);
+
+        expect(originalTicket.clientFk).toEqual(clientId);
+        expect(refundTicket.clientFk).toEqual(clientId);
+        expect(claim.clientFk).toEqual(clientId);
     });
 });

modules/ticket/back/methods/ticket/transferClient.js

@@ -2,20 +2,17 @@ module.exports = Self => {
     Self.remoteMethodCtx('transferClient', {
         description: 'Transfering ticket to another client',
         accessType: 'WRITE',
-        accepts: [
+        accepts: [{
-            {
+            arg: 'id',
-                arg: 'id',
+            type: 'number',
-                type: 'number',
+            required: true,
-                required: true,
+            description: 'the ticket id',
-                description: 'the ticket id',
+            http: {source: 'path'}
-                http: {source: 'path'}
+        }, {
-            },
+            arg: 'clientFk',
-            {
+            type: 'number',
-                arg: 'clientFk',
+            required: true,
-                type: 'number',
+        }],
-                required: true,
-            },
-        ],
         http: {
             path: `/:id/transferClient`,
             verb: 'PATCH'
@@ -25,21 +22,51 @@ module.exports = Self => {
     Self.transferClient = async(ctx, id, clientFk, options) => {
         const models = Self.app.models;
         const myOptions = {};
+        let tx;
+
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        await Self.isEditableOrThrow(ctx, id, myOptions);
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
 
-        const ticket = await models.Ticket.findById(
+        try {
-            id,
+            await Self.isEditableOrThrow(ctx, id, myOptions);
-            {fields: ['id', 'shipped', 'clientFk', 'addressFk']},
-            myOptions
-        );
-        const client = await models.Client.findById(clientFk, {fields: ['id', 'defaultAddressFk']}, myOptions);
 
-        await ticket.updateAttributes({
+            const ticketRefund = await models.TicketRefund.findOne({
-            clientFk,
+                where: {or: [{originalTicketFk: id}, {refundTicketFk: id}]},
-            addressFk: client.defaultAddressFk,
+                include: [{relation: 'refundTicket'}, {relation: 'originalTicket'}]
-        });
+            }, myOptions);
+
+            const {defaultAddressFk: addressFk} = await models.Client.findById(clientFk,
+                {fields: ['id', 'defaultAddressFk']}, myOptions);
+
+            const attributes = {clientFk, addressFk};
+
+            const tickets = [];
+            const ticketIds = [];
+
+            if (ticketRefund) {
+                const {refundTicket, originalTicket} = ticketRefund;
+                tickets.push(refundTicket(), originalTicket());
+
+                for (const ticket of tickets) {
+                    await ticket.updateAttributes(attributes, myOptions);
+                    ticketIds.push(ticket.id);
+                }
+            } else {
+                await Self.updateAll({id}, attributes, myOptions);
+                ticketIds.push(id);
+            }
+
+            await models.Claim.updateAll({ticketFk: {inq: ticketIds}}, {clientFk}, myOptions);
+
+            if (tx) await tx.commit();
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
     };
 };

modules/ticket/back/models/ticket-methods.js

@@ -45,4 +45,5 @@ module.exports = function(Self) {
     require('../methods/ticket/invoiceTickets')(Self);
     require('../methods/ticket/invoiceTicketsAndPdf')(Self);
     require('../methods/ticket/docuwareDownload')(Self);
+    require('../methods/ticket/myLastModified')(Self);
 };

modules/worker/back/methods/worker-time-control/sendMail.js

@@ -137,7 +137,8 @@ module.exports = Self => {
                 tb.type,
                 tb.businessFk,
                 tb.permissionRate,
-                d.isTeleworking
+                d.isTeleworking,
+                d.hasToRefill
             FROM tmp.timeBusinessCalculate tb
                 JOIN account.user u ON u.id = tb.userFk
                 JOIN department d ON d.id = tb.departmentFk
@@ -174,7 +175,7 @@ module.exports = Self => {
             myOptions.transaction = tx;
             try {
                 workerFk = day.workerFk;
-                if (day.timeWorkDecimal > 0 && day.timeWorkedDecimal == null
+                if (day.hasToRefill && day.timeWorkDecimal > 0 && day.timeWorkedDecimal == null
                     && (day.permissionRate == null ? true : day.permissionRate)) {
                     if (day.timeTable == null) {
                         const timed = new Date(day.dated);

modules/worker/back/methods/worker-time-control/specs/clockIn.spec.js

@@ -46,6 +46,31 @@ describe('workerTimeControl clockIn()', () => {
         }
     });
 
+    it('should throw an error trying to change a middle hour to out not resting 12h', async() => {
+        activeCtx.accessToken.userId = HHRRId;
+        const workerId = teamBossId;
+
+        const tx = await models.WorkerTimeControl.beginTransaction({});
+        try {
+            const options = {transaction: tx};
+
+            const entryTime = "2000-12-25T11:00:00.000Z";
+            ctx.args = {timed: entryTime, direction: 'in'};
+            await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
+
+            const middleTime ="2000-12-26T11:00:00.000Z";
+            ctx.args = {timed: middleTime, direction: 'middle'};
+            const middleEntryTime = await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
+            
+            const direction = 'out';
+            await models.WorkerTimeControl.updateTimeEntry(ctx, middleEntryTime.id, direction, options);
+            await tx.rollback();
+        } catch (e) {
+            expect(e.message).toBe('Superado el tiempo máximo entre entrada y salida');
+            await tx.rollback();
+        }
+    });
+
     describe('as Role errors', () => {
         it('should add if the current user is team boss and the target user is himself', async() => {
             activeCtx.accessToken.userId = teamBossId;
@@ -110,16 +135,22 @@ describe('workerTimeControl clockIn()', () => {
                 todayAtOne.setHours(1, 0, 0, 0);
 
                 ctx.args = {timed: todayAtOne, direction: 'in'};
-                const createdTimeEntry = await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
+              const entryTime = await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
+                expect(entryTime.id).toBeDefined();
+                const todayAtTwo = Date.vnNew();
 
-                expect(createdTimeEntry.id).toBeDefined();
+                todayAtTwo.setHours(2, 0, 0, 0);
-
+                ctx.args = {timed: todayAtTwo, direction: 'middle'};
-                ctx.args = {direction: 'out'};
+                const middleTime = await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
-                const updatedTimeEntry = await models.WorkerTimeControl.updateTimeEntry(
+                
-                    ctx, createdTimeEntry.id, options
+                const direction = 'out';
+                const {id:outTimeEntryId} = await models.WorkerTimeControl.updateTimeEntry(
+                    ctx, middleTime.id, direction, options
                 );
 
-                expect(updatedTimeEntry.direction).toEqual('out');
+                const {direction: updatedDirection} = await models.WorkerTimeControl.findById(outTimeEntryId,{fields:['direction']},options);
+                expect(updatedDirection).toEqual('out');
+                
                 await tx.rollback();
             } catch (e) {
                 await tx.rollback();

modules/worker/back/methods/worker-time-control/updateTimeEntry.js

@@ -26,32 +26,39 @@ module.exports = Self => {
         }
     });
 
-    Self.updateTimeEntry = async(ctx, id, options) => {
+    Self.updateTimeEntry = async(ctx, timeEntryId, direction, options) => {
         const currentUserId = ctx.req.accessToken.userId;
         const models = Self.app.models;
-        const args = ctx.args;
-
         const myOptions = {};
+        let tx;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const targetTimeEntry = await Self.findById(id, null, myOptions);
+        if (!myOptions.transaction) {
-        const isSubordinate = await models.Worker.isSubordinate(ctx, targetTimeEntry.userFk, myOptions);
+            tx = await Self.beginTransaction({});
-        const isTeamBoss = await models.ACL.checkAccessAcl(ctx, 'Worker', 'isTeamBoss', 'WRITE');
+            myOptions.transaction = tx;
-        const isHimself = currentUserId == targetTimeEntry.userFk;
+        }
 
-        const notAllowed = isSubordinate === false || (isSubordinate && isHimself && !isTeamBoss);
+        try {
+            const {id, userFk, timed} = await Self.findById(timeEntryId, null, myOptions);
+            const isSubordinate = await models.Worker.isSubordinate(ctx, userFk, myOptions);
+            const isTeamBoss = await models.ACL.checkAccessAcl(ctx, 'Worker', 'isTeamBoss', 'WRITE');
+            const isHimself = currentUserId == userFk;
 
-        if (notAllowed)
+            const notAllowed = isSubordinate === false || (isSubordinate && isHimself && !isTeamBoss);
-            throw new UserError(`You don't have enough privileges`);
+            if (notAllowed) throw new UserError(`You don't have enough privileges`);
 
-        const timeEntryUpdated = await targetTimeEntry.updateAttributes({
+            await models.WorkerTimeControl.deleteById(id, myOptions);
-            direction: args.direction
+            const timeEntryUpdatedId = await Self.clockIn(userFk, timed, direction, null, myOptions);
-        }, myOptions);
 
-        await models.WorkerTimeControl.resendWeeklyHourEmail(ctx, targetTimeEntry.userFk, targetTimeEntry.timed, myOptions);
+            await models.WorkerTimeControl.resendWeeklyHourEmail(ctx, userFk, timed, myOptions);
 
-        return timeEntryUpdated;
+            if (tx) await tx.commit();
+            return timeEntryUpdatedId;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
     };
 };

modules/worker/back/methods/worker/specs/new.spec.js

@@ -36,6 +36,7 @@ describe('Worker new', () => {
         payMethodFk: 1,
         roleFk: 1
     };
+
     const req = {accessToken: {userId: 9}};
 
     it('should return error if personal mail already exists', async() => {
@@ -138,17 +139,29 @@ describe('Worker new', () => {
     });
 
     it('should create a new worker', async() => {
-        const newWorker = await models.Worker.new({args: defaultWorker, req});
+        let newWorker;
-
+        try {
-        await models.Worker.destroyById(newWorker.id);
+            newWorker = await models.Worker.new({args: defaultWorker, req});
-        await models.Address.destroyAll({clientFk: newWorker.id});
+        } finally {
-        await models.Mandate.destroyAll({clientFk: newWorker.id});
+            await removeWorker(newWorker.id);
-        await models.Client.destroyById(newWorker.id);
+        }
-        await models.VnUser.destroyById(newWorker.id);
 
         expect(newWorker.id).toBeDefined();
     });
 
+    it('should create a new client', async() => {
+        let newWorker;
+        let client;
+        try {
+            newWorker = await models.Worker.new({args: defaultWorker, req});
+            client = await models.Client.findById(newWorker.id);
+        } finally {
+            await removeWorker(newWorker.id);
+        }
+
+        expect(client).toBeDefined();
+    });
+
     it('should create a new worker in client', async() => {
         const bruceWayneId = 1101;
         const client = await models.Client.findById(bruceWayneId, {fields: ['fi', 'email']});
@@ -163,10 +176,21 @@ describe('Worker new', () => {
                 }),
             req
         };
-        const newWorker = await models.Worker.new(newWorkerData);
+        let newWorker;
-
+        try {
-        await models.Worker.destroyById(newWorker.id);
+            newWorker = await models.Worker.new(newWorkerData);
+        } finally {
+            await models.Worker.destroyById(newWorker.id);
+        }
 
         expect(newWorker.id).toEqual(bruceWayneId);
     });
 });
+
+async function removeWorker(id) {
+    await models.Worker.destroyById(id);
+    await models.Address.destroyAll({clientFk: id});
+    await models.Mandate.destroyAll({clientFk: id});
+    await models.Client.destroyById(id);
+    await models.VnUser.destroyById(id);
+}

modules/worker/back/model-config.json

@@ -86,6 +86,9 @@
     "WorkerMana": {
         "dataSource": "vn"
     },
+    "WorkerManaExcluded": {
+        "dataSource": "vn"
+    },
     "WorkerMistake": {
         "dataSource": "vn"
     },

modules/worker/back/models/worker-mana-excluded.json

@@ -0,0 +1,22 @@
+{
+    "name": "WorkerManaExcluded",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "workerManaExcluded"
+        }
+    },
+    "properties": {
+        "workerFk": {
+            "id": true,
+            "type": "number"
+        }
+    },
+    "relations": {
+        "worker": {
+            "type": "belongsTo",
+            "model": "Worker",
+            "foreignKey": "workerFk"
+        }
+    }
+}

modules/worker/front/time-control/index.js

@@ -415,11 +415,13 @@ class Controller extends Section {
                 throw new Error(`The entry type can't be empty`);
 
             const query = `WorkerTimeControls/${entry.id}/updateTimeEntry`;
-            this.$http.post(query, {direction: entry.direction})
+            if (entry.direction !== entry.$orgRow.direction) {
-                .then(() => this.vnApp.showSuccess(this.$t('Data saved!')))
+                this.$http.post(query, {direction: entry.direction})
-                .then(() => this.$.editEntry.hide())
+                    .then(() => this.vnApp.showSuccess(this.$t('Data saved!')))
-                .then(() => this.fetchHours())
+                    .then(() => this.$.editEntry.hide())
-                .then(() => this.getMailStates(this.date));
+                    .then(() => this.fetchHours())
+                    .then(() => this.getMailStates(this.date));
+            }
         } catch (e) {
             this.vnApp.showError(this.$t(e.message));
         }

modules/worker/front/time-control/index.spec.js

@@ -130,7 +130,7 @@ describe('Component vnWorkerTimeControl', () => {
                 controller.$.model = {applyFilter: jest.fn().mockReturnValue(Promise.resolve())};
                 controller.date = today;
                 controller.fetchHours = jest.fn();
-                controller.selectedRow = {id: 1, timed: Date.vnNew(), direction: 'in'};
+                controller.selectedRow = {id: 1, timed: Date.vnNew(), direction: 'in', $orgRow: {direction: null}};
                 controller.$.editEntry = {
                     hide: () => {}
                 };

myt.config.yml

@@ -44,7 +44,6 @@ fixtures:
     - module
     - defaultViewConfig
   vn:
-    - agencyTermConfig
     - alertLevel
     - bookingPlanner
     - businessType

package.json

@@ -56,7 +56,7 @@
         "@babel/plugin-syntax-dynamic-import": "^7.7.4",
         "@babel/preset-env": "^7.11.0",
         "@babel/register": "^7.7.7",
-        "@verdnatura/myt": "^1.6.7",
+        "@verdnatura/myt": "^1.6.8",
         "angular-mocks": "^1.7.9",
         "babel-jest": "^26.0.1",
         "babel-loader": "^8.2.4",

pnpm-lock.yaml

@@ -131,8 +131,8 @@ devDependencies:
     specifier: ^7.7.7
     version: 7.23.7(@babel/core@7.23.9)
   '@verdnatura/myt':
-    specifier: ^1.6.7
+    specifier: ^1.6.8
-    version: 1.6.7
+    version: 1.6.8
   angular-mocks:
     specifier: ^1.7.9
     version: 1.8.3
@@ -2633,8 +2633,8 @@ packages:
     dev: false
     optional: true
 
-  /@verdnatura/myt@1.6.7:
+  /@verdnatura/myt@1.6.8:
-    resolution: {integrity: sha512-t/Q1T3QzHpZFdxwIyQL/CV5g+HJvWE6Q65VeA9k0svZdX/vezgnQ21nkI+wuvIurIl6BXqq2Arx7EWYkAhGNNA==}
+    resolution: {integrity: sha512-jpadr6yAR9TQXPv+has5yOYAolR/YEzsxbLgMR7BoDrpLyVFLHJEy4Dfe+Hy11r3AmxCB/8lWM+La1YGvXMWOA==}
     hasBin: true
     dependencies:
       '@sqltools/formatter': 1.2.5

print/templates/reports/invoice/sql/sales.sql

@@ -7,7 +7,8 @@ SELECT
         s.discount,
         s.itemFk,
         s.concept,
-		tc.code vatType
+		tc.code vatType,
+		it.isPackaging
 	FROM vn.invoiceOut io
         JOIN vn.ticket t ON t.refFk = io.ref
         JOIN vn.supplier su ON su.id = io.companyFk
@@ -34,9 +35,10 @@ SELECT
         ts.quantity,
         ts.price,
         0 discount,
-        '',
+        NULL,
-        ts.description concept,
+        ts.description,
-        tc.code vatType
+        tc.code,
+        NULL
     FROM vn.invoiceOut io
         JOIN vn.ticket t ON t.refFk = io.ref
         JOIN vn.ticketService ts ON ts.ticketFk = t.id
@@ -46,3 +48,4 @@ SELECT
         JOIN vn.supplierAccount sa ON sa.id = co.supplierAccountFk
         JOIN vn.taxClass tc ON tc.id = ts.taxClassFk
     WHERE t.refFk = ?
+ORDER BY (isPackaging), concept, itemFk