Re: svn commit: r950900 - in /ofbiz/branches/release10.04: ./ framework/common/data/GeoData_DE.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r950900 - in /ofbiz/branches/release10.04: ./ framework/common/data/GeoData_DE.xml

Vikas Mayur-3
Shouldn't it be reverted in 10.04 and 09.04 as Adam actually fixed the  
issue in trunk r951062?

Regards
Vikas

On Jun 3, 2010, at 1:02 PM, [hidden email] wrote:

> Author: jleroux
> Date: Thu Jun  3 07:32:21 2010
> New Revision: 950900
>
> URL: http://svn.apache.org/viewvc?rev=950900&view=rev
> Log:
> "Applied fix from trunk for revision: 950893"
> ------------------------------------------------------------------------
> r950893 | jleroux | 2010-06-03 09:12:39 +0200 (jeu. 03 juin 2010) |  
> 5 lignes
>
> A patch from Atul Vani for an issue reported by R.S."States of th  
> country Germany shows zero results from both webtools and using  
> services." (https://issues.apache.org/jira/browse/OFBIZ-3799) -  
> OFBIZ-3799
>
> Data to associate the country with states isn't present. This issue  
> is with reference to discussion started by R.S. on user-mailing list  
> subjected as "StateList"
> R.S., thanks for reporting the issue.
>
> ------------------------------------------------------------------------
> 
>
> Modified:
>    ofbiz/branches/release10.04/   (props changed)
>    ofbiz/branches/release10.04/framework/common/data/GeoData_DE.xml
>
> Propchange: ofbiz/branches/release10.04/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Thu Jun  3 07:32:21 2010
> @@ -1,3 +1,3 @@
> /ofbiz/branches/addbirt:831210-885099,885686-886087
> /ofbiz/branches/multitenant20100310:921280-927264
> -/ofbiz/trunk:
> 939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870
> +/ofbiz/trunk:
> 939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893
>
> Modified: ofbiz/branches/release10.04/framework/common/data/
> GeoData_DE.xml
> URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/common/data/GeoData_DE.xml?rev=950900&r1=950899&r2=950900&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/branches/release10.04/framework/common/data/GeoData_DE.xml  
> (original)
> +++ ofbiz/branches/release10.04/framework/common/data/GeoData_DE.xml  
> Thu Jun  3 07:32:21 2010
> @@ -35,4 +35,21 @@ under the License.
>     <Geo abbreviation="SN" geoCode="SN" geoId="DE-SN"  
> geoName="Sachsen" geoTypeId="STATE"/>
>     <Geo abbreviation="SA" geoCode="SA" geoId="DE-SA"  
> geoName="Sachsen-Anhalt" geoTypeId="STATE"/>
>     <Geo abbreviation="TH" geoCode="TH" geoId="DE-TH"  
> geoName="Thüringen" geoTypeId="STATE"/>
> -</entity-engine-xml>
> +
> +    <GeoAssoc geoId="DE" geoIdTo="DE-BW" geoAssocTypeId="REGIONS"/>
> +    <GeoAssoc geoId="DE" geoIdTo="DE-BY" geoAssocTypeId="REGIONS"/>
> +    <GeoAssoc geoId="DE" geoIdTo="DE-BE" geoAssocTypeId="REGIONS"/>
> +    <GeoAssoc geoId="DE" geoIdTo="DE-BR" geoAssocTypeId="REGIONS"/>
> +    <GeoAssoc geoId="DE" geoIdTo="DE-HB" geoAssocTypeId="REGIONS"/>
> +    <GeoAssoc geoId="DE" geoIdTo="DE-HH" geoAssocTypeId="REGIONS"/>
> +    <GeoAssoc geoId="DE" geoIdTo="DE-HE" geoAssocTypeId="REGIONS"/>
> +    <GeoAssoc geoId="DE" geoIdTo="DE-MV" geoAssocTypeId="REGIONS"/>
> +    <GeoAssoc geoId="DE" geoIdTo="DE-NI" geoAssocTypeId="REGIONS"/>
> +    <GeoAssoc geoId="DE" geoIdTo="DE-NW" geoAssocTypeId="REGIONS"/>
> +    <GeoAssoc geoId="DE" geoIdTo="DE-RP" geoAssocTypeId="REGIONS"/>
> +    <GeoAssoc geoId="DE" geoIdTo="DE-SL" geoAssocTypeId="REGIONS"/>
> +    <GeoAssoc geoId="DE" geoIdTo="DE-SH" geoAssocTypeId="REGIONS"/>
> +    <GeoAssoc geoId="DE" geoIdTo="DE-SN" geoAssocTypeId="REGIONS"/>
> +    <GeoAssoc geoId="DE" geoIdTo="DE-SA" geoAssocTypeId="REGIONS"/>
> +    <GeoAssoc geoId="DE" geoIdTo="DE-TH" geoAssocTypeId="REGIONS"/>
> +</entity-engine-xml>
> \ No newline at end of file
>
>

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r950900 - in /ofbiz/branches/release10.04: ./ framework/common/data/GeoData_DE.xml

Jacques Le Roux
Administrator
Thanks for the reminder Vikas, done at r951476 in R10.04, r951475 in R9.04

Actually I should not have backported them in 1st place, but now it's ok

Jacques

From: "Vikas Mayur" <[hidden email]>

> Shouldn't it be reverted in 10.04 and 09.04 as Adam actually fixed the  issue in trunk r951062?
>
> Regards
> Vikas
>
> On Jun 3, 2010, at 1:02 PM, [hidden email] wrote:
>
>> Author: jleroux
>> Date: Thu Jun  3 07:32:21 2010
>> New Revision: 950900
>>
>> URL: http://svn.apache.org/viewvc?rev=950900&view=rev
>> Log:
>> "Applied fix from trunk for revision: 950893"
>> ------------------------------------------------------------------------
>> r950893 | jleroux | 2010-06-03 09:12:39 +0200 (jeu. 03 juin 2010) |  5 lignes
>>
>> A patch from Atul Vani for an issue reported by R.S."States of th  country Germany shows zero results from both webtools and
>> using  services." (https://issues.apache.org/jira/browse/OFBIZ-3799) -  OFBIZ-3799
>>
>> Data to associate the country with states isn't present. This issue  is with reference to discussion started by R.S. on
>> user-mailing list  subjected as "StateList"
>> R.S., thanks for reporting the issue.
>>
>> ------------------------------------------------------------------------
>> 
>>
>> Modified:
>>    ofbiz/branches/release10.04/   (props changed)
>>    ofbiz/branches/release10.04/framework/common/data/GeoData_DE.xml
>>
>> Propchange: ofbiz/branches/release10.04/
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Thu Jun  3 07:32:21 2010
>> @@ -1,3 +1,3 @@
>> /ofbiz/branches/addbirt:831210-885099,885686-886087
>> /ofbiz/branches/multitenant20100310:921280-927264
>> -/ofbiz/trunk:
>> 939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870
>> +/ofbiz/trunk:
>> 939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893
>>
>> Modified: ofbiz/branches/release10.04/framework/common/data/ GeoData_DE.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/common/data/GeoData_DE.xml?rev=950900&r1=950899&r2=950900&view=diff
>> = = = = = = = = ======================================================================
>> --- ofbiz/branches/release10.04/framework/common/data/GeoData_DE.xml  (original)
>> +++ ofbiz/branches/release10.04/framework/common/data/GeoData_DE.xml  Thu Jun  3 07:32:21 2010
>> @@ -35,4 +35,21 @@ under the License.
>>     <Geo abbreviation="SN" geoCode="SN" geoId="DE-SN"  geoName="Sachsen" geoTypeId="STATE"/>
>>     <Geo abbreviation="SA" geoCode="SA" geoId="DE-SA"  geoName="Sachsen-Anhalt" geoTypeId="STATE"/>
>>     <Geo abbreviation="TH" geoCode="TH" geoId="DE-TH"  geoName="Thüringen" geoTypeId="STATE"/>
>> -</entity-engine-xml>
>> +
>> +    <GeoAssoc geoId="DE" geoIdTo="DE-BW" geoAssocTypeId="REGIONS"/>
>> +    <GeoAssoc geoId="DE" geoIdTo="DE-BY" geoAssocTypeId="REGIONS"/>
>> +    <GeoAssoc geoId="DE" geoIdTo="DE-BE" geoAssocTypeId="REGIONS"/>
>> +    <GeoAssoc geoId="DE" geoIdTo="DE-BR" geoAssocTypeId="REGIONS"/>
>> +    <GeoAssoc geoId="DE" geoIdTo="DE-HB" geoAssocTypeId="REGIONS"/>
>> +    <GeoAssoc geoId="DE" geoIdTo="DE-HH" geoAssocTypeId="REGIONS"/>
>> +    <GeoAssoc geoId="DE" geoIdTo="DE-HE" geoAssocTypeId="REGIONS"/>
>> +    <GeoAssoc geoId="DE" geoIdTo="DE-MV" geoAssocTypeId="REGIONS"/>
>> +    <GeoAssoc geoId="DE" geoIdTo="DE-NI" geoAssocTypeId="REGIONS"/>
>> +    <GeoAssoc geoId="DE" geoIdTo="DE-NW" geoAssocTypeId="REGIONS"/>
>> +    <GeoAssoc geoId="DE" geoIdTo="DE-RP" geoAssocTypeId="REGIONS"/>
>> +    <GeoAssoc geoId="DE" geoIdTo="DE-SL" geoAssocTypeId="REGIONS"/>
>> +    <GeoAssoc geoId="DE" geoIdTo="DE-SH" geoAssocTypeId="REGIONS"/>
>> +    <GeoAssoc geoId="DE" geoIdTo="DE-SN" geoAssocTypeId="REGIONS"/>
>> +    <GeoAssoc geoId="DE" geoIdTo="DE-SA" geoAssocTypeId="REGIONS"/>
>> +    <GeoAssoc geoId="DE" geoIdTo="DE-TH" geoAssocTypeId="REGIONS"/>
>> +</entity-engine-xml>
>> \ No newline at end of file
>>
>>
>
>


Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r950900 - in /ofbiz/branches/release10.04: ./ framework/common/data/GeoData_DE.xml

Vikas Mayur-3
Thanks Jacques!

Regards
Vikas

On Jun 4, 2010, at 9:55 PM, Jacques Le Roux wrote:

> Thanks for the reminder Vikas, done at r951476 in R10.04, r951475 in  
> R9.04
>
> Actually I should not have backported them in 1st place, but now  
> it's ok
>
> Jacques
>
> From: "Vikas Mayur" <[hidden email]>
>> Shouldn't it be reverted in 10.04 and 09.04 as Adam actually fixed  
>> the  issue in trunk r951062?
>>
>> Regards
>> Vikas
>>
>> On Jun 3, 2010, at 1:02 PM, [hidden email] wrote:
>>
>>> Author: jleroux
>>> Date: Thu Jun  3 07:32:21 2010
>>> New Revision: 950900
>>>
>>> URL: http://svn.apache.org/viewvc?rev=950900&view=rev
>>> Log:
>>> "Applied fix from trunk for revision: 950893"
>>> ------------------------------------------------------------------------
>>> r950893 | jleroux | 2010-06-03 09:12:39 +0200 (jeu. 03 juin 2010)  
>>> |  5 lignes
>>>
>>> A patch from Atul Vani for an issue reported by R.S."States of th  
>>> country Germany shows zero results from both webtools and using  
>>> services." (https://issues.apache.org/jira/browse/OFBIZ-3799) -  
>>> OFBIZ-3799
>>>
>>> Data to associate the country with states isn't present. This  
>>> issue  is with reference to discussion started by R.S. on user-
>>> mailing list  subjected as "StateList"
>>> R.S., thanks for reporting the issue.
>>>
>>> ------------------------------------------------------------------------
>>> 
>>>
>>> Modified:
>>>   ofbiz/branches/release10.04/   (props changed)
>>>   ofbiz/branches/release10.04/framework/common/data/GeoData_DE.xml
>>>
>>> Propchange: ofbiz/branches/release10.04/
>>> ------------------------------------------------------------------------------
>>> --- svn:mergeinfo (original)
>>> +++ svn:mergeinfo Thu Jun  3 07:32:21 2010
>>> @@ -1,3 +1,3 @@
>>> /ofbiz/branches/addbirt:831210-885099,885686-886087
>>> /ofbiz/branches/multitenant20100310:921280-927264
>>> -/ofbiz/trunk:  
>>> 939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870
>>> +/ofbiz/trunk:  
>>> 939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893
>>>
>>> Modified: ofbiz/branches/release10.04/framework/common/data/  
>>> GeoData_DE.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/common/data/GeoData_DE.xml?rev=950900&r1=950899&r2=950900&view=diff
>>> = = = = = = = =  
>>> =
>>> =
>>> ====================================================================
>>> --- ofbiz/branches/release10.04/framework/common/data/
>>> GeoData_DE.xml  (original)
>>> +++ ofbiz/branches/release10.04/framework/common/data/
>>> GeoData_DE.xml  Thu Jun  3 07:32:21 2010
>>> @@ -35,4 +35,21 @@ under the License.
>>>    <Geo abbreviation="SN" geoCode="SN" geoId="DE-SN"  
>>> geoName="Sachsen" geoTypeId="STATE"/>
>>>    <Geo abbreviation="SA" geoCode="SA" geoId="DE-SA"  
>>> geoName="Sachsen-Anhalt" geoTypeId="STATE"/>
>>>    <Geo abbreviation="TH" geoCode="TH" geoId="DE-TH"  
>>> geoName="Thüringen" geoTypeId="STATE"/>
>>> -</entity-engine-xml>
>>> +
>>> +    <GeoAssoc geoId="DE" geoIdTo="DE-BW" geoAssocTypeId="REGIONS"/>
>>> +    <GeoAssoc geoId="DE" geoIdTo="DE-BY" geoAssocTypeId="REGIONS"/>
>>> +    <GeoAssoc geoId="DE" geoIdTo="DE-BE" geoAssocTypeId="REGIONS"/>
>>> +    <GeoAssoc geoId="DE" geoIdTo="DE-BR" geoAssocTypeId="REGIONS"/>
>>> +    <GeoAssoc geoId="DE" geoIdTo="DE-HB" geoAssocTypeId="REGIONS"/>
>>> +    <GeoAssoc geoId="DE" geoIdTo="DE-HH" geoAssocTypeId="REGIONS"/>
>>> +    <GeoAssoc geoId="DE" geoIdTo="DE-HE" geoAssocTypeId="REGIONS"/>
>>> +    <GeoAssoc geoId="DE" geoIdTo="DE-MV" geoAssocTypeId="REGIONS"/>
>>> +    <GeoAssoc geoId="DE" geoIdTo="DE-NI" geoAssocTypeId="REGIONS"/>
>>> +    <GeoAssoc geoId="DE" geoIdTo="DE-NW" geoAssocTypeId="REGIONS"/>
>>> +    <GeoAssoc geoId="DE" geoIdTo="DE-RP" geoAssocTypeId="REGIONS"/>
>>> +    <GeoAssoc geoId="DE" geoIdTo="DE-SL" geoAssocTypeId="REGIONS"/>
>>> +    <GeoAssoc geoId="DE" geoIdTo="DE-SH" geoAssocTypeId="REGIONS"/>
>>> +    <GeoAssoc geoId="DE" geoIdTo="DE-SN" geoAssocTypeId="REGIONS"/>
>>> +    <GeoAssoc geoId="DE" geoIdTo="DE-SA" geoAssocTypeId="REGIONS"/>
>>> +    <GeoAssoc geoId="DE" geoIdTo="DE-TH" geoAssocTypeId="REGIONS"/>
>>> +</entity-engine-xml>
>>> \ No newline at end of file
>>>
>>>
>>
>
>