Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

2020-04-09 20:05:12 +02:00 · 2020-04-09 20:05:12 +02:00 · ad861c2db3
parent 5909a77587 87f0a7e417
commit ad861c2db3
1 changed files with 1 additions and 0 deletions
--- a/print/templates/reports/delivery-note/delivery-note.js
+++ b/print/templates/reports/delivery-note/delivery-note.js
@ -72,6 +72,7 @@ module.exports = {
                    p.name province
                FROM ticket t
                    JOIN address a ON a.clientFk = t.clientFk
+                        AND a.id = t.addressFk
                    LEFT JOIN province p ON p.id = a.provinceFk
                WHERE t.id = ?`, [ticketId]);
        },