verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 62 Releases Wiki Activity

7525-devToTest #2542

Merged
alexm merged 231 commits from 7525-devToTest into test 2024-06-04 07:59:34 +00:00
Conversation 0 Commits 231 Files Changed 103 +7 -7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c136f2783a - Show all commits

3
db/versions/11065-yellowChrysanthemum/01-modifyInvoiceInAcls.sql
View File

@ -18,5 +18,4 @@ VALUES
('InvoiceIn', 'corrective', 'WRITE', 'ALLOW', 'ROLE', 'buyer'),
('InvoiceIn', 'exchangeRateUpdate', 'WRITE', 'ALLOW', 'ROLE', 'buyer'),
('InvoiceIn', 'invoiceInEmail', 'WRITE', 'ALLOW', 'ROLE', 'buyer'),
('InvoiceIn', 'toBook', 'WRITE', 'ALLOW', 'ROLE', 'buyer'),
('InvoiceIn', 'toUnbook', 'WRITE', 'ALLOW', 'ROLE', 'buyer');
('InvoiceIn', 'toBook', 'WRITE', 'ALLOW', 'ROLE', 'buyer');

11
modules/invoiceIn/back/methods/invoice-in/toUnbook.js
View File

@ -47,10 +47,11 @@ module.exports = Self => {
}
}, myOptions);
if (bookEntry?.ASIEN) {
accountingEntries = await models.Xdiario.count({ASIEN: bookEntry.ASIEN}, myOptions);
let asien = bookEntry?.ASIEN;
if (asien) {
accountingEntries = await models.Xdiario.count({ASIEN: asien}, myOptions);
await models.Xdiario.destroyAll({ASIEN: bookEntry.ASIEN}, myOptions);
await models.Xdiario.destroyAll({ASIEN: asien}, myOptions);
await Self.updateAll({id: invoiceInId}, {isBooked: false}, myOptions);
} else {
const linkedBookEntry = await models.Xdiario.findOne({
@ -61,14 +62,14 @@ module.exports = Self => {
}
}, myOptions);
bookEntry = linkedBookEntry?.ASIEN;
asien = linkedBookEntry?.ASIEN;
isLinked = true;
}
if (tx) await tx.commit();
return {
isLinked,
bookEntry: bookEntry?.ASIEN,
bookEntry: asien,
accountingEntries
};
} catch (e) {