You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2009/06/12 16:54:21 UTC

svn commit: r784145 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java

Author: ashish
Date: Fri Jun 12 14:54:20 2009
New Revision: 784145

URL: http://svn.apache.org/viewvc?rev=784145&view=rev
Log:
Applied patch from jira issue OFBIZ-2590 (  OFBiz Orders not filtered properly on Order List page)
Thanks Chirag & Ratnesh for the contribution.

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java?rev=784145&r1=784144&r2=784145&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java Fri Jun 12 14:54:20 2009
@@ -231,8 +231,10 @@
 
         EntityCondition statusConditionsList = EntityCondition.makeCondition(statusConditions,  EntityOperator.OR);
         EntityCondition typeConditionsList = EntityCondition.makeCondition(typeConditions, EntityOperator.OR);
-        if ((typeConditions.size() > 0) && (statusConditions.size() > 0)) {
+        if (statusConditions.size() > 0) {
             allConditions.add(statusConditionsList);
+        }
+        if (typeConditions.size() > 0) {
             allConditions.add(typeConditionsList);
         }