Merge branch 'test' into dev

db/routines/vn/procedures/invoiceIn_booking.sql

@@ -13,30 +13,16 @@ BEGIN
  * @param vBookEntry Id de asiento, si es NULL se genera uno nuevo
  */
 	DECLARE vFiscalYear INT;
-	DECLARE vDistinctTransactions INT;
 	DECLARE vHasRepeatedTransactions BOOL;
 
-	SELECT COUNT(DISTINCT iit.transactionTypeSageFk) INTO vDistinctTransactions
-		FROM invoiceIn ii
-			JOIN invoiceInTax iit ON iit.invoiceInFk = ii.id
-			JOIN invoiceInSerial iis ON iis.code = ii.serial 
-		WHERE iit.invoiceInFk = vSelf
-			AND iis.taxAreaFk = 'CEE'
-			AND iit.transactionTypeSageFk;
-
-	IF vDistinctTransactions > 1 THEN 
-		CALL util.throw ('This invoice does not allow different types of transactions');
-	END IF;
-
 	SELECT TRUE INTO vHasRepeatedTransactions
 		FROM invoiceInTax
 		WHERE invoiceInFk = vSelf
-		GROUP BY transactionTypeSageFk
+		HAVING COUNT(DISTINCT transactionTypeSageFk) > 1
-		HAVING COUNT(transactionTypeSageFk) > 1
 		LIMIT 1;
 
 	IF vHasRepeatedTransactions THEN 
-		CALL util.throw ('This invoice contains repeated types of transactions');
+		CALL util.throw ('This invoice contains different types of transactions');
 	END IF;
 
 	CREATE OR REPLACE TEMPORARY TABLE tInvoiceIn

db/routines/vn/procedures/itemShelvingSale_addBySale.sql

@@ -98,11 +98,12 @@ proc: BEGIN
 					itemShelvingFk,
 					saleFk,
 					quantity,
-					userFk)
+					isPicked)
 				SELECT vItemShelvingFk, 
 					vSaleFk, 
 					vReservedQuantity, 
-					vUserFk;
+					vUserFk,
+					FALSE;
 			
 			UPDATE itemShelving 
 				SET available = available - vReservedQuantity

modules/route/back/methods/route/cmrs.js

@@ -91,11 +91,13 @@ module.exports = Self => {
                     SELECT t.cmrFk,
                             t.id ticketFk,
                             t.routeFk,
-                            co.name country,
+                            co.id countryFk,
+                            co.name countryName,
                             t.clientFk,
                             IF(sub.id, TRUE, FALSE) hasCmrDms,
                             DATE(t.shipped) shipped,
-                            t.warehouseFk
+                            t.warehouseFk,
+                            w.name warehouseName
                         FROM ticket t
                             JOIN ticketState ts ON ts.ticketFk = t.id
                             JOIN state s ON s.id = ts.stateFk

modules/route/back/methods/route/filter.js

@@ -91,25 +91,20 @@ module.exports = Self => {
         let where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
             case 'search':
-                return {'r.id': value};
+                return {'id': value};
             case 'from':
-                return {'r.created': {gte: value}};
+                return {'created': {gte: value}};
             case 'to':
-                return {'r.created': {lte: value}};
+                return {'created': {lte: value}};
-            case 'm3':
-                return {'r.m3': value};
             case 'description':
-                return {'r.description': {like: `%${value}%`}};
+                return {'description': {like: `%${value}%`}};
+            case 'isOk':
+            case 'm3':
             case 'warehouseFk':
-                param = `v.${param}`;
-                return {[param]: value};
             case 'workerFk':
             case 'vehicleFk':
             case 'agencyModeFk':
-                param = `r.${param}`;
                 return {[param]: value};
-            case 'isOk':
-                return {'r.isOk': value};
             }
         });
 
@@ -119,34 +114,38 @@ module.exports = Self => {
         let stmt;
 
         stmt = new ParameterizedSQL(
-            `SELECT
+            `SELECT *
-                r.id,
+                FROM(
-                r.workerFk,
+                    SELECT
-                r.created,
+                        r.id,
-                r.vehicleFk,
+                        r.workerFk,
-                r.agencyModeFk,
+                        r.created,
-                r.time,
+                        r.vehicleFk,
-                r.isOk,
+                        r.agencyModeFk,
-                r.kmStart,
+                        r.time,
-                r.kmEnd,
+                        r.isOk,
-                r.started,
+                        r.kmStart,
-                r.finished,
+                        r.kmEnd,
-                r.gestdocFk,
+                        r.started,
-                r.cost,
+                        r.finished,
-                r.m3,
+                        r.gestdocFk,
-                r.description,
+                        r.cost,
-                am.name agencyName,
+                        r.m3,
-                u.name AS workerUserName,
+                        r.description,
-                v.numberPlate AS vehiclePlateNumber,
+                        am.name agencyName,
-                Date_format(r.time, '%H:%i') hour,
+                        u.name workerUserName,
-                eu.email
+                        v.numberPlate vehiclePlateNumber,
-            FROM route r
+                        Date_format(r.time, '%H:%i') hour,
-                LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
+                        eu.email,
-                LEFT JOIN agency a ON a.id = am.agencyFk
+                        v.warehouseFk
-                LEFT JOIN vehicle v ON v.id = r.vehicleFk
+                    FROM route r
-                LEFT JOIN worker w ON w.id = r.workerFk
+                        LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
-                LEFT JOIN account.user u ON u.id = w.id
+                        LEFT JOIN agency a ON a.id = am.agencyFk
-                LEFT JOIN account.emailUser eu ON eu.userFk = r.workerFk`
+                        LEFT JOIN vehicle v ON v.id = r.vehicleFk
+                        LEFT JOIN worker w ON w.id = r.workerFk
+                        LEFT JOIN account.user u ON u.id = w.id
+                        LEFT JOIN account.emailUser eu ON eu.userFk = r.workerFk
+                ) sub`
         );
 
         stmt.merge(conn.makeSuffix(filter));

modules/route/back/methods/route/getByWorker.js

@@ -28,11 +28,11 @@ module.exports = Self => {
         if (canViewAll) {
             const userConfig = await models.UserConfig.getUserConfig(ctx, myOptions);
             filterGrant = {
-                where: {'a.warehouseFk': userConfig.warehouseFk}
+                where: {'warehouseFk': userConfig.warehouseFk}
             };
         } else {
             filterGrant = {
-                where: {'r.workerFk': userId}
+                where: {'workerFk': userId}
             };
         }
 
@@ -46,16 +46,16 @@ module.exports = Self => {
                 and: [
                     {
                         or: [
-                            {'r.created': currentDate},
+                            {'created': currentDate},
-                            {'r.created': nextDay}
+                            {'created': nextDay}
                         ]
                     }
                 ]
             },
             order: [
-                'r.created ASC',
+                'created ASC',
-                'r.time ASC',
+                'time ASC',
-                'am.name ASC'
+                'agencyName ASC'
             ]
         };