Merge pull request 'feat: refs #8149 Group by CuentaIvaRepercutido' (!3201) from 8149-ivaXDiario into dev

Reviewed-on: #3201
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

.eslintrc.yml

@@ -36,3 +36,7 @@ rules:
     jasmine/no-focused-tests: 0
     jasmine/prefer-toHaveBeenCalledWith: 0
     arrow-spacing: ["error", { "before": true, "after": true }]
+    no-restricted-syntax:
+    - "error"
+    - selector: "NewExpression[callee.name='Date']"
+      message: "Use Date.vnNew() instead of new Date()."

back/methods/collection/getSales.js

@@ -29,10 +29,8 @@ module.exports = Self => {
     });
 
     Self.getSales = async(ctx, collectionOrTicketFk, print, source, options) => {
-        const models = Self.app.models;
         const userId = ctx.req.accessToken.userId;
         const myOptions = {userId};
-        const $t = ctx.req.__;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -59,22 +57,6 @@ module.exports = Self => {
 
         if (print) await Self.rawSql('CALL vn.collection_printSticker(?,NULL)', [id], myOptions);
 
-        for (let ticket of tickets) {
-            if (ticket.observaciones) {
-                let observations = ticket.observaciones.split(' ');
-
-                for (let observation of observations) {
-                    const salesPerson = ticket.salesPersonFk;
-                    if (observation.startsWith('#') || observation.startsWith('@')) {
-                        await models.Chat.send(ctx,
-                            observation,
-                            $t('ticketCommercial', {ticket: ticket.ticketFk, salesPerson})
-                        );
-                    }
-                }
-            }
-        }
-
         return getCollection(id, tickets, sales, placements, myOptions);
     };
 

back/methods/collection/getTickets.js

@@ -57,10 +57,10 @@ module.exports = Self => {
                     ROW_NUMBER () OVER (PARTITION BY s.id ORDER BY pickingOrder) currentItemShelving,
                     COUNT(*) OVER (PARTITION BY s.id ORDER BY s.id) totalItemShelving,
                     sh.code,
-                    p2.code parkingCode,
-                    p2.pickingOrder pickingOrder,
-                    p.code parkingCodePrevia,
-                    p.pickingOrder pickingOrderPrevia,
+                    p2.code parkingCodePrevia,
+                    p2.pickingOrder pickingOrderPrevia,
+                    p.code parkingCode,
+                    p.pickingOrder pickingOrder,
                     iss.id itemShelvingSaleFk,
                     iss.isPicked,
                     iss.itemShelvingFk
@@ -73,7 +73,7 @@ module.exports = Self => {
                     JOIN item i ON i.id = s.itemFk
                     JOIN itemShelvingSale iss ON iss.saleFk = s.id
                     LEFT JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-                    LEFT JOIN shelving sh ON sh.code = ish.shelvingFk
+                    LEFT JOIN shelving sh ON sh.id = ish.shelvingFk
                     LEFT JOIN parking p ON p.id = sh.parkingFk
                     LEFT JOIN itemColor ic ON ic.itemFk = s.itemFk
                     LEFT JOIN origin o ON o.id = i.originFk
@@ -114,7 +114,7 @@ module.exports = Self => {
                 JOIN item i ON i.id = s.itemFk
                 JOIN itemShelvingSale iss ON iss.saleFk = s.id
                 LEFT JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-                LEFT JOIN shelving sh ON sh.code = ish.shelvingFk
+                LEFT JOIN shelving sh ON sh.id = ish.shelvingFk
                 LEFT JOIN parking p ON p.id = sh.parkingFk
                 LEFT JOIN itemColor ic ON ic.itemFk = s.itemFk
                 LEFT JOIN origin o ON o.id = i.originFk

back/methods/collection/spec/assign.spec.js

@@ -28,9 +28,10 @@ describe('ticket assign()', () => {
         await tx.rollback();
     });
 
-    it('should throw an error when  there is not picking tickets', async() => {
+    it('should throw an error when there are no picking tickets', async() => {
         try {
             await models.Collection.assign(ctx, options);
+            fail('Expected an error to be thrown, but none was thrown.');
         } catch (e) {
             expect(e.message).toEqual('There are not picking tickets');
         }

back/methods/mrw-config/cancelShipment.js

@@ -39,6 +39,9 @@ module.exports = Self => {
         const xmlString = response.data;
         const parser = new DOMParser();
         const xmlDoc = parser.parseFromString(xmlString, 'text/xml');
+
+        await Self.rawSql('CALL util.debugAdd(?,?);', ['cancelShipment', xmlDoc]);
+
         const result = xmlDoc.getElementsByTagName('Mensaje')[0].textContent;
         return result.toLowerCase().includes('se ha cancelado correctamente');
     };

back/methods/workerActivity/add.js

@@ -31,7 +31,7 @@ module.exports = Self => {
         return await Self.rawSql(`
             INSERT INTO workerActivity (workerFk, workerActivityTypeFk, model)
                 SELECT ?, ?, ?
-                    FROM workerTimeControlParams wtcp
+                    FROM workerTimeControlConfig wtcc
                         LEFT JOIN (
                             SELECT wa.workerFk,
                                 wa.created,
@@ -44,7 +44,7 @@ module.exports = Self => {
                         ) sub ON TRUE
                     WHERE sub.workerFk IS NULL
                         OR sub.code <> ? 
-                        OR TIMESTAMPDIFF(SECOND, sub.created, util.VN_NOW()) > wtcp.dayBreak;`
+                        OR TIMESTAMPDIFF(SECOND, sub.created, util.VN_NOW()) > wtcc.dayBreak;`
         , [userId, code, model, userId, code], myOptions);
     };
 };

back/model-config.json

@@ -79,6 +79,9 @@
     "ImageCollectionSize": {
         "dataSource": "vn"
     },
+    "ImageConfig": {
+        "dataSource": "vn"
+    },
     "ImageContainer": {
         "dataSource": "imageStorage"
     },
@@ -139,6 +142,12 @@
     "StarredModule": {
         "dataSource": "vn"
     },
+    "SaySimpleCountry": {
+        "dataSource": "vn"
+    },
+    "SaySimpleConfig": {
+        "dataSource": "vn"
+    },
     "TempContainer": {
         "dataSource": "tempStorage"
     },

back/models/country.json

@@ -44,6 +44,11 @@
             "type": "belongsTo",
             "model": "Continent",
             "foreignKey": "continentFk"
+        },
+        "saySimpleCountry": {
+            "type": "hasOne",
+            "model": "SaySimpleCountry",
+            "foreignKey": "countryFk"
         }
     },
     "acls": [

back/models/expedition_PrintOut.json

@@ -14,9 +14,6 @@
         },
         "itemFk": {
             "type": "number"
-        },
-        "isChecked": {
-            "type": "boolean"
         }
     }
 }

back/models/image-config.json

@@ -0,0 +1,22 @@
+{
+    "name": "ImageConfig",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "hedera.imageConfig"
+        }
+    },
+    "properties": {
+        "url": {
+            "type": "string"
+        }
+    },
+    "acls": [
+        {
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "$authenticated",
+            "permission": "ALLOW"
+        }
+    ]
+}

back/models/say-simple-config.json

@@ -0,0 +1,29 @@
+{
+    "name": "SaySimpleConfig",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "saySimpleConfig"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
+        "url": {
+            "type": "string"
+        },
+        "defaultChannel": {
+            "type": "number"
+        }
+    },
+    "acls": [
+        {
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "$authenticated",
+            "permission": "ALLOW"
+        }
+    ]
+}

back/models/say-simple-country.json

@@ -0,0 +1,26 @@
+{
+    "name": "SaySimpleCountry",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "saySimpleCountry"
+        }
+    },
+    "properties": {
+        "countryFk": {
+            "type": "number",
+            "id": true
+        },
+        "channel": {
+            "type": "number"
+        }
+    },
+    "acls": [
+        {
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "$authenticated",
+            "permission": "ALLOW"
+        }
+    ]
+}

db/dump/.dump/data.sql

@@ -2084,7 +2084,7 @@ INSERT INTO `ACL` VALUES (756,'Route','findOne','READ','ALLOW','ROLE','employee'
 INSERT INTO `ACL` VALUES (757,'Route','getRoutesByWorker','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (758,'Route','canViewAllRoute','READ','ALLOW','ROLE','deliveryAssistant',NULL);
 INSERT INTO `ACL` VALUES (759,'Route','cmr','READ','ALLOW','ROLE','employee',NULL);
-INSERT INTO `ACL` VALUES (760,'Route','downloadCmrsZip','READ','ALLOW','ROLE','employee',NULL);
+INSERT INTO `ACL` VALUES (760,'Cmr','downloadZip','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (761,'Route','downloadZip','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (762,'Route','filter','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (763,'Route','getByWorker','READ','ALLOW','ROLE','employee',NULL);

db/dump/fixtures.before.sql

@@ -1254,9 +1254,9 @@ INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
 
 INSERT INTO `vn`.`itemShelving` (`itemFk`, `shelvingFk`, `visible`, `grouping`, `packing`,`buyFk`, `userFk`)
     VALUES
-        (2, 'GVC', 1, 1, 1, 2,1106),
-        (4, 'HEJ', 1, 1, 1, NULL,1106),
-        (1, 'UXN', 2, 12, 12, NULL,1106);
+        (2, 11, 1, 1, 1, 2,1106),
+        (4, 12, 1, 1, 1, NULL,1106),
+        (1, 13, 2, 12, 12, NULL,1106);
 
 INSERT INTO `vn`.`itemShelvingSale` (`itemShelvingFk`, `saleFk`, `quantity`, `created`, `userFk`)
     VALUES
@@ -1505,32 +1505,32 @@ INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk
         (9,     '99610289193', 302, 2972,   util.VN_CURDATE(),  3871, 442, 1),
         (10,    '07546500856', 185, 2364,   util.VN_CURDATE(),  5321, 442, 1);
 
-INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyModeFk`, `m3`, `kg`,`ref`, `totalEntries`, `cargoSupplierFk`, `awbFK`, `daysInForward`)
-    VALUES (1,  DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 2, 1, 100.00, 1000, 'first travel',   1, 1, 1, NULL),
-        (2,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 150.00, 2000, 'second travel',  2, 2, 2, NULL),
-        (3,  util.VN_CURDATE(),                              util.VN_CURDATE(),                              1, 2, 1, 0.00,   0.00, 'third travel',   1, 1, 3, NULL),
-        (4,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 3, 1, 50.00,  500,  'fourth travel',  0, 2, 4, NULL),
-        (5,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 3, 1, 50.00,  500,  'fifth travel',   1, 1, 5, NULL),
-        (6,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 50.00,  500,  'sixth travel',   1, 2, 6, NULL),
-        (7,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00,  500,  'seventh travel', 2, 1, 7, 2),
-        (8,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00,  500,  'eight travel',   1, 2, 10, NULL),
-        (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, 2),
-        (11, util.VN_CURDATE() - INTERVAL 1 DAY          ,                              util.VN_CURDATE(),   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, NULL),
-        (12, util.VN_CURDATE()                           ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, NULL);
+INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyModeFk`, `m3`, `kg`,`ref`, `totalEntries`, `cargoSupplierFk`, `awbFK`, `isRaid`, `daysInForward`)
+    VALUES (1,  DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 2, 1, 100.00, 1000, 'first travel',   1, 1, 1, FALSE, NULL),
+        (2,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 150.00, 2000, 'second travel',  2, 2, 2, FALSE, NULL),
+        (3,  util.VN_CURDATE(),                              util.VN_CURDATE(),                              1, 2, 1, 0.00,   0.00, 'third travel',   1, 1, 3, FALSE, NULL),
+        (4,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 3, 1, 50.00,  500,  'fourth travel',  0, 2, 4, FALSE, NULL),
+        (5,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 3, 1, 50.00,  500,  'fifth travel',   1, 1, 5, FALSE, NULL),
+        (6,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 50.00,  500,  'sixth travel',   1, 2, 6, FALSE,NULL),
+        (7,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00,  500,  'seventh travel', 2, 1, 7, TRUE, 2),
+        (8,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00,  500,  'eight travel',   1, 2, 10, FALSE, NULL),
+        (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);
 
-INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `evaNotes`)
-    VALUES
-        (1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1, 442, 'IN2001', 'Movement 1', 0, ''),
-        (2, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 442, 'IN2002', 'Movement 2', 0, 'observation two'),
-        (3, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 0, 442, 'IN2003', 'Movement 3', 0, 'observation three'),
-        (4, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 69,  'IN2004', 'Movement 4', 0, 'observation four'),
-        (5, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 0, 442, 'IN2005', 'Movement 5', 0, 'observation five'),
-        (6, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 6, 0, 442, 'IN2006', 'Movement 6', 0, 'observation six'),
-        (7, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2007', 'Movement 7', 0, 'observation seven'),
-        (8, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2008', 'Movement 8', 1,''),
-        (9, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 9', 1, ''),
-        (10, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 10', 1, ''),
-        (99, 69,                   '2000-12-01 00:00:00.000', 11, 0, 442, 'IN2009', 'Movement 99', 0, '');
+INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `evaNotes`, `typeFk`)
+	VALUES
+		(1,		1,	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 	1, 442, 'IN2001', 'Movement 1', 0, '', 'packaging'),
+		(2,		2,	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 	0, 442, 'IN2002', 'Movement 2', 0, 'observation two', 'product'),
+		(3,		1, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 	0, 442, 'IN2003', 'Movement 3', 0, 'observation three', 'product'),
+		(4,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 	0, 69,	'IN2004', 'Movement 4', 0, 'observation four', 'product'),
+		(5,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 	0, 442, 'IN2005', 'Movement 5', 0, 'observation five', 'product'),
+		(6,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 6, 	0, 442, 'IN2006', 'Movement 6', 0, 'observation six', 'product'),
+		(7,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 	0, 442, 'IN2007', 'Movement 7', 0, 'observation seven', 'product'),
+		(8,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 	0, 442, 'IN2008', 'Movement 8', 1, '', 'product'),
+		(9,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 	10, 0, 442, 'IN2009', 'Movement 9', 1, '', 'product'),
+		(10,	2,	DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 	10, 0, 442, 'IN2009', 'Movement 10', 1, '', 'product'),
+		(99,	69, util.VN_CURDATE() - INTERVAL 1 MONTH, 			11, 0, 442, 'IN2009', 'Movement 99', 0, '', 'product');
 
 INSERT INTO `vn`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `defaultSupplierFk`)
 	VALUES (2, 4, 1);
@@ -2521,10 +2521,6 @@ INSERT INTO `vn`.`queuePriority`(`id`, `priority`, `code`)
         (2, 'Normal', 'normal'),
         (3, 'Baja', 'low');
 
-INSERT INTO `vn`.`workerTimeControlParams` (`id`, `dayBreak`, `weekBreak`, `weekScope`, `dayWorkMax`, `dayStayMax`, `weekMaxBreak`, `weekMaxScope`, `askInOut`)
-    VALUES
-        (1, 43200, 129600, 734400, 43200, 50400, 259200, 1296000, 36000);
-
 INSERT IGNORE INTO `vn`.`greugeConfig` (`id`, `freightPickUpPrice`) VALUES ('1', '11');
 
 INSERT INTO `vn`.`thermograph`(`id`, `model`)
@@ -3425,7 +3421,7 @@ INSERT INTO vn.buy
 INSERT INTO vn.itemShelving
 	SET id = 9931,
 		itemFk = 999993,
-		shelvingFk = 'NCC',
+		shelvingFk = 16,
 		visible = 10,
 		`grouping` = 5,
 		packing = 10;
@@ -3752,7 +3748,7 @@ INSERT vn.sale
 
 USE vn;
 DELETE ish.*  FROM vn.itemShelving ish
-		JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+		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.warehouse w ON w.id = s.warehouseFk
@@ -3761,22 +3757,22 @@ DELETE ish.*  FROM vn.itemShelving ish
 INSERT INTO vn.itemShelving
 (itemFk, shelvingFk, visible, created, `grouping`, packing, packagingFk, userFk, isChecked)
 VALUES
-	(999991, 'NAA', 8, '2023-09-20', 1, 20, NULL, 103, NULL),
-	(999998, 'NAA', 80, '2023-09-20', 10, 30, NULL, 103, NULL),
-	(1000001, 'NAA', 6, '2023-09-20', 3, 50, NULL, 103, NULL),
-	(1000000, 'NBB', 50, '2023-09-18', 25, 500, NULL, 103, NULL),
-	(999993, 'NBB', 25, '2023-09-18', NULL, 10, NULL, 103, NULL),
-	(999999, 'NBB', 30, '2023-09-18', 10, 500, NULL, 103, NULL),
-	(999993, 'NCC', 25, '2023-09-20', 5, 10, NULL, 103, NULL),
-	(999997, 'NCC', 10, '2023-09-20', NULL, 100, NULL, 103, NULL),
-	(999999, 'NCC', 40, '2023-09-20', 10, 500, NULL, 103, NULL),
-	(999995, 'NDD', 10, '2023-09-19', NULL, 20, NULL, 103, NULL),
-	(999994, 'NDD', 48, '2023-09-19', 4, 20, NULL, 103, NULL),
-	(1000001, 'NEE', 6, '2023-09-21', 3, 50, NULL, 103, NULL),
-	(999992, 'NEE', 50, '2023-09-21', NULL, 1, NULL, 103, NULL),
-	(1000000, 'NEE', 25, '2023-09-21', 25, 500, NULL, 103, NULL),
-	(999996, 'PAA', 5, '2023-09-27', 1, 5, NULL, 103, NULL),
-	(999997, 'PCC', 10, '2023-09-27', 5, 100, NULL, 103, NULL);
+	(999991, 14, 8, '2023-09-20', 1, 20, NULL, 103, NULL),
+	(999998, 14, 80, '2023-09-20', 10, 30, NULL, 103, NULL),
+	(1000001, 14, 6, '2023-09-20', 3, 50, NULL, 103, NULL),
+	(1000000, 15, 50, '2023-09-18', 25, 500, NULL, 103, NULL),
+	(999993, 15, 25, '2023-09-18', NULL, 10, NULL, 103, NULL),
+	(999999, 15, 30, '2023-09-18', 10, 500, NULL, 103, NULL),
+	(999993, 16, 25, '2023-09-20', 5, 10, NULL, 103, NULL),
+	(999997, 16, 10, '2023-09-20', NULL, 100, NULL, 103, NULL),
+	(999999, 16, 40, '2023-09-20', 10, 500, NULL, 103, NULL),
+	(999995, 17, 10, '2023-09-19', NULL, 20, NULL, 103, NULL),
+	(999994, 17, 48, '2023-09-19', 4, 20, NULL, 103, NULL),
+	(1000001, 18, 6, '2023-09-21', 3, 50, NULL, 103, NULL),
+	(999992, 18, 50, '2023-09-21', NULL, 1, NULL, 103, NULL),
+	(1000000, 18, 25, '2023-09-21', 25, 500, NULL, 103, NULL),
+	(999996, 19, 5, '2023-09-27', 1, 5, NULL, 103, NULL),
+	(999997, 21, 10, '2023-09-27', 5, 100, NULL, 103, NULL);
 
 -- Previous for Bolas de madera
 INSERT IGNORE INTO vn.sectorCollection
@@ -4008,6 +4004,13 @@ INSERT IGNORE INTO pbx.queueMember
 UPDATE vn.department SET pbxQueue = '1000' WHERE name = "CAMARA";
 UPDATE vn.department SET pbxQueue = '2000' WHERE name = "VENTAS";
 
+INSERT INTO vn.workerRelatives (workerFk, isDescendant, disabilityGradeFk, birthed, adoptionYear, isDependend, isJointCustody, updated)
+	VALUES
+		(1106, 1, NULL, 0, NULL, 0, 0, '2024-10-29 08:42:44.000');
+INSERT INTO vn.routeAction (id, name, price, isMainlineDelivered) VALUES(1, 'Pintar traje', 50.00, 0);
+INSERT INTO vn.routeComplement (id, dated, workerFk, price, routeActionFk) VALUES(1, util.VN_CURDATE(), 9, 50.00, 1);
+
+
 INSERT INTO srt.buffer (id, x, y, `size`, `length`, stateFk, typeFk, isActive, code, stratus, hasWorkerWaiting, reserve, routeFk, dayMinute, lastUnloaded, hasStrapper, typeDefaultFk, motors, editorFk)
     VALUES  (0, 0, 0, 0, NULL, 3, 1, 0, 'ENT', 0, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
             (1, 0, 9900, 0, NULL, 1, 0, 0, 'NOK', 0, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
@@ -4021,4 +4024,12 @@ INSERT INTO srt.buffer (id, x, y, `size`, `length`, stateFk, typeFk, isActive, c
             (9, 1400, 1500, 500, 13000, 1, 1, 1, '04B', 4, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
             (10, 0, 2000, 500, 13000, 1, 1, 1, '05A', 5, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL);
 
+INSERT IGNORE INTO vn.saySimpleCountry (countryFk, channel)
+	VALUES (19, '1169'),
+			(8, '1183');
 
+INSERT IGNORE INTO vn.saySimpleConfig (url, defaultChannel)
+	VALUES ('saysimle-url-mock', 1320);
+
+INSERT INTO vn.workerIrpf (workerFk,spouseNif, geographicMobilityDate)
+	VALUES (1106,'26493101E','2019-09-20');

db/routines/account/views/myUser.sql

@@ -7,8 +7,7 @@ AS SELECT `u`.`id` AS `id`,
 	`u`.`email` AS `email`,
 	`u`.`nickname` AS `nickname`,
 	`u`.`lang` AS `lang`,
-	`u`.`role` AS `role`,
-	`u`.`recoverPass` AS `recoverPass`
+	`u`.`role` AS `role`
 FROM `account`.`user` `u`
 WHERE `u`.`name` = `myUser_getName`()
 WITH CASCADED CHECK OPTION

db/routines/bs/procedures/inventoryDiscrepancyDetail_replace.sql

@@ -32,7 +32,7 @@ BEGIN
 		CREATE OR REPLACE TEMPORARY TABLE tVisible
 			SELECT itemFk, SUM(visible) totalVisible
 				FROM vn.itemShelving ish
-					JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+					JOIN vn.shelving sh ON sh.id = ish.shelvingFk
 					JOIN vn.parking p ON p.id = sh.parkingFk
 					JOIN vn.sector sc ON sc.id = p.sectorFk
 					WHERE sc.warehouseFk = vWarehouseFk

db/routines/cache/procedures/availableNoRaids_refresh.sql

@@ -53,7 +53,7 @@ proc: BEGIN
 					WHERE t.landed BETWEEN vInventoryDate AND vStartDate
 						AND t.warehouseInFk = vWarehouse
 						AND s.name != 'INVENTARIO'
-						AND NOT t.daysInForward
+						AND NOT t.isRaid
 					GROUP BY b.itemFk
 			) c
 				JOIN vn.item i ON i.id = c.itemFk

db/routines/edi/triggers/supplyResponse_afterUpdate.sql

@@ -14,7 +14,7 @@ BEGIN
 			b.stickers = NEW.NumberOfUnits
 		WHERE i.supplyResponseFk = NEW.ID
 			AND am.name = 'LOGIFLORA'
-			AND tr.daysInForward
+			AND tr.isRaid
 			AND tr.landed >= util.VN_CURDATE();
 
 END$$

db/routines/hedera/procedures/item_getVisible.sql

@@ -59,7 +59,7 @@ BEGIN
 						JOIN vn.travel t ON t.id = e.travelFk
 					WHERE t.landed BETWEEN vDateInv AND vDate
 						AND t.warehouseInFk = vWarehouse
-						AND NOT t.daysInForward
+						AND NOT t.isRaid
 				UNION ALL
 				SELECT b.itemFk, -b.quantity
 					FROM vn.buy b
@@ -67,7 +67,7 @@ BEGIN
 						JOIN vn.travel t ON t.id = e.travelFk
 					WHERE t.shipped BETWEEN vDateInv AND util.VN_CURDATE()
 						AND t.warehouseOutFk = vWarehouse
-						AND NOT t.daysInForward
+						AND NOT t.isRaid
 						AND t.isDelivered
 				UNION ALL
 				SELECT m.itemFk, -m.quantity

db/routines/hedera/procedures/order_getTax.sql

@@ -9,45 +9,54 @@ BEGIN
  * @param vOrder El identificador del pedido
  * @return tmp.orderTax Bases imponibles, IVA y recargo de equivalencia
  */
+ 	-- No poner create or replace, ya que da problemas
 	DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany;
 	CREATE TEMPORARY TABLE tmp.addressCompany
 		(INDEX (addressFk, companyFk))
 		ENGINE = MEMORY 
 		SELECT DISTINCT o.address_id addressFk, o.company_id companyFk
 			FROM tmp.`order` tmpOrder
-				JOIN hedera.`order` o ON o.id = tmpOrder.orderFk;
+				JOIN `order` o ON o.id = tmpOrder.orderFk;
 
-	CALL vn.addressTaxArea;
+	CALL vn.addressTaxArea();
 
 	-- Calcula el IVA y el recargo desglosado.
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.orderTax;
-	CREATE TEMPORARY TABLE tmp.orderTax
-		(INDEX (orderFk))
+	CREATE OR REPLACE TEMPORARY TABLE tmp.orderTax
+		(PRIMARY KEY (orderFk, code, rate))
 		ENGINE = MEMORY
-		SELECT o.id orderFk,
+		WITH orders AS (
+			SELECT tor.orderFk,
+					oro.amount * oro.price total,
+					s.countryFk,
+					ata.areaFk,
+					itc.taxClassFk
+				FROM hedera.orderRow oro
+					JOIN tmp.order tor ON tor.orderFk = oro.orderFk
+					JOIN hedera.`order` o ON o.id = tor.orderFk
+					JOIN vn.item i ON i.id = oro.itemFk
+					JOIN vn.`client` c ON c.id = o.customer_id
+					JOIN vn.supplier s ON s.id = o.company_id
+					JOIN tmp.addressTaxArea ata ON ata.addressFk = o.address_id
+						AND ata.companyFk = o.company_id
+					JOIN vn.itemTaxCountry itc ON itc.itemFk = i.id
+						AND itc.countryFk = s.countryFk
+				HAVING total
+		)
+		SELECT o.orderFk,
 				tc.code,
-				SUM(m.amount * m.price) taxableBase,
+				SUM(o.total) taxableBase,
 				pgc.rate
-			FROM tmp.`order` tmpOrder
-				JOIN `order` o ON o.id = tmpOrder.orderFk
-				JOIN orderRow m ON m.orderFk = o.id
-				JOIN vn.item i ON i.id = m.itemFk
-				JOIN vn.`client` c ON c.id = o.customer_id
-				JOIN vn.supplier s ON s.id = o.company_id
-				JOIN tmp.addressTaxArea ata
-					ON ata.addressFk = o.address_id AND ata.companyFk = o.company_id
-				JOIN vn.itemTaxCountry itc
-					ON itc.itemFk = i.id AND itc.countryFk = s.countryFk
-				JOIN vn.bookingPlanner bp
-					ON bp.countryFk = s.countryFk
-						AND bp.taxAreaFk = ata.areaFk
-						AND bp.taxClassFk = itc.taxClassFk
-				JOIN vn.pgc ON pgc.`code` = bp.pgcFk
+			FROM orders o
+				JOIN vn.bookingPlanner bp ON bp.countryFk = o.countryFk
+					AND bp.taxAreaFk = o.areaFk
+					AND bp.taxClassFk = o.taxClassFk
+				JOIN vn.pgc ON pgc.code = bp.pgcFk
 				JOIN vn.taxClass tc ON tc.id = bp.taxClassFk
-			GROUP BY tmpOrder.orderFk, pgc.`code`, pgc.rate
-			HAVING taxableBase != 0;
+			GROUP BY o.orderFk, pgc.code, pgc.rate
+			HAVING taxableBase
+			ORDER BY bp.priority;
 					
+	-- No poner create or replace, ya que da problemas
 	DROP TEMPORARY TABLE IF EXISTS tmp.orderAmount;
 	CREATE TEMPORARY TABLE tmp.orderAmount
 		(INDEX (orderFk))

db/routines/sage/procedures/invoiceIn_add.sql

@@ -26,7 +26,7 @@ BEGIN
 
 	DECLARE vCursor CURSOR FOR
 		SELECT it.taxableBase,
-				CAST((( it.taxableBase / 100) * t.PorcentajeIva) AS DECIMAL (10,2)),
+				CAST(SUM((( it.taxableBase / 100) * t.PorcentajeIva)) AS DECIMAL (10,2)),
 				t.PorcentajeIva,
 				it.transactionTypeSageFk,
 				it.taxTypeSageFk,
@@ -39,7 +39,8 @@ BEGIN
 				JOIN TiposTransacciones tt ON tt.CodigoTransaccion = it.transactionTypeSageFk
 				LEFT JOIN vn.dua d ON d.id = vInvoiceInFk
 			WHERE i.id = vInvoiceInFk
-				AND d.id IS NULL;
+				AND d.id IS NULL
+			GROUP BY it.taxTypeSageFk;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 

db/routines/stock/procedures/log_refreshBuy.sql

@@ -6,12 +6,11 @@ BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tValues;
 	CREATE TEMPORARY TABLE tValues
 		ENGINE = MEMORY
-		SELECT
-				b.id buyFk,
+		SELECT b.id buyFk,
 				e.id entryFk,
 				t.id travelFk,
 				b.itemFk,
-				t.daysInForward,
+				t.isRaid,
 				ADDTIME(t.shipped,
 					IFNULL(t.shipmentHour, '00:00:00')) shipped,
 				t.warehouseOutFk,
@@ -50,7 +49,7 @@ BEGIN
 				itemFk,
 				TIMESTAMPADD(DAY, life, @dated),
 				quantity,
-				IF(isIn, isReceived, isDelivered) AND NOT daysInForward
+				IF(isIn, isReceived, isDelivered) AND NOT isRaid
 			FROM tValues
 			WHERE isIn OR !lessThanInventory;
 
@@ -65,7 +64,7 @@ BEGIN
 				itemFk,
 				created,
 				quantity,
-				IF(isIn, isDelivered, isReceived) AND NOT daysInForward
+				IF(isIn, isDelivered, isReceived) AND NOT isRaid
 			FROM tValues
 			WHERE !isIn OR !lessThanInventory;
 

db/routines/vn/functions/address_getGeo.sql

@@ -14,9 +14,12 @@ BEGIN
 	SELECT p.geoFk INTO vGeoFk
 		FROM address a 
 			JOIN town t ON t.provinceFk = a.provinceFk
-			JOIN postCode p ON p.townFk = t.id AND p.`code` = a.postalCode
+			JOIN postCode p ON p.townFk = t.id
+				AND (p.code = a.postalCode OR a.postalCode IS NULL)
+			JOIN zoneGeo zg ON zg.id = p.geoFk
 		WHERE a.id = vSelf
-		ORDER BY (a.city SOUNDS LIKE t.`name`) DESC
+		ORDER BY (a.city SOUNDS LIKE t.name) DESC,
+			(p.code = a.postalCode) DESC
 		LIMIT 1;
 
 	RETURN vGeoFk;

db/routines/vn/functions/client_getGeo.sql

@@ -0,0 +1,27 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`client_getGeo`(vSelf INT)
+	RETURNS int(11)
+	DETERMINISTIC
+BEGIN
+/**
+ * Returns the geo for the passed client.
+ *
+ * @param vSelf The address id
+ * @return The geo id
+ */
+ 	DECLARE vGeoFk INT;
+
+	SELECT p.geoFk INTO vGeoFk
+		FROM client c
+			JOIN town t ON t.provinceFk = c.provinceFk
+			JOIN postCode p ON p.townFk = t.id
+				AND (p.code = c.postcode OR c.postcode IS NULL)
+			JOIN zoneGeo zg ON zg.id = p.geoFk
+		WHERE c.id = vSelf
+		ORDER BY (c.city SOUNDS LIKE t.name) DESC,
+			(p.code = c.postcode) DESC
+		LIMIT 1;
+
+	RETURN vGeoFk;
+END$$
+DELIMITER ;

db/routines/vn/functions/entry_getCommission.sql

@@ -1,48 +1,22 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`entry_getCommission`(vTravelFk INT,
-    vCurrencyFk INT,
-    vSupplierFk INT
+	vCurrencyFk INT,
+	vSupplierFk INT
 )
 	RETURNS int(11)
 	NOT DETERMINISTIC
 	READS SQL DATA
 BEGIN
-    DECLARE vCommission INT;
-    DECLARE vCurrentCommission INT;
-    DECLARE vIsCurrencyUsd INT;
-    DECLARE vLastEntryFk INT;
+	DECLARE vCommission INT;
+	DECLARE vCurrentCommission INT;
+	DECLARE vIsNotEUR INT;
+	DECLARE vLastEntryFk INT;
 
-    SELECT count(*) INTO vIsCurrencyUsd
-            FROM currency c
-            WHERE c.code = 'USD' AND id = vCurrencyFk;
-    
-    IF NOT vIsCurrencyUsd THEN
-    
-		SELECT e.id INTO vLastEntryFk
-			FROM vn.entry e
-				JOIN vn.travel tr ON tr.id = e.travelFk
-                WHERE e.supplierFk = vSupplierFk
-                ORDER BY tr.landed DESC
-                LIMIT 1;
-        
-        IF vLastEntryFk THEN
-        
-			SELECT commission INTO vCurrentCommission
-				FROM vn.entry
-                WHERE id = vLastEntryFk;
-        
-        ELSE
-        
-			SELECT commission INTO vCurrentCommission
-				FROM supplier s
-				WHERE s.id = vSupplierFk;
-        
-		END IF;
-        
-        RETURN vCurrentCommission;
-        
-    ELSE
+	SELECT count(*) INTO vIsNotEUR
+			FROM currency c
+			WHERE c.code <> 'EUR' AND id = vCurrencyFk;
 
+	IF vIsNotEUR THEN
 		SELECT ROUND(-100 * (1 - (1 / r.value))) INTO vCommission
 			FROM travel t
 				LEFT JOIN referenceCurrent r ON r.currencyFk = vCurrencyFk AND r.`dated` <= t.shipped
@@ -51,8 +25,27 @@ BEGIN
 			LIMIT 1;
 
 		RETURN IFNULL(vCommission, 0);
+	ELSE
+		SELECT e.id INTO vLastEntryFk
+			FROM `entry` e
+				JOIN travel tr ON tr.id = e.travelFk
+				WHERE e.supplierFk = vSupplierFk
+				ORDER BY tr.landed DESC
+				LIMIT 1;
 
-    END IF;
+		IF vLastEntryFk THEN
+			SELECT commission INTO vCurrentCommission
+				FROM `entry`
+				WHERE id = vLastEntryFk;
 
+		ELSE
+			SELECT commission INTO vCurrentCommission
+				FROM supplier s
+				WHERE s.id = vSupplierFk;
+
+		END IF;
+
+		RETURN vCurrentCommission;
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/functions/hasItemsInSector.sql

@@ -9,7 +9,7 @@ BEGIN
     SELECT count(*) INTO vItemCount
 		FROM vn.sale s 
 			JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk
-            JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+            JOIN vn.shelving sh ON sh.id = ish.shelvingFk
             JOIN vn.parking p ON p.id = sh.parkingFk
 		WHERE s.ticketFk = vTicketFk
 			AND p.sectorFk = vSectorFk;

db/routines/vn/functions/itemsInSector_get.sql

@@ -10,7 +10,7 @@ BEGIN
     SELECT count(*) INTO vItemCount
 		FROM vn.sale s 
 			JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk
-            JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+            JOIN vn.shelving sh ON sh.id = ish.shelvingFk
             JOIN vn.parking p ON p.id = sh.parkingFk
 		WHERE s.ticketFk = vTicketFk
 			AND p.sectorFk = vSectorFk;

db/routines/vn/functions/supplier_getGeo.sql

@@ -0,0 +1,29 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`supplier_getGeo`(vSelf INT)
+	RETURNS int(11)
+	DETERMINISTIC
+BEGIN
+/**
+ * Returns the geo for the passed supplier.
+ *
+ * @param vSelf The address id
+ * @return The geo id
+ */
+ 	DECLARE vGeoFk INT;
+
+	SELECT p.geoFk INTO vGeoFk
+		FROM supplier s
+			JOIN town t ON t.provinceFk = s.provinceFk
+			JOIN postCode p ON p.townFk = t.id
+				AND (p.code = s.postCode OR s.postCode IS NULL)
+			LEFT JOIN supplierAddress sad ON sad.supplierFk = s.id
+			JOIN zoneGeo zg ON zg.id = p.geoFk
+		WHERE s.id = vSelf
+		ORDER BY (s.city SOUNDS LIKE t.name) DESC,
+			(p.code = s.postCode) DESC,
+			(p.code = sad.postalCode) DESC
+		LIMIT 1;
+
+	RETURN vGeoFk;
+END$$
+DELIMITER ;

db/routines/vn/functions/timeWorkerControl_getDirection.sql

@@ -1,65 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`timeWorkerControl_getDirection`(vUserFk INT, vTimed DATETIME)
-	RETURNS varchar(6) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
-	NOT DETERMINISTIC
-	READS SQL DATA
-BEGIN
-/**
- * Verifica la dirección de la fichada 
- * @param vUserFk Identificador del trabajador
- * @param vTimed Hora de la fichada
- * @return Retorna sentido de la fichada 'in, out, middle'
- */
-
-	DECLARE vPrevious DATETIME ;
-    DECLARE vNext DATETIME ;
-    DECLARE vPreviousDirection VARCHAR(3) ;
-    DECLARE vNextDirection VARCHAR(3) ;
-    DECLARE vDayStayMax INT;
-    DECLARE vTimedSeconds INT;
-    DECLARE vLastTimeIn INT;
-	
-    SELECT UNIX_TIMESTAMP(vTimed) INTO vTimedSeconds;
-    
-    SELECT dayStayMax INTO vDayStayMax
-		FROM vn.workerTimeControlParams;
-
-    SELECT timed, direction INTO vNext,vNextDirection
-		FROM vn.workerTimeControl 
-        WHERE userFk = vUserFk 
-			AND direction IN ('in','out')
-            AND timed > vTimed
-		ORDER BY timed ASC
-        LIMIT 1;
-        
-    SELECT timed, direction INTO vPrevious, vPreviousDirection
-		FROM vn.workerTimeControl 
-        WHERE userFk = vUserFk 
-			AND direction IN ('in','out')
-            AND timed < vTimed
-		ORDER BY timed DESC
-        LIMIT 1;   
-	
-    IF (vTimedSeconds - UNIX_TIMESTAMP(vPrevious) + UNIX_TIMESTAMP(vNext) - vTimedSeconds)<= vDayStayMax AND vPreviousDirection = 'in'  AND vNextDirection = 'out' THEN 
-		RETURN 'middle';
-	END IF;
-    
-    
-    IF (vTimedSeconds> UNIX_TIMESTAMP(vPrevious)) THEN
-		IF vPreviousDirection = 'in' THEN 
-			RETURN 'out';
-		ELSE
-			SELECT UNIX_TIMESTAMP(MAX(timed)) INTO vLastTimeIn
-				FROM vn.workerTimeControl 
-				WHERE userFk = vUserFk 
-					AND direction ='in'
-					AND timed < vPrevious;
-			IF vTimedSeconds - vLastTimeIn <= vDayStayMax THEN
-				RETURN 'out';
-            END IF;
-		END IF;
-	END IF;
-
-	RETURN 'in';
-END$$
-DELIMITER ;

db/routines/vn/procedures/absoluteInventoryHistory.sql

@@ -39,7 +39,7 @@ BEGIN
 						AND vWarehouseFk IN (tr.warehouseInFk, 0)
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
-						AND NOT tr.daysInForward
+						AND NOT tr.isRaid
 				UNION ALL
 				SELECT tr.shipped,
 						NULL,
@@ -58,7 +58,7 @@ BEGIN
 						AND s.id <> (SELECT supplierFk FROM inventoryConfig)
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
-						AND NOT tr.daysInForward
+						AND NOT tr.isRaid
 				UNION ALL
 				SELECT t.shipped,
 						NULL,

db/routines/vn/procedures/available_traslate.sql

@@ -42,7 +42,7 @@ proc: BEGIN
 			WHERE t.landed BETWEEN vDatedInventory AND vDatedFrom
 				AND t.warehouseInFk = vWarehouseLanding
 				AND NOT e.isExcludedFromAvailable
-				AND NOT t.daysInForward
+				AND NOT t.isRaid
 			GROUP BY c.itemFk;
 
 	-- Tabla con el ultimo dia de last_buy para cada producto
@@ -57,7 +57,7 @@ proc: BEGIN
 				JOIN travel tr ON tr.id = e.travelFk
 				LEFT JOIN tItemRange i ON t.itemFk = i.itemFk
 			WHERE t.warehouseFk = vWarehouseShipment
-				AND NOT tr.daysInForward
+				AND NOT tr.isRaid
 	ON DUPLICATE KEY UPDATE tItemRange.dated = GREATEST(tItemRange.dated,
 	tr.landed);
 
@@ -94,7 +94,7 @@ proc: BEGIN
 				JOIN tItemRangeLive ir ON ir.itemFk = b.itemFk
 			WHERE NOT e.isExcludedFromAvailable
 				AND b.quantity <> 0
-				AND NOT t.daysInForward
+				AND NOT t.isRaid
 				AND t.warehouseInFk = vWarehouseLanding
 				AND t.landed >= vDatedFrom
 				AND (ir.dated IS NULL OR t.landed <= ir.dated)

db/routines/vn/procedures/collectionPlacement_get.sql

@@ -83,7 +83,7 @@ BEGIN
 								AND s.semaphore = 1
 							GROUP BY st.saleFk) st ON st.saleFk = ts.saleFk
 				JOIN itemShelving ish ON ish.itemFk = ts.itemFk
-				JOIN shelving sh ON sh.code = ish.shelvingFk
+				JOIN shelving sh ON sh.id = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
 				JOIN sector sc ON sc.id = p.sectorFk
 				JOIN sectorType st ON st.id = sc.typeFk

db/routines/vn/procedures/entry_getTransfer.sql

@@ -166,7 +166,7 @@ BEGIN
 				LEFT JOIN tmp.buyUltimateFromInterval bufi ON bufi.itemFk = i.id
 				LEFT JOIN buy b3 ON b3.id = bufi.buyFk
 		WHERE ic.display
-			AND NOT tr.daysInForward
+			AND NOT tr.isRaid
 			AND (ti.visible OR ti.available)
 			ORDER BY i.typeFk, i.name, i.id, i.size, i.category, o.name;
 

db/routines/vn/procedures/entry_isEditable.sql

@@ -9,16 +9,18 @@ BEGIN
  *
  * @param vSelf Id de entrada
  */
-	DECLARE vIsEditable BOOL;
+	DECLARE vIsNotEditable BOOL DEFAULT FALSE;
 
-	SELECT e.isBooked INTO vIsEditable
+	SELECT TRUE INTO vIsNotEditable
 		FROM `entry` e
-			JOIN entryType et ON et.code = e.typeFk 
-		WHERE NOT et.isInformal
-			AND e.id = vSelf;
+			LEFT JOIN entryType et ON et.code = e.typeFk
+		WHERE e.id = vSelf
+			AND e.isBooked
+			AND (e.typeFk IS NULL OR NOT et.isInformal);
 
-	IF vIsEditable AND NOT IFNULL(@isModeInventory, FALSE) THEN
+	IF vIsNotEditable AND NOT IFNULL(@isModeInventory, FALSE) THEN
 		CALL util.throw(CONCAT('Entry ', vSelf, ' is not editable'));
 	END IF;
+
 END$$
 DELIMITER ;

db/routines/vn/procedures/entry_splitByShelving.sql

@@ -1,10 +1,15 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`entry_splitByShelving`(vShelvingFk VARCHAR(3), vFromEntryFk INT, vToEntryFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`entry_splitByShelving`(
+	vShelvingCode VARCHAR(10),
+	vFromEntryFk INT,
+	vToEntryFk INT
+)
 BEGIN
 /**
- * Divide las compras entre dos entradas de acuerdo con lo ubicado en una matr<EFBFBD>cula
+ * Divide las compras entre dos entradas de
+ * acuerdo con lo ubicado en una matricula.
  * 
- * @param vShelvingFk Identificador de vn.shelving
+ * @param vShelvingCode Código de vn.shelving
  * @param vFromEntryFk Entrada origen
  * @param vToEntryFk Entrada destino
  */
@@ -14,7 +19,7 @@ BEGIN
 	DECLARE vDone BOOLEAN DEFAULT FALSE;
 
 	DECLARE cur CURSOR FOR
-		SELECT 	bb.id buyFk,
+		SELECT bb.id buyFk,
 				LEAST(bb.stickers, FLOOR(ish.visible / ish.packing)) ishStickers,
 				bb.stickers buyStickers
 			FROM itemShelving ish
@@ -23,7 +28,7 @@ BEGIN
 						WHERE b.entryFk = vFromEntryFk
 						ORDER BY b.stickers DESC
 						LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk
-			WHERE ish.shelvingFk = vShelvingFk COLLATE utf8_general_ci
+			WHERE ish.shelvingFk = vShelvingCode COLLATE utf8_general_ci
 				AND NOT ish.isSplit
 			GROUP BY ish.id;
 			
@@ -107,9 +112,10 @@ BEGIN
 			UPDATE buy SET printedStickers = vIshStickers WHERE id = LAST_INSERT_ID();
 		END IF;
 
-		UPDATE itemShelving
-			SET isSplit = TRUE
-				WHERE shelvingFk = vShelvingFk COLLATE utf8_general_ci;
+		UPDATE itemShelving ish
+				JOIN shelving sh ON sh.id = ish.shelvingFk
+			SET ish.isSplit = TRUE
+			WHERE sh.code = vShelvingCode COLLATE utf8_general_ci;
 	END LOOP;
 	CLOSE cur;
 END$$

db/routines/vn/procedures/entry_updateComission.sql

@@ -22,7 +22,7 @@ BEGIN
 			FROM vn.entry e
 				JOIN vn.travel t ON t.id = e.travelFk
 				JOIN vn.warehouse w ON w.id = t.warehouseInFk 
-			WHERE t.shipped >= util.VN_CURDATE()
+			WHERE t.landed >= util.VN_CURDATE()
 				AND e.currencyFk = vCurrency
 				AND NOT e.isBooked;
 

db/routines/vn/procedures/expeditionScan_Put.sql

@@ -4,12 +4,12 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`expeditionScan_Put`(
 	vExpeditionFk INT
 )
 BEGIN
-	IF NOT (SELECT TRUE FROM expedition WHERE id = vExpeditionFk LIMIT 1) THEN
-		CALL util.throw('Expedition not exists');
+	IF NOT EXISTS (SELECT id FROM expeditionPallet WHERE id = vPalletFk) THEN
+		CALL util.throw('Pallet not exists');
 	END IF;
 
-	IF NOT (SELECT TRUE FROM expeditionPallet WHERE id = vPalletFk LIMIT 1) THEN
-		CALL util.throw('Pallet not exists');
+	IF NOT EXISTS (SELECT id FROM expedition WHERE id = vExpeditionFk) THEN
+		CALL util.throw('Expedition not exists');
 	END IF;
 
 	REPLACE expeditionScan(expeditionFk, palletFk)

db/routines/vn/procedures/inventoryMake.sql

@@ -137,7 +137,7 @@ BEGIN
 					JOIN travel tr ON tr.id = e.travelFk
 				WHERE tr.warehouseInFk = vWarehouseFk
 					AND tr.landed BETWEEN vDateLastInventory AND vDateYesterday
-					AND NOT tr.daysInForward
+					AND NOT tr.isRaid
 				GROUP BY b.itemFk;
 
 		-- Transfers
@@ -150,7 +150,7 @@ BEGIN
 							JOIN travel tr ON tr.id = e.travelFk
 						WHERE tr.warehouseOutFk = vWarehouseFk
 							AND tr.shipped BETWEEN vDateLastInventory AND vDateYesterday
-							AND NOT tr.daysInForward
+							AND NOT tr.isRaid
 						GROUP BY b.itemFk
 				) sub
 			ON DUPLICATE KEY UPDATE quantity = IFNULL(quantity, 0) + sub.quantityOut;

db/routines/vn/procedures/invoiceIn_booking.sql

@@ -219,7 +219,7 @@ BEGIN
 						) eWithheld ON TRUE 
 			WHERE tii.taxTypeSageFk IS NOT NULL 
 				AND (tii.taxCode IS NULL OR tii.taxCode NOT IN ('import10', 'import21')) 
-			GROUP BY tii.PorcentajeIva, tii.expenseFk;
+			GROUP BY tii.CuentaIvaRepercutido;
 
 	-- Línea iva inversor sujeto pasivo
  	INSERT INTO XDiario( 
@@ -284,7 +284,7 @@ BEGIN
 				AND NOT(tii.isVies 
 					AND c.nontaxableTransactionTypeFk = tii.transactionTypeSageFk 
 					AND tii.taxCode = 'nonTaxable')
-			GROUP BY tii.PorcentajeIva, tii.expenseFk;
+			GROUP BY tii.CuentaIvaRepercutido;
 		
 	-- Actualización del registro original		
 	UPDATE invoiceIn ii

db/routines/vn/procedures/itemPlacementSupplyAiming.sql

@@ -1,5 +1,9 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemPlacementSupplyAiming`(vShelvingFk VARCHAR(10), quantity INT, vItemFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemPlacementSupplyAiming`(
+    vShelvingCode VARCHAR(10),
+    vQuantity INT,
+    vItemFk INT
+)
 BEGIN
 
 	SELECT 	ish.itemFk,
@@ -9,21 +13,21 @@ BEGIN
 			ish.itemShelvingFk,
             ish.shelving,
             ish.stock,
-            LEAST(ish.stock,quantity) as total,
+            LEAST(ish.stock,vQuantity) total,
             CONCAT(
-					CAST(FLOOR(LEAST(ish.stock,quantity) / ish.packing) AS DECIMAL(10,0)),
+					CAST(FLOOR(LEAST(ish.stock, vQuantity) / ish.packing) AS DECIMAL(10,0)),
                     ' x ',
                     ish.packing,
                     IF	(	
-						LEAST(ish.stock,quantity) MOD ish.packing,
-						CONCAT(' + ',CAST(LEAST(ish.stock,quantity) MOD ish.packing AS DECIMAL(10,0))),
+						LEAST(ish.stock, vQuantity) MOD ish.packing,
+						CONCAT(' + ',CAST(LEAST(ish.stock, vQuantity) MOD ish.packing AS DECIMAL(10,0))),
                         ''
                         ),
                     ' = ',
-                    LEAST(ish.stock,quantity)
-				   ) as proposal
-		FROM vn.itemShelvingPlacementSupplyStock ish
-        WHERE ish.shelving = vShelvingFk COLLATE utf8_general_ci
+                    LEAST(ish.stock, vQuantity)
+				   ) proposal
+		FROM itemShelvingPlacementSupplyStock ish
+        WHERE ish.shelving = vShelvingCode COLLATE utf8_general_ci
 			AND ish.itemFk = vItemFk;
 
 END$$

db/routines/vn/procedures/itemPlacementSupplyGetOrder.sql

@@ -1,5 +1,7 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemPlacementSupplyGetOrder`(vSector INT )
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemPlacementSupplyGetOrder`(
+    vSectorFk INT
+)
 BEGIN
 
 	DECLARE vId INT;
@@ -7,31 +9,35 @@ BEGIN
     DECLARE vNextParkingFk INT;
         
 	SELECT sh.parkingFk INTO vLastParkingFk
-		FROM vn.itemShelvingPlacementSupply isps
-			JOIN vn.itemShelving ish ON ish.id = isps.itemShelvingFk
-            JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+		FROM itemShelvingPlacementSupply isps
+			JOIN itemShelving ish ON ish.id = isps.itemShelvingFk
+            JOIN shelving sh ON sh.id = ish.shelvingFk
         WHERE isps.userFk = getUser()
         ORDER BY isps.created DESC
         LIMIT 1;
     
-    SET vNextParkingFk = vn.itemShelvingPlacementSupply_ClosestGet(vLastParkingFk);
+    SET vNextParkingFk = itemShelvingPlacementSupply_ClosestGet(vLastParkingFk);
     
 	SELECT ipsl.id INTO vId
-		FROM vn.itemPlacementSupplyList ipsl
-			JOIN vn.itemShelvingPlacementSupplyStock ispss ON ispss.itemFk = ipsl.itemFk
+		FROM itemPlacementSupplyList ipsl
+			JOIN itemShelvingPlacementSupplyStock ispss ON ispss.itemFk = ipsl.itemFk
 		WHERE ipsl.saldo > 0
 			AND (ipsl.repoUserFk is NULL OR ipsl.repoUserFk = getUser())
-            AND ipsl.sectorFk = vSector
-         ORDER BY  ipsl.repoUserFk DESC, ipsl.priority DESC, (ispss.parkingFk = vNextParkingFk) DESC, ispss.parking DESC, ipsl.created
+            AND ipsl.sectorFk = vSectorFk
+         ORDER BY ipsl.repoUserFk DESC,
+            ipsl.priority DESC,
+            (ispss.parkingFk = vNextParkingFk) DESC,
+            ispss.parking DESC,
+            ipsl.created
         LIMIT 1;
         
-    UPDATE vn.itemPlacementSupply
+    UPDATE itemPlacementSupply
 		SET repoUserFk = getUser()
         WHERE id = vId;
         
-    SELECT * FROM vn.itemPlacementSupplyList 
+    SELECT * FROM itemPlacementSupplyList 
 		WHERE id = vId 
-		AND sectorFk = vSector;
+		    AND sectorFk = vSectorFk;
 
 END$$
 DELIMITER ;

db/routines/vn/procedures/itemPlacementSupplyStockGetTargetList.sql

@@ -1,5 +1,8 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemPlacementSupplyStockGetTargetList`(vItemFk INT,vSectorFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemPlacementSupplyStockGetTargetList`(
+	vItemFk INT,
+	vSectorFk INT
+)
 BEGIN
 /**
  * Devuelve la lista de ubicaciones para itemFk en ese sector. Se utiliza en la preparación previa.
@@ -13,11 +16,11 @@ BEGIN
 			SUM(ish.visible) stockTotal,
 			ish.created,
 			p.pickingOrder
-		FROM vn.itemShelving ish
-			JOIN vn.shelving sh ON sh.code = ish.shelvingFk
-			JOIN vn.parking p ON p.id = sh.parkingFk
-			JOIN vn.sector sc ON sc.id = p.sectorFk
-			JOIN vn.warehouse w ON w.id = sc.warehouseFk
+		FROM itemShelving ish
+			JOIN shelving sh ON sh.id = ish.shelvingFk
+			JOIN parking p ON p.id = sh.parkingFk
+			JOIN sector sc ON sc.id = p.sectorFk
+			JOIN warehouse w ON w.id = sc.warehouseFk
 		WHERE ish.visible > 0
 			AND ish.itemFk = vItemFk
 		GROUP BY ish.id

db/routines/vn/procedures/itemShelvingLog_get.sql

@@ -1,14 +1,14 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingLog_get`(vShelvingFk VARCHAR(10) )
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingLog_get`(
+	vShelvingCode VARCHAR(10)
+)
 BEGIN
-	
 /**
  * Devuelve el log de los item en cada carro
  *
- * @param vShelvingFk Matrícula del carro 
+ * @param vShelvingCode Matrícula del carro 
  * 
  */
-	
 	SELECT isl.itemShelvingFk, 
 			isl.created, 
 			isl.accion, 
@@ -28,8 +28,9 @@ BEGIN
 	FROM item 
 		JOIN itemShelvingLog isl ON item.id = isl.itemFk 
 		JOIN worker ON isl.workerFk = worker.id
-	WHERE shelvingFk = vShelvingFk OR isl.itemFk = vShelvingFk
-		ORDER BY isl.created DESC;
-	
+		JOIN shelving sh ON sh.id = isl.shelvingFk
+	WHERE sh.code = vShelvingCode COLLATE utf8mb3_unicode_ci
+		OR isl.itemFk = vShelvingCode -- ?? Respeto porque ya estaba
+	ORDER BY isl.created DESC;
 END$$
 DELIMITER ;

db/routines/vn/procedures/itemShelvingMatch.sql

@@ -20,7 +20,7 @@ BEGIN
 		LEFT JOIN (
 					SELECT itemFk, sum(cast(visible / packing AS DECIMAL(10,0))) AS etiquetas 
 						FROM itemShelving ish
-							JOIN shelving sh ON sh.code = ish.shelvingFk
+							JOIN shelving sh ON sh.id = ish.shelvingFk
                             LEFT JOIN parking pk ON pk.id = sh.parkingFk
 						WHERE ish.created BETWEEN vFromTimed AND vToTimed
 						GROUP BY itemFk

db/routines/vn/procedures/itemShelvingSale_addBySale.sql

@@ -27,7 +27,7 @@ proc: BEGIN
 				ish.available
 			FROM sale s
 				JOIN itemShelving ish ON ish.itemFk = s.itemFk
-				JOIN shelving sh ON sh.code = ish.shelvingFk
+				JOIN shelving sh ON sh.id = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
 				JOIN sector sc ON sc.id = p.sectorFk
 				JOIN productionConfig pc
@@ -61,7 +61,7 @@ proc: BEGIN
 		FROM sale s
 			LEFT JOIN itemShelvingSale iss ON iss.saleFk = s.id
 			LEFT JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-			LEFT JOIN shelving sh ON sh.code = ish.shelvingFk
+			LEFT JOIN shelving sh ON sh.id = ish.shelvingFk
 			LEFT JOIN parking p ON p.id = sh.parkingFk
 		WHERE s.id = vSaleFk;
 		

db/routines/vn/procedures/itemShelvingSale_setQuantity.sql

@@ -3,7 +3,8 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingSale_setQ
 	vItemShelvingSaleFk INT(10),
 	vQuantity DECIMAL(10,0),
 	vIsItemShelvingSaleEmpty BOOLEAN,
-	vSectorFk INT
+	vSectorFk INT,
+	vShelvingFk VARCHAR(10)
 )
 BEGIN
 /**
@@ -24,6 +25,7 @@ BEGIN
 	DECLARE vItemFk INT;
 	DECLARE vTotalQuantity INT;
 	DECLARE vStateCode VARCHAR(45);
+	DECLARE vCurrentShelvingFk VARCHAR(10);
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 		BEGIN
@@ -45,18 +47,26 @@ BEGIN
 			iss.saleFk, 
 			iss.itemShelvingFk, 
 			SUM(IFNULL(iss.quantity,0)), 
-			IF(sgd.id, 'PREVIOUS_PREPARATION', 'PREPARED')
+			IF(sgd.id, 'PREVIOUS_PREPARATION', 'PREPARED'),
+			sh.code
 		INTO vItemFk, 
 			vSaleFk, 
 			vItemShelvingFk, 
 			vReservedQuantity, 
-			vStateCode
+			vStateCode,
+			vCurrentShelvingFk
 		FROM itemShelvingSale iss
 			JOIN sale s ON s.id = iss.saleFk
-			LEFT JOIN vn.saleGroupDetail sgd ON sgd.saleFk = iss.saleFk
+			JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+			LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = iss.saleFk
+			LEFT JOIN shelving sh ON sh.id = ish.shelvingFk
 		WHERE iss.id = vItemShelvingSaleFk
 			AND NOT iss.isPicked;
 
+	IF NOT (vCurrentShelvingFk <=> vShelvingFk) THEN
+		CALL util.throw('The shelving can not be different from the shelving reserved');
+	END IF;
+
 	IF vQuantity > vReservedQuantity 
 		OR (vQuantity < vReservedQuantity AND NOT vIsItemShelvingSaleEmpty)
 		OR (vQuantity = vReservedQuantity AND vIsItemShelvingSaleEmpty) THEN

db/routines/vn/procedures/itemShelving_add.sql

@@ -1,6 +1,6 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_add`(
-	vShelvingFk VARCHAR(8),
+	vShelvingCode VARCHAR(10),
 	vBarcode VARCHAR(22),
 	vQuantity INT,
 	vPackagingFk VARCHAR(10),
@@ -12,7 +12,7 @@ BEGIN
 /**
  * Añade registro o lo actualiza si ya existe.
  *
- * @param vShelvingFk matrícula del carro
+ * @param vShelvingCode matrícula del carro
  * @param vBarcode el id del registro
  * @param vQuantity indica la cantidad del producto
  * @param vPackagingFk el packaging del producto en itemShelving, NULL para coger el de la ultima compra
@@ -23,10 +23,15 @@ BEGIN
  **/
 	DECLARE vItemFk INT;
 	DECLARE vBuyFk INT;
+	DECLARE vShelvingFk INT;
 
 	SELECT id INTO vBuyFk 
 		FROM buy WHERE id = vBarcode;
 
+	SELECT id INTO vShelvingFk
+		FROM shelving
+		WHERE code COLLATE utf8_unicode_ci = vShelvingCode;
+
 	SELECT barcodeToItem(vBarcode) INTO vItemFk;
 
 	IF vBuyFk IS NULL THEN
@@ -40,7 +45,7 @@ BEGIN
 	END IF;
 
 	IF (SELECT COUNT(*) FROM itemShelving
-			WHERE shelvingFk COLLATE utf8_unicode_ci  = vShelvingFk
+			WHERE shelvingFk = vShelvingFk
 				AND itemFk  = vItemFk
 				AND packing  = vPacking
 				AND buyFk = vBuyFk) THEN
@@ -48,7 +53,9 @@ BEGIN
 		UPDATE itemShelving
 			SET visible = visible + vQuantity,
 				available = available + vQuantity
-			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking;
+			WHERE shelvingFk = vShelvingFk
+				AND itemFk = vItemFk
+				AND packing = vPacking;
 
 	ELSE
 

db/routines/vn/procedures/itemShelving_addByClaim.sql

@@ -1,29 +1,38 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_addByClaim`(vClaimFk INT, vShelvingFk VARCHAR(3))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_addByClaim`(
+	vClaimFk INT,
+	vShelvingCode VARCHAR(10)
+)
 BEGIN
 /**
  * Insert items of claim into itemShelving.
  *
  * @param vClaimFk The claim
- * @param vShelvingFk The shelving
+ * @param vShelvingCode The shelving code
  * @table tmp.buyUltimate
  */
 	DECLARE vWarehouseFk INT;
+	DECLARE vShelvingFk INT;
 
 	SELECT t.warehouseFk INTO vWarehouseFk
 		FROM claim c
 			JOIN ticket t ON t.id = c.ticketFk
 		WHERE c.id = vClaimFk;
 
+	SELECT id INTO vShelvingFk
+		FROM shelving
+		WHERE code COLLATE utf8_unicode_ci = vShelvingCode;
+
 	CALL buy_getUltimate(NULL, vWarehouseFk, util.VN_CURDATE());
 
 	INSERT INTO itemShelving (itemFk, shelvingFk, packing, `grouping`, visible)
-		SELECT s.itemFk, vShelvingFk, b.packing, b.`grouping`, cb.quantity AS visible
+		SELECT s.itemFk, vShelvingFk, b.packing, b.`grouping`, cb.quantity visible
 			FROM claim c
 				JOIN claimBeginning cb ON c.id = cb.claimFk
 				JOIN sale s ON s.id = cb.saleFk
 				JOIN ticket t ON t.id = s.ticketFk
-				JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk AND bu.warehouseFk = t.warehouseFk
+				JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
+					AND bu.warehouseFk = t.warehouseFk
 				JOIN buy b ON b.id = bu.buyFk
 			WHERE c.id = vClaimFk;
 END$$

db/routines/vn/procedures/itemShelving_addList.sql

@@ -1,6 +1,6 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_addList`(
-	vShelvingFk VARCHAR(3),
+	vShelvingCode VARCHAR(10),
 	vList TEXT,
 	vIsChecking BOOL,
 	vWarehouseFk INT
@@ -13,7 +13,7 @@ BEGIN
  * Cuando es TRUE sólo inserta los elementos de la colección que no están ya en
  * ese shelving, actualizando los valores del campo itemShelving.isChecked
  *
- * @param vShelvingFk Identificador de shelving
+ * @param vShelvingCode Código de shelving
  * @param vList JSON array con esta estructura: '[value1, value2, ...]'
  * @param vIsChecking Define si hay que añadir o comprobar los items
  * @param vWarehouseFk Identificador de warehouse
@@ -24,6 +24,11 @@ BEGIN
 	DECLARE vPath VARCHAR(6);
 	DECLARE vItemFk INT;
 	DECLARE vIsChecked BOOL;
+	DECLARE vShelvingFk INT;
+
+	SELECT id INTO vShelvingFk
+		FROM shelving
+		WHERE code COLLATE utf8_unicode_ci = vShelvingCode;
 
 	WHILE vCounter < vListLength DO
 		SET vPath = CONCAT('$[', vCounter, ']');
@@ -34,17 +39,17 @@ BEGIN
 
 			SELECT IF(COUNT(*), TRUE, FALSE) INTO vIsChecked
 				FROM itemShelving
-				WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk
+				WHERE shelvingFk = vShelvingFk
 					AND itemFk = vItemFk;
 		END IF;
 
 		IF NOT vIsChecking OR NOT vIsChecked THEN
-			CALL itemShelving_add(vShelvingFk, vBarcode, 1, NULL, NULL, NULL, vWarehouseFk);
+			CALL itemShelving_add(vShelvingCode, vBarcode, 1, NULL, NULL, NULL, vWarehouseFk);
 		END IF;
 
 		UPDATE itemShelving
 			SET isChecked = vIsChecked
-			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk
+			WHERE shelvingFk = vShelvingFk
 				AND itemFk = vItemFk
 				AND isChecked IS NULL;
 

db/routines/vn/procedures/itemShelving_get.sql

@@ -1,10 +1,12 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_get`(IN vSelf VARCHAR(8))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_get`(
+	vShelvingCode VARCHAR(10)
+)
 BEGIN
 /**
-* Lista artículos de itemshelving 
+* Lista artículos de itemShelving.
 *
-* @param vSelf matrícula del carro
+* @param vShelvingCode Matrícula del carro
 **/
 	SELECT ish.itemFk item, 
 			i.name, 
@@ -19,12 +21,13 @@ BEGIN
 			ish.isChecked,
 			ic.url,
 			ish.available,
-			ish.buyFk
+			ish.buyFk,
+			ish.shelvingFk
 		FROM itemShelving ish
 			JOIN item i ON i.id = ish.itemFk
-			JOIN shelving s ON vSelf = s.code COLLATE utf8_unicode_ci
-			LEFT JOIN parking p ON s.parkingFk = p.id
+			JOIN shelving s ON s.id = ish.shelvingFk
+			LEFT JOIN parking p ON p.id = s.parkingFk
 			JOIN hedera.imageConfig ic
-		WHERE ish.shelvingFk COLLATE utf8_unicode_ci = vSelf;
+		WHERE s.code COLLATE utf8_unicode_ci = vShelvingCode;
 END$$
 DELIMITER ;

db/routines/vn/procedures/itemShelving_getAlternatives.sql

@@ -1,21 +1,31 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_getAlternatives`(vShelvingFk VARCHAR(10))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_getAlternatives`(
+	vShelvingCode VARCHAR(10)
+)
 BEGIN
 /**
- * Devuelve un listado de posibles ubicaciones alternativas a ubicar los item de la matricula
- * del carro que se le ha pasado.
+ * Devuelve un listado de posibles ubicaciones alternativas a ubicar
+ * los item de la matricula del carro que se le ha pasado.
  *
- * @param vShelvingFk matricula del carro
+ * @param vShelvingCode Matricula del carro
  */
-	SELECT is2.id,is2.shelvingFk , p.code, is2.itemFk , is2.visible, p.pickingOrder 
+	DECLARE vShelvingFk INT;
+
+	SELECT id INTO vShelvingFk
+		FROM shelving
+		WHERE code COLLATE utf8_unicode_ci = vShelvingCode;
+
+	SELECT is2.id,is2.shelvingFk, p.code, is2.itemFk , is2.visible, p.pickingOrder 
 		FROM itemShelving is2
-			JOIN shelving sh ON sh.code = is2.shelvingFk
+			JOIN shelving sh ON sh.id = is2.shelvingFk
 			JOIN parking p ON p.id = sh.parkingFk
 			JOIN sector s ON s.id = p.sectorFk
-			LEFT JOIN operator o ON  o.sectorFk = s.id AND o.workerFk = account.myUser_getId()
+			LEFT JOIN operator o ON  o.sectorFk = s.id
+				AND o.workerFk = account.myUser_getId()
 			JOIN warehouse wh ON wh.id = s.warehouseFk
-			JOIN itemShelving is3 ON is3.itemFk = is2.itemFk AND is3.shelvingFk = vShelvingFk COLLATE utf8_unicode_ci
-		WHERE is2.shelvingFk <> vShelvingFk COLLATE utf8_unicode_ci
+			JOIN itemShelving is3 ON is3.itemFk = is2.itemFk
+				AND is3.shelvingFk = vShelvingFk
+		WHERE is2.shelvingFk <> vShelvingFk
 		GROUP BY is2.id
 		ORDER BY p.pickingOrder DESC;
 END$$

db/routines/vn/procedures/itemShelving_getInfo.sql

@@ -16,7 +16,7 @@ BEGIN
 			ish.itemFk itemFk,
 			sh.priority
 		FROM vn.itemShelving ish
-			JOIN vn.shelving sh ON sh.`code` = ish.shelvingFk
+			JOIN vn.shelving sh ON sh.id = ish.shelvingFk
 			JOIN vn.parking pk ON pk.id = sh.parkingFk
 		WHERE ish.itemFk = vItemFk
 		ORDER BY sh.priority DESC, created ASC;

db/routines/vn/procedures/itemShelving_getItemDetails.sql

@@ -1,14 +1,14 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_getItemDetails`(
 	vBarcodeItem INT, 
-	vShelvingFK VARCHAR(10) 
+	vShelvingCode VARCHAR(10) 
 )
 BEGIN
 /**
  * Obtiene el precio y visible de un item
  *
  * @param vBarcodeItem barcode de artículo
- * @param vShelvingFK Ubicación actual del artículo
+ * @param vShelvingCode Ubicación actual del artículo
  */
 	DECLARE vIsItem BOOL;
 	DECLARE vBuyFk INT;
@@ -38,18 +38,19 @@ BEGIN
 	WITH visible AS(
 		SELECT itemFk,
 				IFNULL(buyingValue, 0) +
-							IFNULL(freightValue, 0) +
-							IFNULL(comissionValue, 0) +
-							IFNULL(packageValue, 0) itemCost
+					IFNULL(freightValue, 0) +
+					IFNULL(comissionValue, 0) +
+					IFNULL(packageValue, 0) itemCost
 			FROM vn.buy b
 			WHERE b.id = vBuyFk
 	) SELECT v.itemFk,
-			vShelvingFK,
+			vShelvingCode,
 			v.itemCost,
 			SUM(ish.visible) visible
 		FROM vn.itemShelving ish
+			JOIN vn.shelving sh ON sh.id = ish.shelvingFK
 			JOIN visible v
-		WHERE ish.shelvingFK = vShelvingFK COLLATE utf8mb3_general_ci
-				AND ish.itemFk = v.itemFk;
+		WHERE sh.code = vShelvingCode COLLATE utf8mb3_general_ci
+			AND ish.itemFk = v.itemFk;
 END$$
 DELIMITER ;

db/routines/vn/procedures/itemShelving_getSaleDate.sql

@@ -1,14 +1,20 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_getSaleDate`(vShelvingFk VARCHAR(3))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_getSaleDate`(
+	vShelvingCode VARCHAR(10)
+)
 BEGIN
-	
-	/* Devuelve la mínima fecha en que se necesita cada producto en esa matrícula.	
-	 * 
-	 *  @param vShelvingFk Matrícula del carro o pallet
-	 */
-
+/**
+ * Devuelve la mínima fecha en que se necesita cada producto en esa matrícula.	
+ * 
+ * @param vShelvingCode Matrícula del carro o pallet
+ */
 	DECLARE vWarehouseFk INT;
 	DECLARE vStockScopeDays INT;
+	DECLARE vShelvingFk INT;
+
+	SELECT id INTO vShelvingFk
+		FROM shelving
+		WHERE code COLLATE utf8_unicode_ci = vShelvingCode;
 
 	SELECT s.warehouseFk, stockScopeDays
 			INTO vWarehouseFk, vStockScopeDays
@@ -30,7 +36,7 @@ BEGIN
 			ENGINE = MEMORY
 			SELECT itemFk, SUM(visible) visible
 				FROM itemShelving
-				WHERE shelvingFk = vShelvingFk COLLATE utf8_unicode_ci
+				WHERE shelvingFk = vShelvingFk
 				GROUP BY itemFk;
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.tStockByDay
@@ -52,7 +58,7 @@ BEGIN
 									SELECT ish.itemFk, - SUM(ish.visible), util.VN_CURDATE()
 										FROM itemShelving ish 
 											JOIN tmp.tItems i ON i.itemFk = ish.itemFk
-											JOIN shelving sh ON sh.code = ish.shelvingFk 
+											JOIN shelving sh ON sh.id = ish.shelvingFk 
 											JOIN parking p ON sh.parkingFk = p.id 
 											JOIN sector s ON s.id = p.sectorFk
 										WHERE s.isReserve 
@@ -110,7 +116,7 @@ BEGIN
 		UPDATE tmp.tStockByDay sbd
 			JOIN (SELECT ish.itemFK, SUM(ish.visible) amount 
 						FROM itemShelving ish
-							JOIN shelving sh ON sh.code = ish.shelvingFk
+							JOIN shelving sh ON sh.id = ish.shelvingFk
 							JOIN parking p ON p.id = sh.parkingFk
 							JOIN sector s ON s.id = p.sectorFk
 						WHERE s.warehouseFk = vWarehouseFk
@@ -150,10 +156,10 @@ BEGIN
 								p.sectorFk,
 								ish.shelvingFk
 							FROM itemShelving ish
-								JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+								JOIN vn.shelving sh ON sh.id = ish.shelvingFk
 								LEFT JOIN parking p ON p.id = parkingFk
 								LEFT JOIN vn.sector s ON s.id = p.sectorFk
-							WHERE ish.shelvingFk = vShelvingFk COLLATE utf8_unicode_ci
+							WHERE ish.shelvingFk = vShelvingFk
 					) sub4 ON sub4.itemFk = ts.itemFk
 					LEFT JOIN sector s ON s.id = sub4.sectorFk
 					LEFT JOIN item i ON i.id = ts.itemFk

db/routines/vn/procedures/itemShelving_inventory.sql

@@ -42,7 +42,7 @@ BEGIN
 			JOIN item i ON i.id = ish.itemFk
 			JOIN itemType it ON it.id = i.typeFk
 			JOIN tmp.stockMisfit sm ON sm.itemFk = ish.itemFk
-			JOIN shelving sh ON sh.code = ish.shelvingFk
+			JOIN shelving sh ON sh.id = ish.shelvingFk
 			JOIN parking p ON p.id = sh.parkingFk
 			LEFT JOIN (
 				SELECT s.itemFk, sum(s.quantity) notPrepared

db/routines/vn/procedures/itemShelving_selfConsumption.sql

@@ -1,6 +1,6 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_selfConsumption`(
-	vShelvingFk VARCHAR(10) COLLATE utf8_general_ci, 
+	vShelvingCode VARCHAR(10) COLLATE utf8_general_ci, 
 	vItemFk INT, 
 	vQuantity INT
 )
@@ -9,9 +9,9 @@ BEGIN
  * Leave the indicated amount on the shelve
  * and create a ticket with the difference.
  * 
- * @param vShelvingFk id of the shelve where the item is located.
- * @param vItemFk article of which the self-consumption ticket is to be created.
- * @param vQuantity amount that will stay on the shelve
+ * @param vShelvingCode Code of the shelve where the item is located
+ * @param vItemFk Item of which the self-consumption ticket is to be created
+ * @param vQuantity Amount that will stay on the shelve
  */
 	DECLARE vVisible INT;
 	DECLARE vClientFk INT;
@@ -21,6 +21,11 @@ BEGIN
 	DECLARE vAgencyModeFk INT;
 	DECLARE vItemShelvingFk INT;
 	DECLARE vAddressFk INT;
+	DECLARE vShelvingFk INT;
+
+	SELECT id INTO vShelvingFk
+		FROM shelving
+		WHERE code = vShelvingCode;
 
 	SELECT c.id,
 			pc.clientSelfConsumptionFk,
@@ -37,7 +42,7 @@ BEGIN
 			JOIN parking p ON p.sectorFk = s.id
 			JOIN shelving s2 ON s2.parkingFk = p.id
 			JOIN productionConfig pc
-		WHERE s2.code = vShelvingFk;
+		WHERE s2.id = vShelvingFk;
 
 	IF vClientFk IS NULL THEN
 		CALL util.throw('The company does not have a customer assigned');
@@ -47,7 +52,7 @@ BEGIN
 		CALL util.throw('The shelf cannot have NULL or negative quantities');
 	END IF;
 
-	IF vShelvingFk IS NULL THEN
+	IF vShelvingCode IS NULL THEN
 		CALL util.throw('The shelf is necessary');
 	END IF;
 

db/routines/vn/procedures/itemShelving_transfer.sql

@@ -1,7 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelving_transfer`(
 	vItemShelvingFk INT, 
-	vShelvingFk VARCHAR(10)
+	vShelvingCode VARCHAR(10)
 )
 BEGIN
 /**
@@ -9,9 +9,14 @@ BEGIN
  * fusionando si coincide el packing y la fecha.
  *
  * @param vItemShelvingFk Identificador de itemShelving
- * @param vShelvingFk Identificador de shelving
+ * @param vShelvingCode Código de shelving
  */
 	DECLARE vNewItemShelvingFk INT;
+	DECLARE vShelvingFk INT;
+
+	SELECT id INTO vShelvingFk
+		FROM shelving
+		WHERE code COLLATE utf8_unicode_ci = vShelvingCode;
 
 	SELECT MAX(ish.id) INTO vNewItemShelvingFk
 		FROM itemShelving ish
@@ -26,7 +31,7 @@ BEGIN
 				AND ish2.packing = ish.packing
 				AND DATE(ish2.created) = DATE(ish.created)
 				AND ish2.buyFk = ish.buyFk
-		WHERE ish.shelvingFk = vShelvingFk COLLATE utf8_unicode_ci;
+		WHERE ish.shelvingFk = vShelvingFk;
 
 	IF vNewItemShelvingFk THEN
 		UPDATE itemShelving ish
@@ -38,9 +43,7 @@ BEGIN
 		DELETE FROM itemShelving
 			WHERE id = vItemShelvingFk;
 	ELSE
-		IF (SELECT EXISTS(SELECT id FROM shelving
-			WHERE code = vShelvingFk COLLATE utf8_unicode_ci)) THEN
-
+		IF (SELECT EXISTS(SELECT id FROM shelving WHERE id = vShelvingFk)) THEN
 			UPDATE itemShelving
 				SET shelvingFk = vShelvingFk
 				WHERE id = vItemShelvingFk;

db/routines/vn/procedures/item_devalueA2.sql

@@ -1,7 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_devalueA2`(
 	vSelf INT, 
-	vShelvingFK VARCHAR(10), 
+	vShelvingCode VARCHAR(10) COLLATE utf8mb3_general_ci, 
 	vBuyingValue DECIMAL(10,4),
 	vQuantity INT
 )
@@ -12,7 +12,7 @@ BEGIN
  * de almacén y shelvings correspondientes
  *
  * @param vSelf Id de artículo a devaluar
- * @param vShelvingFK Ubicación actual del artículo
+ * @param vShelvingCode Código de shelving / ubicación
  * @param vBuyingValue Nuevo precio de coste
  * @param vQuantity Cantidad del ítem a pasar a A2
  */
@@ -109,10 +109,11 @@ BEGIN
 		CALL util.throw ('The item has not a buy');
 	END IF;
 
-	SELECT id,visible INTO vTargetItemShelvingFk, vCurrentVisible
-		FROM itemShelving
-		WHERE shelvingFk = vShelvingFK COLLATE utf8mb3_general_ci
-			AND itemFk = vSelf
+	SELECT ish.id, ish.visible INTO vTargetItemShelvingFk, vCurrentVisible
+		FROM itemShelving ish
+			JOIN shelving sh ON sh.id = ish.shelvingFk
+		WHERE sh.code = vShelvingCode
+			AND ish.itemFk = vSelf
 		LIMIT 1;
 	
 	IF vCurrentVisible IS NULL THEN
@@ -388,16 +389,17 @@ BEGIN
 			userFk, 
 			isChecked) 
 		SELECT vItemA2Fk, 
-				shelvingFk, 
+				ish.shelvingFk, 
 				vQuantity ,
-				`grouping`, 
-				packing, 
-				packagingFk, 
+				ish.`grouping`, 
+				ish.packing, 
+				ish.packagingFk, 
 				account.myUser_getId(), 
-				isChecked
-			FROM itemShelving
-			WHERE itemFK = vSelf
-				AND shelvingFk = vShelvingFK COLLATE utf8mb3_general_ci
+				ish.isChecked
+			FROM itemShelving ish
+				JOIN shelving sh ON sh.id = ish.shelvingFk
+			WHERE ish.itemFK = vSelf
+				AND sh.code = vShelvingCode
 			ON DUPLICATE KEY UPDATE 
 				visible = vQuantity + VALUES(visible);
 

db/routines/vn/procedures/item_getBalance.sql

@@ -59,7 +59,7 @@ BEGIN
 					AND (s.id <> vSupplierInventoryFk OR vDated IS NULL)
 					AND b.itemFk = vItemFk
 					AND NOT e.isExcludedFromAvailable
-					AND NOT tr.daysInForward
+					AND NOT tr.isRaid
 		),
 		entriesOut AS (
 			SELECT 'entry',
@@ -95,7 +95,7 @@ BEGIN
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
 						AND NOT w.isFeedStock
-						AND NOT tr.daysInForward
+						AND NOT tr.isRaid
 		),
 		sales AS (
 			WITH itemSales AS (

db/routines/vn/procedures/item_getMinacum.sql

@@ -63,7 +63,7 @@ BEGIN
 						AND NOT e.isExcludedFromAvailable
 						AND b.quantity <> 0
 						AND (vItemFk IS NULL OR b.itemFk = vItemFk)
-						AND NOT t.daysInForward
+						AND NOT t.isRaid
 				UNION ALL
 				SELECT r.itemFk,
 						r.shipment,

db/routines/vn/procedures/item_multipleBuyByDate.sql

@@ -30,7 +30,7 @@ BEGIN
 			AND NOT s.name = 'INVENTARIO'
 			AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
 			AND w.isComparative
-			AND NOT t.daysInForward
+			AND NOT t.isRaid
 		GROUP BY i.id;
 
 	UPDATE tmp.itemInventory y

db/routines/vn/procedures/item_valuateInventory.sql

@@ -109,7 +109,7 @@ BEGIN
 				JOIN warehouse w ON w.id = tr.warehouseInFk
 			WHERE tr.landed BETWEEN vInventoried AND vDateDayEnd
 				AND IF(tr.landed = util.VN_CURDATE(), tr.isReceived, TRUE)
-				AND NOT tr.daysInForward
+				AND NOT tr.isRaid
 				AND w.valuatedInventory
 				AND t.isInventory
 				AND e.supplierFk <> vInventorySupplierFk
@@ -131,7 +131,7 @@ BEGIN
 				JOIN itemCategory ic ON ic.id = t.categoryFk
 				JOIN warehouse w ON w.id = tr.warehouseOutFk
 			WHERE tr.shipped BETWEEN vInventoried AND vDateDayEnd
-				AND NOT tr.daysInForward
+				AND NOT tr.isRaid
 				AND w.valuatedInventory
 				AND t.isInventory
 				AND (t.id = vItemTypeFk OR vItemTypeFk IS NULL)
@@ -196,7 +196,7 @@ BEGIN
 				JOIN warehouse wIn ON wIn.id = tr.warehouseInFk
 				JOIN warehouse wOut ON wOut.id = tr.warehouseOutFk
 			WHERE vDated >= tr.shipped AND vDated < tr.landed
-				AND NOT tr.daysInForward
+				AND NOT tr.isRaid
 				AND wIn.valuatedInventory
 				AND t.isInventory
 				AND e.isConfirmed

db/routines/vn/procedures/multipleInventory.sql

@@ -60,7 +60,7 @@ proc: BEGIN
 						AND IFNULL(vWarehouseFk, t.warehouseInFk) = t.warehouseInFk
 						AND w.isComparative
 						AND NOT e.isExcludedFromAvailable
-						AND NOT t.daysInForward
+						AND NOT t.isRaid
 				UNION ALL
 				SELECT b.itemFk, - b.quantity
 					FROM buy b
@@ -71,7 +71,7 @@ proc: BEGIN
 						AND IFNULL(vWarehouseFk, t.warehouseOutFk) = t.warehouseOutFk
 						AND w.isComparative
 						AND NOT e.isExcludedFromAvailable
-						AND NOT t.daysInForward
+						AND NOT t.isRaid
 			) sub
 			GROUP BY itemFk;
 
@@ -121,7 +121,7 @@ proc: BEGIN
 						AND IFNULL(vWarehouseFk, t.warehouseInFk) = t.warehouseInFk
 						AND w.isComparative
 						AND NOT e.isExcludedFromAvailable
-						AND NOT t.daysInForward
+						AND NOT t.isRaid
 				UNION ALL
 				SELECT b.itemFk, t.shipped, - b.quantity
 					FROM buy b
@@ -132,7 +132,7 @@ proc: BEGIN
 						AND IFNULL(vWarehouseFk, t.warehouseOutFk) = t.warehouseOutFk
 						AND w.isComparative
 						AND NOT e.isExcludedFromAvailable
-						AND NOT t.daysInForward
+						AND NOT t.isRaid
 			) sub
 			GROUP BY sub.itemFk, sub.dated;
 

db/routines/vn/procedures/productionControl.sql

@@ -217,7 +217,7 @@ proc: BEGIN
 				st.code = 'previousPrepared' isPreviousPrepared,
 				sc.itemPackingTypeFk
 			FROM itemShelving ish
-				JOIN shelving sh ON sh.code = ish.shelvingFk
+				JOIN shelving sh ON sh.id = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
 				JOIN sector sc ON sc.id = p.sectorFk
 				JOIN sectorType st ON st.id = sc.typeFk

db/routines/vn/procedures/route_calcCommission.sql

@@ -11,6 +11,8 @@ BEGIN
  */
 	DECLARE vIsUpdatable, vIsFreelance BOOL DEFAULT 0;
 	DECLARE vAgencyModePricePercentage DOUBLE;
+	DECLARE vIsKmTruckRate BOOL;
+	DECLARE vCountryFk INT;
 
 	SELECT r.created >= rc.cutoffDated INTO vIsUpdatable
 		FROM route r
@@ -21,10 +23,16 @@ BEGIN
 		DELETE FROM routeCommission
 			WHERE routeFk = vSelf;
 
-		SELECT w.isFreelance INTO vIsFreelance
+		SELECT w.isFreelance, v.isKmTruckRate, c.countryFk INTO vIsFreelance, vIsKmTruckRate, vCountryFk
 			FROM route r
 				JOIN worker w ON w.id = r.workerFk
-			WHERE r.id = vSelf;
+				JOIN vehicle v ON v.id = r.vehicleFk
+				LEFT JOIN ticket t ON t.routeFk = r.id
+				LEFT JOIN client c ON c.id = t.clientFk
+			WHERE r.id = vSelf
+			GROUP BY c.countryFk
+			ORDER BY COUNT(*) DESC
+			LIMIT 1;
 
 		SELECT ampp.percentage INTO vAgencyModePricePercentage
 			FROM route r
@@ -39,7 +47,9 @@ BEGIN
 					workCenterFk,
 					freelanceYearlyM3,
 					cat4m3,
-					cat5m3
+					cat5m3,
+					isKmTruckRate,
+					countryFk
 				)
 				SELECT vSelf,
 						r.commissionWorkCenterFk,
@@ -51,11 +61,14 @@ BEGIN
 							IFNULL(r.m3, 0),
 							0
 						),
-						rc.distributionCat4M3 * IFNULL(r.m3, 0),
-						rc.distributionCat5M3 * IFNULL(r.m3, 0)
+						IFNULL(wc.distributionCat4M3, rc.distributionCat4M3) * IFNULL(r.m3, 0),
+						IFNULL(wc.distributionCat5M3, rc.distributionCat5M3) * IFNULL(r.m3, 0),
+						vIsKmTruckRate,
+						vCountryFk
 					FROM route r
 						JOIN vehicle v ON v.id = r.vehicleFk
 						JOIN routeConfig rc
+						LEFT JOIN workCenterCommission wc ON wc.workCenter = r.workCenterFk
 					WHERE r.id = vSelf
 						AND r.workerFk
 						AND r.commissionWorkCenterFk;
@@ -68,7 +81,9 @@ BEGIN
 					yearlyKm,
 					yearlyM3,
 					cat4m3,
-					cat5m3
+					cat5m3,
+					isKmTruckRate,
+					countryFk
 				)
 				SELECT vSelf,
 						r.commissionWorkCenterFk,
@@ -78,11 +93,14 @@ BEGIN
 							IF(v.isKmTruckRate, rc.deliveryM3Cat5, rc.deliveryM3Cat4),
 						(r.kmEnd - r.kmStart) * rc.kmYearly,
 						IFNULL(r.m3, 0) * rc.m3Yearly,
-						rc.distributionCat4M3 * IFNULL(r.m3, 0),
-						rc.distributionCat5M3 * IFNULL(r.m3, 0)
+						IFNULL(wc.distributionCat4M3, rc.distributionCat4M3) * IFNULL(r.m3, 0),
+						IFNULL(wc.distributionCat5M3, rc.distributionCat5M3) * IFNULL(r.m3, 0),
+						vIsKmTruckRate,
+						vCountryFk
 					FROM route r
 						JOIN vehicle v ON v.id = r.vehicleFk
 						JOIN routeConfig rc
+						LEFT JOIN workCenterCommission wc ON wc.workCenter = r.workCenterFk
 					WHERE r.id = vSelf
 						AND r.kmStart
 						AND r.kmEnd

db/routines/vn/procedures/sale_boxPickingPrint.sql

@@ -27,7 +27,7 @@ BEGIN
 	DECLARE vQuantity INT;
 	DECLARE vRemainder INT DEFAULT 0;
 	DECLARE vRemainderSaleFk INT;
-	DECLARE vShelving VARCHAR(10);
+	DECLARE vShelvingFk VARCHAR(10);
 	DECLARE vTicketFk INT;
 
 	SELECT 	s.quantity,
@@ -74,7 +74,7 @@ w1:	WHILE vQuantity >= vPacking DO
 						p.pickingOrder,
 						ish.created
 						FROM itemShelving ish 
-							JOIN shelving sh ON sh.code = ish.shelvingFk
+							JOIN shelving sh ON sh.id = ish.shelvingFk
 							JOIN parking p ON p.id = sh.parkingFk
 							LEFT JOIN itemShelvingSale iss
 								ON iss.itemShelvingFk = ish.id
@@ -262,9 +262,9 @@ w1:	WHILE vQuantity >= vPacking DO
 		CALL dipole.expedition_Add(vExpeditionFk,vPrinterFk, TRUE);
 
 		SELECT shelvingFk, p.code 
-			INTO vShelving, vParkingCode
+			INTO vShelvingFk, vParkingCode
 			FROM itemShelving ish
-				JOIN shelving sh ON sh.code = ish.shelvingFk
+				JOIN shelving sh ON sh.id = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
 			WHERE ish.id = vItemShelvingFk;
 
@@ -273,7 +273,7 @@ w1:	WHILE vQuantity >= vPacking DO
 				itemFk = vItemFk,
 				quantity = vPacking,
 				longName = vConcept,
-				shelvingFk = vShelving,
+				shelvingFk = vShelvingFk,
 				parkingCode = vParkingCode,
 				phone = RIGHT(phone,vMaxPhoneLength),
 				street = RIGHT(street, vMAxStreetLength)

db/routines/vn/procedures/sale_getBoxPickingList.sql

@@ -41,7 +41,7 @@ BEGIN
 								AND iss.created >= vDated
 							GROUP BY iss.itemShelvingFk, s.itemFk) tISS 
 				ON tISS.itemFk = ish.itemFk AND tISS.itemShelvingFk = ish.id
-			JOIN shelving sh ON sh.code = ish.shelvingFk
+			JOIN shelving sh ON sh.id = ish.shelvingFk
 			JOIN parking p ON p.id = sh.parkingFk
 			JOIN tmp.productionBuffer pb ON pb.ticketFk = s.ticketFk
 			JOIN agencyMode am ON am.id = pb.agencyModeFk

db/routines/vn/procedures/sale_getProblems.sql

@@ -87,7 +87,7 @@ BEGIN
 				SUM(ish.visible) visible,
 				s.warehouseFk warehouseFk
 			FROM itemShelving ish
-				JOIN shelving sh ON sh.code = ish.shelvingFk
+				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;
@@ -127,7 +127,7 @@ BEGIN
 							LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
 								AND issw.warehouseFk = t.warehouseFk 
 						WHERE IFNULL(v.visible, 0) < s.quantity
-							AND IFNULL(av.available, 0) < s.quantity
+							AND IFNULL(av.available, 0) < 0
 							AND IFNULL(issw.visible, 0) < s.quantity
 							AND NOT s.isPicked
 							AND NOT s.reserved
@@ -190,7 +190,7 @@ BEGIN
 							LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
 								AND issw.warehouseFk = t.warehouseFk 
 						WHERE IFNULL(v.visible, 0) < s.quantity
-							AND IFNULL(av.available, 0) >= s.quantity
+							AND IFNULL(av.available, 0) >= 0
 							AND IFNULL(issw.visible, 0) < s.quantity
 							AND s.quantity > 0
 							AND NOT s.isPicked

db/routines/vn/procedures/shelvingChange.sql

@@ -1,11 +1,13 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`shelvingChange`(IN `vShelvingO` VARCHAR(8), IN `vShelvingD` VARCHAR(8))
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`shelvingChange`(
+	`vShelvingO` VARCHAR(10),
+	`vShelvingD` VARCHAR(10)
+)
 BEGIN
-
-     UPDATE vn.itemShelving
-     SET shelvingFk =  vShelvingD COLLATE utf8_unicode_ci 
-     WHERE shelvingFk = vShelvingO COLLATE utf8_unicode_ci;  
-     
-    
+	UPDATE itemShelving ish
+		JOIN shelving sh1 ON sh1.code = vShelvingD COLLATE utf8_unicode_ci
+		JOIN shelving sh2 ON sh2.code = vShelvingO COLLATE utf8_unicode_ci
+	SET ish.shelvingFk =  sh1.id
+	WHERE ish.shelvingFk = sh2.id;
 END$$
 DELIMITER ;

db/routines/vn/procedures/shelvingParking_get.sql

@@ -1,8 +1,10 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`shelvingParking_get`(vShelvingFk VARCHAR(10), vWarehouseFk INT, vDayRange INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`shelvingParking_get`(
+	vShelvingCode VARCHAR(10),
+	vWarehouseFk INT,
+	vDayRange INT
+)
 BEGIN	
-
-	
 SELECT 	s.itemFk, 
 	s.concept,
 	CAST(SUM(s.quantity) AS DECIMAL(10,0)) as sinServir, 
@@ -10,14 +12,15 @@ SELECT 	s.itemFk,
 	FROM vn.sale s
 		LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
 		JOIN vn.ticket t ON t.id = s.ticketFk
-		LEFT JOIN vn.itemShelvingStock ist ON ist.itemFk = s.itemFk AND ist.warehouseFk = vWarehouseFk
-		JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk AND ish.shelvingFk = vShelvingFk COLLATE utf8_general_ci
+		LEFT JOIN vn.itemShelvingStock ist ON ist.itemFk = s.itemFk
+			AND ist.warehouseFk = vWarehouseFk
+		JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk
+		JOIN shelving sh ON sh.id = ish.shelvingFk
+			AND sh.code = vShelvingCode COLLATE utf8_general_ci
 	WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(TIMESTAMPADD(DAY, GREATEST(0,vDayRange), util.VN_CURDATE())) 
 		AND iss.saleFk IS NULL
 		AND t.warehouseFk = vWarehouseFk
 	GROUP BY s.itemFk
 	HAVING sinServir > aparcado;
-			
-
 END$$
 DELIMITER ;

db/routines/vn/procedures/shelving_clean.sql

@@ -12,12 +12,12 @@ BEGIN
 
 	DELETE ish.* 
 		FROM itemShelving ish
-			JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+			JOIN vn.shelving sh ON sh.id = ish.shelvingFk
 			WHERE sh.parkingFk IS NULL
 			AND ish.created < TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
 
 UPDATE shelving sh
-	LEFT JOIN itemShelving its ON its.shelvingFk = sh.`code`
+	LEFT JOIN itemShelving its ON its.shelvingFk = sh.id
 		SET isPrinted = 0,
 		parkingFk = NULL
 	WHERE its.id IS NULL
@@ -27,11 +27,11 @@ UPDATE shelving sh
 			OR
 			sh.parked < util.VN_CURDATE() - INTERVAL 2 WEEK
 		)
-			
 		AND IF(code REGEXP '^[A-Za-z]{2}[0-9]', LEFT (code, 2) NOT IN (
-				SELECT DISTINCT LEFT(its.shelvingFk, 2)
+				SELECT DISTINCT LEFT(sh.code, 2)
 					FROM itemShelving its
-					WHERE its.shelvingFk REGEXP '^[A-Za-z]{2}[0-9]'
+						JOIN shelving sh ON sh.id = its.shelvingFk
+					WHERE sh.code REGEXP '^[A-Za-z]{2}[0-9]'
 				), TRUE);
 
 END$$

db/routines/vn/procedures/shelving_getSpam.sql

@@ -25,7 +25,7 @@ BEGIN
 		LEFT JOIN (
 			SELECT ish.itemFk, CAST(SUM(ish.visible) AS DECIMAL(10,0)) AS reserva
 				FROM vn.itemShelving ish
-					JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+					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
 				WHERE s.code = 'FUENTES_PICASSE'
@@ -68,7 +68,7 @@ BEGIN
 			sh.isSpam
 		FROM vn.itemShelving ish
 			JOIN vn.item i ON i.id = ish.itemFk
-			JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+			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.warehouse w ON w.id = s.warehouseFk

db/routines/vn/procedures/stockBought_calculate.sql

@@ -59,7 +59,7 @@ proc: BEGIN
 	
 	INSERT INTO stockBought(workerFk, bought, dated)
 		SELECT tb.workerFk, 
-				ROUND(GREATEST(tb.bought - IFNULL(ts.sold, 0), 0), 1), 
+				ROUND(GREATEST(tb.bought - IFNULL(ts.sold, 0), 0), 2), 
 				vDated
 			FROM tStockBought tb 
 				LEFT JOIN tStockSold ts ON ts.workerFk = tb.workerFk;
@@ -80,7 +80,7 @@ proc: BEGIN
 
 	UPDATE stockBought s
 			JOIN tStockSold ts ON ts.workerFk = s.workerFk
-				SET s.bought = IF(s.bought < ts.sold, ROUND(s.bought - ts.sold, 1), 0)
+				SET s.bought = IF(s.bought < ABS(ts.sold), 0, ROUND(s.bought - ABS(ts.sold), 1))
 		WHERE s.dated = vDated;
 
 	DROP TEMPORARY TABLE tCurrentData, tmp.item, tmp.buyUltimate, tStockSold;

db/routines/vn/procedures/ticketDown_PrintableSelection.sql

@@ -9,7 +9,7 @@ BEGIN
 					JOIN vn.sale s ON s.ticketFk = t.id
                     JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
                     JOIN vn.itemShelving ish ON ish.id = iss.itemShelvingFk
-                    JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+                    JOIN vn.shelving sh ON sh.id = ish.shelvingFk
                     JOIN vn.parking p ON p.id = sh.parkingFk
 					WHERE p.sectorFk = vSectorFk
 			) sub ON sub.id = td.ticketFk

db/routines/vn/procedures/ticket_DelayTruckSplit.sql

@@ -27,7 +27,7 @@ BEGIN
 							SUM(ish.visible) visible,
 							s.warehouseFk warehouseFk
 						FROM itemShelving ish
-							JOIN shelving sh ON sh.code = ish.shelvingFk
+							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,

db/routines/vn/procedures/ticket_getSplitList.sql

@@ -28,7 +28,7 @@ BEGIN
 				SUM(ish.visible) visible,
 				s.warehouseFk warehouseFk
 			FROM itemShelving ish
-				JOIN shelving sh ON sh.code = ish.shelvingFk
+				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,

db/routines/vn/procedures/ticket_splitItemPackingType.sql

@@ -3,87 +3,124 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_splitItemPacki
 	vSelf INT,
 	vOriginalItemPackingTypeFk VARCHAR(1)
 )
-proc:BEGIN
+BEGIN
 /**
- * Clona y reparte las líneas de ventas de un ticket en funcion del tipo de empaquetado.
- * Respeta el id de ticket original para el tipo de empaquetado propuesto.
+ * Separa en diferentes tickets según el tipo de empaquetado
+ * El ticket original conserva las líneas del tipo de empaquetado especificado
+ * Las líneas sin tipo de empaquetado se asignan al ticket del tipo por defecto.
  *
- * @param vSelf Id ticket
- * @param vOriginalItemPackingTypeFk Tipo empaquetado que se mantiene el ticket original
+ * @param vSelf Id del ticket original
+ * @param vOriginalItemPackingTypeFk Tipo de empaquetado a mantener en el ticket original
  * @return table tmp.ticketIPT(ticketFk, itemPackingTypeFk)
  */
-	DECLARE vDone INT DEFAULT FALSE;
-	DECLARE vHasItemPackingType BOOL;
-	DECLARE vItemPackingTypeFk INT;
+	DECLARE vIsDone BOOLEAN DEFAULT FALSE;
+	DECLARE vCurrentPackingType VARCHAR(1);
+	DECLARE vDefaultPackingType VARCHAR(1);
+	DECLARE vHasOriginalPackingType BOOLEAN;
 	DECLARE vNewTicketFk INT;
+	DECLARE vTicketFk INT;
 
 	DECLARE vItemPackingTypes CURSOR FOR
-		SELECT DISTINCT itemPackingTypeFk 
-			FROM tSalesToMove;
+		SELECT DISTINCT itemPackingTypeFk FROM tSalesToMove;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vIsDone = TRUE;
 
-	SELECT COUNT(*) INTO vHasItemPackingType
-			FROM ticket t	
-				JOIN sale s ON s.ticketFk = t.id
-				JOIN item i ON i.id = s.itemFk 
-			WHERE t.id = vSelf
-				AND i.itemPackingTypeFk = vOriginalItemPackingTypeFk;
-
-	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT(
-		ticketFk INT,
-		itemPackingTypeFk VARCHAR(1)
-	) ENGINE=MEMORY
-		SELECT vSelf ticketFk, vOriginalItemPackingTypeFk itemPackingTypeFk;
-
-	IF NOT vHasItemPackingType THEN
-		LEAVE proc;
-	END IF;
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
 
 	CREATE OR REPLACE TEMPORARY TABLE tSalesToMove (
 		ticketFk INT,
 		saleFk INT,
-		itemPackingTypeFk INT
+		itemPackingTypeFk VARCHAR(1)
 	) ENGINE=MEMORY;
 
+	SELECT COALESCE(MAX(ic.defaultPackingTypeFk), MAX(i.itemPackingTypeFk)) INTO vDefaultPackingType
+		FROM vn.sale s
+			JOIN item i ON i.id = s.itemFk
+			LEFT JOIN itemConfig ic ON ic.defaultPackingTypeFk = i.itemPackingTypeFk
+		WHERE s.ticketFk = vSelf
+		GROUP BY s.ticketFk;
+
+	SELECT EXISTS (
+		SELECT TRUE
+			FROM sale s
+				JOIN item i ON i.id = s.itemFk
+			WHERE s.ticketFk = vSelf
+				AND i.itemPackingTypeFk = vOriginalItemPackingTypeFk
+	) INTO vHasOriginalPackingType;
+
+	IF vOriginalItemPackingTypeFk IS NULL OR NOT vHasOriginalPackingType THEN
+		SET vOriginalItemPackingTypeFk = vDefaultPackingType;
+	END IF;
+
+	START TRANSACTION;
+
+	SELECT t.id INTO vTicketFk
+		FROM ticket t
+			JOIN sale s ON s.id = t.id
+		WHERE t.id = vSelf
+		FOR UPDATE;
+
 	INSERT INTO tSalesToMove (saleFk, itemPackingTypeFk)
 		SELECT s.id, i.itemPackingTypeFk
-			FROM ticket t	
-				JOIN sale s ON s.ticketFk = t.id
+			FROM sale s
 				JOIN item i ON i.id = s.itemFk
-			WHERE t.id = vSelf
+			WHERE s.ticketFk = vSelf
 				AND i.itemPackingTypeFk <> vOriginalItemPackingTypeFk;
 
 	OPEN vItemPackingTypes;
-
 	l: LOOP
-		SET vDone = FALSE;
-		FETCH vItemPackingTypes INTO vItemPackingTypeFk;
+		SET vIsDone = FALSE;
+		FETCH vItemPackingTypes INTO vCurrentPackingType;
 
-		IF vDone THEN
+		IF vIsDone THEN
 			LEAVE l;
 		END IF;
 
 		CALL ticket_Clone(vSelf, vNewTicketFk);
 
+		SELECT id INTO vTicketFk
+			FROM ticket t
+			WHERE t.id = vNewTicketFk
+			FOR UPDATE;
+
 		UPDATE tSalesToMove
 			SET ticketFk = vNewTicketFk
-			WHERE itemPackingTypeFk = vItemPackingTypeFk;
+			WHERE itemPackingTypeFk = vCurrentPackingType;
+
+		IF vCurrentPackingType = vDefaultPackingType THEN
+			INSERT INTO tSalesToMove (ticketFk, saleFk, itemPackingTypeFk)
+				SELECT vNewTicketFk, s.id, i.itemPackingTypeFk
+					FROM sale s
+						JOIN item i ON i.id = s.itemFk
+				WHERE s.ticketFk = vSelf
+					AND i.itemPackingTypeFk IS NULL;
+		END IF;
 
 	END LOOP;
-
 	CLOSE vItemPackingTypes;
 
 	UPDATE sale s
-			JOIN tSalesToMove stm ON stm.saleFk = s.id
-		SET s.ticketFk = stm.ticketFk
-		WHERE stm.ticketFk;
+			JOIN tSalesToMove t ON t.saleFk = s.id
+		SET s.ticketFk = t.ticketFk;
 
-	INSERT INTO tmp.ticketIPT (ticketFk, itemPackingTypeFk)
-		SELECT ticketFk, itemPackingTypeFk
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT
+			ENGINE=MEMORY
+		SELECT s.ticketFk, MAX(i.itemPackingTypeFk) itemPackingTypeFk
+			FROM sale s
+				JOIN item i ON i.id = s.itemFk
+			WHERE s.ticketFk = vSelf
+			GROUP BY s.ticketFk
+		UNION
+		SELECT ticketFk, MAX(itemPackingTypeFk)
 			FROM tSalesToMove
 			GROUP BY ticketFk;
 
+	COMMIT;
+
 	DROP TEMPORARY TABLE tSalesToMove;
 END$$
 DELIMITER ;

db/routines/vn/procedures/travelVolume_get.sql

@@ -10,7 +10,7 @@ BEGIN
 			JOIN vn.entry e ON e.travelFk = tr.id
 			JOIN vn.buy b ON b.entryFk = e.id
 		WHERE tr.landed BETWEEN vFromDated AND vToDated
-			AND NOT tr.daysInForward
+			AND NOT tr.isRaid
 			AND tr.warehouseInFk = vWarehouseFk
 		GROUP BY tr.landed , a.name ;
 END$$

db/routines/vn/procedures/travel_checkRaid.sql

@@ -0,0 +1,17 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`travel_checkRaid`(
+	vIsRaid BOOL,
+	vDaysInForward INT
+)
+BEGIN
+/**
+ * Check if the values of isRaid and daysInforward are correct
+ *
+ * @param vIsRaid idRaid value
+ * @param vDaysInForward daysInForward value
+ */
+	IF (NOT vIsRaid AND vDaysInForward IS NOT NULL) OR (vIsRaid AND vDaysInForward IS NULL) THEN
+		CALL util.throw('The raid information is not correct');
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/procedures/travel_moveRaids.sql

@@ -37,7 +37,8 @@ BEGIN
 		SELECT id travelFk,
 				util.VN_CURDATE() + INTERVAL daysInForward  DAY newLanded
 			FROM travel
-			WHERE daysInForward;
+			WHERE isRaid
+				AND daysInForward;
 
 	START TRANSACTION;
 

db/routines/vn/procedures/workerTimeControl_check.sql

@@ -1,168 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`workerTimeControl_check`(vUserFk INT, vDated DATE,vTabletFk VARCHAR(100))
-proc: BEGIN
-/**
- * Verifica si el empleado puede fichar en el momento actual, si puede fichar llama a workerTimeControlAdd
- *
- * @param vUserFk Identificador del trabajador
- * @return Retorna si encuentra un problema 'odd','maxTimeWork','breakDay','breakWeek' ;
- *	En caso de tener algun problema retorna el primero que encuentra
- */
-	DECLARE vLastIn DATETIME ;
-	DECLARE vLastOut DATETIME ;
-	DECLARE vDayWorkMax INT;
-	DECLARE vDayBreak INT;
-	DECLARE vWeekBreak INT ;
-	DECLARE vWeekScope INT;
-	DECLARE vDayStayMax INT;
-	DECLARE vProblem VARCHAR(20) DEFAULT NULL;
-	DECLARE vTimedWorked INT;
-	DECLARE vCalendarStateType VARCHAR(20) DEFAULT NULL;
-	DECLARE vDepartmentFk INT;
-	DECLARE vTo VARCHAR(50) DEFAULT NULL;
-	DECLARE vUserName VARCHAR(50) DEFAULT NULL;
-	DECLARE vBody VARCHAR(255) DEFAULT NULL;
-		
-	SELECT dayBreak, weekBreak, weekScope, dayWorkMax, dayStayMax 
-		INTO vDayBreak, vWeekBreak, vWeekScope, vDayWorkMax, vDayStayMax
-		FROM workerTimeControlParams;
-
-	SELECT MAX(timed) INTO vLastIn
-		FROM workerTimeControl 
-		WHERE userFk = vUserFk 
-			AND direction = 'in';
-		
-	SELECT MAX(timed) INTO vLastOut
-		FROM workerTimeControl 
-		WHERE userFk = vUserFk 
-			AND direction = 'out'; 
-
-	SELECT CONCAT(u.name,'@verdnatura.es') INTO vTo
-		FROM account.user u
-		WHERE u.id = (SELECT bossFk FROM worker WHERE id = vUserFk);   
-		
-	SELECT CONCAT(firstName,' ',lastName) INTO vUserName
-		FROM worker w
-		WHERE w.id = vUserFk;
-
-
-	IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastIn) > vDayStayMax THEN -- NUEVA JORNADA
-		
-		-- VERIFICAR DESCANSO DIARIO 
-		IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vDayBreak THEN 
-			SELECT "Descansos 12 h" AS problem;
-			-- ENVIAMOS CORREO AL BOSSFK
-				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos 12 h") INTO vBody;
-				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
-			LEAVE proc;
-		END IF;   
-		
-		-- VERIFICAR FICHADAS IMPARES DEL ÚLTIMO DÍA QUE SE FICHÓ
-		IF (SELECT MOD(COUNT(*),2) -- <>0 							
-				FROM workerTimeControl 
-				WHERE userFk = vUserFk
-					AND timed >= vLastIn
-			) THEN				
-			SELECT "Dias con fichadas impares" AS problem;
-			-- ENVIAMOS CORREO AL BOSSFK
-				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Dias con fichadas impares") INTO vBody;
-				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
-			LEAVE proc;	  
-		END IF;
-		
-		-- VERIFICAR VACACIONES
-		SELECT at2.name INTO vCalendarStateType
-			FROM calendar c 
-				JOIN business b ON b.id = c.businessFk
-				JOIN absenceType at2 ON at2.id = c.dayOffTypeFk
-			WHERE c.dated = util.VN_CURDATE()
-				AND at2.isAllowedToWork = FALSE
-				AND b.workerFk = vUserFk
-			LIMIT 1;
-		
-			IF(LENGTH(vCalendarStateType)) THEN
-			SELECT vCalendarStateType AS problem;
-			-- ENVIAMOS CORREO AL BOSSFK
-				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Vacaciones") INTO vBody;
-				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
-			LEAVE proc;	
-				
-			END IF;
-		
-		-- VERIFICAR CONTRATO EN VIGOR
-			IF (SELECT COUNT(*)
-					FROM business b
-					WHERE b.workerFk = vUserFk
-						AND b.started <= vDated
-						AND IFNULL(b.ended, vDated) >= vDated
-				) = 0 THEN
-				SELECT "No hay un contrato en vigor" AS problem;
-				-- ENVIAMOS CORREO AL BOSSFK
-				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"No hay un contrato en vigor") INTO vBody;
-				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
-				LEAVE proc;	
-					
-			END IF;
-
-		-- VERIFICAR DESCANSO SEMANAL
-		SET @vHasBreakWeek:= FALSE;
-		SET @vLastTimed:= UNIX_TIMESTAMP((util.VN_NOW() - INTERVAL vWeekScope SECOND)); 
-		
-		DROP TEMPORARY TABLE IF EXISTS tmp.trash;
-		CREATE TEMPORARY TABLE tmp.trash
-		SELECT  IF(vWeekBreak-(UNIX_TIMESTAMP(timed)-@vLastTimed) <= 0, @vHasBreakWeek:=TRUE, TRUE) alias,
-				@vLastTimed:= UNIX_TIMESTAMP(timed)
-			FROM workerTimeControl 
-			WHERE timed>= (util.VN_NOW() - INTERVAL vWeekScope SECOND)
-				AND userFk= vUserFk
-				AND direction IN ('in','out')
-			ORDER BY timed ASC;   
-			
-		IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vWeekBreak AND @vHasBreakWeek = FALSE THEN -- REVISA SI EL DESCANSO SE HA REALIZADO DESPUÉS DE LA ÚLTIMA FICHADA     
-			SELECT "Descansos 36 h" AS problem;
-			-- ENVIAMOS CORREO AL BOSSFK
-				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos 36 h") INTO vBody;
-				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
-			LEAVE proc;
-		END IF;
-		
-		DROP TEMPORARY TABLE tmp.trash;    
-
-	ELSE  -- DIA ACTUAL   
-		
-		-- VERIFICA QUE EL TIEMPO EFECTIVO NO SUPERE EL MÁXIMO
-		SELECT IFNULL(SUM(if( mod(wtc.order,2)=1, -UNIX_TIMESTAMP(timed), UNIX_TIMESTAMP(timed))),0) -  IF( MOD(COUNT(*),2), UNIX_TIMESTAMP(util.VN_NOW()), 0) INTO vTimedWorked 
-			FROM workerTimeControl wtc
-			WHERE userFk = vUserFk 
-				AND timed >= vLastIn
-			ORDER BY timed;
-
-		IF  vTimedWorked > vDayWorkMax THEN 
-			SELECT "Jornadas" AS problem;
-			-- ENVIAMOS CORREO AL BOSSFK
-				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Jornadas") INTO vBody;
-				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
-			LEAVE proc;
-		END IF;
-
-	END IF;
-
-		-- VERIFICAR DEPARTAMENTO
-	/*	IF vTabletFk IS NOT NULL  THEN
-			SELECT wtcu.departmentFk INTO vDepartmentFk
-				FROM workerTimeControlUserInfo wtcu
-				WHERE wtcu.userFk = vUserFk;
-			IF (SELECT COUNT(td.tabletFk)
-						FROM tabletDepartment td
-						WHERE td.tabletFk = vTabletFk AND td.departmentFk = vDepartmentFk
-					) = 0 THEN
-					SELECT "No perteneces a este departamento." AS problem;
-					-- ENVIAMOS CORREO AL BOSSFK
-					SELECT CONCAT(vUserName,' No a podido fichar por el siguiente problema: ',"No perteneces a este departamento.") INTO vBody;
-					CALL mail_insert(vTo,vTo,'error al fichar',vBody);
-					LEAVE proc;	
-			END IF;
-		END IF;*/
-	
-END$$
-DELIMITER ;

db/routines/vn/triggers/address_beforeInsert.sql

@@ -6,6 +6,7 @@ BEGIN
 	DECLARE vIsEqualizated BOOL;
 
 	SET NEW.editorFk = account.myUser_getId();
+	SET NEW.geoFk = address_getGeo(NEW.id);
 
 	IF (NEW.phone <> '') THEN
 		CALL pbx.phone_isValid(NEW.phone);

db/routines/vn/triggers/address_beforeUpdate.sql

@@ -3,7 +3,6 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`address_beforeUpdate`
 	BEFORE UPDATE ON `address`
 	FOR EACH ROW
 BEGIN
-	
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF !(NEW.phone <=> OLD.phone) AND (NEW.phone <> '') THEN
@@ -14,5 +13,10 @@ BEGIN
 		CALL pbx.phone_isValid(NEW.mobile);
 	END IF;
 
+	IF NOT (NEW.provinceFk <=> OLD.provinceFk)
+		OR (NEW.postalCode <=> OLD.postalCode) THEN
+
+		SET NEW.geoFk = address_getGeo(NEW.id);
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/client_beforeInsert.sql

@@ -3,8 +3,10 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`client_beforeInsert`
 	BEFORE INSERT ON `client`
 	FOR EACH ROW
 BEGIN
-
 	SET NEW.editorFk = account.myUser_getId();
+	SET NEW.accountingAccount = 4300000000 + NEW.id;
+    SET NEW.lastSalesPersonFk = NEW.salesPersonFk;
+	SET NEW.geoFk = client_getGeo(NEW.id);
 
 	IF (NEW.phone <> '') THEN
 		CALL pbx.phone_isValid(NEW.phone);
@@ -13,9 +15,5 @@ BEGIN
 	IF (NEW.mobile <> '') THEN
 		CALL pbx.phone_isValid(NEW.mobile);
 	END IF;
-
-	SET NEW.accountingAccount = 4300000000 + NEW.id;
-    
-    SET NEW.lastSalesPersonFk = NEW.salesPersonFk;
 END$$
 DELIMITER ;

db/routines/vn/triggers/client_beforeUpdate.sql

@@ -72,5 +72,11 @@ BEGIN
 	IF NOT (NEW.businessTypeFk <=> OLD.businessTypeFk) AND (NEW.businessTypeFk = 'individual' OR OLD.businessTypeFk = 'individual') THEN
 		SET NEW.isTaxDataChecked = 0;
 	END IF;
+
+	IF NOT (NEW.provinceFk <=> OLD.provinceFk)
+		OR (NEW.postcode <=> OLD.postcode) THEN
+
+		SET NEW.geoFk = client_getGeo(NEW.id);
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/entry_beforeUpdate.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`entry_beforeUpdate`
 	BEFORE UPDATE ON `entry`
 	FOR EACH ROW
 BEGIN
-	DECLARE vDaysInForward INT;
+	DECLARE vIsRaid BOOL;
 	DECLARE vPrintedCount INT;
 	DECLARE vHasDistinctWarehouses BOOL;
 	DECLARE vTotalBuy INT;
@@ -38,10 +38,10 @@ BEGIN
 			CALL travel_throwAwb(NEW.travelFk);
 		END IF;
 
-		SELECT daysInForward INTO vDaysInForward
+		SELECT t.isRaid INTO vIsRaid
 			FROM travel t
 				JOIN entry e ON e.travelFk = t.id
-			WHERE entryFk = NEW.id;
+			WHERE e.id = NEW.id;
 
 		SELECT NOT (o.warehouseInFk <=> n.warehouseInFk)
 				OR NOT (o.warehouseOutFk <=> n.warehouseOutFk)
@@ -50,7 +50,7 @@ BEGIN
 			WHERE o.id = OLD.travelFk
 				AND n.id = NEW.travelFk;
 
-		IF vDaysInForward AND vHasDistinctWarehouses THEN
+		IF vIsRaid AND vHasDistinctWarehouses THEN
 			SIGNAL SQLSTATE '45000'
 				SET MESSAGE_TEXT = 'A cloned entry cannot be moved to a travel with different warehouses';
 		END IF;

db/routines/vn/triggers/route_afterUpdate.sql

@@ -21,7 +21,8 @@ BEGIN
 		OR !(NEW.kmEnd <=> OLD.kmEnd)
 		OR !(NEW.workerFk <=> OLD.workerFk)
 		OR !(NEW.m3 <=> OLD.m3)
-		OR !(NEW.agencyModeFk <=> OLD.agencyModeFk)THEN
+		OR !(NEW.agencyModeFk <=> OLD.agencyModeFk)
+		OR !(NEW.vehicleFk <=> OLD.vehicleFk)THEN
 			CALL route_calcCommission(NEW.id);
 	END IF;
 

db/routines/vn/triggers/supplier_beforeInsert.sql

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

db/routines/vn/triggers/supplier_beforeUpdate.sql

@@ -40,5 +40,10 @@ BEGIN
 		SET NEW.isPayMethodChecked = FALSE;
 	END IF;
 
+	IF NOT (NEW.provinceFk <=> OLD.provinceFk)
+		OR (NEW.postCode <=> OLD.postCode) THEN
+
+		SET NEW.geoFk = supplier_getGeo(NEW.id);
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/town_beforeUpdate.sql

@@ -1,10 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`town_beforeUpdate`
-	BEFORE UPDATE ON `town`
-	FOR EACH ROW
-BEGIN
-	-- IF !(OLD.geoFk <=> NEW.geoFk) THEN
-	-- 	CALL zoneGeo_throwNotEditable;
-	-- END IF;
-END$$
-DELIMITER ;

db/routines/vn/triggers/travel_beforeInsert.sql

@@ -9,6 +9,10 @@ BEGIN
 
 	CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk);
 
+	IF NEW.isRaid IS NOT NULL OR NEW.daysInForward IS NOT NULL THEN
+		CALL travel_checkRaid(NEW.isRaid, NEW.daysInForward);
+	END IF;
+
 	IF NEW.awbFk IS NOT NULL THEN
 		CALL travel_throwAwb(NEW.id);
 	END IF;

db/routines/vn/triggers/travel_beforeUpdate.sql

@@ -20,6 +20,10 @@ BEGIN
 		CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk);
 	END IF;
 
+	IF NOT (NEW.isRaid <=> OLD.isRaid)  OR NOT (NEW.daysInForward <=> OLD.daysInForward) THEN
+		CALL travel_checkRaid(NEW.isRaid, NEW.daysInForward);
+	END IF;
+
 	IF NOT (NEW.awbFk <=> OLD.awbFk)THEN
 		SELECT COUNT(*) INTO vHasAnyInvoiceBooked
 			FROM travel t

db/routines/vn/views/itemEntryIn.sql

@@ -6,7 +6,7 @@ AS SELECT `t`.`warehouseInFk` AS `warehouseInFk`,
 	`b`.`itemFk` AS `itemFk`,
 	`b`.`quantity` AS `quantity`,
 	`t`.`isReceived` AS `isReceived`,
-	`t`.`daysInForward` AS `isVirtualStock`,
+	`t`.`isRaid` AS `isVirtualStock`,
 	`e`.`id` AS `entryFk`
 FROM (
 		(

db/routines/vn/views/itemEntryOut.sql

@@ -15,5 +15,5 @@ FROM (
 		JOIN `vn`.`travel` `t` ON(`e`.`travelFk` = `t`.`id`)
 	)
 WHERE `e`.`isExcludedFromAvailable` = 0
-	AND NOT `t`.`daysInForward`
+	AND NOT `t`.`isRaid`
 	AND `b`.`quantity` <> 0

db/routines/vn/views/itemShelvingList.sql

@@ -15,7 +15,7 @@ FROM (
 		(
 			(
 				`vn`.`itemShelving` `ish`
-				JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`)
+				JOIN `vn`.`shelving` `sh` ON(`sh`.`id` = `ish`.`shelvingFk`)
 			)
 			JOIN `vn`.`item` `i` ON(`i`.`id` = `ish`.`itemFk`)
 		)

db/routines/vn/views/itemShelvingPlacementSupplyStock.sql

@@ -18,7 +18,7 @@ FROM (
 		(
 			(
 				`vn`.`itemShelving` `ish`
-				JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`)
+				JOIN `vn`.`shelving` `sh` ON(`sh`.`id` = `ish`.`shelvingFk`)
 			)
 			LEFT JOIN `vn`.`parking` `p` ON(`p`.`id` = `sh`.`parkingFk`)
 		)

db/routines/vn/views/itemShelvingSaleSum.sql

@@ -13,7 +13,7 @@ FROM (
 				`vn`.`itemShelvingSale` `iss`
 				JOIN `vn`.`itemShelving` `ish` ON(`ish`.`id` = `iss`.`itemShelvingFk`)
 			)
-			JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`)
+			JOIN `vn`.`shelving` `sh` ON(`sh`.`id` = `ish`.`shelvingFk`)
 		)
 		JOIN `vn`.`parking` `p` ON(`p`.`id` = `sh`.`parkingFk`)
 	)

db/routines/vn/views/itemShelvingStock.sql

@@ -21,7 +21,7 @@ FROM (
 			(
 				(
 					`vn`.`itemShelving` `ish`
-					LEFT JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`)
+					LEFT JOIN `vn`.`shelving` `sh` ON(`sh`.`id` = `ish`.`shelvingFk`)
 				)
 				LEFT JOIN `vn`.`parking` `p` ON(`p`.`id` = `sh`.`parkingFk`)
 			)

db/routines/vn/views/itemShelvingStockFull.sql

@@ -19,7 +19,7 @@ FROM (
 			(
 				(
 					`vn`.`itemShelving` `ish`
-					JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`)
+					JOIN `vn`.`shelving` `sh` ON(`sh`.`id` = `ish`.`shelvingFk`)
 				)
 				JOIN `vn`.`parking` `p` ON(`p`.`id` = `sh`.`parkingFk`)
 			)

db/routines/vn/views/lastPurchases.sql

@@ -31,5 +31,5 @@ FROM (
 		LEFT JOIN `edi`.`ekt` `ek` ON(`ek`.`id` = `b`.`ektFk`)
 	)
 WHERE `tr`.`landed` BETWEEN `util`.`yesterday`() AND `util`.`tomorrow`()
-	AND NOT  `tr`.`daysInForward`
+	AND NOT  `tr`.`isRaid`
 	AND `b`.`stickers` > 0