Merge branch 'dev' into test

debian/changelog

@@ -1,4 +1,4 @@
-hedera-web (24.14.5) stable; urgency=low
+hedera-web (24.14.6) stable; urgency=low
 
   * Initial Release.
 

forms/account/address/ui.xml

@@ -65,8 +65,8 @@
 				one-way="true"
 				one-time="true">
 				<db-model property="model">
-					SELECT id, country FROM vn.country
-						ORDER BY country
+					SELECT id, name FROM vn.country
+						ORDER BY name
 				</db-model>
 			</htk-combo>
 		</div>

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "24.14.5",
+  "version": "24.14.6",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {