comparing with https://code.openbravo.com/erp/devel/pi
searching for changes
changeset:   28158:c4f13aa750cd
tag:         tip
user:        Carlos Aristu <carlos.aristu@openbravo.com>
date:        Tue Dec 22 12:37:39 2015 +0100
summary:     fixes issue 31454: Can not filter by Attribute Set in Return From Customer P&E

diff --git a/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
@@ -969,7 +969,7 @@
     final int index = leftWherePart.lastIndexOf(DalUtil.DOT);
     if (key.equals(JsonConstants.IDENTIFIER)) {
       prefix = getMainAlias() + DalUtil.DOT;
-    } else if (key.endsWith(JsonConstants.IDENTIFIER)) {
+    } else if (key.endsWith(JsonConstants.IDENTIFIER) && !creatingJoinsInWhereClauseIsPrevented) {
       final String propPath = key.substring(0, key.indexOf(JsonConstants.IDENTIFIER) - 1);
       boolean fromCriteria = true;
       final String join = resolveJoins(