Merge pull request 'feat: refs #8138 reduce credit on risk' (!3215 ) from 8138-feat-reduce-credit-on-risk into dev

Reviewed-on: #3215 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Merge branch 'dev' into 8138-feat-reduce-credit-on-risk
2024-11-20 11:21:09 +00:00 · 2024-11-20 06:46:46 +00:00 · 2024-11-19 07:02:11 +00:00 · 2024-11-19 08:01:41 +01:00
1 changed files with 2 additions and 1 deletions
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@ -265,7 +265,8 @@ module.exports = Self => {
                            FROM sale s2
                            JOIN item i2 ON i2.id = s2.itemFk
                            WHERE s2.ticketFk = t.id
-                        ) AS packing
+                        ) AS packing,
+                        c.credit
                   FROM ticket t
                       LEFT JOIN invoiceOut io ON t.refFk = io.ref
                       LEFT JOIN zone z ON z.id = t.zoneFk
Author	SHA1	Message	Date
Pablo Natek	cde3c8c50a	Merge pull request 'feat: refs #8138 reduce credit on risk' (!3215 ) from 8138-feat-reduce-credit-on-risk into dev gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #3215 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-11-20 11:21:09 +00:00
Pablo Natek	5e52b3b596	Merge branch 'dev' into 8138-feat-reduce-credit-on-risk gitea/salix/pipeline/pr-dev This commit looks good Details	2024-11-20 06:46:46 +00:00
Pablo Natek	a3f92a284f	Merge branch 'dev' into 8138-feat-reduce-credit-on-risk gitea/salix/pipeline/pr-dev This commit looks good Details	2024-11-19 07:02:11 +00:00
Pablo Natek	2f93da199a	feat: refs #8138 reduce credit on risk gitea/salix/pipeline/pr-dev Build queued... Details	2024-11-19 08:01:41 +01:00