details:   https://code.openbravo.com/erp/devel/pi/rev/f396fccd99e9
changeset: 27659:f396fccd99e9
user:      Atul Gaware <atul.gaware <at> openbravo.com>
date:      Thu Oct 08 10:24:55 2015 +0530
summary:   Fixes Issue 30842: GL Item combo not working when using saved view 
which does
not have Organization field shown in grid

If session attribute Organization of financial window is not available due to
grid column visible option then get it from requestMap.

details:   https://code.openbravo.com/erp/devel/pi/rev/e8e697041a8e
changeset: 27660:e8e697041a8e
user:      Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date:      Thu Oct 08 15:55:09 2015 +0200
summary:   Related to issue 30842: updated copyright

diffstat:

 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/GLItemSelectorFilterExpression.java
 |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (37 lines):

diff -r 8d000060c64f -r e8e697041a8e 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/GLItemSelectorFilterExpression.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/GLItemSelectorFilterExpression.java
 Thu Oct 08 14:15:32 2015 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/GLItemSelectorFilterExpression.java
 Thu Oct 08 15:55:09 2015 +0200
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2012 Openbravo SLU 
+ * All portions are Copyright (C) 2012-2015 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -21,11 +21,14 @@
 
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
 import org.openbravo.client.application.FilterExpression;
 import org.openbravo.client.kernel.RequestContext;
 import org.openbravo.dal.core.OBContext;
+
 import org.openbravo.erpCommon.utility.Utility;
 
+
 public class GLItemSelectorFilterExpression implements FilterExpression {
   final static String FINANCIAL_ACCOUNT_WINDOW = 
"94EAA455D2644E04AB25D93BE5157B6D";
 
@@ -37,6 +40,9 @@
     StringBuilder whereClause = new StringBuilder();
     String orgId = (String) RequestContext.get().getSession()
         .getAttribute(FINANCIAL_ACCOUNT_WINDOW + "|AD_ORG_ID");
+    if(StringUtils.isEmpty(orgId)) {
+       orgId = requestMap.get("inpadOrgId");
+    }
     String orgList = Utility.getInStrSet(OBContext.getOBContext()
         .getOrganizationStructureProvider().getNaturalTree(orgId));
     if (!orgList.isEmpty()) {

------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to