From 1cefe817f55096390ce68b63f377a80c494764c6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 11 Jun 2024 12:06:44 +0200
Subject: [PATCH 1/3] feat: add editZone ACL for buyer

---
 db/versions/11096-blackChico/00-addBuyerAcl.sql | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 db/versions/11096-blackChico/00-addBuyerAcl.sql

diff --git a/db/versions/11096-blackChico/00-addBuyerAcl.sql b/db/versions/11096-blackChico/00-addBuyerAcl.sql
new file mode 100644
index 0000000000..1b4adee5cc
--- /dev/null
+++ b/db/versions/11096-blackChico/00-addBuyerAcl.sql
@@ -0,0 +1,8 @@
+INSERT INTO salix.ACL
+	SET 
+		model = 'Ticket',
+		property = 'editZone',
+		accessType = 'WRITE',
+		permission = 'ALLOW',
+		principalType = 'ROLE',
+		principalId = 'buyer';
\ No newline at end of file

From 8039530ab42db21e6e76bb72ca4ae90e1fda0e87 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Tue, 11 Jun 2024 14:15:10 +0200
Subject: [PATCH 2/3] fix: refs #7039 fix item-tax

---
 modules/item/front/tax/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/item/front/tax/index.js b/modules/item/front/tax/index.js
index b72fbefa39..2d70414ab3 100644
--- a/modules/item/front/tax/index.js
+++ b/modules/item/front/tax/index.js
@@ -11,7 +11,7 @@ export default class Controller extends Section {
             fields: ['id', 'countryFk', 'taxClassFk'],
             include: [{
                 relation: 'country',
-                scope: {fields: ['country']}
+                scope: {fields: ['name']}
             }]
         };
 

From 79c922300bd53b0be596d9bf28e65757c4a8401b Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 11 Jun 2024 14:50:47 +0200
Subject: [PATCH 3/3] hotfix #6408

---
 modules/ticket/back/methods/ticket/state.js | 22 ++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/ticket/back/methods/ticket/state.js b/modules/ticket/back/methods/ticket/state.js
index 9b0b862f24..eede02d74d 100644
--- a/modules/ticket/back/methods/ticket/state.js
+++ b/modules/ticket/back/methods/ticket/state.js
@@ -26,6 +26,7 @@ module.exports = Self => {
         const models = Self.app.models;
         const myOptions = {};
         let tx;
+        let newStateOrder;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -40,11 +41,16 @@ module.exports = Self => {
                 throw new UserError('State cannot be blank');
 
             if (params.stateFk) {
-                const {code} = await models.State.findById(params.stateFk, {fields: ['code']}, myOptions);
+                const {code, order} = await models.State.findById(
+                    params.stateFk,
+                    {fields: ['code', 'order']},
+                    myOptions);
                 params.code = code;
+                newStateOrder = order;
             } else {
-                const {id} = await models.State.findOne({where: {code: params.code}}, myOptions);
+                const {id, order} = await models.State.findOne({where: {code: params.code}}, myOptions);
                 params.stateFk = id;
+                newStateOrder = order;
             }
 
             if (!params.userFk) {
@@ -75,7 +81,9 @@ module.exports = Self => {
             }, myOptions);
 
             const salesPersonFk = ticket.client().salesPersonFk;
-            if (salesPersonFk) {
+            const stateChecked = await models.State.findOne({fields: ['order'], where: {code: 'CHECKED'}});
+
+            if (salesPersonFk && newStateOrder >= stateChecked.order) {
                 const sales = await Self.rawSql(`
                     SELECT DISTINCT s.id,
                             s.itemFk,
@@ -83,17 +91,9 @@ module.exports = Self => {
                             s.originalQuantity AS oldQuantity,
                             s.quantity AS newQuantity
                         FROM vn.sale s
-                            JOIN vn.saleTracking st ON st.saleFk = s.id
-                            JOIN vn.ticket t ON t.id = s.ticketFk
-                            JOIN vn.client c ON c.id = t.clientFk
-                            JOIN vn.ticketState ts ON ts.ticketFk = t.id
-                            JOIN vn.state s2 ON s2.id = ts.stateFk
                         WHERE s.ticketFk = ?
-                            AND st.isChecked
                             AND s.originalQuantity IS NOT NULL
                             AND s.originalQuantity <> s.quantity
-                            AND s2.\`order\` < (SELECT \`order\` FROM vn.state WHERE code = 'CHECKED')
-                        ORDER BY st.created DESC
                     `, [params.ticketFk], myOptions);
 
                 let changes = '';