verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Carlos Satorres 2024-09-10 11:34:50 +02:00
parent a27e3ed60f bb27f0f1f5
commit ff328c9f0d
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
back/models/warehouse.json
View File

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

2
db/routines/vn/procedures/ticket_close.sql
View File

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

3
modules/client/back/models/client.js
View File

@ -320,7 +320,8 @@ module.exports = Self => {
// Credit management changes // 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); await Self.changeCreditManagement(ctx, finalState, changes);
const oldInstance = {}; const oldInstance = {};

6
modules/item/back/methods/fixed-price/filter.js
View File

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

2
package.json
View File

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