Author: deepak Date: Sat May 16 11:35:19 2015 New Revision: 1679732 URL: http://svn.apache.org/r1679732 Log: Applied patch from jira issue OFBIZ-6216 : ProductStoreData.xml contains UPS NEXT_DAY not present in ShippingData.xml
Thanks Christian Carlow, Rishi Solanki and Divesh for your valuable thought and providing the fix. Modified: ofbiz/trunk/applications/commonext/data/ProductStoreData.xml Modified: ofbiz/trunk/applications/commonext/data/ProductStoreData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/ProductStoreData.xml?rev=1679732&r1=1679731&r2=1679732&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/data/ProductStoreData.xml (original) +++ ofbiz/trunk/applications/commonext/data/ProductStoreData.xml Sat May 16 11:35:19 2015 @@ -46,7 +46,7 @@ <ProductStoreShipmentMeth productStoreShipMethId="9000" productStoreId="PRODUCTSTOREID" partyId="_NA_" includeNoChargeItems="Y" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NO_SHIPPING" sequenceNumber="6"/> <ProductStoreShipmentMeth productStoreShipMethId="9001" productStoreId="PRODUCTSTOREID" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND" sequenceNumber="3"/> <ProductStoreShipmentMeth productStoreShipMethId="9002" productStoreId="PRODUCTSTOREID" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="AIR" sequenceNumber="2"/> - <ProductStoreShipmentMeth productStoreShipMethId="9003" productStoreId="PRODUCTSTOREID" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_DAY" sequenceNumber="1"/> + <ProductStoreShipmentMeth productStoreShipMethId="9003" productStoreId="PRODUCTSTOREID" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_DAY_AIR" sequenceNumber="1"/> <ProductStoreShipmentMeth productStoreShipMethId="9004" productStoreId="PRODUCTSTOREID" partyId="USPS" includeNoChargeItems="N" allowUspsAddr="Y" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="STANDARD" serviceName="uspsRateInquire" sequenceNumber="5"/> <ProductStoreShipmentMeth productStoreShipMethId="9005" productStoreId="PRODUCTSTOREID" partyId="USPS" includeNoChargeItems="N" allowUspsAddr="Y" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS" serviceName="uspsRateInquire" sequenceNumber="4"/> <ProductStoreShipmentMeth productStoreShipMethId="9006" productStoreId="PRODUCTSTOREID" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS" sequenceNumber="7"/> @@ -66,7 +66,7 @@ <ShipmentCostEstimate productStoreId="PRODUCTSTOREID" orderFlatPrice="5.0" orderItemFlatPrice="0.0" carrierPartyId="ORGPARTYID" carrierRoleTypeId="CARRIER" orderPricePercent="0.0" shipmentMethodTypeId="LOCAL_DELIVERY"/> <ShipmentCostEstimate productStoreShipMethId="9002" productStoreId="PRODUCTSTOREID" orderFlatPrice="5.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="AIR" carrierPartyId="UPS" carrierRoleTypeId="CARRIER" weightBreakId="9000" weightUnitPrice="0.2"/> <ShipmentCostEstimate productStoreShipMethId="9001" productStoreId="PRODUCTSTOREID" orderFlatPrice="3.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="GROUND" carrierPartyId="UPS" carrierRoleTypeId="CARRIER" weightBreakId="9001" weightUnitPrice="0.1"/> - <ShipmentCostEstimate productStoreShipMethId="9003" productStoreId="PRODUCTSTOREID" orderFlatPrice="10.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="NEXT_DAY" carrierPartyId="UPS" carrierRoleTypeId="CARRIER" weightBreakId="9002" weightUnitPrice="0.35"/> + <ShipmentCostEstimate productStoreShipMethId="9003" productStoreId="PRODUCTSTOREID" orderFlatPrice="10.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="NEXT_DAY_AIR" carrierPartyId="UPS" carrierRoleTypeId="CARRIER" weightBreakId="9002" weightUnitPrice="0.35"/> <ShipmentCostEstimate productStoreShipMethId="9000" productStoreId="PRODUCTSTOREID" shipmentMethodTypeId="STANDARD" carrierPartyId="_NA_" carrierRoleTypeId="CARRIER" orderFlatPrice="0.0" orderPricePercent="20.0" orderItemFlatPrice="0.0"/> <ShipmentCostEstimate productStoreShipMethId="9000" productStoreId="PRODUCTSTOREID" shipmentMethodTypeId="NO_SHIPPING" carrierPartyId="_NA_" carrierRoleTypeId="CARRIER" orderFlatPrice="0.0" orderPricePercent="0.0" orderItemFlatPrice="0.0"/> <ShipmentCostEstimate productStoreShipMethId="9006" productStoreId="PRODUCTSTOREID" orderFlatPrice="10.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentMethodTypeId="EXPRESS" carrierPartyId="DHL" carrierRoleTypeId="CARRIER" weightBreakId="9003" weightUnitPrice="0.2"/>