Merge branch 'dev' into 4074-useAcls

db/.pullinfo.json

@@ -9,7 +9,7 @@
     },
     "vn": {
       "view": {
-        "expeditionPallet_Print": "ced2b84a114fcb99fce05f0c34f4fc03f3fa387bef92621be1bc306608a84345"
+        "expeditionPallet_Print": "99f75145ac2e7b612a6d71e74b6e55f194a465780fd9875a15eb01e6596b447e"
       }
     }
   }

db/versions/11124-greenBamboo/01-firstScript.sql

@@ -1,4 +1,5 @@
 -- Calculamos todos los volumenes de todos los tickets una sola vez
+/* Se ejecutará el dia de test - master manualmente para no hacer lenta la subida
 CREATE OR REPLACE TEMPORARY TABLE tmp.tTicketVolume
 	(PRIMARY KEY (id))
 	ENGINE = MEMORY
@@ -14,3 +15,4 @@ UPDATE vn.ticket t
 	SET t.volume = tv.volume;
 
 DROP TEMPORARY TABLE tmp.tTicketVolume;
+*/

modules/client/back/models/client.js

@@ -320,7 +320,8 @@ module.exports = Self => {
 
         // Credit management changes
 
-        if (changes?.rating >= 0 || changes?.recommendedCredit >= 0)
+        if ((changes?.rating != null && changes.rating >= 0)
+                || (changes?.recommendedCredit != null && changes.recommendedCredit >= 0))
             await Self.changeCreditManagement(ctx, finalState, changes);
 
         const oldInstance = {};

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "24.36.0",
+    "version": "24.40.0",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",