[Gnucash-changes] Updating test data files to G2 syntax

Neil Williams codehelp at cvs.gnucash.org
Thu Oct 13 08:32:05 EDT 2005


Log Message:
-----------
Updating test data files to G2 syntax

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash/src/backend/file/test/test-files/xml2:
        Money95bank_fr.gml2
        Money95invst.gml2
        Money95mutual.gml2
        Money95stocks.gml2
        abc.gml2
        abcall.gml2
        carols-data-file.gml2
        cbb-export.gml2
        conrads-file.gml2
        every.gml2
        goonies-file.gml2
        hierachical-data-file.gml2
        ms-money.gml2
        pricedb1.gml2

Revision Data
-------------
Index: hierachical-data-file.gml2
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-files/xml2/hierachical-data-file.gml2,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -Lsrc/backend/file/test/test-files/xml2/hierachical-data-file.gml2 -Lsrc/backend/file/test/test-files/xml2/hierachical-data-file.gml2 -u -r1.1 -r1.1.6.1
--- src/backend/file/test/test-files/xml2/hierachical-data-file.gml2
+++ src/backend/file/test/test-files/xml2/hierachical-data-file.gml2
@@ -1,16 +1,41 @@
 <?xml version="1.0"?>
-<gnc-v2>
+<gnc-v2
+     xmlns:gnc="http://www.gnucash.org/XML/gnc"
+     xmlns:act="http://www.gnucash.org/XML/act"
+     xmlns:book="http://www.gnucash.org/XML/book"
+     xmlns:cd="http://www.gnucash.org/XML/cd"
+     xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+     xmlns:price="http://www.gnucash.org/XML/price"
+     xmlns:slot="http://www.gnucash.org/XML/slot"
+     xmlns:split="http://www.gnucash.org/XML/split"
+     xmlns:sx="http://www.gnucash.org/XML/sx"
+     xmlns:trn="http://www.gnucash.org/XML/trn"
+     xmlns:ts="http://www.gnucash.org/XML/ts"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:addr="http://www.gnucash.org/XML/addr"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
+     xmlns:employee="http://www.gnucash.org/XML/employee"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:billterm="http://www.gnucash.org/XML/billterm"
+     xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+     xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:entry="http://www.gnucash.org/XML/entry"
+     xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="account">8</gnc:count-data>
 <gnc:count-data cd:type="transaction">6</gnc:count-data>
 <gnc:account version="2.0.0">
   <act:name>Bank Accounts</act:name>
   <act:id type="guid">ec511fd83bdb2fb877d7b23042968c7e</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -22,11 +47,11 @@
   <act:name>Bank 1</act:name>
   <act:id type="guid">c8ceb48e3378ae638357508a041ca61a</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -39,11 +64,11 @@
   <act:name>Credit Card B</act:name>
   <act:id type="guid">f5423230f8cb39ef01fc0a2696627d5d</act:id>
   <act:type>CREDIT</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -55,11 +80,11 @@
   <act:name>Liabilities</act:name>
   <act:id type="guid">7241c921241f5ccb8f8fade580109f75</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -71,11 +96,11 @@
   <act:name>Credit card A</act:name>
   <act:id type="guid">9b2119ed0a2eb7449d0209137a2410de</act:id>
   <act:type>CREDIT</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -88,11 +113,11 @@
   <act:name>Liability 1</act:name>
   <act:id type="guid">37bdf5369928876a5f20900458bc84a8</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -105,11 +130,11 @@
   <act:name>Liability 2</act:name>
   <act:id type="guid">4178e5b449bdec62dd02ff69d45795ef</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -122,11 +147,11 @@
   <act:name>Equity</act:name>
   <act:id type="guid">7f7955a48b6a2436d8f4d0d31ca4f6c8</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
Index: carols-data-file.gml2
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-files/xml2/carols-data-file.gml2,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -Lsrc/backend/file/test/test-files/xml2/carols-data-file.gml2 -Lsrc/backend/file/test/test-files/xml2/carols-data-file.gml2 -u -r1.1 -r1.1.6.1
--- src/backend/file/test/test-files/xml2/carols-data-file.gml2
+++ src/backend/file/test/test-files/xml2/carols-data-file.gml2
@@ -1,5 +1,30 @@
 <?xml version="1.0"?>
-<gnc-v2>
+<gnc-v2
+     xmlns:gnc="http://www.gnucash.org/XML/gnc"
+     xmlns:act="http://www.gnucash.org/XML/act"
+     xmlns:book="http://www.gnucash.org/XML/book"
+     xmlns:cd="http://www.gnucash.org/XML/cd"
+     xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+     xmlns:price="http://www.gnucash.org/XML/price"
+     xmlns:slot="http://www.gnucash.org/XML/slot"
+     xmlns:split="http://www.gnucash.org/XML/split"
+     xmlns:sx="http://www.gnucash.org/XML/sx"
+     xmlns:trn="http://www.gnucash.org/XML/trn"
+     xmlns:ts="http://www.gnucash.org/XML/ts"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:addr="http://www.gnucash.org/XML/addr"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
+     xmlns:employee="http://www.gnucash.org/XML/employee"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:billterm="http://www.gnucash.org/XML/billterm"
+     xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+     xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:entry="http://www.gnucash.org/XML/entry"
+     xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="commodity">40</gnc:count-data>
 <gnc:count-data cd:type="account">18</gnc:count-data>
 <gnc:count-data cd:type="transaction">19</gnc:count-data>
@@ -247,11 +272,11 @@
   <act:name>Checking</act:name>
   <act:id type="guid">7cce1d8ee29f0e4c30c949f77bb2a447</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -276,11 +301,11 @@
   <act:name>Savings</act:name>
   <act:id type="guid">7117b00944ea5def8959751832990c9e</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -292,11 +317,11 @@
   <act:name>Cash</act:name>
   <act:id type="guid">15468df1e7097e7c317fb7a541010d69</act:id>
   <act:type>CASH</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -308,11 +333,11 @@
   <act:name>Credit Card</act:name>
   <act:id type="guid">bdc5ed7168216d6df0f8d00767299bc7</act:id>
   <act:type>CREDIT</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -333,11 +358,11 @@
   <act:name>Salary</act:name>
   <act:id type="guid">d77f5ecb0a800748fdbae42e98908a85</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -349,11 +374,11 @@
   <act:name>Clothes</act:name>
   <act:id type="guid">52c89f4b1d0b7b445e0793278fd5ff62</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -365,11 +390,11 @@
   <act:name>Dining</act:name>
   <act:id type="guid">f4472ff237862ece69a1d3a58f293220</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -381,11 +406,11 @@
   <act:name>FICA</act:name>
   <act:id type="guid">1b211cffcf23b31e80666dadf57a37b0</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -397,11 +422,11 @@
   <act:name>FedTax</act:name>
   <act:id type="guid">9372c7685bfaf9086cb3cb53190b2ce2</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -413,11 +438,11 @@
   <act:name>Finance Charge</act:name>
   <act:id type="guid">4ca91a8240c1df8068fa4dc7c1da147e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -429,11 +454,11 @@
   <act:name>Fuel</act:name>
   <act:id type="guid">a13c10f2c32dc74c2e70f894351ef209</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -445,11 +470,11 @@
   <act:name>Groceries</act:name>
   <act:id type="guid">17e25505b81c735adec6d10aa1536a0a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -461,11 +486,11 @@
   <act:name>Household</act:name>
   <act:id type="guid">62479a9add5ae8bb253da6ab3d713083</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -477,11 +502,11 @@
   <act:name>Service Charges</act:name>
   <act:id type="guid">630a8066fdf69ac977808b2295ed9f68</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -493,11 +518,11 @@
   <act:name>Tools</act:name>
   <act:id type="guid">126f38b941cfe865f811e1c011e5bc51</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -509,11 +534,11 @@
   <act:name>Utilities</act:name>
   <act:id type="guid">00adc8fb6cc29e7ae5de56d6f8624ac5</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -525,11 +550,11 @@
   <act:name>Electric</act:name>
   <act:id type="guid">554b4134fc4a9c0361e9c8ca8f744229</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -542,11 +567,11 @@
   <act:name>Opening Balances</act:name>
   <act:id type="guid">f61553abd3d8029455441267f6530f3d</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
Index: Money95bank_fr.gml2
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-files/xml2/Money95bank_fr.gml2,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -Lsrc/backend/file/test/test-files/xml2/Money95bank_fr.gml2 -Lsrc/backend/file/test/test-files/xml2/Money95bank_fr.gml2 -u -r1.1 -r1.1.6.1
--- src/backend/file/test/test-files/xml2/Money95bank_fr.gml2
+++ src/backend/file/test/test-files/xml2/Money95bank_fr.gml2
@@ -1,557 +1,582 @@
 <?xml version="1.0"?>
-<gnc-v2>
+<gnc-v2
+     xmlns:gnc="http://www.gnucash.org/XML/gnc"
+     xmlns:act="http://www.gnucash.org/XML/act"
+     xmlns:book="http://www.gnucash.org/XML/book"
+     xmlns:cd="http://www.gnucash.org/XML/cd"
+     xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+     xmlns:price="http://www.gnucash.org/XML/price"
+     xmlns:slot="http://www.gnucash.org/XML/slot"
+     xmlns:split="http://www.gnucash.org/XML/split"
+     xmlns:sx="http://www.gnucash.org/XML/sx"
+     xmlns:trn="http://www.gnucash.org/XML/trn"
+     xmlns:ts="http://www.gnucash.org/XML/ts"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:addr="http://www.gnucash.org/XML/addr"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
+     xmlns:employee="http://www.gnucash.org/XML/employee"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:billterm="http://www.gnucash.org/XML/billterm"
+     xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+     xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:entry="http://www.gnucash.org/XML/entry"
+     xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="account">52</gnc:count-data>
 <gnc:count-data cd:type="transaction">143</gnc:count-data>
 <gnc:account version="2.0.0">
   <act:name>Compte courant</act:name>
   <act:id type="guid">de3be9d4e8f598584db381c56092f351</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Livret bleu</act:name>
   <act:id type="guid">cfb34c39585b58904baa3c1f9be9b8c4</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Salaire</act:name>
   <act:id type="guid">547e0f4df1fb2f3a124f09cddd90add4</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Primes</act:name>
   <act:id type="guid">4840ebbf3d52f81ad87acd6f79b4cb6d</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">547e0f4df1fb2f3a124f09cddd90add4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Salaire net</act:name>
   <act:id type="guid">6de38f0a8881dd2368610d32363fb463</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">547e0f4df1fb2f3a124f09cddd90add4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Alimentation</act:name>
   <act:id type="guid">fb45010dd73162faf7870d23451773e7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Epicerie</act:name>
   <act:id type="guid">63ab8d5de094c6ac7c11ae06645ea667</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">fb45010dd73162faf7870d23451773e7</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Restaurant</act:name>
   <act:id type="guid">b9e482629dfadf0675facd9bbf76d4f3</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">fb45010dd73162faf7870d23451773e7</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Assurance</act:name>
   <act:id type="guid">24e0d1cb0af579d19129ec79f16f9205</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Automobile</act:name>
   <act:id type="guid">e89232e4cdd3a66a5c3b229cea2d0fda</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">24e0d1cb0af579d19129ec79f16f9205</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Multi-risques habitation</act:name>
   <act:id type="guid">472918bd0bf48e41f507878041efcb4d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">24e0d1cb0af579d19129ec79f16f9205</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Automobile</act:name>
   <act:id type="guid">343f5c0ccf4c7a3d54443ece59073d4c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Cr&#233;dit auto</act:name>
   <act:id type="guid">56c0e0eae313a1804d8d1183166a34af</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">343f5c0ccf4c7a3d54443ece59073d4c</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Essence</act:name>
   <act:id type="guid">b5ff22c2b91ca04c20a36782d9c750cc</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">343f5c0ccf4c7a3d54443ece59073d4c</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Cadeaux</act:name>
   <act:id type="guid">324d517fa7427163088ed8a2422b4943</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Divers</act:name>
   <act:id type="guid">d9f9dda3d1a61bd15b3b4c67b40c2769</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Fournitures diverses</act:name>
   <act:id type="guid">cbfd18621567322c77b9a5b3d6aa3a49</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">d9f9dda3d1a61bd15b3b4c67b40c2769</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>D&#233;placements prof.</act:name>
   <act:id type="guid">3af7ef0f555aa2a41d75d034c6afd436</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Frais de transport</act:name>
   <act:id type="guid">96f0ca2b62ae6909cac058d1b876f6ef</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">3af7ef0f555aa2a41d75d034c6afd436</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Frais bancaires</act:name>
   <act:id type="guid">011ba398b7c38291d50cd10de44d4710</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Personnels</act:name>
   <act:id type="guid">ef0041623a6b317860e84b847af785c7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">011ba398b7c38291d50cd10de44d4710</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Frais financiers</act:name>
   <act:id type="guid">e6501ba2005ac400866b117379443af3</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Autres frais</act:name>
   <act:id type="guid">a673b6830d9fdc782ed408168f6b4f06</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">e6501ba2005ac400866b117379443af3</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Habillement</act:name>
   <act:id type="guid">674e7f3ba414c8c31b93282247b04213</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Imp&#244;ts</act:name>
   <act:id type="guid">0a5c854c367926d4ce7ffaa60f99a85a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Imp&#244;ts sur le revenu</act:name>
   <act:id type="guid">0a5d0546390d60dab623114e6f136d7a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">0a5c854c367926d4ce7ffaa60f99a85a</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Logement</act:name>
   <act:id type="guid">436e114c09ccaa489be81be1a24f1656</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Loyer</act:name>
   <act:id type="guid">779db6be3d2098d0a2561322f43612c9</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">436e114c09ccaa489be81be1a24f1656</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Loisirs</act:name>
   <act:id type="guid">ae47cf420aa54ba58fb1906b4edba98f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Canal Plus-C&#226;ble</act:name>
   <act:id type="guid">6a2a8fed6fbad778df8a5292148d1582</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">ae47cf420aa54ba58fb1906b4edba98f</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Cin&#233;ma-Th&#233;&#226;tre</act:name>
   <act:id type="guid">b2a4e65fd87146b8199f46c31fa215f1</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">ae47cf420aa54ba58fb1906b4edba98f</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Disques-cassettes</act:name>
   <act:id type="guid">52a3df54b9e7fb80b22e64a2572a89bb</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">ae47cf420aa54ba58fb1906b4edba98f</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Equipement</act:name>
   <act:id type="guid">d7620d56c56e8b2cb0e052411f12cd0a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">ae47cf420aa54ba58fb1906b4edba98f</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Livres-Journaux</act:name>
   <act:id type="guid">6406d28576114d95f1a6d9561a0b65e3</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">ae47cf420aa54ba58fb1906b4edba98f</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Photographie</act:name>
   <act:id type="guid">9c0f50a450219f9275d7c4ae3b3cbaa9</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">ae47cf420aa54ba58fb1906b4edba98f</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Maison</act:name>
   <act:id type="guid">a648b21f385e784fbe2b26cb3f718a79</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Chauffage</act:name>
   <act:id type="guid">d04143b5e1486b50f154614b3369ba9c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">a648b21f385e784fbe2b26cb3f718a79</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Electricit&#233;</act:name>
   <act:id type="guid">a74cdda295ca3f404ca97a5e94a564c3</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">a648b21f385e784fbe2b26cb3f718a79</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>T&#233;l&#233;phone</act:name>
   <act:id type="guid">3a6503c7c577f1beb48a620e905b207d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">a648b21f385e784fbe2b26cb3f718a79</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Mobilier</act:name>
   <act:id type="guid">8f5104499ca8138b3c48f5c900d7b285</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Cuisine-Salle de bains</act:name>
   <act:id type="guid">d0a283d1c384e5ee67f2135f308688bb</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">8f5104499ca8138b3c48f5c900d7b285</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Eclairage</act:name>
   <act:id type="guid">11f39397fe9ff09741bb4d9530b21945</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">8f5104499ca8138b3c48f5c900d7b285</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Electro-m&#233;nager</act:name>
   <act:id type="guid">3b925233706cf676b2e8f40054f34a68</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">8f5104499ca8138b3c48f5c900d7b285</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Sant&#233;</act:name>
   <act:id type="guid">1c3053f62d72017f9faacec828e3b874</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Dentiste</act:name>
   <act:id type="guid">5816cdbc45a11a5747f7ca286550c73a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">1c3053f62d72017f9faacec828e3b874</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Ordonnances</act:name>
   <act:id type="guid">672b9edafeae9eb5c17316688678ee3d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">1c3053f62d72017f9faacec828e3b874</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Soins personnels</act:name>
   <act:id type="guid">5d9afede4f8d14de29b0f64ebd23a649</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Coiffeur</act:name>
   <act:id type="guid">1e52527b3d343c4719a265a454753df7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">5d9afede4f8d14de29b0f64ebd23a649</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Vacances</act:name>
   <act:id type="guid">37563222f8bfa2ef6edb653a3b492d0b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Devises</act:name>
   <act:id type="guid">13e72266b7b88c8bb23d747dbd3ebd23</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">37563222f8bfa2ef6edb653a3b492d0b</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Voyage</act:name>
   <act:id type="guid">592d53a1ecb323212d3e1da50239473f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">37563222f8bfa2ef6edb653a3b492d0b</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Retained Earnings</act:name>
   <act:id type="guid">afe841ab5436faa629103cfbb93c6a74</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:transaction version="2.0.0">
   <trn:id type="guid">9643f159a0522e203df526c2125ccdd4</trn:id>
Index: pricedb1.gml2
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-files/xml2/pricedb1.gml2,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -Lsrc/backend/file/test/test-files/xml2/pricedb1.gml2 -Lsrc/backend/file/test/test-files/xml2/pricedb1.gml2 -u -r1.1 -r1.1.6.1
--- src/backend/file/test/test-files/xml2/pricedb1.gml2
+++ src/backend/file/test/test-files/xml2/pricedb1.gml2
@@ -1,5 +1,30 @@
 <?xml version="1.0"?>
-<gnc-v2>
+<gnc-v2
+     xmlns:gnc="http://www.gnucash.org/XML/gnc"
+     xmlns:act="http://www.gnucash.org/XML/act"
+     xmlns:book="http://www.gnucash.org/XML/book"
+     xmlns:cd="http://www.gnucash.org/XML/cd"
+     xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+     xmlns:price="http://www.gnucash.org/XML/price"
+     xmlns:slot="http://www.gnucash.org/XML/slot"
+     xmlns:split="http://www.gnucash.org/XML/split"
+     xmlns:sx="http://www.gnucash.org/XML/sx"
+     xmlns:trn="http://www.gnucash.org/XML/trn"
+     xmlns:ts="http://www.gnucash.org/XML/ts"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:addr="http://www.gnucash.org/XML/addr"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
+     xmlns:employee="http://www.gnucash.org/XML/employee"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:billterm="http://www.gnucash.org/XML/billterm"
+     xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+     xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:entry="http://www.gnucash.org/XML/entry"
+     xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="commodity">12</gnc:count-data>
 <gnc:commodity version="2.0.0">
   <cmdty:space>AMEX</cmdty:space>
Index: Money95mutual.gml2
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-files/xml2/Money95mutual.gml2,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -Lsrc/backend/file/test/test-files/xml2/Money95mutual.gml2 -Lsrc/backend/file/test/test-files/xml2/Money95mutual.gml2 -u -r1.1 -r1.1.6.1
--- src/backend/file/test/test-files/xml2/Money95mutual.gml2
+++ src/backend/file/test/test-files/xml2/Money95mutual.gml2
@@ -1,5 +1,30 @@
 <?xml version="1.0"?>
-<gnc-v2>
+<gnc-v2
+     xmlns:gnc="http://www.gnucash.org/XML/gnc"
+     xmlns:act="http://www.gnucash.org/XML/act"
+     xmlns:book="http://www.gnucash.org/XML/book"
+     xmlns:cd="http://www.gnucash.org/XML/cd"
+     xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+     xmlns:price="http://www.gnucash.org/XML/price"
+     xmlns:slot="http://www.gnucash.org/XML/slot"
+     xmlns:split="http://www.gnucash.org/XML/split"
+     xmlns:sx="http://www.gnucash.org/XML/sx"
+     xmlns:trn="http://www.gnucash.org/XML/trn"
+     xmlns:ts="http://www.gnucash.org/XML/ts"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:addr="http://www.gnucash.org/XML/addr"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
+     xmlns:employee="http://www.gnucash.org/XML/employee"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:billterm="http://www.gnucash.org/XML/billterm"
+     xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+     xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:entry="http://www.gnucash.org/XML/entry"
+     xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="commodity">1</gnc:count-data>
 <gnc:count-data cd:type="account">5</gnc:count-data>
 <gnc:count-data cd:type="transaction">3</gnc:count-data>
@@ -13,31 +38,31 @@
   <act:name>Livret bleu</act:name>
   <act:id type="guid">3bcb236af583d5bd7b6e0153fe97e7e3</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>FRF</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Money95mfunds fr</act:name>
   <act:id type="guid">89e091b3489a50957b400a868f101d59</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>FRF</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>O-Sicav Plus</act:name>
   <act:id type="guid">e0e954412d6b31dfa1fcbb9937a125b0</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>FRF</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>O-Sicav Plus</cmdty:id>
@@ -49,21 +74,21 @@
   <act:name>Commissions</act:name>
   <act:id type="guid">41b9e953585cd5662712d62848e71789</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>FRF</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Money95mfunds fr</act:name>
   <act:id type="guid">c7a4746248d0677c6421077833477bba</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>FRF</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">41b9e953585cd5662712d62848e71789</act:parent>
 </gnc:account>
 <gnc:transaction version="2.0.0">
Index: abcall.gml2
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-files/xml2/abcall.gml2,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -Lsrc/backend/file/test/test-files/xml2/abcall.gml2 -Lsrc/backend/file/test/test-files/xml2/abcall.gml2 -u -r1.1 -r1.1.6.1
--- src/backend/file/test/test-files/xml2/abcall.gml2
+++ src/backend/file/test/test-files/xml2/abcall.gml2
@@ -1,81 +1,106 @@
 <?xml version="1.0"?>
-<gnc-v2>
+<gnc-v2
+     xmlns:gnc="http://www.gnucash.org/XML/gnc"
+     xmlns:act="http://www.gnucash.org/XML/act"
+     xmlns:book="http://www.gnucash.org/XML/book"
+     xmlns:cd="http://www.gnucash.org/XML/cd"
+     xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+     xmlns:price="http://www.gnucash.org/XML/price"
+     xmlns:slot="http://www.gnucash.org/XML/slot"
+     xmlns:split="http://www.gnucash.org/XML/split"
+     xmlns:sx="http://www.gnucash.org/XML/sx"
+     xmlns:trn="http://www.gnucash.org/XML/trn"
+     xmlns:ts="http://www.gnucash.org/XML/ts"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:addr="http://www.gnucash.org/XML/addr"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
+     xmlns:employee="http://www.gnucash.org/XML/employee"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:billterm="http://www.gnucash.org/XML/billterm"
+     xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+     xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:entry="http://www.gnucash.org/XML/entry"
+     xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="account">7</gnc:count-data>
 <gnc:count-data cd:type="transaction">10</gnc:count-data>
 <gnc:account version="2.0.0">
   <act:name>ABC Bank</act:name>
   <act:id type="guid">eda56e3c0c402d1816f845430caf362e</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:description>Some Old Bank Acct</act:description>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Swipe Brokers</act:name>
   <act:id type="guid">729ae65a6c202a83a5335bcd32709888</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:description>My Investment Account</act:description>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>pocket cash</act:name>
   <act:id type="guid">5d0b89cb9bcc5074cda514d0d4c10af4</act:id>
   <act:type>CASH</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>SlaveCardt</act:name>
   <act:id type="guid">2b804a30e16e54a97da593fc1f71c386</act:id>
   <act:type>CREDIT</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:description>my credit card</act:description>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Gift Received</act:name>
   <act:id type="guid">04b5cbc4192f4790fac0586c5cc152f4</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:description>Gift Received</act:description>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Invest Inc</act:name>
   <act:id type="guid">d4f69b07cf7bb1a77c134f1b2c128684</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:description>Investment Income</act:description>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Other Inc</act:name>
   <act:id type="guid">0a241ed16a10c3be1836ce37f8a069e9</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:description>Other Income</act:description>
 </gnc:account>
 <gnc:transaction version="2.0.0">
Index: Money95invst.gml2
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-files/xml2/Money95invst.gml2,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -Lsrc/backend/file/test/test-files/xml2/Money95invst.gml2 -Lsrc/backend/file/test/test-files/xml2/Money95invst.gml2 -u -r1.1 -r1.1.6.1
--- src/backend/file/test/test-files/xml2/Money95invst.gml2
+++ src/backend/file/test/test-files/xml2/Money95invst.gml2
@@ -1,36 +1,61 @@
 <?xml version="1.0"?>
-<gnc-v2>
+<gnc-v2
+     xmlns:gnc="http://www.gnucash.org/XML/gnc"
+     xmlns:act="http://www.gnucash.org/XML/act"
+     xmlns:book="http://www.gnucash.org/XML/book"
+     xmlns:cd="http://www.gnucash.org/XML/cd"
+     xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+     xmlns:price="http://www.gnucash.org/XML/price"
+     xmlns:slot="http://www.gnucash.org/XML/slot"
+     xmlns:split="http://www.gnucash.org/XML/split"
+     xmlns:sx="http://www.gnucash.org/XML/sx"
+     xmlns:trn="http://www.gnucash.org/XML/trn"
+     xmlns:ts="http://www.gnucash.org/XML/ts"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:addr="http://www.gnucash.org/XML/addr"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
+     xmlns:employee="http://www.gnucash.org/XML/employee"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:billterm="http://www.gnucash.org/XML/billterm"
+     xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+     xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:entry="http://www.gnucash.org/XML/entry"
+     xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="account">3</gnc:count-data>
 <gnc:count-data cd:type="transaction">10</gnc:count-data>
 <gnc:account version="2.0.0">
   <act:name>Compte courant</act:name>
   <act:id type="guid">a68387e637bb8e7405bc949764b9aefd</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Livret bleu</act:name>
   <act:id type="guid">cec92cd077aee62305910cfd929cc341</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Retained Earnings</act:name>
   <act:id type="guid">afed1334dfcdc53865cafe61edbb0fc6</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:transaction version="2.0.0">
   <trn:id type="guid">ad7c592d0603871110acb8f2c7bcd215</trn:id>
Index: goonies-file.gml2
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-files/xml2/goonies-file.gml2,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -Lsrc/backend/file/test/test-files/xml2/goonies-file.gml2 -Lsrc/backend/file/test/test-files/xml2/goonies-file.gml2 -u -r1.1 -r1.1.6.1
--- src/backend/file/test/test-files/xml2/goonies-file.gml2
+++ src/backend/file/test/test-files/xml2/goonies-file.gml2
@@ -1,5 +1,30 @@
 <?xml version="1.0"?>
-<gnc-v2>
+<gnc-v2
+     xmlns:gnc="http://www.gnucash.org/XML/gnc"
+     xmlns:act="http://www.gnucash.org/XML/act"
+     xmlns:book="http://www.gnucash.org/XML/book"
+     xmlns:cd="http://www.gnucash.org/XML/cd"
+     xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+     xmlns:price="http://www.gnucash.org/XML/price"
+     xmlns:slot="http://www.gnucash.org/XML/slot"
+     xmlns:split="http://www.gnucash.org/XML/split"
+     xmlns:sx="http://www.gnucash.org/XML/sx"
+     xmlns:trn="http://www.gnucash.org/XML/trn"
+     xmlns:ts="http://www.gnucash.org/XML/ts"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:addr="http://www.gnucash.org/XML/addr"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
+     xmlns:employee="http://www.gnucash.org/XML/employee"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:billterm="http://www.gnucash.org/XML/billterm"
+     xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+     xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:entry="http://www.gnucash.org/XML/entry"
+     xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="commodity">2</gnc:count-data>
 <gnc:count-data cd:type="account">4</gnc:count-data>
 <gnc:count-data cd:type="transaction">4</gnc:count-data>
@@ -19,11 +44,11 @@
   <act:name>Bank Account</act:name>
   <act:id type="guid">117841ae858b1700a017d752b7f02b09</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -35,11 +60,11 @@
   <act:name>HAL Stock</act:name>
   <act:id type="guid">3619a4f1c902a2f6e39ed311321034c3</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>HAL</cmdty:id>
@@ -56,11 +81,11 @@
   <act:name>HN Stock</act:name>
   <act:id type="guid">b0a11711e0f804f7a51981f32556191d</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>HN</cmdty:id>
@@ -77,11 +102,11 @@
   <act:name>Initial Equity</act:name>
   <act:id type="guid">c421c81f4c3c4c8337b9c9bcac82c8d5</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
Index: ms-money.gml2
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-files/xml2/ms-money.gml2,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -Lsrc/backend/file/test/test-files/xml2/ms-money.gml2 -Lsrc/backend/file/test/test-files/xml2/ms-money.gml2 -u -r1.1 -r1.1.6.1
--- src/backend/file/test/test-files/xml2/ms-money.gml2
+++ src/backend/file/test/test-files/xml2/ms-money.gml2
@@ -1,414 +1,439 @@
 <?xml version="1.0"?>
-<gnc-v2>
+<gnc-v2
+     xmlns:gnc="http://www.gnucash.org/XML/gnc"
+     xmlns:act="http://www.gnucash.org/XML/act"
+     xmlns:book="http://www.gnucash.org/XML/book"
+     xmlns:cd="http://www.gnucash.org/XML/cd"
+     xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+     xmlns:price="http://www.gnucash.org/XML/price"
+     xmlns:slot="http://www.gnucash.org/XML/slot"
+     xmlns:split="http://www.gnucash.org/XML/split"
+     xmlns:sx="http://www.gnucash.org/XML/sx"
+     xmlns:trn="http://www.gnucash.org/XML/trn"
+     xmlns:ts="http://www.gnucash.org/XML/ts"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:addr="http://www.gnucash.org/XML/addr"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
+     xmlns:employee="http://www.gnucash.org/XML/employee"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:billterm="http://www.gnucash.org/XML/billterm"
+     xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+     xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:entry="http://www.gnucash.org/XML/entry"
+     xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="account">39</gnc:count-data>
 <gnc:count-data cd:type="transaction">347</gnc:count-data>
 <gnc:account version="2.0.0">
   <act:name>Cathy Bank</act:name>
   <act:id type="guid">7be24f20929f644872ca1718cdd80bee</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>New Bank</act:name>
   <act:id type="guid">ab52d1a8fbd5883a788d51bd29c77e84</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>School Credit</act:name>
   <act:id type="guid">6cdb61279507abc41065ae0cfc49e314</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Dividend</act:name>
   <act:id type="guid">4ac81d62b599798f057b2dd83a5d89fb</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Other Income</act:name>
   <act:id type="guid">fd1d2d2d58ceefc149f572a1e6936cec</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Credit balance</act:name>
   <act:id type="guid">65adcfc02d0f936916bb49b994895c89</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">fd1d2d2d58ceefc149f572a1e6936cec</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Refund</act:name>
   <act:id type="guid">c1c71598e096d9ab5565f096db36ed59</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Reimbursement</act:name>
   <act:id type="guid">60a59d2467d55241a1f13d5c0c43fa1b</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Camcorder</act:name>
   <act:id type="guid">56c1924305fc9b5667ff93ed389f571a</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">60a59d2467d55241a1f13d5c0c43fa1b</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Tax Refund</act:name>
   <act:id type="guid">15a7de112614d62d993dfcc43ff70142</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Unspecified</act:name>
   <act:id type="guid">9defb6c42135fa2f4036762c8926c8ca</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>WS</act:name>
   <act:id type="guid">4da6e3f697287c126a6827efd63a0b43</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>A</act:name>
   <act:id type="guid">74446cb1e9d9fb729f0d002aea325430</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Insurance</act:name>
   <act:id type="guid">73f01092a778ac5f25d1f95c1f34a6eb</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">74446cb1e9d9fb729f0d002aea325430</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>M</act:name>
   <act:id type="guid">2dba4680e7c14b4f1b3f60cc75959daa</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">74446cb1e9d9fb729f0d002aea325430</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Membership</act:name>
   <act:id type="guid">f5b32f79be8cc4952e6e2ddd4077b0fa</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">74446cb1e9d9fb729f0d002aea325430</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>T</act:name>
   <act:id type="guid">ee3d0e82c9b191091e61d4d1bc8da9f3</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">74446cb1e9d9fb729f0d002aea325430</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>W</act:name>
   <act:id type="guid">3451d55fd6957c001991ac7b98402b04</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">74446cb1e9d9fb729f0d002aea325430</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Bank Charges</act:name>
   <act:id type="guid">94f1725a16858da2a9832cec4d7c78fa</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Bills</act:name>
   <act:id type="guid">b978ff4097c571ecbbd134bd50cb439f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Electricity</act:name>
   <act:id type="guid">92b05cc5070282b02b05e60f161a5882</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">b978ff4097c571ecbbd134bd50cb439f</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Natural Gas</act:name>
   <act:id type="guid">51feb1a2384a8b12a1738d5561c9ea7a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">b978ff4097c571ecbbd134bd50cb439f</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Rent</act:name>
   <act:id type="guid">329b2c5196efdaf54e1321e05b9f0875</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">b978ff4097c571ecbbd134bd50cb439f</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Telephone</act:name>
   <act:id type="guid">8d9a8e4928257f0b0aaee042057d8012</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">b978ff4097c571ecbbd134bd50cb439f</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Clothing</act:name>
   <act:id type="guid">baaf4f690ee338fe4b0cf67dd6c2bf8a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:description>Clothing</act:description>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Credit Card</act:name>
   <act:id type="guid">5fc1c6a2a79889318f644120ac82c8ee</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Education</act:name>
   <act:id type="guid">f981711ab9d0c5ca6b75d0b5a8ee261b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:description>Education</act:description>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Food</act:name>
   <act:id type="guid">073d73615847b401ef859cc852509ab7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Groceries</act:name>
   <act:id type="guid">594ee4adb251ad1515794a77837ae15c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">073d73615847b401ef859cc852509ab7</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Healthcare</act:name>
   <act:id type="guid">60845136829c50ec4a09675a08c2da24</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Insurance</act:name>
   <act:id type="guid">2f38dff5dceaa7e0ee4d645a19215103</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>A</act:name>
   <act:id type="guid">cc640e911a739a6f58675333704ce9de</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">2f38dff5dceaa7e0ee4d645a19215103</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Leisure</act:name>
   <act:id type="guid">246d4bbc03fd4ebfc817afda54011ebc</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Photo</act:name>
   <act:id type="guid">9963d86a4c411a32c1991a9b91f634fd</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">246d4bbc03fd4ebfc817afda54011ebc</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Misc</act:name>
   <act:id type="guid">e9b94c2baee4d4f9489a856f4a8a06e0</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:description>Miscellaneous</act:description>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Miscellaneous</act:name>
   <act:id type="guid">96d92c6744c5df991da54c700630fe72</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Student account</act:name>
   <act:id type="guid">a4267ec85727c7c75d9ddea58f2fd26e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">96d92c6744c5df991da54c700630fe72</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>TD</act:name>
   <act:id type="guid">c791e88d9c25ef9cbdab5d4b9f51fde9</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Retained Earnings</act:name>
   <act:id type="guid">c4eb84e774bfe977982edc87793e44cf</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:transaction version="2.0.0">
   <trn:id type="guid">58a96777671bde4e1352e2b061edd814</trn:id>
Index: abc.gml2
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-files/xml2/abc.gml2,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -Lsrc/backend/file/test/test-files/xml2/abc.gml2 -Lsrc/backend/file/test/test-files/xml2/abc.gml2 -u -r1.1 -r1.1.6.1
--- src/backend/file/test/test-files/xml2/abc.gml2
+++ src/backend/file/test/test-files/xml2/abc.gml2
@@ -1,48 +1,73 @@
 <?xml version="1.0"?>
-<gnc-v2>
+<gnc-v2
+     xmlns:gnc="http://www.gnucash.org/XML/gnc"
+     xmlns:act="http://www.gnucash.org/XML/act"
+     xmlns:book="http://www.gnucash.org/XML/book"
+     xmlns:cd="http://www.gnucash.org/XML/cd"
+     xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+     xmlns:price="http://www.gnucash.org/XML/price"
+     xmlns:slot="http://www.gnucash.org/XML/slot"
+     xmlns:split="http://www.gnucash.org/XML/split"
+     xmlns:sx="http://www.gnucash.org/XML/sx"
+     xmlns:trn="http://www.gnucash.org/XML/trn"
+     xmlns:ts="http://www.gnucash.org/XML/ts"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:addr="http://www.gnucash.org/XML/addr"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
+     xmlns:employee="http://www.gnucash.org/XML/employee"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:billterm="http://www.gnucash.org/XML/billterm"
+     xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+     xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:entry="http://www.gnucash.org/XML/entry"
+     xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="account">4</gnc:count-data>
 <gnc:count-data cd:type="transaction">7</gnc:count-data>
 <gnc:account version="2.0.0">
   <act:name>Swipe Brokers</act:name>
   <act:id type="guid">8a2778a7eef9bc606de8a12b489f737c</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:description>My Investment Account</act:description>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>abc</act:name>
   <act:id type="guid">8c054c66321f7be82287dbb0c6b7b8a2</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Gift Received</act:name>
   <act:id type="guid">07212c5f31968d8d55144f1fd5651d8c</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:description>Gift Received</act:description>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Other Inc</act:name>
   <act:id type="guid">a2d8b63955baad46ddca87bbd96d399f</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:description>Other Income</act:description>
 </gnc:account>
 <gnc:transaction version="2.0.0">
Index: cbb-export.gml2
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-files/xml2/cbb-export.gml2,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -Lsrc/backend/file/test/test-files/xml2/cbb-export.gml2 -Lsrc/backend/file/test/test-files/xml2/cbb-export.gml2 -u -r1.1 -r1.1.6.1
--- src/backend/file/test/test-files/xml2/cbb-export.gml2
+++ src/backend/file/test/test-files/xml2/cbb-export.gml2
@@ -1,131 +1,156 @@
 <?xml version="1.0"?>
-<gnc-v2>
+<gnc-v2
+     xmlns:gnc="http://www.gnucash.org/XML/gnc"
+     xmlns:act="http://www.gnucash.org/XML/act"
+     xmlns:book="http://www.gnucash.org/XML/book"
+     xmlns:cd="http://www.gnucash.org/XML/cd"
+     xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+     xmlns:price="http://www.gnucash.org/XML/price"
+     xmlns:slot="http://www.gnucash.org/XML/slot"
+     xmlns:split="http://www.gnucash.org/XML/split"
+     xmlns:sx="http://www.gnucash.org/XML/sx"
+     xmlns:trn="http://www.gnucash.org/XML/trn"
+     xmlns:ts="http://www.gnucash.org/XML/ts"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:addr="http://www.gnucash.org/XML/addr"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
+     xmlns:employee="http://www.gnucash.org/XML/employee"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:billterm="http://www.gnucash.org/XML/billterm"
+     xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+     xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:entry="http://www.gnucash.org/XML/entry"
+     xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="account">12</gnc:count-data>
 <gnc:count-data cd:type="transaction">9</gnc:count-data>
 <gnc:account version="2.0.0">
   <act:name>cbb export</act:name>
   <act:id type="guid">504a8f7f0ff8e1e53c6df8b1bb714c47</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>HRK</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Gifts</act:name>
   <act:id type="guid">8cd43c12f1dc32ea8a51ec997fcf35ef</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>HRK</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:description>Gift Expenses</act:description>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Reimbursements</act:name>
   <act:id type="guid">4f502fe69043087c2186dcac27cc56bf</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>HRK</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Salary</act:name>
   <act:id type="guid">077894556323647344da06d5f5fe6449</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>HRK</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:description>Salary Income</act:description>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Clothing</act:name>
   <act:id type="guid">37539261eaf4bcf82c17eba0a5bf5949</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>HRK</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:description>Clothing</act:description>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Credit Card</act:name>
   <act:id type="guid">3b09243ca91d85c7b2984dd5f2490701</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>HRK</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Dining-Out</act:name>
   <act:id type="guid">cd6d68365b6c9f80e4b68a552b71950b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>HRK</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Entertainment</act:name>
   <act:id type="guid">47585dff7df1969ea961e4b1a7fa9f27</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>HRK</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Household</act:name>
   <act:id type="guid">46d28144c136899835833bca6cda4e52</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>HRK</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:description>Household Misc. Exp</act:description>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Personal Cash</act:name>
   <act:id type="guid">98e07d070ecce19416db949e9124a45d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>HRK</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Telephone</act:name>
   <act:id type="guid">72e555d138c8a1e7c5e8c7953a54a55e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>HRK</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:description>Telephone Expense</act:description>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Textbooks</act:name>
   <act:id type="guid">224840878e17f4f7c6a5d6418747cafa</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>HRK</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:transaction version="2.0.0">
   <trn:id type="guid">9d2c18d552ab4a405bee914ca188eb70</trn:id>
Index: conrads-file.gml2
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-files/xml2/conrads-file.gml2,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -Lsrc/backend/file/test/test-files/xml2/conrads-file.gml2 -Lsrc/backend/file/test/test-files/xml2/conrads-file.gml2 -u -r1.1 -r1.1.6.1
--- src/backend/file/test/test-files/xml2/conrads-file.gml2
+++ src/backend/file/test/test-files/xml2/conrads-file.gml2
@@ -1,5 +1,30 @@
 <?xml version="1.0"?>
-<gnc-v2>
+<gnc-v2
+     xmlns:gnc="http://www.gnucash.org/XML/gnc"
+     xmlns:act="http://www.gnucash.org/XML/act"
+     xmlns:book="http://www.gnucash.org/XML/book"
+     xmlns:cd="http://www.gnucash.org/XML/cd"
+     xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+     xmlns:price="http://www.gnucash.org/XML/price"
+     xmlns:slot="http://www.gnucash.org/XML/slot"
+     xmlns:split="http://www.gnucash.org/XML/split"
+     xmlns:sx="http://www.gnucash.org/XML/sx"
+     xmlns:trn="http://www.gnucash.org/XML/trn"
+     xmlns:ts="http://www.gnucash.org/XML/ts"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:addr="http://www.gnucash.org/XML/addr"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
+     xmlns:employee="http://www.gnucash.org/XML/employee"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:billterm="http://www.gnucash.org/XML/billterm"
+     xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+     xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:entry="http://www.gnucash.org/XML/entry"
+     xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="commodity">1</gnc:count-data>
 <gnc:count-data cd:type="account">6</gnc:count-data>
 <gnc:count-data cd:type="transaction">12</gnc:count-data>
@@ -13,21 +38,21 @@
   <act:name>Imbalance-AUD</act:name>
   <act:id type="guid">ca36693eb25a602c171d07cb682b3e1b</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>AUD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Assets</act:name>
   <act:id type="guid">a947017cbd3b26198484086f8d93863b</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>AUD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:code>A0000</act:code>
   <act:slots>
     <slot>
@@ -40,11 +65,11 @@
   <act:name>Stock1</act:name>
   <act:id type="guid">33181c172f50aaa24792256f2db4690e</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>AUD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:code>A0001</act:code>
   <act:security>
     <cmdty:space>AMEX</cmdty:space>
@@ -63,11 +88,11 @@
   <act:name>Stock2</act:name>
   <act:id type="guid">4ca39e2f16ccf288ea0d956d2371bf82</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>AUD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:code>A0002</act:code>
   <act:security>
     <cmdty:space>AMEX</cmdty:space>
@@ -86,11 +111,11 @@
   <act:name>Cash</act:name>
   <act:id type="guid">dd0cfd17078251ec6ef03da8a081f2a3</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>AUD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:code>C0000</act:code>
   <act:slots>
     <slot>
@@ -103,11 +128,11 @@
   <act:name>Bank</act:name>
   <act:id type="guid">6f8df62ae08403ee2a8eb5aa61cec772</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>AUD</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:code>C0001</act:code>
   <act:slots>
     <slot>
Index: Money95stocks.gml2
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-files/xml2/Money95stocks.gml2,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -Lsrc/backend/file/test/test-files/xml2/Money95stocks.gml2 -Lsrc/backend/file/test/test-files/xml2/Money95stocks.gml2 -u -r1.1 -r1.1.6.1
--- src/backend/file/test/test-files/xml2/Money95stocks.gml2
+++ src/backend/file/test/test-files/xml2/Money95stocks.gml2
@@ -1,5 +1,30 @@
 <?xml version="1.0"?>
-<gnc-v2>
+<gnc-v2
+     xmlns:gnc="http://www.gnucash.org/XML/gnc"
+     xmlns:act="http://www.gnucash.org/XML/act"
+     xmlns:book="http://www.gnucash.org/XML/book"
+     xmlns:cd="http://www.gnucash.org/XML/cd"
+     xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+     xmlns:price="http://www.gnucash.org/XML/price"
+     xmlns:slot="http://www.gnucash.org/XML/slot"
+     xmlns:split="http://www.gnucash.org/XML/split"
+     xmlns:sx="http://www.gnucash.org/XML/sx"
+     xmlns:trn="http://www.gnucash.org/XML/trn"
+     xmlns:ts="http://www.gnucash.org/XML/ts"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:addr="http://www.gnucash.org/XML/addr"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
+     xmlns:employee="http://www.gnucash.org/XML/employee"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:billterm="http://www.gnucash.org/XML/billterm"
+     xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+     xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:entry="http://www.gnucash.org/XML/entry"
+     xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="commodity">2</gnc:count-data>
 <gnc:count-data cd:type="account">8</gnc:count-data>
 <gnc:count-data cd:type="transaction">28</gnc:count-data>
@@ -19,31 +44,31 @@
   <act:name>Livret bleu</act:name>
   <act:id type="guid">21db466b6be8b3f6a3043d0c0316de8c</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Money95stocks fr</act:name>
   <act:id type="guid">2a42eb5710ad4ddbf9352f070d603fe2</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Microsoft</act:name>
   <act:id type="guid">c28902afc0e2168dab793b63dbf56e1f</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>MSFT</cmdty:id>
@@ -55,11 +80,11 @@
   <act:name>Usinor/Sacilor</act:name>
   <act:id type="guid">b3955645bed5651123986f415d0e81d6</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>USSA</cmdty:id>
@@ -71,42 +96,42 @@
   <act:name>Unspecified</act:name>
   <act:id type="guid">37d287c3550ab2810c386d1b33cc2d0b</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Commissions</act:name>
   <act:id type="guid">5efcfb966ef97810de2fbaaa2b352205</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Money95stocks fr</act:name>
   <act:id type="guid">da8e001155343694bd34f6aa248b1c28</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
   <act:parent type="guid">5efcfb966ef97810de2fbaaa2b352205</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Retained Earnings</act:name>
   <act:id type="guid">1aaa099850fe7a07e2b5ae97f18b9af2</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
-  <act:currency-scu>100</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
 </gnc:account>
 <gnc:transaction version="2.0.0">
   <trn:id type="guid">67da2dc62331fb318640aa5a1a3da937</trn:id>
Index: every.gml2
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-files/xml2/every.gml2,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -Lsrc/backend/file/test/test-files/xml2/every.gml2 -Lsrc/backend/file/test/test-files/xml2/every.gml2 -u -r1.1 -r1.1.6.1
--- src/backend/file/test/test-files/xml2/every.gml2
+++ src/backend/file/test/test-files/xml2/every.gml2
@@ -1,5 +1,30 @@
 <?xml version="1.0"?>
-<gnc-v2>
+<gnc-v2
+     xmlns:gnc="http://www.gnucash.org/XML/gnc"
+     xmlns:act="http://www.gnucash.org/XML/act"
+     xmlns:book="http://www.gnucash.org/XML/book"
+     xmlns:cd="http://www.gnucash.org/XML/cd"
+     xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+     xmlns:price="http://www.gnucash.org/XML/price"
+     xmlns:slot="http://www.gnucash.org/XML/slot"
+     xmlns:split="http://www.gnucash.org/XML/split"
+     xmlns:sx="http://www.gnucash.org/XML/sx"
+     xmlns:trn="http://www.gnucash.org/XML/trn"
+     xmlns:ts="http://www.gnucash.org/XML/ts"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:addr="http://www.gnucash.org/XML/addr"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
+     xmlns:employee="http://www.gnucash.org/XML/employee"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:billterm="http://www.gnucash.org/XML/billterm"
+     xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+     xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:entry="http://www.gnucash.org/XML/entry"
+     xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="commodity">5</gnc:count-data>
 <gnc:count-data cd:type="account">27</gnc:count-data>
 <gnc:count-data cd:type="transaction">161</gnc:count-data>
@@ -37,22 +62,22 @@
   <act:name>Fidelity Inv</act:name>
   <act:id type="guid">1b791374ee19ad07b06c3e0a99aeb4fa</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:description>Mutual Fund Family</act:description>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>FID Cap &amp; Income</act:name>
   <act:id type="guid">31123b56c4780f491050562fc2bbdc20</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>FID Cap &amp; Income</cmdty:id>
@@ -64,11 +89,11 @@
   <act:name>FID Eq Inc II</act:name>
   <act:id type="guid">db2182ba7d730b4e90c755d29c64c894</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>FID Eq Inc II</cmdty:id>
@@ -80,11 +105,11 @@
   <act:name>FID Govt Res</act:name>
   <act:id type="guid">504f743d68e663efff21fc66b85cc491</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>FID Govt Res</cmdty:id>
@@ -96,11 +121,11 @@
   <act:name>FID Growth &amp; Inc</act:name>
   <act:id type="guid">ebec8d5a26522f4a0865fa5f837af17b</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>FID Growth &amp; Inc</cmdty:id>
@@ -112,11 +137,11 @@
   <act:name>FID NewMkt Inc</act:name>
   <act:id type="guid">0fac2553ae5a682f5ae978d081566ea5</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>FID NewMkt Inc</cmdty:id>
@@ -128,43 +153,43 @@
   <act:name>Dummy Cash</act:name>
   <act:id type="guid">049676696675474217124e24f44fbaa7</act:id>
   <act:type>CASH</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:description>Reconcile Accounts</act:description>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Cap. gain (long)</act:name>
   <act:id type="guid">1ade3e58381c463d8a8c2703d134ccea</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Fidelity Inv</act:name>
   <act:id type="guid">b7eaa97e2760274bd7eb5104a3f6fd84</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:parent type="guid">1ade3e58381c463d8a8c2703d134ccea</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>FID Eq Inc II</act:name>
   <act:id type="guid">2998f1baa86deced08bf21cb73d4d194</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>FID Eq Inc II</cmdty:id>
@@ -176,11 +201,11 @@
   <act:name>FID Growth &amp; Inc</act:name>
   <act:id type="guid">5b7c74145709c67b9fa6d33ea12c9163</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>FID Growth &amp; Inc</cmdty:id>
@@ -192,32 +217,32 @@
   <act:name>Cap. gain (short)</act:name>
   <act:id type="guid">fec86ac037ee8dd3cfe9512f7fced74b</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Fidelity Inv</act:name>
   <act:id type="guid">57e365b7b895c5a9ef328a69367c49e5</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:parent type="guid">fec86ac037ee8dd3cfe9512f7fced74b</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>FID Eq Inc II</act:name>
   <act:id type="guid">f9599ed5ecf62d2c9326766617d6e5e7</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>FID Eq Inc II</cmdty:id>
@@ -229,11 +254,11 @@
   <act:name>FID Growth &amp; Inc</act:name>
   <act:id type="guid">d023c36ca9c320b873c5be9993078451</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>FID Growth &amp; Inc</cmdty:id>
@@ -245,11 +270,11 @@
   <act:name>FID NewMkt Inc</act:name>
   <act:id type="guid">5f4d3dd84f8df6527d5091152aadb4d6</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>FID NewMkt Inc</cmdty:id>
@@ -261,32 +286,32 @@
   <act:name>Dividends</act:name>
   <act:id type="guid">0406079e56613a22d8112b8dbfbed622</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Fidelity Inv</act:name>
   <act:id type="guid">928026d717b302da3d24fb64f086b18a</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:parent type="guid">0406079e56613a22d8112b8dbfbed622</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>FID Cap &amp; Income</act:name>
   <act:id type="guid">98a3d87a9305f733420ceee444cbfbe4</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>FID Cap &amp; Income</cmdty:id>
@@ -298,11 +323,11 @@
   <act:name>FID Eq Inc II</act:name>
   <act:id type="guid">6344d1b4710050ba1fd600c56eee740b</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>FID Eq Inc II</cmdty:id>
@@ -314,11 +339,11 @@
   <act:name>FID Govt Res</act:name>
   <act:id type="guid">11709b1c45e84450d7a282228e69b56c</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>FID Govt Res</cmdty:id>
@@ -330,11 +355,11 @@
   <act:name>FID Growth &amp; Inc</act:name>
   <act:id type="guid">55d69cebd7b9b64b6e9678b6588e64a1</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>FID Growth &amp; Inc</cmdty:id>
@@ -346,11 +371,11 @@
   <act:name>FID NewMkt Inc</act:name>
   <act:id type="guid">4ed39bec2d9009028bc277e7ca58b372</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:security>
     <cmdty:space>NYSE</cmdty:space>
     <cmdty:id>FID NewMkt Inc</cmdty:id>
@@ -362,42 +387,42 @@
   <act:name>Unspecified</act:name>
   <act:id type="guid">5f856918b8284a11ebc757485d853667</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Commissions</act:name>
   <act:id type="guid">c4ab48d47126697c3ee461627fedbc86</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Fidelity Inv</act:name>
   <act:id type="guid">01ebde432dcc5dee900ce670743eab41</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
   <act:parent type="guid">c4ab48d47126697c3ee461627fedbc86</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Retained Earnings</act:name>
   <act:id type="guid">7914214426a5a0d6f1d6d64c6614f80a</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>IRR</cmdty:id>
-  </act:currency>
-  <act:currency-scu>1</act:currency-scu>
+  </act:commodity>
+  <act:commodity-scu>1</act:commodity-scu>
 </gnc:account>
 <gnc:transaction version="2.0.0">
   <trn:id type="guid">d6e78e4275e257da6c333a9876c3b644</trn:id>


More information about the gnucash-changes mailing list