Jacques could you revert this when you get a chance?  CountryAddressFormat 
doesn't exist in 11.04.  Another reminder (I've lost count) that changes 
shouldn't be backported to releases without testing.

Regards
Scott

On 2/04/2014, at 3:54 am, jler...@apache.org wrote:

> Author: jleroux
> Date: Tue Apr  1 14:54:12 2014
> New Revision: 1583694
> 
> URL: http://svn.apache.org/r1583694
> Log:
> "Applied fix from trunk for revision: 1583689 " 
> ------------------------------------------------------------------------
> r1583689 | jleroux | 2014-04-01 16:52:23 +0200 (mar. 01 avr. 2014) | 4 lignes
> 
> A patch from Christian Carlow for "Include Thailand Province Geo data" 
> https://issues.apache.org/jira/browse/OFBIZ-5607
> 
> This patch includes the CountryAddressFormat records for my Malaysia 
> (OFBIZ-5606), Thailand, and Israel (OFBIZ-5609) geo issues.
> Without this patch, the state/provinces do not appear in the dependent drop 
> down form when adding party contact info.
> ------------------------------------------------------------------------
> 
> 
> Modified:
>    ofbiz/branches/release11.04/   (props changed)
>    ofbiz/branches/release11.04/framework/common/data/GeoData.xml
> 
> Propchange: ofbiz/branches/release11.04/
> ------------------------------------------------------------------------------
>  Merged /ofbiz/trunk:r1583689
> 
> Modified: ofbiz/branches/release11.04/framework/common/data/GeoData.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/data/GeoData.xml?rev=1583694&r1=1583693&r2=1583694&view=diff
> ==============================================================================
> --- ofbiz/branches/release11.04/framework/common/data/GeoData.xml (original)
> +++ ofbiz/branches/release11.04/framework/common/data/GeoData.xml Tue Apr  1 
> 14:54:12 2014
> @@ -318,4 +318,7 @@ under the License.
>     <GeoAssoc geoAssocTypeId="GROUP_MEMBER" geoIdTo="GBR" geoId="NIRL"/>
>     <GeoAssoc geoAssocTypeId="GROUP_MEMBER" geoIdTo="GBR" geoId="WALS"/>
> 
> +    <CountryAddressFormat geoId="MYS" geoAssocTypeId="REGIONS" 
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" 
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> +    <CountryAddressFormat geoId="THA" geoAssocTypeId="REGIONS" 
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" 
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> +    <CountryAddressFormat geoId="ISR" geoAssocTypeId="REGIONS" 
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" 
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> </entity-engine-xml>
> 
> 

Reply via email to