Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

db/changes/232402/00-hotFix_travelConfig.sql

@@ -0,0 +1,22 @@
+CREATE TABLE `vn`.`travelConfig` (
+    `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+    `warehouseInFk` smallint(6) unsigned NOT NULL DEFAULT 8 COMMENT 'Warehouse de origen',
+    `warehouseOutFk` smallint(6) unsigned NOT NULL DEFAULT 60 COMMENT 'Warehouse destino',
+    `agencyFk` int(11) NOT NULL DEFAULT 1378 COMMENT 'Agencia por defecto',
+    `companyFk` int(10) unsigned NOT NULL DEFAULT 442 COMMENT 'Compañía por defecto',
+    PRIMARY KEY (`id`),
+    KEY `travelConfig_FK` (`warehouseInFk`),
+    KEY `travelConfig_FK_1` (`warehouseOutFk`),
+    KEY `travelConfig_FK_2` (`agencyFk`),
+    KEY `travelConfig_FK_3` (`companyFk`),
+    CONSTRAINT `travelConfig_FK` FOREIGN KEY (`warehouseInFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT `travelConfig_FK_1` FOREIGN KEY (`warehouseOutFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT `travelConfig_FK_2` FOREIGN KEY (`agencyFk`) REFERENCES `agencyMode` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT `travelConfig_FK_3` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Entry', 'addFromPackaging', 'WRITE', 'ALLOW', 'ROLE', 'production'),
+        ('Entry', 'addFromBuy', 'WRITE', 'ALLOW', 'ROLE', 'production'),
+        ('Supplier', 'getItemsPackaging', 'READ', 'ALLOW', 'ROLE', 'production');

modules/ticket/back/methods/ticket/setDeleted.js

@@ -81,17 +81,15 @@ module.exports = Self => {
                 throw new UserError('You must delete all the buy requests first');
 
             // removes item shelvings
-            if (hasItemShelvingSales && isSalesAssistant) {
+            const promises = [];
-                const promises = [];
+            for (let sale of sales) {
-                for (let sale of sales) {
+                if (sale.itemShelvingSale()) {
-                    if (sale.itemShelvingSale()) {
+                    const itemShelvingSale = sale.itemShelvingSale();
-                        const itemShelvingSale = sale.itemShelvingSale();
+                    const destroyedShelving = models.ItemShelvingSale.destroyById(itemShelvingSale.id, myOptions);
-                        const destroyedShelving = models.ItemShelvingSale.destroyById(itemShelvingSale.id, myOptions);
+                    promises.push(destroyedShelving);
-                        promises.push(destroyedShelving);
-                    }
                 }
-                await Promise.all(promises);
             }
+            await Promise.all(promises);
 
             // Remove ticket greuges
             const ticketGreuges = await models.Greuge.find({where: {ticketFk: id}}, myOptions);

modules/worker/back/models/operator.js

@@ -1,10 +1,10 @@
 module.exports = function(Self) {
     Self.observe('after save', async function(ctx) {
-        const instance = ctx.instance;
+        const instance = ctx.data || ctx.instance;
         const models = Self.app.models;
         const options = ctx.options;
 
-        if (!instance.sectorFk || !instance.labelerFk) return;
+        if (!instance?.sectorFk || !instance?.labelerFk) return;
 
         const sector = await models.Sector.findById(instance.sectorFk, {
             fields: ['mainPrinterFk']

modules/worker/back/models/operator.json

@@ -16,18 +16,12 @@
 			"type": "number"
 		},
 		"trainFk": {
-			"type": "number",
+			"type": "number"
-			"required": true
 		},
 		"itemPackingTypeFk": {
-			"type": "string",
+			"type": "string"
-			"required": true
 		},
 		"warehouseFk": {
-			"type": "number",
-			"required": true
-		},
-		"sectorFk": {
 			"type": "number"
 		},
 		"labelerFk": {