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

8267-devToTest #3270

Merged
alexm merged 131 commits from 8267-devToTest into test 2024-12-03 12:18:21 +00:00
Conversation 0 Commits 131 Files Changed 87 +2 -1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cde3c8c50a - Show all commits

3
modules/ticket/back/methods/ticket/filter.js
View File

@ -265,7 +265,8 @@ module.exports = Self => {
FROM sale s2 FROM sale s2
JOIN item i2 ON i2.id = s2.itemFk JOIN item i2 ON i2.id = s2.itemFk
WHERE s2.ticketFk = t.id WHERE s2.ticketFk = t.id
) AS packing ) AS packing,
c.credit
FROM ticket t FROM ticket t
LEFT JOIN invoiceOut io ON t.refFk = io.ref LEFT JOIN invoiceOut io ON t.refFk = io.ref
LEFT JOIN zone z ON z.id = t.zoneFk LEFT JOIN zone z ON z.id = t.zoneFk