svn commit: r615676 - /ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.bsh

Author: jleroux
Date: Sun Jan 27 15:23:18 2008
New Revision: 615676

URL: http://svn.apache.org/viewvc?rev=615676&view=rev
Log:
Fix a bug. Related to https://issues.apache.org/jira/browse/OFBIZ-1604 but not the bug reported.

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.bsh

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.bsh?rev=615676&r1=615675&r2=615676&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.bsh Sun Jan 27 15:23:18 2008
@@ -39,10 +39,10 @@
 // search by orderTypeId is mandatory
 conditions = UtilMisc.toList(new EntityExpr("orderTypeId", EntityOperator.EQUALS, orderTypeId));
 
-if (!fromOrderDate.equals("")){
+if (UtilValidate.isDate(fromOrderDate) && UtilValidate.isNotEmpty(fromOrderDate)){
     conditions.add(new EntityExpr("orderDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromOrderDate));
 }
-if (!thruOrderDate.equals("")){
+if (UtilValidate.isDate(thruOrderDate) && UtilValidate.isNotEmpty(thruOrderDate)){
     conditions.add(new EntityExpr("orderDate", EntityOperator.LESS_THAN_EQUAL_TO, thruOrderDate));
 }
 
@@ -148,7 +148,3 @@
 }
 context.put("orderItemList", orderItemList);
 context.put("totalAmountList", totalAmountList);
-
-
-
-