From d8ea9134d4508fc96b56cfe40b107d1f5b2e2ee4 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Tue, 7 May 2024 07:29:00 +0200
Subject: [PATCH 1/3] feat: refs #7039 change country to name

---
 forms/account/address/ui.xml   | 2 +-
 forms/ecomerce/checkout/ui.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/forms/account/address/ui.xml b/forms/account/address/ui.xml
index 66c71144..ff216ee3 100644
--- a/forms/account/address/ui.xml
+++ b/forms/account/address/ui.xml
@@ -65,7 +65,7 @@
 				one-way="true"
 				one-time="true">
 				<db-model property="model">
-					SELECT id, country FROM vn.country
+					SELECT id, name FROM vn.country
 						ORDER BY country
 				</db-model>
 			</htk-combo>
diff --git a/forms/ecomerce/checkout/ui.xml b/forms/ecomerce/checkout/ui.xml
index 8506152f..cfe7f03e 100644
--- a/forms/ecomerce/checkout/ui.xml
+++ b/forms/ecomerce/checkout/ui.xml
@@ -120,7 +120,7 @@
 							form-id="iter"
 							on-change="onAddressChange">
 							<db-model property="model" id="addresses">
-								SELECT a.id, a.nickname, p.name province, a.city, a.street, a.isActive, c.country
+								SELECT a.id, a.nickname, p.name province, a.city, a.street, a.isActive, c.name
 									FROM myAddress a
 										LEFT JOIN vn.province p ON p.id = a.provinceFk
 										JOIN vn.country c ON c.id = p.countryFk

From 359ddb5d180e55d89407f04cc75f544514c2490c Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Tue, 7 May 2024 14:05:44 +0200
Subject: [PATCH 2/3] Fix

---
 forms/account/address/ui.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forms/account/address/ui.xml b/forms/account/address/ui.xml
index ff216ee3..f18e96a5 100644
--- a/forms/account/address/ui.xml
+++ b/forms/account/address/ui.xml
@@ -66,7 +66,7 @@
 				one-time="true">
 				<db-model property="model">
 					SELECT id, name FROM vn.country
-						ORDER BY country
+						ORDER BY name
 				</db-model>
 			</htk-combo>
 		</div>

From 29e800ea302e9ac8b59cc8ed539bad476ff09294 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 27 May 2024 07:15:44 +0200
Subject: [PATCH 3/3] refs #7039 Version increased

---
 debian/changelog | 2 +-
 package.json     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce2d6687..85ed2fd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (24.14.3) stable; urgency=low
+hedera-web (24.14.6) stable; urgency=low
 
   * Initial Release.
 
diff --git a/package.json b/package.json
index e09b7755..45911592 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "24.14.3",
+  "version": "24.14.6",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {