OFBiz › OFBiz - Commits

svn commit: r889671 - in /ofbiz/branches/release09.04: ./ framework/common/config/CommonEntityLabels.xml framework/common/data/CurrencyData.xml

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r889671 - in /ofbiz/branches/release09.04: ./ framework/common/config/CommonEntityLabels.xml framework/common/data/CurrencyData.xml

jleroux@apache.org
Author: jleroux
Date: Fri Dec 11 16:02:17 2009
New Revision: 889671

URL: http://svn.apache.org/viewvc?rev=889671&view=rev
Log:
"Applied fix from trunk for revision: 889666  "
------------------------------------------------------------------------
r889666 | jleroux | 2009-12-11 16:46:03 +0100 (ven. 11 d‚c. 2009) | 3 lignes

Close "duplicated countries listed in currency selection" (https://issues.apache.org/jira/browse/OFBIZ-3246)
As explained in OFBIZ-3246, RMB is not ISO, CNY is. I kept the lines (only commented out)

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/framework/common/config/CommonEntityLabels.xml
    ofbiz/branches/release09.04/framework/common/data/CurrencyData.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 11 16:02:17 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810
 814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810
 814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666

Modified: ofbiz/branches/release09.04/framework/common/config/CommonEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/config/CommonEntityLabels.xml?rev=889671&r1=889670&r2=889671&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/common/config/CommonEntityLabels.xml (original)
+++ ofbiz/branches/release09.04/framework/common/config/CommonEntityLabels.xml Fri Dec 11 16:02:17 2009
@@ -13450,7 +13450,8 @@
         <value xml:lang="th">เรียล กาตาร์</value>
         <value xml:lang="zh">卡塔尔里亚尔</value>
     </property>
-    <property key="Uom.description.RMB">
+    <!-- see https://issues.apache.org/jira/browse/OFBIZ-3246 -->
+    <!--property key="Uom.description.RMB">
         <value xml:lang="en">Chinese Renminbi Yuan</value>
         <value xml:lang="fr">Yuan Renmimbi chinois</value>
         <value xml:lang="it">Chinese Renminbi Yuan</value>
@@ -13459,7 +13460,7 @@
         <value xml:lang="ru">Китайский юань</value>
         <value xml:lang="th">หยวน จีนเหรินหมินปี้</value>
         <value xml:lang="zh">中国人民币元</value>
-    </property>
+    </property-->
     <property key="Uom.description.ROL">
         <value xml:lang="de">Leu Rumänien</value>
         <value xml:lang="en">Romanian Leu</value>

Modified: ofbiz/branches/release09.04/framework/common/data/CurrencyData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/data/CurrencyData.xml?rev=889671&r1=889670&r2=889671&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/common/data/CurrencyData.xml (original)
+++ ofbiz/branches/release09.04/framework/common/data/CurrencyData.xml Fri Dec 11 16:02:17 2009
@@ -142,7 +142,7 @@
     <Uom abbreviation="PLZ" description="Poland" uomId="PLZ" uomTypeId="CURRENCY_MEASURE"/>
     <Uom abbreviation="PYG" description="Paraguayan Guarani" uomId="PYG" uomTypeId="CURRENCY_MEASURE"/>
     <Uom abbreviation="QAR" description="Qatar Riyal" uomId="QAR" uomTypeId="CURRENCY_MEASURE"/>
-    <Uom abbreviation="RMB" description="Chinese Renminbi Yuan" uomId="RMB" uomTypeId="CURRENCY_MEASURE"/>
+    <!--Uom abbreviation="RMB" description="Chinese Renminbi Yuan" uomId="RMB" uomTypeId="CURRENCY_MEASURE"/--><!-- see https://issues.apache.org/jira/browse/OFBIZ-3246 -->
     <Uom abbreviation="ROL" description="Romanian Leu" uomId="ROL" uomTypeId="CURRENCY_MEASURE"/>
     <Uom abbreviation="RUR" description="Russian Rouble" uomId="RUR" uomTypeId="CURRENCY_MEASURE"/>
     <Uom abbreviation="RWF" description="Rwanda Franc" uomId="RWF" uomTypeId="CURRENCY_MEASURE"/>


Free forum by Nabble Edit this page