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

7691-testToMaster #2703

Merged
alexm merged 268 commits from 7691-testToMaster into master 2024-07-09 05:38:28 +00:00
Conversation 0 Commits 268 Files Changed 185 +3 -1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f1f57a388d - Show all commits

2
db/versions/11117-blueGalax/00-firstScript.sql Normal file
View File

@ -0,0 +1,2 @@
-- Place your SQL code here
ALTER TABLE vn.routesMonitor DROP COLUMN expeditionTruckFk;

2
modules/ticket/back/methods/ticket/addSale.js
View File

@ -70,7 +70,7 @@ module.exports = Self => {
quantity: quantity quantity: quantity
}, myOptions); }, myOptions);
await Self.rawSql('CALL vn.sale_calculateComponent(?, NULL)', [newSale.id], myOptions); await Self.rawSql('CALL vn.sale_calculateComponent(?, )', [newSale.id], myOptions);
await Self.rawSql('CALL vn.ticket_recalc(?, NULL)', [id], myOptions); await Self.rawSql('CALL vn.ticket_recalc(?, NULL)', [id], myOptions);
const sale = await models.Sale.findById(newSale.id, { const sale = await models.Sale.findById(newSale.id, {