From eb215274e4ac17ff466351f68a68d80ff87532ed Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan.ferrer.toribio@gmail.com>
Date: Thu, 16 Nov 2017 16:14:19 +0100
Subject: [PATCH] Referenced new i18n tables

---
 debian/changelog              |  2 +-
 forms/ecomerce/catalog/ui.xml | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7ad38bd..714c5b2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (1.405.10) stable; urgency=low
+hedera-web (1.405.11) stable; urgency=low
 
   * Initial Release.
 
diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml
index 64920f5f..6bc8705d 100755
--- a/forms/ecomerce/catalog/ui.xml
+++ b/forms/ecomerce/catalog/ui.xml
@@ -71,12 +71,12 @@
 			CALL bionic_calc ();
 			SELECT a.Id_Article item_id, a.description, b.available, b.price,
 			b.producer, a.Foto, a.Article, a.Categoria, a.Medida,
-			IF(a.Tallos > 1, a.Tallos, NULL) Tallos, c.str color
+			IF(a.Tallos > 1, a.Tallos, NULL) Tallos, c.name color
 				FROM tmp.bionic_item b
 					JOIN vn2008.Articles a ON a.Id_Article = b.item_id
 		    		LEFT JOIN vn2008.producer p ON p.producer_id = a.producer_id
-					LEFT JOIN vn_locale.color_view c ON c.color_id = a.Color
-					LEFT JOIN vn_locale.origin_view o ON o.origin_id = a.id_origen
+					LEFT JOIN vn.inkL10n c ON c.id = a.Color
+					LEFT JOIN vn.originL10n o ON o.id = a.id_origen
 				WHERE b.available > 0
 				ORDER BY a.relevancy DESC, a.Article, a.Medida
 				LIMIT 400;
@@ -99,9 +99,9 @@
 			batch="card-batch"
 			on-status-changed-after="onStatusChange">
 			<custom>
-				SELECT a.description, o.str origin
+				SELECT a.description, o.name origin
 					FROM vn2008.Articles a
-						LEFT JOIN vn_locale.origin_view o ON o.origin_id = a.id_origen
+						LEFT JOIN vn.originL10n o ON o.id = a.id_origen
 					WHERE a.Id_Article = #item
 			</custom>
 		</db-model>
@@ -217,9 +217,9 @@
 						property="model"
 						on-status-changed="refreshTitleColor">
 						<custom>
-							SELECT r.id, l.str name, r.color
+							SELECT r.id, l.name, r.color
 								FROM vn2008.reinos r
-									LEFT JOIN vn_locale.realm_view l ON l.realm_id = r.id
+									JOIN vn.itemCategoryL10n l ON l.id = r.id
 								WHERE r.display != FALSE
 								ORDER BY name
 						</custom>
@@ -249,11 +249,11 @@
 					on-status-changed="refreshTitle">
 					<custom>
 						CALL item_available ();
-						SELECT DISTINCT t.tipo_id, l.str name
+						SELECT DISTINCT t.tipo_id, l.name
 							FROM vn2008.Tipos t
 								JOIN vn2008.Articles a ON a.tipo_id = t.tipo_id
-								LEFT JOIN vn_locale.family_view l ON l.family_id = t.tipo_id
 								JOIN tmp.item_available i ON i.item_id = a.Id_Article
+								JOIN vn.itemTypeL10n l ON l.id = t.tipo_id
 							WHERE #filter
 							ORDER BY name
 					</custom>
@@ -271,11 +271,11 @@
 				<db-model property="model" auto-load="false" result-index="1">
 					<custom>
 						CALL item_available ();
-						SELECT DISTINCT c.Id_Tinta, l.str name
+						SELECT DISTINCT c.Id_Tinta, l.name
 							FROM vn2008.Tintas c
 								JOIN vn2008.Articles a ON a.Color = c.Id_Tinta
 								JOIN vn2008.Tipos t ON t.tipo_id = a.tipo_id
-								LEFT JOIN vn_locale.color_view l ON l.color_id = c.Id_Tinta
+								JOIN vn.colorL10n l ON l.id = c.Id_Tinta
 								JOIN tmp.item_available i ON i.item_id = a.Id_Article
 							WHERE #filter
 							ORDER BY name
@@ -320,11 +320,11 @@
 				<db-model property="model" auto-load="false" result-index="1">
 					<custom>
 						CALL item_available ();
-						SELECT DISTINCT o.id, l.str name, o.Abreviatura
+						SELECT DISTINCT o.id, l.name, o.Abreviatura
 							FROM vn2008.Origen o
 								JOIN vn2008.Articles a ON a.id_origen = o.id
 								JOIN vn2008.Tipos t ON t.tipo_id = a.tipo_id
-								LEFT JOIN vn_locale.origin_view l ON l.origin_id = o.id
+								JOIN vn.originL10n l ON l.id = o.id
 								JOIN tmp.item_available i ON i.item_id = a.Id_Article
 							WHERE #filter
 							ORDER BY name