svn commit: r742556 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java

[jacopoc]

Author: jacopoc
Date: Mon Feb  9 15:15:28 2009
New Revision: 742556

URL: http://svn.apache.org/viewvc?rev=742556&view=rev
Log:
Applied patch from OFBIZ-2176 by Arun Patidar to fix an error happening when calculating shipping estimates for a ship group. The fix is good for now even if we will have to review and complete the shipping estimate enhancements done some time ago. Thanks for the patch.

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java?rev=742556&r1=742555&r2=742556&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java Mon Feb  9 15:15:28 2009
@@ -118,7 +118,6 @@
         String carrierRoleTypeId = shipGroup.getString("carrierRoleTypeId");
         String carrierPartyId = shipGroup.getString("carrierPartyId");
         String supplierPartyId = shipGroup.getString("supplierPartyId");
-        String productStoreShipMethId = shipGroup.getString("productStoreShipMethId");
 
         GenericValue shipAddr = orh.getShippingAddress(shipGroupSeqId);
         if (shipAddr == null) {
@@ -133,7 +132,7 @@
         }
         return getShipGroupEstimate(dispatcher, delegator, orh.getOrderTypeId(), shipmentMethodTypeId, carrierPartyId, carrierRoleTypeId,
                 contactMechId, orh.getProductStoreId(), supplierPartyId, orh.getShippableItemInfo(shipGroupSeqId), orh.getShippableWeight(shipGroupSeqId),
-                orh.getShippableQuantity(shipGroupSeqId), orh.getShippableTotal(shipGroupSeqId), partyId, productStoreShipMethId);
+                orh.getShippableQuantity(shipGroupSeqId), orh.getShippableTotal(shipGroupSeqId), partyId, null);
     }
 
     // version with no support for using the supplier's address as the origin