You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/12/11 16:46:04 UTC

svn commit: r889666 - in /ofbiz/trunk/framework/common: config/CommonEntityLabels.xml data/CurrencyData.xml

Author: jleroux
Date: Fri Dec 11 15:46:03 2009
New Revision: 889666

URL: http://svn.apache.org/viewvc?rev=889666&view=rev
Log:
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/trunk/framework/common/config/CommonEntityLabels.xml
    ofbiz/trunk/framework/common/data/CurrencyData.xml

Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonEntityLabels.xml?rev=889666&r1=889665&r2=889666&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonEntityLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonEntityLabels.xml Fri Dec 11 15:46:03 2009
@@ -13776,7 +13776,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>
@@ -13785,7 +13786,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/trunk/framework/common/data/CurrencyData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/CurrencyData.xml?rev=889666&r1=889665&r2=889666&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/CurrencyData.xml (original)
+++ ofbiz/trunk/framework/common/data/CurrencyData.xml Fri Dec 11 15:46:03 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"/>