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 2010/04/19 11:43:58 UTC
svn commit: r935497 -
/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy
Author: ashish
Date: Mon Apr 19 09:43:58 2010
New Revision: 935497
URL: http://svn.apache.org/viewvc?rev=935497&view=rev
Log:
Applied patch from jira issue OFBIZ-3717 - Cancel items should not displays on receive inventory of PO.
Thanks Arun & Pranay for the contribution.
Modified:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy?rev=935497&r1=935496&r2=935497&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy Mon Apr 19 09:43:58 2010
@@ -128,6 +128,7 @@ if (purchaseOrder) {
} else {
purchaseOrderItems = purchaseOrder.getRelated("OrderItem");
}
+ purchaseOrderItems = EntityUtil.filterByAnd(purchaseOrderItems, [EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ITEM_CANCELLED")]);
}
// convert the unit prices to that of the facility owner's currency
orderCurrencyUnitPriceMap = [:];