Merge branch '6276-createNewWarehouse' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse

back/methods/collection/addItem.js

@@ -6,7 +6,7 @@ module.exports = Self => {
         accepts: [
             {
                 arg: 'code',
-                type: 'string',
+                type: 'number',
                 required: true
             },
             {

back/methods/machine-worker/updateInTime.js

@@ -50,7 +50,7 @@ module.exports = Self => {
             });
             if (machineWorker) {
                 await machineWorker.updateAttributes({
-                    inTime: new Date(Date.now())
+                    outTime: new Date(Date.now())
                 }, myOptions);
             }
 

db/changes/235001/00-newWareHouse.sql

@@ -9,6 +9,10 @@ INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalTyp
         ('SaleTracking','updateTracking','WRITE','ALLOW','ROLE','employee'),
         ('SaleTracking','mark','WRITE','ALLOW','ROLE','employee'),
         ('ItemBarcode','deleteByItemAndCode','WRITE','ALLOW','ROLE','employee'),
-        ('Collection','addItem','WRITE','ALLOW','ROLE','employee');
-        ('ExpeditionPallet', '*', 'READ', 'ALLOW', 'ROLE', 'production');         
+        ('Collection','addItem','WRITE','ALLOW','ROLE','employee'),
+        ('ExpeditionPallet', '*', 'READ', 'ALLOW', 'ROLE', 'production'),   
+        ('MobileAppVersionControl', '*', 'READ', 'ALLOW', 'ROLE', 'production'),
+        ('Collection', 'assignCollection', 'WRITE', 'ALLOW', 'ROLE', 'production'),
+        ('Collection', 'addItem', 'WRITE', 'ALLOW', 'ROLE', 'production'),
+        ('MachineWorker', 'updateInTime', 'WRITE', 'ALLOW', 'ROLE', 'production');;
         

loopback/locale/es.json

@@ -337,5 +337,7 @@
 	"Incorrect pin": "Pin incorrecto.",
 	"You already have the mailAlias": "Ya tienes este alias de correo",
 	"The alias cant be modified": "Este alias de correo no puede ser modificado",
-	"No tickets to invoice": "No hay tickets para facturar"
+	"No tickets to invoice": "No hay tickets para facturar",
+	"No hay tickets para sacar": "No hay tickets para sacar",
+	"There is no zone for these parameters 999999": "There is no zone for these parameters 999999"
 }

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

@@ -4,7 +4,7 @@ module.exports = Self => {
         accessType: 'WRITE',
         accepts: [{
             arg: 'shelvingFk',
-            type: 'number',
+            type: 'string',
             required: true,
         },
         {

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

@@ -62,7 +62,7 @@ module.exports = Self => {
 
                 return {
                     id: itemShelving.id,
-                    item: itemShelving.itemFk,
+                    itemFk: itemShelving.itemFk,
                     longName: item ? item.longName || `${item.name} ${item.size}` : '',
                     quantity: itemShelving.visible,
                     stickers: Math.ceil(itemShelving.visible / itemShelving.packing),

modules/item/back/methods/item/card.js

@@ -44,7 +44,7 @@ module.exports = Self => {
         let itemInfo;
         if (result.length) {
             itemInfo = {...result[0]};
-            itemInfo.barcodes = barcodes.map(barcode => barcode.code);
+            itemInfo.barcodes = barcodes;
         }
 
         return itemInfo;

modules/ticket/back/methods/expedition-pallet/getPallet.js

@@ -16,6 +16,7 @@ module.exports = Self => {
         },
         returns: {
             type: 'object',
+            root: true
         },
     });