From d5cba25082cda40b4f3a8c717c03a89a088d2e2d Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Fri, 17 Feb 2017 19:57:18 +0100
Subject: [PATCH] IDEMPIERE-259 Cannot set tab display logic based on specific
 tab value of field

---
 org.adempiere.base/src/org/compiere/util/Evaluator.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/org.adempiere.base/src/org/compiere/util/Evaluator.java b/org.adempiere.base/src/org/compiere/util/Evaluator.java
index 104a863fe6..04379437fb 100644
--- a/org.adempiere.base/src/org/compiere/util/Evaluator.java
+++ b/org.adempiere.base/src/org/compiere/util/Evaluator.java
@@ -126,7 +126,7 @@ public class Evaluator
 				retValue = retValue | temp;
 			else
 			{
-				s_log.log(Level.SEVERE, "Logic operant '|' or '&' expected => " + logic);
+				s_log.log(Level.SEVERE, "Logic operand '|' or '&' expected => " + logic);
 				return false;
 			}
 		}	// hasMoreTokens
@@ -289,6 +289,8 @@ public class Evaluator
 		//	log.fine( variable);
 			if (variable.startsWith("~")) 
 				variable = variable.substring(1);
+			// strip also @tabno|
+			variable = variable.replaceFirst("[0-9][0-9]*\\|", "");
 			if (variable.indexOf(".") > 0)
 				variable = variable.substring(0, variable.indexOf("."));
 			list.add(variable);