Author: jleroux
Date: Mon Sep 12 16:39:56 2011
New Revision: 1169822
URL: http://svn.apache.org/viewvc?rev=1169822&view=rev
Log:
We need also to update seed and demo data for USA states GeoId changes
Modified:
ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml
ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml
ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderTestData.xml
Modified: ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml?rev=1169822&r1=1169821&r2=1169822&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml Mon Sep
12 16:39:56 2011
@@ -27,7 +27,7 @@ under the License.
<PartyRole partyId="Company" roleTypeId="_NA_"/>
<ContactMech contactMechId="9000" contactMechTypeId="POSTAL_ADDRESS"/>
<PartyContactMech partyId="Company" contactMechId="9000"
fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/>
- <PostalAddress contactMechId="9000" toName="Company XYZ" address1="2003
Open Blvd" city="Open City" postalCode="999999" countryGeoId="USA"
stateProvinceGeoId="CA" geoPointId="9000"/>
+ <PostalAddress contactMechId="9000" toName="Company XYZ" address1="2003
Open Blvd" city="Open City" postalCode="999999" countryGeoId="USA"
stateProvinceGeoId="US-CA" geoPointId="9000"/>
<ContactMech contactMechId="Company" contactMechTypeId="EMAIL_ADDRESS"
infoString="[email protected]"/>
<PartyContactMech partyId="Company" contactMechId="Company"
fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/>
<PartyContactMechPurpose contactMechPurposeTypeId="PRIMARY_EMAIL"
partyId="Company" contactMechId="Company" fromDate="2003-01-01 00:00:00.000"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml?rev=1169822&r1=1169821&r2=1169822&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml Mon Sep
12 16:39:56 2011
@@ -61,14 +61,14 @@ under the License.
<PartyRole partyId="DemoCustCompany" roleTypeId="_NA_"/>
<ContactMech contactMechId="9010" contactMechTypeId="POSTAL_ADDRESS"/>
- <PostalAddress contactMechId="9010" toName="Demo Customer Company"
address1="2004 Factory Blvd" city="Orem" stateProvinceGeoId="UT"
postalCode="84057" countryGeoId="USA" geoPointId="9000"/>
+ <PostalAddress contactMechId="9010" toName="Demo Customer Company"
address1="2004 Factory Blvd" city="Orem" stateProvinceGeoId="US-UT"
postalCode="84057" countryGeoId="USA" geoPointId="9000"/>
<PartyContactMech partyId="DemoCustCompany" contactMechId="9010"
fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
<PartyContactMechPurpose partyId="DemoCustCompany" contactMechId="9010"
contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
<PartyContactMechPurpose partyId="DemoCustCompany" contactMechId="9010"
contactMechPurposeTypeId="SHIPPING_LOCATION" fromDate="2001-05-13
00:00:00.000"/>
<PartyContactMechPurpose partyId="DemoCustCompany" contactMechId="9010"
contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
<ContactMech contactMechId="9014" contactMechTypeId="POSTAL_ADDRESS"/>
- <PostalAddress contactMechId="9014" toName="Demo Customer Company"
address1="1234 Commerce Way" city="Los Angeles" stateProvinceGeoId="CA"
postalCode="90010" countryGeoId="USA"/>
+ <PostalAddress contactMechId="9014" toName="Demo Customer Company"
address1="1234 Commerce Way" city="Los Angeles" stateProvinceGeoId="US-CA"
postalCode="90010" countryGeoId="USA"/>
<PartyContactMech partyId="DemoCustCompany" contactMechId="9014"
fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
<PartyContactMechPurpose partyId="DemoCustCompany" contactMechId="9014"
contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
<PartyContactMechPurpose partyId="DemoCustCompany" contactMechId="9014"
contactMechPurposeTypeId="SHIPPING_LOCATION" fromDate="2001-05-13
00:00:00.000"/>
@@ -85,8 +85,8 @@ under the License.
<BillingAccount billingAccountId="9010" accountLimit="10000.0"
accountCurrencyUomId="USD" contactMechId="9010" fromDate="2001-05-13
00:00:00.000" description="Demo Customer Company Billing Account"/>
<BillingAccountRole billingAccountId="9010" partyId="DemoCustCompany"
roleTypeId="BILL_TO_CUSTOMER" fromDate="2001-05-13 00:00:00.000"/>
- <PartyTaxAuthInfo partyId="DemoCustCompany" taxAuthGeoId="UT"
taxAuthPartyId="UT_TAXMAN" fromDate="2001-05-13 00:00:00.000"
partyTaxId="12-3456789" isExempt="Y"/>
- <PartyTaxAuthInfo partyId="DemoCustCompany" taxAuthGeoId="CA"
taxAuthPartyId="CA_BOE" fromDate="2001-05-13 00:00:00.000"
partyTaxId="98-7654321" isExempt="N"/>
+ <PartyTaxAuthInfo partyId="DemoCustCompany" taxAuthGeoId="US-UT"
taxAuthPartyId="UT_TAXMAN" fromDate="2001-05-13 00:00:00.000"
partyTaxId="12-3456789" isExempt="Y"/>
+ <PartyTaxAuthInfo partyId="DemoCustCompany" taxAuthGeoId="US-CA"
taxAuthPartyId="CA_BOE" fromDate="2001-05-13 00:00:00.000"
partyTaxId="98-7654321" isExempt="N"/>
<!-- DemoCustAgent -->
<Party partyId="DemoCustAgent" partyTypeId="PERSON"/>
@@ -96,7 +96,7 @@ under the License.
<PartyRole partyId="DemoCustAgent" roleTypeId="AGENT"/>
<PartyRole partyId="DemoCustAgent" roleTypeId="_NA_"/>
<ContactMech contactMechId="9011" contactMechTypeId="POSTAL_ADDRESS"/>
- <PostalAddress contactMechId="9011" toName="Demo Customer Agent"
address1="2004 Factory Blvd" city="Orem" stateProvinceGeoId="UT"
postalCode="84057" countryGeoId="USA" geoPointId="9000"/>
+ <PostalAddress contactMechId="9011" toName="Demo Customer Agent"
address1="2004 Factory Blvd" city="Orem" stateProvinceGeoId="US-UT"
postalCode="84057" countryGeoId="USA" geoPointId="9000"/>
<PartyContactMech partyId="DemoCustAgent" contactMechId="9011"
fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
<PartyContactMechPurpose partyId="DemoCustAgent" contactMechId="9011"
contactMechPurposeTypeId="SHIPPING_LOCATION" fromDate="2001-05-13
00:00:00.000"/>
<PartyContactMechPurpose partyId="DemoCustAgent" contactMechId="9011"
contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
@@ -125,7 +125,7 @@ under the License.
<ContactMech contactMechId="9015" contactMechTypeId="POSTAL_ADDRESS"/>
- <PostalAddress contactMechId="9015" toName="Demo Customer" address1="2004
Factory Blvd" city="Orem" stateProvinceGeoId="UT" postalCode="84057"
countryGeoId="USA" geoPointId="9000"/>
+ <PostalAddress contactMechId="9015" toName="Demo Customer" address1="2004
Factory Blvd" city="Orem" stateProvinceGeoId="US-UT" postalCode="84057"
countryGeoId="USA" geoPointId="9000"/>
<PartyContactMech partyId="DemoCustomer" contactMechId="9015"
fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
<PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9015"
contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
<PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9015"
contactMechPurposeTypeId="SHIPPING_LOCATION" fromDate="2001-05-13
00:00:00.000"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderTestData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderTestData.xml?rev=1169822&r1=1169821&r2=1169822&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderTestData.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderTestData.xml Mon Sep 12
16:39:56 2011
@@ -153,7 +153,7 @@ under the License.
<OrderAdjustment orderAdjustmentId="8002"
orderAdjustmentTypeId="SHIPPING_CHARGES" orderId="Demo1002"
orderItemSeqId="_NA_" shipGroupSeqId="00001" amount="12.100"
createdDate="2009-08-17 14:56:44.515" createdByUserLogin="admin"
lastUpdatedStamp="2009-08-17 14:56:44.778"/>
<OrderAdjustment orderAdjustmentId="8003"
orderAdjustmentTypeId="SALES_TAX" orderId="Demo1002" orderItemSeqId="_NA_"
shipGroupSeqId="00001" comments="Utah County, Utah Sales Tax" amount="-0.012"
taxAuthorityRateSeqId="9005" sourcePercentage="0.100000" primaryGeoId="UT-UTAH"
taxAuthGeoId="UT-UTAH" taxAuthPartyId="UT_UTAH_TAXMAN"
overrideGlAccountId="224153"/>
<OrderAdjustment orderAdjustmentId="8004"
orderAdjustmentTypeId="SALES_TAX" orderId="Demo1002" orderItemSeqId="00001"
shipGroupSeqId="00001" comments="Utah County, Utah Sales Tax" amount="0.120"
taxAuthorityRateSeqId="9005" sourcePercentage="0.100000" primaryGeoId="UT-UTAH"
taxAuthGeoId="UT-UTAH" taxAuthPartyId="UT_UTAH_TAXMAN"
overrideGlAccountId="224153" createdDate="2009-08-17 14:56:44.515"/>
- <OrderAdjustment orderAdjustmentId="8005"
orderAdjustmentTypeId="SALES_TAX" orderId="Demo1002" orderItemSeqId="00001"
shipGroupSeqId="00001" comments="Utah State Sales Tax" amount="5.699"
taxAuthorityRateSeqId="9004" sourcePercentage="4.750000" primaryGeoId="UT"
taxAuthGeoId="UT" taxAuthPartyId="UT_TAXMAN" overrideGlAccountId="224153"
createdDate="2009-08-17 14:56:44.515"/>
+ <OrderAdjustment orderAdjustmentId="8005"
orderAdjustmentTypeId="SALES_TAX" orderId="Demo1002" orderItemSeqId="00001"
shipGroupSeqId="00001" comments="Utah State Sales Tax" amount="5.699"
taxAuthorityRateSeqId="9004" sourcePercentage="4.750000" primaryGeoId="US-UT"
taxAuthGeoId="US-UT" taxAuthPartyId="UT_TAXMAN" overrideGlAccountId="224153"
createdDate="2009-08-17 14:56:44.515"/>
<OrderAdjustment orderAdjustmentId="8006"
orderAdjustmentTypeId="SALES_TAX" orderId="Demo1002" orderItemSeqId="00001"
shipGroupSeqId="00001" comments="1% OFB _NA_ Tax" amount="1.200"
taxAuthorityRateSeqId="9000" sourcePercentage="1.000000" primaryGeoId="_NA_"
taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" overrideGlAccountId="224000"
createdDate="2009-08-17 14:56:44.515"/>
<OrderPaymentPreference orderPaymentPreferenceId="9001" orderId="Demo1002"
paymentMethodTypeId="CREDIT_CARD" paymentMethodId="9015" presentFlag="N"
swipedFlag="N" overflowFlag="N" maxAmount="127.09" processAttempt="1"
statusId="PAYMENT_SETTLED" needsNsfRetry="N" createdDate="2009-08-17
14:56:44.573"/>
@@ -196,7 +196,7 @@ under the License.
<Invoice invoiceId="8009" invoiceTypeId="SALES_INVOICE"
partyIdFrom="Company" partyId="DemoCustomer" statusId="INVOICE_PAID"
invoiceDate="2009-08-17 14:57:03.614" paidDate="2009-08-17 14:57:04.99"
currencyUomId="USD"/>
<InvoiceItem invoiceId="8009" invoiceItemSeqId="00001"
invoiceItemTypeId="INV_FPROD_ITEM" inventoryItemId="9005" productId="WG-1111"
quantity="2.000000" amount="59.990" description="Micro Chrome Widget"/>
<InvoiceItem invoiceId="8009" invoiceItemSeqId="00002"
invoiceItemTypeId="ITM_SALES_TAX" overrideGlAccountId="224153"
productId="WG-1111" parentInvoiceId="8009" parentInvoiceItemSeqId="00001"
quantity="1.000000" amount="0.120" description="Utah County, Utah Sales Tax"
taxAuthPartyId="UT_UTAH_TAXMAN" taxAuthGeoId="UT-UTAH"
taxAuthorityRateSeqId="9005"/>
- <InvoiceItem invoiceId="8009" invoiceItemSeqId="00003"
invoiceItemTypeId="ITM_SALES_TAX" overrideGlAccountId="224153"
productId="WG-1111" parentInvoiceId="8009" parentInvoiceItemSeqId="00001"
quantity="1.000000" amount="5.699" description="Utah State Sales Tax"
taxAuthPartyId="UT_TAXMAN" taxAuthGeoId="UT" taxAuthorityRateSeqId="9004"/>
+ <InvoiceItem invoiceId="8009" invoiceItemSeqId="00003"
invoiceItemTypeId="ITM_SALES_TAX" overrideGlAccountId="224153"
productId="WG-1111" parentInvoiceId="8009" parentInvoiceItemSeqId="00001"
quantity="1.000000" amount="5.699" description="Utah State Sales Tax"
taxAuthPartyId="UT_TAXMAN" taxAuthGeoId="US-UT" taxAuthorityRateSeqId="9004"/>
<InvoiceItem invoiceId="8009" invoiceItemSeqId="00004"
invoiceItemTypeId="ITM_SALES_TAX" overrideGlAccountId="224000"
productId="WG-1111" parentInvoiceId="8009" parentInvoiceItemSeqId="00001"
quantity="1.000000" amount="1.200" description="1% OFB _NA_ Tax"
taxAuthPartyId="_NA_" taxAuthGeoId="_NA_" taxAuthorityRateSeqId="9000"/>
<InvoiceItem invoiceId="8009" invoiceItemSeqId="00005"
invoiceItemTypeId="INV_FPROD_ITEM" inventoryItemId="9005" productId="WG-1111"
quantity="1.000000" amount="59.990" description="Micro Chrome Widget"/>
<InvoiceItem invoiceId="8009" invoiceItemSeqId="00006"
invoiceItemTypeId="ITM_PROMOTION_ADJ" productId="WG-1111"
parentInvoiceId="8009" parentInvoiceItemSeqId="00005" quantity="1.000000"
amount="-59.990"/>
