From 470b3d45cc38fa33225c6a0aae1d1c41701a8f57 Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Sat, 20 Jan 2018 10:03:37 +0100
Subject: [PATCH] IDEMPIERE-3580 Advanced Zoom Across

---
 .../src/org/adempiere/model/GenericZoomProvider.java           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/org.adempiere.base/src/org/adempiere/model/GenericZoomProvider.java b/org.adempiere.base/src/org/adempiere/model/GenericZoomProvider.java
index 8f5c1fb486..80d8c808b3 100644
--- a/org.adempiere.base/src/org/adempiere/model/GenericZoomProvider.java
+++ b/org.adempiere.base/src/org/adempiere/model/GenericZoomProvider.java
@@ -87,7 +87,7 @@ public class GenericZoomProvider implements IZoomProvider {
 			+ "JOIN AD_Window_Trl w ON (w.AD_Window_ID=w0.AD_Window_ID AND w.AD_Language=?) "
 			+ "JOIN AD_Column c ON (t.AD_Table_ID=c.AD_Table_ID AND c.IsActive='Y' AND c.IsKey='N' AND c.IsParent='N' AND c.ColumnSQL IS NULL) "
 			+ "JOIN AD_Field f0 ON (f0.AD_Column_ID=c.AD_Column_ID AND f0.AD_Tab_ID=tt0.AD_Tab_ID AND f0.IsActive='Y' AND f0.IsDisplayed='Y') "
-			+ "JOIN AD_Field_Trl f ON (f.AD_Field_ID=f0.AD_Field_ID) ");
+			+ "JOIN AD_Field_Trl f ON (f.AD_Field_ID=f0.AD_Field_ID AND f.AD_Language=?) ");
 		}
 		sqlb.append(
 			  "LEFT JOIN AD_Ref_Table r ON (c.AD_Reference_Value_ID=r.AD_Reference_ID) "
@@ -114,6 +114,7 @@ public class GenericZoomProvider implements IZoomProvider {
 			if (!baseLanguage) {
 				pstmt.setString(index++, Env.getAD_Language(Env.getCtx()));
 				pstmt.setString(index++, Env.getAD_Language(Env.getCtx()));
+				pstmt.setString(index++, Env.getAD_Language(Env.getCtx()));
 			}
 			pstmt.setString(index++, po.get_KeyColumns()[0]);
 			if (detailedZoom) {