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

Merge pull request 'refs #6922 change order' (!2071) from 6922-invoiceOutOrder into dev
gitea/salix/pipeline/head There was a failure building this commit Details 

Reviewed-on: #2071
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
Carlos Satorres 2024-02-22 13:40:46 +00:00
parent 3132475d9a 8a2cff5308
commit 4c7d7f2ab7
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
print/templates/reports/invoice/sql/sales.sql
View File

@ -7,7 +7,8 @@ SELECT
s.discount, s.discount,
s.itemFk, s.itemFk,
s.concept, s.concept,
tc.code vatType tc.code vatType,
it.isPackaging
FROM vn.invoiceOut io FROM vn.invoiceOut io
JOIN vn.ticket t ON t.refFk = io.ref JOIN vn.ticket t ON t.refFk = io.ref
JOIN vn.supplier su ON su.id = io.companyFk JOIN vn.supplier su ON su.id = io.companyFk
@ -34,9 +35,10 @@ SELECT
ts.quantity, ts.quantity,
ts.price, ts.price,
0 discount, 0 discount,
'', NULL,
ts.description concept, ts.description,
tc.code vatType tc.code,
NULL
FROM vn.invoiceOut io FROM vn.invoiceOut io
JOIN vn.ticket t ON t.refFk = io.ref JOIN vn.ticket t ON t.refFk = io.ref
JOIN vn.ticketService ts ON ts.ticketFk = t.id JOIN vn.ticketService ts ON ts.ticketFk = t.id
@ -46,3 +48,4 @@ SELECT
JOIN vn.supplierAccount sa ON sa.id = co.supplierAccountFk JOIN vn.supplierAccount sa ON sa.id = co.supplierAccountFk
JOIN vn.taxClass tc ON tc.id = ts.taxClassFk JOIN vn.taxClass tc ON tc.id = ts.taxClassFk
WHERE t.refFk = ? WHERE t.refFk = ?
ORDER BY (isPackaging), concept, itemFk