back/methods/mrw-config/specs/createShipment.spec.js

@@ -49,6 +49,7 @@ describe('MRWConfig createShipment()', () => {
 
         await models.MrwConfig.create(
             {
+                'id': 1,
                 'url': 'https://url.com',
                 'user': 'user',
                 'password': 'password',

back/methods/notification/specs/getList.spec.js

@@ -7,7 +7,7 @@ describe('NotificationSubscription getList()', () => {
         const notifications = await models.Notification.find({});
         const totalAvailable = notifications.length - active.length;
 
-        expect(active.length).toEqual(2);
+        expect(active.length).toEqual(3);
         expect(available.length).toEqual(totalAvailable);
     });
 });

back/models/mrw-config.json

@@ -9,6 +9,7 @@
 	"properties": {
 		"id": {
 			"type": "number",
+			"id": true,
 			"required": true
 		},
 		"url": {

db/dump/fixtures.after.sql

@@ -7,8 +7,8 @@ SET foreign_key_checks = 0;
 
 -- XXX: vn-database
 
-INSERT INTO util.config (environment, mockTime, mockUtcTime, mockEnabled)
+INSERT INTO util.config (id, environment, mockTime, mockUtcTime, mockEnabled)
-    VALUES ('local', '2001-01-01 12:00:00', '2001-01-01 11:00:00', TRUE);
+    VALUES (1, 'local', '2001-01-01 12:00:00', '2001-01-01 11:00:00', TRUE);
 /* #5483
 INSERT INTO vn.entryConfig (defaultEntry, mailToNotify, inventorySupplierFk, maxLockTime, defaultSupplierFk)
     VALUES(1, NULL, 1, 300, 1);
@@ -70,7 +70,7 @@ UPDATE vn.supplier
 
 UPDATE `vn`.`claimRatio` SET `claimAmount` = '10' WHERE (`clientFk` = '1101');
 
-INSERT INTO `vn`.`agency` (`name`, `warehouseFk`, `isOwn`, `isAnyVolumeAllowed`) 
+INSERT INTO `vn`.`agency` (`name`, `warehouseFk`, `isOwn`, `isAnyVolumeAllowed`)
     VALUES
     ('Agencia', '1', '1', '1'),
     ('Otra agencia ', '1', '0', '0');

db/dump/fixtures.before.sql

@@ -60,13 +60,13 @@ INSERT INTO `vn`.`ticketConfig` (`id`, `scopeDays`)
     VALUES
         ('1', '6');
 
-INSERT INTO `vn`.`bionicConfig` (`generalInflationCoeficient`, `minimumDensityVolumetricWeight`, `verdnaturaVolumeBox`, `itemCarryBox`)
+INSERT INTO `vn`.`bionicConfig` (`id`, `generalInflationCoeficient`, `minimumDensityVolumetricWeight`, `verdnaturaVolumeBox`, `itemCarryBox`)
     VALUES
-        (1.30, 167.00, 138000, 71);
+        (1, 1.30, 167.00, 138000, 71);
 
-INSERT INTO `vn`.`chatConfig` (`host`, `api`)
+INSERT INTO `vn`.`chatConfig` (`id`, `host`, `api`)
     VALUES
-        ('https://chat.verdnatura.es', 'https://chat.verdnatura.es/api/v1');
+        (1, 'https://chat.verdnatura.es', 'https://chat.verdnatura.es/api/v1');
 
 INSERT IGNORE INTO `vn`.`greugeConfig`(`id`, `freightPickUpPrice`)
     VALUES
@@ -592,13 +592,13 @@ INSERT INTO `vn`.`supplierAccount`(`id`, `supplierFk`, `iban`, `bankEntityFk`)
     VALUES
          (241, 442, 'ES111122333344111122221111', 128);
 
-INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `sage200Company`, `expired`, `companyGroupFk`, `phytosanitary` , `clientFk`)
+INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `expired`, `companyGroupFk`, `phytosanitary` , `clientFk`)
     VALUES
-        (69  , 'CCs', NULL, 30,  NULL, 0, NULL,         1, NULL                             , NULL),
+        (69  , 'CCs', NULL, 30, 0, NULL,         1, NULL                             , NULL),
-        (442 , 'VNL', 241,  30,  2   , 1, NULL,         2, 'VNL Company - Plant passport'   , 1101),
+        (442 , 'VNL', 241,  30, 1, NULL,         2, 'VNL Company - Plant passport'   , 1101),
-        (567 , 'VNH', NULL, 30,  NULL, 4, NULL,         1, 'VNH Company - Plant passport'   , NULL),
+        (567 , 'VNH', NULL, 30, 4, NULL,         1, 'VNH Company - Plant passport'   , NULL),
-        (791 , 'FTH', NULL, 30,  NULL, 3, '2015-11-30', 1, NULL                             , NULL),
+        (791 , 'FTH', NULL, 30, 3, '2015-11-30', 1, NULL                             , NULL),
-        (1381, 'ORN', NULL, 30,  NULL, 7, NULL,         1, 'ORN Company - Plant passport'   , NULL);
+        (1381, 'ORN', NULL, 30, 7, NULL,         1, 'ORN Company - Plant passport'   , NULL);
 
 INSERT INTO `vn`.`taxArea` (`code`, `claveOperacionFactura`, `CodigoTransaccion`)
     VALUES
@@ -608,7 +608,8 @@ INSERT INTO `vn`.`taxArea` (`code`, `claveOperacionFactura`, `CodigoTransaccion`
         ('WORLD',    2, 15);
 
 INSERT INTO vn.invoiceOutConfig
-    SET parallelism = 8;
+    SET id = 1,
+        parallelism = 8;
 
 INSERT INTO `vn`.`invoiceOutSerial` (`code`, `description`, `isTaxed`, `taxAreaFk`, `isCEE`, `type`)
     VALUES
@@ -714,7 +715,7 @@ INSERT INTO `vn`.`zoneClosure` (`zoneFk`, `dated`, `hour`)
         (12,    util.VN_CURDATE(), '23:59'),
         (13,    util.VN_CURDATE(), '23:59');
 
-INSERT INTO `vn`.`zoneConfig` (`scope`) VALUES ('1');
+INSERT INTO `vn`.`zoneConfig` (`id`, `scope`) VALUES (1, '1');
 
 INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agencyModeFk`, `description`, `m3`, `cost`, `started`, `finished`, `zoneFk`)
     VALUES
@@ -759,8 +760,8 @@ INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeF
         (29, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL),
         (30, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL),
         (31, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL),
-        (32, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL);
+        (32, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL),
-
+        (33, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1102, 'NY roofs',                                      122, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL);
 INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
     VALUES
         (1,  11, 1, 'ready'),
@@ -983,9 +984,9 @@ INSERT INTO `vn`.`packaging`(`id`, `volume`, `width`, `height`, `depth`, `isPack
         ('cc',          1640038.00, 56.00,  220.00, 128.00, 1, util.VN_CURDATE(), 15,   90.00),
         ('pallet 100',  2745600.00, 100.00, 220.00, 120.00, 1, util.VN_CURDATE(), 16,   0.00);
 
-INSERT INTO `vn`.`packagingConfig`(`upperGap`, `defaultSmallPackageFk`, `defaultBigPackageFk`)
+INSERT INTO `vn`.`packagingConfig`(`id`, `upperGap`, `defaultSmallPackageFk`, `defaultBigPackageFk`)
     VALUES
-        ('10', 1, 'pallet 100');
+        (1, '10', 1, 'pallet 100');
 
 INSERT INTO `vn`.`expeditionStateType`(`id`, `description`, `code`)
     VALUES
@@ -1491,8 +1492,8 @@ INSERT INTO `bs`.`waste`(`buyer`, `year`, `week`, `family`, `itemFk`, `itemTypeF
 
 INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packagingFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`, `printedStickers`,`isChecked`,`isIgnored`,`weight`, `created`)
     VALUES
-        (1,  1, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH)),
+        (1,  1, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH),
-        (2,  2, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+        (2,  2, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  1, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 1 MONTH),
         (3,  3, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  0, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE()),
         (4,  2, 2, 5,       450,    3, 1, 1.000, 1.000, 0.000, 10, 10, 0, NULL, 0.00, 7.30, 7.00,   0, 1, 0, 2.5,   util.VN_CURDATE()),
         (5,  3, 3, 55,      500,    5, 1, 1.000, 1.000, 0.000, 1,  1,  0, NULL, 0.00, 78.3, 75.6,   0, 1, 0, 2.5,   util.VN_CURDATE()),
@@ -1868,8 +1869,7 @@ INSERT INTO `vn`.`claimEnd`(`id`, `saleFk`, `claimFk`, `workerFk`, `claimDestina
 
 INSERT INTO `vn`.`claimConfig`(`id`, `maxResponsibility`)
     VALUES
-        (1, 50),
+        (1, 50);
-        (2, 30);
 
 INSERT INTO `vn`.`claimRatio`(`clientFk`, `yearSale`, `claimAmount`, `claimingRate`, `priceIncreasing`, `packingRate`)
     VALUES
@@ -1980,10 +1980,10 @@ INSERT INTO `pbx`.`sip`(`user_id`, `extension`)
         (5, 1102),
         (9, 1201);
 
-INSERT INTO `vn`.`professionalCategory` (`id`, `name`, `level`, `dayBreak`)
+INSERT INTO `vn`.`professionalCategory` (`id`, `description`)
     VALUES
-        (1, 'employee', NULL, NULL),
+        (1, 'employee'),
-        (2, 'florist', NULL, NULL);
+        (2, 'florist');
 
 INSERT INTO `vn`.`calendarType` (`id`, `description`, `hoursWeek`, `isPartial`)
     VALUES
@@ -2504,9 +2504,9 @@ INSERT INTO `hedera`.`imageCollectionSize`(`id`, `collectionFk`,`width`, `height
     VALUES
         (1, 4, 160, 160);
 
-INSERT INTO `vn`.`rateConfig`(`rate0`, `rate1`, `rate2`, `rate3`)
+INSERT INTO `vn`.`rateConfig`(`id`, `rate0`, `rate1`, `rate2`, `rate3`)
     VALUES
-        (36, 31, 25, 21);
+        (1, 36, 31, 25, 21);
 
 INSERT INTO `vn`.`rate`(`dated`, `warehouseFk`, `rate0`, `rate1`, `rate2`, `rate3`)
     VALUES
@@ -2697,9 +2697,9 @@ INSERT INTO `bs`.`sale` (`saleFk`, `amount`, `dated`,  `typeFk`, `clientFk`)
         (4,     33.8,      util.VN_CURDATE(),    1,  1101),
         (30,    34.4,      util.VN_CURDATE(),    1,  1108);
 
-INSERT INTO `vn`.`docuwareConfig` (`url`)
+INSERT INTO `vn`.`docuwareConfig` (`id`, `url`)
     VALUES
-        ('http://docuware.url/');
+        (1, 'http://docuware.url/');
 
 INSERT INTO `vn`.`calendarHolidaysName` (`id`, `name`)
     VALUES
@@ -2796,11 +2796,12 @@ INSERT INTO `vn`.`packingSite` (`id`, `code`, `hostFk`, `monitorId`)
     VALUES
         (1, 'h1', 1, '');
 
-INSERT INTO `vn`.`packingSiteConfig` (`shinobiUrl`, `shinobiToken`, `shinobiGroupKey`, `avgBoxingTime`)
+INSERT INTO `vn`.`packingSiteConfig` (`id`, `shinobiUrl`, `shinobiToken`, `shinobiGroupKey`, `avgBoxingTime`)
     VALUES
-        ('', 'SHINNOBI_TOKEN', 'GROUP_TOKEN', 6000);
+        (1, '', 'SHINNOBI_TOKEN', 'GROUP_TOKEN', 6000);
 INSERT INTO `util`.`notificationConfig`
-	SET `cleanDays` = 90;
+	SET `id` = 1,
+        `cleanDays` = 90;
 
 INSERT INTO `util`.`notification` (`id`, `name`, `description`)
     VALUES
@@ -2809,7 +2810,8 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`)
         (3, 'not-main-printer-configured', 'A printer distinct than main has been configured'),
         (4, 'supplier-pay-method-update', 'A supplier pay method has been updated'),
         (5, 'modified-entry', 'An entry has been modified'),
-        (6, 'book-entry-deleted', 'accounting entries deleted');
+        (6, 'book-entry-deleted', 'accounting entries deleted'),
+        (7, 'zone-included','An email to notify zoneCollisions');
 
 INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
     VALUES
@@ -2819,7 +2821,8 @@ INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
         (3, 9),
         (4, 1),
         (5, 9),
-        (6, 9);
+        (6, 9),
+        (7, 9);
 
 INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`)
     VALUES
@@ -2836,8 +2839,8 @@ INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`)
         (2, 1109),
 	    (1, 9),
         (1, 3),
-        (6, 9);
+        (6, 9),
-
+        (7, 9);
 
 INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`)
     VALUES
@@ -2853,7 +2856,7 @@ INSERT INTO `vn`.`collection` (`id`, `created`, `workerFk`, `stateFk`, `itemPack
 
 INSERT INTO `vn`.`itemConfig` (`id`, `isItemTagTriggerDisabled`, `monthToDeactivate`, `wasteRecipients`, `validPriorities`, `defaultPriority`, `defaultTag`, `warehouseFk`)
     VALUES
-        (0, 0, 24, '', '[1,2,3]', 2, 56, 60);
+        (1, 0, 24, '', '[1,2,3]', 2, 56, 60);
 
 INSERT INTO `vn`.`ticketCollection` (`ticketFk`, `collectionFk`, `created`, `level`, `wagon`, `smartTagFk`, `usedShelves`, `itemCount`, `liters`)
     VALUES
@@ -2890,7 +2893,7 @@ INSERT INTO `vn`.`ticketLog` (originFk, userFk, `action`, creationDate, changedM
         (1,   18, 'insert', '1999-05-09 10:00:00', 'Ticket',    45, 'Super Man'  , NULL, '{"id":45,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"Super Man","addressFk":48637,"isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":false,"hasPriority":false,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}', NULL);
 INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`, `responseType`, `fromEmailId`, `replyTo`)
     VALUES
-        (0, 'http://localhost:56596/scp', 'ostadmin', 'Admin1', '1,6', 3, 60, 'Este CAU se ha cerrado automáticamente. Si el problema persiste responda a este mensaje.', 'localhost', 'osticket', 'osticket', 40003, 'reply', 1, 'all');
+        (1, 'http://localhost:56596/scp', 'ostadmin', 'Admin1', '1,6', 3, 60, 'Este CAU se ha cerrado automáticamente. Si el problema persiste responda a este mensaje.', 'localhost', 'osticket', 'osticket', 40003, 'reply', 1, 'all');
 
 INSERT INTO `vn`.`mdbApp` (`app`, `baselineBranchFk`, `userFk`, `locked`)
     VALUES
@@ -3711,8 +3714,8 @@ UPDATE vn.collection
 UPDATE vn.sale
 	SET isPicked =FALSE;
 
-INSERT INTO vn.machineWorkerConfig(maxHours)
+INSERT INTO vn.machineWorkerConfig(id, maxHours)
-	VALUES(12);
+	VALUES(1, 12);
 
 INSERT INTO vn.workerAppTester(workerFk) VALUES(66);
 

db/routines/bs/procedures/ventas_contables_add.sql

@@ -23,7 +23,7 @@ BEGIN
 		ENGINE = MEMORY
 		SELECT Id_Ticket
 			FROM vn2008.Tickets t
-				JOIN vn.invoiceOut io ON io.id = t.Factura
+				JOIN vn.invoiceOut io ON io.`ref` = t.Factura
 			WHERE year(io.issued) = vYear
 				AND month(io.issued) = vMonth;
 

db/routines/floranet/events/clean.sql

@@ -0,0 +1,22 @@
+DELIMITER $$
+CREATE OR REPLACE 
+	DEFINER=`root`@`localhost` 
+	EVENT `floranet`.`clean`
+	ON SCHEDULE EVERY 1 DAY
+	STARTS '2024-01-01 23:00:00.000'
+	ON COMPLETION PRESERVE
+	ENABLE
+DO
+BEGIN
+	DELETE 
+		FROM `order`
+		WHERE created < CURDATE()
+			AND isPaid = FALSE;
+
+	DELETE c.*
+		FROM catalogue c
+			LEFT JOIN `order` o ON o.catalogueFk = c.id 
+		WHERE c.created < CURDATE()
+			AND o.id IS NULL;
+END$$
+DELIMITER ;

db/routines/floranet/procedures/catalogue_get.sql

@@ -0,0 +1,52 @@
+DROP PROCEDURE IF EXISTS floranet.catalogue_get;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE floranet.catalogue_get(vLanded DATE, vPostalCode VARCHAR(15))
+READS SQL DATA
+BEGIN
+/**
+ * Returns list, price and all the stuff regarding the floranet items
+ * 
+ * @param vLanded Delivery date
+ * @param vPostalCode Delivery address postal code
+ */
+	DECLARE vLastCatalogueFk INT;
+
+	START TRANSACTION;
+
+	SELECT * FROM catalogue FOR UPDATE;
+
+	SELECT MAX(id) INTO vLastCatalogueFk
+		FROM catalogue;
+
+	INSERT INTO catalogue(
+					name,
+					price,
+					itemFk,
+					dated,
+					postalCode,
+					`type`,
+					image,
+					description
+				)
+		SELECT 	i.name,
+				i.`size`,
+				i.id,
+				vLanded,
+				vPostalCode,
+				it.name, 
+				CONCAT('https://cdn.verdnatura.es/image/catalog/1600x900/', i.image), 
+				i.description
+			FROM vn.item i
+				JOIN vn.itemType it ON it.id = i.typeFk
+			WHERE it.code IN ('FNR','FNP');
+
+	SELECT *
+		FROM catalogue
+		WHERE id > IFNULL(vLastCatalogueFk,0);
+
+	COMMIT;
+
+END$$
+DELIMITER ;

db/routines/floranet/procedures/contact_request.sql

@@ -0,0 +1,20 @@
+DROP PROCEDURE IF EXISTS floranet.contact_request;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` 
+PROCEDURE floranet.contact_request(
+	vName VARCHAR(100),
+	vPhone VARCHAR(15),
+	vEmail VARCHAR(100),
+	vMessage TEXT)
+READS SQL DATA
+BEGIN
+/**
+ * Set actions for contact request.
+ * 
+ * @param vPostalCode Delivery address postal code
+ */
+	
+END$$
+DELIMITER ;

db/routines/floranet/procedures/deliveryDate_get.sql

@@ -0,0 +1,29 @@
+DROP PROCEDURE IF EXISTS floranet.deliveryDate_get;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `floranet`.`deliveryDate_get`(vPostalCode VARCHAR(15))
+    READS SQL DATA
+BEGIN
+/**
+ * Returns available dates for this postalCode, in the next seven days
+ * 
+ * @param vPostalCode Delivery address postal code
+ */
+	DECLARE vCurrentDayOfWeek INT;
+
+	SET vCurrentDayOfWeek = DAYOFWEEK(NOW());
+
+	SELECT DISTINCT nextDay 
+		FROM (
+				SELECT CURDATE() + INTERVAL IF(
+					apc.dayOfWeek >= vCurrentDayOfWeek,
+					apc.dayOfWeek - vCurrentDayOfWeek,
+					7 - apc.dayOfWeek
+					) DAY nextDay,
+	NOW() + INTERVAL apc.hoursInAdvance - 12 HOUR minDeliveryTime
+	FROM addressPostCode apc
+		WHERE apc.postCode = vPostalCode
+	HAVING nextDay > minDeliveryTime) sub;
+END$$
+DELIMITER ;

db/routines/floranet/procedures/order_confirm.sql

@@ -0,0 +1,25 @@
+DROP PROCEDURE IF EXISTS floranet.order_confirm;
+
+DELIMITER $$
+$$
+
+CREATE DEFINER=`root`@`localhost`PROCEDURE floranet.order_confirm(vCatalogueFk INT)
+READS SQL DATA
+
+BEGIN
+/** Update order.isPaid field
+ *  
+ *  @param vCatalogueFk floranet.catalogue.id
+ * 
+ *  @returns floranet.order.isPaid
+ */
+	UPDATE `order`
+		SET isPaid = TRUE,
+			payed = NOW()
+		WHERE catalogueFk = vCatalogueFk;
+
+	SELECT isPaid
+		FROM `order`
+		WHERE catalogueFk = vCatalogueFk;
+END$$
+DELIMITER ;

db/routines/floranet/procedures/order_put.sql

@@ -0,0 +1,42 @@
+DROP PROCEDURE IF EXISTS floranet.order_put;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE floranet.order_put(vOrder JSON)
+READS SQL DATA
+BEGIN
+/**
+ *  Get and process an order
+ * 
+ * @param vOrder Data of the order
+ *
+ *	Customer data: <customerName>, <email>, <customerPhone>
+ *
+ *	Item data: <catalogueFk>, <message>	
+ *
+ *	Delivery data: <deliveryName>, <address>, <deliveryPhone>
+ *
+ */
+	INSERT IGNORE INTO `order`(
+							catalogueFk,
+							customerName,
+							email,
+							customerPhone,
+							message,
+							deliveryName,
+							address,
+							deliveryPhone
+	)
+		VALUES (JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.catalogueFk')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.customerName')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.email')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.customerPhone')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.message')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.deliveryName')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.address')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.deliveryPhone'))
+		);
+
+	SELECT LAST_INSERT_ID() orderFk;
+END$$
+DELIMITER ;

db/routines/floranet/procedures/sliders_get.sql

@@ -0,0 +1,19 @@
+DROP PROCEDURE IF EXISTS floranet.sliders_get;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE floranet.sliders_get()
+READS SQL DATA
+BEGIN
+/**
+ * Returns list of url for sliders
+ */
+	SELECT 
+        CONCAT('https://cdn.verdnatura.es/image/catalog/1600x900/', i.image) url,
+        i.longName
+    FROM vn.item i
+        JOIN vn.itemType it ON it.id = i.typeFk
+    WHERE it.code IN ('FNR','FNP');
+    
+END$$
+DELIMITER ;

db/routines/sage/procedures/invoiceIn_add.sql

@@ -3,10 +3,11 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`invoiceIn_add`(vI
 BEGIN
 /**
  * Traslada la info de contabilidad relacionada con las facturas recibidas
- * 
+ *
  * @vInvoiceInFk Factura recibida
  * @vXDiarioFk Id tabla XDiario
- */	
+ */
+    DECLARE vInvoiceInOriginalFk INT;
 	DECLARE vDone BOOL DEFAULT FALSE;
 	DECLARE vBase DOUBLE;
 	DECLARE vVat DOUBLE;
@@ -23,25 +24,25 @@ BEGIN
 	DECLARE vInvoiceTypeInformative VARCHAR(1);
 	DECLARE vIsInformativeExportation BOOL DEFAULT FALSE;
 
-	DECLARE vCursor CURSOR FOR 
+	DECLARE vCursor CURSOR FOR
 		SELECT it.taxableBase,
 				CAST((( it.taxableBase / 100) * t.PorcentajeIva) AS DECIMAL (10,2)),
 				t.PorcentajeIva,
 				it.transactionTypeSageFk,
 				it.taxTypeSageFk,
 				tty.isIntracommunity,
-				tt.ClaveOperacionDefecto 
+				tt.ClaveOperacionDefecto
 			FROM vn.invoiceIn i
 				JOIN vn.invoiceInTax it ON it.InvoiceInFk = i.id
 				JOIN TiposIva t ON t.CodigoIva = it.taxTypeSageFk
 				JOIN taxType tty ON tty.id = t.CodigoIva
 				JOIN TiposTransacciones tt ON tt.CodigoTransaccion = it.transactionTypeSageFk
 				LEFT JOIN vn.dua d ON d.id = vInvoiceInFk
-			WHERE i.id = vInvoiceInFk 
+			WHERE i.id = vInvoiceInFk
 				AND d.id IS NULL;
-	
+
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-	
+
 	DELETE FROM movContaIVA
 		WHERE id = vXDiarioFk;
 
@@ -64,22 +65,22 @@ BEGIN
 				vTaxCode,
 				vIsIntracommunity,
 				vOperationCode;
-		
+
-		IF vDone THEN 
+		IF vDone THEN
 			LEAVE l;
 		END IF;
 
-		SET vTransactionCodeOld = vTransactionCode; 
+		SET vTransactionCodeOld = vTransactionCode;
-		SET vTaxCodeOld = vTaxCode; 
+		SET vTaxCodeOld = vTaxCode;
 
-		IF vOperationCode IS NOT NULL THEN 
+		IF vOperationCode IS NOT NULL THEN
 			UPDATE movContaIVA
 				SET ClaveOperacionFactura = vOperationCode
 				WHERE id = vXDiarioFk;
 		END IF;
-		
+
 		SET vCounter = vCounter + 1;
-		CASE vCounter 
+		CASE vCounter
 			WHEN 1 THEN
 				 UPDATE movContaIVA
 					SET BaseIva1 = vBase,
@@ -115,31 +116,31 @@ BEGIN
 					WHERE id = vXDiarioFk;
 			ELSE
 				SELECT vXDiarioFk INTO vXDiarioFk;
-		END CASE; 
+		END CASE;
 
 		IF vIsIntracommunity THEN
 			UPDATE movContaIVA
 				SET Intracomunitaria = TRUE
 				WHERE id = vXDiarioFk;
 		END IF;
-	
+
-		SET vTransactionCodeOld = vTransactionCode; 
+		SET vTransactionCodeOld = vTransactionCode;
-		SET vTaxCodeOld = vTaxCode; 		
+		SET vTaxCodeOld = vTaxCode;
-		
+
 	END LOOP;
 
 	CLOSE vCursor;
 
 	SELECT d.ASIEN AND x.ASIEN IS NULL INTO vIsInformativeExportation
 		FROM vn.dua d
-			LEFT JOIN vn.XDiario x ON x.ASIEN = d.ASIEN 
+			LEFT JOIN vn.XDiario x ON x.ASIEN = d.ASIEN
 				AND x.SERIE = vSerialDua COLLATE utf8mb3_unicode_ci
 		WHERE d.ASIEN = (
 			SELECT ASIEN
-				FROM vn.XDiario 
+				FROM vn.XDiario
 				WHERE id = vXDiarioFk)
 		LIMIT 1;
- 
+
 	UPDATE movContaIVA mci
 			JOIN tmp.invoiceIn ii ON ii.id = vInvoiceInFk
 			JOIN vn.XDiario x ON x.id = mci.id
@@ -151,13 +152,13 @@ BEGIN
 			mci.Serie = ii.serial,
 			mci.Factura = ii.id,
 			mci.FechaFactura = ii.issued,
-			mci.ImporteFactura = IFNULL(mci.BaseIva1, 0) + IFNULL(mci.CuotaIva1, 0) + 
+			mci.ImporteFactura = IFNULL(mci.BaseIva1, 0) + IFNULL(mci.CuotaIva1, 0) +
-								IFNULL(mci.BaseIva2, 0) + IFNULL(mci.CuotaIva2, 0) + 
+								IFNULL(mci.BaseIva2, 0) + IFNULL(mci.CuotaIva2, 0) +
-								IFNULL(mci.BaseIva3, 0) + IFNULL(mci.CuotaIva3, 0) + 
+								IFNULL(mci.BaseIva3, 0) + IFNULL(mci.CuotaIva3, 0) +
 								IFNULL(mci.BaseIva4, 0) + IFNULL(mci.CuotaIva4, 0),
-			mci.TipoFactura = IF(id.id, 
+			mci.TipoFactura = IF(id.id,
-				IF( ii.serial = vSerialDua COLLATE utf8mb3_unicode_ci, vInvoiceTypeReceived, vInvoiceTypeInformative), 
+				IF( ii.serial = vSerialDua COLLATE utf8mb3_unicode_ci, vInvoiceTypeReceived, vInvoiceTypeInformative),
-				IF(vIsInformativeExportation,vInvoiceTypeInformative, vInvoiceTypeReceived)), 
+				IF(vIsInformativeExportation,vInvoiceTypeInformative, vInvoiceTypeReceived)),
 			mci.CodigoCuentaFactura = x.SUBCTA,
 			mci.CifDni = IF(LEFT(TRIM(s.nif), 2) = n.SiglaNacion, SUBSTRING(TRIM(s.nif), 3), s.nif),
 			mci.Nombre = s.name,
@@ -185,7 +186,7 @@ BEGIN
 			JOIN (SELECT SUM(x2.BASEEURO) taxableBase, SUM(x2.EURODEBE) taxBase
 					FROM vn.XDiario x1
 						JOIN vn.XDiario x2 ON x1.ASIEN = x2.ASIEN
-					WHERE x2.BASEEURO <> 0 
+					WHERE x2.BASEEURO <> 0
 						AND x1.id = vXDiarioFk
 				)sub
 			JOIN ClavesOperacion co ON co.Descripcion = 'Arrendamiento de locales de negocio'
@@ -193,10 +194,41 @@ BEGIN
 			mci.ClaveOperacionFactura = IF( t.Retencion = 'ARRENDAMIENTO Y SUBARRENDAMIENTO', co.ClaveOperacionFactura_, mci.ClaveOperacionFactura),
 			mci.BaseRetencion = IF (t.Retencion = 'ACTIVIDADES AGRICOLAS O GANADERAS', sub.taxableBase + sub.taxBase, sub.taxableBase),
 			mci.PorRetencion = t.PorcentajeRetencion,
-			mci.ImporteRetencion = iit.taxableBase * - 1 
+			mci.ImporteRetencion = iit.taxableBase * - 1
-		WHERE mci.id = vXDiarioFk 
+		WHERE mci.id = vXDiarioFk
 			AND e.name = 'Retenciones'
 			AND id.id IS NULL;
 
+	SELECT correctedFk INTO vInvoiceInOriginalFk
+		FROM vn.invoiceInCorrection
+		WHERE correctingFk = vInvoiceInFk;
+
+	IF vInvoiceInOriginalFk THEN 
+
+		UPDATE movContaIVA mci
+				JOIN vn.invoiceInRefund iir ON iir.invoiceInRefundFk = vInvoiceInFk
+				JOIN (SELECT issued,
+							SUM(sub.taxableBase) taxableBase, 
+							SUM(ROUND((sub.taxableBase * sub.PorcentajeIva) / 100 , 2)) vat
+						FROM(SELECT issued,
+									SUM(iit.taxableBase) taxableBase, 
+									ti.PorcentajeIva
+								FROM vn.invoiceIn i 
+									JOIN vn.invoiceInTax iit ON iit.invoiceInFk = i.id
+									JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk
+								WHERE i.id = vInvoiceInOriginalFk
+								GROUP BY ti.CodigoIva)sub
+					)invoiceInOriginal
+				JOIN ClavesOperacion co ON co.Descripcion = 'Factura rectificativa'
+			SET mci.TipoRectificativa = iir.refundCategoryFk,
+				mci.ClaseAbonoRectificativas = iir.refundType, 
+				mci.FechaFacturaOriginal = invoiceInOriginal.issued,
+				mci.FechaOperacion = invoiceInOriginal.issued,
+				mci.BaseImponibleOriginal = invoiceInOriginal.taxableBase,
+				mci.CuotaIvaOriginal = invoiceInOriginal.vat,
+				mci.ClaveOperacionFactura = co.ClaveOperacionFactura_
+			WHERE mci.id = vXDiarioFk;
+
+	END IF;
 END$$
-DELIMITER ;
+DELIMITER ;

db/routines/sage/procedures/pgc_add.sql

@@ -17,13 +17,13 @@ BEGIN
 						e.id accountFk,
 						UCASE(e.name),
 						''
-					FROM expense e
+					FROM vn.expense e
 					UNION 
 					SELECT company_getCode(vCompanyFk),
 							a.account, 
 							UCASE(a.bank),
 							'' 
-						FROM accounting a
+						FROM vn.accounting a
 						WHERE a.isActive
 							AND a.`account`
 					UNION 

db/routines/vn/functions/travel_hasUniqueAwb.sql

@@ -0,0 +1,28 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`travel_hasUniqueAwb`(
+	vSelf INT
+)
+	RETURNS BOOL
+	READS SQL DATA
+BEGIN
+/**
+ * Comprueba que el travel pasado tiene un AWB lógico, 
+ * no se pueden tener varios AWB asociados al mismo DUA
+ *
+ * @param vSelf Id del travel
+ */
+	DECLARE vHasUniqueAwb BOOL DEFAULT TRUE;
+
+	SELECT NOT COUNT(t2.awbFk) INTO vHasUniqueAwb
+		FROM entry e 
+			JOIN travel t ON t.id = e.travelFk 
+			JOIN duaEntry de ON de.entryFk = e.id 
+			JOIN duaEntry de2 ON de2.duaFk = de.duaFk 
+			JOIN entry e2 ON e2.id = de2.entryFk 
+			JOIN travel t2 ON t2.id = e2.travelFk 
+		WHERE t.id = vSelf
+			AND t2.awbFk <> t.awbFk;
+
+	RETURN vHasUniqueAwb;
+END$$
+DELIMITER ;

db/routines/vn/procedures/absoluteInventoryHistory.sql

@@ -0,0 +1,102 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`absoluteInventoryHistory`(
+	vItemFk INT,
+	vWarehouseFk INT,
+	vDate DATETIME
+)
+BEGIN
+/**
+* Calcula y proporciona un historial de inventario absoluto
+* para un artículo específico en un almacén dado
+* hasta una fecha determinada.
+*
+* @param vItemFk Id de artículo
+* @param vWarehouseFk Id de almacén
+* @param vDate Fecha
+*/
+	DECLARE vCalculatedInventory INT;
+	DECLARE vToday DATETIME DEFAULT util.VN_CURDATE();
+	DECLARE vStartDate DATE DEFAULT '2001-01-01';
+
+	CREATE OR REPLACE TEMPORARY TABLE tHistoricalPast
+		ENGINE = MEMORY
+		SELECT *
+			FROM (
+				SELECT tr.landed `date`,
+						b.quantity input,
+						NULL `output`,
+						tr.isReceived ok,
+						s.name alias,
+						e.invoiceNumber reference,
+						e.id id,
+						tr.isDelivered f5
+					FROM buy b
+						JOIN `entry` e ON e.id = b.entryFk
+						JOIN travel tr ON tr.id = e.travelFk
+						JOIN supplier s ON s.id = e.supplierFk
+					WHERE tr.landed >= vStartDate
+						AND s.id <> (SELECT supplierFk FROM inventoryConfig)
+						AND vWarehouseFk IN (tr.warehouseInFk, 0)
+						AND b.itemFk = vItemFk
+						AND NOT e.isExcludedFromAvailable
+						AND NOT e.isRaid
+				UNION ALL
+				SELECT tr.shipped,
+						NULL,
+						b.quantity,
+						tr.isDelivered,
+						s.name,
+						e.invoiceNumber,
+						e.id,
+						tr.isDelivered
+					FROM buy b
+						JOIN `entry` e ON e.id = b.entryFk
+						JOIN travel tr ON tr.id = e.travelFk
+						JOIN supplier s ON s.id = e.supplierFk
+					WHERE tr.shipped >= vStartDate
+						AND vWarehouseFk = tr.warehouseOutFk
+						AND s.id <> (SELECT supplierFk FROM inventoryConfig)
+						AND b.itemFk = vItemFk
+						AND NOT e.isExcludedFromAvailable
+						AND NOT e.isRaid
+				UNION ALL
+				SELECT t.shipped,
+						NULL,
+						m.quantity,
+						(m.isPicked OR t.isLabeled OR t.refFk IS NOT NULL),
+						t.nickname,
+						t.refFk,
+						t.id,
+						t.isPrinted
+					FROM sale m
+						JOIN ticket t ON t.id = m.ticketFk
+						JOIN client c ON c.id = t.clientFk
+					WHERE t.shipped >= vStartDate
+						AND m.itemFk = vItemFk
+						AND vWarehouseFk IN (t.warehouseFk, 0)
+			) t1
+			ORDER BY `date`, input DESC, ok DESC;
+
+	SELECT SUM(input) - SUM(`output`) INTO vCalculatedInventory
+		FROM tHistoricalPast
+			WHERE `date` < vDate;
+
+	SELECT p1.*, NULL v_virtual 
+		FROM (
+			SELECT vDate `date`,
+				vCalculatedInventory input,
+				NULL `output`,
+				1 ok,
+				'Inventario calculado' alias,
+				'' reference,
+				0 id,
+				1 f5
+			UNION ALL
+			SELECT *
+				FROM tHistoricalPast
+					WHERE `date` >= vDate
+			) p1;
+	
+	DROP TEMPORARY TABLE tHistoricalPast;
+END$$
+DELIMITER ;

db/routines/vn/procedures/entry_checkBooked.sql

@@ -0,0 +1,22 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_checkBooked`(
+	vSelf INT
+)
+BEGIN
+/**
+ * Comprueba si una entrada está contabilizada,
+ * y si lo está retorna un throw.
+ *
+ * @param vSelf Id de entrada
+ */
+	DECLARE vIsBooked BOOL;
+
+	SELECT isBooked INTO vIsBooked
+		FROM `entry`
+		WHERE id = vSelf;
+
+	IF vIsBooked THEN
+		CALL util.throw('Entry is already booked');
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/procedures/invoiceInTax_recalc.sql

@@ -10,20 +10,15 @@ BEGIN
  * @param vInvoiceInFk Id de factura recibida
  */
 	DECLARE vRate DOUBLE DEFAULT 1;
-	DECLARE vDated DATE;
+	DECLARE vExpenseFk VARCHAR(10);
-	DECLARE vExpenseFk INT;
 
-	SELECT MAX(rr.dated) INTO vDated
+	SELECT `value` INTO vRate
 		FROM referenceRate rr
 			JOIN invoiceIn ii ON ii.id = vInvoiceInFk
 		WHERE rr.dated <= ii.issued
-			AND rr.currencyFk = ii.currencyFk;
+			AND rr.currencyFk = ii.currencyFk
-
+		ORDER BY dated DESC
-	IF vDated THEN
+		LIMIT 1;
-		SELECT `value` INTO vRate
-			FROM referenceRate
-			WHERE dated = vDated;
-	END IF;
 
 	DELETE FROM invoiceInTax WHERE invoiceInFk = vInvoiceInFk;
 

db/routines/vn/procedures/invoiceIn_add.sql

@@ -1,234 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`invoiceIn_add`(vInvoiceInFk INT, vXDiarioFk INT)
-BEGIN
-/**
- * Traslada la info de contabilidad relacionada con las facturas recibidas
- *
- * @vInvoiceInFk Factura recibida
- * @vXDiarioFk Id tabla XDiario
- */
-    DECLARE vInvoiceInOriginalFk INT;
-	DECLARE vDone BOOL DEFAULT FALSE;
-	DECLARE vBase DOUBLE;
-	DECLARE vVat DOUBLE;
-	DECLARE vRate DOUBLE;
-	DECLARE vTransactionCode INT;
-	DECLARE vCounter INT DEFAULT 0;
-	DECLARE vTransactionCodeOld INT;
-	DECLARE vTaxCode INT;
-	DECLARE vTaxCodeOld INT;
-	DECLARE vOperationCode VARCHAR(1);
-	DECLARE vIsIntracommunity BOOL DEFAULT FALSE;
-	DECLARE vSerialDua VARCHAR(1) DEFAULT 'D';
-	DECLARE vInvoiceTypeReceived VARCHAR(1);
-	DECLARE vInvoiceTypeInformative VARCHAR(1);
-	DECLARE vIsInformativeExportation BOOL DEFAULT FALSE;
-
-	DECLARE vCursor CURSOR FOR
-		SELECT it.taxableBase,
-				CAST((( it.taxableBase / 100) * t.PorcentajeIva) AS DECIMAL (10,2)),
-				t.PorcentajeIva,
-				it.transactionTypeSageFk,
-				it.taxTypeSageFk,
-				tty.isIntracommunity,
-				tt.ClaveOperacionDefecto
-			FROM vn.invoiceIn i
-				JOIN vn.invoiceInTax it ON it.InvoiceInFk = i.id
-				JOIN TiposIva t ON t.CodigoIva = it.taxTypeSageFk
-				JOIN taxType tty ON tty.id = t.CodigoIva
-				JOIN TiposTransacciones tt ON tt.CodigoTransaccion = it.transactionTypeSageFk
-				LEFT JOIN vn.dua d ON d.id = vInvoiceInFk
-			WHERE i.id = vInvoiceInFk
-				AND d.id IS NULL;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
-	DELETE FROM movContaIVA
-		WHERE id = vXDiarioFk;
-
-	SELECT codeSage INTO vInvoiceTypeReceived
-		FROM invoiceType WHERE code ='received';
-
-	SELECT codeSage INTO vInvoiceTypeInformative
-		FROM invoiceType WHERE code ='informative';
-
-	INSERT INTO movContaIVA(id, LibreA1)
-		VALUES (vXDiarioFk, vInvoiceInFk);
-
-	OPEN vCursor;
-
-	l: LOOP
-		FETCH vCursor INTO vBase,
-				vVat,
-				vRate,
-				vTransactionCode,
-				vTaxCode,
-				vIsIntracommunity,
-				vOperationCode;
-
-		IF vDone THEN
-			LEAVE l;
-		END IF;
-
-		SET vTransactionCodeOld = vTransactionCode;
-		SET vTaxCodeOld = vTaxCode;
-
-		IF vOperationCode IS NOT NULL THEN
-			UPDATE movContaIVA
-				SET ClaveOperacionFactura = vOperationCode
-				WHERE id = vXDiarioFk;
-		END IF;
-
-		SET vCounter = vCounter + 1;
-		CASE vCounter
-			WHEN 1 THEN
-				 UPDATE movContaIVA
-					SET BaseIva1 = vBase,
-						PorIva1 = vRate,
-						CuotaIva1 = vVat,
-						CodigoTransaccion1 = vTransactionCode,
-						CodigoIva1 = vTaxCode
-					WHERE id = vXDiarioFk;
-
-			WHEN 2 THEN
-				UPDATE movContaIVA
-					SET BaseIva2 = vBase,
-						PorIva2 = vRate,
-						CuotaIva2 = vVat,
-						CodigoTransaccion2 = vTransactionCode,
-						CodigoIva2 = vTaxCode
-					WHERE id = vXDiarioFk;
-			WHEN 3 THEN
-				UPDATE movContaIVA
-					SET BaseIva3 = vBase,
-						PorIva3 = vRate,
-						CuotaIva3 = vVat,
-						CodigoTransaccion3 = vTransactionCode,
-						CodigoIva3 = vTaxCode
-					WHERE id = vXDiarioFk;
-			WHEN 4 THEN
-				UPDATE movContaIVA
-					SET BaseIva4 = vBase,
-						PorIva4 = vRate,
-						CuotaIva4 = vVat,
-						CodigoTransaccion4 = vTransactionCode,
-						CodigoIva4 = vTaxCode
-					WHERE id = vXDiarioFk;
-			ELSE
-				SELECT vXDiarioFk INTO vXDiarioFk;
-		END CASE;
-
-		IF vIsIntracommunity THEN
-			UPDATE movContaIVA
-				SET Intracomunitaria = TRUE
-				WHERE id = vXDiarioFk;
-		END IF;
-
-		SET vTransactionCodeOld = vTransactionCode;
-		SET vTaxCodeOld = vTaxCode;
-
-	END LOOP;
-
-	CLOSE vCursor;
-
-	SELECT d.ASIEN AND x.ASIEN IS NULL INTO vIsInformativeExportation
-		FROM vn.dua d
-			LEFT JOIN vn.XDiario x ON x.ASIEN = d.ASIEN
-				AND x.SERIE = vSerialDua COLLATE utf8mb3_unicode_ci
-		WHERE d.ASIEN = (
-			SELECT ASIEN
-				FROM vn.XDiario
-				WHERE id = vXDiarioFk)
-		LIMIT 1;
-
-	UPDATE movContaIVA mci
-			JOIN tmp.invoiceIn ii ON ii.id = vInvoiceInFk
-			JOIN vn.XDiario x ON x.id = mci.id
-			LEFT JOIN tmp.invoiceDua id ON id.id = mci.id
-			JOIN vn.supplier s ON s.id = ii.supplierFk
-			JOIN Naciones n ON n.countryFk = s.countryFk
-		SET mci.CodigoDivisa = ii.currencyFk,
-			mci.Año = YEAR(ii.issued),
-			mci.Serie = ii.serial,
-			mci.Factura = ii.id,
-			mci.FechaFactura = ii.issued,
-			mci.ImporteFactura = IFNULL(mci.BaseIva1, 0) + IFNULL(mci.CuotaIva1, 0) +
-								IFNULL(mci.BaseIva2, 0) + IFNULL(mci.CuotaIva2, 0) +
-								IFNULL(mci.BaseIva3, 0) + IFNULL(mci.CuotaIva3, 0) +
-								IFNULL(mci.BaseIva4, 0) + IFNULL(mci.CuotaIva4, 0),
-			mci.TipoFactura = IF(id.id,
-				IF( ii.serial = vSerialDua COLLATE utf8mb3_unicode_ci, vInvoiceTypeReceived, vInvoiceTypeInformative),
-				IF(vIsInformativeExportation,vInvoiceTypeInformative, vInvoiceTypeReceived)),
-			mci.CodigoCuentaFactura = x.SUBCTA,
-			mci.CifDni = IF(LEFT(TRIM(s.nif), 2) = n.SiglaNacion, SUBSTRING(TRIM(s.nif), 3), s.nif),
-			mci.Nombre = s.name,
-			mci.SiglaNacion = n.SiglaNacion,
-			mci.EjercicioFactura = YEAR(ii.issued),
-			mci.FechaOperacion = ii.issued,
-			mci.MantenerAsiento = TRUE,
-			mci.SuFacturaNo = ii.supplierRef,
-			mci.IvaDeducible1 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva1, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
-			mci.IvaDeducible2 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva2, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
-			mci.IvaDeducible3 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva3, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
-			mci.IvaDeducible4 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva4, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
-			mci.FechaFacturaOriginal = x.FECHA_EX
-		WHERE mci.id = vXDiarioFk;
-
-	-- RETENCIONES
-	UPDATE movContaIVA mci
-			JOIN vn.invoiceIn ii ON ii.id = vInvoiceInFk
-			JOIN vn.XDiario x ON x.id = mci.id
-			JOIN vn.supplier s ON s.id = supplierFk
-			JOIN vn.invoiceInTax iit ON iit.invoiceInFk = ii.id
-			JOIN vn.expense e ON e.id = iit.expenseFk
-			JOIN TiposRetencion t ON t.CodigoRetencion = ii.withholdingSageFk
-			LEFT JOIN tmp.invoiceDua id ON id.id = mci.id
-			JOIN (SELECT SUM(x2.BASEEURO) taxableBase, SUM(x2.EURODEBE) taxBase
-					FROM vn.XDiario x1
-						JOIN vn.XDiario x2 ON x1.ASIEN = x2.ASIEN
-					WHERE x2.BASEEURO <> 0
-						AND x1.id = vXDiarioFk
-				)sub
-			JOIN ClavesOperacion co ON co.Descripcion = 'Arrendamiento de locales de negocio'
-		SET mci.CodigoRetencion = t.CodigoRetencion,
-			mci.ClaveOperacionFactura = IF( t.Retencion = 'ARRENDAMIENTO Y SUBARRENDAMIENTO', co.ClaveOperacionFactura_, mci.ClaveOperacionFactura),
-			mci.BaseRetencion = IF (t.Retencion = 'ACTIVIDADES AGRICOLAS O GANADERAS', sub.taxableBase + sub.taxBase, sub.taxableBase),
-			mci.PorRetencion = t.PorcentajeRetencion,
-			mci.ImporteRetencion = iit.taxableBase * - 1
-		WHERE mci.id = vXDiarioFk
-			AND e.name = 'Retenciones'
-			AND id.id IS NULL;
-
-	SELECT correctedFk INTO vInvoiceInOriginalFk
-		FROM vn.invoiceInCorrection
-		WHERE correctingFk = vInvoiceInFk;
-
-	IF vInvoiceInOriginalFk THEN 
-
-		UPDATE movContaIVA mci
-				JOIN vn.invoiceInRefund iir ON iir.invoiceInRefundFk = vInvoiceInFk
-				JOIN (SELECT issued,
-							SUM(sub.taxableBase) taxableBase, 
-							SUM(ROUND((sub.taxableBase * sub.PorcentajeIva) / 100 , 2)) vat
-						FROM(SELECT issued,
-									SUM(iit.taxableBase) taxableBase, 
-									ti.PorcentajeIva
-								FROM vn.invoiceIn i 
-									JOIN vn.invoiceInTax iit ON iit.invoiceInFk = i.id
-									JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk
-								WHERE i.id = vInvoiceInOriginalFk
-								GROUP BY ti.CodigoIva)sub
-					)invoiceInOriginal
-				JOIN ClavesOperacion co ON co.Descripcion = 'Factura rectificativa'
-			SET mci.TipoRectificativa = iir.refundCategoryFk,
-				mci.ClaseAbonoRectificativas = iir.refundType, 
-				mci.FechaFacturaOriginal = invoiceInOriginal.issued,
-				mci.FechaOperacion = invoiceInOriginal.issued,
-				mci.BaseImponibleOriginal = invoiceInOriginal.taxableBase,
-				mci.CuotaIvaOriginal = invoiceInOriginal.vat,
-				mci.ClaveOperacionFactura = co.ClaveOperacionFactura_
-			WHERE mci.id = vXDiarioFk;
-
-	END IF;
-END$$
-DELIMITER ;

db/routines/vn/procedures/sale_replaceItem.sql

@@ -104,7 +104,7 @@ BEGIN
 			price)
 		SELECT vTicketFk,
 				vNewItemFk,
-				CEIL(vQuantity / vRoundQuantity) * vRoundQuantity, CONCAT('+ ',i.longName),
+				CEIL(vQuantity / vRoundQuantity) * vRoundQuantity, CONCAT('+ ', i.name),
 				vFinalPrice
 			FROM vn.item i
 			WHERE id = vNewItemFk;

db/routines/vn/procedures/ticketClon.sql

@@ -1,55 +1,10 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticketClon`(vTicketFk INT, vNewShipped DATE)
 BEGIN
-	
-    DECLARE done INT DEFAULT FALSE;
-	DECLARE vNewTicketFk INT;    
-	DECLARE vOldSaleFk INT;
-    DECLARE vNewSaleFk INT;
-    
-    DECLARE cur1 CURSOR FOR
-		SELECT id
-			FROM vn.sale
-            WHERE ticketFk = vTicketFk;
-            
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
-    
-    SET vNewShipped = IFNULL(vNewShipped, util.VN_CURDATE());
-        
-    CALL vn.ticket_Clone(vTicketFk, vNewTicketFk);
-    
-    UPDATE vn.ticket 
-		SET landed = TIMESTAMPADD(DAY, DATEDIFF(vNewShipped, shipped), landed),
-			shipped = vNewShipped
-        WHERE id = vNewTicketFk;
-        
-	OPEN cur1;
-    
-	read_loop: LOOP
- 
-    FETCH cur1 INTO vOldSaleFk;
-    
-    IF done THEN
-      LEAVE read_loop;
-    END IF;
-    
-		INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price, discount, priceFixed, isPriceFixed)
-			SELECT vNewTicketFk, itemFk, quantity, concept, price, discount, priceFixed, isPriceFixed
-				FROM vn.sale
-                WHERE id = vOldSaleFk;
-        
-        SELECT max(id) INTO vNewSaleFk
-			FROM vn.sale
-            WHERE ticketFk = vNewTicketFk;
-        
-		INSERT INTO vn.saleComponent(saleFk, componentFk, value, isGreuge)
-			SELECT vNewSaleFk, componentFk, value, isGreuge
-				FROM vn.saleComponent
-                WHERE saleFk = vOldSaleFk;
-    
-	END LOOP;
 
-	CLOSE cur1;
+	DECLARE vNewTicketFk INT;
-    
+
+	CALL ticket_cloneAll(vTicketFk, vNewShipped, TRUE, vNewTicketFk);
+
 END$$
 DELIMITER ;

db/routines/vn/procedures/ticket_cloneAll.sql

@@ -0,0 +1,55 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_cloneAll`(vTicketFk INT, vNewShipped DATE, vWithWarehouse BOOLEAN, OUT vNewTicketFk INT)
+BEGIN
+	
+	DECLARE vDone BOOLEAN DEFAULT FALSE;
+	DECLARE vOldSaleFk INT;
+	DECLARE vNewSaleFk INT;
+	
+	DECLARE cur1 CURSOR FOR
+		SELECT id
+			FROM sale
+			WHERE ticketFk = vTicketFk;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+	
+	SET vNewShipped = IFNULL(vNewShipped, util.VN_CURDATE());
+
+	CALL ticket_Clone(vTicketFk, vNewTicketFk);
+	
+	UPDATE ticket 
+		SET landed = TIMESTAMPADD(DAY, DATEDIFF(vNewShipped, shipped), landed),
+			shipped = vNewShipped,
+			warehouseFk = IF(vWithWarehouse, warehouseFk, NULL)
+		WHERE id = vNewTicketFk;
+		
+	OPEN cur1;
+	
+	read_loop: LOOP
+ 
+		FETCH cur1 INTO vOldSaleFk;
+	
+		IF vDone THEN
+			LEAVE read_loop;
+		END IF;
+	
+		INSERT INTO sale(ticketFk, itemFk, quantity, concept, price, discount, priceFixed, isPriceFixed)
+			SELECT vNewTicketFk, itemFk, quantity, concept, price, discount, priceFixed, isPriceFixed
+				FROM sale
+				WHERE id = vOldSaleFk;
+		
+		SELECT max(id) INTO vNewSaleFk
+			FROM sale
+			WHERE ticketFk = vNewTicketFk;
+		
+		INSERT INTO saleComponent(saleFk, componentFk, value, isGreuge)
+			SELECT vNewSaleFk, componentFk, value, isGreuge
+				FROM saleComponent
+				WHERE saleFk = vOldSaleFk;
+	
+	END LOOP;
+
+	CLOSE cur1;
+	
+END$$
+DELIMITER ;

db/routines/vn/procedures/zone_getCollisions.sql

@@ -1,8 +1,9 @@
 DELIMITER $$
+
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getCollisions`()
 BEGIN
 /**
- * Calcula si para un mismo codigo postal y dia 
+ * Calcula si para un mismo codigo postal y dia
  * hay mas de una zona configurada y manda correo
  *
  */
@@ -10,17 +11,18 @@ BEGIN
 	DECLARE vZoneFk INT;
 	DECLARE vIsDone INT DEFAULT FALSE;
 	DECLARE vTableCollisions TEXT;
+    DECLARE json_data JSON;
 	DECLARE cur1 CURSOR FOR SELECT zoneFk from tmp.zoneOption;
-		
+
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vIsDone = TRUE;
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.zone;
 	CREATE TEMPORARY TABLE tmp.zone
-		SELECT z.id 
+		SELECT z.id
 			FROM zone z
 				JOIN agencyMode am ON am.id = z.agencyModeFk
 				JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
-			WHERE dm.code IN ('AGENCY','DELIVERY'); 
+			WHERE dm.code IN ('AGENCY','DELIVERY');
 
 	CALL zone_getOptionsForShipment(util.VN_CURDATE(),FALSE);
 
@@ -35,7 +37,7 @@ BEGIN
 			PRIMARY KEY zoneFkk (zoneFk, geoFk),
 			INDEX(geoFk))
 			ENGINE = MyISAM;
-		
+
 	OPEN cur1;
 	cur1Loop: LOOP
 		SET vIsDone = FALSE;
@@ -43,82 +45,63 @@ BEGIN
 		IF vIsDone THEN
 			LEAVE cur1Loop;
 	    END IF;
-	   
+
 		CALL zone_getLeaves(vZoneFk, NULL, NULL, TRUE);
 
-		myLoop: LOOP	
+		myLoop: LOOP
 			SET vGeoFk = NULL;
-			SELECT geoFk INTO vGeoFk 
+			SELECT geoFk INTO vGeoFk
 				FROM tmp.zoneNodes zn
 				WHERE NOT isChecked
 				LIMIT 1;
-			
+
 			IF vGeoFk IS NULL THEN
 				LEAVE myLoop;
 			END IF;
-		
+
 			CALL zone_getLeaves(vZoneFk, vGeoFk, NULL, TRUE);
 			UPDATE tmp.zoneNodes
-				SET isChecked = TRUE 
+				SET isChecked = TRUE
 				WHERE geoFk = vGeoFk;
 		END LOOP;
 
 	END LOOP;
 	CLOSE cur1;
-	DELETE FROM tmp.zoneNodes 
+	DELETE FROM tmp.zoneNodes
 		WHERE sons > 0;
-	
+
 	DROP TEMPORARY TABLE IF EXISTS geoCollision;
 	CREATE TEMPORARY TABLE geoCollision
 		SELECT z.agencyModeFk, zn.geoFk, zw.warehouseFk
 			FROM tmp.zoneNodes zn
 				JOIN zone z ON z.id = zn.zoneFk
-				JOIN zoneWarehouse zw ON z.id = zw.zoneFk 
+				JOIN zoneWarehouse zw ON z.id = zw.zoneFk
 	        GROUP BY z.agencyModeFk, zn.geoFk, zw.warehouseFk
 	        HAVING count(*) > 1;
-	
+
-	SELECT '<table  cellspacing="10">
+    -- Recojo los datos de la zona que ha dado conflicto
-				<tr>
+    SELECT JSON_ARRAYAGG(
-					<th>C.Postal</th>
+        JSON_OBJECT(
-					<th>Número de zona</th>
+            'zoneFk', zoneFk,
-					<th>Precio</th>
+            'zn',  JSON_OBJECT('name', zn.name),
-					<th>Zona</th>
+            'z',  JSON_OBJECT('name', z.name,'price', z.price),
-					<th>Almacén</th>
+            'w',  JSON_OBJECT('name', w.name)
-					<th>Salix</th>
+            )
-                 </tr>' INTO vTableCollisions;
+    ) FROM tmp.zoneNodes zn
-                
+    JOIN zone z ON z.id = zn.zoneFk
-    INSERT INTO mail (receiver,replyTo,subject,body)                
+    JOIN geoCollision gc ON gc.agencyModeFk = z.agencyModeFk AND zn.geoFk = gc.geoFk
-		SELECT 'pepe@verdnatura.es' receiver,
+    JOIN warehouse w ON w.id = gc.warehouseFk
-	           'noreply@verdnatura.es' replyTo,
+    INTO json_data;
-	            CONCAT('Colisiones en zonas ', util.VN_CURDATE()) subject,
+
-	            CONCAT(vTableCollisions,
+    -- Creo un registro de la notificacion 'zone-included' para reportar via email
-	            	GROUP_CONCAT(sub.td SEPARATOR ''),
+    SELECT util.notification_send(
-	            	'</table>') body
+        'zone-included',
-			FROM(SELECT 
+            JSON_OBJECT('zoneCollisions',json_data),
-					CONCAT('<tr>
+        account.myUser_getId()
-						<td>', zn.name, '</td>
+    );
-						<td>', zoneFk,'</td>
+
-						<td>', z.price,'</td>
+	DROP TEMPORARY TABLE
-						<td>', z.name,'</td>
+		geoCollision,
-						<td>', w.name, '</td>
-						<td>', CONCAT('<a href="https://salix.verdnatura.es/#!/zone/', 
-								zoneFk,
-								'/location?q=%7B%22search%22:%22',
-								zn.name, 
-								'%22%7D">'
-								'https://salix.verdnatura.es/#!/zone/', 
-								zoneFk,
-								'/location?q=%7B%22search%22:%22',
-								zn.name, 
-								'%22%7D</a>'),'</td>
-						</tr>') td
-				FROM tmp.zoneNodes zn
-					JOIN zone z ON z.id = zn.zoneFk
-					JOIN geoCollision gc ON gc.agencyModeFk = z.agencyModeFk AND zn.geoFk = gc.geoFk
-					JOIN warehouse w ON w.id = gc.warehouseFk) sub;
-			
-	DROP TEMPORARY TABLE 
-		geoCollision, 
 		tmp.zone,
 		tmp.zoneNodes;
 END$$

db/routines/vn/triggers/buy_beforeDelete.sql

@@ -3,6 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`buy_beforeDelete`
 	BEFORE DELETE ON `buy`
 	FOR EACH ROW
 BEGIN 
+	CALL entry_checkBooked(OLD.entryFk);
 	IF OLD.printedStickers <> 0 THEN
 		CALL util.throw("it is not possible to delete buys with printed labels ");
 	END IF;

db/routines/vn/triggers/buy_beforeInsert.sql

@@ -9,17 +9,26 @@ trig: BEGIN
 	DECLARE vGroupingMode TINYINT;
 	DECLARE vGenericFk INT;
 	DECLARE vGenericInDate BOOL;
+	DECLARE vBuyerFk INT;
 
 	IF @isModeInventory THEN
 		LEAVE trig;
 	END IF;
 
+	CALL entry_checkBooked(NEW.entryFk);
 	IF NEW.printedStickers <> 0 THEN
 		CALL util.throw('it is not possible to create buy lines with printedstickers other than 0');
 	END IF;
 
 	SET NEW.editorFk = account.myUser_getId();
 
+	SELECT it.workerFk INTO vBuyerFk
+		FROM item i
+			JOIN itemType it ON it.id = i.typeFk
+		WHERE i.id = NEW.itemFk;
+
+	SET NEW.buyerFk = vBuyerFk;
+
 	CALL buy_checkGrouping(NEW.`grouping`);
 
 	SELECT t.warehouseInFk, t.landed

db/routines/vn/triggers/buy_beforeUpdate.sql

@@ -7,11 +7,13 @@ trig:BEGIN
 	DECLARE vGenericInDate BOOL;
 	DECLARE vIsInventory BOOL;
 	DECLARE vDefaultEntry INT;
+	DECLARE vBuyerFk INT;
 
 	IF @isTriggerDisabled THEN
 		LEAVE trig;
 	END IF;
 
+	CALL entry_checkBooked(OLD.entryFk);
 	SET NEW.editorFk = account.myUser_getId();
 
 	SELECT defaultEntry INTO vDefaultEntry
@@ -65,6 +67,15 @@ trig:BEGIN
 		SET	NEW.isIgnored = TRUE;
 	END IF;
 
+	IF NOT (NEW.itemFk <=> OLD.itemFk) THEN
+		SELECT it.workerFk INTO vBuyerFk
+			FROM item i
+				JOIN itemType it ON it.id = i.typeFk
+			WHERE i.id = NEW.itemFk;
+
+		SET NEW.buyerFk = vBuyerFk;
+	END IF;
+
 	IF NOT (NEW.itemFk <=> OLD.itemFk) OR 
 		NOT (OLD.entryFk <=> NEW.entryFk) THEN		
 		CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck

db/routines/vn/triggers/entry_beforeDelete.sql

@@ -3,6 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entry_beforeDelete`
 	BEFORE DELETE ON `entry`
 	FOR EACH ROW
 BEGIN
+	CALL entry_checkBooked(OLD.id);
 	DELETE FROM buy WHERE entryFk = OLD.id;
 END$$
 DELIMITER ;

db/routines/vn/triggers/entry_beforeInsert.sql

@@ -7,6 +7,8 @@ BEGIN
 	CALL supplier_checkIsActive(NEW.supplierFk);
 	SET NEW.currencyFk = entry_getCurrency(NEW.currencyFk, NEW.supplierFk);
 	SET NEW.commission = entry_getCommission(NEW.travelFk, NEW.currencyFk,NEW.supplierFk);
-
+	IF NEW.travelFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.travelFk) THEN
+		CALL util.throw('The travel is incorrect, there is a different AWB in the associated entries');	
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/entry_beforeUpdate.sql

@@ -6,15 +6,24 @@ BEGIN
 	DECLARE vIsVirtual BOOL;
 	DECLARE vPrintedCount INT;
 	DECLARE vHasDistinctWarehouses BOOL;
+	
+	IF NEW.isBooked = OLD.isBooked THEN
+		CALL entry_checkBooked(OLD.id);
+	END IF;
 
 	SET NEW.editorFk = account.myUser_getId();
 
-	IF !(NEW.travelFk <=> OLD.travelFk) THEN
+	IF NOT (NEW.travelFk <=> OLD.travelFk) THEN
+
+		IF NEW.travelFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.travelFk) THEN
+			CALL util.throw('The travel is incorrect, there is a different AWB in the associated entries');	
+		END IF;
+	
 		SELECT COUNT(*) > 0 INTO vIsVirtual
 			FROM entryVirtual WHERE entryFk = NEW.id;
 
-		SELECT !(o.warehouseInFk <=> n.warehouseInFk)
+		SELECT NOT (o.warehouseInFk <=> n.warehouseInFk)
-			OR !(o.warehouseOutFk <=> n.warehouseOutFk)
+			OR NOT (o.warehouseOutFk <=> n.warehouseOutFk)
 			INTO vHasDistinctWarehouses
 			FROM travel o, travel n
 			WHERE o.id = OLD.travelFk
@@ -43,9 +52,8 @@ BEGIN
 		SET NEW.currencyFk = entry_getCurrency(NEW.currencyFk, NEW.supplierFk);
 	END IF;
 
-	IF NOT (NEW.travelFk <=> OLD.travelFk)		
+	IF NOT (NEW.travelFk <=> OLD.travelFk) OR NOT (NEW.currencyFk <=> OLD.currencyFk) THEN 
-	OR NOT (NEW.currencyFk <=> OLD.currencyFk) THEN 		
+		SET NEW.commission = entry_getCommission(NEW.travelFk, NEW.currencyFk, NEW.supplierFk);
-		SET NEW.commission = entry_getCommission(NEW.travelFk, NEW.currencyFk,NEW.supplierFk);		
 	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/travel_afterUpdate.sql

@@ -5,7 +5,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travel_afterUpdate`
 BEGIN
 	CALL stock.log_add('travel', NEW.id, OLD.id);
 
-	IF !(NEW.shipped <=> OLD.shipped) THEN
+	IF NOT(NEW.shipped <=> OLD.shipped) THEN
 		UPDATE entry 
 			SET commission = entry_getCommission(travelFk, currencyFk,supplierFk)
 			WHERE travelFk = NEW.id;
@@ -23,5 +23,9 @@ BEGIN
 			CALL buy_checkItem();
 		END IF;
 	END IF;
+
+	IF (NOT(NEW.awbFk <=> OLD.awbFk)) AND NEW.awbFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.id) THEN
+		CALL util.throw('The AWB is incorrect, there is a different AWB in the associated entries');
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/travel_beforeInsert.sql

@@ -8,5 +8,9 @@ BEGIN
 	CALL travel_checkDates(NEW.shipped, NEW.landed);
 
 	CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk);
+	
+	IF NEW.awbFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.id) THEN
+		CALL util.throw('The AWB is incorrect, there is a different AWB in the associated entries');	
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/zoneIncluded_afterDelete.sql

@@ -8,5 +8,6 @@ BEGIN
 			`changedModel` = 'zoneIncluded',
 			`changedModelId` = OLD.zoneFk,
 			`userFk` = account.myUser_getId();
+
 END$$
 DELIMITER ;

db/routines/vn/triggers/zoneIncluded_beforeInsert.sql

@@ -4,5 +4,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneIncluded_beforeIn
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
 END$$
 DELIMITER ;

db/routines/vn/triggers/zoneIncluded_beforeUpdate.sql

@@ -4,5 +4,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneIncluded_beforeUp
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+
 END$$
 DELIMITER ;

db/routines/vn/views/salesPersonSince.sql

@@ -12,5 +12,5 @@ FROM (
 			`pc`.`id` = `b`.`workerBusinessProfessionalCategoryFk`
 		)
 	)
-WHERE `pc`.`name` = 'Aux ventas'
+WHERE `pc`.`description` = 'Aux ventas'
 GROUP BY `b`.`workerFk`

db/routines/vn2008/procedures/add_awb_component.sql

@@ -1,61 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`add_awb_component`(IN vAwbFk SMALLINT)
-BEGIN
-
-	DECLARE vShipped DATE;
-	DECLARE vHasStems BOOLEAN;
-
-	SELECT t.shipped, IF(a.stems, TRUE, FALSE)  
-			INTO vShipped, vHasStems
-		FROM vn.travel t
-			JOIN vn.awb a ON a.id = t.awbFk
-		WHERE awbFk = vAwbFk 
-		LIMIT 1;
-
-	INSERT IGNORE INTO awb_component (awb_id,Id_Proveedor,awb_component_type_id,awb_role_id,awb_unit_id,value,Id_Moneda) 
-		SELECT id, Id_Proveedor, awb_component_type_id, awb_role_id,awb_unit_id, LEAST(GREATEST(value1, IFNULL(min_value, value1)), IFNULL(max_value, value1)), Id_Moneda
-			FROM (
-				SELECT a.id,
-						IFNULL(act.carguera_id,
-							CASE awb_role_id 
-								WHEN 1 THEN a.carguera_id 
-								WHEN 2 THEN a.transitario_id 
-								WHEN 3 THEN f.airline_id 
-							END
-						) Id_Proveedor, 
-						act.awb_component_type_id,
-						act.awb_role_id,
-						act.awb_unit_id, 
-						value *
-							CASE awb_unit_id
-								WHEN '1000Tj-20' THEN ((CAST(stems AS SIGNED) - 20000)/1000) + (min_value / value)
-								WHEN '1000Tj-10' THEN ((CAST(stems AS SIGNED) - 10000)/1000) + (min_value / value)
-								WHEN '100GW' THEN peso/100 
-								WHEN 'AWB' THEN 1 -- No action
-								WHEN 'FB' THEN hb/2
-								WHEN 'GW' THEN peso
-								WHEN 'TW' THEN GREATEST(peso,volume_weight)
-								WHEN 'PN' THEN LEAST(90, value + a.propertyNumber * 10)
-							END value1, 
-						value,
-						act.Id_Moneda, 
-						act.min_value, 
-						act.max_value
-					FROM awb a 
-						JOIN flight f ON f.flight_id = a.flight_id 
-						LEFT JOIN awb_component_template act ON 
-							((IFNULL(act.carguera_id, a.carguera_id) = a.carguera_id AND awb_role_id = 1) 
-								OR (IFNULL(act.carguera_id, a.transitario_id) = a.transitario_id AND awb_role_id = 2)
-								OR (IFNULL(act.airline_id, f.airline_id) = f.airline_id AND awb_role_id = 3)
-								OR (awb_role_id = 4))
-							AND IFNULL(act.airport_out, f.airport_out) = f.airport_out 
-							AND IFNULL(act.airport_in, f.airport_in) = f.airport_in 
-							AND IFNULL(act.airline_id, f.airline_id) = f.airline_id 
-							AND INSTR(IFNULL(act.days, WEEKDAY(vShipped) + 1),WEEKDAY(vShipped) + 1)
-						JOIN awb_component_type acty ON acty.awb_component_type_id = act.awb_component_type_id 
-					WHERE a.id = vAwbFk AND Fecha <= vShipped 
-						AND (vHasStems = TRUE OR acty.hasStems)
-					ORDER BY Fecha DESC, act.days DESC LIMIT 10000000000000000000
-				) t;
-END$$
-DELIMITER ;

db/routines/vn2008/procedures/agencyModeImbalance.sql

@@ -1,50 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`agencyModeImbalance`(vStarted DATE, vEnded DATE)
-BEGIN
-/**
- * Devuelve el valor de los precios teorico, practico de las agencias
- * y si ademas es de mrw lo compara con su fichero previamente procesado
- *
- * @param vEktFk Identificador de edi.ekt
- */
-	DECLARE vEndedDayEnd DATETIME;
-
-	SET vEndedDayEnd = util.dayEnd(vEnded);
-
-	SELECT t.id ticketFk,t.addressFk,
-			CAST(v.amount AS DECIMAL (10,2)) AS VN,
-			CAST(v.amount - e.shipping_charge AS DECIMAL (10,2)) AS Difer,
-			CAST(mrwPrice AS DECIMAL (10,2)) mrwPrice,
-			CAST(e.shipping_charge - mrwPrice AS DECIMAL (10,2)) mrwDifference,
-			CAST(e.shipping_charge AS DECIMAL (10,2)) AS teorico,
-			CAST(e.extraCharge AS DECIMAL (10,2)) AS extraCharge,
-			t.packages, t.clientFk,
-			t.zoneFk, a.provinceFk, mrwCount
-		FROM  vn.ticket t
-			LEFT JOIN
-			(SELECT ticketFk, SUM(amount) amount, fc.shipped
-				FROM vn.sale_freightComponent fc
-					JOIN vn.ticket t ON t.id = fc.ticketFk
-					JOIN tmp.agencyMode am ON am.agencyModeFk = t.agencyModeFk
-				WHERE fc.shipped BETWEEN vStarted AND vEndedDayEnd
-						GROUP BY ticketFk) v ON t.id = v.ticketFk
-			LEFT JOIN (SELECT t.id,
-								SUM(t.zonePrice) shipping_charge,
-								SUM(IFNULL(aex.price,0)) extraCharge
-							FROM vn.ticket t
-								LEFT JOIN vn.expedition e ON e.ticketFk = t.id
-								LEFT JOIN vn.packaging p ON p.id = e.packagingFk
-								JOIN tmp.agencyMode amc ON amc.agencyModeFk = t.agencyModeFk
-								JOIN vn.agencyMode am ON am.id = amc.agencyModeFk
-								LEFT JOIN vn.agencyExtraCharge aex ON p.width+p.depth+p.height BETWEEN aex.sizeMin AND aex.sizeMax AND aex.agencyFk = am.agencyFk
-							WHERE t.shipped BETWEEN vStarted AND vEndedDayEnd
-							GROUP BY t.id
-					) e ON t.id = e.id
-			LEFT JOIN (SELECT ticketFk, SUM(price) mrwPrice, COUNT(*) mrwCount
-							FROM vn.mrw
-							GROUP BY ticketFk) mrw ON mrw.ticketFk = t.id
-			JOIN vn.address a ON a.id = t.addressFk
-			JOIN tmp.agencyMode am ON am.agencyModeFk = t.agencyModeFk
-		WHERE t.shipped BETWEEN vStarted AND vEndedDayEnd;
-END$$
-DELIMITER ;

db/routines/vn2008/procedures/historico_absoluto.sql

@@ -1,91 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`historico_absoluto`(IN idART INT, IN wh INT, IN datfecha DATETIME)
-BEGIN
-
-	DECLARE inv_calculado INT;
-	DECLARE inv INT;
-	DECLARE today DATETIME;
-	DECLARE fecha_inv DATETIME;
-	
-	SET today = util.VN_CURDATE();
-
-	CREATE OR REPLACE TEMPORARY TABLE historico_pasado
-		SELECT *
-			FROM (
-				SELECT TR.landing Fecha,
-						C.Cantidad Entrada,
-						NULL Salida,
-						(TR.received != FALSE) OK,
-						P.Proveedor Alias,
-						E.Referencia Referencia,
-						E.Id_Entrada id,
-						TR.delivered F5
-					FROM Compres C -- mirar perque no entra en received
-						INNER JOIN Entradas E USING (Id_Entrada)
-						INNER JOIN travel TR ON TR.id = E.travel_id
-						INNER JOIN Proveedores P USING (Id_Proveedor)
-					WHERE TR.landing >= '2001-01-01'
-						AND Id_proveedor <> 4
-						AND wh IN (TR.warehouse_id , 0)
-						AND C.Id_Article = idART
-						AND E.Inventario = 0
-						AND E.Redada = 0
-				UNION ALL
-				SELECT TR.shipment Fecha,
-						NULL Entrada,
-						C.Cantidad Salida,
-						TR.delivered OK,
-						P.Proveedor Alias,
-						E.Referencia Referencia,
-						E.Id_Entrada id,
-						TR.delivered F5
-					FROM Compres C
-						INNER JOIN Entradas E USING (Id_Entrada)
-						INNER JOIN travel TR ON TR.id = E.travel_id
-						INNER JOIN Proveedores P USING (Id_Proveedor)
-					WHERE TR.shipment >= '2001-01-01'
-						AND wh = TR.warehouse_id_out
-						AND Id_Proveedor <> 4
-						AND C.Id_Article = idART
-						AND E.Inventario = 0
-						AND E.Redada = 0
-				UNION ALL
-				SELECT T.Fecha Fecha,
-						NULL Entrada,
-						M.Cantidad Salida,
-						(M.OK <> 0 OR T.Etiquetasemitidas <> 0 OR T.Factura IS NOT NULL) OK,
-						T.Alias Alias,
-						T.Factura Referencia,
-						T.Id_Ticket,
-						T.PedidoImpreso
-					FROM Movimientos M
-						INNER JOIN Tickets T USING (Id_Ticket)
-						JOIN Clientes C ON C.Id_Cliente = T.Id_Cliente
-					WHERE T.Fecha >= '2001-01-01'
-						AND M.Id_Article = idART
-						AND wh IN (T.warehouse_id , 0)
-			) t1 
-			ORDER BY Fecha, Entrada DESC, OK DESC;
-
-	SELECT sum(Entrada) - sum(Salida) INTO inv_calculado
-		FROM historico_pasado
-			WHERE Fecha < datfecha;
-
-	SELECT p1.*, NULL v_virtual 
-		FROM(
-			SELECT datfecha Fecha,
-				inv_calculado Entrada,
-				NULL Salida,
-				1 OK,
-				'Inventario calculado' Alias,
-				'' Referencia, 0 id,
-				1 F5
-			UNION ALL
-			SELECT * 
-				FROM historico_pasado
-					WHERE Fecha >= datfecha
-			) p1;
-	
-	DROP TEMPORARY TABLE historico_pasado;
-END$$
-DELIMITER ;

db/routines/vn2008/procedures/historico_multiple.sql

@@ -1,206 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`historico_multiple`(IN vItemFk INT)
-BEGIN
-
-	DECLARE vDateInventory DATETIME;
-
-	SELECT Fechainventario INTO vDateInventory FROM tblContadores;
-
-	SET @a = 0;
-
-	DROP TEMPORARY TABLE IF EXISTS hm1;
-
-	CREATE TEMPORARY TABLE hm1
-	SELECT DATE(Fecha) as Fecha,
-		   Entrada,
-		   Salida,
-		   OK,
-		   Referencia,
-		   Historia.id,
-		   
-		   wh,
-		   
-		   `name` as wh_name
-
-	FROM
-
-		( SELECT TR.landing as Fecha,
-				 C.Cantidad as Entrada,
-				 NULL as Salida,
-				 
-				 IF(warehouse_id = 44, 1, warehouse_id) as wh,
-				 (TR.received != FALSE) as OK,
-				 E.Referencia as Referencia,
-				 E.Id_Entrada as id
-				 
-				
-
-		  FROM Compres C
-		  INNER JOIN Entradas E USING (Id_Entrada)
-		  INNER JOIN travel TR ON TR.id = E.travel_id
-		  WHERE TR.landing >= vDateInventory
-		  AND C.Id_Article = vItemFk
-		  AND E.Redada = 0
-		  
-		  AND C.Cantidad <> 0
-		  
-		UNION ALL
-
-		  SELECT TR.shipment as Fecha,
-				 NULL as Entrada,
-				 C.Cantidad as Salida,
-				 warehouse_id_out as wh,
-				 TR.delivered as OK,
-				 E.Referencia as Referencia,
-				 E.Id_Entrada as id
-
-		  FROM Compres C
-		  INNER JOIN Entradas E USING (Id_Entrada)
-		  INNER JOIN travel TR ON TR.id = E.travel_id
-		  WHERE TR.shipment >= vDateInventory
-		  AND C.Id_Article = vItemFk
-		  
-		  AND E.Redada = 0
-		  
-		  AND C.Cantidad <> 0
-
-		UNION ALL
-
-		  SELECT T.Fecha as Fecha,
-				 NULL as Entrada,
-				 M.Cantidad as Salida,
-				 warehouse_id as wh,
-				 (M.OK <> 0 OR T.Etiquetasemitidas <> 0 OR T.Factura IS NOT NULL)  as OK,
-				 T.Factura as Referencia,
-				 T.Id_Ticket as id
-
-			FROM Movimientos M
-			INNER JOIN Tickets T USING (Id_Ticket)
-			WHERE T.Fecha >= vDateInventory
-				AND M.Id_Article = vItemFk
-
-		 ) AS Historia
-		 
-		 INNER JOIN warehouse ON warehouse.id = Historia.wh
-	ORDER BY Fecha, Entrada DESC, OK DESC;
-
-
-	DROP TEMPORARY TABLE IF EXISTS hm2;
-	DROP TEMPORARY TABLE IF EXISTS hm3;
-	DROP TEMPORARY TABLE IF EXISTS hm4;
-	DROP TEMPORARY TABLE IF EXISTS hm5;
-	DROP TEMPORARY TABLE IF EXISTS hm6;
-	DROP TEMPORARY TABLE IF EXISTS hm7;
-	DROP TEMPORARY TABLE IF EXISTS hm8;
-	CREATE TEMPORARY TABLE hm2 SELECT * FROM hm1 WHERE wh = 19;
-	CREATE TEMPORARY TABLE hm3 SELECT * FROM hm1 WHERE wh = 7;
-	CREATE TEMPORARY TABLE hm4 SELECT * FROM hm1 WHERE wh = 60;
-	CREATE TEMPORARY TABLE hm5 SELECT * FROM hm1 WHERE wh = 5;
-	CREATE TEMPORARY TABLE hm6 SELECT * FROM hm1 WHERE wh = 17;
-	CREATE TEMPORARY TABLE hm7 SELECT * FROM hm1 WHERE wh = 37;
-	CREATE TEMPORARY TABLE hm8 SELECT * FROM hm1 WHERE wh = 55;
-
-	SELECT * FROM
-
-	(
-
-	SELECT Fecha, Entrada as BOGEntrada, Salida as BOGSalida, OK as BOGOK, Referencia as BOGReferencia, id as BOGid,
-
-		   NULL AS VNHEntrada, NULL AS VNHSalida, NULL AS VNHOK, NULL AS VNHReferencia, NULL AS VNHid,
-		   
-		   NULL AS ALGEntrada, NULL AS ALGSalida, NULL AS ALGOK, NULL AS ALGReferencia, NULL AS ALGid,
-		   
-		   NULL AS MADEntrada, NULL AS MADSalida, NULL AS MADOK, NULL AS MADReferencia, NULL AS MADid,
-		   
-		   NULL AS MCFEntrada, NULL AS MCFSalida, NULL AS MCFOK, NULL AS MCFReferencia, NULL AS MCFid,
-
-		   NULL AS VILEntrada, NULL AS VILSalida, NULL AS VILOK, NULL AS VILReferencia, NULL AS VILid,
-		   
-		   NULL AS BAREntrada, NULL AS BARSalida, NULL AS BAROK, NULL AS BARReferencia, NULL AS BARid
-
-	FROM hm2 
-
-
-	UNION ALL
-
-	SELECT Fecha
-		 , NULL, NULL, NULL, NULL, NULL
-		 ,Entrada, Salida, OK, Referencia, id
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-	FROM hm3
-
-
-
-	UNION ALL
-
-	SELECT Fecha
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 ,  Entrada, Salida, OK, Referencia, id
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-	FROM hm4
-
-	UNION ALL
-
-	SELECT Fecha
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 ,  Entrada, Salida, OK, Referencia, id
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-	FROM hm5
-
-	UNION ALL
-
-	SELECT Fecha
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 ,  Entrada, Salida, OK, Referencia, id
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-	FROM hm6
-
-	UNION ALL
-
-	SELECT Fecha
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-		,  Entrada, Salida, OK, Referencia, id
-		, NULL, NULL, NULL, NULL, NULL
-		
-		 
-	FROM hm7
-
-	UNION ALL
-
-	SELECT Fecha
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-		,  Entrada, Salida, OK, Referencia, id
-		 
-	FROM hm8
-
-	) sub
-
-	ORDER BY Fecha, BOGEntrada IS NULL, VNHEntrada IS NULL, ALGEntrada IS NULL, MADEntrada IS NULL, MCFEntrada IS NULL, VILEntrada IS NULL, BAREntrada IS NULL;
-
-END$$
-DELIMITER ;

db/routines/vn2008/views/empresa.sql

@@ -5,7 +5,6 @@ AS SELECT `c`.`id` AS `id`,
 	`c`.`code` AS `abbreviation`,
 	`c`.`supplierAccountFk` AS `Id_Proveedores_account`,
 	`c`.`workerManagerFk` AS `gerente_id`,
-	`c`.`sage200Company` AS `digito_factura`,
 	`c`.`phytosanitary` AS `phytosanitary`,
 	`c`.`companyCode` AS `CodigoEmpresa`,
 	`c`.`companyGroupFk` AS `empresa_grupo`,

db/versions/10880-salmonHydrangea/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.buy ADD buyerFk int(10) unsigned DEFAULT NULL NULL;

db/versions/10881-greenHydrangea/00-alterTableNotification.sql

@@ -0,0 +1 @@
+ALTER TABLE util.notification MODIFY COLUMN id int(11) auto_increment NOT NULL;

db/versions/10881-greenHydrangea/01-notification.vn.sql

@@ -0,0 +1,15 @@
+INSERT IGNORE INTO util.notification ( `name`,`description`)
+	VALUES
+    ( 'zone-included','An email to notify zoneCollisions');
+
+-- Change value if destionation user should be different
+SET @DESTINATION_USER =  "pepe";
+
+SET @MaxId = LAST_INSERT_ID();
+
+INSERT IGNORE INTO util.notificationSubscription (notificationFk,userFk)
+		VALUES(
+            @MaxId,  (SELECT id from `account`.`user` where name = @DESTINATION_USER));
+
+INSERT IGNORE INTO util.notificationAcl (notificationFk,roleFk)
+	SELECT @MaxId, (SELECT role from `account`.`user` where name = @DESTINATION_USER) FROM util.notification WHERE name= "zone-included";

db/versions/10887-floranet/00-schemaAndUser.sql

@@ -0,0 +1,14 @@
+
+CREATE SCHEMA IF NOT EXISTS `floranet`;
+
+CREATE ROLE IF NOT EXISTS 'floranet' ;
+
+GRANT Create temporary tables ON floranet.* TO 'floranet';
+
+GRANT Execute ON floranet.* TO 'floranet';
+
+GRANT Lock tables ON floranet.* TO 'floranet';
+
+CREATE USER IF NOT EXISTS 'floranet'@'%';
+
+GRANT floranet TO floranet@'%';

db/versions/10887-floranet/01-tables.sql

@@ -0,0 +1,61 @@
+CREATE OR REPLACE TABLE floranet.`builder` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `itemFk` int(11) NOT NULL,
+  `elementFk` int(11) NOT NULL,
+  `quantity` int(10) unsigned NOT NULL DEFAULT 1,
+  PRIMARY KEY (`id`),
+  KEY `builder_FK` (`itemFk`),
+  KEY `builder_FK_1` (`elementFk`),
+  CONSTRAINT `builder_FK` FOREIGN KEY (`itemFk`) REFERENCES `vn`.`item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Links handmade products with their elements';
+
+CREATE OR REPLACE TABLE floranet.`element` (
+  `itemFk` int(11) NOT NULL,
+  `typeFk` smallint(5) unsigned DEFAULT NULL,
+  `size` int(11) DEFAULT NULL,
+  `inkFk` char(3) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `originFk` tinyint(2) unsigned DEFAULT NULL,
+  `name` varchar(30) DEFAULT NULL,
+  `quantity` int(11) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`itemFk`),
+  KEY `element_FK` (`itemFk`),
+  KEY `element_FK_1` (`typeFk`),
+  KEY `element_FK_2` (`inkFk`),
+  KEY `element_FK_3` (`originFk`),
+  CONSTRAINT `element_FK` FOREIGN KEY (`itemFk`) REFERENCES `vn`.`item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `element_FK_1` FOREIGN KEY (`typeFk`) REFERENCES `vn`.`itemType` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `element_FK_2` FOREIGN KEY (`inkFk`) REFERENCES `vn`.`ink` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `element_FK_3` FOREIGN KEY (`originFk`) REFERENCES `vn`.`origin` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Filtro para localizar posibles items que coincidan con la descripción';
+
+ALTER TABLE floranet.builder ADD CONSTRAINT `builder_FK_1` FOREIGN KEY (`elementFk`) REFERENCES `element` (`itemFk`) ON UPDATE CASCADE;
+
+CREATE OR REPLACE TABLE floranet.catalogue
+(id INT AUTO_INCREMENT PRIMARY KEY,
+ name VARCHAR(50),
+ price DECIMAL(10,2) NOT NULL,
+ itemFk INT NOT NULL, 
+ dated DATE,
+ postalCode VARCHAR(12),
+ `type` VARCHAR(50),
+ image VARCHAR(255),
+ description TEXT,
+ created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ payed DATETIME,
+ FOREIGN KEY (itemFk) REFERENCES vn.item(id) ON DELETE RESTRICT ON UPDATE CASCADE);
+
+
+CREATE OR REPLACE TABLE floranet.`order`
+(id INT AUTO_INCREMENT PRIMARY KEY,
+ catalogueFk INT UNIQUE,
+ customerName VARCHAR(100),
+ email VARCHAR(100),
+ customerPhone VARCHAR(15),
+ message VARCHAR(255),
+ deliveryName VARCHAR(100),
+ address VARCHAR(200),
+ deliveryPhone VARCHAR(100),
+ isPaid BOOL NOT NULL DEFAULT FALSE,
+ payed DATETIME,
+ created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ FOREIGN KEY (catalogueFk) REFERENCES catalogue(id) ON DELETE RESTRICT ON UPDATE CASCADE);

db/versions/10892-yellowGerbera/00-firstScript.sql

@@ -12,8 +12,8 @@ UPDATE vn.itemShelving
 
 SET @isTriggerDisabled := FALSE;
 
-ALTER TABLE vn.buy MODIFY COLUMN packing int(11) NOT NULL CHECK(packing > 0);
+ALTER TABLE vn.buy MODIFY COLUMN packing int(11) NOT NULL DEFAULT 1 CHECK(packing > 0);
-ALTER TABLE vn.itemShelving MODIFY COLUMN packing int(11) NOT NULL CHECK(packing > 0);
+ALTER TABLE vn.itemShelving MODIFY COLUMN packing int(11) NOT NULL DEFAULT 1 CHECK(packing > 0);
 
 -- Antes tenia '0=sin obligar 1=groping 2=packing' (groping → grouping)
 ALTER TABLE vn.buy MODIFY COLUMN groupingMode tinyint(4) DEFAULT 0 NOT NULL COMMENT '0=sin obligar 1=grouping 2=packing';

db/versions/10893-limeFern/00-sage.sql

@@ -0,0 +1,73 @@
+--  Auto-generated SQL script #202403061303
+UPDATE vn.company
+	SET companyCode=0
+	WHERE id=69;
+UPDATE vn.company
+	SET companyCode=1
+	WHERE id=442;
+UPDATE vn.company
+	SET companyCode=4
+	WHERE id=567;
+UPDATE vn.company
+	SET companyCode=2
+	WHERE id=791;
+UPDATE vn.company
+	SET companyCode=3
+	WHERE id=792;
+UPDATE vn.company
+	SET companyCode=5
+	WHERE id=965;
+UPDATE vn.company
+	SET companyCode=7
+	WHERE id=1381;
+UPDATE vn.company
+	SET companyCode=3
+	WHERE id=1463;
+UPDATE vn.company
+	SET companyCode=8
+	WHERE id=2142;
+UPDATE vn.company
+	SET companyCode=6
+	WHERE id=2393;
+UPDATE vn.company
+	SET companyCode=9
+	WHERE id=3869;
+
+--  Auto-generated SQL script #202403061311
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=69;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=442;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=567;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=791;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=792;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=965;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=1381;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=1463;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=2142;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=2393;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=3869;
+
+
+ALTER TABLE vn.company CHANGE sage200Company sage200Company__ int(2) DEFAULT NULL NULL COMMENT '@deprecated 06/03/2024';
+ALTER TABLE vn.company MODIFY COLUMN sage200Company__ int(2) DEFAULT NULL NULL COMMENT '@deprecated 06/03/2024';

db/versions/10932-azureEucalyptus/00-firstScript.sql

@@ -0,0 +1,22 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`multipleInventoryHistory`(
+	vItemFk INT)
+BEGIN
+	DECLARE vDateInventory DATETIME;
+	SELECT inventoried INTO vDateInventory FROM config;
+
+END$$
+DELIMITER ;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`absoluteInventoryHistory`(
+	vItemFk INT, vWarehouse INT, vDate DATETIME)
+BEGIN
+	DECLARE vCalculatedInventory INT;
+	SET vCalculatedInventory = 0;
+
+END$$
+DELIMITER ;
+
+GRANT EXECUTE ON PROCEDURE vn.absoluteInventoryHistory TO buyer;
+GRANT EXECUTE ON PROCEDURE vn.multipleInventoryHistory TO buyer;

db/versions/10953-redChico/00-account.sql

@@ -0,0 +1,23 @@
+-- account.accountConfig
+ALTER TABLE account.accountConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE account.accountConfig ADD CONSTRAINT accountConfig_check CHECK (id = 1);
+
+-- account.ldapConfig
+ALTER TABLE account.ldapConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE account.ldapConfig ADD CONSTRAINT ldapConfig_check CHECK (id = 1);
+
+-- account.mailConfig
+ALTER TABLE account.mailConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE account.mailConfig ADD CONSTRAINT mailConfig_check CHECK (id = 1);
+
+-- account.roleConfig
+ALTER TABLE account.roleConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE account.roleConfig ADD CONSTRAINT roleConfig_check CHECK (id = 1);
+
+-- account.sambaConfig
+ALTER TABLE account.sambaConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE account.sambaConfig ADD CONSTRAINT sambaConfig_check CHECK (id = 1);
+
+-- account.userConfig
+ALTER TABLE account.userConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE account.userConfig ADD CONSTRAINT userConfig_check CHECK (id = 1);

db/versions/10953-redChico/01-bs.sql

@@ -0,0 +1,7 @@
+-- bs.nightTaskConfig
+ALTER TABLE bs.nightTaskConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE bs.nightTaskConfig ADD CONSTRAINT nightTaskConfig_check CHECK (id = 1);
+
+-- bs.workerProductivityConfig
+ALTER TABLE bs.workerProductivityConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE bs.workerProductivityConfig ADD CONSTRAINT workerProductivityConfig_check CHECK (id = 1);

db/versions/10953-redChico/02-edi.sql

@@ -0,0 +1,15 @@
+-- edi.exchangeConfig
+ALTER TABLE edi.exchangeConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE edi.exchangeConfig ADD CONSTRAINT exchangeConfig_check CHECK (id = 1);
+
+-- edi.ftpConfig
+ALTER TABLE edi.ftpConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE edi.ftpConfig ADD CONSTRAINT ftpConfig_check CHECK (id = 1);
+
+-- edi.imapConfig (Tiene más de 1 registro en producción)
+-- ALTER TABLE edi.imapConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+-- ALTER TABLE edi.imapConfig ADD CONSTRAINT imapConfig_check CHECK (id = 1);
+
+-- edi.offerRefreshConfig
+ALTER TABLE edi.offerRefreshConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE edi.offerRefreshConfig ADD CONSTRAINT offerRefreshConfig_check CHECK (id = 1);

db/versions/10953-redChico/03-hedera.sql

@@ -0,0 +1,27 @@
+-- hedera.config
+ALTER TABLE hedera.config MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE hedera.config ADD CONSTRAINT config_check CHECK (id = 1);
+
+-- hedera.imageConfig
+ALTER TABLE hedera.imageConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE hedera.imageConfig ADD CONSTRAINT imageConfig_check CHECK (id = 1);
+
+-- hedera.mailConfig
+ALTER TABLE hedera.mailConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE hedera.mailConfig ADD CONSTRAINT mailConfig_check CHECK (id = 1);
+
+-- hedera.orderConfig
+ALTER TABLE hedera.orderConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE hedera.orderConfig ADD CONSTRAINT orderConfig_check CHECK (id = 1);
+
+-- hedera.shelfConfig (Tiene más de 1 registro en producción)
+-- ALTER TABLE hedera.shelfConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+-- ALTER TABLE hedera.shelfConfig ADD CONSTRAINT shelfConfig_check CHECK (id = 1);
+
+-- hedera.tpvConfig
+ALTER TABLE hedera.tpvConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE hedera.tpvConfig ADD CONSTRAINT tpvConfig_check CHECK (id = 1);
+
+-- hedera.tpvImapConfig
+ALTER TABLE hedera.tpvImapConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE hedera.tpvImapConfig ADD CONSTRAINT tpvImapConfig_check CHECK (id = 1);

db/versions/10953-redChico/04-pbx.sql

@@ -0,0 +1,15 @@
+-- pbx.config
+ALTER TABLE pbx.config MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE pbx.config ADD CONSTRAINT config_check CHECK (id = 1);
+
+-- pbx.followmeConfig
+ALTER TABLE pbx.followmeConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE pbx.followmeConfig ADD CONSTRAINT followmeConfig_check CHECK (id = 1);
+
+-- pbx.queueConfig (Tiene más de 1 registro en producción)
+-- ALTER TABLE pbx.queueConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+-- ALTER TABLE pbx.queueConfig ADD CONSTRAINT queueConfig_check CHECK (id = 1);
+
+-- pbx.sipConfig
+ALTER TABLE pbx.sipConfig MODIFY COLUMN id mediumint(8) unsigned NOT NULL;
+ALTER TABLE pbx.sipConfig ADD CONSTRAINT sipConfig_check CHECK (id = 1);

db/versions/10953-redChico/05-sage.sql

@@ -0,0 +1,3 @@
+-- sage.config
+ALTER TABLE sage.config MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE sage.config ADD CONSTRAINT config_check CHECK (id = 1);

db/versions/10953-redChico/06-salix.sql

@@ -0,0 +1,7 @@
+-- salix.accessTokenConfig
+ALTER TABLE salix.accessTokenConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE salix.accessTokenConfig ADD CONSTRAINT accessTokenConfig_check CHECK (id = 1);
+
+-- salix.printConfig
+ALTER TABLE salix.printConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE salix.printConfig ADD CONSTRAINT printConfig_check CHECK (id = 1);

db/versions/10953-redChico/06-srt.sql

@@ -0,0 +1,3 @@
+-- srt.config
+ALTER TABLE srt.config MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE srt.config ADD CONSTRAINT config_check CHECK (id = 1);

db/versions/10953-redChico/07-util.sql

@@ -0,0 +1,11 @@
+-- util.config
+ALTER TABLE util.config MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE util.config ADD CONSTRAINT config_check CHECK (id = 1);
+
+-- util.notificationConfig
+ALTER TABLE util.notificationConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE util.notificationConfig ADD CONSTRAINT notificationConfig_check CHECK (id = 1);
+
+-- util.versionConfig
+ALTER TABLE util.versionConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE util.versionConfig ADD CONSTRAINT versionConfig_check CHECK (id = 1);

db/versions/10953-redChico/08-vn.sql

@@ -0,0 +1,87 @@
+-- vn.accountingConfig
+ALTER TABLE vn.accountingConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.accountingConfig ADD CONSTRAINT accountingConfig_check CHECK (id = 1);
+
+-- vn.auctionConfig
+ALTER TABLE vn.auctionConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.auctionConfig ADD CONSTRAINT auctionConfig_check CHECK (id = 1);
+
+-- vn.autoRadioConfig
+ALTER TABLE vn.autoRadioConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.autoRadioConfig ADD CONSTRAINT autoRadioConfig_check CHECK (id = 1);
+
+-- vn.bankEntityConfig
+ALTER TABLE vn.bankEntityConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.bankEntityConfig ADD CONSTRAINT bankEntityConfig_check CHECK (id = 1);
+
+-- vn.bionicConfig
+ALTER TABLE vn.bionicConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.bionicConfig ADD CONSTRAINT bionicConfig_check CHECK (id = 1);
+
+-- vn.buyConfig
+ALTER TABLE vn.buyConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.buyConfig ADD CONSTRAINT buyConfig_check CHECK (id = 1);
+
+-- vn.chatConfig
+ALTER TABLE vn.chatConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.chatConfig ADD CONSTRAINT chatConfig_check CHECK (id = 1);
+
+-- vn.claimConfig
+ALTER TABLE vn.claimConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.claimConfig ADD CONSTRAINT claimConfig_check CHECK (id = 1);
+
+-- vn.clientConfig
+ALTER TABLE vn.clientConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.clientConfig ADD CONSTRAINT clientConfig_check CHECK (id = 1);
+
+-- vn.comparativeAddConfig
+ALTER TABLE vn.comparativeAddConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.comparativeAddConfig ADD CONSTRAINT comparativeAddConfig_check CHECK (id = 1);
+
+-- vn.comparativeConfig
+ALTER TABLE vn.comparativeConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.comparativeConfig ADD CONSTRAINT comparativeConfig_check CHECK (id = 1);
+
+-- vn.config
+ALTER TABLE vn.config MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.config ADD CONSTRAINT config_check CHECK (id = 1);
+
+-- vn.conveyorConfig (Tiene más de 1 registro en producción)
+-- ALTER TABLE vn.conveyorConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+-- ALTER TABLE vn.conveyorConfig ADD CONSTRAINT conveyorConfig_check CHECK (id = 1);
+
+-- vn.deviceProductionConfig
+ALTER TABLE vn.deviceProductionConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.deviceProductionConfig ADD CONSTRAINT deviceProductionConfig_check CHECK (id = 1);
+
+-- vn.docuwareConfig
+ALTER TABLE vn.docuwareConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.docuwareConfig ADD CONSTRAINT docuwareConfig_check CHECK (id = 1);
+
+-- vn.floramondoConfig
+ALTER TABLE vn.floramondoConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.floramondoConfig ADD CONSTRAINT floramondoConfig_check CHECK (id = 1);
+
+-- vn.franceExpressConfig
+ALTER TABLE vn.franceExpressConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.franceExpressConfig ADD CONSTRAINT franceExpressConfig_check CHECK (id = 1);
+
+-- vn.glsConfig
+ALTER TABLE vn.glsConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.glsConfig ADD CONSTRAINT glsConfig_check CHECK (id = 1);
+
+-- vn.greugeConfig
+ALTER TABLE vn.greugeConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.greugeConfig ADD CONSTRAINT greugeConfig_check CHECK (id = 1);
+
+-- vn.inventoryConfig
+ALTER TABLE vn.inventoryConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.inventoryConfig ADD CONSTRAINT inventoryConfig_check CHECK (id = 1);
+
+-- vn.invoiceInConfig
+ALTER TABLE vn.invoiceInConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.invoiceInConfig ADD CONSTRAINT invoiceInConfig_check CHECK (id = 1);
+
+-- vn.invoiceOutConfig
+ALTER TABLE vn.invoiceOutConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.invoiceOutConfig ADD CONSTRAINT invoiceOutConfig_check CHECK (id = 1);

db/versions/10953-redChico/08-vn2.sql

@@ -0,0 +1,91 @@
+-- vn.invoiceOutTaxConfig (Tiene más de 1 registro en producción)
+-- ALTER TABLE vn.invoiceOutTaxConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+-- ALTER TABLE vn.invoiceOutTaxConfig ADD CONSTRAINT invoiceOutTaxConfig_check CHECK (id = 1);
+
+-- vn.itemConfig
+ALTER TABLE vn.itemConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.itemConfig ADD CONSTRAINT itemConfig_check CHECK (id = 1);
+
+-- vn.machineWorkerConfig
+ALTER TABLE vn.machineWorkerConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.machineWorkerConfig ADD CONSTRAINT machineWorkerConfig_check CHECK (id = 1);
+
+-- vn.mdbConfig
+ALTER TABLE vn.mdbConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.mdbConfig ADD CONSTRAINT mdbConfig_check CHECK (id = 1);
+
+-- vn.mrwConfig
+ALTER TABLE vn.mrwConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.mrwConfig ADD CONSTRAINT mrwConfig_check CHECK (id = 1);
+
+-- vn.osTicketConfig
+ALTER TABLE vn.osTicketConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.osTicketConfig ADD CONSTRAINT osTicketConfig_check CHECK (id = 1);
+
+-- vn.packagingConfig
+ALTER TABLE vn.packagingConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.packagingConfig ADD CONSTRAINT packagingConfig_check CHECK (id = 1);
+
+-- vn.packingSiteConfig
+ALTER TABLE vn.packingSiteConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.packingSiteConfig ADD CONSTRAINT packingSiteConfig_check CHECK (id = 1);
+
+-- vn.productionConfig
+ALTER TABLE vn.productionConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.productionConfig ADD CONSTRAINT productionConfig_check CHECK (id = 1);
+
+-- vn.rateConfig
+ALTER TABLE vn.rateConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.rateConfig ADD CONSTRAINT rateConfig_check CHECK (id = 1);
+
+-- vn.routeConfig
+ALTER TABLE vn.routeConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.routeConfig ADD CONSTRAINT routeConfig_check CHECK (id = 1);
+
+-- vn.salespersonConfig
+ALTER TABLE vn.salespersonConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.salespersonConfig ADD CONSTRAINT salespersonConfig_check CHECK (id = 1);
+
+-- vn.sendingConfig
+ALTER TABLE vn.sendingConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.sendingConfig ADD CONSTRAINT sendingConfig_check CHECK (id = 1);
+
+-- vn.smsConfig
+ALTER TABLE vn.smsConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.smsConfig ADD CONSTRAINT smsConfig_check CHECK (id = 1);
+
+-- vn.ticketConfig
+ALTER TABLE vn.ticketConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.ticketConfig ADD CONSTRAINT ticketConfig_check CHECK (id = 1);
+
+-- vn.tillConfig
+ALTER TABLE vn.tillConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.tillConfig ADD CONSTRAINT tillConfig_check CHECK (id = 1);
+
+-- vn.travelConfig
+ALTER TABLE vn.travelConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.travelConfig ADD CONSTRAINT travelConfig_check CHECK (id = 1);
+
+-- vn.viaexpressConfig
+ALTER TABLE vn.viaexpressConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.viaexpressConfig ADD CONSTRAINT viaexpressConfig_check CHECK (id = 1);
+
+-- vn.wagonConfig
+ALTER TABLE vn.wagonConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.wagonConfig ADD CONSTRAINT wagonConfig_check CHECK (id = 1);
+
+-- vn.workerConfig
+ALTER TABLE vn.workerConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.workerConfig ADD CONSTRAINT workerConfig_check CHECK (id = 1);
+
+-- vn.workerTimeControlConfig
+ALTER TABLE vn.workerTimeControlConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.workerTimeControlConfig ADD CONSTRAINT workerTimeControlConfig_check CHECK (id = 1);
+
+-- vn.zipConfig
+ALTER TABLE vn.zipConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.zipConfig ADD CONSTRAINT zipConfig_check CHECK (id = 1);
+
+-- vn.zoneConfig
+ALTER TABLE vn.zoneConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.zoneConfig ADD CONSTRAINT zoneConfig_check CHECK (id = 1);

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

@@ -0,0 +1,12 @@
+CREATE TABLE floranet.`addressPostCode` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `addressFk` int(11) NOT NULL,
+  `postCode` varchar(30) NOT NULL,
+  `hoursInAdvance` int(10) unsigned NOT NULL DEFAULT 24,
+  `dayOfWeek` int(10) unsigned NOT NULL,
+  `deliveryCost` decimal(10,2) NOT NULL DEFAULT 0.00,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `addressPostCode_unique` (`postCode`,`addressFk`,`dayOfWeek`),
+  KEY `addressPostCode_address_FK` (`addressFk`),
+  CONSTRAINT `addressPostCode_address_FK` FOREIGN KEY (`addressFk`) REFERENCES `vn`.`address` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Client''s address registered for floranet network';

db/versions/10957-goldenAnthurium/00-aclTicketClone.sql

@@ -0,0 +1,2 @@
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+    VALUES('Ticket', 'clone', 'WRITE', 'ALLOW', 'ROLE', 'administrative');

db/versions/10959-bronzePalmetto/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE util.debug MODIFY COLUMN value text CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;

db/versions/10968-salmonBamboo/00-firstScript.sql

@@ -0,0 +1,3 @@
+ALTER TABLE vn.professionalCategory DROP COLUMN dayBreak, DROP COLUMN `level`;
+ALTER TABLE vn.professionalCategory
+    CHANGE name description varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;

e2e/paths/05-ticket/09_weekly.spec.js

@@ -24,7 +24,7 @@ describe('Ticket descriptor path', () => {
 
     it('should go back to the ticket index then search and access a ticket summary', async() => {
         await page.accessToSection('ticket.index');
-        await page.accessToSearchResult('11');
+        await page.accessToSearchResult('33');
     });
 
     it('should add the ticket to thursday turn using the descriptor more menu', async() => {
@@ -33,7 +33,7 @@ describe('Ticket descriptor path', () => {
         await page.waitToClick(selectors.ticketDescriptor.thursdayButton);
         const message = await page.waitForSnackbar();
 
-        expect(message.text).toContain('Data saved!');
+        expect(message.text).toContain('Current ticket deleted and added to shift');
     });
 
     it('should again click on the Tickets button of the top bar menu', async() => {
@@ -43,7 +43,7 @@ describe('Ticket descriptor path', () => {
         await page.waitForState('ticket.index');
     });
 
-    it('should confirm the ticket 11 was added to thursday', async() => {
+    it('should confirm the ticket 33 was added to thursday', async() => {
         await page.accessToSection('ticket.weekly.index');
         const result = await page.waitToGetProperty(selectors.ticketsIndex.thirdWeeklyTicket, 'value');
 
@@ -57,8 +57,8 @@ describe('Ticket descriptor path', () => {
         await page.waitForState('ticket.index');
     });
 
-    it('should now search for the ticket 11', async() => {
+    it('should now search for the ticket 33', async() => {
-        await page.accessToSearchResult('11');
+        await page.accessToSearchResult('33');
         await page.waitForState('ticket.card.summary');
     });
 
@@ -68,7 +68,7 @@ describe('Ticket descriptor path', () => {
         await page.waitToClick(selectors.ticketDescriptor.saturdayButton);
         const message = await page.waitForSnackbar();
 
-        expect(message.text).toContain('Data saved!');
+        expect(message.text).toContain('Current ticket deleted and added to shift');
     });
 
     it('should click on the Tickets button of the top bar menu once again', async() => {
@@ -78,7 +78,7 @@ describe('Ticket descriptor path', () => {
         await page.waitForState('ticket.index');
     });
 
-    it('should confirm the ticket 11 was added on saturday', async() => {
+    it('should confirm the ticket 33 was added on saturday', async() => {
         await page.accessToSection('ticket.weekly.index');
         await page.waitForTimeout(5000);
 
@@ -87,14 +87,14 @@ describe('Ticket descriptor path', () => {
         expect(result).toEqual('Saturday');
     });
 
-    it('should now search for the weekly ticket 11', async() => {
+    it('should now search for the weekly ticket 33', async() => {
-        await page.doSearch('11');
+        await page.doSearch('33');
         const nResults = await page.countElement(selectors.ticketsIndex.searchWeeklyResult);
 
         expect(nResults).toEqual(2);
     });
 
-    it('should delete the weekly ticket 11', async() => {
+    it('should delete the weekly ticket 33', async() => {
         await page.waitToClick(selectors.ticketsIndex.firstWeeklyTicketDeleteIcon);
         await page.waitToClick(selectors.ticketsIndex.acceptDeleteTurn);
         const message = await page.waitForSnackbar();

e2e/paths/14-account/05_connections.spec.js

@@ -22,12 +22,4 @@ describe('Account Connections path', () => {
 
         expect(firstResult).toContain(account);
     });
-
-    it('should kill this connection and then get redirected to the login page', async() => {
-        await page.waitToClick(selectors.accountConnections.deleteFirstConnection);
-        await page.waitToClick(selectors.globalItems.acceptButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Your session has expired, please login again');
-    });
 });

loopback/locale/en.json

@@ -220,5 +220,7 @@
 	"Shelving not valid": "Shelving not valid",
 	"printerNotExists": "The printer does not exist",
 	"There are not picking tickets": "There are not picking tickets",
-	"ticketCommercial": "The ticket {{ ticket }} for the salesperson {{ salesMan }} is in preparation. (automatically generated message)"
+	"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"
 }

loopback/locale/es.json

@@ -346,5 +346,7 @@
     "CountryFK cannot be empty": "El país no puede estar vacío",
     "Cmr file does not exist": "El archivo del cmr no existe",
     "You are not allowed to modify the alias": "No estás autorizado a modificar el alias",
-    "The address of the customer must have information about Incoterms and Customs Agent": "El consignatario del cliente debe tener informado Incoterms y Agente de aduanas"
+    "The address of the customer must have information about Incoterms and Customs Agent": "El consignatario del cliente debe tener informado Incoterms y Agente de aduanas",
-}
+    "This password can only be changed by the user themselves": "Esta contraseña solo puede ser modificada por el propio usuario",
+    "They're not your subordinate": "No es tu subordinado/a."
+}

modules/account/back/models/account.js

@@ -1,4 +1,7 @@
 
+const ForbiddenError = require('vn-loopback/util/forbiddenError');
+const {models} = require('vn-loopback/server/server');
+
 module.exports = Self => {
     require('../methods/account/sync')(Self);
     require('../methods/account/sync-by-id')(Self);
@@ -7,4 +10,11 @@ module.exports = Self => {
     require('../methods/account/logout')(Self);
     require('../methods/account/change-password')(Self);
     require('../methods/account/set-password')(Self);
+
+    Self.setUnverifiedPassword = async(id, pass, options) => {
+        const {emailVerified} = await models.VnUser.findById(id, {fields: ['emailVerified']}, options);
+        if (emailVerified) throw new ForbiddenError('This password can only be changed by the user themselves');
+
+        await models.VnUser.setPassword(id, pass, options);
+    };
 };

modules/ticket/back/methods/ticket/clone.js

@@ -0,0 +1,54 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('clone', {
+        description: 'clone a ticket and return the new ticket id',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'id',
+            type: 'number',
+            required: true,
+            description: 'The ticket id',
+            http: {source: 'path'}
+        }, {
+            arg: 'shipped',
+            type: 'date',
+        }, {
+            arg: 'withWarehouse',
+            type: 'boolean',
+        }
+        ],
+        returns: {
+            type: 'number',
+            root: true
+        },
+        http: {
+            path: `/:id/clone`,
+            verb: 'POST'
+        }
+    });
+
+    Self.clone = async(ctx, id, shipped, withWarehouse, 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;
+        }
+
+        try {
+            const [, [{clonedTicketId}]] = await Self.rawSql(`
+                CALL vn.ticket_cloneAll(?, ?, ?, @clonedTicketId); 
+                SELECT @clonedTicketId clonedTicketId;`,
+            [id, shipped, withWarehouse], myOptions);
+
+            if (tx) await tx.commit();
+            return clonedTicketId;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};

modules/ticket/back/methods/ticket/closeAll.js

@@ -58,6 +58,11 @@ module.exports = Self => {
                     AND t.refFk IS NULL
                 GROUP BY t.id
         `, [toDate, toDate]);
+        const ticketIds = tickets.map(ticket => ticket.id);
+        await Self.rawSql(`
+            INSERT INTO util.debug (variable, value)
+                VALUES ('nightInvoicing', ?)
+        `, [ticketIds.join(',')]);
 
         await closure(ctx, Self, tickets);
 

modules/ticket/back/methods/ticket/closure.js

@@ -13,6 +13,8 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
     const failedtickets = [];
     for (const ticket of tickets) {
         try {
+            await Self.rawSql(`CALL util.debugAdd('invoicingTicket', ?)`, [ticket.id], {userId});
+
             await Self.app.models.InvoiceOut.getSerial(ticket.clientFk, ticket.companyFk, ticket.addressFk, 'M');
             await Self.rawSql(
                 `CALL vn.ticket_closeByTicket(?)`,

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

@@ -0,0 +1,56 @@
+const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
+
+describe('Ticket cloning - clone function', () => {
+    let ctx;
+    let options;
+    let tx;
+    const ticketId = 1;
+    const shipped = Date.vnNew();
+
+    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.Ticket.beginTransaction({});
+        options.transaction = tx;
+    });
+
+    afterEach(async() => {
+        await tx.rollback();
+    });
+
+    it('should clone a new ticket without warehouse', async() => {
+        const originalTicket = await models.Ticket.findById(ticketId, null, options);
+
+        const newTicketId = await models.Ticket.clone(ctx, ticketId, shipped, false, options);
+        const newTicket = await models.Ticket.findById(newTicketId, null, options);
+
+        expect(newTicket.clientFk).toEqual(originalTicket.clientFk);
+        expect(newTicket.companyFk).toEqual(originalTicket.companyFk);
+        expect(newTicket.addressFk).toEqual(originalTicket.addressFk);
+        expect(newTicket.warehouseFk).toBeFalsy();
+    });
+
+    it('should clone a new ticket with warehouse', async() => {
+        const originalTicket = await models.Ticket.findById(ticketId, null, options);
+
+        const newTicketId = await models.Ticket.clone(ctx, ticketId, shipped, true, options);
+        const newTicket = await models.Ticket.findById(newTicketId, null, options);
+
+        expect(newTicket.clientFk).toEqual(originalTicket.clientFk);
+        expect(newTicket.companyFk).toEqual(originalTicket.companyFk);
+        expect(newTicket.addressFk).toEqual(originalTicket.addressFk);
+        expect(newTicket.warehouseFk).toEqual(originalTicket.warehouseFk);
+    });
+});

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

@@ -68,7 +68,7 @@ describe('ticket filter()', () => {
             const filter = {};
             const result = await models.Ticket.filter(ctx, filter, options);
 
-            expect(result.length).toEqual(6);
+            expect(result.length).toEqual(7);
 
             await tx.rollback();
         } catch (e) {

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

@@ -46,4 +46,6 @@ module.exports = function(Self) {
     require('../methods/ticket/invoiceTicketsAndPdf')(Self);
     require('../methods/ticket/docuwareDownload')(Self);
     require('../methods/ticket/myLastModified')(Self);
+    require('../methods/ticket/addSaleByCode')(Self);
+    require('../methods/ticket/clone')(Self);
 };

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

@@ -1,4 +1,5 @@
 const UserError = require('vn-loopback/util/user-error');
+const LoopBackContext = require('loopback-context');
 
 module.exports = Self => {
     require('../methods/ticket-weekly/filter')(Self);
@@ -8,4 +9,11 @@ module.exports = Self => {
             return new UserError(`This ticket is already on weekly tickets`);
         return err;
     });
+
+    Self.observe('after save', async ctx => {
+        const loopBackContext = LoopBackContext.getCurrentContext();
+        const httpCtx = {req: loopBackContext.active};
+        const httpRequest = httpCtx.req.http;
+        await Self.app.models.Ticket.setDeleted(httpRequest, ctx.instance.ticketFk, ctx.options);
+    });
 };

modules/ticket/back/models/ticket.js

@@ -1,5 +1,4 @@
 module.exports = Self => {
     require('./ticket-methods')(Self);
     require('../methods/ticket/state')(Self);
-    require('../methods/ticket/addSaleByCode')(Self);
 };

modules/ticket/front/descriptor-menu/index.js

@@ -147,7 +147,8 @@ class Controller extends Section {
         return this.$http.patch(`TicketWeeklies`, params)
             .then(() => {
                 this.$.addTurn.hide();
-                this.vnApp.showSuccess(this.$t('Data saved!'));
+                this.vnApp.showSuccess(this.$t('Current ticket deleted and added to shift'));
+                this.reload();
             });
     }
 

modules/ticket/front/descriptor-menu/index.spec.js

@@ -41,6 +41,7 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
     }));
 
     describe('addTurn()', () => {
+        pending('refs #6302');
         it('should make a query and call $.addTurn.hide() and vnApp.showSuccess()', () => {
             controller.$.addTurn = {hide: () => {}};
             jest.spyOn(controller.$.addTurn, 'hide');

modules/ticket/front/descriptor-menu/locale/es.yml

@@ -28,3 +28,4 @@ Create a single ticket with all the content of the current ticket: Crea un ticke
 Set ticket weight: Establecer peso al ticket
 Ticket weight: Peso del ticket
 This address has incoterms, you should set the weight before invoice it: Este consigatario tiene incoterms, deberías establecer el peso antes de facturar
+Current ticket deleted and added to shift: Ticket actual borrado y añadido a turno

modules/worker/back/methods/worker/setPassword.js

@@ -1,31 +1,29 @@
-const UserError = require('vn-loopback/util/user-error');
+const ForbiddenError = require('vn-loopback/util/forbiddenError');
 module.exports = Self => {
     Self.remoteMethodCtx('setPassword', {
         description: 'Set a new password',
-        accepts: [
+        accepts: [{
-            {
+            arg: 'id',
-                arg: 'workerFk',
+            type: 'number',
-                type: 'number',
+            required: true,
-                required: true,
+            description: 'The worker id',
-                description: 'The worker id',
+            http: {source: 'path'}
-            },
+        }, {
-            {
+            arg: 'newPass',
-                arg: 'newPass',
+            type: 'String',
-                type: 'String',
+            required: true,
-                required: true,
+            description: 'The new worker password'
-                description: 'The new worker password'
+        }],
-            }
-        ],
         http: {
             path: `/:id/setPassword`,
             verb: 'PATCH'
         }
     });
-    Self.setPassword = async(ctx, options) => {
+    Self.setPassword = async(ctx, id, newPass, options) => {
         const models = Self.app.models;
         const myOptions = {};
-        const {args} = ctx;
         let tx;
+
         if (typeof options == 'object')
             Object.assign(myOptions, options);
         if (!myOptions.transaction) {
@@ -33,11 +31,10 @@ module.exports = Self => {
             myOptions.transaction = tx;
         }
         try {
-            const isSubordinate = await models.Worker.isSubordinate(ctx, args.workerFk, myOptions);
+            const isSubordinate = await Self.isSubordinate(ctx, id, myOptions);
-            if (!isSubordinate) throw new UserError('You don\'t have enough privileges.');
+            if (!isSubordinate) throw new ForbiddenError('They\'re not your subordinate');
 
-            await models.VnUser.setPassword(args.workerFk, args.newPass, myOptions);
+            await models.Account.setUnverifiedPassword(id, newPass, myOptions);
-            await models.VnUser.updateAll({id: args.workerFk}, {emailVerified: true}, myOptions);
 
             if (tx) await tx.commit();
         } catch (e) {

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

@@ -1,31 +1,30 @@
-const UserError = require('vn-loopback/util/user-error');
+const {models} = require('vn-loopback/server/server');
-
-const models = require('vn-loopback/server/server').models;
 
 describe('worker setPassword()', () => {
     let ctx;
+    const newPass = 'H3rn4d3z#';
+    const employeeId = 1;
+    const managerId = 20;
+    const administrativeId = 5;
+
     beforeAll(() => {
         ctx = {
             req: {
-                accessToken: {},
+                accessToken: {userId: managerId},
                 headers: {origin: 'http://localhost'}
             },
-            args: {workerFk: 9}
         };
     });
 
-    beforeEach(() => {
+    it('should change the password if it is a subordinate and the email is not verified', async() => {
-        ctx.req.accessToken.userId = 20;
-        ctx.args.newPass = 'H3rn4d3z#';
-    });
-
-    it('should change the password', async() => {
         const tx = await models.Worker.beginTransaction({});
 
         try {
             const options = {transaction: tx};
-            await models.Worker.setPassword(ctx, options);
+            await models.Worker.setPassword(ctx, employeeId, newPass, options);
+            const isNewPass = await passHasBeenChanged(employeeId, newPass, options);
 
+            expect(isNewPass).toBeTrue();
             await tx.rollback();
         } catch (e) {
             await tx.rollback();
@@ -33,29 +32,48 @@ describe('worker setPassword()', () => {
         }
     });
 
-    it('should throw an error: Password does not meet requirements', async() => {
+    it('should not change the password if it is a subordinate and the email is verified', async() => {
-        const tx = await models.Collection.beginTransaction({});
+        const tx = await models.Worker.beginTransaction({});
-        ctx.args.newPass = 'Hi';
+
         try {
             const options = {transaction: tx};
-            await models.Worker.setPassword(ctx, options);
+            await models.VnUser.updateAll({id: employeeId}, {emailVerified: true}, options);
+            await models.Worker.setPassword(ctx, employeeId, newPass, options);
+
+            await tx.rollback();
+        } catch (e) {
+            expect(e.message).toEqual(`This password can only be changed by the user themselves`);
+            await tx.rollback();
+        }
+    });
+
+    it('should not change the password if it is not a subordinate', async() => {
+        const tx = await models.Worker.beginTransaction({});
+        try {
+            const options = {transaction: tx};
+            await models.Worker.setPassword(ctx, administrativeId, newPass, options);
+            await tx.rollback();
+        } catch (e) {
+            expect(e.message).toEqual(`They're not your subordinate`);
+            await tx.rollback();
+        }
+    });
+
+    it('should throw an error: Password does not meet requirements', async() => {
+        const tx = await models.Worker.beginTransaction({});
+        const newPass = 'Hi';
+        try {
+            const options = {transaction: tx};
+            await models.Worker.setPassword(ctx, employeeId, newPass, options);
             await tx.rollback();
         } catch (e) {
             expect(e.sqlMessage).toEqual('Password does not meet requirements');
             await tx.rollback();
         }
     });
-
-    it('should throw an error: You don\'t have enough privileges.', async() => {
-        ctx.req.accessToken.userId = 5;
-        const tx = await models.Collection.beginTransaction({});
-        try {
-            const options = {transaction: tx};
-            await models.Worker.setPassword(ctx, options);
-            await tx.rollback();
-        } catch (e) {
-            expect(e).toEqual(new UserError(`You don't have enough privileges.`));
-            await tx.rollback();
-        }
-    });
 });
+
+const passHasBeenChanged = async(userId, pass, options) => {
+    const user = await models.VnUser.findById(userId, null, options);
+    return user.hasPassword(pass);
+};

modules/worker/front/descriptor/index.html

@@ -11,8 +11,8 @@
                 ? 'Click to allow the user to be disabled'
                 : 'Click to exclude the user from getting disabled'}}
           </vn-item>
-          <vn-item ng-if="!$ctrl.worker.user.emailVerified" ng-click="setPassword.show()" translate>
+          <vn-item ng-if="!$ctrl.worker.user.emailVerified && $ctrl.vnConfig.storage.currentUserWorkerId !=$ctrl.worker.id" ng-click="setPassword.show()" translate>
-            Change password
+            Change password 
           </vn-item>
     </slot-menu>
     <slot-body>

modules/worker/front/descriptor/index.js

@@ -69,6 +69,7 @@ class Controller extends Descriptor {
                 }
             ]
         };
+
         return this.getData(`Workers/${this.id}`, {filter})
             .then(res => this.entity = res.data);
     }
@@ -86,15 +87,14 @@ class Controller extends Descriptor {
         if (this.newPassword != this.repeatPassword)
             throw new UserError(`Passwords don't match`);
         this.$http.patch(
-            `Workers/${this.entity.id}/setPassword`,
+            `Workers/${this.entity.id}/setPassword`, {newPass: this.newPassword}
-            {workerFk: this.entity.id, newPass: this.newPassword}
         ) .then(() => {
             this.vnApp.showSuccess(this.$translate.instant('Password changed!'));
-        });
+        }).then(() => this.loadData());
     }
 }
 
-Controller.$inject = ['$element', '$scope', '$rootScope'];
+Controller.$inject = ['$element', '$scope', '$rootScope', 'vnConfig'];
 
 ngModule.vnComponent('vnWorkerDescriptor', {
     template: require('./index.html'),

modules/worker/front/descriptor/index.spec.js

@@ -16,6 +16,7 @@ describe('vnWorkerDescriptor', () => {
             const id = 1;
             const response = 'foo';
 
+            $httpBackend.whenGET('UserConfigs/getUserConfig').respond({});
             $httpBackend.expectRoute('GET', `Workers/${id}`).respond(response);
             controller.id = id;
             $httpBackend.flush();

modules/zone/back/methods/zone/specs/toggleIsIncluded.spec.js

@@ -1,6 +1,5 @@
 const models = require('vn-loopback/server/server').models;
 const LoopBackContext = require('loopback-context');
-
 describe('zone toggleIsIncluded()', () => {
     beforeAll(async() => {
         const activeCtx = {
@@ -58,7 +57,7 @@ describe('zone toggleIsIncluded()', () => {
 
             await models.Zone.toggleIsIncluded(1, 20, false, options);
 
-            let result = await models.Zone.toggleIsIncluded(1, 20, undefined, options);
+            const result = await models.Zone.toggleIsIncluded(1, 20, undefined, options);
 
             expect(result).toEqual({count: 1});
 

modules/zone/back/model-config.json

@@ -3,10 +3,10 @@
         "dataSource": "vn"
     },
     "AgencyMode": {
-       "dataSource": "vn"
+        "dataSource": "vn"
     },
     "DeliveryMethod": {
-       "dataSource": "vn"
+        "dataSource": "vn"
     },
     "Zone": {
         "dataSource": "vn"

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.8",
+        "@verdnatura/myt": "^1.6.9",
         "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.8
+    specifier: ^1.6.9
-    version: 1.6.8
+    version: 1.6.9
   angular-mocks:
     specifier: ^1.7.9
     version: 1.8.3
@@ -2633,8 +2633,8 @@ packages:
     dev: false
     optional: true
 
-  /@verdnatura/myt@1.6.8:
+  /@verdnatura/myt@1.6.9:
-    resolution: {integrity: sha512-jpadr6yAR9TQXPv+has5yOYAolR/YEzsxbLgMR7BoDrpLyVFLHJEy4Dfe+Hy11r3AmxCB/8lWM+La1YGvXMWOA==}
+    resolution: {integrity: sha512-29IauYra9igfdPWwV4+pVV/tBXvIg0fkVHEpSz8Zz3G3lRtzm286FN2Kv6hZkxmD/F1n52O37jN9WLiLHDTW1Q==}
     hasBin: true
     dependencies:
       '@sqltools/formatter': 1.2.5
@@ -4886,6 +4886,7 @@ packages:
   /deep-extend@0.6.0:
     resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
     engines: {node: '>=4.0.0'}
+    requiresBuild: true
 
   /deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
@@ -12714,6 +12715,7 @@ packages:
   /strip-json-comments@2.0.1:
     resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
     engines: {node: '>=0.10.0'}
+    requiresBuild: true
 
   /strip-json-comments@3.1.1:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}

print/templates/email/zone-included/assets/css/import.js

@@ -0,0 +1,11 @@
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
+
+module.exports = new Stylesheet([
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/email.css`])
+    .mergeStyles();

print/templates/email/zone-included/locale/es.yml

@@ -0,0 +1,7 @@
+subject: Colisiones en zonas
+title: "La zona {0}  y localización {1} ha sido registrada en más de un sitio"
+postalCode: C. Postal
+zoneFk: Número de zona
+price: Precio
+zone: Zona
+warehouse: Almacén

print/templates/email/zone-included/zone-included.html

@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html v-bind:lang="$i18n.locale">
+    <head>
+        <meta name="viewport" content="width=device-width" />
+        <meta name="format-detection" content="telephone=no" />
+    </head>
+
+    <body>
+        <table class="grid column-oriented">
+            <thead>
+                <tr>
+                    <th>{{ $t('postalCode') }}</th>
+                    <th>{{ $t('zoneFk') }}</th>
+                    <th>{{ $t('price') }}</th>
+                    <th>{{ $t('zone') }}</th>
+                    <th>{{ $t('warehouse') }}</th>
+                    <th></th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr v-for="zone in zoneCollisions">
+                    <td>{{ zone.zn.name }}</td>
+                    <td>{{ zone.zoneFk }}</td>
+                    <td>{{ zone.z.price }}</td>
+                    <td>{{ zone.z.name }}</td>
+                    <td>{{ zone.w.name }}</td>
+                    <td>
+                        <a v-bind:href="'https://salix.verdnatura.es/#!/zone/'+
+                        zone.zoneFk+
+                        '/location?q=%7B%22search%22:%22'+
+                        zone.zn.name+
+                        '%22%7D'">
+                        https://salix.verdnatura.es/#!/zone/
+                        {{zone.zoneFk}}
+                        /location?q=%7B%22search%22:%22
+                        {{zone.zn.name}}
+                        %22%7D</a></td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>

print/templates/email/zone-included/zone-included.js

@@ -0,0 +1,12 @@
+const Component = require(`vn-print/core/component`);
+const emailHeader = new Component('email-header');
+
+module.exports = {
+    name: 'zone-included',
+    components: {
+        'email-header': emailHeader.build(),
+    },
+    props: {
+        zoneCollisions: {type: Array, required: true}
+    }
+};