svn commit: r784147 - /ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/order/OrderListState.java

[ashish-18]

Author: ashish
Date: Fri Jun 12 14:58:23 2009
New Revision: 784147

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

Modified:
    ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/order/OrderListState.java

Modified: ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/order/OrderListState.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/order/OrderListState.java?rev=784147&r1=784146&r2=784147&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/order/OrderListState.java (original)
+++ ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/order/OrderListState.java Fri Jun 12 14:58:23 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);
         }