r15442 - gnucash/branches/2.0 - Change Russian Ruble from RUR to RUB; r7574 was erroneous. See bug #393185.

[Derek Atkins]

Author: warlord
Date: 2007-01-27 23:09:32 -0500 (Sat, 27 Jan 2007)
New Revision: 15442
Trac: http://svn.gnucash.org/trac/changeset/15442

Modified:
   gnucash/branches/2.0/
   gnucash/branches/2.0/ChangeLog
   gnucash/branches/2.0/src/engine/gnc-commodity.c
   gnucash/branches/2.0/src/engine/iso-4217-currencies.scm
Log:
Change Russian Ruble from RUR to RUB; r7574 was erroneous. See bug #393185.
Fix numerical currency code for RUB.

Merge from r15421 and r15422



Property changes on: gnucash/branches/2.0
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/2.0:697
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:13973
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/2.0:697
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:13974
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282

Modified: gnucash/branches/2.0/ChangeLog
===================================================================
--- gnucash/branches/2.0/ChangeLog	2007-01-28 04:09:14 UTC (rev 15441)
+++ gnucash/branches/2.0/ChangeLog	2007-01-28 04:09:32 UTC (rev 15442)
@@ -1,3 +1,8 @@
+2007-01-27  Christian Stimming  <stimming at tuhh.de>
+
+	* Change Russian Ruble from RUR to RUB; r7574 was erroneous. #393185.
+	  Fix numerical currency code for RUB.
+	
 2007-01-27  Joshua Sled  <jsled at asynchronous.org>
 
 	* Bug#394420: initialized dates still aren't valid; set to 'now'

Modified: gnucash/branches/2.0/src/engine/gnc-commodity.c
===================================================================
--- gnucash/branches/2.0/src/engine/gnc-commodity.c	2007-01-28 04:09:14 UTC (rev 15441)
+++ gnucash/branches/2.0/src/engine/gnc-commodity.c	2007-01-28 04:09:32 UTC (rev 15442)
@@ -84,7 +84,7 @@
   const char *old_code;
   const char *new_code;
 } gnc_new_iso_codes[] = {
-  {"RUB", "RUR"}, /* Russian Ruble */
+  {"RUR", "RUB"}, /* Russian Ruble: RUR through 1997-12, RUB from 1998-01 onwards; see bug #393185 */
   {"PLZ", "PLN"}, /* Polish Zloty */
   {"UAG", "UAH"}, /* Ukraine Hryvnia */
   {"ILS", "NIS"}, /* New Israeli Shekel */

Modified: gnucash/branches/2.0/src/engine/iso-4217-currencies.scm
===================================================================
--- gnucash/branches/2.0/src/engine/iso-4217-currencies.scm	2007-01-28 04:09:14 UTC (rev 15441)
+++ gnucash/branches/2.0/src/engine/iso-4217-currencies.scm	2007-01-28 04:09:32 UTC (rev 15442)
@@ -145,7 +145,7 @@
 ( "Qatari Rial" "rial" "dirham" "ISO4217" "QAR" "634" 100 100 )
 ( "Romanian Leu" "leu" "bani"  "ISO4217" "ROL" "642" 100 100 ) ;; through 2005-06
 ( "Romanian Leu" "leu" "bani"  "ISO4217" "RON" "946" 100 100 ) ;; from 2005-07
-( "Russian Rouble" "rouble" "kopek" "ISO4217" "RUR" "810" 100 100 )
+( "Russian Rouble" "rouble" "kopek" "ISO4217" "RUB" "643" 100 100 ) ;; RUR through 1997-12, RUB from 1998-01 onwards; see bug #393185
 ( "Rwanda Franc" "franc" "centime" "ISO4217" "RWF" "646" 100 100 )
 ( "Samoan Tala" "tala" "sene" "ISO4217" "WST" "882" 100 100 )
 ( "Sao Tome and Principe Dobra" "Dobra" "centimo" "ISO4217" "STD" "678" 100 100 )