diff --git a/print/templates/reports/invoice/sql/intrastat.sql b/print/templates/reports/invoice/sql/intrastat.sql index c9e419b77..b277bf0a2 100644 --- a/print/templates/reports/invoice/sql/intrastat.sql +++ b/print/templates/reports/invoice/sql/intrastat.sql @@ -3,8 +3,18 @@ SELECT ir.id code, iii.stems, iii.net netKg, iii.amount subtotal - FROM invoiceInIntrastat iii - LEFT JOIN invoiceIn ii ON ii.id = iii.invoiceInFk - LEFT JOIN invoiceOut io ON io.ref = ii.supplierRef - LEFT JOIN intrastat ir ON ir.id = iii.intrastatFk - WHERE io.`ref` = ?; + FROM vn.invoiceInIntrastat iii + LEFT JOIN vn.invoiceIn ii ON ii.id = iii.invoiceInFk + LEFT JOIN vn.invoiceOut io ON io.ref = ii.supplierRef + LEFT JOIN vn.intrastat ir ON ir.id = iii.intrastatFk + WHERE io.`ref` = ? +UNION ALL +SELECT NULL code, + 'Servicios' description, + 0 stems, + 0 netKg, + IF(CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), 0) subtotal + FROM vn.ticketService ts + JOIN vn.ticket t ON ts.ticketFk = t.id + WHERE t.refFk = ? + ORDER BY code;