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

8093-devToTest_2442_3 #3100

Merged
alexm merged 284 commits from 8093-devToTest_2442_3 into test 2024-10-15 06:51:43 +00:00
Conversation 0 Commits 284 Files Changed 295 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 36e1cfd51a - Show all commits

8
modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
View File

@ -64,7 +64,7 @@ module.exports = Self => {
try { try {
const client = await models.Client.findById(args.clientId, { const client = await models.Client.findById(args.clientId, {
fields: ['id', 'hasToInvoiceByAddress'] fields: ['id', 'hasToInvoiceByAddress']
}, options); }, myOptions);
if (client.hasToInvoiceByAddress) { if (client.hasToInvoiceByAddress) {
await Self.rawSql('CALL ticketToInvoiceByAddress(?, ?, ?, ?)', [ await Self.rawSql('CALL ticketToInvoiceByAddress(?, ?, ?, ?)', [
@ -72,13 +72,13 @@ module.exports = Self => {
args.maxShipped, args.maxShipped,
args.addressId, args.addressId,
args.companyFk args.companyFk
], options); ], myOptions);
} else { } else {
await Self.rawSql('CALL invoiceFromClient(?, ?, ?)', [ await Self.rawSql('CALL invoiceFromClient(?, ?, ?)', [
args.maxShipped, args.maxShipped,
client.id, client.id,
args.companyFk args.companyFk
], options); ], myOptions);
} }
const invoiceId = await models.Ticket.makeInvoice( const invoiceId = await models.Ticket.makeInvoice(
@ -87,7 +87,7 @@ module.exports = Self => {
args.companyFk, args.companyFk,
args.invoiceDate, args.invoiceDate,
null, null,
options myOptions
); );
if (tx) await tx.commit(); if (tx) await tx.commit();