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

MASTER_hotfix_invoiceOut #1197

Merged
vicent merged 2 commits from MASTER_hotfix_invoiceOut into master 2022-12-02 12:25:37 +00:00
Conversation 0 Commits 2 Files Changed 3 +41 -34
3 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,7 +138,7 @@ module.exports = Self => {
recipient: invoiceOut.client().email recipient: invoiceOut.client().email
}; };
try { try {
await models.InvoiceOut.invoiceEmail(ctx); await models.InvoiceOut.invoiceEmail(ctx, invoiceOut.ref);
} catch (err) {} } catch (err) {}
return invoiceId; return invoiceId;

2
print/templates/reports/invoice/invoice.js
View File

@ -82,7 +82,7 @@ module.exports = {
return this.rawSqlFromDef(`taxes`, [reference]); return this.rawSqlFromDef(`taxes`, [reference]);
}, },
fetchIntrastat(reference) { fetchIntrastat(reference) {
return this.rawSqlFromDef(`intrastat`, [reference, reference, reference, reference]); return this.rawSqlFromDef(`intrastat`, [reference, reference, reference, reference, reference]);
}, },
fetchRectified(reference) { fetchRectified(reference) {
return this.rawSqlFromDef(`rectified`, [reference]); return this.rawSqlFromDef(`rectified`, [reference]);

15
print/templates/reports/invoice/sql/intrastat.sql
View File

@ -1,4 +1,9 @@
SELECT *
FROM invoiceOut io
JOIN invoiceOutSerial ios ON io.serial = ios.code
JOIN
(SELECT (SELECT
t.refFk,
ir.id code, ir.id code,
ir.description description, ir.description description,
CAST(SUM(IFNULL(i.stems, 1) * s.quantity) AS DECIMAL(10,2)) stems, CAST(SUM(IFNULL(i.stems, 1) * s.quantity) AS DECIMAL(10,2)) stems,
@ -19,14 +24,16 @@
WHERE t.refFk = ? WHERE t.refFk = ?
AND i.intrastatFk AND i.intrastatFk
GROUP BY i.intrastatFk GROUP BY i.intrastatFk
ORDER BY i.intrastatFk)
UNION ALL UNION ALL
(SELECT SELECT
NULL AS refFk,
NULL AS code, NULL AS code,
NULL AS description, NULL AS description,
0 AS stems, 0 AS stems,
0 AS netKg, 0 AS netKg,
CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)) AS subtotal IF(CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), 0) AS subtotal
FROM vn.ticketService ts FROM vn.ticketService ts
JOIN vn.ticket t ON ts.ticketFk = t.id JOIN vn.ticket t ON ts.ticketFk = t.id
WHERE t.refFk = ?); WHERE t.refFk = ?) sub
WHERE io.`ref` = ? AND ios.isCEE
ORDER BY sub.code;