back/models/warehouse.json

@@ -25,6 +25,9 @@
     "isManaged": {
       "type": "boolean"
     },
+    "isDestiny": {
+      "type": "boolean"
+    },
     "countryFk": {
       "type": "number"
     }

db/.pullinfo.json

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

db/routines/vn/procedures/ticket_close.sql

@@ -85,7 +85,7 @@ BEGIN
 
 		IF(vHasDailyInvoice) AND vHasToInvoice THEN
 			SELECT invoiceSerial(vClientFk, vCompanyFk, 'quick') INTO vSerial;
-			IF NOT vSerial THEN 
+			IF vSerial IS NULL THEN 
 				CALL util.throw('Cannot booking without a serial');
 			END IF;
 

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;
+*/

db/versions/11216-salmonPaniculata/00-firstScript.sql

@@ -0,0 +1,12 @@
+-- Place your SQL code here
+DELETE FROM salix.ACL WHERE model = 'Province' LIMIT 1;
+DELETE FROM salix.ACL WHERE model = 'Town' LIMIT 1;
+
+UPDATE salix.ACL SET accessType = 'READ' WHERE model = 'BankEntity';
+INSERT INTO salix.ACL 
+	SET model = 'BankEntity',
+		property = '*',
+		accessType = 'WRITE',
+		permission = 'ALLOW',
+		principalType = 'ROLE',
+		principalId = 'financial';

e2e/paths/02-client/04_edit_billing_data.spec.js

@@ -35,6 +35,14 @@ describe('Client Edit billing data path', () => {
 
     it(`should attempt to edit the billing data without an IBAN but fail`, async() => {
         await page.autocompleteSearch($.payMethod, 'PayMethod with IBAN');
+        await page.waitToClick($.saveButton);
+        const message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('That payment method requires an IBAN');
+    });
+
+    it(`should edit the billing data and save the form`, async() => {
+        await page.autocompleteSearch($.payMethod, 'PayMethod five');
         await page.autocompleteSearch($.swiftBic, 'BBKKESMMMMM');
         await page.clearInput($.dueDay);
         await page.write($.dueDay, '60');
@@ -45,10 +53,13 @@ describe('Client Edit billing data path', () => {
         await page.waitToClick($.saveButton);
         const message = await page.waitForSnackbar();
 
-        expect(message.text).toContain('That payment method requires an IBAN');
+        expect(message.text).toContain('Notification sent!');
     });
 
     it(`should create a new BIC code`, async() => {
+        await page.loginAndModule('financial', 'client');
+        await page.accessToSearchResult('Bruce Banner');
+        await page.accessToSection('client.card.billingData');
         await page.waitToClick($.newBankEntityButton);
         await page.write($.newBankEntityName, 'Gotham City Bank');
         await page.write($.newBankEntityBIC, 'GTHMCT');
@@ -66,7 +77,7 @@ describe('Client Edit billing data path', () => {
     it(`should confirm the IBAN pay method was sucessfully saved`, async() => {
         const payMethod = await page.waitToGetProperty($.payMethod, 'value');
 
-        expect(payMethod).toEqual('PayMethod with IBAN');
+        expect(payMethod).toEqual('PayMethod five');
     });
 
     it(`should clear the BIC code field, update the IBAN to see how he BIC code autocompletes`, async() => {
@@ -79,14 +90,6 @@ describe('Client Edit billing data path', () => {
         expect(automaticCode).toEqual('CAIXESBB');
     });
 
-    it(`should save the form with all its new data`, async() => {
-        await page.waitForWatcherData($.watcher);
-        await page.waitToClick($.saveButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Notification sent!');
-    });
-
     it('should confirm the billing data have been edited', async() => {
         const dueDate = await page.waitToGetProperty($.dueDay, 'value');
         const IBAN = await page.waitToGetProperty($.IBAN, 'value');
@@ -94,7 +97,9 @@ describe('Client Edit billing data path', () => {
         const receivedCoreLCR = await page.checkboxState($.receivedCoreLCRCheckbox);
         const receivedCoreVNL = await page.checkboxState($.receivedCoreVNLCheckbox);
         const receivedB2BVNL = await page.checkboxState($.receivedB2BVNLCheckbox);
+        const payMethod = await page.waitToGetProperty($.payMethod, 'value');
 
+        expect(payMethod).toEqual('PayMethod five');
         expect(dueDate).toEqual('60');
         expect(IBAN).toEqual('ES9121000418450200051332');
         expect(swiftBic).toEqual('CAIXESBB');

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 = {};

modules/item/back/methods/fixed-price/filter.js

@@ -128,6 +128,9 @@ module.exports = Self => {
                 return {[param]: value};
             }
         });
+        if (ctx.req.query?.showBadDates === 'true')
+            where['fp.started'] = {gte: Date.vnNew()};
+
         filter = mergeFilters(filter, {where});
 
         const stmts = [];
@@ -136,6 +139,7 @@ module.exports = Self => {
             SELECT DISTINCT fp.id,
                 fp.itemFk,
                 fp.warehouseFk,
+                w.name warehouseName,
                 fp.rate2,
                 fp.rate3,
                 fp.started,
@@ -159,6 +163,7 @@ module.exports = Self => {
             FROM priceFixed fp
             JOIN item i ON i.id = fp.itemFk
             JOIN itemType it ON it.id = i.typeFk
+            JOIN warehouse w ON fp.warehouseFk = w.id
         `);
 
         if (ctx.args.tags) {
@@ -184,7 +189,6 @@ module.exports = Self => {
         }
 
         stmt.merge(conn.makeSuffix(filter));
-
         const fixedPriceIndex = stmts.push(stmt) - 1;
         const sql = ParameterizedSQL.join(stmts, ';');
         const result = await conn.executeStmt(sql, myOptions);

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",