Merge branch 'master' into test

Reviewed-on: #3234
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

back/models/expedition_PrintOut.json

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

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
+	IF NOT EXISTS (SELECT id FROM expeditionPallet WHERE id = vPalletFk) THEN
-		CALL util.throw('Expedition not exists');
+		CALL util.throw('Pallet not exists');
 	END IF;
 
-	IF NOT (SELECT TRUE FROM expeditionPallet WHERE id = vPalletFk LIMIT 1) THEN
+	IF NOT EXISTS (SELECT id FROM expedition WHERE id = vExpeditionFk) THEN
-		CALL util.throw('Pallet not exists');
+		CALL util.throw('Expedition not exists');
 	END IF;
 
 	REPLACE expeditionScan(expeditionFk, palletFk)

modules/order/back/methods/order/filter.js

@@ -79,6 +79,7 @@ module.exports = Self => {
         const models = Self.app.models;
         const conn = Self.dataSource.connector;
         const myOptions = {};
+        const userId = ctx.req.accessToken.userId;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);