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

8032-devToTest_2440 #3009

Merged
alexm merged 262 commits from 8032-devToTest_2440 into test 2024-09-24 09:34:49 +00:00
Conversation 0 Commits 262 Files Changed 156 +6 -5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6c9676ce9c - Show all commits

11
modules/ticket/back/methods/ticket/setWeight.js
View File

@ -70,12 +70,13 @@ module.exports = Self => {
const [{taxArea}] = await Self.rawSql('SELECT clientTaxArea(?,?) taxArea', const [{taxArea}] = await Self.rawSql('SELECT clientTaxArea(?,?) taxArea',
[ticket.clientFk, ticket.warehouseFk], myOptions); [ticket.clientFk, ticket.warehouseFk], myOptions);
if (ticketState.alertLevel >= packedState.alertLevel && taxArea == 'WORLD' && client.hasDailyInvoice) { const isInvoiceable = ticketState.alertLevel >= packedState.alertLevel &&
await Self.invoiceTicketsAndPdf(ctx, [ticketId], null, myOptions); taxArea == 'WORLD' && client.hasDailyInvoice;
return true;
}
if (tx) await tx.commit(); if (tx) await tx.commit();
return false; if (isInvoiceable) await Self.invoiceTicketsAndPdf(ctx, [ticketId]);
return isInvoiceable;
} catch (e) { } catch (e) {
if (tx) await tx.rollback(); if (tx) await tx.rollback();
throw e; throw e;