From 21281e09dbfbf915a7634e1cd6d81b76edace5f0 Mon Sep 17 00:00:00 2001
From: alexandre <alexandre@verdnatura.es>
Date: Thu, 2 Feb 2023 15:13:53 +0100
Subject: [PATCH 1/3] hotfix removed supplier

---
 print/templates/reports/balance-compensation/sql/client.sql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/print/templates/reports/balance-compensation/sql/client.sql b/print/templates/reports/balance-compensation/sql/client.sql
index 92e6f6cabe..b4463be234 100644
--- a/print/templates/reports/balance-compensation/sql/client.sql
+++ b/print/templates/reports/balance-compensation/sql/client.sql
@@ -8,5 +8,4 @@ SELECT
         r.payed
     FROM client c
         JOIN receipt r ON r.clientFk = c.id
-        JOIN supplier s ON c.fi = s.nif
-    WHERE r.id = ?
\ No newline at end of file
+    WHERE r.id = ?

From 2717c6420c468163fc876e710cb161b65c7e243e Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 3 Feb 2023 14:58:58 +0100
Subject: [PATCH 2/3] fix(invoiceIn_descriptor): supplier.email

---
 modules/invoiceIn/back/models/invoice-in.json |  5 -----
 modules/invoiceIn/front/card/index.js         | 14 ++++++++------
 modules/invoiceIn/front/descriptor/index.html |  2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/modules/invoiceIn/back/models/invoice-in.json b/modules/invoiceIn/back/models/invoice-in.json
index fa8a1d8f84..c6a736b06a 100644
--- a/modules/invoiceIn/back/models/invoice-in.json
+++ b/modules/invoiceIn/back/models/invoice-in.json
@@ -94,11 +94,6 @@
             "model": "Supplier",
             "foreignKey": "supplierFk"
         },
-        "supplierContact": {
-            "type": "hasMany",
-            "model": "SupplierContact",
-            "foreignKey": "supplierFk"
-        },
         "currency": {
             "type": "belongsTo",
             "model": "Currency",
diff --git a/modules/invoiceIn/front/card/index.js b/modules/invoiceIn/front/card/index.js
index c7ac08cc7e..48217faa52 100644
--- a/modules/invoiceIn/front/card/index.js
+++ b/modules/invoiceIn/front/card/index.js
@@ -6,13 +6,15 @@ class Controller extends ModuleCard {
         const filter = {
             include: [
                 {
-                    relation: 'supplier'
-                },
-                {
-                    relation: 'supplierContact',
+                    relation: 'supplier',
                     scope: {
-                        where: {
-                            email: {neq: null}
+                        include: {
+                            relation: 'contacts',
+                            scope: {
+                                where: {
+                                    email: {neq: null},
+                                }
+                            }
                         }
                     }
                 },
diff --git a/modules/invoiceIn/front/descriptor/index.html b/modules/invoiceIn/front/descriptor/index.html
index 223914c9c3..c4330fbf0a 100644
--- a/modules/invoiceIn/front/descriptor/index.html
+++ b/modules/invoiceIn/front/descriptor/index.html
@@ -40,7 +40,7 @@
         </vn-item>
         <vn-item
             ng-if="$ctrl.isAgricultural()"
-            ng-click="sendPdfConfirmation.show({email: $ctrl.entity.supplierContact[0].email})"
+            ng-click="sendPdfConfirmation.show({email: $ctrl.entity.supplier.contacts[0].email})"
             translate>
             Send agricultural receipt as PDF
         </vn-item>

From 0a9d37ca08b1ff3676aaa3bdcbe38a3a0a7c4b71 Mon Sep 17 00:00:00 2001
From: alexandre <alexandre@verdnatura.es>
Date: Mon, 6 Feb 2023 09:01:13 +0100
Subject: [PATCH 3/3] hotfix itemConfig

---
 db/changes/230202/00-itemConfig.sql | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 db/changes/230202/00-itemConfig.sql

diff --git a/db/changes/230202/00-itemConfig.sql b/db/changes/230202/00-itemConfig.sql
new file mode 100644
index 0000000000..a793997d08
--- /dev/null
+++ b/db/changes/230202/00-itemConfig.sql
@@ -0,0 +1,9 @@
+ALTER TABLE `vn`.`itemConfig` ADD defaultTag INT DEFAULT 56 NOT NULL;
+ALTER TABLE `vn`.`itemConfig` ADD CONSTRAINT itemConfig_FK FOREIGN KEY (defaultTag) REFERENCES vn.tag(id);
+ALTER TABLE `vn`.`itemConfig` ADD validPriorities varchar(50) DEFAULT '[1,2,3]' NOT NULL;
+ALTER TABLE `vn`.`itemConfig` ADD defaultPriority INT DEFAULT 2 NOT NULL;
+ALTER TABLE `vn`.`item` MODIFY COLUMN relevancy tinyint(1) DEFAULT 0 NOT NULL COMMENT 'La web ordena de forma descendiente por este campo para mostrar los artículos';
+
+INSERT INTO `salix`.`ACL`
+(model, property, accessType, permission, principalType, principalId)
+VALUES('ItemConfig', '*', 'READ', 'ALLOW', 'ROLE', 'buyer');