Author: jleroux
Date: Wed Mar 14 01:26:52 2007
New Revision: 518064
URL: http://svn.apache.org/viewvc?view=rev&rev=518064
Log:
Replace productStoreShipmentMethId by productStoreShipMethId
Modified:
ofbiz/trunk/applications/ecommerce/data/DemoRentalShipping.xml
ofbiz/trunk/applications/ecommerce/data/DemoShipping.xml
Modified: ofbiz/trunk/applications/ecommerce/data/DemoRentalShipping.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoRentalShipping.xml?view=diff&rev=518064&r1=518063&r2=518064
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/DemoRentalShipping.xml (original)
+++ ofbiz/trunk/applications/ecommerce/data/DemoRentalShipping.xml Wed Mar 14
01:26:52 2007
@@ -47,12 +47,12 @@
<CarrierShipmentMethod partyId="_NA_" roleTypeId="CARRIER"
shipmentMethodTypeId="STANDARD" sequenceNumber="5"/>
<CarrierShipmentMethod partyId="_NA_" roleTypeId="CARRIER"
shipmentMethodTypeId="NO_SHIPPING" sequenceNumber="8"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9017"
productStoreId="RentalStore" partyId="_NA_" includeNoChargeItems="Y"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="NO_SHIPPING" sequenceNumber="6"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9018"
productStoreId="RentalStore" partyId="UPS" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="GROUND" sequenceNumber="3"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9019"
productStoreId="RentalStore" partyId="UPS" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="AIR" sequenceNumber="2"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9020"
productStoreId="RentalStore" partyId="UPS" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="NEXT_DAY" sequenceNumber="1"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9021"
productStoreId="RentalStore" partyId="USPS" includeNoChargeItems="N"
allowUspsAddr="Y" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="STANDARD" serviceName="uspsRateInquire"
sequenceNumber="5"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9022"
productStoreId="RentalStore" partyId="USPS" includeNoChargeItems="N"
allowUspsAddr="Y" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="EXPRESS" serviceName="uspsRateInquire"
sequenceNumber="4"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9017"
productStoreId="RentalStore" partyId="_NA_" includeNoChargeItems="Y"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="NO_SHIPPING" sequenceNumber="6"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9018"
productStoreId="RentalStore" partyId="UPS" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="GROUND" sequenceNumber="3"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9019"
productStoreId="RentalStore" partyId="UPS" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="AIR" sequenceNumber="2"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9020"
productStoreId="RentalStore" partyId="UPS" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="NEXT_DAY" sequenceNumber="1"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9021"
productStoreId="RentalStore" partyId="USPS" includeNoChargeItems="N"
allowUspsAddr="Y" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="STANDARD" serviceName="uspsRateInquire"
sequenceNumber="5"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9022"
productStoreId="RentalStore" partyId="USPS" includeNoChargeItems="N"
allowUspsAddr="Y" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="EXPRESS" serviceName="uspsRateInquire"
sequenceNumber="4"/>
<QuantityBreak fromQuantity="0.0" quantityBreakId="RentalStore"
quantityBreakTypeId="SHIP_WEIGHT" thruQuantity="0.0"/>
<QuantityBreak fromQuantity="0.0" quantityBreakId="9003"
quantityBreakTypeId="SHIP_WEIGHT" thruQuantity="0.0"/>
Modified: ofbiz/trunk/applications/ecommerce/data/DemoShipping.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoShipping.xml?view=diff&rev=518064&r1=518063&r2=518064
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/DemoShipping.xml (original)
+++ ofbiz/trunk/applications/ecommerce/data/DemoShipping.xml Wed Mar 14
01:26:52 2007
@@ -69,23 +69,23 @@
<CarrierShipmentMethod partyId="FEDEX" roleTypeId="CARRIER"
shipmentMethodTypeId="GROUND" sequenceNumber="18"
carrierServiceCode="FEDEXGROUND"/>
<CarrierShipmentMethod partyId="FEDEX" roleTypeId="CARRIER"
shipmentMethodTypeId="GROUND_HOME" sequenceNumber="19"
carrierServiceCode="GROUNDHOMEDELIVERY"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9000"
productStoreId="9000" partyId="_NA_" includeNoChargeItems="Y" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NO_SHIPPING"
sequenceNumber="6"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9001"
productStoreId="9000" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND"
sequenceNumber="3"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9002"
productStoreId="9000" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="AIR"
sequenceNumber="2"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9003"
productStoreId="9000" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_DAY"
sequenceNumber="1"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9004"
productStoreId="9000" partyId="USPS" includeNoChargeItems="N" allowUspsAddr="Y"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="STANDARD"
serviceName="uspsRateInquire" sequenceNumber="5"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9005"
productStoreId="9000" partyId="USPS" includeNoChargeItems="N" allowUspsAddr="Y"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS"
serviceName="uspsRateInquire" sequenceNumber="4"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9006"
productStoreId="9000" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS"
sequenceNumber="7"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9007"
productStoreId="9000" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_PM"
sequenceNumber="8"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9008"
productStoreId="9000" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="SECOND_DAY"
sequenceNumber="9"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9009"
productStoreId="9000" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND"
sequenceNumber="10"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9010"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="NEXT_AM" sequenceNumber="11"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9011"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="NEXT_DAY" sequenceNumber="12"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9012"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="NEXT_PM" sequenceNumber="13"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9013"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="SECOND_DAY" sequenceNumber="14"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9014"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="EXPRESS" sequenceNumber="15"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9015"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="GROUND" sequenceNumber="16"/>
- <ProductStoreShipmentMeth productStoreShipmentMethId="9016"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="GROUND_HOME" sequenceNumber="17"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9000"
productStoreId="9000" partyId="_NA_" includeNoChargeItems="Y" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NO_SHIPPING"
sequenceNumber="6"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9001"
productStoreId="9000" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND"
sequenceNumber="3"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9002"
productStoreId="9000" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="AIR"
sequenceNumber="2"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9003"
productStoreId="9000" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_DAY"
sequenceNumber="1"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9004"
productStoreId="9000" partyId="USPS" includeNoChargeItems="N" allowUspsAddr="Y"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="STANDARD"
serviceName="uspsRateInquire" sequenceNumber="5"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9005"
productStoreId="9000" partyId="USPS" includeNoChargeItems="N" allowUspsAddr="Y"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS"
serviceName="uspsRateInquire" sequenceNumber="4"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9006"
productStoreId="9000" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS"
sequenceNumber="7"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9007"
productStoreId="9000" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_PM"
sequenceNumber="8"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9008"
productStoreId="9000" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="SECOND_DAY"
sequenceNumber="9"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9009"
productStoreId="9000" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND"
sequenceNumber="10"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9010"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="NEXT_AM" sequenceNumber="11"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9011"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="NEXT_DAY" sequenceNumber="12"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9012"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="NEXT_PM" sequenceNumber="13"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9013"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="SECOND_DAY" sequenceNumber="14"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9014"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="EXPRESS" sequenceNumber="15"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9015"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="GROUND" sequenceNumber="16"/>
+ <ProductStoreShipmentMeth productStoreShipMethId="9016"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="GROUND_HOME" sequenceNumber="17"/>
<QuantityBreak fromQuantity="0.0" quantityBreakId="9000"
quantityBreakTypeId="SHIP_WEIGHT" thruQuantity="0.0"/>
<QuantityBreak fromQuantity="0.0" quantityBreakId="9001"
quantityBreakTypeId="SHIP_WEIGHT" thruQuantity="0.0"/>
