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

refactor: refs #6942 toUnbook & drop buyer acls

This commit is contained in:
Jorge Penadés 2024-05-27 12:34:27 +02:00
parent 0fa6074278
commit c136f2783a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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