back/models/payment.json

@@ -52,7 +52,7 @@
         },
         "payMethod": {
             "type": "belongsTo",
-            "model": "PayMethod",
+            "model": "PayMethodFk",
             "foreignKey": "payMethodFk"
         },
         "company": {

back/models/vn-user.json

@@ -54,8 +54,7 @@
             "type": "string"
         },
         "hasGrant": {
-            "type": "boolean",
+            "type": "boolean"
-            "default": false
         },
         "passExpired": {
             "type": "date"
@@ -169,7 +168,6 @@
                 "emailVerified",
                 "twoFactor"
             ]
-
         }
     }
 }

db/dump/fixtures.after.sql

@@ -77,8 +77,8 @@ INSERT INTO `vn`.`agency` (`name`, `warehouseFk`, `isOwn`, `isAnyVolumeAllowed`)
     ('Otra agencia ', '1', '0', '0');
 
 INSERT INTO `vn`.`expedition` (`agencyModeFk`, `ticketFk`, `isBox`, `counter`, `workerFk`, `externalId`, `packagingFk`, `hostFk`, `itemPackingTypeFk`, `hasNewRoute`) VALUES
-    ('1', '1', 1, '1', '1', '1', '1', 'pc1', 'F', 0),
+    ('1', '1', 1, '1', '1', '1', '1', 'pc00', 'F', 0),
-    ('1', '1', 1, '2', '1', '1', '1', 'pc1', 'F', 0);
+    ('1', '1', 1, '2', '1', '1', '1', 'pc00', 'F', 0);
 
 INSERT INTO vn.client (id,name,defaultAddressFk,street,fi,email,dueDay,isTaxDataChecked,accountingAccount,city,provinceFk,postcode,socialName,contact,credit,countryFk,quality,riskCalculated) VALUES
     (100,'root',110,'Valle de la muerte','74974747G','root@mydomain.com',0,1,'4300000078','ALGEMESI',1,'46680','rootSocial','rootContact',500.0,1,10,'2025-01-01');

db/dump/fixtures.before.sql

@@ -214,15 +214,15 @@ INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`,`bossFk`, `phone
         (1109, 'HLK', 'Bruce'        , 'Banner', 19, 432978109),
         (1110, 'JJJ', 'Jessica'      , 'Jones' , 19, 432978110);
 
-INSERT INTO `vn`.`parking` (`id`, `sectorFk`, `code`, `pickingOrder`)
+INSERT INTO `vn`.`parking` (`id`, `column`, `row`, `sectorFk`, `code`, `pickingOrder`)
     VALUES
-		('1',   1, '700-01', 70001),
+        ('1',   700, '01', 1, '700-01', 70001),
-		('2',   2, '700-02', 70002),
+        ('2',   700, '02', 2, '700-02', 70002),
-		('3',   1, '100-01', 1),
+        ('3',   100, '01', 1, '100-01', 1),
-		(32397, 1, 'A-47-1',   1165),
+        (32397, 100, '02', 1, 'A-47-1',   1165),
-		(34831, 1, 'K-26-2',   20220),
+        (34831, 200, '01', 1, 'K-26-2',   20220),
-		(34965, 2, 'L-08-4',   21800),
+        (34965, 200, '02', 2, 'L-08-4',   21800),
-		(39096, 2, 'LR-02-3',  99999);
+        (39096, 200, '03', 2, 'LR-02-3',  99999);
 
 INSERT INTO `vn`.`shelving` (`code`, `parkingFk`, `isPrinted`, `priority`, `userFk`, `isRecyclable`)
     VALUES
@@ -321,11 +321,6 @@ UPDATE `vn`.`agencyMode` SET `web` = 1, `reportMail` = 'no-reply@gothamcity.com'
 
 UPDATE `vn`.`agencyMode` SET `code` = 'refund' WHERE  `id` = 23;
 
-INSERT INTO `vn`.`agencyIncoming`(`agencyModeFk`)
-    VALUES
-        (1),
-		(2);
-
 INSERT INTO `vn`.`payMethod`(`id`,`code`,  `name`, `graceDays`, `outstandingDebt`, `isIbanRequiredForClients`, `isIbanRequiredForSuppliers`, `hasVerified`)
     VALUES
         (1, NULL,           'PayMethod one',            0,  001,    0, 0, 0),
@@ -499,7 +494,7 @@ DROP TEMPORARY TABLE IF EXISTS tmp.address;
 CREATE TEMPORARY TABLE tmp.address
     SELECT * FROM `vn`.`address`;
 
-UPDATE `vn`.`client` `c`
+ UPDATE `vn`.`client` `c`
     JOIN `tmp`.`address` `a` ON `a`.`clientFk` = `c`.`id`
 	SET `c`.`defaultAddressFk` = `a`.`id`
         WHERE `defaultAddressFk` IS NULL;
@@ -750,15 +745,15 @@ INSERT INTO `vn`.`zoneClosure` (`zoneFk`, `dated`, `hour`)
 
 INSERT INTO `vn`.`zoneConfig` (`id`, `scope`) VALUES (1, '1');
 
-INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agencyModeFk`, `description`, `m3`, `cost`, `started`, `finished`, `dated`)
+INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agencyModeFk`, `description`, `m3`, `cost`, `started`, `finished`, `zoneFk`, `dated`)
     VALUES
-        (1, '1899-12-30 12:15:00', 133, util.VN_CURDATE(), 1, 1, 'first route',   1.8,   10, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), util.VN_CURDATE()),
+        (1, '1899-12-30 12:15:00', 56, util.VN_CURDATE(), 1, 1, 'first route',   1.8,   10, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1,  util.VN_CURDATE()),
-        (2, '1899-12-30 13:20:00', 56, util.VN_CURDATE(), 1, 2, 'second route',  0.2,   20, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), util.VN_CURDATE()),
+        (2, '1899-12-30 13:20:00', 56, util.VN_CURDATE(), 1, 2, 'second route',  0.2,   20, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 9,  util.VN_CURDATE()),
-        (3, '1899-12-30 14:30:00', 133, util.VN_CURDATE(), 2, 3, 'third route',   0.5,   30, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), util.VN_CURDATE()),
+        (3, '1899-12-30 14:30:00', 56, util.VN_CURDATE(), 2, 3, 'third route',   0.5,   30, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 10, util.VN_CURDATE()),
-        (4, '1899-12-30 15:45:00', 56, util.VN_CURDATE(), 3, 4, 'fourth route',  0,     40, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), util.VN_CURDATE()),
+        (4, '1899-12-30 15:45:00', 56, util.VN_CURDATE(), 3, 4, 'fourth route',  0,     40, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 12, util.VN_CURDATE()),
-        (5, '1899-12-30 16:00:00', 133, util.VN_CURDATE(), 4, 5, 'fifth route',   0.1,   50, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), util.VN_CURDATE()),
+        (5, '1899-12-30 16:00:00', 56, util.VN_CURDATE(), 4, 5, 'fifth route',   0.1,   50, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 13, util.VN_CURDATE()),
-        (6, NULL,                  57, util.VN_CURDATE(), 5, 7, 'sixth route',   1.7,   60, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), util.VN_CURDATE()),
+        (6, NULL,                  57, util.VN_CURDATE(), 5, 7, 'sixth route',   1.7,   60, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 3,  util.VN_CURDATE()),
-        (7, NULL,                  57, util.VN_CURDATE(), 6, 8, 'seventh route', 0,     70, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), util.VN_CURDATE());
+        (7, NULL,                  57, util.VN_CURDATE(), 6, 8, 'seventh route', 0,     70, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 5,  util.VN_CURDATE());
 
 INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `landed`, `clientFk`,`nickname`, `addressFk`, `refFk`, `isDeleted`, `zoneFk`, `zonePrice`, `zoneBonus`, `created`, `weight`, `cmrFk`, `problem`, `risk`)
     VALUES
@@ -798,8 +793,7 @@ INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeF
         (34, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1103, 'BEJAR',                                         123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
         (35, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1102, 'Somewhere in Philippines',                      123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
         (36, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1102, 'Ant-Man Adventure',                             123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
-        (37, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1110, 'Deadpool swords',                               123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
+        (37, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1110, 'Deadpool swords',                               123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL);
-		(1000000, NULL, 1, 1, NULL, util.VN_CURDATE(), util.VN_CURDATE(), 1, 'employee', 131, NULL, 0, 1, 1.00, 0.00, CURDATE(), NULL, NULL, '', NULL);
 
 INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
     VALUES
@@ -855,15 +849,14 @@ INSERT INTO `vn`.`deliveryPoint` (`id`, `name`, `ubication`)
     VALUES
         (1, 'Gotham','1007 Mountain Drive, Gotham');
 
-INSERT INTO `vn`.`vehicle`(`id`, `numberPlate`, `tradeMark`, `model`, `companyFk`, `warehouseFk`, `description`, `m3`, `isActive`, `deliveryPointFk`, `chassis`, `leasing`, `supplierFk`, `fuelTypeFk`, `bankPolicyFk`)
+INSERT INTO `vn`.`vehicle`(`id`, `numberPlate`, `tradeMark`, `model`, `companyFk`, `warehouseFk`, `description`, `m3`, `isActive`, `deliveryPointFk`)
     VALUES
-        (1, '3333-BAT', 'WAYNE INDUSTRIES', 'BATMOBILE', 442, 1, 'The ultimate war machine',       50, 1, 1, 'XCSC133C60', 'Wayne leasing', 1, 1, 1),
+        (1, '3333-BAT', 'WAYNE INDUSTRIES', 'BATMOBILE', 442, 1, 'The ultimate war machine',       50, 1, 1),
-        (2, '1111-IMK', 'STARK INDUSTRIES', 'MARK-III',  442, 1, 'Iron-Man Heavy Armor MARK-III',  18, 1, 1, '', '', 2, 2, 2),
+        (2, '1111-IMK', 'STARK INDUSTRIES', 'MARK-III',  442, 1, 'Iron-Man Heavy Armor MARK-III',  18, 1, 1),
-        (3, '2222-IMK', 'STARK INDUSTRIES', 'MARK-VI',   442, 1, 'Iron-Man Heavy Armor MARK-VI',   16, 1, 1, '', '', 442, 2, null),
+        (3, '2222-IMK', 'STARK INDUSTRIES', 'MARK-VI',   442, 1, 'Iron-Man Heavy Armor MARK-VI',   16, 1, 1),
-        (4, '3333-IMK', 'STARK INDUSTRIES', 'MARK-VII',  442, 1, 'Iron-Man Heavy Armor MARK-VII',  14, 1, 1, '', '', 442, 3, null),
+        (4, '3333-IMK', 'STARK INDUSTRIES', 'MARK-VII',  442, 1, 'Iron-Man Heavy Armor MARK-VII',  14, 1, 1),
-        (5, '4444-IMK', 'STARK INDUSTRIES', 'MARK-XLII', 442, 1, 'Iron-Man Heavy Armor MARK-XLII', 13, 1, 1, '', '', 442, 4, null),
+        (5, '4444-IMK', 'STARK INDUSTRIES', 'MARK-XLII', 442, 1, 'Iron-Man Heavy Armor MARK-XLII', 13, 1, 1),
-        (6, '5555-IMK', 'STARK INDUSTRIES', 'MARK-XLV',  442, 1, 'Iron-Man Heavy Armor MARK-XLV',  12, 0, 1, '', '', 442, 5, null),
+        (6, '5555-IMK', 'STARK INDUSTRIES', 'MARK-XLV',  442, 1, 'Iron-Man Heavy Armor MARK-XLV',  12, 0, 1);
-        (7, '5555-SHI', 'SHIELD',           'Quinjet',   442, 1, 'High-speed jet used by the Avengers', 30, 1, 1, 'QJ12345', 'SHIELD leasing', 1, 1, 1);
 
 INSERT INTO `vn`.`config`(`id`, `mdbServer`, `fakeEmail`, `defaultersMaxAmount`, `inventoried`)
     VALUES
@@ -924,18 +917,17 @@ INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `life`, `workerF
         (5, 'CON', 'Container',      3, NULL,   35, 1, 'warm', 0),
         (6, 'ALS', 'Alstroemeria',   1, 31,     16, 0, 'warm', 1);
 
-INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`, `hex`, `hexJson`)
+INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`, `hex`)
     VALUES
-		('YEL', 'Yellow',         1, 1, 'F4D03F', '{"value": ["F4D03F"]}'),
+        ('YEL', 'Yellow',       1, 1, 'F4D03F'),
-		('BLU', 'Blue',           1, 2, '5DADE2', '{"value": ["5DADE2"]}'),
+        ('BLU', 'Blue',         1, 2, '5DADE2'),
-		('RED', 'Red',            1, 3, 'EC7063', '{"value": ["EC7063"]}'),
+        ('RED', 'Red',          1, 3, 'EC7063'),
-		('SLV', 'Silver',         1, 4, 'CACFD2', '{"value": ["CACFD2"]}'),
+        ('SLV', 'Silver',       1, 4, 'CACFD2'),
-		('BRW', 'Brown',          1, 5, 'DC7633', '{"value": ["DC7633"]}'),
+        ('BRW', 'Brown',        1, 5, 'DC7633'),
-		('BLK', 'Black',          1, 6, '000000', '{"value": ["000000"]}'),
+        ('BLK', 'Black',        1, 6, '000000'),
-		('BAS', 'Blue/Silver',    1, 7, '5DADE2', '{"value": ["5DADE2"]}'),
+        ('BAS', 'Blue/Silver',  1, 7, '5DADE2'),
-		('GRN', 'Green',          1, 8, '28A745', '{"value": ["28A745"]}'),
+        ('GRN', 'Green',        1, 8, '28A745'),
-		('WHT', 'White',          1, 9, 'FFFFFF', '{"value": ["FFFFFF"]}'),
+        ('WHT', 'White',        1, 9, 'FFFFFF');
-        ('RGB', 'Red/Green/Blue', 1, 9, 'FFFFFF', '{"value": ["EC7063","5DADE2","28A745"]}');
 
 INSERT INTO `vn`.`origin`(`id`,`code`, `name`)
     VALUES
@@ -985,28 +977,26 @@ INSERT INTO `vn`.`itemFamily`(`code`, `description`)
 INSERT INTO `vn`.`item`(
     `id`, `typeFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenseFk`,
     `comment`, `relevancy`, `image`, `subName`, `minPrice`, `family`, `isFloramondo`, `genericFk`,
-	`itemPackingTypeFk`, `hasMinPrice`, `packingOut`, `weightByPiece`, `isCustomInspectionRequired`
+    `itemPackingTypeFk`, `hasMinPrice`, `weightByPiece`, `isCustomInspectionRequired`
 )
 VALUES
-	(1,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 'EMB',  0,  NULL,	'V',	0, NULL,    3, 	1),
+    (1,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 'EMB',  0,  NULL,	'V',	0, 3, 		1),
-	(2,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 'VT',   0,  NULL,   'H',  	0, NULL,    2, 	1),
+    (2,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 'VT',   0,  NULL,   'H',  	0, 2, 		1),
-	(3,  1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,    5,  0),
+    (3,  1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, 5, 		0),
-	(4,  1, 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (4,  1, 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(5,  3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '5',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (5,  3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '5',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(6,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '6',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (6,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '6',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(7,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '7',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (7,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '7',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(8,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '8',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (8,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '8',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(9,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '9',  NULL, 0, 'VT',   1,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (9,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '9',  NULL, 0, 'VT',   1,  NULL,   NULL, 	0, NULL,	0),
-	(10, 1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '10', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (10, 1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '10', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(11, 1, 1,    1, NULL,              1,    05080000, 4751000000, NULL, 0, '11', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (11, 1, 1,    1, NULL,              1,    05080000, 4751000000, NULL, 0, '11', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(12, 3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '12', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (12, 3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '12', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(13, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 'VT',   1,  NULL,   NULL, 	1, NULL, NULL,	0),
+    (13, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 'VT',   1,  NULL,   NULL, 	1, NULL,	0),
-	(14, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   1,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (14, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   1,  NULL,   NULL, 	0, NULL,	0),
-	(15, 4, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (15, 4, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 	0, NULL,	0),
-	(16, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (16, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 	0, NULL,	0),
-	(71, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (71, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0);
-	(72, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, NULL, NULL, 1, 'VT',   0,  NULL,   NULL, 	1,    1, NULL, 	0),
-	(88, 1,    1, 2, NULL,              NULL, 06021010, 4751000000, NULL, 0, NULL, NULL,10, 'VT',   0,  NULL,   NULL,   1, NULL, NULL,  0);
 
 
 -- Update the taxClass after insert of the items
@@ -1095,12 +1085,12 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
         (5,  1, 2,  'Ranged weapon longbow 200cm',         1,  110.33, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),     'hasComponentLack'),
         (6,  1, 3,  'Ranged weapon longbow 200cm',         1,  110.33, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH),     'hasComponentLack'),
         (7,  2, 11, 'Melee weapon combat fist 15cm',    15, 7.74,   0, 0, 0, util.VN_CURDATE(),     NULL),
-        (8,  4, 11, 'Melee weapon heavy shield 100cm', 10, 1.79,   0, 0, 0, util.VN_CURDATE(),     'hasItemLost,hasRounding'),
+        (8,  4, 11, 'Melee weapon heavy shield 100cm', 10, 1.79,   0, 0, 0, util.VN_CURDATE(),     NULL),
         (9,  1, 16, 'Ranged weapon longbow 200cm',         1,  103.49, 0, 0, 0, util.VN_CURDATE(),     NULL),
         (10, 2, 16, 'Melee weapon combat fist 15cm',    10, 7.09,   0, 0, 0, util.VN_CURDATE(),     NULL),
         (11, 1, 16, 'Ranged weapon longbow 200cm',         1,  103.49, 0, 0, 0, util.VN_CURDATE(),     NULL),
         (12, 4, 16, 'Melee weapon heavy shield 100cm', 20, 1.71,   0, 0, 0, util.VN_CURDATE(),     NULL),
-        (13, 2, 8,  'Melee weapon combat fist 15cm',    10, 7.08,   0, 0, 0, util.VN_CURDATE(),     'hasItemLost'),
+        (13, 2, 8,  'Melee weapon combat fist 15cm',    10, 7.08,   0, 0, 0, util.VN_CURDATE(),     NULL),
         (14, 1, 8,  'Ranged weapon longbow 200cm',         2, 103.49, 0, 0, 0, util.VN_CURDATE(),     NULL),
         (15, 1, 19, 'Ranged weapon longbow 200cm',         1, 103.49,   0, 0, 0, util.VN_CURDATE(),     NULL),
         (16, 2, 20, 'Melee weapon combat fist 15cm',    20, 7.07,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack'),
@@ -1111,26 +1101,25 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
         (21, 1, 6,  'Ranged weapon longbow 200cm',         1,  8.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),     'hasComponentLack'),
         (22, 1, 7,  'Ranged weapon longbow 200cm',         1,  8.07,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack'),
         (23, 1, 9,  'Ranged weapon longbow 200cm',         1,  8.07,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack'),
-        (24, 1, 10, 'Ranged weapon longbow 200cm',         1,  8.07,   0, 0, 0, util.VN_CURDATE(),     'hasItemShortage,hasComponentLack'),
+        (24, 1, 10, 'Ranged weapon longbow 200cm',         1,  8.07,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack'),
-        (25, 4, 12, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack,hasItemLost'),
+        (25, 4, 12, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack'),
-        (26, 4, 13, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack,hasItemLost'),
+        (26, 4, 13, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack'),
-        (27, 4, 14, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),     'hasItemShortage,hasComponentLack,hasItemLost'),
+        (27, 4, 14, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack'),
-        (28, 4, 15, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack,hasItemLost'),
+        (28, 4, 15, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack'),
-        (29, 4, 17, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),     'hasItemShortage,hasComponentLack'),
+        (29, 4, 17, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack'),
-        (30, 4, 18, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),     'hasItemShortage,hasComponentLack'),
+        (30, 4, 18, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack'),
-        (31, 2, 23, 'Melee weapon combat fist 15cm',    -5, 7.08,   0, 0, 0, util.VN_CURDATE(),     'hasRounding'),
+        (31, 2, 23, 'Melee weapon combat fist 15cm',    -5, 7.08,   0, 0, 0, util.VN_CURDATE(),     NULL),
         (32, 1, 24, 'Ranged weapon longbow 200cm',         -1, 8.07,   0, 0, 0, util.VN_CURDATE(),  NULL),
         (33, 5, 14, 'Ranged weapon pistol 9mm',         50, 1.79,   0, 0, 0, util.VN_CURDATE(),     NULL),
-        (34, 4, 28, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack,hasItemLost'),
+        (34, 4, 28, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack'),
-        (35, 4, 29, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack,hasItemLost'),
+        (35, 4, 29, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack'),
         (37, 4, 31, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),      NULL),
-        (36, 4, 30, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack,hasItemLost'),
+        (36, 4, 30, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE(),     'hasComponentLack'),
         (38, 2, 32, 'Melee weapon combat fist 15cm',    30, 7.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH),     'hasComponentLack'),
         (39, 1, 32,  'Ranged weapon longbow 200cm',         2, 103.49, 0, 0, 0, util.VN_CURDATE(),     'hasComponentLack'),
-        (40, 2, 34, 'Melee weapon combat fist 15cm', 10.00, 3.91, 0, 0, 0, util.VN_CURDATE(),     'hasComponentLack,hasItemLost'),
+        (40, 2, 34, 'Melee weapon combat fist 15cm', 10.00, 3.91, 0, 0, 0, util.VN_CURDATE(),     'hasComponentLack'),
-        (41, 2, 35, 'Melee weapon combat fist 15cm', 8.00, 3.01, 0, 0, 0, util.VN_CURDATE(),     'hasComponentLack,hasRounding,hasItemLost'),
+        (41, 2, 35, 'Melee weapon combat fist 15cm', 8.00, 3.01, 0, 0, 0, util.VN_CURDATE(),     'hasComponentLack'),
-        (42, 2, 36, 'Melee weapon combat fist 15cm', 6.00, 2.50, 0, 0, 0, util.VN_CURDATE(),     'hasComponentLack,hasRounding,hasItemLost'),
+        (42, 2, 36, 'Melee weapon combat fist 15cm', 6.00, 2.50, 0, 0, 0, util.VN_CURDATE(),     'hasComponentLack');
-		(43, 88, 1000000, 'Chest medical box 2', 15.00, 10.00, 0, 0, 0, CURDATE(), '');
 
 INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
     VALUES
@@ -1462,21 +1451,7 @@ INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
         (98,    14, 23, '1',                        7),
         (99,    15, 92, 'Trolley',                  2),
         (100,   16, 92, 'Pallet',                   2),
-        (101,   71, 92, 'Shipping cost',            2),
+        (101,   71, 92, 'Shipping cost',            2);
-        (102,   88, 56, 'Chest',                    1),
-        (103,   88, 58, 'ammo box',                 2),
-        (104,   88, 27, '100cm',                    3),
-        (105,   88, 36, 'Stark Industries',         4),
-        (106,   88, 1,  'White',                    5),
-        (107,   88, 67, 'supply',                   6),
-        (108,   88, 23, '13',                       7),
-		(109,   72, 56, 'Mistic weapon',            1),
-        (110,   72, 58, 'Stormbreaker',             2),
-        (111,   72, 27, '200cm',                    3),
-        (112,   72, 36, 'Stark Industries',         4),
-        (113,   72, 1,  'Red/Green/Blue',           5),
-        (114,   72, 67, '-1 precission',            6),
-        (115,   72, 23, '1',                        7);
 
 INSERT INTO `vn`.`itemTypeTag`(`id`, `itemTypeFk`, `tagFk`, `priority`)
     VALUES
@@ -1546,8 +1521,7 @@ INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseO
         (10, DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   5, 1, 1, 50.00,  500,  'nineth travel',  1, 2, 10, TRUE, 2),
         (11, util.VN_CURDATE() - INTERVAL 1 DAY          ,                              util.VN_CURDATE(),   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL),
         (12, util.VN_CURDATE()                           ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL),
-        (13,  util.VN_CURDATE() - INTERVAL 1 MONTH - INTERVAL 1 DAY, util.VN_CURDATE() - INTERVAL 1 MONTH,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL),
+        (13,  util.VN_CURDATE() - INTERVAL 1 MONTH - INTERVAL 1 DAY, util.VN_CURDATE() - INTERVAL 1 MONTH,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL);
-        (14, util.VN_CURDATE() - INTERVAL 1 DAY          ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL);
 
 INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `evaNotes`, `typeFk`)
 	VALUES
@@ -1563,11 +1537,10 @@ INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed
 		(10,	2,	DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 	10, 0, 442, 'IN2010', 'Movement 10',1,                  '', 'product'),
         (11,    4,  DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH),  1, 1, 442, 'IN2011', 'Movement 11',0,                  '', 'product'),
         (12,    4,  util.VN_CURDATE() - INTERVAL 1 MONTH,            13, 1, 442, 'IN2012', 'Movement 12',0,                 '', 'product'),
-		(99,	69, util.VN_CURDATE() - INTERVAL 1 MONTH, 			11, 0, 442, 'IN2009', 'Movement 99',0,                  '', 'product'),
+		(99,	69, util.VN_CURDATE() - INTERVAL 1 MONTH, 			11, 0, 442, 'IN2009', 'Movement 99',0,                  '', 'product');
-        (100,    1, util.VN_CURDATE()                   ,           14, 0, 442, 'IN2009','Movement 100',0,                  '', 'product');
 
-INSERT INTO `vn`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `maxLockTime`, `defaultSupplierFk`)
+INSERT INTO `vn`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `defaultSupplierFk`)
-	VALUES (2, 4, 300, 1);
+	VALUES (2, 4, 1);
 
 INSERT INTO `bs`.`waste`(`buyerFk`, `year`, `week`, `itemFk`, `itemTypeFk`, `saleTotal`, `saleWasteQuantity`, `saleExternalWaste`, `saleFaultWaste`, `saleContainerWaste`, `saleBreakWaste`, `saleOtherWaste`)
     VALUES
@@ -1587,35 +1560,26 @@ INSERT INTO `bs`.`waste`(`buyerFk`, `year`, `week`, `itemFk`, `itemTypeFk`, `sal
         ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      6, 1, '186',      '0',      '51',      '53.12',   '56.20',   '56.20',   '56.20'),
         ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      7, 1, '277',      '0',      '53.12',   '56.20',   '56.20',   '56.20',   '56.20');
 
-    INSERT INTO edi.supplier (supplier_id,company_name,entry_date,expiry_date,change_date_time,isAllowedDirectSales,isBanned)
+	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,'MV', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 0);
-    INSERT INTO edi.ekt (id,`ref`,qty,pro,pri,ok,scanned)
-        VALUES (1, 1234, 1, 1, 1.1, 1, 1);
-
-	INSERT INTO vn.buy(id,entryFk,itemFk,buyingValue,quantity,packagingFk,stickers,freightValue,packageValue,comissionValue,packing,grouping,groupingMode,location,price1,price2,price3,printedStickers,isChecked,isIgnored,ektFk,weight,created)
     VALUES
-    		( 1,   1, 1,      50, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1, util.VN_CURDATE() - INTERVAL 2 MONTH),
+        (1,  1, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', 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,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1, util.VN_CURDATE() - INTERVAL 1 MONTH),
+        (2,  2, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', 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,       NULL, NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1,                    util.VN_CURDATE()),
+        (3,  3, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  NULL, 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,       NULL, NULL, 0.00,  7.30,  7.00, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+        (4,  2, 2, 5,       450,    3, 1, 1.000, 1.000, 0.000, 10, 10, NULL, 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,       NULL, NULL, 0.00,  78.3,  75.6, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+        (5,  3, 3, 55,      500,    5, 1, 1.000, 1.000, 0.000, 1,  1,  NULL, NULL, 0.00, 78.3, 75.6,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-    		( 6,   4, 8,      50, 1000, 4, 1, 1.000, 1.000, 0.000,  1,  1, 'grouping', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+        (6,  4, 8, 50,      1000,   4, 1, 1.000, 1.000, 0.000, 1,  1,  'grouping', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-    		( 7,   4, 9,      20, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10,  'packing', NULL, 0.00, 30.50, 29.00, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+        (7,  4, 9, 20,      1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 'packing', NULL, 0.00, 30.50, 29.00, 0, 1, 0, 2.5,   util.VN_CURDATE()),
-    		( 8,   4, 4,    1.25, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+        (8,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-    		( 9,   4, 4,    1.25, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+        (9,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-    		(10,   5, 1,      50,   10, 4, 1, 2.500, 2.500, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+        (10, 5, 1, 50,      10,     4, 1, 2.500, 2.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
-    		(11,   5, 4,    1.25,   10, 3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+        (11, 5, 4, 1.25,    10,     3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-    		(12,   6, 4,    1.25,    0, 3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+        (12, 6, 4, 1.25,    0,      3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-    		(13,   7, 1,      50,    0, 3, 1, 2.000, 2.000, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+        (13, 7, 1, 50,      0,      3, 1, 2.000, 2.000, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
-    		(14,   7, 2,       5,    0, 3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00,  7.30,  7.00, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+        (14, 7, 2, 5,       0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 7.30, 7.00,   0, 1, 0, 4,     util.VN_CURDATE()),
-            (15,   7, 4,    1.25,    0, 3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+		(15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-            (16,  99, 1, 50.0000, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1,  'packing', NULL, 0.00, 99.60, 99.40, 0, 1, 0, NULL, 1.00,            '2024-07-30 08:13:51.000'),
+        (16, 99,1,50.0000,  5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.60, 99.40,  0, 1, 0, 1.00, '2024-07-30 08:13:51.000'),
-            (17,  11, 1,      50, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1, util.VN_CURDATE() - INTERVAL 2 MONTH),
+        (17, 11, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH),
-            (18,  12, 1,      50, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1, 'grouping', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1, util.VN_CURDATE() - INTERVAL 2 MONTH),
+        (18, 12, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'grouping', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH);
-            (19, 100, 1,      50,  100, 4, 1, 1.500, 1.500, 0.000,  1,  1, 'grouping', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1,                    util.VN_CURDATE()),
-            (20, 100, 2,       5,  450, 3, 2, 1.000, 1.000, 0.000, 10, 10,       NULL, NULL, 0.00,  7.30,  7.00, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
-            (21, 100,72,      55,  500, 5, 3, 1.000, 1.000, 0.000,  1,  1,  'packing', NULL, 0.00,  78.3,  75.6, 0, 1, 0,    1,    3,                    util.VN_CURDATE()),		
-	  (10000002,  12,88, 50.0000, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1, 'grouping', NULL, 0.00, 99.60, 99.40, 0, 1, 0, 1.00,    1,util.VN_CURDATE()  - INTERVAL 2 MONTH);
 
 INSERT INTO `hedera`.`order`(`id`, `date_send`, `customer_id`, `delivery_method_id`, `agency_id`, `address_id`, `company_id`, `note`, `source_app`, `confirmed`,`total`, `date_make`, `first_row_stamp`, `confirm_date`)
     VALUES
@@ -1910,10 +1874,10 @@ INSERT INTO `vn`.`workerManaExcluded`(`workerFk`)
     VALUES
         (9);
 /*
-el mana de los trabajadores lo podemos poner a mano en la tabla si lo calculamos antes,
+ el mana de los trabajadores lo podemos poner a mano en la tabla si lo calculamos antes,
-pero si hazemos alguna modificacion en alguna tabla que utiliza para calcularlo ya no seria correcto
+ pero si hazemos alguna modificacion en alguna tabla que utiliza para calcularlo ya no seria correcto
 
-La otra manera es poner el calculo con los 2 trabajadores que utilizamos ahora mismo para los tickets
+ La otra manera es poner el calculo con los 2 trabajadores que utilizamos ahora mismo para los tickets
 */
 
 call vn.manaSpellersRequery(19);
@@ -1976,9 +1940,9 @@ INSERT INTO `vn`.`claimEnd`(`id`, `saleFk`, `claimFk`, `workerFk`, `claimDestina
         (1, 31, 4, 21, 2),
         (2, 32, 3, 21, 3);
 
-INSERT INTO `vn`.`claimConfig`(`id`, `maxResponsibility`, `monthsToRefund`, `minShipped`,`daysToClaim`)
+INSERT INTO `vn`.`claimConfig`(`id`, `maxResponsibility`, `monthsToRefund`, `minShipped`)
     VALUES
-        (1, 5, 4, '2016-10-01', 7);
+        (1, 5, 4, '2016-10-01');
 
 INSERT INTO `vn`.`claimRatio`(`clientFk`, `yearSale`, `claimAmount`, `claimingRate`, `priceIncreasing`, `packingRate`)
     VALUES
@@ -2670,9 +2634,9 @@ REPLACE INTO `vn`.`invoiceIn`(`id`, `serialNumber`,`serial`, `supplierFk`, `issu
         (9,  1009,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1242, 0, 442, 1,util.VN_CURDATE()),
         (10, 1010,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1243, 0, 442, 1,util.VN_CURDATE());
 
-INSERT INTO `vn`.`invoiceInConfig` (`id`, `retentionRate`, `retentionName`, `sageFarmerWithholdingFk`, `daysAgo`, `balanceStartingDate`)
+INSERT INTO `vn`.`invoiceInConfig` (`id`, `retentionRate`, `retentionName`, `sageFarmerWithholdingFk`, `daysAgo`)
     VALUES
-        (1, -2, '2% retention', 2, 45, '2000-01-01');
+        (1, -2, '2% retention', 2, 45);
 
 INSERT INTO `vn`.`invoiceInDueDay`(`invoiceInFk`, `dueDated`, `bankFk`, `amount`)
     VALUES
@@ -2785,13 +2749,13 @@ INSERT INTO `vn`.`roadmapAddress` (`addressFk`)
         (3),
         (4);
 
-INSERT INTO `vn`.`roadmap` (`id`, `name`, `tractorPlate`, `trailerPlate`, `phone`, `supplierFk`, `etd`, `observations`, `editorFk`, `price`, `driverName`)
+INSERT INTO `vn`.`roadmap` (`id`, `name`, `tractorPlate`, `trailerPlate`, `phone`, `supplierFk`, `etd`, `observations`, `userFk`, `price`, `driverName`)
     VALUES
         (1, 'val-algemesi', '1234-BCD', '9876-BCD', '111111111', 1, util.VN_NOW(),                           'this is test observation', 1, 15, 'Batman'),
         (2, 'alg-valencia', '2345-CDF', '8765-BCD', '111111111', 1, util.VN_NOW(), 'test observation',         1, 20, 'Robin'),
-        (3, 'alz-algemesi', '3456-DFG', '7654-BCD', '222222222', 2, DATE_ADD(util.VN_NOW(), INTERVAL 3 DAY), 'observations...',          2, 25, 'Driverman');
+        (3, 'alz-algemesi', '3456-DFG', '7654-BCD', '222222222', 2, DATE_ADD(util.VN_NOW(), INTERVAL 2 DAY), 'observations...',          2, 25, 'Driverman');
 
-INSERT INTO `vn`.`roadmapStop` (`id`, `roadmapFk`, `roadmapAddressFk`, `eta`, `description`, `editorFk`)
+INSERT INTO `vn`.`roadmapStop` (`id`, `roadmapFk`, `addressFk`, `eta`, `description`, `userFk`)
     VALUES
         (1, 1, 1, DATE_ADD(util.VN_NOW(), INTERVAL 1 DAY),          'Best truck in fleet',      1),
         (2, 1, 2, DATE_ADD(util.VN_NOW(), INTERVAL '1 2' DAY_HOUR), 'Second truck in fleet',    1),
@@ -2955,8 +2919,7 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`)
         (7, 'zone-included','An email to notify zoneCollisions'),
         (8, 'backup-printer-selected','A backup printer has been selected'),
         (9, 'mrw-deadline','The MRW deadline has passed'),
-        (10,'invoice-ticket-closure','Tickets not invoiced during the nightly closure ticket process'),
+        (10,'invoice-ticket-closure','Tickets not invoiced during the nightly closure ticket process');
-        (11,'misallocation-warehouse','Misallocation of items in the warehouse.');
 
 TRUNCATE `util`.`notificationAcl`;
 INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
@@ -2970,8 +2933,7 @@ INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
         (6, 9),
         (7, 9),
         (8, 66),
-        (9, 56),
+        (9, 56);
-		(11, 9);
 
 TRUNCATE `util`.`notificationQueue`;
 INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`)
@@ -3238,7 +3200,7 @@ UPDATE vn.department
     SET workerFk = null;
 
 INSERT INTO vn.packaging
-    VALUES('--', 2745600.00, 100.00, 120.00, 220.00, 0.00, 1, '2001-01-01 00:00:00.000', NULL, NULL, NULL, 0.00, 16, 0.00, 0, NULL, 0.00, NULL, NULL, 0, NULL, 0, 0,0,1,0);
+    VALUES('--', 2745600.00, 100.00, 120.00, 220.00, 0.00, 1, '2001-01-01 00:00:00.000', NULL, NULL, NULL, 0.00, 16, 0.00, 0, NULL, 0.00, NULL, NULL, 0, NULL, 0, 0,0,1);
 
 
 INSERT IGNORE INTO vn.intrastat
@@ -4083,9 +4045,6 @@ INSERT IGNORE INTO vn.saySimpleConfig (url, defaultChannel)
 INSERT INTO vn.workerIrpf (workerFk,spouseNif, geographicMobilityDate)
 	VALUES (1106,'26493101E','2019-09-20');
 
-INSERT INTO vn.payment (received, supplierFk, amount, currencyFk, divisa, bankFk, payMethodFk, bankingFees, concept, companyFk, created, isConciliated, dueDated, workerFk) VALUES
-	 (util.VN_CURDATE(), 1, 1000.00, 1, NULL, 1, 1, 0.0, 'n/pago', 442, util.VN_CURDATE(), 1, util.VN_CURDATE(), 9);
-
 INSERT INTO vn.referenceRate (currencyFk, dated, value)
     VALUES (2, '2000-12-01', 1.0495),
             (2, '2001-01-01', 1.0531),
@@ -4097,48 +4056,3 @@ INSERT IGNORE INTO vn.osrmConfig (id,url,tolerance)
 INSERT IGNORE INTO  vn.inventoryConfig
     SET id = 1,
         supplierFk = 4;
-
-UPDATE vn.worker
-	SET isFreelance=1
-	WHERE firstName='deliveryFreelancer';
-
-INSERT INTO vn.vehicleState (state, hasToNotify)
-    VALUES
-        ('Operativo', NULL),
-        ('Prestado', NULL),
-        ('Robado', NULL),
-        ('Taller', NULL),
-        ('Targeta SOLRED', NULL),
-        ('Via T SOLRED', NULL),
-        ('ITV', NULL);
-
-INSERT INTO vn.vehicleEvent (started, finished, vehicleStateFk, description, vehicleFk, userFk, notified)
-    VALUES
-        ('2000-12-01', '2000-12-02', 4, 'cambio de aceite', 5, 103, NULL),
-        ('2000-12-15', '2000-12-18', 2, 'viaje fin de curso', 5, 103, NULL),
-        ('2000-12-20', '2001-01-01', 3, 'llaves puestas', 2, 103, NULL);
-
-INSERT INTO vn.fuelType (id, name, code)
-    VALUES
-        (1, 'gasoil', 'gasoil'),
-        (2, 'gas', 'gas'),
-        (3, 'adblue', 'adblue'),
-        (4, 'gasolina', 'gasolina'),
-        (5, 'gasoil-frigo', 'gasoil-frigo'),
-        (6, 'electrico', 'electric');
-
-INSERT INTO vn.bankPolicy (id, `ref`, amount, committedFee, nonCommittedFee, annualFee, started, ended, accountingFk, companyFk, supplierFk, description, hasGuarantee, dmsFk, notaryFk, currencyFk, amortizationTypeFk, periodicityTypeFk, insuranceExpired)
-    VALUES
-        (1, '11112222', 500000.0, 0.028, 0.0, 0.001, '2001-01-01', '2001-02-01', 1, 442, NULL, NULL, 0, NULL, NULL, 1, NULL, NULL, NULL),
-        (2, '33334444', 100000.0, 0.017, 0.0, 0.0, '2001-01-01', '2001-02-01', 1, 2, NULL, NULL, 0, NULL, NULL, 2, NULL, NULL, NULL);
-
-INSERT INTO vn.ppe (id, amortization, firstAmortizated, lastAmortizated, finished, value, planFk, groupFk, account, endowment, elementAccount, nature, location, discharged, cause, isInvestmentAsset, workerFk, companyFk, description, isDone)
-    VALUES
-        (1, 0.00, '2001-01-01', NULL, NULL, 700.95, 16, 4, '3456000000', '4320000000', '12345', 'INMOVILIZADO', 'V02', NULL, NULL, 0, NULL, 442, 'UTILLAJE LASER ROTATIVO AUTONIVELANTE 500M', NULL),
-        (2, 0.00, '2001-01-01', NULL, NULL, 400.00, 16, 4, '5678000000', '1230000000', '67891', 'INMOVILIZADO', 'V02', NULL, NULL, 0, NULL, 442, 'UTILLAJE BALANZA Z100 150KILOS', NULL);
-
-INSERT IGNORE INTO vn.vehicleType (id, name)
-    VALUES (1,'vehículo empresa'),
-        (2, 'furgoneta'),
-        (3, 'cabeza tractora'),
-        (4, 'remolque');

db/routines/bs/procedures/inventoryDiscrepancyDetail_replace.sql

@@ -65,7 +65,7 @@ BEGIN
 								JOIN vn.ticketState ts ON ts.ticketFk = t.id
 								JOIN vn.alertLevel al ON al.id = ts.alertLevel
 							WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
-								AND NOT s.isPicked
+								AND s.isPicked = FALSE
 								AND al.code = 'FREE'
 								AND  t.warehouseFk = vWarehouseFk
 							GROUP BY s.itemFk
@@ -73,6 +73,7 @@ BEGIN
 					) s ON s.itemFk = v.item_id
 				WHERE v.calc_id = vCalc
 					AND NOT v.visible <=> tv.totalVisible;
+
 	END LOOP;
 	CLOSE cWarehouses;
 

db/routines/cache/procedures/available_refresh.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`available_refres
 	OUT `vCalc` INT,
 	`vRefresh` INT,
 	`vWarehouse` INT,
-	`vAvailabled` DATETIME
+	`vDated` DATE
 )
 proc: BEGIN
 	DECLARE vStartDate DATE;
@@ -12,7 +12,6 @@ proc: BEGIN
 	DECLARE vInventoryDate DATE;
 	DECLARE vLifeScope DATE;
 	DECLARE vWarehouseFkInventory INT;
-	DECLARE vDated DATE;
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
@@ -20,17 +19,13 @@ proc: BEGIN
 		RESIGNAL;
 	END;
 
-	IF vAvailabled < util.VN_CURDATE() THEN
+	IF vDated < util.VN_CURDATE() THEN
 		LEAVE proc;
 	END IF;
 
-	SET vDated = DATE(vAvailabled);
-
-	SET vAvailabled = vDated + INTERVAL HOUR(vAvailabled) HOUR;
-
 	CALL vn.item_getStock(vWarehouse, vDated, NULL);
 
-	SET vParams = CONCAT_WS('/', vWarehouse, vAvailabled);
+	SET vParams = CONCAT_WS('/', vWarehouse, vDated);
 	CALL cache_calc_start (vCalc, vRefresh, 'available', vParams);
 
 	IF !vRefresh THEN
@@ -89,13 +84,14 @@ proc: BEGIN
 						AND (ir.ended IS NULL OR i.shipped <= ir.ended)
 						AND i.warehouseFk = vWarehouse
 				UNION ALL
-				SELECT i.itemFk, IFNULL(i.availabled, i.landed), i.quantity
+				SELECT i.itemFk, i.landed, i.quantity
 					FROM vn.itemEntryIn i
 						JOIN itemRange ir ON ir.itemFk = i.itemFk
-					WHERE IFNULL(i.availabled, i.landed) >= vStartDate
+						LEFT JOIN edi.warehouseFloramondo wf ON wf.entryFk = i.entryFk
-						AND IFNULL(i.availabled, i.landed) <= vAvailabled
+					WHERE i.landed >= vStartDate
-						AND (ir.ended IS NULL OR IFNULL(i.availabled, i.landed) <= ir.ended)
+						AND (ir.ended IS NULL OR i.landed <= ir.ended)
 						AND i.warehouseInFk = vWarehouse
+						AND ISNULL(wf.entryFk)
 				UNION ALL
 				SELECT i.itemFk, i.shipped, i.quantity
 					FROM vn.itemEntryOut i

db/routines/sage/procedures/accountingMovements_add.sql

@@ -23,7 +23,6 @@ BEGIN
 	DECLARE vInvoiceTypeInformativeCode VARCHAR(1);
 	DECLARE vCountryCanariasCode, vCountryCeutaMelillaCode VARCHAR(2);
 	DECLARE vCompanyCode INT;
-	DECLARE vHasErrorTax BOOL DEFAULT FALSE;
 
 	SELECT SiglaNacion INTO vCountryCanariasCode
 		FROM Naciones
@@ -67,24 +66,6 @@ BEGIN
 		WHERE enlazadoSage = FALSE
 			AND Asiento <> 1 ;
 
-	SELECT EXISTS (
-		SELECT TRUE
-			FROM vn.XDiario x
-				 JOIN vn.invoiceIn ii ON ii.id = x.CLAVE
-				 JOIN vn.invoiceInTax it ON it.invoiceInFk = ii.id
-				 LEFT JOIN TiposIva ti ON ti.CodigoIva = it.taxTypeSageFk
-				 LEFT JOIN taxType tt ON tt.id = it.taxTypeSageFk
-			WHERE x.FECHA BETWEEN vDatedFrom AND vDatedTo
-				AND NOT x.enlazadoSage
-				AND x.empresa_id = vCompanyFk
-				AND it.taxTypeSageFk
-				AND (ti.CodigoIva IS NULL OR tt.id IS NULL)
-	) INTO vHasErrorTax;
-
-	IF vHasErrorTax tHEN
-		CALL util.throw ('Error in tables for received invoices tax');
-	END IF;
-
 	CALL invoiceOut_manager(vYear, vCompanyFk);
  	CALL invoiceIn_manager(vYear, vCompanyFk);
 

db/routines/vn/functions/getTimeBetweenRoadmapAddresses.sql

@@ -1,62 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`getTimeBetweenRoadmapAddresses`(
-	vRoadmapAddressFrom INT,
-	vRoadmapAddressTo INT
-)
-	RETURNS int(11)
-	DETERMINISTIC
-BEGIN
-/**
- * Retorna el tiempo en segundos que se suele tardar en ir
- * de un punto de distribución a otro en una ruta troncal.
- *
- * @param vRoadmapAddressFrom Punto de distribución de origen
- * @param vRoadmapAddressTo Punto de distribución de destino
- * @return Tiempo en segundos
- */
-	DECLARE vSeconds INT;
-
-	WITH wRoadmapStop AS (
-		SELECT ROW_NUMBER() OVER(PARTITION BY roadmapFk ORDER BY eta) `sequence`,
-				roadmapFk,
-				roadmapAddressFk,
-				eta
-			FROM vn.roadmapStop
-			WHERE roadmapFk IS NOT NULL
-				AND roadmapAddressFk IS NOT NULL
-				AND eta IS NOT NULL
-	)
-	SELECT AVG(TIME_TO_SEC(TIMEDIFF(rsTo.eta, rsFrom.eta))) INTO vSeconds
-		FROM wRoadmapStop rsFrom
-			JOIN wRoadmapStop rsTo ON rsTo.roadmapFk = rsFrom.roadmapFk
-		WHERE rsFrom.roadmapAddressFk = vRoadmapAddressFrom
-			AND rsTo.roadmapAddressFk = vRoadmapAddressTo
-			AND rsFrom.`sequence` + 1 = rsTo.`sequence`;
-	
-	IF NOT IFNULL(vSeconds, 0) THEN
-		WITH wRoadmap AS (
-			SELECT id,
-					roadmapAddressFk,
-					etd
-				FROM vn.roadmap
-				WHERE roadmapAddressFk = vRoadmapAddressFrom
-					AND etd IS NOT NULL
-		), wRoadmapStop AS (
-			SELECT ROW_NUMBER() OVER(PARTITION BY roadmapFk ORDER BY eta) `sequence`,
-					roadmapFk,
-					roadmapAddressFk,
-					eta
-				FROM vn.roadmapStop
-				WHERE roadmapFk IS NOT NULL
-					AND roadmapAddressFk = vRoadmapAddressTo
-					AND eta IS NOT NULL
-		)
-		SELECT AVG(TIME_TO_SEC(TIMEDIFF(rsTo.eta, rFrom.etd))) INTO vSeconds
-			FROM wRoadmap rFrom
-				JOIN wRoadmapStop rsTo ON rsTo.roadmapFk = rFrom.id
-					AND rsTo.`sequence` = 1;
-	END IF;
-
-	RETURN vSeconds;
-END$$
-DELIMITER ;

db/routines/vn/procedures/catalog_calculate.sql

@@ -19,15 +19,13 @@ BEGIN
  * @return tmp.ticketComponentPrice
  */
 	DECLARE vAvailableCalc INT;
-	DECLARE vAvailabled DATETIME;
+	DECLARE vAvailableNoRaidsCalc INT;
-	DECLARE vDone BOOL;
-	DECLARE vHour INT;
 	DECLARE vShipped DATE;
 	DECLARE vWarehouseFk SMALLINT;
 	DECLARE vZoneFk INT;
-
+	DECLARE vDone BOOL;
 	DECLARE cTravelTree CURSOR FOR
-		SELECT zoneFk, warehouseFk, shipped, `hour` FROM tmp.zoneGetShipped;
+		SELECT zoneFk, warehouseFk, shipped FROM tmp.zoneGetShipped;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
@@ -68,15 +66,14 @@ BEGIN
 	OPEN cTravelTree;
 	l: LOOP
 		SET vDone = FALSE;
-		FETCH cTravelTree INTO vZoneFk, vWarehouseFk, vShipped, vHour;
+		FETCH cTravelTree INTO vZoneFk, vWarehouseFk, vShipped;
-	
-		SET vAvailabled = vShipped + INTERVAL HOUR(vHour) HOUR;
 
 		IF vDone THEN
 			LEAVE l;
 		END IF;
 
-		CALL `cache`.available_refresh(vAvailableCalc, FALSE, vWarehouseFk, vAvailabled);
+		CALL `cache`.available_refresh(vAvailableCalc, FALSE, vWarehouseFk, vShipped);
+		CALL `cache`.availableNoRaids_refresh(vAvailableNoRaidsCalc, FALSE, vWarehouseFk, vShipped);
 		CALL buy_getUltimate(NULL, vWarehouseFk, vShipped);
 
 		INSERT INTO tmp.ticketLot (warehouseFk, itemFk, available, buyFk, zoneFk)
@@ -86,10 +83,31 @@ BEGIN
 					bu.buyFk,
 					vZoneFk
 				FROM `cache`.available a
+					LEFT JOIN cache.availableNoRaids anr ON anr.item_id = a.item_id 
+														AND anr.calc_id = vAvailableNoRaidsCalc
 					JOIN tmp.item i ON i.itemFk = a.item_id
 					JOIN item it ON it.id = i.itemFk
 					JOIN `zone` z ON z.id = vZoneFk
 					LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = a.item_id	
+					LEFT JOIN edi.supplyResponse sr ON sr.ID = it.supplyResponseFk	
+					LEFT JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID 
+					LEFT JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
+					LEFT JOIN (SELECT isVNHSupplier, isEarlyBird, TRUE AS itemAllowed
+									FROM addressFilter af
+										JOIN (SELECT ad.provinceFk, p.countryFk, ad.isLogifloraAllowed 
+												FROM address ad 
+													JOIN province p ON p.id = ad.provinceFk 
+												WHERE ad.id = vAddressFk
+											) sub2 ON sub2.provinceFk <=> IFNULL(af.provinceFk, sub2.provinceFk)
+													AND sub2.countryFk <=> IFNULL(af.countryFk, sub2.countryFk)
+													AND sub2.isLogifloraAllowed <=> IFNULL(af.isLogifloraAllowed, sub2.isLogifloraAllowed)
+								WHERE vWarehouseFk = af.warehouseFk
+									AND (vShipped < af.beforeDated
+										OR ISNULL(af.beforeDated)
+										OR	vShipped > af.afterDated
+										OR ISNULL(af.afterDated))
+								) sub ON sub.isVNHSupplier = v.isVNHSupplier
+										AND (sub.isEarlyBird = mp.isEarlyBird OR ISNULL(sub.isEarlyBird))
 					JOIN agencyMode am ON am.id = vAgencyModeFk
 					JOIN agency ag ON ag.id = am.agencyFk
 					JOIN itemType itt ON itt.id = it.typeFk
@@ -106,6 +124,7 @@ BEGIN
 							AND ait.itemTypeFk = itt.id
 				WHERE a.calc_id = vAvailableCalc
 					AND a.available > 0
+					AND (sub.itemAllowed OR NOT it.isFloramondo OR anr.available > 0)
 					AND (ag.isAnyVolumeAllowed OR NOT itt.isUnconventionalSize)
 					AND (it.`size` IS NULL
 						OR IF(itc.isReclining,

db/routines/vn/procedures/collection_new.sql

@@ -160,11 +160,9 @@ BEGIN
 				OR (NOT s.isPreparable AND NOT s.isPrintable)
 				OR pb.collectionH IS NOT NULL
 				OR pb.collectionV IS NOT NULL
-				OR pb.collectionA IS NOT NULL
 				OR pb.collectionN IS NOT NULL
-				OR (NOT pb.H AND pb.V + pb.A > 0 AND vItemPackingTypeFk = 'H')
+				OR (NOT pb.H AND pb.V > 0 AND vItemPackingTypeFk = 'H')
 				OR (NOT pb.V AND vItemPackingTypeFk = 'V')
-				OR (NOT pb.A AND vItemPackingTypeFk = 'A')
 				OR (pc.isPreviousPreparationRequired AND pb.previousWithoutParking)
 				OR LENGTH(pb.problem)
 				OR pb.lines > vLinesLimit

db/routines/vn/procedures/entry_clone.sql

@@ -1,31 +1,20 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`entry_clone`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`entry_clone`(vSelf INT)
-	vSelf INT,
-	OUT vOutputEntryFk INT
-)
 BEGIN
 /**
  * clones an entry.
  *
  * @param vSelf The entry id
- * @param vOutputEntryFk The new entry id
  */
 	DECLARE vNewEntryFk INT;
 
-	DECLARE vIsRequiredTx BOOL DEFAULT NOT @@in_transaction;
+	START TRANSACTION;
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		CALL util.tx_rollback(vIsRequiredTx);
-		RESIGNAL;
-	END;
-
-	CALL util.tx_start(vIsRequiredTx);
 
 	CALL entry_cloneHeader(vSelf, vNewEntryFk, NULL);
 	CALL entry_copyBuys(vSelf, vNewEntryFk);
 
-	CALL util.tx_commit(vIsRequiredTx);
+	COMMIT;
-	SET vOutputEntryFk = vNewEntryFk;
 
+	SELECT vNewEntryFk;
 END$$
 DELIMITER ;

db/routines/vn/procedures/entry_transfer.sql

@@ -1,158 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`entry_transfer`(
-	vOriginalEntry INT,
-	OUT vNewEntryFk INT
- )
-BEGIN
-/**
- * Adelanta a mañana la mercancia de una entrada a partir de lo que hay ubicado en el almacén
- *
- * @param vOriginalEntry entrada que se quiera adelantar
- * @param vNewEntry nueva entrada creada
- */
-	DECLARE vTravelFk INT;
-	DECLARE vWarehouseFk INT;
-	DECLARE vWarehouseInFk INT;
-	DECLARE vWarehouseOutFk INT;
-	DECLARE vRef INT;
-	DECLARE vIsReceived INT;
-	DECLARE vAgencyModeFk INT;
-	DECLARE vTomorrow DATETIME DEFAULT util.tomorrow();
-	DECLARE vCurDate DATE DEFAULT util.VN_CURDATE();
-
-	DECLARE vIsRequiredTx BOOL DEFAULT NOT @@in_transaction;
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		CALL util.tx_rollback(vIsRequiredTx);
-		RESIGNAL;
-	END;
-
-	-- Clonar la entrada
-	CALL entry_clone(vOriginalEntry, vNewEntryFk);
-
-	CALL util.tx_start(vIsRequiredTx);
-
-	/* Hay que crear un nuevo travel, con salida hoy y llegada mañana y
-		asignar la entrada nueva al nuevo travel.*/
-	SELECT t.warehouseInFk, t.warehouseOutFk, t.`ref`, t.isReceived, t.agencyModeFk
-		INTO vWarehouseInFk, vWarehouseOutFk, vRef, vIsReceived, vAgencyModeFk
-		FROM travel t
-			JOIN entry e ON e.travelFk = t.id
-		WHERE e.id = vOriginalEntry;
-
-	SELECT id INTO vTravelFk
-		FROM travel t
-		WHERE shipped = vCurDate
-			AND landed = vTomorrow
-			AND warehouseInFk = vWarehouseInFk
-			AND warehouseOutFk = vWarehouseOutFk
-			AND `ref` = vRef
-			AND isReceived =vIsReceived
-			AND agencyModeFk = vAgencyModeFk;
-
-	IF vTravelFk IS NULL THEN
-			INSERT INTO travel(
-				shipped,
-				landed,
-				warehouseInFk,
-				warehouseOutFk,
-				`ref`,
-				isReceived,
-				agencyModeFk)
-			SELECT vCurDate,
-					vTomorrow,
-					t.warehouseInFk,
-					t.warehouseOutFk,
-					t.`ref`,
-					t.isReceived,
-					t.agencyModeFk
-				FROM travel t
-					JOIN entry e ON e.travelFk = t.id
-				WHERE e.id = vOriginalEntry;
-
-		SET vTravelFk = LAST_INSERT_ID();
-	END IF;
-
-	UPDATE entry
-		SET travelFk = vTravelFk,
-			evaNotes = vOriginalEntry
-		WHERE id = vNewEntryFk;
-
-	-- Poner a 0 las cantidades
-	UPDATE buy b
-		SET b.quantity = 0, b.stickers = 0
-		WHERE b.entryFk = vNewEntryFk;
-
-	-- Eliminar duplicados
-	DELETE b
-		FROM buy b
-			LEFT JOIN (SELECT b.id, b.itemFk
-							FROM buy b
-							WHERE b.entryFk = vNewEntryFk
-							GROUP BY b.itemFk) tBuy ON tBuy.id = b.id
-		WHERE b.entryFk = vNewEntryFk
-			AND tBuy.id IS NULL;
-
-	SELECT t.warehouseInFk INTO vWarehouseFk
-		FROM travel t
-			JOIN entry e ON e.travelFk = t.id
-		WHERE e.id = vOriginalEntry;
-
-	/* Actualizar nueva entrada con lo que no está ubicado HOY,
-		descontando lo vendido HOY de esas ubicaciones*/
-	CREATE OR REPLACE TEMPORARY TABLE buys
-		WITH tBuy AS (
-			SELECT b.itemFk, SUM(b.quantity) totalQuantity
-				FROM vn.buy b
-				WHERE b.entryFk = vOriginalEntry
-				GROUP BY b.itemFk
-		),
-		itemShelvings AS (
-			SELECT ish.itemFk, SUM(ish.visible) visible
-				FROM vn.itemShelving ish
-					JOIN vn.shelving sh ON sh.id = ish.shelvingFk
-					JOIN vn.parking p ON p.id = sh.parkingFk
-					JOIN vn.sector s ON s.id = p.sectorFk
-					JOIN vn.buy b ON b.id = ish.buyFk
-					JOIN vn.entry e ON e.id = b.entryFk
-					JOIN tBuy t ON t.itemFk = ish.itemFk
-				WHERE s.warehouseFk = vWarehouseFk
-					AND sh.parked >= vCurDate
-				GROUP BY ish.itemFk
-		),
-		sales AS (
-			SELECT s.itemFk, SUM(s.quantity) sold
-				FROM vn.ticket t
-					JOIN vn.sale s ON s.ticketFk = t.id
-					JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
-					JOIN vn.itemShelving is2 ON is2.id = iss.itemShelvingFk
-					JOIN vn.shelving s2 ON s2.id = is2.shelvingFk
-					JOIN tBuy t ON t.itemFk = s.itemFk
-				WHERE t.shipped BETWEEN vCurDate AND util.dayend(vCurDate)
-					AND s2.parked >= vCurDate
-				GROUP BY s.itemFk
-		)
-		SELECT tmp.itemFk,
-				IFNULL(iss.visible, 0) visible,
-				tmp.totalQuantity,
-				IFNULL(s.sold, 0) sold
-			FROM tBuy tmp
-				LEFT JOIN itemShelvings iss ON tmp.itemFk = iss.itemFk
-				LEFT JOIN sales s ON s.itemFk = tmp.itemFk
-			WHERE visible < tmp.totalQuantity
-				OR iss.itemFk IS NULL;
-
-	UPDATE buy b
-			JOIN buys tmp ON tmp.itemFk = b.itemFk
-		SET b.quantity = tmp.totalQuantity - tmp.visible - tmp.sold
-		WHERE b.entryFk = vNewEntryFk;
-
-	-- Limpia la nueva entrada
-	DELETE FROM buy WHERE entryFk = vNewEntryFk AND quantity = 0;
-
-	CALL util.tx_commit(vIsRequiredTx);
-
-	CALL cache.visible_refresh(@c,TRUE,vWarehouseFk);
-	CALL cache.available_refresh(@c, TRUE, vWarehouseFk, vCurDate);
-END$$
-DELIMITER ;

db/routines/vn/procedures/itemShelvingRadar.sql

@@ -0,0 +1,207 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingRadar`(
+	vSectorFk INT
+)
+BEGIN
+/**
+ * Calcula la información detallada respecto un sector.
+ *
+ * @param vSectorFk Id de sector
+ */
+	DECLARE vCalcVisibleFk INT;
+	DECLARE vCalcAvailableFk INT;
+	DECLARE hasFatherSector BOOLEAN;
+	DECLARE vBuyerFk INT DEFAULT 0;
+	DECLARE vWarehouseFk INT DEFAULT 0;
+	DECLARE vSonSectorFk INT;
+	DECLARE vWorkerFk INT;
+
+	SELECT s.workerFk INTO vWorkerFk 
+		FROM sector s
+		WHERE s.id = vSectorFk;
+
+	SELECT COUNT(*) INTO hasFatherSector
+		FROM sector
+		WHERE sonFk = vSectorFk;
+
+	SELECT warehouseFk, sonFk INTO vWarehouseFk, vSonSectorFk
+		FROM sector
+		WHERE id = vSectorFk;
+
+	CALL cache.visible_refresh(vCalcVisibleFk, TRUE, vWarehouseFk);
+	CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE());
+
+	IF hasFatherSector THEN
+		CREATE OR REPLACE TEMPORARY TABLE tItemShelvingRadar
+			(PRIMARY KEY (itemFk))
+			ENGINE = MEMORY 
+			SELECT * 
+				FROM (
+					SELECT iss.itemFk,
+							i.longName,
+							i.size,
+							i.subName producer,
+							IFNULL(a.available, 0) available,
+							SUM(IF(s.sonFk = vSectorFk, IFNULL(iss.visible, 0), 0)) upstairs,
+							SUM(IF(iss.sectorFk = vSectorFk, IFNULL(iss.visible, 0), 0)) downstairs,
+							IF(it.isPackaging, NULL, IFNULL(v.visible, 0)) visible,
+							vSectorFk sectorFk,
+							ish.isChecked,
+							sub.isAllChecked
+						FROM itemShelvingStock iss
+							JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+							LEFT JOIN (
+								SELECT itemFk,
+										IF(
+											COUNT(*) = SUM(IF(isChecked >= 0, 1, 0)),
+											TRUE,
+											FALSE
+										) isAllChecked
+									FROM itemShelving is2
+									GROUP BY itemFk
+							) sub ON sub.itemFk = ish.itemFk
+							JOIN sector s ON s.id = iss.sectorFk
+							JOIN item i ON i.id = iss.itemFk
+							JOIN itemType it ON it.id = i.typeFk
+							LEFT JOIN cache.available a ON a.item_id = iss.itemFk
+								AND a.calc_id = vCalcAvailableFk
+							LEFT JOIN cache.visible v  ON v.item_id = iss.itemFk
+								AND v.calc_id = vCalcVisibleFk
+							WHERE vSectorFk IN (iss.sectorFk, s.sonFk)
+							GROUP BY iss.itemFk
+					UNION ALL
+					SELECT v.item_id,
+							i.longName,
+							i.size,
+							i.subName,
+							IFNULL(a.available, 0),
+							0,
+							0,
+							IF(it.isPackaging, NULL, v.visible),
+							vSectorFk,
+							NULL,
+							NULL
+						FROM cache.visible v  
+							JOIN item i ON i.id = v.item_id
+							JOIN itemType it ON it.id = i.typeFk
+							LEFT JOIN itemShelvingStock iss ON iss.itemFk = v.item_id
+								AND iss.warehouseFk = vWarehouseFk
+							LEFT JOIN cache.available a ON a.item_id = v.item_id
+								AND a.calc_id = vCalcAvailableFk
+						WHERE v.calc_id = vCalcVisibleFk
+							AND iss.itemFk IS NULL
+							AND it.isInventory
+				) sub
+				GROUP BY itemFk;
+					
+		SELECT ishr.*, 
+				CAST(visible - upstairs - downstairs AS DECIMAL(10, 0)) nicho,
+				CAST(downstairs - IFNULL(notPickedYed, 0) AS DECIMAL(10, 0)) pendiente
+			FROM tItemShelvingRadar ishr
+				JOIN item i ON i.id = ishr.itemFk
+				LEFT JOIN (
+					SELECT s.itemFk, SUM(s.quantity) notPickedYed
+							FROM ticket t
+								JOIN ticketStateToday tst ON tst.ticketFk = t.id
+								JOIN alertLevel al ON al.id = tst.alertLevel
+								JOIN sale s ON s.ticketFk = t.id
+							WHERE t.warehouseFk = vWarehouseFk
+								AND al.code = 'FREE'
+							GROUP BY s.itemFk
+				) sub ON sub.itemFk = ishr.itemFk
+			ORDER BY i.typeFk, i.longName;
+	ELSE
+		CREATE OR REPLACE TEMPORARY TABLE tItemShelvingRadar
+			(PRIMARY KEY (itemFk))
+			ENGINE = MEMORY 
+			SELECT iss.itemFk,
+					0 `hour`,
+					0 `minute`,
+					'--' itemPlacementCode,
+					i.longName,
+					i.size,
+					i.subName producer,
+					i.upToDown,
+					IFNULL(a.available, 0) available,
+					IFNULL(v.visible - iss.visible, 0) dayEndVisible,
+					IFNULL(v.visible - iss.visible, 0) firstNegative,
+					IFNULL(v.visible - iss.visible, 0) itemPlacementVisible, 
+					IFNULL(i.minimum * b.packing, 0) itemPlacementSize,
+					ips.onTheWay,
+					iss.visible itemShelvingStock,
+					IFNULL(v.visible, 0) visible,
+					b.isPickedOff,
+					iss.sectorFk
+				FROM itemShelvingStock iss
+					JOIN item i ON i.id = iss.itemFk
+					LEFT JOIN cache.last_buy lb ON lb.item_id = iss.itemFk
+						AND lb.warehouse_id = vWarehouseFk
+						LEFT JOIN buy b ON b.id = lb.buy_id
+					LEFT JOIN cache.available a ON a.item_id = iss.itemFk
+						AND a.calc_id = vCalcAvailableFk
+					LEFT JOIN cache.visible v  ON v.item_id = iss.itemFk
+						AND v.calc_id = vCalcVisibleFk
+					LEFT JOIN (
+						SELECT itemFk, SUM(saldo) onTheWay
+							FROM itemPlacementSupplyList 
+							WHERE saldo > 0 
+							GROUP BY itemFk
+					) ips ON ips.itemFk = i.id
+					WHERE iss.sectorFk = vSectorFk
+						OR iss.sectorFk IS NULL;            
+
+		CREATE OR REPLACE TEMPORARY TABLE tmp.itemOutTime
+			SELECT *, SUM(amount) quantity
+				FROM (
+					SELECT io.itemFk,
+							io.quantity amount, 
+							IF(HOUR(t.shipped), HOUR(t.shipped), HOUR(z.`hour`)) `hours`, 
+							IF(MINUTE(t.shipped), MINUTE(t.shipped), MINUTE(z.`hour`)) `minutes`
+						FROM itemTicketOut `io`
+							JOIN tItemShelvingRadar isr ON isr.itemFk = io.itemFk
+							JOIN ticket t ON t.id= io.ticketFk
+							JOIN ticketState ts ON ts.ticketFk = io.ticketFk
+							JOIN `state` s ON s.id = ts.stateFk
+							LEFT JOIN `zone` z ON z.id = t.zoneFk
+							LEFT JOIN (
+								SELECT DISTINCT saleFk 
+									FROM saleTracking st 
+									WHERE st.created > util.VN_CURDATE() 
+										AND st.isChecked
+							) stPrevious ON stPrevious.saleFk = io.saleFk
+						WHERE t.warehouseFk = vWarehouseFk
+							AND NOT s.isPicked
+							AND NOT io.reserved 
+							AND stPrevious.saleFk IS NULL
+							AND io.shipped >= util.VN_CURDATE() 
+							AND io.shipped < util.VN_CURDATE() + INTERVAL 1 DAY
+				) sub
+				GROUP BY itemFk, `hours`, `minutes`;
+	
+		INSERT INTO tItemShelvingRadar (itemFk)
+			SELECT itemFk FROM tmp.itemOutTime
+				ON DUPLICATE KEY UPDATE dayEndVisible = dayEndVisible + quantity, 
+					firstNegative = IF(firstNegative < 0, firstNegative, firstNegative + quantity),
+					`hour` = IFNULL(IF(firstNegative > 0 , `hour`, `hours`), 0),
+					`minute` = IFNULL(IF(firstNegative > 0, `minute`, `minutes`), 0);
+
+		UPDATE tItemShelvingRadar isr
+				JOIN (
+					SELECT s.itemFk, SUM(s.quantity) amount
+						FROM sale s
+							JOIN ticket t ON t.id = s.ticketFk
+							JOIN ticketState ts ON ts.ticketFk = t.id
+						WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+							AND ts.code = 'COOLER_PREPARATION'
+						GROUP BY s.itemFk
+				) sub ON sub.itemFk = isr.itemFk
+			SET isr.dayEndVisible = dayEndVisible + sub.amount,
+				firstNegative = firstNegative + sub.amount;
+
+		SELECT * FROM tItemShelvingRadar;
+	END IF;
+
+	DROP TEMPORARY TABLE tItemShelvingRadar;
+	
+END$$
+DELIMITER ;

db/routines/vn/procedures/item_getBalance.sql

@@ -30,7 +30,7 @@ BEGIN
 		WITH entriesIn AS (
 			SELECT 'entry' originType,
 					e.id originId,
-					IFNULL(tr.availabled, tr.landed) shipped,
+					tr.landed shipped,
 					b.quantity `in`,
 					NULL `out`,
 					st.alertLevel ,
@@ -54,7 +54,7 @@ BEGIN
 						OR (util.VN_CURDATE() AND tr.isReceived),
 							'DELIVERED',
 							'FREE')
-				WHERE IFNULL(tr.availabled, tr.landed) >= vDateInventory
+				WHERE tr.landed >= vDateInventory
 					AND tr.warehouseInFk = vWarehouseFk
 					AND (s.id <> vSupplierInventoryFk OR vDated IS NULL)
 					AND b.itemFk = vItemFk
@@ -99,7 +99,7 @@ BEGIN
 		),
 		sales AS (
 			WITH itemSales AS (
-				SELECT DATE(t.shipped) + INTERVAL HOUR(z.`hour`) HOUR shipped,
+				SELECT DATE(t.shipped) shipped,
 						s.quantity,
 						st2.alertLevel,
 						st2.name,
@@ -114,7 +114,6 @@ BEGIN
 						cb.claimFk
 					FROM vn.sale s
 						JOIN vn.ticket t ON t.id = s.ticketFk
-						JOIN vn.`zone` z ON z.id = t.zoneFk
 						LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
 						LEFT JOIN vn.state st ON st.code = ts.code
 						JOIN vn.client c ON c.id = t.clientFk
@@ -190,15 +189,14 @@ BEGIN
 			SELECT * FROM sales
 			UNION ALL
 			SELECT * FROM orders
-			ORDER BY DATE(shipped),
+			ORDER BY shipped,
 				(inventorySupplierFk = entityId) DESC,
 				alertLevel DESC,
 				isTicket,
 				`order` DESC,
 				isPicked DESC,
 				`in` DESC,
-				`out` DESC,
+				`out` DESC;
-				shipped;
 
 	IF vDated IS NULL THEN
 		SET @a := 0;
@@ -207,7 +205,7 @@ BEGIN
 
 		SELECT t.originType,
 			t.originId,
-			@shipped:= t.shipped,
+			DATE(@shipped:= t.shipped) shipped,
 			t.alertLevel,
 			t.stateName,
 			t.reference,

db/routines/vn/procedures/item_getLack.sql

@@ -1,16 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getLack`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getLack`(IN vForce BOOLEAN, IN vDays INT)
-	vSelf INT,
-    vForce BOOLEAN,
-    vDays INT,
-    vLongname VARCHAR(255),
-    vProducerName VARCHAR(255),
-    vColor VARCHAR(255),
-    vSize INT,
-    vOrigen INT,
-    vLack INT,
-    vWarehouseFk INT
-    )
 BEGIN
 /**
  * Calcula una tabla con el máximo negativo visible para cada producto y almacen
@@ -58,14 +47,6 @@ BEGIN
 		WHERE w.isForTicket
 			AND ic.display
 			AND it.code != 'GEN'
-            AND (vSelf IS NULL OR i.id = vSelf)
-			AND (vLongname IS NULL OR i.name = vLongname)
-			AND (vProducerName IS NULL OR p.`name` LIKE CONCAT('%', vProducerName, '%'))
-			AND (vColor IS NULL OR vColor = i.inkFk)
-			AND (vSize IS NULL OR vSize = i.`size`)
-			AND (vOrigen IS NULL OR vOrigen = w.id)
-			AND (vLack IS NULL OR vLack = sub.amount)
-			AND (vWarehouseFk IS NULL OR vWarehouseFk = w.id)
 		GROUP BY i.id, w.id
 		HAVING lack < 0;
 

db/routines/vn/procedures/item_getSimilar.sql

@@ -82,19 +82,14 @@ BEGIN
 				AND it.priority = vPriority
 			LEFT JOIN vn.tag t ON t.id = it.tagFk
 			LEFT JOIN vn.buy b ON b.id = bu.buyFk
-			LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = i.id
-				AND iss.warehouseFk = vWarehouseFk
-			LEFT JOIN vn.ink ink ON ink.id = i.tag5
 			JOIN itemTags its
 		WHERE a.available > 0
 			AND (i.typeFk = its.typeFk OR NOT vShowType)
 			AND i.id <> vSelf
-		ORDER BY (a.available > 0) DESC,
+		ORDER BY `counter` DESC,
-				`counter` DESC,
 			(t.name = its.name) DESC,
 			(it.value = its.value) DESC,
 			(i.tag5 = its.tag5) DESC,
-				(ink.`showOrder`) DESC,
 			match5 DESC,
 			(i.tag6 = its.tag6) DESC,
 			match6 DESC,

db/routines/vn/procedures/item_getStock.sql

@@ -15,6 +15,8 @@ BEGIN
  *
  * @return tmp.itemList(itemFk, stock, visible, available)
  */
+	DECLARE vIsLogifloraDay BOOL DEFAULT vn.isLogifloraDay(vDated, vWarehouseFk);
+
 	SET vDated = TIMESTAMP(vDated, '00:00:00');
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.itemList
@@ -34,11 +36,14 @@ BEGIN
 				UNION ALL
 				SELECT iei.itemFk, iei.quantity
 					FROM itemEntryIn iei
+						LEFT JOIN edi.warehouseFloramondo wf ON wf.entryFk = iei.entryFk
 						JOIN item i ON i.id = iei.itemFk
-					WHERE IFNULL(iei.availabled, iei.landed) >= util.VN_CURDATE()
+					WHERE iei.landed >= util.VN_CURDATE()
-						AND IFNULL(iei.availabled, iei.landed) < vDated
+						AND iei.landed < vDated
 						AND iei.warehouseInFk = vWarehouseFk
 						AND (vItemFk IS NULL OR iei.itemFk = vItemFk)
+						AND (wf.entryFk IS NULL OR vIsLogifloraDay)
+						AND NOT (iei.landed > util.VN_CURDATE() AND i.isFloramondo)
 				UNION ALL
 				SELECT ieo.itemFk, ieo.quantity
 					FROM itemEntryOut ieo
@@ -47,6 +52,7 @@ BEGIN
 						AND ieo.shipped < vDated
 						AND ieo.warehouseOutFk = vWarehouseFk
 						AND (vItemFk IS NULL OR ieo.itemFk = vItemFk)
+						AND NOT (ieo.shipped > util.VN_CURDATE() AND i.isFloramondo)
 			) sub
 			GROUP BY itemFk
 			HAVING stock;

db/routines/vn/procedures/prepareTicketList.sql

@@ -1,18 +1,16 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`prepareTicketList`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`prepareTicketList`(vStartingDate DATETIME, vEndingDate DATETIME)
-	vStartingDate DATETIME, 
-	vEndingDate DATETIME
-)
 BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tmp.productionTicket;
 	CREATE TEMPORARY TABLE tmp.productionTicket
 		(PRIMARY KEY (ticketFk))
 		ENGINE = MEMORY
-		SELECT t.id ticketFk
+		SELECT t.id ticketFk, t.clientFk
 			FROM ticket t
 				JOIN alertLevel al ON al.code = 'DELIVERED'
 				LEFT JOIN ticketState ts ON ts.ticketFk = t.id
 				JOIN client c ON c.id = t.clientFk
+
 			WHERE c.typeFk IN ('normal','handMaking','internalUse')
 				AND (
 					t.shipped BETWEEN util.VN_CURDATE() AND vEndingDate

db/routines/vn/procedures/productionControl.sql

@@ -24,31 +24,24 @@ proc: BEGIN
 	CALL prepareTicketList(util.yesterday(), vEndingDate);
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
+		SELECT * FROM tmp.productionTicket;
+
+	CALL prepareClientList();
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.sale_getProblems
 		(INDEX (ticketFk))
 		ENGINE = MEMORY
-		SELECT ticketFk
+		SELECT tt.ticketFk, tt.clientFk, t.warehouseFk, t.shipped
-			FROM tmp.productionTicket;
+			FROM tmp.productionTicket tt
+				JOIN ticket t ON t.id = tt.ticketFk;
 
 	CALL ticket_getProblems(vIsTodayRelative);
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.productionBuffer
 		(PRIMARY KEY(ticketFk), previaParking VARCHAR(255))
 		ENGINE = MEMORY
-		WITH saleProblemsDescription AS(
-		SELECT s.ticketFk,
-				LEFT(CONCAT('F: ', GROUP_CONCAT(CONCAT(i.id, ' ', i.longName) SEPARATOR ', ')), 250) itemShortage,
-				LEFT(CONCAT('R: ', GROUP_CONCAT(CONCAT(i2.id, ' ', i2.longName) SEPARATOR ', ')), 250) itemDelay,
-				LEFT(CONCAT('I: ', GROUP_CONCAT(CONCAT(i3.id, ' ', i3.longName) SEPARATOR ', ')), 250) itemLost 
-			FROM tmp.saleProblems sp
-				JOIN vn.sale s ON s.id = sp.saleFk
-				LEFT JOIN vn.item i ON i.id = s.itemFk AND sp.hasItemShortage
-				LEFT JOIN vn.item i2 ON i2.id = s.itemFk AND sp.hasItemDelay
-				LEFT JOIN vn.item i3 ON i3.id = s.itemFk AND sp.hasItemLost
-			WHERE hasItemShortage OR hasItemDelay OR hasItemLost
-			GROUP BY s.ticketFk
-		)
 		SELECT tt.ticketFk,
-				t.clientFk,
+				tt.clientFk,
 				t.warehouseFk,
 				t.nickname,
 				t.packages,
@@ -66,17 +59,7 @@ proc: BEGIN
 				0 `lines`,
 				CAST( 0 AS DECIMAL(5,2)) m3,
 				CAST( 0 AS DECIMAL(5,2)) preparationRate,
-				TRIM(CAST(CONCAT(  IFNULL(sp.itemShortage, ''),
+				"" problem,
-					IFNULL(sp.itemDelay, ''),
-					IFNULL(sp.itemLost, ''),
-					IF(tpr.isFreezed, ' CONGELADO',''),
-					IF(tpr.hasHighRisk, ' RIESGO',''),
-					IF(tpr.hasTicketRequest, ' COD 100',''),
-					IF(tpr.isTaxDataChecked, '',' FICHA INCOMPLETA'),
-					IF(tpr.hasComponentLack, ' COMPONENTES', ''),
-					IF(HOUR(util.VN_NOW()) < IF(HOUR(t.shipped), HOUR(t.shipped), COALESCE(HOUR(zc.hour),HOUR(z.hour))) 
-						AND tpr.isTooLittle, ' PEQUEÑO', '')
-				) AS char(255))) problem,
 				IFNULL(tls.state,2) state,
 				w.code workerCode,
 				DATE(t.shipped) shipped,
@@ -91,34 +74,31 @@ proc: BEGIN
 				pk.code parking,
 				0 H,
 				0 V,
-				0 A,
 				0 N,
 				st.isOk,
 				ag.isOwn,
 				rm.bufferFk
 			FROM tmp.productionTicket tt
-				JOIN vn.ticket t ON tt.ticketFk = t.id
+				JOIN ticket t ON tt.ticketFk = t.id
-				JOIN vn.alertLevel al ON al.code = 'FREE'
+				JOIN alertLevel al ON al.code = 'FREE'
-				LEFT JOIN vn.ticketStateToday tst ON tst.ticketFk = t.id
+				LEFT JOIN ticketStateToday tst ON tst.ticketFk = t.id
-				LEFT JOIN vn.`state` st ON st.id = tst.state
+				LEFT JOIN `state` st ON st.id = tst.state
-				LEFT JOIN vn.client c ON c.id = t.clientFk
+				LEFT JOIN client c ON c.id = t.clientFk
-				LEFT JOIN vn.worker wk ON wk.id = c.salesPersonFk
+				LEFT JOIN worker wk ON wk.id = c.salesPersonFk
-				JOIN vn.address a ON a.id = t.addressFk
+				JOIN address a ON a.id = t.addressFk
-				LEFT JOIN vn.province p ON p.id = a.provinceFk
+				LEFT JOIN province p ON p.id = a.provinceFk
-				JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+				JOIN agencyMode am ON am.id = t.agencyModeFk
-				JOIN vn.deliveryMethod dm ON dm.id = am.deliveryMethodFk
+				JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
-				JOIN vn.agency ag ON ag.id = am.agencyFk
+				JOIN agency ag ON ag.id = am.agencyFk
-				LEFT JOIN vn.ticketState tls ON tls.ticketFk = tt.ticketFk
+				LEFT JOIN ticketState tls ON tls.ticketFk = tt.ticketFk
-				LEFT JOIN vn.ticketLastUpdated tlu ON tlu.ticketFk = tt.ticketFk
+				LEFT JOIN ticketLastUpdated tlu ON tlu.ticketFk = tt.ticketFk
-				LEFT JOIN vn.worker w ON w.id = tls.userFk
+				LEFT JOIN worker w ON w.id = tls.userFk
-				LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
+				LEFT JOIN routesMonitor rm ON rm.routeFk = t.routeFk
-				LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
+				LEFT JOIN `zone` z ON z.id = t.zoneFk
-				LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk
+				LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
 					AND DATE(t.shipped) = zc.dated
-				LEFT JOIN vn.ticketParking  tp ON tp.ticketFk = t.id
+				LEFT JOIN ticketParking  tp ON tp.ticketFk = t.id
-				LEFT JOIN vn.parking pk ON pk.id = tp.parkingFk
+				LEFT JOIN parking pk ON pk.id = tp.parkingFk
-				LEFT JOIN tmp.ticketProblems tpr ON tpr.ticketFk = tt.ticketFk
-				LEFT JOIN saleProblemsDescription sp ON sp.ticketFk = tt.ticketFk
 			WHERE t.warehouseFk = vWarehouseFk
 				AND dm.code IN ('AGENCY', 'DELIVERY', 'PICKUP');
 
@@ -139,9 +119,21 @@ proc: BEGIN
 		CHANGE COLUMN `problem` `problem` VARCHAR(255),
 		ADD COLUMN `collectionH` INT,
 		ADD COLUMN `collectionV` INT,
-		ADD COLUMN `collectionA` INT,
 		ADD COLUMN `collectionN` INT;
 
+	UPDATE tmp.productionBuffer pb
+		JOIN  tmp.ticket_problems tp ON tp.ticketFk = pb.ticketFk
+		SET pb.problem = TRIM(CAST(CONCAT(  IFNULL(tp.itemShortage, ''),
+				IFNULL(tp.itemDelay, ''),
+				IFNULL(tp.itemLost, ''),
+				IF(tp.isFreezed, ' CONGELADO',''),
+				IF(tp.hasHighRisk, ' RIESGO',''),
+				IF(tp.hasTicketRequest, ' COD 100',''),
+				IF(tp.isTaxDataChecked, '',' FICHA INCOMPLETA'),
+				IF(tp.hasComponentLack, ' COMPONENTES', ''),
+				IF(HOUR(util.VN_NOW()) < pb.HH AND tp.isTooLittle, ' PEQUEÑO', '')
+			) AS char(255)));
+
 	-- Clientes Nuevos o Recuperados
 	UPDATE tmp.productionBuffer pb
 			LEFT JOIN bs.clientNewBorn cnb ON cnb.clientFk = pb.clientFk
@@ -181,13 +173,11 @@ proc: BEGIN
 		SELECT ticketFk,
 				SUM(sub.H) H,
 				SUM(sub.V) V,
-				SUM(sub.A) A,
 				SUM(sub.N) N
 			FROM (
 				SELECT t.ticketFk,
 						SUM(i.itemPackingTypeFk = 'H') H,
 						SUM(i.itemPackingTypeFk = 'V') V,
-						SUM(i.itemPackingTypeFk = 'A') A,
 						SUM(i.itemPackingTypeFk IS NULL) N
 					FROM tmp.productionTicket t
 						JOIN sale s ON s.ticketFk = t.ticketFk
@@ -200,7 +190,6 @@ proc: BEGIN
 			JOIN tItemPackingType ti ON ti.ticketFk = pb.ticketFk
 		SET pb.H = ti.H,
 			pb.V = ti.V,
-			pb.A = ti.A,
 			pb.N = ti.N;
 
 	-- Colecciones segun tipo de encajado
@@ -208,7 +197,6 @@ proc: BEGIN
 			JOIN ticketCollection tc ON pb.ticketFk = tc.ticketFk
 		SET pb.collectionH = IF(pb.H, tc.collectionFk, NULL),
 			pb.collectionV = IF(pb.V, tc.collectionFk, NULL),
-			pb.collectionA = IF(pb.A, tc.collectionFk, NULL),
 			pb.collectionN = IF(pb.N, tc.collectionFk, NULL);
 
 	-- Previa pendiente
@@ -290,8 +278,7 @@ proc: BEGIN
 	DROP TEMPORARY TABLE
 		tmp.productionTicket,
 		tmp.ticket,
-		tmp.ticketProblems,
+		tmp.ticket_problems,
-		tmp.saleProblems,
 		tmp.ticketWithPrevia,
 		tItemShelvingStock,
 		tItemPackingType;

db/routines/vn/procedures/roadmap_cloneDay.sql

@@ -1,72 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`roadmap_cloneDay`(
-	vDateToCopy DATE,
-	vDateToPaste DATE
-)
-BEGIN
-/**
- * Clona roadmaps de un día a otro, incluyendo las paradas y sin algunos
- * campos de la tabla principal, como matrículas, conductores...
- *
- * @param vDateToCopy Fecha para copiar
- * @param vDateToPaste Fecha para pegar
- */
-	DECLARE vDaysDiff INT;
-	DECLARE vRoadmapFk INT;
-	DECLARE vNewRoadmapFk INT;
-	DECLARE vDone BOOL DEFAULT FALSE;
-	DECLARE vRoadmaps CURSOR FOR
-		SELECT id
-			FROM roadmap
-			WHERE etd BETWEEN vDateToCopy AND util.dayEnd(vDateToCopy);
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		ROLLBACK;
-		RESIGNAL;
-	END;
-
-	SET vDaysDiff = DATEDIFF(vDateToPaste, vDateToCopy);
-
-	IF vDaysDiff IS NULL THEN
-		CALL util.throw("No valid dates");
-	END IF;
-
-	START TRANSACTION;
-
-	OPEN vRoadmaps;
-	l: LOOP
-		SET vDone = FALSE;
-		FETCH vRoadmaps INTO vRoadmapFk;
-
-		IF vDone THEN
-			LEAVE l;
-		END IF;
-
-	INSERT INTO roadmap (`name`, roadmapAddressFk, etd, eta, observations, price)
-		SELECT `name`,
-				roadmapAddressFk,
-				etd + INTERVAL vDaysDiff DAY,
-				eta + INTERVAL vDaysDiff DAY,
-				observations,
-				price
-			FROM roadmap
-			WHERE id = vRoadmapFk;
-
-	SET vNewRoadmapFk = LAST_INSERT_ID();
-
-	INSERT INTO roadmapStop (roadmapFk, roadmapAddressFk, eta, `description`, bufferFk)
-		SELECT vNewRoadmapFk,
-				roadmapAddressFk,
-				eta + INTERVAL vDaysDiff DAY,
-				`description`,
-				bufferFk
-			FROM roadmapStop
-			WHERE roadmapFk = vRoadmapFk;
-	END LOOP;
-	CLOSE vRoadmaps;
-
-	COMMIT;
-END$$
-DELIMITER ;

db/routines/vn/procedures/sale_getProblems.sql

@@ -1,14 +1,14 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`sale_getProblems`(
-	vIsTodayRelative TINYINT(1)
+	vIsTodayRelative tinyint(1)
 )
 BEGIN
 /**
- * Calcula los problemas para un conjunto de sale
+ * Calcula los problemas de cada venta para un conjunto de tickets.
  *
  * @param vIsTodayRelative Indica si se calcula el disponible como si todo saliera hoy
- * @table tmp.sale(saleFk) Identificadores de los sale a calcular
+ * @table tmp.sale_getProblems(ticketFk, clientFk, warehouseFk, shipped) Tickets a calcular
- * @return tmp.saleProblems
+ * @return tmp.sale_problems
  */
  	DECLARE vWarehouseFk INT;
 	DECLARE vDate DATE;
@@ -16,27 +16,71 @@ BEGIN
 	DECLARE vVisibleCache INT;
 	DECLARE vDone BOOL;
  	DECLARE vCursor CURSOR FOR
-		SELECT t.warehouseFk, IF(vIsTodayRelative, util.VN_CURDATE(), DATE(t.shipped)) dated
+		SELECT DISTINCT warehouseFk, IF(vIsTodayRelative, util.VN_CURDATE(), DATE(shipped))
-			FROM tmp.sale ts
+			FROM tmp.sale_getProblems
-				JOIN sale s ON s.id = ts.saleFk
+			WHERE shipped BETWEEN util.VN_CURDATE()
-				JOIN ticket t ON t.id = s.ticketFk
+				AND util.dayEnd(util.VN_CURDATE() + INTERVAL IF(vIsTodayRelative, 9.9, 1.9) DAY);
-			WHERE t.shipped BETWEEN util.VN_CURDATE()
-				AND util.dayEnd(util.VN_CURDATE() + INTERVAL IF(vIsTodayRelative, 9.9, 1.9) DAY)
-			GROUP BY warehouseFk, dated;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
-	CREATE OR REPLACE TEMPORARY TABLE tmp.saleProblems(
+	CREATE OR REPLACE TEMPORARY TABLE tmp.sale_problems (
+		ticketFk INT(11),
 		saleFk INT(11),
-		hasItemShortage BOOL DEFAULT FALSE,
+		isFreezed INTEGER(1) DEFAULT 0,
-		hasItemLost BOOL DEFAULT FALSE,
+		risk DECIMAL(10,1) DEFAULT 0,
-		hasComponentLack BOOL DEFAULT FALSE,
+		hasRisk TINYINT(1) DEFAULT 0,
-		hasItemDelay BOOL DEFAULT FALSE,
+		hasHighRisk TINYINT(1) DEFAULT 0,
-		hasRounding BOOL DEFAULT FALSE,
+		hasTicketRequest INTEGER(1) DEFAULT 0,
-		PRIMARY KEY (saleFk)
+		itemShortage VARCHAR(255),
-	) ENGINE = MEMORY;
+		isTaxDataChecked  INTEGER(1) DEFAULT 1,
+		itemDelay VARCHAR(255),
+		itemLost VARCHAR(255),
+		hasComponentLack INTEGER(1),
+		hasRounding VARCHAR(255),
+		isTooLittle BOOL DEFAULT FALSE,
+		isVip BOOL DEFAULT FALSE,
+		PRIMARY KEY (ticketFk, saleFk)
+	); -- No memory
 
-	CREATE OR REPLACE TEMPORARY TABLE tItemShelving
+	INSERT INTO tmp.sale_problems(ticketFk,
+									saleFk,
+									isFreezed,
+									risk,
+									hasRisk,
+									hasHighRisk,
+									hasTicketRequest,
+									isTaxDataChecked,
+									hasComponentLack,
+									isTooLittle)
+			SELECT sgp.ticketFk,
+					s.id,
+					IF(FIND_IN_SET('isFreezed', t.problem), TRUE, FALSE) isFreezed,
+					t.risk,
+					IF(FIND_IN_SET('hasRisk', t.problem), TRUE, FALSE) hasRisk,
+					IF(FIND_IN_SET('hasHighRisk', t.problem), TRUE, FALSE) hasHighRisk,
+					IF(FIND_IN_SET('hasTicketRequest', t.problem), TRUE, FALSE) hasTicketRequest,
+					IF(FIND_IN_SET('isTaxDataChecked', t.problem), FALSE, TRUE) isTaxDataChecked,
+					IF(FIND_IN_SET('hasComponentLack', s.problem), TRUE, FALSE) hasComponentLack,
+					IF(FIND_IN_SET('isTooLittle', t.problem)
+						AND util.VN_NOW() < (util.VN_CURDATE() + INTERVAL HOUR(zc.`hour`) HOUR) + INTERVAL MINUTE(zc.`hour`) MINUTE,
+						TRUE, FALSE) isTooLittle
+				FROM tmp.sale_getProblems sgp
+					JOIN ticket t ON t.id = sgp.ticketFk
+					LEFT JOIN sale s ON s.ticketFk = t.id
+					LEFT JOIN item i ON i.id = s.itemFk
+					LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
+						AND zc.dated = util.VN_CURDATE()
+				WHERE s.problem <> '' OR t.problem <> '' OR t.risk
+				GROUP BY t.id, s.id;
+
+	INSERT INTO tmp.sale_problems(ticketFk, isVip)
+		SELECT sgp.ticketFk, TRUE
+			FROM tmp.sale_getProblems sgp
+				JOIN client c ON c.id = sgp.clientFk
+			WHERE c.businessTypeFk = 'VIP'
+		ON DUPLICATE KEY UPDATE isVIP = TRUE;
+
+	CREATE OR REPLACE TEMPORARY TABLE tItemShelvingStock_byWarehouse
 		(INDEX (itemFk, warehouseFk))
 		ENGINE = MEMORY
 		SELECT ish.itemFk itemFk,
@@ -48,14 +92,6 @@ BEGIN
 				JOIN sector s ON s.id = p.sectorFk
 			GROUP BY ish.itemFk, s.warehouseFk;
 
-	-- Componentes: Algún componente obligatorio no se ha calcualdo
-		INSERT INTO tmp.saleProblems(saleFk, hasComponentLack)
-			SELECT s.id, TRUE
-				FROM tmp.sale ts
-					JOIN sale s ON s.id = ts.saleFk
-				WHERE FIND_IN_SET('hasComponentLack', s.problem)
-				GROUP BY s.id;
-
 	-- Disponible, faltas, inventario y retrasos
 	OPEN vCursor;
 	l: LOOP
@@ -72,11 +108,15 @@ BEGIN
 		-- Faltas: visible, disponible y ubicado son menores que la cantidad vendida	
 		CALL cache.visible_refresh(vVisibleCache, FALSE, vWarehouseFk);
 
-		INSERT INTO tmp.saleProblems(saleFk, hasItemShortage)
+		INSERT INTO tmp.sale_problems(ticketFk, itemShortage, saleFk)
-			SELECT s.id, TRUE
+			SELECT ticketFk, problem, saleFk
-				FROM tmp.sale ts
+				FROM (
-					JOIN sale s ON s.id = ts.saleFk
+					SELECT sgp.ticketFk, 
-					JOIN ticket t ON t.id = s.ticketFk
+							LEFT(CONCAT('F: ', GROUP_CONCAT(i.id, ' ', i.longName, ' ')), 250) problem, 
+							s.id saleFk
+						FROM tmp.sale_getProblems sgp
+							JOIN ticket t ON t.id = sgp.ticketFk
+							JOIN sale s ON s.ticketFk = t.id
 							JOIN item i ON i.id = s.itemFk
 							JOIN itemType it ON it.id = i.typeFk
 							JOIN itemCategory ic ON ic.id = it.categoryFk 
@@ -84,11 +124,11 @@ BEGIN
 								AND v.calc_id = vVisibleCache
 							LEFT JOIN cache.available av ON av.item_id = i.id
 								AND av.calc_id = vAvailableCache
-					LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
+							LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
-						AND tis.warehouseFk = t.warehouseFk
+								AND issw.warehouseFk = t.warehouseFk 
-				WHERE (s.quantity > v.visible OR (s.quantity > 0 AND v.visible IS NULL))
+						WHERE IFNULL(v.visible, 0) < s.quantity
-					AND (av.available < 0 OR av.available IS NULL)
+							AND IFNULL(av.available, 0) < 0
-					AND (s.quantity > tis.visible OR tis.visible IS NULL)
+							AND IFNULL(issw.visible, 0) < s.quantity
 							AND NOT s.isPicked
 							AND NOT s.reserved
 							AND ic.merchandise
@@ -96,24 +136,28 @@ BEGIN
 							AND NOT i.generic
 							AND util.VN_CURDATE() = vDate
 							AND t.warehouseFk = vWarehouseFk
-			GROUP BY s.id
+					GROUP BY sgp.ticketFk) sub
-			ON DUPLICATE KEY UPDATE hasItemShortage = TRUE;
+					ON DUPLICATE KEY UPDATE itemShortage = sub.problem, saleFk = sub.saleFk;
 		
 		-- Inventario: Visible suficiente, pero ubicado menor a la cantidad vendida
-		INSERT INTO tmp.saleProblems(saleFk, hasItemLost)
+		INSERT INTO tmp.sale_problems(ticketFk, itemLost, saleFk)
-			SELECT s.id, TRUE
+			SELECT ticketFk, problem, saleFk
-				FROM tmp.sale ts
+				FROM (
-					JOIN sale s ON s.id = ts.saleFk
+					SELECT sgp.ticketFk,
-					JOIN ticket t ON t.id = s.ticketFk
+							LEFT(GROUP_CONCAT('I: ', i.id, ' ', i.longName, ' '), 250) problem,
+							s.id saleFk
+						FROM tmp.sale_getProblems sgp
+							JOIN ticket t ON t.id = sgp.ticketFk
+							JOIN sale s ON s.ticketFk = t.id
 							JOIN item i ON i.id = s.itemFk
 							JOIN itemType it ON it.id = i.typeFk
 							JOIN itemCategory ic ON ic.id = it.categoryFk
 							LEFT JOIN cache.visible v ON v.item_id = s.itemFk
 								AND v.calc_id = vVisibleCache
-					LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
+							LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
-						AND tis.warehouseFk = t.warehouseFk
+								AND issw.warehouseFk = t.warehouseFk 
-				WHERE (v.visible >= s.quantity OR v.visible IS NULL)
+						WHERE IFNULL(v.visible, 0) >= s.quantity
-					AND (s.quantity > tis.visible  AND tis.visible IS NOT NULL)
+							AND IFNULL(issw.visible, 0) < s.quantity
 							AND s.quantity > 0
 							AND NOT s.isPicked
 							AND NOT s.reserved
@@ -122,15 +166,20 @@ BEGIN
 							AND NOT i.generic
 							AND util.VN_CURDATE() = vDate
 							AND t.warehouseFk = vWarehouseFk
-				GROUP BY s.id
+						GROUP BY sgp.ticketFk
-				ON DUPLICATE KEY UPDATE hasItemLost = TRUE;
+				) sub
+			ON DUPLICATE KEY UPDATE itemLost = sub.problem, saleFk = sub.saleFk;
 		
 		-- Retraso: Disponible suficiente, pero no visible ni ubicado
-		INSERT INTO tmp.saleProblems(saleFk, hasItemDelay)
+		INSERT INTO tmp.sale_problems(ticketFk, itemDelay, saleFk)
-			SELECT s.id, TRUE
+			SELECT ticketFk, problem, saleFk
-				FROM tmp.sale ts
+				FROM (
-					JOIN sale s ON s.id = ts.saleFk
+					SELECT sgp.ticketFk,
-					JOIN ticket t ON t.id = s.ticketFk
+							LEFT(GROUP_CONCAT('R: ', i.id, ' ', i.longName, ' '), 250) problem,
+							s.id saleFk
+						FROM tmp.sale_getProblems sgp
+							JOIN ticket t ON t.id = sgp.ticketFk
+							JOIN sale s ON s.ticketFk = t.id
 							JOIN item i ON i.id = s.itemFk
 							JOIN itemType it ON it.id = i.typeFk
 							JOIN itemCategory ic ON ic.id = it.categoryFk
@@ -138,11 +187,11 @@ BEGIN
 								AND v.calc_id = vVisibleCache
 							LEFT JOIN cache.available av ON av.item_id = i.id
 								AND av.calc_id = vAvailableCache
-					LEFT JOIN tItemShelving tis ON tis.itemFk = i.id
+							LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
-						AND tis.warehouseFk = t.warehouseFk
+								AND issw.warehouseFk = t.warehouseFk 
-				WHERE (s.quantity > v.visible AND v.visible IS NULL)
+						WHERE IFNULL(v.visible, 0) < s.quantity
-					AND (av.available >= 0 OR av.available IS NULL)
+							AND IFNULL(av.available, 0) >= 0
-					AND (s.quantity > tis.visible AND tis.visible IS NOT NULL)
+							AND IFNULL(issw.visible, 0) < s.quantity
 							AND s.quantity > 0
 							AND NOT s.isPicked
 							AND NOT s.reserved
@@ -151,29 +200,34 @@ BEGIN
 							AND NOT i.generic
 							AND util.VN_CURDATE() = vDate
 							AND t.warehouseFk = vWarehouseFk
-				GROUP BY s.id
+						GROUP BY sgp.ticketFk
-				ON DUPLICATE KEY UPDATE hasItemDelay = TRUE;
+				) sub
+			ON DUPLICATE KEY UPDATE itemDelay = sub.problem, saleFk = sub.saleFk;
 
 		-- Redondeo: cantidad incorrecta con respecto al grouping 
 		CALL buy_getUltimate(NULL, vWarehouseFk, vDate);
-
+		INSERT INTO tmp.sale_problems(ticketFk, hasRounding, saleFk)
-		INSERT INTO tmp.saleProblems(saleFk, hasRounding)
+			SELECT ticketFk, problem, saleFk
-			SELECT s.id, TRUE
+				FROM (
-				FROM tmp.sale ts
+					SELECT sgp.ticketFk, 
-					JOIN sale s ON s.id = ts.saleFk
+							s.id saleFk,
-					JOIN ticket t ON t.id = s.ticketFk
+							LEFT(GROUP_CONCAT('RE: ',i.id, ' ',  IFNULL(i.longName,'') SEPARATOR ', '), 250) problem
+						FROM tmp.sale_getProblems sgp
+							JOIN ticket t ON t.id = sgp.ticketFk 
 								AND t.warehouseFk = vWarehouseFk
+							JOIN sale s ON s.ticketFk = sgp.ticketFk
 							JOIN item i ON i.id = s.itemFk
 							JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
 							JOIN buy b ON b.id = bu.buyFk
 						WHERE MOD(s.quantity, b.`grouping`)	
-				GROUP BY s.id
+						GROUP BY sgp.ticketFk
-				ON DUPLICATE KEY UPDATE hasRounding = TRUE;
+				)sub 
+			ON DUPLICATE KEY UPDATE hasRounding = sub.problem, saleFk = sub.saleFk;
 
 		DROP TEMPORARY TABLE tmp.buyUltimate;
 	END LOOP;
 	CLOSE vCursor;
 
-	DROP TEMPORARY TABLE tItemShelving;
+	DROP TEMPORARY TABLE tItemShelvingStock_byWarehouse;
 END$$
 DELIMITER ;

db/routines/vn/procedures/sale_getProblemsByTicket.sql

@@ -1,25 +1,25 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`sale_getProblemsByTicket`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`sale_getProblemsByTicket`(IN vTicketFk INT, IN vIsTodayRelative TINYINT(1))
-    IN vTicketFk INT, 
-    IN vIsTodayRelative TINYINT(1)
-)
 BEGIN
 /**
- * Calcula los problemas de cada venta para un tickets.
+ * Calcula los problemas de cada venta 
+ * para un conjunto de tickets.
  *
  * @return Problems result
  */
-	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
+    CREATE OR REPLACE TEMPORARY TABLE tmp.sale_getProblems 
-		(INDEX (saleFk))
+    (INDEX (ticketFk))
     ENGINE = MEMORY
-		SELECT id saleFk FROM sale WHERE ticketFk = vTicketFk;
+    SELECT t.id ticketFk, t.clientFk, t.warehouseFk, t.shipped 
+        FROM ticket t
+        WHERE t.id = vTicketFk;
 
     CALL sale_getProblems(vIsTodayRelative);
 
-	SELECT * FROM tmp.saleProblems;
+    SELECT * FROM tmp.sale_problems;
 
     DROP TEMPORARY TABLE
-		tmp.saleProblems, 
+        tmp.sale_getProblems,
-		tmp.sale;
+        tmp.sale_problems;
 END$$
 DELIMITER ;

db/routines/vn/procedures/sale_replaceItem.sql

@@ -25,11 +25,9 @@ BEGIN
 	DECLARE vNewSaleFk INT;
 	DECLARE vFinalPrice DECIMAL(10,2);
 
-
-	DECLARE vIsRequiredTx BOOL DEFAULT NOT @@in_transaction;
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
-		CALL util.tx_rollback(vIsRequiredTx);
+		ROLLBACK;
 		RESIGNAL;
 	END;
 
@@ -131,6 +129,6 @@ BEGIN
 		VALUES(vItemFk, vNewItemFk, 1)
 		ON DUPLICATE KEY UPDATE counter = counter + 1;
 
-	CALL util.tx_commit(vIsRequiredTx);
+	COMMIT;
 END$$
 DELIMITER ;

db/routines/vn/procedures/supplier_statementWithEntries.sql

@@ -41,7 +41,6 @@ BEGIN
 				) currencyBalance
 			FROM (
 				SELECT NULL bankFk,
-						NULL bank,
 						ii.companyFk,
 						ii.serial,
 						ii.id,
@@ -75,7 +74,6 @@ BEGIN
 					GROUP BY iid.id, ii.id
 				UNION ALL
 				SELECT p.bankFk,
-						a.bank,
 						p.companyFk,
 						NULL,
 						p.id,
@@ -111,7 +109,6 @@ BEGIN
 					AND (vIsConciliated = p.isConciliated OR NOT vIsConciliated)
 				UNION ALL
 				SELECT NULL,
-						NULL bankFk,
 						companyFk,
 						NULL,
 						se.id,
@@ -139,7 +136,6 @@ BEGIN
 						AND (vIsConciliated = se.isConciliated OR NOT vIsConciliated)
 				UNION ALL
 				SELECT NULL bankFk,
-					NULL,
 					e.companyFk,
 					'E' serial,
 					e.invoiceNumber id,
@@ -158,7 +154,7 @@ BEGIN
 						JOIN travel tr ON tr.id = e.travelFk
 						JOIN currency c ON c.id = e.currencyFk
 					WHERE e.supplierFk = vSupplierFk
-						AND tr.landed >= util.VN_CURDATE()
+						AND tr.landed >= CURDATE()
 						AND e.invoiceInFk IS NULL
 						AND vHasEntries
 				ORDER BY (dated IS NULL AND NOT isBooked),

db/routines/vn/procedures/ticket_DelayTruck.sql

@@ -0,0 +1,36 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_DelayTruck`(vWarehouserFk INT, vHour INT, vMinute INT)
+BEGIN
+	DECLARE done INT DEFAULT FALSE;
+	DECLARE vTicketFk INT;
+	DECLARE cur1 CURSOR FOR SELECT ticketFk FROM tTicket;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+
+	CALL vn.productionControl(vWarehouserFk,0) ;
+
+	DROP TEMPORARY TABLE IF EXISTS tTicket;
+	CREATE TEMPORARY TABLE tTicket
+		SELECT ticketFk
+		FROM tmp.productionBuffer
+			JOIN alertLevel al ON al.code = 'FREE'
+		WHERE shipped = util.VN_CURDATE()
+			AND problem LIKE '%I:%'
+			AND (HH <= vHour OR HH = vHour AND mm < vMinute)
+			AND alertLevel = al.id;
+
+	OPEN cur1;
+
+	read_loop: LOOP
+		FETCH cur1 INTO vTicketFk;
+		IF done THEN
+			LEAVE read_loop;
+		END IF;
+
+		CALL vn.ticket_DelayTruckSplit(vTicketFk);
+	END LOOP;
+
+	CLOSE cur1;
+	DROP TEMPORARY TABLE tTicket, tmp.productionBuffer;
+END$$
+DELIMITER ;

db/routines/vn/procedures/ticket_DelayTruckSplit.sql

@@ -0,0 +1,59 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_DelayTruckSplit`(
+	vTicketFk INT
+)
+BEGIN
+/**
+ * Splita las lineas de ticket que no estan ubicadas
+ *
+ * @param vTicketFk Id ticket
+ */
+	DECLARE vNewTicketFk INT;
+	DECLARE vTotalLines INT;
+	DECLARE vLinesToSplit INT;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.SalesToSplit;
+	
+	SELECT COUNT(*) INTO vTotalLines
+		FROM sale 
+		WHERE ticketFk = vTicketFk;
+			
+	CREATE TEMPORARY TABLE tmp.SalesToSplit
+		SELECT s.id saleFk
+			FROM ticket t
+				JOIN sale s ON t.id = s.ticketFk 
+				LEFT JOIN (
+					SELECT ish.itemFk itemFk,
+							SUM(ish.visible) visible,
+							s.warehouseFk warehouseFk
+						FROM itemShelving ish
+							JOIN shelving sh ON sh.id = ish.shelvingFk
+							JOIN parking p ON p.id = sh.parkingFk
+							JOIN sector s ON s.id = p.sectorFk
+						GROUP BY ish.itemFk,
+							s.warehouseFk
+				) issw ON issw.itemFk = s.itemFk
+					AND issw.warehouseFk = t.warehouseFk 
+			WHERE s.quantity > IFNULL(issw.visible, 0)
+				AND s.quantity > 0
+				AND NOT s.isPicked
+				AND NOT s.reserved
+				AND t.id = vTicketFk;
+
+	SELECT COUNT(*) INTO vLinesToSplit
+		FROM tmp.SalesToSplit;
+
+	IF vLinesToSplit = vTotalLines AND vLinesToSplit > 0 THEN
+		SET vNewTicketFk = vTicketFk;
+	ELSE
+		CALL ticket_Clone(vTicketFk, vNewTicketFk);
+		UPDATE sale s 
+			JOIN tmp.SalesToSplit sts ON sts.saleFk = s.id 
+			SET s.ticketFk = vNewTicketFk;
+	END IF;
+
+	CALL ticket_setState(vNewTicketFk, 'FIXING');
+
+	DROP TEMPORARY TABLE tmp.SalesToSplit;
+END$$
+DELIMITER ;

db/routines/vn/procedures/ticket_canbePostponed.sql

@@ -19,7 +19,6 @@ BEGIN
 			sub2.iptd futureIpt,
 			sub2.state futureState,
 			t.clientFk,
-			cl.salespersonFk,
 			t.warehouseFk,
 			ts.alertLevel,
 			sub2.alertLevel futureAlertLevel,
@@ -30,21 +29,15 @@ BEGIN
 			st.code stateCode,
 			sub2.code futureStateCode,
 			st.classColor,
-			sub2.classColor futureClassColor,
+			sub2.classColor futureClassColor
-			am.id agencyFk,
-			am.name agency,
-			sub2.agencyModeFk futureAgencyFk,
-			sub2.agencyMode futureAgency
 		FROM vn.saleVolume sv
 			JOIN vn.sale s ON s.id = sv.saleFk
 			JOIN vn.item i ON i.id = s.itemFk
 			JOIN vn.ticket t ON t.id = sv.ticketFk
-			JOIN vn.agencyMode am ON am.id = t.agencyModeFk
 			JOIN vn.address a ON a.id = t.addressFk
 			JOIN vn.province p ON p.id = a.provinceFk
 			JOIN vn.country c ON c.id = p.countryFk
 			JOIN vn.ticketState ts ON ts.ticketFk = t.id
-			JOIN vn.client cl ON cl.id = t.clientFk
 			JOIN vn.state st ON st.id = ts.stateFk
 			JOIN vn.alertLevel al ON al.id = ts.alertLevel
 			LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
@@ -59,11 +52,8 @@ BEGIN
 							st.name state,
 							st.code,
 							st.classColor,
-							am.id agencyModeFk,
-							am.name agencyMode,
 							GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) iptd
 							FROM vn.ticket t
-							JOIN vn.agencyMode am ON am.id = t.agencyModeFk
 								JOIN vn.ticketState ts ON ts.ticketFk = t.id
 								JOIN vn.state st ON st.id = ts.stateFk
 								JOIN vn.sale s ON s.ticketFk = t.id

db/routines/vn/procedures/ticket_getProblems.sql

@@ -1,109 +1,53 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_getProblems`(
-	vIsTodayRelative TINYINT(1)
+	vIsTodayRelative tinyint(1)
 )
 BEGIN
 /**
  * Calcula los problemas para un conjunto de tickets.
+ * Agrupados por ticket
  *
- * @param vIsTodayRelative Indica si se calcula el disponible como si todo saliera hoy
+ * @table tmp.sale_getProblems(ticketFk, clientFk, warehouseFk, shipped) Identificadores de los tickets a calcular
- * @table tmp.ticket(ticketFk) Identificadores de los tickets a calcular
+ * @return tmp.ticket_problems
- * @return tmp.ticketProblems, tmp.saleProblems
  */
-	CREATE OR REPLACE TEMPORARY TABLE tmp.sale (
-		saleFk INT(11),
-		PRIMARY KEY (saleFk)
-	) ENGINE = MEMORY
-		SELECT DISTINCT s.id saleFk
-			FROM tmp.ticket tt
-				JOIN ticket t ON t.id = tt.ticketFk
-				JOIN sale s ON s.ticketFk = t.id
-			GROUP BY s.id;
-
 	CALL sale_getProblems(vIsTodayRelative);
 
-	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketProblems (
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket_problems 
-		ticketFk INT(11),
+		(PRIMARY KEY (ticketFk))
-		isFreezed BOOL DEFAULT FALSE,
+		ENGINE = MEMORY
-		risk DECIMAL(10,1) DEFAULT 0,
+		SELECT ticketFk,
-		hasRisk BOOL DEFAULT FALSE,
+			MAX(isFreezed) isFreezed,
-		hasHighRisk BOOL DEFAULT FALSE,
+			MAX(risk) risk,
-		hasTicketRequest BOOL DEFAULT FALSE,
+			MAX(hasRisk) hasRisk,
-		isTaxDataChecked BOOL DEFAULT FALSE,
+			MAX(hasHighRisk) hasHighRisk,
-		isTooLittle BOOL DEFAULT FALSE,
+			MAX(hasTicketRequest) hasTicketRequest,
-		isVip BOOL DEFAULT FALSE,
+			MAX(itemShortage) itemShortage,
-		hasItemShortage BOOL DEFAULT FALSE,
+			MIN(isTaxDataChecked) isTaxDataChecked,
-		hasItemDelay BOOL DEFAULT FALSE,
+			MAX(hasComponentLack) hasComponentLack,
-		hasItemLost BOOL DEFAULT FALSE,
+			MAX(isTooLittle) isTooLittle,
-		hasComponentLack BOOL DEFAULT FALSE,
+			MAX(itemDelay) itemDelay,
-		hasRounding BOOL DEFAULT FALSE,
+			MAX(hasRounding) hasRounding,
-		PRIMARY KEY (ticketFk)
+			MAX(itemLost) itemLost,
-	) ENGINE = MEMORY
+			MAX(isVip) isVip,
-	WITH hasItemShortage AS(
-	SELECT s.ticketFk
-		FROM tmp.saleProblems sp
-			JOIN vn.sale s ON s.id = sp.saleFk
-		WHERE sp.hasItemShortage
-		GROUP BY s.ticketFk
-	),hasItemLost AS(
-	SELECT s.ticketFk
-		FROM tmp.saleProblems sp
-			JOIN vn.sale s ON s.id = sp.saleFk
-		WHERE sp.hasItemLost
-		GROUP BY s.ticketFk
-	),hasRounding AS(
-	SELECT s.ticketFk
-		FROM tmp.saleProblems sp
-			JOIN vn.sale s ON s.id = sp.saleFk
-		WHERE sp.hasRounding
-		GROUP BY s.ticketFk
-	), hasItemDelay AS(
-	SELECT s.ticketFk
-		FROM tmp.saleProblems sp
-			JOIN vn.sale s ON s.id = sp.saleFk
-		WHERE sp.hasItemDelay
-		GROUP BY s.ticketFk
-	), hasComponentLack AS(
-	SELECT s.ticketFk
-		FROM tmp.saleProblems sp
-			JOIN vn.sale s ON s.id = sp.saleFk
-		WHERE sp.hasComponentLack
-		GROUP BY s.ticketFk
-	)SELECT tt.ticketFk,
-			FIND_IN_SET('isFreezed', t.problem) > 0 isFreezed,
-			t.risk,
-			FIND_IN_SET('hasRisk', t.problem) > 0 hasRisk,
-			FIND_IN_SET('hasHighRisk', t.problem) > 0 hasHighRisk,
-			FIND_IN_SET('hasTicketRequest', t.problem) > 0 hasTicketRequest,
-			FIND_IN_SET('isTaxDataChecked', t.problem) > 0 isTaxDataChecked,
-			FIND_IN_SET('isTooLittle', t.problem) > 0
-				AND util.VN_NOW() < (util.VN_CURDATE() +
-					INTERVAL HOUR(zc.`hour`) HOUR) +
-					INTERVAL MINUTE(zc.`hour`) MINUTE isTooLittle,
-			c.businessTypeFk = 'VIP' isVip,
-			NOT (his.ticketFk IS NULL) hasItemShortage,
-			NOT (hid.ticketFk IS NULL) hasItemDelay,
-			NOT (hil.ticketFk IS NULL) hasItemLost,
-			NOT (hcl.ticketFk IS NULL) hasComponentLack,
-			NOT (hr.ticketFk IS NULL) hasRounding,
 			0 totalProblems
-		FROM tmp.ticket tt
+		FROM tmp.sale_problems
-			JOIN vn.ticket t ON t.id = tt.ticketFk
+			GROUP BY ticketFk;
-			JOIN vn.client c ON c.id = t.clientFk
-			LEFT JOIN hasItemShortage his ON his.ticketFk = t.id
-			LEFT JOIN hasItemLost hil ON hil.ticketFk = t.id
-			LEFT JOIN hasRounding hr ON hr.ticketFk = t.id
-			LEFT JOIN hasItemDelay hid ON hid.ticketFk = t.id
-			LEFT JOIN hasComponentLack hcl ON hcl.ticketFk = t.id
-			LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk
-				AND zc.dated = util.VN_CURDATE()
-		GROUP BY t.id;
 
-	UPDATE tmp.ticketProblems
+	UPDATE tmp.ticket_problems
-		SET totalProblems = isFreezed + hasHighRisk + hasTicketRequest +
+		SET totalProblems = (
-			isTaxDataChecked + hasComponentLack + hasItemDelay +
+			(isFreezed) +
-			isTooLittle + hasItemLost + hasRounding  + hasItemShortage + isVip;
+			(hasHighRisk) +
+			(hasTicketRequest) +
+			(!isTaxDataChecked) +
+			(hasComponentLack) +
+			(itemDelay IS NOT NULL) +
+			(isTooLittle) +
+			(itemLost IS NOT NULL) +
+			(hasRounding IS NOT NULL) +
+			(itemShortage IS NOT NULL) +
+			(isVip)
+		);
 
-	DROP TEMPORARY TABLE tmp.sale;
+	DROP TEMPORARY TABLE tmp.sale_problems;
 END$$
 DELIMITER ;

db/routines/vn/procedures/vehicle_checkNumberPlate.sql

@@ -1,21 +1,14 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`vehicle_checkNumberPlate`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`vehicle_checkNumberPlate`(vNumberPlate VARCHAR(10), vCountryCodeFk VARCHAR(2))
-	vNumberPlate VARCHAR(10),
-	vCountryCodeFk VARCHAR(2)
-)
 BEGIN
 /**
- * Comprueba si la matricula pasada tiene el formato
+ * Comprueba si la matricula pasada tiene el formato correcto dependiendo del pais del vehiculo
- * correcto dependiendo del pais del vehiculo.
- *
- * @param vNumberPlate Número de matricula
- * @param vCountryCodeFk Código de pais
  */
 	DECLARE vRegex VARCHAR(45);
 
-	SELECT regex INTO vRegex
+	SELECT vp.regex INTO vRegex
-		FROM vehiclePlateRegex
+		FROM vehiclePlateRegex vp
-		WHERE countryCodeFk = vCountryCodeFk;
+		WHERE vp.countryCodeFk = vCountryCodeFk;
 	
 	IF NOT vNumberPlate REGEXP BINARY (vRegex)THEN
 		CALL util.throw(CONCAT('Error: la matricula ', vNumberPlate, ' no es valida para ',vCountryCodeFk));

db/routines/vn/triggers/roadmapStop_beforeInsert.sql

@@ -3,16 +3,8 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeInser
 	BEFORE INSERT ON `roadmapStop`
 	FOR EACH ROW
 BEGIN
-	SET NEW.editorFk = account.myUser_getId();
 
-	IF NEW.description IS NOT NULL THEN
 	SET NEW.description = UCASE(NEW.description);
-	END IF;
 
-	IF NEW.roadmapFk IS NOT NULL THEN
-		IF NEW.eta < (SELECT etd FROM roadmap WHERE id = NEW.roadmapFk) THEN
-			CALL util.throw('Departure time can not be after arrival time');
-		END IF;
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmapStop_beforeUpdate.sql

@@ -3,17 +3,8 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeUpdat
 	BEFORE UPDATE ON `roadmapStop`
 	FOR EACH ROW
 BEGIN
-	SET NEW.editorFk = account.myUser_getId();
 
-	IF NOT (NEW.description <=> OLD.description) THEN
 	SET NEW.description = UCASE(NEW.description);
-	END IF;
 
-	IF NOT (NEW.roadmapFk <=> OLD.roadmapFk) OR NOT (NEW.eta <=> OLD.eta) THEN
-
-		IF NEW.eta < (SELECT etd FROM roadmap WHERE id = NEW.roadmapFk) THEN
-			CALL util.throw('Departure time can not be after arrival time');
-		END IF;
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmap_beforeInsert.sql

@@ -3,31 +3,10 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_beforeInsert`
 	BEFORE INSERT ON `roadmap`
 	FOR EACH ROW
 BEGIN
-	SET NEW.editorFk = account.myUser_getId();
-
-	IF NEW.name IS NOT NULL THEN
-		SET NEW.name = UCASE(NEW.name);
-	END IF;
-
-	IF NEW.trailerPlate IS NOT NULL OR NEW.tugPlate IS NOT NULL THEN
-		SET NEW.m3 = (SELECT SUM(m3) FROM vehicle WHERE numberPlate IN (NEW.trailerPlate, NEW.tugPlate));
-	END IF;
-
 	IF NEW.driver1Fk IS NOT NULL THEN
-		SET NEW.driverName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
+		SET NEW.driverName = (SELECT firstName FROM worker WHERE id = NEW.driver1Fk);
-								FROM worker w
+	ELSE
-								WHERE w.id = NEW.driver1Fk);
+		SET NEW.driverName = NULL;
-
-		SET NEW.phone = (SELECT COALESCE(w.phone, c.mobile, c.phone, c.mobile)
-							FROM worker w
-								LEFT JOIN client c ON c.id = w.id
-							WHERE w.id = NEW.driver1Fk);
-	END IF;
-
-	IF NEW.driverChangeFk IS NOT NULL THEN
-		SET NEW.driverChangeName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
-										FROM worker w
-										WHERE w.id = NEW.driverChangeFk);
 	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmap_beforeUpdate.sql

@@ -3,51 +3,10 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_beforeUpdate`
 	BEFORE UPDATE ON `roadmap`
 	FOR EACH ROW
 BEGIN
-	DECLARE vSeconds INT;
+	IF NEW.driver1Fk IS NOT NULL THEN
-
+		SET NEW.driverName = (SELECT firstName FROM worker WHERE id = NEW.driver1Fk);
-	SET NEW.editorFk = account.myUser_getId();
+	ELSE
-
+		SET NEW.driverName = NULL;
-	IF NOT (NEW.name <=> OLD.name) THEN
-		SET NEW.name = UCASE(NEW.name);
-	END IF;
-
-	IF NOT (NEW.trailerPlate <=> OLD.trailerPlate) OR NOT (NEW.tugPlate <=> OLD.tugPlate) THEN
-		SET NEW.m3 = (SELECT SUM(m3) FROM vehicle WHERE numberPlate IN (NEW.trailerPlate, NEW.tugPlate));
-	END IF;
-
-	IF NOT (NEW.driverName <=> OLD.driverName) THEN
-		SET NEW.driver1Fk = NULL;
-	END IF;
-
-	IF NOT (NEW.driver1Fk <=> OLD.driver1Fk) AND NEW.driver1Fk IS NOT NULL THEN
-		SET NEW.driverName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
-								FROM worker w
-								WHERE w.id = NEW.driver1Fk);
-
-		SET NEW.phone = (SELECT COALESCE(w.phone, c.mobile, c.phone, c.mobile)
-							FROM worker w
-								LEFT JOIN client c ON c.id = w.id
-							WHERE w.id = NEW.driver1Fk);
-	END IF;
-
-	IF NOT (NEW.driverChangeName <=> OLD.driverChangeName) THEN
-		SET NEW.driverChangeFk = NULL;
-	END IF;
-
-	IF NOT (NEW.driverChangeFk <=> OLD.driverChangeFk) AND NEW.driverChangeFk IS NOT NULL THEN
-		SET NEW.driverChangeName = (SELECT CONCAT(w.firstName, ' ', w.lastName)
-										FROM worker w
-										WHERE w.id = NEW.driverChangeFk);
-	END IF;
-
-	IF NOT (NEW.etd <=> OLD.etd) THEN
-		SET vSeconds = TIME_TO_SEC(TIMEDIFF(NEW.etd, OLD.etd));
-		
-		IF vSeconds <> 0 THEN
-			UPDATE roadmapStop
-				SET eta = eta + INTERVAL vSeconds SECOND
-				WHERE roadmapFk = NEW.id;
-		END IF;
 	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/travel_beforeInsert.sql

@@ -16,9 +16,5 @@ BEGIN
 	IF NEW.awbFk IS NOT NULL THEN
 		CALL travel_throwAwb(NEW.id);
 	END IF;
-
-	IF NEW.availabled < NEW.landed THEN
-		CALL util.throw('The travel availabled cannot be earlier than landed');
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/travel_beforeUpdate.sql

@@ -40,9 +40,5 @@ BEGIN
 	IF (NOT(NEW.awbFk <=> OLD.awbFk)) AND NEW.awbFk IS NOT NULL THEN
 		CALL travel_throwAwb(NEW.id);
 	END IF;
-
-	IF NEW.availabled < NEW.landed THEN
-		CALL util.throw('The travel availabled cannot be earlier than landed');
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/views/agencyModeIncoming.sql

@@ -1,9 +0,0 @@
-CREATE OR REPLACE DEFINER=`vn`@`localhost`
-SQL SECURITY DEFINER
-VIEW `vn`.`agencyModeIncoming` AS
-	SELECT
-		am.id,
-		am.name
-	FROM `vn`.`agencyMode` AS am
-		JOIN `vn`.`agencyIncoming` AS ai
-			ON am.id = ai.agencyModeFk;

db/routines/vn/views/itemEntryIn.sql

@@ -7,8 +7,7 @@ AS SELECT `t`.`warehouseInFk` AS `warehouseInFk`,
 	`b`.`quantity` AS `quantity`,
 	`t`.`isReceived` AS `isReceived`,
 	`t`.`isRaid` AS `isVirtualStock`,
-	`e`.`id` AS `entryFk`,
+	`e`.`id` AS `entryFk`
-	`t`.`availabled`
 FROM (
 		(
 			`vn`.`buy` `b`

db/routines/vn/views/roadmapEta.sql

@@ -1,8 +0,0 @@
-CREATE OR REPLACE DEFINER=`vn`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`roadmapEta`
-AS SELECT `roadmapFk` AS id,
-	MAX(`eta`) AS `eta`
-FROM `vn`.`roadmapStop`
-WHERE `roadmapFk` IS NOT NULL
-GROUP BY `roadmapFk`;

db/routines/vn2008/views/Cubos.sql

@@ -18,6 +18,5 @@ AS SELECT `p`.`id` AS `Id_Cubo`,
 	`p`.`base` AS `Base`,
 	`p`.`isBox` AS `box`,
 	`p`.`returnCost` AS `costeRetorno`,
-	`p`.`isActive` AS `isActive`,
+	`p`.`isActive` AS `isActive`
-	`p`.`flippingCost` AS `flippingCost`
 FROM `vn`.`packaging` `p`

db/routines/vn2008/views/Split_lines.sql

@@ -0,0 +1,8 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`Split_lines`
+AS SELECT `sl`.`id` AS `Id_Split_lines`,
+	`sl`.`splitFk` AS `Id_Split`,
+	`sl`.`itemFk` AS `Id_Article`,
+	`sl`.`buyFk` AS `Id_Compra`
+FROM `vn`.`splitLine` `sl`

db/routines/vn2008/views/awb.sql

@@ -29,6 +29,5 @@ AS SELECT `a`.`id` AS `id`,
 	`a`.`invoiceInPaletizedFk` AS `invoiceInPaletizedFk`,
 	`a`.`observation` AS `observation`,
 	`a`.`hasFreightPrepaid` AS `hasFreightPrepaid`,
-	`a`.`propertyNumber` AS `propertyNumber`,
+	`a`.`propertyNumber` AS `propertyNumber`
-	`a`.`costPerKg` AS `costPerKg`
 FROM `vn`.`awb` `a`

db/routines/vn2008/views/travel.sql

@@ -16,6 +16,7 @@ AS SELECT `t`.`id` AS `id`,
 	`t`.`kg` AS `kg`,
 	`t`.`cargoSupplierFk` AS `cargoSupplierFk`,
 	`t`.`totalEntries` AS `totalEntries`,
+	`t`.`appointment` AS `appointment`,
 	`t`.`awbFk` AS `awbFk`,
 	`t`.`isRaid` AS `isRaid`,
 	`t`.`daysInForward` AS `daysInForward`

db/versions/10936-wheatAnthurium/00-updateACL.sql

@@ -1,6 +0,0 @@
-INSERT IGNORE INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES
-        ('Ticket','itemLack','READ','ALLOW','ROLE','employee'),
-        ('Ticket','itemLackDetail','READ','ALLOW','ROLE','employee'),
-        ('Ticket','split','WRITE','ALLOW','ROLE','employee'),
-        ('Sale','replaceItem','WRITE','ALLOW','ROLE','employee');

db/versions/11076-blueChico/00-firstScript.sql

@@ -1,27 +0,0 @@
-ALTER TABLE vn.business
-ADD CONSTRAINT `business_companyCodeFk` FOREIGN KEY (`companyCodeFk`) REFERENCES `company` (`code`) ON DELETE CASCADE ON UPDATE CASCADE;
-
---  Auto-generated SQL script. Actual values for binary/complex data types may differ - what you see is the default string representation of values.
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('BusinessReasonEnd','find','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('CalendarType','find','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('OccupationCode','find','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('BusinessReasonEnd','find','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('WorkerBusinessProfessionalCategory','find','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('WorkerBusinessAgreement','find','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('WorkerBusinessType','find','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('PayrollCategory','find','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('Worker','__get__business','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('Worker','__create__business','*','ALLOW','ROLE','hr');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('Business','crud','*','ALLOW','ROLE','hr');
-

db/versions/11132-aquaDracena/00-firstScript.sql

@@ -1,2 +0,0 @@
-ALTER TABLE vn.ticketConfig ADD lackAlertPrice int(11) DEFAULT 30 NOT NULL COMMENT 'Value to alert when item proposal exceed price';
-ALTER TABLE vn.ticketConfig ADD lackScopeDays int(11) DEFAULT 2 NOT NULL COMMENT 'Number of days to look back for ticket with negatives';

db/versions/11202-limeRuscus/01-updateStateAlertLevel.sql

@@ -1,14 +0,0 @@
-UPDATE vn.state
-    SET alertLevel = 1 -- ON_PREVIOUS
-    WHERE id IN (
-        36, -- Previa Revisando
-        37, -- Previa Revisado
-        26, -- Prep Previa
-        28, -- Previa OK
-        29, -- Previa Impreso
-        31, -- Polizon Impreso
-        32, -- Polizon OK
-        20, -- Asignado
-        23, -- URGENTE
-        33  -- Auto_Impreso
-    );

db/versions/11306-greenMonstera/00-firstScript.sql

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

db/versions/11334-grayRoebelini/00-firstScript.sql

@@ -1,2 +0,0 @@
--- Place your SQL code here
-ALTER TABLE vn.claimConfig ADD IF NOT EXISTS daysToClaim int(11) NOT NULL DEFAULT 7 COMMENT 'Dias para reclamar';

db/versions/11383-maroonChico/00-town.sql

@@ -1,10 +0,0 @@
-UPDATE vn.town t
-		LEFT JOIN vn.zoneGeo zg ON zg.id = t.geoFk
-	SET t.geoFk = NULL
-	WHERE zg.id IS NULL;
-
-ALTER TABLE vn.town
-	ADD CONSTRAINT town_zoneGeo_FK FOREIGN KEY (geoFk)
-		REFERENCES vn.zoneGeo(id)
-		ON DELETE RESTRICT
-		ON UPDATE CASCADE;

db/versions/11383-maroonChico/01-postCode.sql

@@ -1,10 +0,0 @@
-UPDATE vn.postCode pc
-		LEFT JOIN vn.zoneGeo zg ON zg.id = pc.geoFk
-	SET pc.geoFk = NULL
-	WHERE zg.id IS NULL;
-
-ALTER TABLE vn.postCode
-	ADD CONSTRAINT postCode_zoneGeo_FK FOREIGN KEY (geoFk)
-		REFERENCES vn.zoneGeo(id)
-		ON DELETE RESTRICT
-		ON UPDATE CASCADE;

db/versions/11383-maroonChico/02-province.sql

@@ -1,10 +0,0 @@
-UPDATE vn.province p
-		LEFT JOIN vn.zoneGeo zg ON zg.id = p.geoFk
-	SET p.geoFk = NULL
-	WHERE zg.id IS NULL;
-
-ALTER TABLE vn.province
-	ADD CONSTRAINT province_zoneGeo_FK FOREIGN KEY (geoFk)
-		REFERENCES vn.zoneGeo(id)
-		ON DELETE RESTRICT
-		ON UPDATE CASCADE;

db/versions/11389-yellowChico/00-firstScript.sql

@@ -1,23 +0,0 @@
-CREATE TABLE vn.parkingCoordinates (
-	parkingFk int(11) NOT NULL,
-	x varchar(5) NOT NULL,
-	y varchar(5) NOT NULL,
-	z varchar(5) NOT NULL,
-	CONSTRAINT parkingCoordinates_pk PRIMARY KEY (parkingFk),
-	CONSTRAINT parkingCoordinates_parking_FK FOREIGN KEY (parkingFk) REFERENCES vn.parking(id) ON DELETE CASCADE ON UPDATE CASCADE
-)
-ENGINE=InnoDB
-DEFAULT CHARSET=utf8mb3
-COLLATE=utf8mb3_unicode_ci;
-
-INSERT INTO vn.parkingCoordinates (parkingFk, x, y, z)
-	SELECT id, `column`, `row`, `floor`
-		FROM vn.parking
-		WHERE `column` IS NOT NULL
-			OR `row` IS NOT NULL
-			OR `floor` IS NOT NULL;
-
-ALTER TABLE vn.parking
-	DROP COLUMN `column`,
-	DROP COLUMN `row`,
-	DROP COLUMN `floor`;

db/versions/11393-redCamellia/00-firstScript.sql

@@ -1,19 +0,0 @@
-INSERT INTO account.`role` (name,description,hasLogin)
-	VALUES ('deliveryFreelancer','Repartidor autónomo',1);
-
-INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
-	VALUES
-		('Route', 'getTickets', 'READ', 'ALLOW', 'ROLE', 'deliveryFreelancer'),
-		('AgencyTerm', 'filter', 'READ', 'ALLOW', 'ROLE', 'deliveryFreelancer'),
-		('Route', 'summary', 'READ', 'ALLOW', 'ROLE', 'deliveryFreelancer'),
-		('Route', 'getRouteByAgency', 'WRITE', 'ALLOW', 'ROLE', 'deliveryFreelancer'),
-		('Route','filter','READ','ALLOW','ROLE','deliveryFreelancer'),
-		('UserConfig','getUserConfig','*','ALLOW','ROLE','deliveryFreelancer'),
-		('Route', 'getTickets', 'READ', 'ALLOW', 'ROLE', 'deliveryFreelancer'),
-		('Route','guessPriority','WRITE','ALLOW','ROLE','deliveryFreelancer'),
-		('Route','getDeliveryPoint','READ','ALLOW','ROLE','deliveryFreelancer'),
-        ('Route', 'findById', 'READ', 'ALLOW', 'ROLE', 'deliveryFreelancer'),
-		('Route','sendSms','WRITE','ALLOW','ROLE','deliveryFreelancer'),
-		('Ticket','updateAttributes','WRITE','ALLOW','ROLE','deliveryFreelancer'),
-		('Client','findById','READ','ALLOW','ROLE','deliveryFreelancer');
-;

db/versions/11394-brownAsparagus/00-firstScript.sql

@@ -1,41 +0,0 @@
-USE vn;
-
-INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
-	VALUES ('Vehicle', 'filter', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-			('Vehicle', 'filter', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
-			('Vehicle', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-			('Vehicle', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
-			('Vehicle', 'findById', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-			('Vehicle', 'findById', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
-			('Vehicle', '__get__active', 'READ', 'ALLOW', 'ROLE', 'employee'),
-			('Vehicle', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
-			('Vehicle', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssistant'),
-			('Vehicle', 'deleteById', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
-			('Vehicle', 'deleteById', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssistant'),
-			('Vehicle', 'create', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
-			('Vehicle', 'create', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssistant'),
-			('BankPolicy', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-			('BankPolicy', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
-			('VehicleState', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-			('VehicleState', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
-			('Ppe', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative' ),
-			('Ppe', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant' ),
-			('VehicleType', 'find', 'READ', 'ALLOW', 'ROLE', 'employee'),
-			('DeliveryPoint', 'find', 'READ', 'ALLOW', 'ROLE', 'deliveryAssistant'),
-			('DeliveryPoint', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative');
-			
-CREATE TABLE IF NOT EXISTS vehicleType (
-	id INT(11) PRIMARY KEY AUTO_INCREMENT,
-	name VARCHAR(45) NOT NULL
-);
-
-INSERT IGNORE INTO vehicleType (id, name)
-	VALUES (1,'vehículo empresa'),
-		(2, 'furgoneta'),
-		(3, 'cabeza tractora'),
-		(4, 'remolque');
-
-ALTER TABLE vehicle ADD COLUMN importCooler  decimal(10,2) DEFAULT NULL;
-ALTER TABLE vehicle ADD COLUMN vehicleTypeFk INT(11) DEFAULT 1;
-ALTER TABLE vehicle ADD CONSTRAINT fk_vehicle_vehicleType FOREIGN KEY (vehicleTypeFk) REFERENCES vehicleType(id);
-

db/versions/11399-bronzeOak/00-firstScript.sql

@@ -1,90 +0,0 @@
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('Entry','getBuyList','READ','ALLOW','ROLE','buyer'),
-		('Entry','getBuyUltimate','READ','ALLOW','ROLE','buyer'),
-		('Entry','search','READ','ALLOW','ROLE','buyer'),
-		('Entry','create','WRITE','ALLOW','ROLE','buyer'),
-		('Entry','cloneEntry','WRITE','ALLOW','ROLE','buyer'),
-		('Entry','deleteEntry','WRITE','ALLOW','ROLE','buyer'),
-		('Entry','recalcEntryPrices','WRITE','ALLOW','ROLE','buyer'),
-		('EntryType','find','READ','ALLOW','ROLE','buyer'),
-		('EntryConfig','findOne','READ','ALLOW','ROLE','buyer');
-
-ALTER TABLE vn.ink ADD IF NOT EXISTS hexJson TEXT NOT NULL;
-
-UPDATE vn.ink
-	SET hexJson = CONCAT('{"value": ["',hex,'"]}');
-
-UPDATE vn.ink
-SET hexJson = CASE `name`
-    WHEN 'Blanco/Naranja' THEN '{"value": ["FFFFFF", "FFA500"]}'
-    WHEN 'Sin especificar' THEN '{"value": ["808080"]}'
-    WHEN '2 Colores' THEN '{"value": ["000000", "FFFFFF"]}'
-    WHEN 'Amarillo/Marrón' THEN '{"value": ["FFFF00", "8B4513"]}'
-    WHEN 'Amarillo/Naranja' THEN '{"value": ["FFFF00", "FFA500"]}'
-    WHEN 'Rosa/Blanco/Amarillo' THEN '{"value": ["FFC0CB", "FFFFFF", "FFFF00"]}'
-    WHEN 'Rosa/Amarillo' THEN '{"value": ["FFC0CB", "FFFF00"]}'
-    WHEN 'Antracita' THEN '{"value": ["2F2F2F"]}'
-    WHEN 'Azul/Amarillo' THEN '{"value": ["0000FF", "FFFF00"]}'
-    WHEN 'Azul Claro' THEN '{"value": ["ADD8E6"]}'
-    WHEN 'Azul/Marron' THEN '{"value": ["0000FF", "8B4513"]}'
-    WHEN 'Azul/Verde' THEN '{"value": ["0000FF", "008000"]}'
-    WHEN 'Blanco/Amarillo' THEN '{"value": ["FFFFFF", "FFFF00"]}'
-    WHEN 'Blaugrana' THEN '{"value": ["A50044", "004D98"]}'
-    WHEN 'Blanco/Negro' THEN '{"value": ["FFFFFF", "000000"]}'
-    WHEN 'Blanco/Verde' THEN '{"value": ["FFFFFF", "008000"]}'
-    WHEN 'Blanco/Azul' THEN '{"value": ["FFFFFF", "0000FF"]}'
-    WHEN 'Blanco/Rosa' THEN '{"value": ["FFFFFF", "FFC0CB"]}'
-    WHEN 'Cognac/Verde' THEN '{"value": ["9A463D", "008000"]}'
-    WHEN 'Champagne/Verde' THEN '{"value": ["F7E7CE", "008000"]}'
-    WHEN 'Camuflaje' THEN '{"value": ["6B8E23", "556B2F", "8B4513"]}'
-    WHEN 'Crema/Rosa' THEN '{"value": ["FFFDD0", "FFC0CB"]}'
-    WHEN 'Fucsia/Amarillo' THEN '{"value": ["FF00FF", "FFFF00"]}'
-    WHEN 'Fucsia/Blanco' THEN '{"value": ["FF00FF", "FFFFFF"]}'
-    WHEN 'Fucsia/Crema' THEN '{"value": ["FF00FF", "FFFDD0"]}'
-    WHEN 'Fucsia/Rosa' THEN '{"value": ["FF00FF", "FFC0CB"]}'
-    WHEN 'Fucsia/Verde' THEN '{"value": ["FF00FF", "008000"]}'
-    WHEN 'Granate/Blanco' THEN '{"value": ["800000", "FFFFFF"]}'
-    WHEN 'Gris Lila' THEN '{"value": ["808080", "C8A2C8"]}'
-    WHEN 'Lavanda/Amarillo' THEN '{"value": ["E6E6FA", "FFFF00"]}'
-    WHEN 'Lavanda/Gris' THEN '{"value": ["E6E6FA", "808080"]}'
-    WHEN 'Lividum' THEN '{"value": ["702963"]}'
-    WHEN 'Morado/Amarillo' THEN '{"value": ["800080", "FFFF00"]}'
-    WHEN 'Marrón/Blanco' THEN '{"value": ["8B4513", "FFFFFF"]}'
-    WHEN 'Marron/Gris' THEN '{"value": ["8B4513", "808080"]}'
-    WHEN 'Marron/Negro' THEN '{"value": ["8B4513", "000000"]}'
-    WHEN 'Marrón/Verde' THEN '{"value": ["8B4513", "008000"]}'
-    WHEN 'Matizado' THEN '{"value": ["D3D3D3", "808080", "FFFFFF"]}'
-    WHEN 'Mixto' THEN '{"value": ["FF0000", "0000FF", "008000", "FFFF00"]}'
-    WHEN 'Marrón Oscuro' THEN '{"value": ["654321"]}'
-    WHEN 'Naranja/Marron' THEN '{"value": ["FFA500", "8B4513"]}'
-    WHEN 'Naranja/Rosa' THEN '{"value": ["FFA500", "FFC0CB"]}'
-    WHEN 'Ocre/Burgundi' THEN '{"value": ["CC7722", "800020"]}'
-    WHEN 'Oro/Plata' THEN '{"value": ["FFD700", "C0C0C0"]}'
-    WHEN 'Oro/Negro' THEN '{"value": ["FFD700", "000000"]}'
-    WHEN 'Oro/Verde' THEN '{"value": ["FFD700", "008000"]}'
-    WHEN 'Purpura/Blanco' THEN '{"value": ["800080", "FFFFFF"]}'
-    WHEN 'Purpura/Rosa' THEN '{"value": ["800080", "FFC0CB"]}'
-    WHEN 'Pastel' THEN '{"value": ["FFB6C1", "87CEFA", "98FB98"]}'
-    WHEN 'Plata' THEN '{"value": ["C0C0C0"]}'
-    WHEN 'Plata/Verde' THEN '{"value": ["C0C0C0", "008000"]}'
-    WHEN 'Rojo/Amarillo' THEN '{"value": ["FF0000", "FFFF00"]}'
-    WHEN 'Rojo/Blanco' THEN '{"value": ["FF0000", "FFFFFF"]}'
-    WHEN 'Rojo/Naranja' THEN '{"value": ["FF0000", "FFA500"]}'
-    WHEN 'Rojo/Oro' THEN '{"value": ["FF0000", "FFD700"]}'
-    WHEN 'Rojo/Verde' THEN '{"value": ["FF0000", "008000"]}'
-    WHEN 'Rosa/Lila' THEN '{"value": ["FFC0CB", "C8A2C8"]}'
-    WHEN 'Rosa/Naranja' THEN '{"value": ["FFC0CB", "FFA500"]}'
-    WHEN 'Rojo/Rosa' THEN '{"value": ["FF0000", "FFC0CB"]}'
-    WHEN 'Rosa empolvado' THEN '{"value": ["E6B8AF"]}'
-    WHEN 'Rosa/Verde' THEN '{"value": ["FFC0CB", "008000"]}'
-    WHEN 'Topo/Blanco' THEN '{"value": ["8B8589", "FFFFFF"]}'
-    WHEN 'Topo' THEN '{"value": ["8B8589"]}'
-    WHEN 'Transparente' THEN '{"value": ["00000000"]}'
-    WHEN 'Verde/Amarillo' THEN '{"value": ["008000", "FFFF00"]}'
-    WHEN 'Verde/Negro' THEN '{"value": ["008000", "000000"]}'
-    WHEN 'Variado' THEN '{"value": ["FF0000", "0000FF", "008000", "FFFF00", "FFA500"]}'
-    WHEN 'Verde Claro/Morado' THEN '{"value": ["90EE90", "800080"]}'
-    WHEN 'Verde/Lila' THEN '{"value": ["008000", "C8A2C8"]}'
-    WHEN 'Vaquero Neon' THEN '{"value": ["1560BD", "FFFF00"]}'
-    ELSE hexJson 
-END;

db/versions/11404-azureAnthurium/00-firstScript.sql

@@ -1,6 +0,0 @@
-INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
-VALUES
-    ('WorkerDms', 'hasHighPrivs', 'READ', 'ALLOW', 'ROLE', 'hr'),
-    ('Business', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'hr'),
-    ('Worker', '__get__business', 'READ', 'ALLOW', 'ROLE', 'hr')
-    ;

db/versions/11411-turquoiseEucalyptus/00-agencyIncomingForeign.sql

@@ -1,13 +0,0 @@
-use `vn`;
-DELETE ai from
-		`vn`.`agencyIncoming` ai
-	LEFT JOIN `vn`.`agencyMode` am ON
-		am.id = ai.agencyModeFk
-	WHERE am.id IS null;
-
-ALTER TABLE `vn`.`agencyIncoming`
-  ADD CONSTRAINT `fk_agencyIncoming_agencyMode`
-    FOREIGN KEY (`agencyModeFk`)
-    REFERENCES `agencyMode`(`id`)
-    ON DELETE CASCADE
-    ON UPDATE CASCADE;

db/versions/11411-turquoiseEucalyptus/01-travelThermographAlter.sql

@@ -1,7 +0,0 @@
-ALTER TABLE `vn`.`travelThermograph`
-  ADD COLUMN `agencyModeFk` INT(11) NULL AFTER `editorFk`,
-  ADD CONSTRAINT `travelThermograph_agencyIncoming_fk`
-    FOREIGN KEY (`agencyModeFk`)
-    REFERENCES `agencyIncoming`(`agencyModeFk`)
-    ON DELETE RESTRICT
-    ON UPDATE CASCADE;

db/versions/11416-goldenTulip/00-firstScript.sql

@@ -1,4 +0,0 @@
-ALTER TABLE vn.roadmap
-	DROP FOREIGN KEY roadmap_worker_FK_2,
-	DROP FOREIGN KEY roadmap_worker_FK,
-	DROP FOREIGN KEY roadmap_ibfk_2;

db/versions/11416-goldenTulip/01-firstScript.sql

@@ -1,20 +0,0 @@
-ALTER TABLE vn.roadmap
-	COMMENT='Rutas troncales (trailers)',
-	MODIFY COLUMN m3 int(10) unsigned DEFAULT NULL NULL COMMENT 'Capacidad máxima del remolque',
-	MODIFY COLUMN trailerPlate varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL,
-	MODIFY COLUMN etd datetime NOT NULL COMMENT 'Tiempo estimado de salida',
-	MODIFY COLUMN `name` varchar(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NULL,
-	MODIFY COLUMN driver1Fk int(10) unsigned DEFAULT NULL NULL AFTER driverName,
-	MODIFY COLUMN driver2Fk int(10) unsigned DEFAULT NULL NULL AFTER driver1Fk,
-	ADD eta datetime DEFAULT NULL NULL COMMENT 'Tiempo estimado de llegada' AFTER etd,
-	ADD roadmapAddressFk int(11) DEFAULT NULL NULL AFTER `name`,
-	ADD dollyPlate varchar(10) DEFAULT NULL AFTER trailerPlate,
-	ADD tugPlate varchar(10) DEFAULT NULL AFTER dollyPlate,
-	ADD driverChangeName varchar(45) DEFAULT NULL AFTER driver2Fk,
-	ADD driverChangeFk int(10) unsigned DEFAULT NULL NULL AFTER driverChangeName;
-
--- Separamos los CHANGE por que si no arriba no se aplican
-ALTER TABLE vn.roadmap
-	CHANGE userFk editorFk int(10) unsigned DEFAULT NULL NULL AFTER m3;
-
-CREATE INDEX roadmap_etd_IDX USING BTREE ON vn.roadmap (etd);

db/versions/11416-goldenTulip/02-firstScript.sql

@@ -1,15 +0,0 @@
-UPDATE vn.roadmap
-	SET roadmapAddressFk = (SELECT MIN(addressFk) FROM vn.roadmapAddress),
-		eta = etd + INTERVAL 1 DAY;
-
-ALTER TABLE vn.roadmap
-	ADD CONSTRAINT roadmap_roadmapAddress_FK FOREIGN KEY (roadmapAddressFk)
-		REFERENCES vn.roadmapAddress(addressFk) ON DELETE RESTRICT ON UPDATE CASCADE,
-	ADD CONSTRAINT roadmap_driver_FK FOREIGN KEY (driver1Fk)
-		REFERENCES vn.worker(id) ON DELETE RESTRICT ON UPDATE CASCADE,
-	ADD CONSTRAINT roadmap_driver_FK2 FOREIGN KEY (driver2Fk)
-		REFERENCES vn.worker(id) ON DELETE RESTRICT ON UPDATE CASCADE,
-	ADD CONSTRAINT roadmap_driverChange_FK FOREIGN KEY (driverChangeFk)
-		REFERENCES vn.worker(id) ON DELETE RESTRICT ON UPDATE CASCADE,
-	ADD CONSTRAINT roadmap_user_Fk FOREIGN KEY (editorFk)
-		REFERENCES account.user(id) ON DELETE RESTRICT ON UPDATE CASCADE;

db/versions/11416-goldenTulip/03-firstScript.sql

@@ -1,7 +0,0 @@
-ALTER TABLE vn.roadmapStop
-    CHANGE userFk editorFk int(10) unsigned DEFAULT NULL NULL,
-    CHANGE addressFk roadmapAddressFk int(11) DEFAULT NULL NULL,
-    DROP FOREIGN KEY expeditionTruck_FK_2;
-
-ALTER TABLE vn.roadmapStop ADD CONSTRAINT roadmapStop_roadmap_FK
-    FOREIGN KEY (roadmapFk) REFERENCES vn.roadmap(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/versions/11416-goldenTulip/04-firstScript.sql

@@ -1,4 +0,0 @@
-ALTER TABLE vn.route
-	ADD roadmapStopFk int(11) NULL,
-	ADD CONSTRAINT route_roadmapStop_FK FOREIGN KEY (roadmapStopFk) REFERENCES vn.roadmapStop(id) ON DELETE RESTRICT ON UPDATE CASCADE,
-	CHANGE editorFk editorFk int(10) unsigned DEFAULT NULL NULL AFTER roadmapStopFk;

db/versions/11416-goldenTulip/05-firstScript.sql

@@ -1,2 +0,0 @@
-ALTER TABLE vn.roadmapAddress 
-	COMMENT='Direcciones de los troncales o también llamados puntos de distribución';

db/versions/11416-goldenTulip/06-firstScript.sql

@@ -1,11 +0,0 @@
-GRANT SELECT ON TABLE vn.roadmap TO 'delivery';
-GRANT SELECT ON TABLE vn.roadmapStop TO 'delivery';
-GRANT SELECT ON TABLE vn.roadmapAddress TO 'delivery';
-
-GRANT DELETE, UPDATE, INSERT ON TABLE vn.roadmap TO 'deliveryBoss';
-GRANT DELETE, UPDATE, INSERT ON TABLE vn.roadmapStop TO 'deliveryBoss';
-GRANT DELETE, UPDATE, INSERT ON TABLE vn.roadmapAddress TO 'deliveryBoss';
-
--- Comentado debido a que da error porque ejecuta primero el script de la versión
--- GRANT EXECUTE ON PROCEDURE vn.roadmap_cloneDay TO 'deliveryBoss';
--- GRANT EXECUTE ON FUNCTION vn.getTimeBetweenRoadmapAddresses TO 'deliveryBoss';

db/versions/11416-goldenTulip/07-firstScript.sql

@@ -1,2 +0,0 @@
-ALTER TABLE vn.route DROP FOREIGN KEY fk_route_1;
-ALTER TABLE vn.route DROP COLUMN zoneFk;

db/versions/11416-goldenTulip/08-firstScript.sql

@@ -1,2 +0,0 @@
-ALTER TABLE vn.vehicle
-    ADD typeFk enum('car','van','truck','trailer','tug', 'tugDolly','dolly') DEFAULT 'van' NOT NULL;

db/versions/11416-goldenTulip/09-firstScript.sql

@@ -1 +0,0 @@
-CREATE INDEX route_dated_IDX USING BTREE ON vn.route (dated);

db/versions/11419-orangeSalal/00-firstScript.sql

@@ -1,2 +0,0 @@
-ALTER TABLE `vn`.`tag`
-ADD COLUMN IF NOT EXISTS `validationRegex` varchar(50) DEFAULT NULL;

db/versions/11422-blackAsparagus/00-firstScript.sql

@@ -1,5 +0,0 @@
-RENAME TABLE vn.sorter TO vn.sorter__;
-ALTER TABLE vn.sorter__ COMMENT='@deprecated 2025-01-22';
-
-RENAME TABLE vn.splitLine TO vn.splitLine__;
-ALTER TABLE vn.splitLine__ COMMENT='@deprecated 2025-01-22';

db/versions/11424-navyRose/00-travel.sql

@@ -1,3 +0,0 @@
--- Place your SQL code here
-ALTER TABLE vn.travel ADD IF NOT EXISTS availabled DATETIME NULL 
-COMMENT 'Indicates the moment in time when the goods become available for picking';

db/versions/11425-aquaCordyline/00-firstScript.sql

@@ -1,2 +0,0 @@
-INSERT IGNORE INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
-VALUES('Entry', 'transfer', 'WRITE', 'ALLOW', 'ROLE', 'coolerBoss');

db/versions/11427-azureChico/00-firstScript.sql

@@ -1,2 +0,0 @@
-ALTER TABLE vn.packaging
-    ADD COLUMN flippingCost decimal(10, 2) NOT NULL DEFAULT 0.00

db/versions/11428-blackArborvitae/00-firstScript.sql

@@ -1 +0,0 @@
-ALTER TABLE vn.travel CHANGE appointment appointment__ datetime DEFAULT NULL COMMENT '@deprecated 2025-01-28';

db/versions/11429-brownBamboo/00-firstScript.sql

@@ -1,2 +0,0 @@
-ALTER TABLE `vn`.`awb`
-    ADD COLUMN `costPerKg` DECIMAL(10, 2) UNSIGNED DEFAULT NULL COMMENT 'Tarifa que indica a cuanto cuesta el kilo en ese vuelo';

db/versions/11430-salmonRaphis/00-firstScript.sql

@@ -1,5 +0,0 @@
-
-
-INSERT IGNORE INTO util.notification
-    SET name = 'misallocation-warehouse',
-        description = 'Misallocation in warehouse';

db/versions/11436-bronzeMonstera/00-firstScript.sql

@@ -1,3 +0,0 @@
-ALTER TABLE vn.roadmap
-    MODIFY COLUMN dollyPlate varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL COMMENT
-        'Vehículo sin motor diseñado para conectarse a una unidad tractora, un camión o un vehículo tractor con fuerte potencia de tracción';

db/versions/11436-bronzeMonstera/01-firstScript.sql

@@ -1,3 +0,0 @@
-ALTER TABLE vn.volumeConfig ADD COLUMN id INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST;
-
-GRANT UPDATE (palletM3) ON vn.volumeConfig TO deliveryBoss;

db/versions/11436-bronzeMonstera/02-firstScript.sql

@@ -1,3 +0,0 @@
-ALTER TABLE vn.vehicle
-    MODIFY COLUMN typeFk enum('car','van','truck','trailer','tug','dolly','trailerLink')
-        CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'van' NOT NULL;

db/versions/11436-bronzeMonstera/03-firstScript.sql

@@ -1 +0,0 @@
-ALTER TABLE vn.roadmap DROP COLUMN eta;

db/versions/11441-limeCyca/00-firstScript.sql

@@ -1,8 +0,0 @@
-UPDATE vn.expedition e
-        JOIN (
-            SELECT id
-            FROM vn.expedition
-            WHERE hostFk COLLATE utf8mb3_unicode_ci NOT IN 
-                (SELECT code COLLATE utf8mb3_unicode_ci FROM vn.host WHERE code IS NOT NULL)
-        ) s ON e.id = s.id
-    SET e.hostFk = 'pc336';

db/versions/11441-limeCyca/01-firstScript.sql

@@ -1,9 +0,0 @@
-ALTER TABLE vn.expedition
-    MODIFY COLUMN hostFk VARCHAR(30) COLLATE utf8mb3_general_ci;
-
-ALTER TABLE vn.expedition
-    ADD CONSTRAINT fk_expedition_host_code
-    FOREIGN KEY (hostFk)
-    REFERENCES host(code)
-    ON UPDATE CASCADE
-    ON DELETE CASCADE;

e2e/paths/02-client/21_defaulter.spec.js

@@ -0,0 +1,65 @@
+import selectors from '../../helpers/selectors.js';
+import getBrowser from '../../helpers/puppeteer';
+
+describe('Client defaulter path', () => {
+    let browser;
+    let page;
+
+    beforeAll(async() => {
+        browser = await getBrowser();
+        page = browser.page;
+        await page.loginAndModule('insurance', 'client');
+        await page.accessToSection('client.defaulter');
+    });
+
+    afterAll(async() => {
+        await browser.close();
+    });
+
+    it('should count the amount of clients in the turns section', async() => {
+        const result = await page.countElement(selectors.clientDefaulter.anyClient);
+
+        expect(result).toEqual(6);
+    });
+
+    it('should check contain expected client', async() => {
+        const clientName =
+            await page.waitToGetProperty(selectors.clientDefaulter.firstClientName, 'innerText');
+        const salesPersonName =
+            await page.waitToGetProperty(selectors.clientDefaulter.firstSalesPersonName, 'innerText');
+
+        expect(clientName).toEqual('Ororo Munroe');
+        expect(salesPersonName).toEqual('salesperson');
+    });
+
+    it('should first observation not changed', async() => {
+        const expectedObservation = 'Madness, as you know, is like gravity, all it takes is a little push';
+        const result = await page.waitToGetProperty(selectors.clientDefaulter.firstObservation, 'value');
+
+        expect(result).toContain(expectedObservation);
+    });
+
+    it('should not add empty observation', async() => {
+        await page.waitToClick(selectors.clientDefaulter.allDefaulterCheckbox);
+
+        await page.waitToClick(selectors.clientDefaulter.addObservationButton);
+        await page.write(selectors.clientDefaulter.observation, '');
+        await page.waitToClick(selectors.clientDefaulter.saveButton);
+        const message = await page.waitForSnackbar();
+
+        expect(message.text).toContain(`The message can't be empty`);
+    });
+
+    it('should checked all defaulters', async() => {
+        await page.loginAndModule('insurance', 'client');
+        await page.accessToSection('client.defaulter');
+
+        await page.waitToClick(selectors.clientDefaulter.allDefaulterCheckbox);
+    });
+
+    it('should add observation for all clients', async() => {
+        await page.waitToClick(selectors.clientDefaulter.addObservationButton);
+        await page.write(selectors.clientDefaulter.observation, 'My new observation');
+        await page.waitToClick(selectors.clientDefaulter.saveButton);
+    });
+});

loopback/locale/en.json

@@ -58,10 +58,10 @@
 	"Swift / BIC can't be empty": "Swift / BIC can't be empty",
 	"Deleted sales from ticket": "I have deleted the following lines from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
 	"Added sale to ticket": "I have added the following line to the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
-	"Changed sale discount": "I have changed the following lines discounts from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}} {{ticketWeekly}}",
+	"Changed sale discount": "I have changed the following lines discounts from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
 	"Created claim": "I have created the claim [{{claimId}}]({{{claimUrl}}}) for the following lines from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"Changed sale price": "I have changed the price of [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) from {{oldPrice}}€ ➔ *{{newPrice}}€* of the ticket [{{ticketId}}]({{{ticketUrl}}}) {{ticketWeekly}}",
+	"Changed sale price": "I have changed the price of [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) from {{oldPrice}}€ ➔ *{{newPrice}}€* of the ticket [{{ticketId}}]({{{ticketUrl}}})",
-	"Changed sale quantity": "I have changed {{changes}} of the ticket [{{ticketId}}]({{{ticketUrl}}}) {{ticketWeekly}}",
+	"Changed sale quantity": "I have changed {{changes}} of the ticket [{{ticketId}}]({{{ticketUrl}}})",
 	"Changes in sales": "the quantity of [{{itemId}} {{concept}}]({{{itemUrl}}}) from {{oldQuantity}} ➔ *{{newQuantity}}*",
 	"Changed sale reserved state": "I have changed the following lines reserved state from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
 	"Bought units from buy request": "Bought {{quantity}} units of [{{itemId}} {{concept}}]({{{urlItem}}}) for the ticket id [{{ticketId}}]({{{url}}})",
@@ -234,7 +234,6 @@
 	"It has been invoiced but the PDF of refund not be generated": "It has been invoiced but the PDF of refund not be generated",
 	"Cannot add holidays on this day": "Cannot add holidays on this day",
 	"Cannot send mail": "Cannot send mail",
-	"This worker already exists": "This worker already exists",
 	"CONSTRAINT `chkParkingCodeFormat` failed for `vn`.`parking`": "CONSTRAINT `chkParkingCodeFormat` failed for `vn`.`parking`",
 	"This postcode already exists": "This postcode already exists",
 	"Original invoice not found": "Original invoice not found",
@@ -254,8 +253,5 @@
 	"Sales already moved": "Sales already moved",
 	"Holidays to past days not available": "Holidays to past days not available",
 	"Incorrect delivery order alert on route": "Incorrect delivery order alert on route: {{ route }} zone: {{ zone }}",
-	"Ticket has been delivered out of order": "The ticket {{ticket}} of route {{{fullUrl}}} has been delivered out of order.",
+	"Ticket has been delivered out of order": "The ticket {{ticket}} of route {{{fullUrl}}} has been delivered out of order."
-    "clonedFromTicketWeekly": ", that is a cloned sale from ticket {{ ticketWeekly }}",
-	"negativeReplaced": "Replaced item [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} with [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} from ticket [{{ticketId}}]({{{ticketUrl}}})",
-  	"The tag and priority can't be repeated": "The tag and priority can't be repeated"
 }

loopback/locale/es.json

@@ -121,10 +121,10 @@
 	"Incoterms is required for a non UEE member": "El incoterms es requerido para los clientes extracomunitarios",
 	"Deleted sales from ticket": "He eliminado las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
 	"Added sale to ticket": "He añadido la siguiente linea al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
-    "Changed sale discount": "He cambiado el descuento de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}} {{ticketWeekly}}",
+	"Changed sale discount": "He cambiado el descuento de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
 	"Created claim": "He creado la reclamación [{{claimId}}]({{{claimUrl}}}) de las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-    "Changed sale price": "He cambiado el precio de [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) de {{oldPrice}}€ ➔ *{{newPrice}}€* del ticket [{{ticketId}}]({{{ticketUrl}}}) {{ticketWeekly}} ",
+	"Changed sale price": "He cambiado el precio de [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) de {{oldPrice}}€ ➔ *{{newPrice}}€* del ticket [{{ticketId}}]({{{ticketUrl}}})",
-    "Changed sale quantity": "He cambiado {{changes}} del ticket [{{ticketId}}]({{{ticketUrl}}}) {{ticketWeekly}}",
+	"Changed sale quantity": "He cambiado {{changes}} del ticket [{{ticketId}}]({{{ticketUrl}}})",
 	"Changes in sales": "la cantidad de [{{itemId}} {{concept}}]({{{itemUrl}}}) de {{oldQuantity}} ➔ *{{newQuantity}}*",
 	"State": "Estado",
 	"regular": "normal",
@@ -395,8 +395,6 @@
 	"All tickets have a route order": "Todos los tickets tienen orden de ruta",
 	"There are tickets to be invoiced": "La zona tiene tickets por facturar",
 	"Incorrect delivery order alert on route": "Alerta de orden de entrega incorrecta en ruta: {{ route }} zona: {{ zone }}",
-    "Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sido entregado en su orden.",
+	"Ticket has been delivered out of order": "El ticket {{ticket}} de la ruta {{{fullUrl}}} no ha sigo entregado en su orden.",
-    "Price cannot be blank": "El precio no puede estar en blanco",
+	"Price cannot be blank": "El precio no puede estar en blanco"
-    "clonedFromTicketWeekly": ", que es una linea clonada del ticket {{ticketWeekly}}",
-    "negativeReplaced": "Sustituido el articulo [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} por [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} del ticket [{{ticketId}}]({{{ticketUrl}}})"
 }

loopback/locale/fr.json

@@ -368,6 +368,5 @@
 	"ticketLostExpedition": "Le ticket [{{ticketId}}]({{{ticketUrl}}}) a l'expédition perdue suivante : {{expeditionId}}",
 	"The web user's email already exists": "L'email de l'internaute existe déjà",
 	"Incorrect delivery order alert on route": "Alerte de bon de livraison incorrect sur l'itinéraire: {{ route }} zone : {{ zone }}",
-	"Ticket has been delivered out of order": "Le ticket {{ticket}} de la route {{{fullUrl}}} a été livré hors service.",
+	"Ticket has been delivered out of order": "Le ticket {{ticket}} de la route {{{fullUrl}}} a été livré hors service."
-	"negativeReplaced": "Remplacé l'article [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} par [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} du ticket [{{ticketId}}]({{{ticketUrl}}})"
 }

loopback/locale/pt.json

@@ -367,6 +367,5 @@
 	"ticketLostExpedition": "O ticket [{{ticketId}}]({{{ticketUrl}}}) tem a seguinte expedição perdida: {{expeditionId}}",
 	"The web user's email already exists": "O e-mail do utilizador da web já existe.",
 	"Incorrect delivery order alert on route": "Alerta de ordem de entrega incorreta na rota: {{ route }} zona: {{ zone }}",
-	"Ticket has been delivered out of order": "O ticket {{ticket}} da rota {{{fullUrl}}} foi entregue fora de ordem.",
+	"Ticket has been delivered out of order": "O ticket {{ticket}} da rota {{{fullUrl}}} foi entregue fora de ordem."
-	"negativeReplaced": "Substituído o artigo [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} por [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} do ticket [{{ticketId}}]({{{ticketUrl}}})"
 }

modules/claim/back/methods/claim-beginning/specs/claim-beginning.spec.js

@@ -4,7 +4,7 @@ const LoopBackContext = require('loopback-context');
 describe('ClaimBeginning model()', () => {
     const claimFk = 1;
     const activeCtx = {
-        accessToken: {userId: 72},
+        accessToken: {userId: 18},
         headers: {origin: 'localhost:5000'},
         __: () => {}
     };

modules/claim/back/methods/claim/filter.js

@@ -109,7 +109,6 @@ module.exports = Self => {
         const args = ctx.args;
         const myOptions = {};
         let to;
-        let myTeamIds = [];
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -134,8 +133,21 @@ module.exports = Self => {
             claimIdsByClaimResponsibleFk = claims.map(claim => claim.claimFk);
         }
 
-        if (args.myTeam != null)
+        // Apply filter by team
-            myTeamIds = await models.Worker.myTeam(userId);
+        const teamMembersId = [];
+        if (args.myTeam != null) {
+            const worker = await models.Worker.findById(userId, {
+                include: {
+                    relation: 'collegues'
+                }
+            }, myOptions);
+            const collegues = worker.collegues() || [];
+            for (let collegue of collegues)
+                teamMembersId.push(collegue.collegueFk);
+
+            if (teamMembersId.length == 0)
+                teamMembersId.push(userId);
+        }
 
         const where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
@@ -172,9 +184,9 @@ module.exports = Self => {
                 return {'t.zoneFk': value};
             case 'myTeam':
                 if (value)
-                    return {'cl.workerFk': {inq: myTeamIds}};
+                    return {'cl.workerFk': {inq: teamMembersId}};
                 else
-                    return {'cl.workerFk': {nin: myTeamIds}};
+                    return {'cl.workerFk': {nin: teamMembersId}};
             }
         });
 

modules/claim/back/methods/claim/specs/createFromSales.spec.js

@@ -3,18 +3,22 @@ const LoopBackContext = require('loopback-context');
 
 describe('Claim createFromSales()', () => {
     const ticketId = 23;
-    const newSale = [{id: 31, instance: 0, quantity: 10}];
+    const newSale = [{
-    let activeCtx;
+        id: 31,
-    let ctx;
+        instance: 0,
-
+        quantity: 10
-    beforeEach(() => {
+    }];
-        activeCtx = {
+    const activeCtx = {
-            accessToken: {userId: 72},
+        accessToken: {userId: 1},
         headers: {origin: 'localhost:5000'},
         __: () => {}
     };
-        ctx = {req: activeCtx};
 
+    const ctx = {
+        req: activeCtx
+    };
+
+    beforeEach(() => {
         spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
             active: activeCtx
         });

modules/claim/back/models/claim-beginning.js

@@ -1,7 +1,6 @@
 
 const UserError = require('vn-loopback/util/user-error');
 const LoopBackContext = require('loopback-context');
-const moment = require('moment');
 
 module.exports = Self => {
     require('../methods/claim-beginning/importToNewRefundTicket')(Self);
@@ -14,51 +13,10 @@ module.exports = Self => {
         const options = ctx.options;
         const models = Self.app.models;
         const saleFk = ctx?.currentInstance?.saleFk || ctx?.instance?.saleFk;
-        const claimFk = ctx?.instance?.claimFk || ctx?.currentInstance?.claimFk;
-        const myOptions = {};
-        const accessToken = ctx?.options?.accessToken || LoopBackContext.getCurrentContext().active.accessToken;
-        const ctxToken = {req: {accessToken}};
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
         const sale = await models.Sale.findById(saleFk, {fields: ['ticketFk', 'quantity']}, options);
 
-        const canCreateClaimAfterDeadline = models.ACL.checkAccessAcl(
-            ctxToken,
-            'Claim',
-            'createAfterDeadline',
-            myOptions
-        );
-
-        const canUpdateClaim = models.ACL.checkAccessAcl(
-            ctxToken,
-            'Claim',
-            'updateClaim',
-            myOptions
-        );
-
-        if (!canUpdateClaim && !canCreateClaimAfterDeadline)
-            throw new UserError(`You don't have permission to modify this claim`);
-
-        if (canUpdateClaim) {
-            const query = `
-            SELECT  daysToClaim
-            FROM vn.claimConfig`;
-            const res = await Self.rawSql(query);
-            const daysToClaim = res[0]?.daysToClaim;
-
-            const claim = await models.Claim.findById(claimFk, {fields: ['created']}, options);
-            const claimDate = moment.utc(claim.created);
-            const currentDate = moment.utc();
-            const daysSinceSale = currentDate.diff(claimDate, 'days');
-
-            if (daysSinceSale > daysToClaim && !canCreateClaimAfterDeadline)
-                throw new UserError(`You can't modify this claim because the deadline has already passed`);
-        }
-
         if (ctx.isNewInstance) {
-            const claim = await models.Claim.findById(claimFk, {fields: ['ticketFk']}, options);
+            const claim = await models.Claim.findById(ctx.instance.claimFk, {fields: ['ticketFk']}, options);
             if (sale.ticketFk != claim.ticketFk)
                 throw new UserError(`Cannot create a new claimBeginning from a different ticket`);
         }
@@ -83,7 +41,7 @@ module.exports = Self => {
         if (ctx.options && ctx.options.transaction)
             myOptions.transaction = ctx.options.transaction;
 
-        const claimBeginning = ctx.instance ?? await Self.findById(ctx?.where?.id);
+        const claimBeginning = ctx.instance ?? await Self.findById(ctx.where.id);
 
         const filter = {
             where: {id: claimBeginning.claimFk},

modules/client/back/methods/client/filter.js

@@ -158,12 +158,10 @@ module.exports = Self => {
                     a.provinceFk AS provinceAddressFk,
                     p.name AS province,
                     u.id AS salesPersonFk,
-                    u.name AS salesPerson,
+                    u.name AS salesPerson
-                    co.name AS country
                 FROM client c
                     LEFT JOIN account.user u ON u.id = c.salesPersonFk
                     LEFT JOIN province p ON p.id = c.provinceFk
-                    LEFT JOIN country co ON co.id = c.countryFk
                     JOIN address a ON a.clientFk = c.id
             `
         );

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

@@ -157,52 +157,4 @@ describe('Address updateAddress', () => {
             throw e;
         }
     });
-
-    it('should update ticket observations when updateObservations is true', async() => {
-        const tx = await models.Client.beginTransaction({});
-        const client = 1103;
-        const address = 123;
-        const ticket = 31;
-        const observationType = 3;
-
-        const salesAssistantId = 21;
-        const addressObservation = 'nuevo texto';
-        const ticketObservation = 'texto a modificar';
-
-        try {
-            const options = {transaction: tx};
-            ctx.req.accessToken.userId = salesAssistantId;
-            ctx.args = {
-                updateObservations: true,
-                incotermsFk: incotermsId,
-                provinceFk: provinceId,
-                customsAgentFk: customAgentOneId
-            };
-
-            await models.AddressObservation.create({
-                addressFk: address,
-                observationTypeFk: observationType,
-                description: addressObservation
-            }, options);
-
-            await models.TicketObservation.create({
-                ticketFk: ticket,
-                observationTypeFk: observationType,
-                description: ticketObservation
-            }, options);
-
-            await models.Client.updateAddress(ctx, client, address, options);
-
-            const updatedObservation = await models.TicketObservation.findOne({
-                where: {ticketFk: ticket, observationTypeFk: observationType}
-            }, options);
-
-            expect(updatedObservation.description).toEqual(addressObservation);
-
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            throw e;
-        }
-    });
 });

modules/client/back/methods/client/updateAddress.js

@@ -80,10 +80,6 @@ module.exports = function(Self) {
             {
                 arg: 'latitude',
                 type: 'any',
-            },
-            {
-                arg: 'updateObservations',
-                type: 'boolean'
             }
         ],
         returns: {
@@ -139,17 +135,6 @@ module.exports = function(Self) {
         delete args.ctx; // Remove unwanted properties
 
         const updatedAddress = await address.updateAttributes(ctx.args, myOptions);
-        if (args.updateObservations) {
-            const ticket = await Self.rawSql(`
-                UPDATE ticketObservation to2
-                        JOIN ticket t ON t.id = to2.ticketFk
-                        JOIN address a ON a.id = t.addressFk
-                        JOIN addressObservation ao ON ao.addressFk = a.id
-                    SET to2.description  = ao.description
-                    WHERE ao.observationTypeFk = to2.observationTypeFk
-                        AND a.id = ?
-                        AND t.shipped >= util.VN_CURDATE()`, [addressId], myOptions);
-        }
 
         return updatedAddress;
     };

modules/client/back/methods/defaulter/filter.js

@@ -21,7 +21,7 @@ module.exports = Self => {
             }
         ],
         returns: {
-            type: 'object',
+            type: ['object'],
             root: true
         },
         http: {
@@ -41,28 +41,23 @@ module.exports = Self => {
             switch (param) {
             case 'search':
                 return {or: [
-                    {'c.id': value},
+                    {'d.clientFk': value},
-                    {'c.name': {like: `%${value}%`}}
+                    {'d.clientName': {like: `%${value}%`}}
                 ]};
             }
         });
 
-        const date = Date.vnNew();
+        filter = mergeFilters(ctx.args.filter, {where});
-        date.setHours(0, 0, 0, 0);
-
-        filter = mergeFilters({where: {'d.created': date, 'd.amount': {gt: 0}}}, ctx.args.filter);
-        filter = mergeFilters(filter, {where});
 
         const stmts = [];
 
-        let stmt = new ParameterizedSQL(
+        const date = Date.vnNew();
-            `CREATE OR REPLACE TEMPORARY TABLE tmp.defaulters
+        date.setHours(0, 0, 0, 0);
-                WITH clientObservations AS
+        const stmt = new ParameterizedSQL(
-                (SELECT clientFk,text, created, workerFk
+            `SELECT *
-                    FROM vn.clientObservation
+                FROM (
-                    GROUP BY clientFk
+                    SELECT
-                    ORDER BY created DESC
+                        DISTINCT c.id clientFk,
-                )SELECT c.id clientFk,
                         c.name clientName,
                         c.salesPersonFk,
                         c.businessTypeFk = 'worker' isWorker,
@@ -85,43 +80,36 @@ module.exports = Self => {
                         JOIN client c ON c.id = d.clientFk
                         JOIN country cn ON cn.id = c.countryFk
                         JOIN payMethod pm ON pm.id = c.payMethodFk
-                        LEFT JOIN clientObservations co ON co.clientFk = c.id
+                        LEFT JOIN clientObservation co ON co.clientFk = c.id
                         LEFT JOIN account.user u ON u.id = c.salesPersonFk
                         LEFT JOIN account.user uw ON uw.id = co.workerFk
                         LEFT JOIN (
                          SELECT r1.started, r1.clientFk, r1.finished
                             FROM recovery r1
                                 JOIN (
-                                    SELECT MAX(started) maxStarted, clientFk
+                                    SELECT MAX(started) AS maxStarted, clientFk
                                         FROM recovery
                                         GROUP BY clientFk
                                 ) r2 ON r1.clientFk = r2.clientFk
                                     AND r1.started = r2.maxStarted
-                            WHERE r1.finished
-                            GROUP BY r1.clientFk
                         ) r ON r.clientFk = c.id
                         LEFT JOIN workerDepartment wd ON wd.workerFk = u.id
-                        LEFT JOIN department dp ON dp.id = wd.departmentFk`);
+                        LEFT JOIN department dp ON dp.id = wd.departmentFk
+                    WHERE
+                        d.created = ?
+                        AND d.amount > 0
+                    ORDER BY co.created DESC) d`
+            , [date]);
 
         stmt.merge(conn.makeWhere(filter.where));
-        stmts.push(stmt);
+        stmt.merge(`GROUP BY d.clientFk`);
-
-        stmt = new ParameterizedSQL(`
-            SELECT SUM(amount) amount
-                FROM tmp.defaulters
-        `);
-        stmts.push(stmt);
-
-        stmt = new ParameterizedSQL(`
-            SELECT *
-                FROM tmp.defaulters
-        `);
         stmt.merge(conn.makeOrderBy(filter.order));
+        stmt.merge(conn.makeLimit(filter));
 
         const itemsIndex = stmts.push(stmt) - 1;
         const sql = ParameterizedSQL.join(stmts, ';');
         const result = await conn.executeStmt(sql, myOptions);
 
-        return {defaulters: result[itemsIndex], amount: result[itemsIndex - 1][0].amount};
+        return itemsIndex === 0 ? result : result[itemsIndex];
     };
 };

modules/client/back/methods/defaulter/specs/filter.spec.js

@@ -11,10 +11,10 @@ describe('defaulter filter()', () => {
             const ctx = {req: {accessToken: {userId: authUserId}}, args: {filter: filter}};
 
             const result = await models.Defaulter.filter(ctx, null, options);
-            const firstRow = result.defaulters[0];
+            const firstRow = result[0];
 
             expect(firstRow.clientFk).toEqual(1101);
-            expect(result.defaulters.length).toEqual(5);
+            expect(result.length).toEqual(5);
 
             await tx.rollback();
         } catch (e) {
@@ -31,7 +31,7 @@ describe('defaulter filter()', () => {
             const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 1101}};
 
             const result = await models.Defaulter.filter(ctx, null, options);
-            const firstRow = result.defaulters[0];
+            const firstRow = result[0];
 
             expect(firstRow.clientFk).toEqual(1101);
 
@@ -50,7 +50,7 @@ describe('defaulter filter()', () => {
             const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 'Petter Parker'}};
 
             const result = await models.Defaulter.filter(ctx, null, options);
-            const firstRow = result.defaulters[0];
+            const firstRow = result[0];
 
             expect(firstRow.clientName).toEqual('Petter Parker');
 
@@ -60,23 +60,4 @@ describe('defaulter filter()', () => {
             throw e;
         }
     });
-
-    it('should return the defaulter the sum of every defaulters', async() => {
-        const tx = await models.Defaulter.beginTransaction({});
-
-        try {
-            const options = {transaction: tx};
-            const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 1101}};
-            const {defaulters, amount} = await models.Defaulter.filter(ctx, null, options);
-
-            const total = defaulters.reduce((total, row) => total + row.amount, 0);
-
-            expect(total).toEqual(amount);
-
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            throw e;
-        }
-    });
 });

modules/client/back/model-config.json

@@ -139,23 +139,5 @@
     },
     "Xdiario": {
         "dataSource": "vn"
-    },
-    "BusinessReasonEnd": {
-        "dataSource": "vn"
-    },
-    "OccupationCode": {
-        "dataSource": "vn"
-    },
-    "WorkerBusinessProfessionalCategory": {
-        "dataSource": "vn"
-    },
-    "CalendarType": {
-        "dataSource": "vn"
-    },
-    "WorkerBusinessType": {
-        "dataSource": "vn"
-    },
-    "PayrollCategory": {
-        "dataSource": "vn"
     }
 }

modules/client/back/models/business-reason-end.json

@@ -1,17 +0,0 @@
-{
-    "name": "BusinessReasonEnd",
-    "base": "VnModel",
-    "options": {
-        "mysql": {
-            "table": "businessReasonEnd"
-        }
-    },
-    "properties": {
-        "id": {
-            "type": "number"
-        },
-        "reason": {
-            "type": "string"
-        }
-    }
-}

modules/client/back/models/business.json

@@ -13,63 +13,6 @@
         },
         "workcenterFk" : {
             "type": "number"
-        },
-        "companyCodeFk" : {
-            "type": "string"
-        },
-        "started" : {
-            "type": "date"
-        },
-        "ended" : {
-            "type": "date"
-        },
-        "workerBusiness" : {
-            "type": "string"
-        },
-        "reasonEndFk" : {
-            "type": "number"
-        },
-        "payedHolidays" : {
-            "type": "number"
-        },
-        "occupationCodeFk" : {
-            "type": "string"
-        },
-        "workerFk" : {
-            "type": "number"
-        },
-        "notes" : {
-            "type": "string"
-        },
-        "departmentFk": {
-            "type": "string"
-        },
-        "workerBusinessProfessionalCategoryFk": {
-            "type": "number"
-        },
-        "calendarTypeFk": {
-            "type": "string"
-        },
-        "isHourlyLabor": {
-            "type": "boolean"
-        },
-        "rate": {
-            "type": "number"
-        },
-        "workerBusinessCategoryFk": {
-            "type": "number"
-        },
-        "workerBusinessTypeFk": {
-            "type": "number"
-        },
-        "amount": {
-            "type": "number"
-        },
-        "workerBusinessAgreementFk": {
-            "type": "number"
-        },
-        "basicSalary": {
-            "type": "number"
         }
     },
     "relations": {
@@ -82,59 +25,6 @@
             "type": "belongsTo",
             "model": "Department",
             "foreignKey": "departmentFk"
-        },
-        "workCenter": {
-            "type": "belongsTo",
-            "model": "WorkCenter",
-            "foreignKey": "workcenterFk"
-        },
-        "companyCode": {
-            "type": "belongsTo",
-            "model": "Company",
-            "foreignKey": "companyCodeFk",
-            "primaryKey": "code"
-        },
-        "reasonEnd": {
-            "type": "belongsTo",
-            "model": "BusinessReasonEnd",
-            "foreignKey": "reasonEndFk"
-        },
-        "occupationCode": {
-            "type": "belongsTo",
-            "model": "OccupationCode",
-            "foreignKey":"occupationCodeFk",
-            "primaryKey": "code"
-        },
-        "payrollCategory": {
-            "type": "belongsTo",
-            "model": "PayrollCategory",
-            "foreignKey":"workerBusinessCategoryFk"
-        },
-        "workerBusinessProfessionalCategory": {
-            "type": "belongsTo",
-            "model": "WorkerBusinessProfessionalCategory",
-            "foreignKey": "workerBusinessProfessionalCategoryFk"
-        },
-        "calendarType": {
-            "type": "belongsTo",
-            "model": "CalendarType",
-            "foreignKey": "calendarTypeFk"
-        },
-        "workerBusinessCategory": {
-            "type": "belongsTo",
-            "model": "WorkerBusinessCategory",
-            "foreignKey": "workerBusinessCategoryFk"
-        },
-        "workerBusinessType": {
-            "type": "belongsTo",
-            "model": "WorkerBusinessType",
-            "foreignKey": "workerBusinessTypeFk"
-        },
-        "workerBusinessAgreement": {
-            "type": "belongsTo",
-            "model": "WorkerBusinessAgreement",
-            "foreignKey": "workerBusinessAgreementFk"
         }
-
     }
 }

modules/client/back/models/calendar-type.json

@@ -1,21 +0,0 @@
-{
-    "name": "CalendarType",
-    "base": "VnModel",
-    "options": {
-        "mysql": {
-            "table": "calendarType"
-        }
-    },
-    "properties": {
-        "id": {
-            "type": "number"
-        },
-        "description": {
-            "type": "string"
-        },
-        "hoursWeek": {
-            "type": "number"
-        },
-        "isPartial": "number"
-    }
-}