Author: lektran
Date: Mon Jun 21 02:05:18 2010
New Revision: 956439
URL: http://svn.apache.org/viewvc?rev=956439&view=rev
Log:
Merged from trunk r956438:
Make sure the shipment id is transferred to the WeightPackageSession
Modified:
ofbiz/branches/release10.04/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy
Modified:
ofbiz/branches/release10.04/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy?rev=956439&r1=956438&r2=956439&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy
(original)
+++
ofbiz/branches/release10.04/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy
Mon Jun 21 02:05:18 2010
@@ -116,6 +116,7 @@ if (shipmentId) {
context.shipmentPackageRouteSegList = shipmentPackageRouteSegList;
}
+weightPackageSession.setShipmentId(shipmentId);
weightPackageSession.setPrimaryShipGroupSeqId(shipGroupSeqId);
weightPackageSession.setPrimaryOrderId(orderId);
weightPackageSession.setPicklistBinId(picklistBinId);
@@ -198,4 +199,4 @@ if (facility) {
if (!defaultWeightUomId) {
defaultWeightUomId =
UtilProperties.getPropertyValue("shipment.properties",
"shipment.default.weight.uom", "WT_kg");
}
-context.defaultWeightUomId = defaultWeightUomId;
\ No newline at end of file
+context.defaultWeightUomId = defaultWeightUomId;
