svn commit: r1649400 - in /ofbiz/branches/release14.12/applications/product: src/org/ofbiz/shipment/shipment/ShipmentServices.java webapp/facility/shipment/PackOrder.ftl

[ashish-18]

Author: ashish
Date: Sun Jan  4 20:06:00 2015
New Revision: 1649400

URL: http://svn.apache.org/r1649400
Log:
Applied bug fix from trunk r1649396.
=================================================================
Applied patch from jira issue - OFBIZ-5925 - Pack order flow is broken.
Thanks Deepak for creating the issue and thanks Divesh for the patch. Thanks Jacopo!
=================================================================

Modified:
    ofbiz/branches/release14.12/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
    ofbiz/branches/release14.12/applications/product/webapp/facility/shipment/PackOrder.ftl

Modified: ofbiz/branches/release14.12/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java?rev=1649400&r1=1649399&r2=1649400&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java (original)
+++ ofbiz/branches/release14.12/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java Sun Jan  4 20:06:00 2015
@@ -432,22 +432,26 @@ public class ShipmentServices {
         if (shippableItemInfo != null) {
             for (Map<String, Object> itemMap: shippableItemInfo) {
                 // add the item sizes
-                BigDecimal itemSize = (BigDecimal) itemMap.get("size");
-                if (itemSize != null) {
-                    shippableItemSizes.add(itemSize);
+                if (itemMap.containsKey("size")) {
+                    BigDecimal itemSize = (BigDecimal) itemMap.get("size");
+                    if (itemSize != null) {
+                        shippableItemSizes.add(itemSize);
+                    }
                 }
 
                 // add the feature quantities
                 BigDecimal quantity = (BigDecimal) itemMap.get("quantity");
-                Set<String> featureSet = UtilGenerics.checkSet(itemMap.get("featureSet"));
-                if (UtilValidate.isNotEmpty(featureSet)) {
-                    for (String featureId: featureSet) {
-                        BigDecimal featureQuantity = shippableFeatureMap.get(featureId);
-                        if (featureQuantity == null) {
-                            featureQuantity = BigDecimal.ZERO;
+                if (itemMap.containsKey("featureSet")) {
+                    Set<String> featureSet = UtilGenerics.checkSet(itemMap.get("featureSet"));
+                    if (UtilValidate.isNotEmpty(featureSet)) {
+                        for (String featureId: featureSet) {
+                            BigDecimal featureQuantity = shippableFeatureMap.get(featureId);
+                            if (featureQuantity == null) {
+                                featureQuantity = BigDecimal.ZERO;
+                            }
+                            featureQuantity = featureQuantity.add(quantity);
+                            shippableFeatureMap.put(featureId, featureQuantity);
                         }
-                        featureQuantity = featureQuantity.add(quantity);
-                        shippableFeatureMap.put(featureId, featureQuantity);
                     }
                 }
 

Modified: ofbiz/branches/release14.12/applications/product/webapp/facility/shipment/PackOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=1649400&r1=1649399&r2=1649400&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/product/webapp/facility/shipment/PackOrder.ftl (original)
+++ ofbiz/branches/release14.12/applications/product/webapp/facility/shipment/PackOrder.ftl Sun Jan  4 20:06:00 2015
@@ -150,7 +150,7 @@ under the License.
         </div>
         <div class="screenlet-body">
               <#if orderItemShipGroup?has_content>
-                <#if (orderItemShipGroup.contacMechId)?has_content>
+                <#if (orderItemShipGroup.contactMechId)?has_content>
                   <#assign postalAddress = orderItemShipGroup.getRelatedOne("PostalAddress", false)>
                 </#if>
                 <#assign carrier = orderItemShipGroup.carrierPartyId?default("N/A")>