You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/09/02 18:13:14 UTC
svn commit: r1758998 - in
/ofbiz/branches/release15.12/applications/product/webapp/facility/WEB-INF/actions/inventory:
InventoryAverageCosts.groovy InventoryItemTotals.groovy
Author: deepak
Date: Fri Sep 2 18:13:14 2016
New Revision: 1758998
URL: http://svn.apache.org/viewvc?rev=1758998&view=rev
Log:
(OFBIZ-7390) Manually applied patch from jira issue:
================================
Print PDF functionality throws exception on Inventory Average Cost screen
================================
Thanks Avnindra Sharma for your contribution.
Modified:
ofbiz/branches/release15.12/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy
ofbiz/branches/release15.12/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy
Modified: ofbiz/branches/release15.12/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy?rev=1758998&r1=1758997&r2=1758998&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy (original)
+++ ofbiz/branches/release15.12/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy Fri Sep 2 18:13:14 2016
@@ -29,6 +29,7 @@ facilityId = context.get("facilityId");
EntityCondition whereConditions = EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId);
inventoryItems = select("productId").from("InventoryItem").where("facilityId", facilityId).orderBy("productId").queryList();
inventoryItemProducts = EntityUtil.getFieldListFromEntityList(inventoryItems, "productId", true);
+searchParameterString = "action=Y&facilityId=" + facilityId;
inventoryAverageCosts = [];
inventoryItemProducts.each { productId ->
@@ -47,4 +48,5 @@ inventoryItemProducts.each { productId -
}
}
+context.searchParameterString = searchParameterString;
context.inventoryAverageCosts = inventoryAverageCosts;
Modified: ofbiz/branches/release15.12/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy?rev=1758998&r1=1758997&r2=1758998&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy (original)
+++ ofbiz/branches/release15.12/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy Fri Sep 2 18:13:14 2016
@@ -31,6 +31,7 @@ retailPriceGrandTotal = 0.0;
totalCostPriceGrandTotal = 0.0;
totalRetailPriceGrandTotal = 0.0;
boolean beganTransaction = false;
+searchParameterString = "action=Y&facilityId=" + facilityId;
if (action) {
conditions = [EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INV_DELIVERED")];
conditions.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, null));
@@ -106,5 +107,6 @@ inventoryItemGrandTotals = [];
inventoryItemGrandTotals.add([qohGrandTotal : qohGrandTotal, atpGrandTotal : atpGrandTotal,
totalCostPriceGrandTotal : totalCostPriceGrandTotal, totalRetailPriceGrandTotal : totalRetailPriceGrandTotal]);
+context.searchParameterString = searchParameterString;
context.inventoryItemTotals = inventoryItemTotals;
context.inventoryItemGrandTotals = inventoryItemGrandTotals;