Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-restrictAbsencePrivs

back/methods/vn-user/update-user.js

@@ -22,7 +22,7 @@ module.exports = Self => {
                 description: 'The user email'
             }, {
                 arg: 'lang',
-                type: 'string',
+                type: 'any',
                 description: 'The user lang'
             }, {
                 arg: 'twoFactor',

db/routines/bs/procedures/waste_addSales.sql

@@ -22,7 +22,7 @@ BEGIN
 
 	REPLACE bs.waste
 		SELECT YEAR(t.shipped),
-				WEEK(t.shipped, 4),
+				WEEK(t.shipped, 6),
 				it.workerFk,
 				it.id,
 				s.itemFk,
@@ -70,6 +70,6 @@ BEGIN
 				JOIN vn.buy b ON b.id = lb.buy_id
 			WHERE t.shipped BETWEEN vDateFrom AND vDateTo
 				AND w.isManaged
-			GROUP BY YEAR(t.shipped), WEEK(t.shipped, 4), i.id;
+			GROUP BY YEAR(t.shipped), WEEK(t.shipped, 6), i.id;
 END$$
 DELIMITER ;