From e96fa75356caf77cbd95c9c0fa27278bc10b2f38 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Thu, 18 Jul 2024 09:22:27 +0200
Subject: [PATCH 1/3] fix: refs #7039 country order

---
 modules/invoiceIn/front/intrastat/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/invoiceIn/front/intrastat/index.html b/modules/invoiceIn/front/intrastat/index.html
index fc0139303..b15fdf543 100644
--- a/modules/invoiceIn/front/intrastat/index.html
+++ b/modules/invoiceIn/front/intrastat/index.html
@@ -10,7 +10,7 @@
     auto-load="true"
     url="Countries"
     data="countries"
-    order="country">
+    order="name">
 </vn-crud-model>
 <vn-crud-model
     auto-load="true"

From 409daaf5841face7ff1e829f2511ca0e59edb598 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 18 Jul 2024 10:13:21 +0200
Subject: [PATCH 2/3] feat: refs #6403 add address mobile

---
 back/methods/mrw-config/createShipment.ejs | 2 +-
 back/methods/mrw-config/createShipment.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/back/methods/mrw-config/createShipment.ejs b/back/methods/mrw-config/createShipment.ejs
index 65326112b..52ccc859c 100644
--- a/back/methods/mrw-config/createShipment.ejs
+++ b/back/methods/mrw-config/createShipment.ejs
@@ -25,7 +25,7 @@
                     </mrw:Direccion>
                     <mrw:Nif><%= expeditionData.fi %></mrw:Nif>
                     <mrw:Nombre><%= expeditionData.clientName %></mrw:Nombre>
-                    <mrw:Telefono><%= expeditionData.phone %></mrw:Telefono>
+                    <mrw:Telefono><%= expeditionData.mobile %></mrw:Telefono>
                     <mrw:Observaciones><%= expeditionData.deliveryObservation %></mrw:Observaciones>
                 </mrw:DatosEntrega>
                 <mrw:DatosServicio>
diff --git a/back/methods/mrw-config/createShipment.js b/back/methods/mrw-config/createShipment.js
index 900e1fc0f..4db0d0c7d 100644
--- a/back/methods/mrw-config/createShipment.js
+++ b/back/methods/mrw-config/createShipment.js
@@ -47,7 +47,7 @@ module.exports = Self => {
                 co.code countryCode,
                 c.fi,
                 c.name clientName,
-                c.phone,
+                a.mobile,
                 DATE_FORMAT(t.shipped, '%d/%m/%Y') created,
                 t.shipped,
                 CONCAT( e.ticketFk, LPAD(e.counter, mc.counterWidth, '0')) reference,

From ba5c44994d19103206d284d0900858f9dd661e6c Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 18 Jul 2024 13:45:06 +0200
Subject: [PATCH 3/3] feat: refs #7686 Added cascade on update
 vn.state.alertLevel

---
 db/versions/11160-blueRoebelini/00-firstScript.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 db/versions/11160-blueRoebelini/00-firstScript.sql

diff --git a/db/versions/11160-blueRoebelini/00-firstScript.sql b/db/versions/11160-blueRoebelini/00-firstScript.sql
new file mode 100644
index 000000000..235eda7fd
--- /dev/null
+++ b/db/versions/11160-blueRoebelini/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.state DROP FOREIGN KEY state_ibfk_1;
+ALTER TABLE vn.state ADD CONSTRAINT state_ibfk_1 FOREIGN KEY (alertLevel) REFERENCES vn.alertLevel(id) ON DELETE RESTRICT ON UPDATE CASCADE;