Author: jleroux
Date: Wed Feb 14 03:30:21 2007
New Revision: 507490
URL:
http://svn.apache.org/viewvc?view=rev&rev=507490Log:
This fix the problem reported by Rohit Sureka in
https://issues.apache.org/jira/browse/OFBIZ-644#action_12472071.
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?view=diff&rev=507490&r1=507489&r2=507490==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java Wed Feb 14 03:30:21 2007
@@ -232,9 +232,11 @@
EntityCondition statusConditionsList = new EntityConditionList(statusConditions, EntityOperator.OR);
EntityCondition typeConditionsList = new EntityConditionList(typeConditions, EntityOperator.OR);
EntityCondition filterConditionsList = new EntityConditionList(filterConditions, EntityOperator.OR);
- if ((typeConditions.size() > 0) && (statusConditions.size() > 0) && (filterConditions.size() > 0)) {
+ if ((typeConditions.size() > 0) && (statusConditions.size() > 0)) {
allConditions.add(statusConditionsList);
allConditions.add(typeConditionsList);
+ }
+ if (filterConditions.size() > 0) {
allConditions.add(filterConditionsList);
}