Author: jleroux
Date: Tue Sep 13 06:45:13 2011
New Revision: 1170061
URL: http://svn.apache.org/viewvc?rev=1170061&view=rev
Log:
For historical reason, revert recent geo data changes for USA and CAN.
Modified:
ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml
ofbiz/trunk/framework/common/data/GeoData_CA.xml
ofbiz/trunk/framework/common/data/GeoData_US.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=1170061&r1=1170060&r2=1170061&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml Tue Sep
13 06:45:13 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="US-CA" geoPointId="9000"/>
+ <PostalAddress contactMechId="9000" toName="Company XYZ" address1="2003
Open Blvd" city="Open City" postalCode="999999" countryGeoId="USA"
stateProvinceGeoId="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/framework/common/data/GeoData_CA.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/GeoData_CA.xml?rev=1170061&r1=1170060&r2=1170061&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/GeoData_CA.xml (original)
+++ ofbiz/trunk/framework/common/data/GeoData_CA.xml Tue Sep 13 06:45:13 2011
@@ -19,33 +19,33 @@ under the License.
-->
<entity-engine-xml>
- <Geo abbreviation="AB" geoCode="AB" geoId="CA-AB" geoName="Alberta"
geoTypeId="PROVINCE"/>
- <Geo abbreviation="BC" geoCode="BC" geoId="CA-BC" geoName="British
Columbia" geoTypeId="PROVINCE"/>
- <Geo abbreviation="MB" geoCode="MB" geoId="CA-MB" geoName="Manitoba"
geoTypeId="PROVINCE"/>
- <Geo abbreviation="NB" geoCode="NB" geoId="CA-NB" geoName="New Brunswick"
geoTypeId="PROVINCE"/>
- <Geo abbreviation="NL" geoCode="NL" geoId="CA-NL" geoName="Newfoundland
and Labrador" geoTypeId="PROVINCE"/>
- <Geo abbreviation="NS" geoCode="NS" geoId="CA-NS" geoName="Nova Scotia"
geoTypeId="PROVINCE"/>
- <Geo abbreviation="NT" geoCode="NT" geoId="CA-NT" geoName="Northwest
Territories" geoTypeId="PROVINCE"/>
- <Geo abbreviation="NU" geoCode="NU" geoId="CA-NU" geoName="Nunavut"
geoTypeId="PROVINCE"/>
- <Geo abbreviation="ON" geoCode="ON" geoId="CA-ON" geoName="Ontario"
geoTypeId="PROVINCE"/>
- <Geo abbreviation="PE" geoCode="PE" geoId="CA-PE" geoName="Prince Edward
Island" geoTypeId="PROVINCE"/>
- <Geo abbreviation="QC" geoCode="QC" geoId="CA-QC" geoName="Quebec"
geoTypeId="PROVINCE"/>
- <Geo abbreviation="SK" geoCode="SK" geoId="CA-SK" geoName="Saskatchewan"
geoTypeId="PROVINCE"/>
- <Geo abbreviation="YT" geoCode="YT" geoId="CA-YT" geoName="Yukon"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="AB" geoCode="AB" geoId="AB" geoName="Alberta"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="BC" geoCode="BC" geoId="BC" geoName="British Columbia"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="MB" geoCode="MB" geoId="MB" geoName="Manitoba"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="NB" geoCode="NB" geoId="NB" geoName="New Brunswick"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="NL" geoCode="NL" geoId="NL" geoName="Newfoundland and
Labrador" geoTypeId="PROVINCE"/>
+ <Geo abbreviation="NS" geoCode="NS" geoId="NS" geoName="Nova Scotia"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="NT" geoCode="NT" geoId="NT" geoName="Northwest
Territories" geoTypeId="PROVINCE"/>
+ <Geo abbreviation="NU" geoCode="NU" geoId="NU" geoName="Nunavut"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="ON" geoCode="ON" geoId="ON" geoName="Ontario"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="PE" geoCode="PE" geoId="PE" geoName="Prince Edward
Island" geoTypeId="PROVINCE"/>
+ <Geo abbreviation="QC" geoCode="QC" geoId="QC" geoName="Quebec"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="SK" geoCode="SK" geoId="SK" geoName="Saskatchewan"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="YT" geoCode="YT" geoId="YT" geoName="Yukon"
geoTypeId="PROVINCE"/>
- <GeoAssoc geoId="CA-CAN" geoIdTo="AB" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CA-CAN" geoIdTo="BC" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CA-CAN" geoIdTo="MB" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CA-CAN" geoIdTo="NB" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CA-CAN" geoIdTo="NL" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CA-CAN" geoIdTo="NS" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CA-CAN" geoIdTo="NT" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CA-CAN" geoIdTo="NU" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CA-CAN" geoIdTo="ON" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CA-CAN" geoIdTo="PE" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CA-CAN" geoIdTo="QC" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CA-CAN" geoIdTo="SK" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CA-CAN" geoIdTo="YT" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="AB" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="BC" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="MB" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="NB" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="NL" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="NS" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="NT" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="NU" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="ON" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="PE" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="QC" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="SK" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="YT" geoAssocTypeId="REGIONS"/>
</entity-engine-xml>
Modified: ofbiz/trunk/framework/common/data/GeoData_US.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/GeoData_US.xml?rev=1170061&r1=1170060&r2=1170061&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/GeoData_US.xml (original)
+++ ofbiz/trunk/framework/common/data/GeoData_US.xml Tue Sep 13 06:45:13 2011
@@ -19,204 +19,204 @@ under the License.
-->
<entity-engine-xml>
- <Geo abbreviation="AA" geoCode="AA" geoId="US-AA" geoName="Armed Forces
Americas" geoTypeId="STATE"/>
- <Geo abbreviation="AE" geoCode="AE" geoId="US-AE" geoName="Armed Forces
Europe" geoTypeId="STATE"/>
- <Geo abbreviation="AP" geoCode="AP" geoId="US-AP" geoName="Armed Forces
Pacific" geoTypeId="STATE"/>
-
- <Geo abbreviation="AK" geoCode="AK" geoId="US-AK" geoName="Alaska"
geoTypeId="STATE"/>
- <Geo abbreviation="AL" geoCode="AL" geoId="US-AL" geoName="Alabama"
geoTypeId="STATE"/>
- <Geo abbreviation="AR" geoCode="AR" geoId="US-AR" geoName="Arkansas"
geoTypeId="STATE"/>
- <Geo abbreviation="AS" geoCode="AS" geoId="US-AS" geoName="American Samoa"
geoTypeId="STATE"/>
- <Geo abbreviation="AZ" geoCode="AZ" geoId="US-AZ" geoName="Arizona"
geoTypeId="STATE"/>
- <Geo abbreviation="CA" geoCode="CA" geoId="US-CA" geoName="California"
geoTypeId="STATE"/>
- <Geo abbreviation="CO" geoCode="CO" geoId="US-CO" geoName="Colorado"
geoTypeId="STATE"/>
- <Geo abbreviation="CT" geoCode="CT" geoId="US-CT" geoName="Connecticut"
geoTypeId="STATE"/>
- <Geo abbreviation="DC" geoCode="DC" geoId="US-DC" geoName="District of
Columbia" geoTypeId="STATE"/>
- <Geo abbreviation="DE" geoCode="DE" geoId="US-DE" geoName="Delaware"
geoTypeId="STATE"/>
- <Geo abbreviation="FL" geoCode="FL" geoId="US-FL" geoName="Florida"
geoTypeId="STATE"/>
- <Geo abbreviation="FM" geoCode="FM" geoId="US-FM" geoName="Federated
States of Micronesia" geoTypeId="STATE"/>
- <Geo abbreviation="GA" geoCode="GA" geoId="US-GA" geoName="Georgia"
geoTypeId="STATE"/>
- <Geo abbreviation="GU" geoCode="GU" geoId="US-GU" geoName="Guam"
geoTypeId="STATE"/>
- <Geo abbreviation="HI" geoCode="HI" geoId="US-HI" geoName="Hawaii"
geoTypeId="STATE"/>
- <Geo abbreviation="IA" geoCode="IA" geoId="US-IA" geoName="Iowa"
geoTypeId="STATE"/>
- <Geo abbreviation="ID" geoCode="ID" geoId="US-ID" geoName="Idaho"
geoTypeId="STATE"/>
- <Geo abbreviation="IL" geoCode="IL" geoId="US-IL" geoName="Illinois"
geoTypeId="STATE"/>
- <Geo abbreviation="IN" geoCode="IN" geoId="US-IN" geoName="Indiana"
geoTypeId="STATE"/>
- <Geo abbreviation="KS" geoCode="KS" geoId="US-KS" geoName="Kansas"
geoTypeId="STATE"/>
- <Geo abbreviation="KY" geoCode="KY" geoId="US-KY" geoName="Kentucky"
geoTypeId="STATE"/>
- <Geo abbreviation="LA" geoCode="LA" geoId="US-LA" geoName="Louisiana"
geoTypeId="STATE"/>
- <Geo abbreviation="MA" geoCode="MA" geoId="US-MA" geoName="Massachusetts"
geoTypeId="STATE"/>
- <Geo abbreviation="MD" geoCode="MD" geoId="US-MD" geoName="Maryland"
geoTypeId="STATE"/>
- <Geo abbreviation="ME" geoCode="ME" geoId="US-ME" geoName="Maine"
geoTypeId="STATE"/>
- <Geo abbreviation="MH" geoCode="MH" geoId="US-MH" geoName="Marshall
Islands" geoTypeId="STATE"/>
- <Geo abbreviation="MI" geoCode="MI" geoId="US-MI" geoName="Michigan"
geoTypeId="STATE"/>
- <Geo abbreviation="MN" geoCode="MN" geoId="US-MN" geoName="Minnesota"
geoTypeId="STATE"/>
- <Geo abbreviation="MP" geoCode="MP" geoId="US-MP" geoName="Northern
Mariana Islands" geoTypeId="STATE"/>
- <Geo abbreviation="MO" geoCode="MO" geoId="US-MO" geoName="Missouri"
geoTypeId="STATE"/>
- <Geo abbreviation="MS" geoCode="MS" geoId="US-MS" geoName="Mississippi"
geoTypeId="STATE"/>
- <Geo abbreviation="MT" geoCode="MT" geoId="US-MT" geoName="Montana"
geoTypeId="STATE"/>
- <Geo abbreviation="NC" geoCode="NC" geoId="US-NC" geoName="North Carolina"
geoTypeId="STATE"/>
- <Geo abbreviation="ND" geoCode="ND" geoId="US-ND" geoName="North Dakota"
geoTypeId="STATE"/>
- <Geo abbreviation="NE" geoCode="NE" geoId="US-NE" geoName="Nebraska"
geoTypeId="STATE"/>
- <Geo abbreviation="NH" geoCode="NH" geoId="US-NH" geoName="New Hampshire"
geoTypeId="STATE"/>
- <Geo abbreviation="NJ" geoCode="NJ" geoId="US-NJ" geoName="New Jersey"
geoTypeId="STATE"/>
- <Geo abbreviation="NM" geoCode="NM" geoId="US-NM" geoName="New Mexico"
geoTypeId="STATE"/>
- <Geo abbreviation="NV" geoCode="NV" geoId="US-NV" geoName="Nevada"
geoTypeId="STATE"/>
- <Geo abbreviation="NY" geoCode="NY" geoId="US-NY" geoName="New York"
geoTypeId="STATE"/>
- <Geo abbreviation="OH" geoCode="OH" geoId="US-OH" geoName="Ohio"
geoTypeId="STATE"/>
- <Geo abbreviation="OK" geoCode="OK" geoId="US-OK" geoName="Oklahoma"
geoTypeId="STATE"/>
- <Geo abbreviation="OR" geoCode="OR" geoId="US-OR" geoName="Oregon"
geoTypeId="STATE"/>
- <Geo abbreviation="PA" geoCode="PA" geoId="US-PA" geoName="Pennsylvania"
geoTypeId="STATE"/>
- <Geo abbreviation="PW" geoCode="PW" geoId="US-PW" geoName="Palau"
geoTypeId="STATE"/>
- <Geo abbreviation="PR" geoCode="PR" geoId="US-PR" geoName="Puerto Rico"
geoTypeId="STATE"/>
- <Geo abbreviation="RI" geoCode="RI" geoId="US-RI" geoName="Rhode Island"
geoTypeId="STATE"/>
- <Geo abbreviation="SC" geoCode="SC" geoId="US-SC" geoName="South Carolina"
geoTypeId="STATE"/>
- <Geo abbreviation="SD" geoCode="SD" geoId="US-SD" geoName="South Dakota"
geoTypeId="STATE"/>
- <Geo abbreviation="TN" geoCode="TN" geoId="US-TN" geoName="Tennessee"
geoTypeId="STATE"/>
- <Geo abbreviation="TX" geoCode="TX" geoId="US-TX" geoName="Texas"
geoTypeId="STATE"/>
- <Geo abbreviation="UM" geoCode="UM" geoId="US-UM" geoName="U.S. Minor
Outlying Islands" geoTypeId="STATE"/>
- <Geo abbreviation="UT" geoCode="UT" geoId="US-UT" geoName="Utah"
geoTypeId="STATE"/>
- <Geo abbreviation="VA" geoCode="VA" geoId="US-VA" geoName="Virginia"
geoTypeId="STATE"/>
- <Geo abbreviation="VT" geoCode="VT" geoId="US-VT" geoName="Vermont"
geoTypeId="STATE"/>
- <Geo abbreviation="WA" geoCode="WA" geoId="US-WA" geoName="Washington"
geoTypeId="STATE"/>
- <Geo abbreviation="WI" geoCode="WI" geoId="US-WI" geoName="Wisconsin"
geoTypeId="STATE"/>
- <Geo abbreviation="WV" geoCode="WV" geoId="US-WV" geoName="West Virginia"
geoTypeId="STATE"/>
- <Geo abbreviation="WY" geoCode="WY" geoId="US-WY" geoName="Wyoming"
geoTypeId="STATE"/>
- <Geo abbreviation="VI" geoCode="VI" geoId="US-VI" geoName="Virgin Islands"
geoTypeId="STATE"/>
-
- <GeoAssoc geoId="USA" geoIdTo="US-AK" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-AL" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-AR" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-AZ" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-CA" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-CO" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-CT" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-DC" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-DE" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-FL" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-GA" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-GU" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-HI" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-IA" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-ID" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-IL" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-IN" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-KS" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-KY" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-LA" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-MA" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-MD" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-ME" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-MI" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-MN" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-MO" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-MS" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-MT" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-NC" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-ND" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-NE" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-NH" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-NJ" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-NM" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-NV" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-NY" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-OH" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-OK" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-OR" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-PA" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-PR" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-RI" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-SC" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-SD" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-TN" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-TX" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-UT" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-VA" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-VT" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-WA" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-WI" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-WV" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-WY" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-VI" geoAssocTypeId="REGIONS"/>
-
- <GeoAssoc geoId="USA" geoIdTo="US-AA" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-AE" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="USA" geoIdTo="US-AP" geoAssocTypeId="REGIONS"/>
+ <Geo abbreviation="AA" geoCode="AA" geoId="AA" geoName="Armed Forces
Americas" geoTypeId="STATE"/>
+ <Geo abbreviation="AE" geoCode="AE" geoId="AE" geoName="Armed Forces
Europe" geoTypeId="STATE"/>
+ <Geo abbreviation="AP" geoCode="AP" geoId="AP" geoName="Armed Forces
Pacific" geoTypeId="STATE"/>
+
+ <Geo abbreviation="AK" geoCode="AK" geoId="AK" geoName="Alaska"
geoTypeId="STATE"/>
+ <Geo abbreviation="AL" geoCode="AL" geoId="AL" geoName="Alabama"
geoTypeId="STATE"/>
+ <Geo abbreviation="AR" geoCode="AR" geoId="AR" geoName="Arkansas"
geoTypeId="STATE"/>
+ <Geo abbreviation="AS" geoCode="AS" geoId="AS" geoName="American Samoa"
geoTypeId="STATE"/>
+ <Geo abbreviation="AZ" geoCode="AZ" geoId="AZ" geoName="Arizona"
geoTypeId="STATE"/>
+ <Geo abbreviation="CA" geoCode="CA" geoId="CA" geoName="California"
geoTypeId="STATE"/>
+ <Geo abbreviation="CO" geoCode="CO" geoId="CO" geoName="Colorado"
geoTypeId="STATE"/>
+ <Geo abbreviation="CT" geoCode="CT" geoId="CT" geoName="Connecticut"
geoTypeId="STATE"/>
+ <Geo abbreviation="DC" geoCode="DC" geoId="DC" geoName="District of
Columbia" geoTypeId="STATE"/>
+ <Geo abbreviation="DE" geoCode="DE" geoId="DE" geoName="Delaware"
geoTypeId="STATE"/>
+ <Geo abbreviation="FL" geoCode="FL" geoId="FL" geoName="Florida"
geoTypeId="STATE"/>
+ <Geo abbreviation="FM" geoCode="FM" geoId="FM" geoName="Federated States
of Micronesia" geoTypeId="STATE"/>
+ <Geo abbreviation="GA" geoCode="GA" geoId="GA" geoName="Georgia"
geoTypeId="STATE"/>
+ <Geo abbreviation="GU" geoCode="GU" geoId="GU" geoName="Guam"
geoTypeId="STATE"/>
+ <Geo abbreviation="HI" geoCode="HI" geoId="HI" geoName="Hawaii"
geoTypeId="STATE"/>
+ <Geo abbreviation="IA" geoCode="IA" geoId="IA" geoName="Iowa"
geoTypeId="STATE"/>
+ <Geo abbreviation="ID" geoCode="ID" geoId="ID" geoName="Idaho"
geoTypeId="STATE"/>
+ <Geo abbreviation="IL" geoCode="IL" geoId="IL" geoName="Illinois"
geoTypeId="STATE"/>
+ <Geo abbreviation="IN" geoCode="IN" geoId="IN" geoName="Indiana"
geoTypeId="STATE"/>
+ <Geo abbreviation="KS" geoCode="KS" geoId="KS" geoName="Kansas"
geoTypeId="STATE"/>
+ <Geo abbreviation="KY" geoCode="KY" geoId="KY" geoName="Kentucky"
geoTypeId="STATE"/>
+ <Geo abbreviation="LA" geoCode="LA" geoId="LA" geoName="Louisiana"
geoTypeId="STATE"/>
+ <Geo abbreviation="MA" geoCode="MA" geoId="MA" geoName="Massachusetts"
geoTypeId="STATE"/>
+ <Geo abbreviation="MD" geoCode="MD" geoId="MD" geoName="Maryland"
geoTypeId="STATE"/>
+ <Geo abbreviation="ME" geoCode="ME" geoId="ME" geoName="Maine"
geoTypeId="STATE"/>
+ <Geo abbreviation="MH" geoCode="MH" geoId="MH" geoName="Marshall Islands"
geoTypeId="STATE"/>
+ <Geo abbreviation="MI" geoCode="MI" geoId="MI" geoName="Michigan"
geoTypeId="STATE"/>
+ <Geo abbreviation="MN" geoCode="MN" geoId="MN" geoName="Minnesota"
geoTypeId="STATE"/>
+ <Geo abbreviation="MP" geoCode="MP" geoId="MP" geoName="Northern Mariana
Islands" geoTypeId="STATE"/>
+ <Geo abbreviation="MO" geoCode="MO" geoId="MO" geoName="Missouri"
geoTypeId="STATE"/>
+ <Geo abbreviation="MS" geoCode="MS" geoId="MS" geoName="Mississippi"
geoTypeId="STATE"/>
+ <Geo abbreviation="MT" geoCode="MT" geoId="MT" geoName="Montana"
geoTypeId="STATE"/>
+ <Geo abbreviation="NC" geoCode="NC" geoId="NC" geoName="North Carolina"
geoTypeId="STATE"/>
+ <Geo abbreviation="ND" geoCode="ND" geoId="ND" geoName="North Dakota"
geoTypeId="STATE"/>
+ <Geo abbreviation="NE" geoCode="NE" geoId="NE" geoName="Nebraska"
geoTypeId="STATE"/>
+ <Geo abbreviation="NH" geoCode="NH" geoId="NH" geoName="New Hampshire"
geoTypeId="STATE"/>
+ <Geo abbreviation="NJ" geoCode="NJ" geoId="NJ" geoName="New Jersey"
geoTypeId="STATE"/>
+ <Geo abbreviation="NM" geoCode="NM" geoId="NM" geoName="New Mexico"
geoTypeId="STATE"/>
+ <Geo abbreviation="NV" geoCode="NV" geoId="NV" geoName="Nevada"
geoTypeId="STATE"/>
+ <Geo abbreviation="NY" geoCode="NY" geoId="NY" geoName="New York"
geoTypeId="STATE"/>
+ <Geo abbreviation="OH" geoCode="OH" geoId="OH" geoName="Ohio"
geoTypeId="STATE"/>
+ <Geo abbreviation="OK" geoCode="OK" geoId="OK" geoName="Oklahoma"
geoTypeId="STATE"/>
+ <Geo abbreviation="OR" geoCode="OR" geoId="OR" geoName="Oregon"
geoTypeId="STATE"/>
+ <Geo abbreviation="PA" geoCode="PA" geoId="PA" geoName="Pennsylvania"
geoTypeId="STATE"/>
+ <Geo abbreviation="PW" geoCode="PW" geoId="PW" geoName="Palau"
geoTypeId="STATE"/>
+ <Geo abbreviation="PR" geoCode="PR" geoId="PR" geoName="Puerto Rico"
geoTypeId="STATE"/>
+ <Geo abbreviation="RI" geoCode="RI" geoId="RI" geoName="Rhode Island"
geoTypeId="STATE"/>
+ <Geo abbreviation="SC" geoCode="SC" geoId="SC" geoName="South Carolina"
geoTypeId="STATE"/>
+ <Geo abbreviation="SD" geoCode="SD" geoId="SD" geoName="South Dakota"
geoTypeId="STATE"/>
+ <Geo abbreviation="TN" geoCode="TN" geoId="TN" geoName="Tennessee"
geoTypeId="STATE"/>
+ <Geo abbreviation="TX" geoCode="TX" geoId="TX" geoName="Texas"
geoTypeId="STATE"/>
+ <Geo abbreviation="UM" geoCode="UM" geoId="UM" geoName="U.S. Minor
Outlying Islands" geoTypeId="STATE"/>
+ <Geo abbreviation="UT" geoCode="UT" geoId="UT" geoName="Utah"
geoTypeId="STATE"/>
+ <Geo abbreviation="VA" geoCode="VA" geoId="VA" geoName="Virginia"
geoTypeId="STATE"/>
+ <Geo abbreviation="VT" geoCode="VT" geoId="VT" geoName="Vermont"
geoTypeId="STATE"/>
+ <Geo abbreviation="WA" geoCode="WA" geoId="WA" geoName="Washington"
geoTypeId="STATE"/>
+ <Geo abbreviation="WI" geoCode="WI" geoId="WI" geoName="Wisconsin"
geoTypeId="STATE"/>
+ <Geo abbreviation="WV" geoCode="WV" geoId="WV" geoName="West Virginia"
geoTypeId="STATE"/>
+ <Geo abbreviation="WY" geoCode="WY" geoId="WY" geoName="Wyoming"
geoTypeId="STATE"/>
+ <Geo abbreviation="VI" geoCode="VI" geoId="VI" geoName="Virgin Islands"
geoTypeId="STATE"/>
+
+ <GeoAssoc geoId="USA" geoIdTo="AK" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="AL" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="AR" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="AZ" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="CA" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="CO" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="CT" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="DC" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="DE" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="FL" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="GA" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="GU" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="HI" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="IA" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="ID" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="IL" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="IN" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="KS" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="KY" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="LA" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="MA" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="MD" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="ME" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="MI" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="MN" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="MO" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="MS" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="MT" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="NC" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="ND" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="NE" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="NH" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="NJ" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="NM" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="NV" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="NY" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="OH" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="OK" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="OR" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="PA" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="PR" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="RI" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="SC" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="SD" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="TN" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="TX" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="UT" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="VA" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="VT" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="WA" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="WI" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="WV" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="WY" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="VI" geoAssocTypeId="REGIONS"/>
+
+ <GeoAssoc geoId="USA" geoIdTo="AA" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="AE" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="USA" geoIdTo="AP" geoAssocTypeId="REGIONS"/>
<Geo abbreviation="USAF" geoCode="USAF" geoId="USAF" geoName="US Armed
Forces" geoTypeId="GROUP"/>
- <GeoAssoc geoId="US-AA" geoIdTo="USAF" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-AE" geoIdTo="USAF" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-AP" geoIdTo="USAF" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="AA" geoIdTo="USAF" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="AE" geoIdTo="USAF" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="AP" geoIdTo="USAF" geoAssocTypeId="GROUP_MEMBER"/>
<Geo abbreviation="AKHI" geoCode="AKHI" geoId="AKHI"
geoName="Alaska/Hawaii" geoTypeId="GROUP"/>
- <GeoAssoc geoId="US-AK" geoIdTo="AKHI" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-HI" geoIdTo="AKHI" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="AK" geoIdTo="AKHI" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="HI" geoIdTo="AKHI" geoAssocTypeId="GROUP_MEMBER"/>
<Geo abbreviation="USTR" geoCode="USTR" geoId="USTR" geoName="US
Territories" geoTypeId="GROUP"/>
- <GeoAssoc geoId="US-AS" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-FM" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-GU" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-MH" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-MP" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-PW" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-PR" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-UM" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-VI" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="AS" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="FM" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="GU" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="MH" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="MP" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="PW" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="PR" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="UM" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="VI" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
<Geo abbreviation="AHUST" geoCode="AHUST" geoId="AHUST"
geoName="Alaska/Hawaii/Territories" geoTypeId="GROUP"/>
<GeoAssoc geoId="AKHI" geoIdTo="AHUST" geoAssocTypeId="GROUP_MEMBER"/>
<GeoAssoc geoId="USTR" geoIdTo="AHUST" geoAssocTypeId="GROUP_MEMBER"/>
<Geo abbreviation="USCN" geoCode="USCN" geoId="USCN" geoName="US
Continental" geoTypeId="GROUP"/>
- <GeoAssoc geoId="US-AL" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-AR" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-AZ" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-CA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-CO" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-CT" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-DC" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-DE" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-FL" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-GA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-IA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-ID" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-IL" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-IN" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-KS" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-KY" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-LA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-MA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-MD" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-ME" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-MI" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-MN" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-MO" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-MS" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-MT" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-NC" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-ND" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-NE" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-NH" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-NJ" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-NM" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-NV" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-NY" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-OH" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-OK" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-OR" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-PA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-RI" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-SC" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-SD" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-TN" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-TX" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-UT" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-VA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-VT" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-WA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-WI" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-WV" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
- <GeoAssoc geoId="US-WY" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="AL" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="AR" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="AZ" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="CA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="CO" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="CT" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="DC" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="DE" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="FL" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="GA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="IA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="ID" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="IL" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="IN" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="KS" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="KY" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="LA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="MA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="MD" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="ME" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="MI" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="MN" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="MO" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="MS" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="MT" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="NC" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="ND" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="NE" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="NH" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="NJ" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="NM" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="NV" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="NY" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="OH" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="OK" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="OR" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="PA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="RI" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="SC" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="SD" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="TN" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="TX" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="UT" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="VA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="VT" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="WA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="WI" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="WV" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="WY" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
<Geo abbreviation="USALL" geoCode="USALL" geoId="USALL" geoName="US All
(w/ APO/FPO)" geoTypeId="GROUP"/>
<GeoAssoc geoId="USCN" geoIdTo="USALL" geoAssocTypeId="GROUP_MEMBER"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml?rev=1170061&r1=1170060&r2=1170061&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml Tue Sep
13 06:45:13 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="US-UT"
postalCode="84057" countryGeoId="USA" geoPointId="9000"/>
+ <PostalAddress contactMechId="9010" toName="Demo Customer Company"
address1="2004 Factory Blvd" city="Orem" stateProvinceGeoId="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="US-CA"
postalCode="90010" countryGeoId="USA"/>
+ <PostalAddress contactMechId="9014" toName="Demo Customer Company"
address1="1234 Commerce Way" city="Los Angeles" stateProvinceGeoId="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="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"/>
+ <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"/>
<!-- 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="US-UT"
postalCode="84057" countryGeoId="USA" geoPointId="9000"/>
+ <PostalAddress contactMechId="9011" toName="Demo Customer Agent"
address1="2004 Factory Blvd" city="Orem" stateProvinceGeoId="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="US-UT" postalCode="84057"
countryGeoId="USA" geoPointId="9000"/>
+ <PostalAddress contactMechId="9015" toName="Demo Customer" address1="2004
Factory Blvd" city="Orem" stateProvinceGeoId="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=1170061&r1=1170060&r2=1170061&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderTestData.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderTestData.xml Tue Sep 13
06:45:13 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="US-UT"
taxAuthGeoId="US-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="UT"
taxAuthGeoId="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="US-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="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"/>
