Author: jacopoc
Date: Wed Mar 21 00:41:12 2007
New Revision: 520784
URL:
http://svn.apache.org/viewvc?view=rev&rev=520784Log:
Added from/thru dates to the list of fields returned by the query on SupplierProduct.
They are needed to filter discontinued items (see the call to EntityUtil.filterByDate(...)).
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.bsh
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.bsh
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.bsh?view=diff&rev=520784&r1=520783&r2=520784==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.bsh Wed Mar 21 00:41:12 2007
@@ -45,6 +45,6 @@
conditionList.add(new EntityExpr("currencyUomId", EntityOperator.EQUALS, shoppingCart.getCurrency()));
conditions = new EntityConditionList(conditionList, EntityOperator.AND);
-productList = delegator.findByCondition("SupplierProduct", conditions, UtilMisc.toList("productId", "supplierProductId", "supplierProductName", "lastPrice", "minimumOrderQuantity"), UtilMisc.toList("productId"));
+productList = delegator.findByCondition("SupplierProduct", conditions, UtilMisc.toList("productId", "supplierProductId", "supplierProductName", "lastPrice", "minimumOrderQuantity", "availableFromDate", "availableThruDate"), UtilMisc.toList("productId"));
productList = EntityUtil.filterByDate(productList, UtilDateTime.nowTimestamp(), "availableFromDate", "availableThruDate", true);
context.put("productList", productList);