From 38a6a7a3ac44b80dcc4b1ed0fd4aeec1aa647c75 Mon Sep 17 00:00:00 2001
From: Juan <juan@pc-juan.verdnatura.es>
Date: Thu, 13 Sep 2018 13:23:50 +0200
Subject: [PATCH] Addresses without province or country are now visible

---
 debian/changelog                  | 2 +-
 forms/account/address-list/ui.xml | 3 +--
 forms/account/address/ui.xml      | 3 +--
 package.json                      | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 431c8e0d..1deae95f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (1.406.19) stable; urgency=low
+hedera-web (1.406.20) stable; urgency=low
 
   * Initial Release.
 
diff --git a/forms/account/address-list/ui.xml b/forms/account/address-list/ui.xml
index 4623a1a6..f43d945a 100644
--- a/forms/account/address-list/ui.xml
+++ b/forms/account/address-list/ui.xml
@@ -11,10 +11,9 @@
 	<db-model id="addresses" updatable="true">
 		<custom>
 			SELECT a.id, a.nickname, p.name province, a.postalCode,
-			a.city, a.street, a.isActive, c.country
+			a.city, a.street, a.isActive
 				FROM myAddress a
 				LEFT JOIN vn.province p ON p.id = a.provinceFk
-				JOIN vn.country c ON c.id = p.countryFk
 					WHERE a.isActive
 		</custom>
 	</db-model>
diff --git a/forms/account/address/ui.xml b/forms/account/address/ui.xml
index 8e742686..a309a580 100644
--- a/forms/account/address/ui.xml
+++ b/forms/account/address/ui.xml
@@ -10,10 +10,9 @@
 			mode="ON_DEMAND"
 			on-operations-done="onOperationsDone">
 			SELECT a.id, a.street, a.nickname, a.city,
-					a.postalCode, a.provinceFk, c.id countryFk
+					a.postalCode, a.provinceFk, p.countryFk
 				FROM myAddress a
 					LEFT JOIN vn.province p ON p.id = a.provinceFk
-					JOIN vn.country c ON c.id = p.countryFk
 				WHERE a.id = #address
 			<sql-batch property="batch">
 				<custom>
diff --git a/package.json b/package.json
index 5ace6b76..c2c8fab5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "1.406.19",
+  "version": "1.406.20",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {