Merge lp:~openerp-dev/openobject-addons/trunk-americanization_account_config-ssh into lp:openobject-addons

[Sunil Sharma(OpenERP)]

Hello,

Improve demo record and yml tests case for account,account_voucher.

Thanks
Sunil Sharma

[lp:~openerp-dev/openobject-addons/trunk-americanization_account_config-ssh]

9002. By Sunil Sharma(OpenERP) on 2014-02-11

[mrg]:lp:openobject-addons

9003. By Sunil Sharma(OpenERP) on 2014-02-12

[MRG]:lp:openobject-addons

9004. By Sunil Sharma(OpenERP) on 2014-02-17

[MRG]:lp:openobject-addons

9005. By Chirag Dodiya(OpenERP) on 2014-03-20

[MRG]Merge with lp:openobject-addons

9006. By Chirag Dodiya(OpenERP) on 2014-03-20

[MRG]Merge with lp:openobject-addons

9007. By Sunil Sharma(OpenERP) on 2014-04-11

[mrg]:openobject-addons

9008. By Sunil Sharma(OpenERP) on 2014-04-14

[MRG]:openobject-addons

9009. By Sunil Sharma(OpenERP) on 2014-04-17

[MRG]:lp:openobject-addons

9010. By Sunil Sharma(OpenERP) on 2014-04-23

[MRG]:lp:openobject-addons

9011. By Sunil Sharma(OpenERP) on 2014-04-25

[MRG]:lp:openobject-addns

9012. By Sunil Sharma(OpenERP) on 2014-04-28

[MRG]:lp:openobject-addons

9013. By Sunil Sharma(OpenERP) on 2014-05-01

[MRG]:lp:openobject-addons

9014. By Sunil Sharma(OpenERP) on 2014-05-02

[mrg]:lp:openobject-addons

9015. By Sunil Sharma(OpenERP) on 2014-05-02

[imp]:base currency used USD

9016. By Sunil Sharma(OpenERP) on 2014-05-07

[imp]:remove secondry currency

9017. By Sunil Sharma(OpenERP) on 2014-05-07

[mrg]:lp:openobject-addons

9018. By Sunil Sharma(OpenERP) on 2014-05-08

[imp]:improve EUR Bank account -(test) demo

9019. By Sunil Sharma(OpenERP) on 2014-05-09

[imp]:improve currency for multicompany

9020. By Sunil Sharma(OpenERP) on 2014-05-09

lp:openobject-addons

9021. By Sunil Sharma(OpenERP) on 2014-05-09

[imp]:improve usd currency rate

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

- context should be pass to _get_company method.
- get_default_currency and set_default_currency should use get_company_currency.
- yml file should be rename.
- EDI purchase pricelist (EUR) .. why we are taking ref of eur ?

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-americanization_account_config-ssh]

9022. By Sunil Sharma(OpenERP) on 2014-05-12

[imp]:improve get_default and set_default method

9023. By Sunil Sharma(OpenERP) on 2014-05-12

[rename]:rename test case convince

9024. By Sunil Sharma(OpenERP) on 2014-05-12

[rename]:rename test case convince

9025. By Sunil Sharma(OpenERP) on 2014-05-12

[imp]:base currency USD

9026. By Sunil Sharma(OpenERP) on 2014-05-12

[mrg]:lp:openobject-addons

[Sunil Sharma(OpenERP) (sunil.sharma-openerp)]

Hello Sir,

 I have done following changes as per suggestion.

 1. context should be pass to _get_company method.
 2. get_default_currency and set_default_currency should use get_company_currency.
 3. yml file should be rename.
 4. EDI purchase pricelist "Default Purchase Pricelist".

Thanks
Sunil Sharma (SSH)

[lp:~openerp-dev/openobject-addons/trunk-americanization_account_config-ssh]

9027. By Sunil Sharma(OpenERP) on 2014-05-13

[imp]:improve set_default_currency method

9028. By Sunil Sharma(OpenERP) on 2014-05-13

[mrg]:lp:openobejct-addons

9029. By Sunil Sharma(OpenERP) on 2014-05-14

[imp]:improve yml currency rate

9030. By Sunil Sharma(OpenERP) on 2014-05-14

[imp]:improve rate for near to EUR rate

9031. By Sunil Sharma(OpenERP) on 2014-05-14

[imp]:improve yml currency rate

9032. By Sunil Sharma(OpenERP) on 2014-05-14

[imp]:improve rate for near to EUR rate

9033. By Sunil Sharma(OpenERP) on 2014-05-14

[imp]:improve valid msg

9034. By Sunil Sharma(OpenERP) on 2014-05-14

[imp]:improve rate for near to EUR rate

9035. By Sunil Sharma(OpenERP) on 2014-05-14

improve yml

Unmerged revisions

9035. By Sunil Sharma(OpenERP) on 2014-05-14

improve yml

9034. By Sunil Sharma(OpenERP) on 2014-05-14

[imp]:improve rate for near to EUR rate

9033. By Sunil Sharma(OpenERP) on 2014-05-14

[imp]:improve valid msg

9032. By Sunil Sharma(OpenERP) on 2014-05-14

[imp]:improve rate for near to EUR rate

9031. By Sunil Sharma(OpenERP) on 2014-05-14

[imp]:improve yml currency rate

9030. By Sunil Sharma(OpenERP) on 2014-05-14

[imp]:improve rate for near to EUR rate

9029. By Sunil Sharma(OpenERP) on 2014-05-14

[imp]:improve yml currency rate

9028. By Sunil Sharma(OpenERP) on 2014-05-13

[mrg]:lp:openobejct-addons

9027. By Sunil Sharma(OpenERP) on 2014-05-13

[imp]:improve set_default_currency method

9026. By Sunil Sharma(OpenERP) on 2014-05-12

[mrg]:lp:openobject-addons

=== modified file 'account/account_unit_test.xml'
--- account/account_unit_test.xml	2013-11-13 13:01:07 +0000
+++ account/account_unit_test.xml	2014-05-14 12:25:54 +0000
@@ -3,7 +3,7 @@
     <data>
         <!-- This file must be loaded  _after_  account_demo.xml ! -->
         <record id="test_invoice_1" model="account.invoice">
-            <field name="currency_id" ref="base.EUR"/>
+            <field name="currency_id" ref="base.USD"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="partner_id" ref="base.res_partner_1"/>
             <field name="journal_id" ref="account.sales_journal"/>
@@ -35,7 +35,7 @@
         </record>
 
         <assert id="test_invoice_1" model="account.invoice" string="The currency unit of Test invoice 1 is EUR">
-            <test expr="currency_id.symbol">€</test>
+            <test expr="currency_id.symbol">$</test>
         </assert>
 
         <assert id="test_invoice_1" model="account.invoice" severity="error" string="The amount of Test invoice 1 is correct">

=== modified file 'account/data/configurable_account_chart.xml'
--- account/data/configurable_account_chart.xml	2012-11-29 22:26:45 +0000
+++ account/data/configurable_account_chart.xml	2014-05-14 12:25:54 +0000
@@ -371,7 +371,7 @@
                     </record>
 
         <record id="configurable_chart_template" model="account.chart.template">
-            <field name="name">Configurable Account Chart Template</field>
+            <field name="name">Configurable Chart of Accounts Template</field>
             <field name="account_root_id" ref="conf_chart0"/>
             <field name="tax_code_root_id" ref="tax_code_chart_root"/>
             <field name="bank_account_view_id" ref="conf_bnk"/>

=== modified file 'account/demo/account_invoice_demo.xml'
--- account/demo/account_invoice_demo.xml	2012-11-29 22:26:45 +0000
+++ account/demo/account_invoice_demo.xml	2014-05-14 12:25:54 +0000
@@ -5,7 +5,7 @@
             <field name="date_due" eval="time.strftime('%Y')+'-01-30'"/>
             <field name="payment_term" ref="account.account_payment_term"/>
             <field name="journal_id" ref="account.expenses_journal"/>
-            <field name="currency_id" ref="base.EUR"/>
+            <field name="currency_id" ref="base.USD"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="reference_type">none</field>
             <field name="company_id" ref="base.main_company"/>

=== modified file 'account/demo/account_minimal.xml'
--- account/demo/account_minimal.xml	2013-10-27 12:31:04 +0000
+++ account/demo/account_minimal.xml	2014-05-14 12:25:54 +0000
@@ -122,13 +122,13 @@
             <field name="type">other</field>
             <field name="user_type" ref="data_account_type_income"/>
         </record>
-        <record id="usd_bnk" model="account.account">
+        <record id="eur_bnk" model="account.account">
             <field name="code">X11007</field>
-            <field name="name">USD Bank Account - (test)</field>
+            <field name="name">EUR Bank Account - (test)</field>
             <field ref="cas" name="parent_id"/>
             <field name="type">liquidity</field>
             <field name="user_type" ref="data_account_type_asset"/>
-            <field name="currency_id" ref="base.USD"/>
+            <field name="currency_id" ref="base.EUR"/>
         </record>
 
         <record model="account.account" id="liabilities_view">
@@ -409,14 +409,15 @@
             <field name="user_id" ref="base.user_root"/>
         </record>
 
-        <record id="bank_journal_usd" model="account.journal">
-            <field name="name">USD Bank Journal - (test)</field>
-            <field name="code">TUBK</field>
+        <record id="bank_journal_eur" model="account.journal">
+            <field name="name">EUR Bank Journal - (test)</field>
+            <field name="code">TEBK</field>
             <field name="type">bank</field>
-            <field name="default_debit_account_id" ref="usd_bnk"/>
-            <field name="default_credit_account_id" ref="usd_bnk"/>
-            <field name="currency" ref="base.USD"/>
+            <field name="default_debit_account_id" ref="eur_bnk"/>
+            <field name="default_credit_account_id" ref="eur_bnk"/>
+            <field name="currency" ref="base.EUR"/>
         </record>
+
         <!--
         Product income and expense accounts, default parameters
         -->

=== modified file 'account/res_config.py'
--- account/res_config.py	2014-04-23 11:40:53 +0000
+++ account/res_config.py	2014-05-14 12:25:54 +0000
@@ -39,8 +39,7 @@
         'expects_chart_of_accounts': fields.related('company_id', 'expects_chart_of_accounts', type='boolean',
             string='This company has its own chart of accounts',
             help="""Check this box if this company is a legal entity."""),
-        'currency_id': fields.related('company_id', 'currency_id', type='many2one', relation='res.currency', required=True,
-            string='Default company currency', help="Main currency of the company."),
+        'currency_id': fields.many2one('res.currency', required=True, string='Default company currency', help="Main currency of the company."),
         'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
             string='Paypal account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer  will be able to pay your invoices or quotations with a button \"Pay with  Paypal\" in automated emails or through the OpenERP portal."),
         'company_footer': fields.related('company_id', 'rml_footer', type='text', readonly=True,
@@ -127,6 +126,16 @@
             implied_group="account.group_supplier_inv_check_total"),
     }
 
+    def set_default_currency(self, cr, uid, ids, context=None):
+        config_data = self.browse(cr, uid, ids, context=context)[0]
+        company_id = config_data.company_id.id 
+        currency_id = config_data.currency_id.id
+        return self.pool.get('res.company').write(cr, uid, [company_id], {'currency_id': currency_id}, context=context)
+
+    def get_default_currency(self, cr, uid, fields, context=None):
+        currency_id = self.pool.get('res.company')._get_company_currency(cr, uid, uid, context)
+        return {'currency_id': currency_id}
+
     def _default_company(self, cr, uid, context=None):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         return user.company_id.id

=== modified file 'account/test/account_change_currency.yml'
--- account/test/account_change_currency.yml	2012-11-29 22:26:45 +0000
+++ account/test/account_change_currency.yml	2014-05-14 12:25:54 +0000
@@ -4,7 +4,7 @@
   !record {model: account.invoice, id: account_invoice_currency}:
     account_id: account.a_recv
     company_id: base.main_company
-    currency_id: base.EUR
+    currency_id: base.USD
     invoice_line:
       - account_id: account.a_sale
         name: '[PCSC234] PC Assemble SC234'

=== modified file 'account/test/account_customer_invoice.yml'
--- account/test/account_customer_invoice.yml	2013-10-27 12:31:04 +0000
+++ account/test/account_customer_invoice.yml	2014-05-14 12:25:54 +0000
@@ -36,8 +36,8 @@
   I manually assign tax on invoice
 -
   !python {model: account.invoice.tax}: |
-    amt = self.amount_change(cr, uid, [], 50.0, ref('base.EUR'), ref('base.main_company'), False)
-    base_amt = self.base_change(cr, uid, [], 9000.0, ref('base.EUR'), ref('base.main_company'), False)
+    amt = self.amount_change(cr, uid, [], 50.0, ref('base.USD'), ref('base.main_company'), False)
+    base_amt = self.base_change(cr, uid, [], 9000.0, ref('base.USD'), ref('base.main_company'), False)
     invoice_tax_line = {
         'name':  'Test Tax for Customer Invoice',
         'manual': 1,

=== modified file 'account/test/account_invoice_state.yml'
--- account/test/account_invoice_state.yml	2013-10-27 12:31:04 +0000
+++ account/test/account_invoice_state.yml	2014-05-14 12:25:54 +0000
@@ -9,7 +9,7 @@
   !record {model: account.invoice, id: account_invoice_state}:
     account_id: account.a_recv
     company_id: base.main_company
-    currency_id: base.EUR
+    currency_id: base.USD
     invoice_line:
       - account_id: account.a_sale
         name: '[PCSC234] PC Assemble SC234'

=== modified file 'account/test/account_report.yml'
--- account/test/account_report.yml	2014-04-02 16:40:53 +0000
+++ account/test/account_report.yml	2014-05-14 12:25:54 +0000
@@ -2,7 +2,7 @@
   In order to test the PDF reports defined on an invoice, we will create a Invoice Record
 -
   !record {model: account.invoice, id: test_invoice_1}:
-    currency_id: base.EUR
+    currency_id: base.USD
     company_id: base.main_company
     partner_id: base.res_partner_1
     state: draft

=== modified file 'account/test/account_sequence_test.yml'
--- account/test/account_sequence_test.yml	2012-11-29 22:26:45 +0000
+++ account/test/account_sequence_test.yml	2014-05-14 12:25:54 +0000
@@ -17,7 +17,7 @@
 - !record {model: account.invoice, id: invoice_seq_test}:
     account_id: account.a_recv
     company_id: base.main_company
-    currency_id: base.EUR
+    currency_id: base.USD
     invoice_line:
       - account_id: account.a_sale
         name: '[PC-DEM] PC on Demand'

=== modified file 'account/test/account_supplier_invoice.yml'
--- account/test/account_supplier_invoice.yml	2013-10-27 12:31:04 +0000
+++ account/test/account_supplier_invoice.yml	2014-05-14 12:25:54 +0000
@@ -30,7 +30,7 @@
     account_id: account.a_pay
     check_total: 3000.0
     company_id: base.main_company
-    currency_id: base.EUR
+    currency_id: base.USD
     invoice_line:
       - account_id: account.a_expense
         name: '[PCSC234] PC Assemble SC234'

=== modified file 'account/test/test_edi_invoice.yml'
--- account/test/test_edi_invoice.yml	2012-11-29 22:26:45 +0000
+++ account/test/test_edi_invoice.yml	2014-05-14 12:25:54 +0000
@@ -6,7 +6,7 @@
   !record {model: account.invoice, id: invoice_edi_1}:
     journal_id: 1
     partner_id: base.res_partner_2
-    currency_id: base.EUR
+    currency_id: base.USD
     company_id: 1
     account_id: account.a_pay
     date_invoice: !eval "'%s' % (time.strftime('%Y-%m-%d'))"

=== modified file 'account_voucher/__openerp__.py'
--- account_voucher/__openerp__.py	2014-04-02 16:40:53 +0000
+++ account_voucher/__openerp__.py	2014-05-14 12:25:54 +0000
@@ -65,13 +65,13 @@
         'test/account_voucher.yml',
         'test/sales_receipt.yml',
         'test/sales_payment.yml',
-        'test/case1_usd_usd.yml',
-        'test/case1_usd_usd_payment_rate.yml',
-        'test/case2_usd_eur_debtor_in_eur.yml',
-        'test/case2_usd_eur_debtor_in_usd.yml',
-        'test/case3_eur_eur.yml',
+        'test/case1_eur_eur.yml',
+        'test/case1_eur_eur_payment_rate.yml',
+        'test/case2_eur_usd_debtor_in_usd.yml',
+        'test/case2_eur_usd_debtor_in_eur.yml',
+        'test/case3_usd_usd.yml',
         'test/case4_cad_chf.yml',
-        'test/case_eur_usd.yml',
+        'test/case_usd_eur.yml',
     ],
     'auto_install': False,
     'application': True,

=== renamed file 'account_voucher/test/case1_usd_usd.yml' => 'account_voucher/test/case1_eur_eur.yml'
--- account_voucher/test/case1_usd_usd.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case1_eur_eur.yml	2014-05-14 12:25:54 +0000
@@ -1,6 +1,6 @@
 -
-  In order to check the Account_voucher module with multi-currency in OpenERP, 
-  I create 2 Invoices in USD and make 2 Payments in USD based on the currency rating on that particular date
+  In order to check the Account_voucher module with multi-currency in OpenERP,
+  I create 2 Invoices in EUR and make 2 Payments in EUR based on the currency rating on that particular date
 -
   I set the income and expense currency accounts on the main company
 -
@@ -11,69 +11,69 @@
       'expense_currency_exchange_account_id': ref('account.o_expense')}
     self.write(cr, uid, ref('base.main_company'), vals)
 -
-  I create currency USD in OpenERP for January of 1.333333 Rate
+  I create currency EUR in OpenERP for January of 0.800000 Rate
 -
   !python {model: res.currency.rate}: |
     from datetime import datetime
-    curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'USD')])[0]
+    curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'EUR')])[0]
     date = '%s-01-01' %(datetime.now().year)
     ids = self.search(cr, uid, [('currency_id','=',curr_id), ('name', '=', date)])
-    self.write(cr, uid, ids, {'rate': 1.333333})
--
-  I create currency USD in OpenERP for February of 1.250000 Rate
--
-  !record {model: res.currency.rate, id: feb_usd}:
-    currency_id: base.USD
+    self.write(cr, uid, ids, {'rate': 0.800000})
+-
+  I create currency EUR in OpenERP for February of 0.700000 Rate
+-
+  !record {model: res.currency.rate, id: feb_eur}:
+    currency_id: base.EUR
     name: !eval "'%s-02-01' %(datetime.now().year)"
-    rate: 1.250000
+    rate: 0.700000
 
 -
-  I create currency USD in OpenERP for March of 1.111111 Rate
+  I create currency EUR in OpenERP for March of 0.600000 Rate
 -
-  !record {model: res.currency.rate, id: mar_usd}:
-    currency_id: base.USD
+  !record {model: res.currency.rate, id: mar_eur}:
+    currency_id: base.EUR
     name: !eval "'%s-03-01' %(datetime.now().year)"
-    rate: 1.111111
+    rate: 0.600000
 
 -
-  I create currency USD in OpenERP for April of 1.052632 Rate
+  I create currency EUR in OpenERP for April of 0.500000 Rate
 -
-  !record {model: res.currency.rate, id: apr_usd}:
-    currency_id: base.USD
+  !record {model: res.currency.rate, id: apr_eur}:
+    currency_id: base.EUR
     name: !eval "'%s-04-01' %(datetime.now().year)"
-    rate: 1.052632
+    rate: 0.500000
 
 -
-  I create a cash account with currency USD
+  I create a cash account with currency EUR
 -
-  !record {model: account.account, id: account_cash_usd_id}:
-    currency_id: base.USD
-    name: "cash account in usd"
-    code: "Xcash usd"
+  !record {model: account.account, id: account_cash_eur_id}:
+    currency_id: base.EUR
+    name: "cash account in EUR"
+    code: "Xcash EUR"
     type: 'liquidity'
     user_type: "account.data_account_type_cash"
 
 -
-  I create a bank journal with USD as currency
+  I create a bank journal with EUR as currency
 -
-  !record {model: account.journal, id: bank_journal_USD}:
-    name: Bank Journal(USD)
-    code: BUSD
+  !record {model: account.journal, id: bank_journal_EUR}:
+    name: Bank Journal(EUR)
+    code: BEUR
     type: bank
     analytic_journal_id: account.sit
     sequence_id: account.sequence_bank_journal
-    default_debit_account_id: account_cash_usd_id
-    default_credit_account_id: account_cash_usd_id
-    currency: base.USD
+    default_debit_account_id: account_cash_eur_id
+    default_credit_account_id: account_cash_eur_id
+    currency: base.EUR
     company_id: base.main_company
 
 -
-  I create the first invoice on 1st January  for 200 USD
+  I create the first invoice on 1st January  for 200 EUR
 -
   !record {model: account.invoice, id: account_invoice_jan}:
     account_id: account.a_recv
     company_id: base.main_company
-    currency_id: base.USD
+    currency_id: base.EUR
     date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
     period_id: account.period_1
     invoice_line:
@@ -91,7 +91,7 @@
 -
   !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_jan}
 -
-  I check that first invoice move is correct for debtor account (debit - credit == 150.0)
+  I check that first invoice move is correct for debtor account (debit - credit == 250.0)
 -
   !python {model: account.invoice}: |
     invoice_id = self.browse(cr, uid, ref("account_invoice_jan"))
@@ -99,14 +99,14 @@
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
-    assert (move_line.debit - move_line.credit == 150.0), "Invoice move is not correct for debtors account"
+    assert (move_line.debit - move_line.credit == 250.0), "Invoice move is not correct for debtors account"
 -
-  I create the second invoice on 1st February for 100 USD
+  I create the second invoice on 1st February for 100 EUR
 -
   !record {model: account.invoice, id: account_invoice_feb}:
     account_id: account.a_recv
     company_id: base.main_company
-    currency_id: base.USD
+    currency_id: base.EUR
     date_invoice: !eval "'%s-02-01' %(datetime.now().year)"
     period_id: account.period_2
     invoice_line:
@@ -124,7 +124,7 @@
 -
   !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_feb}
 -
-  I check that second invoice move is correct for debtor account (debit - credit == 80)
+  I check that second invoice move is correct for debtor account (debit - credit == 142.86)
 -
   !python {model: account.invoice}: |
     invoice_id = self.browse(cr, uid, ref("account_invoice_feb"))
@@ -132,7 +132,7 @@
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
-    assert (move_line.debit - move_line.credit == 80), "Invoice move is not correct for debtors account"
+    assert (move_line.debit - move_line.credit == 142.86), "Invoice move is not correct for debtors account"
 
 -
   I set the context that will be used for the encoding of all the vouchers of this file
@@ -140,14 +140,14 @@
   !context
     'type': 'receipt'
 -
-  On the first March, I create the first voucher of payment with values 240 USD, journal USD, 
+  On the first March, I create the first voucher of payment with values 240 EUR, journal EUR,
 -
   !record {model: account.voucher, id: account_voucher_1_case1, view: view_vendor_receipt_form}:
     account_id: account.cash
     amount: 240.0
     company_id: base.main_company
-    journal_id: bank_journal_USD
-    name: 'First payment: Case 1 USD/USD'
+    journal_id: bank_journal_EUR
+    name: 'First payment: Case 1 EUR/EUR'
     partner_id: base.res_partner_19
     period_id: account.period_3
     date: !eval time.strftime("%Y-03-01")
@@ -174,20 +174,20 @@
   I check that writeoff amount computed is -10.0
 -
   !python {model: account.voucher}: |
-    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 USD/USD'), ('partner_id', '=', ref('base.res_partner_19'))])
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 EUR/EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
     voucher_id = self.browse(cr, uid, voucher[0])
     assert (voucher_id.writeoff_amount == -10.0), "Writeoff amount is not -10.0"
 -
   I confirm the voucher
 -
   !python {model: account.voucher}: |
-    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 USD/USD'), ('partner_id', '=', ref('base.res_partner_19'))])
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 EUR/EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
     self.signal_proforma_voucher(cr, uid, voucher)
 -
   I check that the move of my first voucher is valid
 -
   !python {model: account.voucher}: |
-    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 USD/USD'), ('partner_id', '=', ref('base.res_partner_19'))])
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 EUR/EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
     voucher_id = self.browse(cr, uid, voucher[0])
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
@@ -196,24 +196,24 @@
 -
   I check that my debtor account is correct
 -
-  I check that the debtor account has 2 new lines with -180 and -70 as amount_currency columns and that their credit columns are respectively 162 and 63
+  I check that the debtor account has 2 new lines with -180 and -70 as amount_currency columns and that their credit columns are respectively 300 and 116.67
 -
-  I check that my write-off is correct. 9 debit and 10 amount_currency
+  I check that my write-off is correct. 16.67 debit and 10 amount_currency
 -
   !python {model: account.voucher}: |
-    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 USD/USD'), ('partner_id', '=', ref('base.res_partner_19'))])
+    voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 EUR/EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
     voucher_id = self.browse(cr, uid, voucher[0])
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
     for move_line in move_line_obj.browse(cr, uid, move_lines):
         if move_line.amount_currency == -180.00:
-            assert move_line.credit == 162.00, "Debtor account has wrong entry."
+            assert move_line.credit == 300.0, "Debtor account has wrong entry."
         elif move_line.amount_currency == -70.00:
-            assert move_line.credit == 63.00, "Debtor account has wrong entry."
+            assert move_line.credit == 116.67, "Debtor account has wrong entry."
         elif move_line.amount_currency == 10.00:
-            assert move_line.debit == 9.00, "Writeoff amount is wrong."
+            assert move_line.debit == 16.67, "Writeoff amount is wrong."
         elif move_line.amount_currency == 240.00:
-            assert move_line.debit == 216.00, "Bank entry is wrong."
+            assert move_line.debit == 400.00, "Bank entry is wrong."
         else:
             assert False, "Unrecognized journal entry"
 -
@@ -235,13 +235,13 @@
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.amount_residual_currency == 30.0) , "Residual amount is not correct for first Invoice"
 -
-  On the first April, I create the second voucher of payment with values 45 USD, journal USD, 
+  On the first April, I create the second voucher of payment with values 45 EUR, journal EUR,
 -
   !record {model: account.voucher, id: account_voucher_2_case1, view: view_vendor_receipt_form}:
     account_id: account.cash
     amount: 45.0
     company_id: base.main_company
-    journal_id: bank_journal_USD
+    journal_id: bank_journal_EUR
     name: 'Second payment: Case 1'
     partner_id: base.res_partner_19
     period_id: account.period_3
@@ -290,13 +290,13 @@
 -
   I check that my debtor account is correct
 -
-  I check that the debtor account has 2 new lines with -20 and -30 as amount_currency columns and their credit columns are respectively 19 and 28.5
+  I check that the debtor account has 2 new lines with -20 and -30 as amount_currency columns and their credit columns are respectively 40 and 60
 -
   I check that my currency rate difference is correct. 8.5 in credit with no amount_currency
 -
   I  check that the total reconcilation created entries as expected
 -
-  I check that my writeoff is correct. 4.75 debit and 5 amount_currency
+  I check that my writeoff is correct. 10.0 debit and 5 amount_currency
 -
   !python {model: account.voucher}: |
     voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 1'), ('partner_id', '=', ref('base.res_partner_19'))])
@@ -313,21 +313,21 @@
             reconcile_a = move_line.reconcile_id.id
     for move_line in move_line_obj.browse(cr, uid, move_lines):
         if move_line.amount_currency == -20.00:
-            assert move_line.credit == 19.00, "Debtor account has wrong entry."
+            assert move_line.credit == 40.00, "Debtor account has wrong entry."
         elif move_line.amount_currency == -30.00:
-            assert move_line.credit == 28.50, "Debtor account has wrong entry."
+            assert move_line.credit == 60.0, "Debtor account has wrong entry."
         elif move_line.amount_currency == 5.00:
-            assert move_line.debit == 4.75, "Writeoff amount is wrong."
-        elif move_line.debit == 11.5 and move_line.account_id.reconcile:
+            assert move_line.debit == 10.0, "Writeoff amount is wrong."
+        elif move_line.debit == 33.81 and move_line.account_id.reconcile:
             assert move_line.amount_currency == 0.0 and move_line.reconcile_id.id == reconcile_a, "Exchange difference entry for the invoice of 100$ is wrong"
-        elif move_line.credit == 11.5:
+        elif move_line.credit == 33.81:
             assert move_line.amount_currency == 0.0
-        elif move_line.debit == 31.0 and move_line.account_id.reconcile:
+        elif move_line.debit == 90.0 and move_line.account_id.reconcile:
             assert move_line.amount_currency == 0.0 and move_line.reconcile_id.id == reconcile_b, "Exchange difference entry for the invoice of 200$ is wrong"
-        elif move_line.credit == 31.0:
+        elif move_line.credit == 90.0:
             assert move_line.amount_currency == 0.0
         elif move_line.amount_currency == 45.00:
-            assert move_line.debit == 42.75, "Bank entry is wrong."
+            assert move_line.debit == 90.0, "Bank entry is wrong."
         else:
             assert False, "Unrecognized journal entry"
 -

=== renamed file 'account_voucher/test/case1_usd_usd_payment_rate.yml' => 'account_voucher/test/case1_eur_eur_payment_rate.yml'
--- account_voucher/test/case1_usd_usd_payment_rate.yml	2013-05-14 12:03:41 +0000
+++ account_voucher/test/case1_eur_eur_payment_rate.yml	2014-05-14 12:25:54 +0000
@@ -1,6 +1,6 @@
 -
-  In order to check the Account_voucher module with multi-currency in OpenERP, 
-  I create 2 Invoices in USD and make 1 Payment in USD based on the currency rating given by the bank which is slightly different that the one encoded in OpenERP
+  In order to check the Account_voucher module with multi-currency in OpenERP,
+  I create 2 Invoices in EUR and make 1 Payment in EUR based on the currency rating given by the bank which is slightly different that the one encoded in OpenERP
 -
   I set the income and expense currency accounts on the main company
 -
@@ -11,60 +11,60 @@
       'expense_currency_exchange_account_id': ref('account.o_expense')}
     self.write(cr, uid, ref('base.main_company'), vals)
 -
-  I create currency USD in OpenERP for January of 1.333333 Rate
+  I create currency EUR in OpenERP for January of 0.888888 Rate
 -
   !python {model: res.currency.rate}: |
     from datetime import datetime
-    curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'USD')])[0]
+    curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'EUR')])[0]
     date = '%s-01-01' %(datetime.now().year)
     ids = self.search(cr, uid, [('currency_id','=',curr_id), ('name', '=', date)])
-    self.write(cr, uid, ids, {'rate': 1.333333})
--
-  I create currency USD in OpenERP for February of 1.250000 Rate
--
-  !record {model: res.currency.rate, id: feb_usd}:
-    currency_id: base.USD
+    self.write(cr, uid, ids, {'rate': 0.888888})
+-
+  I create currency EUR in OpenERP for February of 0.999999 Rate
+-
+  !record {model: res.currency.rate, id: feb_eur}:
+    currency_id: base.EUR
     name: !eval "'%s-02-01' %(datetime.now().year)"
-    rate: 1.250000
+    rate: 0.999999
 
 -
-  I create currency USD in OpenERP for March of 1.111111 Rate
+  I create currency EUR in OpenERP for March of 0.777777 Rate
 -
-  !record {model: res.currency.rate, id: mar_usd}:
-    currency_id: base.USD
+  !record {model: res.currency.rate, id: mar_eur}:
+    currency_id: base.EUR
     name: !eval "'%s-03-01' %(datetime.now().year)"
-    rate: 1.111111
+    rate: 0.777777
 
 -
-  I create currency USD in OpenERP for April of 1.052632 Rate
+  I create currency EUR in OpenERP for April of 0.666666 Rate
 -
-  !record {model: res.currency.rate, id: apr_usd}:
-    currency_id: base.USD
+  !record {model: res.currency.rate, id: apr_eur}:
+    currency_id: base.EUR
     name: !eval "'%s-04-01' %(datetime.now().year)"
-    rate: 1.052632
+    rate: 0.666666
 
 -
-  I create a cash account with currency USD
+  I create a cash account with currency EUR
 -
-  !record {model: account.account, id: account_cash_usd_id}:
-    currency_id: base.USD
-    name: "cash account in usd"
-    code: "Xcash usd"
+  !record {model: account.account, id: account_cash_eur_id}:
+    currency_id: base.EUR
+    name: "cash account in EUR"
+    code: "Xcash eur"
     type: 'liquidity'
     user_type: "account.data_account_type_cash"
 
 -
-  I create a bank journal with USD as currency
+  I create a bank journal with EUR as currency
 -
-  !record {model: account.journal, id: bank_journal_USD}:
-    name: Bank Journal(USD)
-    code: BUSD
+  !record {model: account.journal, id: bank_journal_EUR}:
+    name: Bank Journal(EUR)
+    code: BEUR
     type: bank
     analytic_journal_id: account.sit
     sequence_id: account.sequence_bank_journal
-    default_debit_account_id: account_cash_usd_id
-    default_credit_account_id: account_cash_usd_id
-    currency: base.USD
+    default_debit_account_id: account_cash_eur_id
+    default_credit_account_id: account_cash_eur_id
+    currency: base.EUR
     company_id: base.main_company
 
 -
@@ -75,12 +75,12 @@
     property_account_receivable: account.a_recv
     property_account_payable: account.a_pay
 -
-  I create the first invoice on 1st January  for 200 USD
+  I create the first invoice on 1st January  for 200 EUR
 -
   !record {model: account.invoice, id: account_invoice_jan_payment_rate}:
     account_id: account.a_recv
     company_id: base.main_company
-    currency_id: base.USD
+    currency_id: base.EUR
     date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
     period_id: account.period_1
     invoice_line:
@@ -98,7 +98,7 @@
 -
   !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_jan_payment_rate}
 -
-  I check that first invoice move is correct for debtor account (debit - credit == 150.0)
+  I check that first invoice move is correct for debtor account (debit - credit == 225.0)
 -
   !python {model: account.invoice}: |
     invoice_id = self.browse(cr, uid, ref("account_invoice_jan_payment_rate"))
@@ -106,14 +106,14 @@
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
-    assert (move_line.debit - move_line.credit == 150.0), "Invoice move is not correct for debtors account"
+    assert (move_line.debit - move_line.credit == 225.0), "Invoice move is not correct for debtors account"
 -
-  I create the second invoice on 1st February for 100 USD
+  I create the second invoice on 1st February for 100 EUR
 -
   !record {model: account.invoice, id: account_invoice_feb_payment_rate}:
     account_id: account.a_recv
     company_id: base.main_company
-    currency_id: base.USD
+    currency_id: base.EUR
     date_invoice: !eval "'%s-02-01' %(datetime.now().year)"
     period_id: account.period_2
     invoice_line:
@@ -131,7 +131,7 @@
 -
   !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_feb_payment_rate}
 -
-  I check that second invoice move is correct for debtor account (debit - credit == 80)
+  I check that second invoice move is correct for debtor account (debit - credit == 100.0)
 -
   !python {model: account.invoice}: |
     invoice_id = self.browse(cr, uid, ref("account_invoice_feb_payment_rate"))
@@ -139,7 +139,7 @@
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
-    assert (move_line.debit - move_line.credit == 80), "Invoice move is not correct for debtors account"
+    assert (move_line.debit - move_line.credit == 100.0), "Invoice move is not correct for debtors account"
 
 -
   I set the context that will be used for the encoding of all the vouchers of this file
@@ -147,14 +147,14 @@
   !context
     'type': 'receipt'
 -
-  On the first March, I create the first voucher of payment with values 240 USD, journal USD, and specifying that $1 = 0.8€
+  On the first March, I create the first voucher of payment with values 240 EUR, journal EUR, and specifying that $1 = 0.8€
 -
   !record {model: account.voucher, id: account_voucher_1_case1_payment_rate, view: view_vendor_receipt_form}:
     account_id: account.cash
     amount: 240.0
     company_id: base.main_company
-    journal_id: bank_journal_USD
-    name: 'Payment: Case 1 USD/USD payment rate'
+    journal_id: bank_journal_EUR
+    name: 'Payment: Case 1 EUR/EUR payment rate'
     partner_id: res_partner_mc_kay
     period_id: account.period_3
     date: !eval time.strftime("%Y-03-01")
@@ -162,7 +162,7 @@
     writeoff_acc_id: account.a_expense
     comment: 'Write Off'
     payment_rate: 0.8
-    payment_rate_currency_id: base.EUR
+    payment_rate_currency_id: base.USD
 
 -
   I fill amounts 180 for the invoice of 200$ and 70 for the invoice of 100$>
@@ -226,22 +226,22 @@
         else:
             assert False, "Unrecognized journal entry"
 -
-  I check the residual amount of Invoice1, should be 20 in amount_currency and 6 in amount_residual
+  I check the residual amount of Invoice1, should be 20 in amount_currency and 81 in amount_residual
 -
   !python {model: account.invoice}: |
     invoice_id = self.browse(cr, uid, ref("account_invoice_jan_payment_rate"))
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
-    assert (move_line.amount_residual == 6.0) , "Residual amount is not correct for first Invoice"
+    assert (move_line.amount_residual == 81.0) , "Residual amount is not correct for first Invoice"
     assert (move_line.amount_residual_currency == 20.0) , "Residual amount in currency is not correct for first Invoice"
 -
-  I check the residual amuont of Invoice2, should be 30 in residual currency and 24 in amount_residual
+  I check the residual amuont of Invoice2, should be 30 in residual currency and 44 in amount_residual
 -
   !python {model: account.invoice}: |
     invoice_id = self.browse(cr, uid, ref("account_invoice_feb_payment_rate"))
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
-    assert (move_line.amount_residual == 24.0) , "Residual amount is not correct for second Invoice"
+    assert (move_line.amount_residual == 44.0) , "Residual amount is not correct for second Invoice"
     assert (move_line.amount_residual_currency == 30.0) , "Residual amount in currency is not correct for second Invoice"

=== renamed file 'account_voucher/test/case2_usd_eur_debtor_in_usd.yml' => 'account_voucher/test/case2_eur_usd_debtor_in_eur.yml'
--- account_voucher/test/case2_usd_eur_debtor_in_usd.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case2_eur_usd_debtor_in_eur.yml	2014-05-14 12:25:54 +0000
@@ -1,6 +1,6 @@
 -
-  In order to check the Account_voucher module with multi-currency in OpenERP, 
-  I create 2 Invoices in USD and make 2 Payments one in USD and another in EUR, based on the currency rating on that particular date
+  In order to check the Account_voucher module with multi-currency in OpenERP,
+  I create 2 Invoices in EUR and make 2 Payments one in EUR and another in USD, based on the currency rating on that particular date
 -
   I set the income and expense currency accounts on the main company
 -
@@ -11,42 +11,54 @@
       'expense_currency_exchange_account_id': ref('account.o_expense')}
     self.write(cr, uid, ref('base.main_company'), vals)
 -
-  I modify the debtor account in order to set the currency_id = USD
+  I modify the debtor account in order to set the currency_id = EUR
 -
   !python {model: account.account}: |
     from datetime import datetime
     ids = self.search(cr, uid, [('name', 'ilike', 'debtor')])
-    self.write(cr, uid, ids, {'currency_id': ref('base.USD')})
+    self.write(cr, uid, ids, {'currency_id': ref('base.EUR')})
 -
-  I create currency USD in OpenERP for January of 1.333333 Rate
+  I create currency EUR in OpenERP for January of 0.800000 Rate
 -
   !python {model: res.currency.rate}: |
     from datetime import datetime
-    curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'USD')])[0]
+    curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'EUR')])[0]
     date = '%s-01-01' %(datetime.now().year)
     ids = self.search(cr, uid, [('currency_id', '=', curr_id), ('name', '=', date)])
-    self.write(cr, uid, ids, {'rate': 1.333333})
--
-  I create currency USD in OpenERP for February of 1.250000 Rate
--
-  !record {model: res.currency.rate, id: feb_usd}:
-    currency_id: base.USD
+    self.write(cr, uid, ids, {'rate': 0.800000})
+-
+  I create currency EUR in OpenERP for February of 0.900000 Rate
+-
+  !record {model: res.currency.rate, id: feb_eur}:
+    currency_id: base.EUR
     name: !eval "'%s-02-01' %(datetime.now().year)"
-    rate: 1.250000
--
-  I create currency USD in OpenERP for March of 1.111111 Rate
--
-  !record {model: res.currency.rate, id: mar_usd}:
-    currency_id: base.USD
+    rate: 0.900000
+-
+  I create currency EUR in OpenERP for March of 0.600000 Rate
+-
+  !record {model: res.currency.rate, id: mar_eur}:
+    currency_id: base.EUR
     name: !eval "'%s-03-01' %(datetime.now().year)"
-    rate: 1.111111
--
-  I create currency USD in OpenERP for April of 1.052632 Rate
--
-  !record {model: res.currency.rate, id: apr_usd}:
-    currency_id: base.USD
+    rate: 0.600000
+-
+  I create currency EUR in OpenERP for April of 0.500000 Rate
+-
+  !record {model: res.currency.rate, id: apr_eur}:
+    currency_id: base.EUR
     name: !eval "'%s-04-01' %(datetime.now().year)"
-    rate: 1.052632
+    rate: 0.500000
+-
+  I create a bank journal with USD as currency
+-
+  !record {model: account.journal, id: bank_journal_USD}:
+    name: Bank Journal(USD)
+    code: BUSD
+    type: bank
+    analytic_journal_id: account.sit
+    sequence_id: account.sequence_bank_journal
+    default_debit_account_id: account.cash
+    default_credit_account_id: account.cash
+    company_id: base.main_company
 -
   I create a bank journal with EUR as currency
 -
@@ -56,29 +68,17 @@
     type: bank
     analytic_journal_id: account.sit
     sequence_id: account.sequence_bank_journal
-    default_debit_account_id: account.cash
-    default_credit_account_id: account.cash
-    company_id: base.main_company
--
-  I create a bank journal with USD as currency
--
-  !record {model: account.journal, id: bank_journal_USD}:
-    name: Bank Journal(USD)
-    code: BUSD
-    type: bank
-    analytic_journal_id: account.sit
-    sequence_id: account.sequence_bank_journal
-    default_debit_account_id: account_cash_usd_id
-    default_credit_account_id: account_cash_usd_id
-    currency: base.USD
-    company_id: base.main_company
--
-  I create the first invoice on 1st January for 200 USD
+    default_debit_account_id: account_cash_eur_id
+    default_credit_account_id: account_cash_eur_id
+    currency: base.EUR
+    company_id: base.main_company
+-
+  I create the first invoice on 1st January for 200 EUR
 -
   !record {model: account.invoice, id: account_first_invoice_jan_michal}:
     account_id: account.a_recv
     company_id: base.main_company
-    currency_id: base.USD
+    currency_id: base.EUR
     date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
     period_id: account.period_1
     invoice_line:
@@ -96,7 +96,7 @@
 -
   !workflow {model: account.invoice, action: invoice_open, ref: account_first_invoice_jan_michal}
 -
-  I check that first invoice move is correct for debtor account(debit - credit == 150)
+  I check that first invoice move is correct for debtor account(debit - credit == 250)
 -
   !python {model: account.invoice}: |
     invoice_id = self.browse(cr, uid, ref("account_first_invoice_jan_michal"))
@@ -104,14 +104,14 @@
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
-    assert (move_line.debit - move_line.credit == 150.00), "Invoice move is incorrect for debtors account"
+    assert (move_line.debit - move_line.credit == 250.00), "Invoice move is incorrect for debtors account"
 -
-  I create the second invoice on 1st February for 100 USD
+  I create the second invoice on 1st February for 100 EUR
 -
   !record {model: account.invoice, id: account_second_invoice_feb_michal}:
     account_id: account.a_recv
     company_id: base.main_company
-    currency_id: base.USD
+    currency_id: base.EUR
     date_invoice: !eval "'%s-02-01' %(datetime.now().year)"
     period_id: account.period_2
     invoice_line:
@@ -129,7 +129,7 @@
 -
   !workflow {model: account.invoice, action: invoice_open, ref: account_second_invoice_feb_michal}
 -
-  I check that second invoice move is correct for debtor account (debit - credit == 80)
+  I check that second invoice move is correct for debtor account (debit - credit == 111.11)
 -
   !python {model: account.invoice}: |
     invoice_id = self.browse(cr, uid, ref("account_second_invoice_feb_michal"))
@@ -137,20 +137,20 @@
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
-    assert (move_line.debit - move_line.credit == 80), "Invoice move is incorrect for debtors account"
+    assert (move_line.debit - move_line.credit == 111.11), "Invoice move is incorrect for debtors account"
 -
   I set the context that will be used for the encoding of all the vouchers of this file
 -
   !context
     'type': 'receipt'
 -
-  I create the first voucher of payment with values 200 EUR, journal EUR
+  I create the first voucher of payment with values 200 USD, journal USD
 -
   !record {model: account.voucher, id: account_voucher_1_case2b, view: view_vendor_receipt_form}:
     account_id: account.cash
     amount: 200.0
     company_id: base.main_company
-    journal_id: bank_journal_EUR
+    journal_id: bank_journal_USD
     partner_id: base.res_partner_19
     period_id: account.period_3
     date: !eval time.strftime("%Y-03-01")
@@ -193,7 +193,7 @@
 -
   I check that my debtor account is correct
 -
-  I check that the debtor account has 2 new lines with 144.44 and 77.78 in amount_currency columns and their credit columns are 130 and 70
+  I check that the debtor account has 2 new lines with 144.44 and 42.0 in amount_currency columns and their credit columns are 130 and 70
 -
   !python {model: account.voucher}: |
     voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 2 USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_19'))])
@@ -202,35 +202,35 @@
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
     for move_line in move_line_obj.browse(cr, uid, move_lines):
         if move_line.credit == 70.0:
-            assert move_line.amount_currency == -77.78, "Wrong debtor entry"
+            assert move_line.amount_currency == -42.0, "Wrong debtor entry"
         if move_line.credit == 130.0:
             assert move_line.amount_currency == -144.44, "Wrong debtor entry"
 -
-  I check the residual amount of Invoice1, should be 55.56 in residual currency and 20 in amount_residual
+  I check the residual amount of Invoice1, should be 158.0 in residual currency and 180.0 in amount_residual
 -
   !python {model: account.invoice}: |
     invoice_id = self.browse(cr, uid, ref("account_first_invoice_jan_michal"))
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
-    assert (move_line.amount_residual_currency == 55.56 and move_line.amount_residual == 20) , "Residual amount is not correct for first Invoice"
+    assert (move_line.amount_residual_currency == 158.0 and move_line.amount_residual == 180.0) , "Residual amount is not correct for first Invoice"
 -
-  I check the residual amount of Invoice2, should be 22.22 in residual currency and 10 in amount_residual
+  I check the residual amount of Invoice2, should be 58.0 in residual currency and 41.11 in amount_residual
 -
    !python {model: account.invoice}: |
     invoice_id = self.browse(cr, uid, ref("account_second_invoice_feb_michal"))
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
-    assert (move_line.amount_residual_currency == 22.22 and move_line.amount_residual == 10) , "Residual amount is not correct for second Invoice"
+    assert (move_line.amount_residual_currency == 58.0 and move_line.amount_residual == 41.11) , "Residual amount is not correct for second Invoice"
 -
-  I create the second voucher of payment with values 80 USD, journal USD
+  I create the second voucher of payment with values 80 EUR, journal EUR
 -
   !record {model: account.voucher, id: account_voucher_2_case2b, view: view_vendor_receipt_form}:
     account_id: account.cash
     amount: 80.0
     company_id: base.main_company
-    journal_id: bank_journal_USD
+    journal_id: bank_journal_EUR
     partner_id: base.res_partner_19
     period_id: account.period_3
     date: !eval time.strftime("%Y-04-01")
@@ -247,20 +247,20 @@
     voucher_id = self.browse(cr, uid, ref('account_voucher_2_case2b'))
     data = []
     for item in voucher_id.line_cr_ids:
-        if item.amount_unreconciled == 55.56:
-            data += [(item.id, 55.56)]
+        if item.amount_unreconciled == 158.0:
+            data += [(item.id, 158.0)]
         else:
-            data += [(item.id, 22.22)]
+            data += [(item.id, 58.0)]
     for line_id, amount in data:
         self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher_id.state=='draft'), "Voucher is not in draft state"
 -
-  I check that writeoff amount computed is 2.22
+  I check that writeoff amount computed is -136.0
 -
   !python {model: account.voucher}: |
     voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR USD'), ('partner_id', '=', ref('base.res_partner_19'))])
     voucher_id = self.browse(cr, uid, voucher[0])
-    assert (round(voucher_id.writeoff_amount, 2) == 2.22), "Writeoff amount is not 2.22$"
+    assert (round(voucher_id.writeoff_amount, 2) == -136.0), "Writeoff amount is not -136.0$"
 -
   I confirm the voucher
 -

=== renamed file 'account_voucher/test/case2_usd_eur_debtor_in_eur.yml' => 'account_voucher/test/case2_eur_usd_debtor_in_usd.yml'
--- account_voucher/test/case2_usd_eur_debtor_in_eur.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case2_eur_usd_debtor_in_usd.yml	2014-05-14 12:25:54 +0000
@@ -1,6 +1,6 @@
 -
-  In order to check the Account_voucher module with multi-currency in OpenERP, 
-  I create 2 Invoices in USD and make 2 Payments one in USD and another in EUR, based on the currency rating on that particular date
+  In order to check the Account_voucher module with multi-currency in OpenERP,
+  I create 2 Invoices in EUR and make 2 Payments one in EUR and another in USD, based on the currency rating on that particular date
 -
   I set the income and expense currency accounts on the main company
 -
@@ -18,35 +18,47 @@
     ids = self.search(cr, uid, [('name', 'ilike', 'debtor')])
     self.write(cr, uid, ids, {'currency_id': False})
 -
-  I create currency USD in OpenERP for January of 1.333333 Rate
+  I create currency EUR in OpenERP for January of 0.800000 Rate
 -
   !python {model: res.currency.rate}: |
     from datetime import datetime
-    curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'USD')])[0]
+    curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'EUR')])[0]
     date = '%s-01-01' %(datetime.now().year)
     ids = self.search(cr, uid, [('currency_id', '=', curr_id), ('name', '=', date)])
-    self.write(cr, uid, ids, {'rate': 1.333333})
--
-  I create currency USD in OpenERP for February of 1.250000 Rate
--
-  !record {model: res.currency.rate, id: feb_usd}:
-    currency_id: base.USD
+    self.write(cr, uid, ids, {'rate': 0.800000})
+-
+  I create currency EUR in OpenERP for February of 0.900000 Rate
+-
+  !record {model: res.currency.rate, id: feb_eur}:
+    currency_id: base.EUR
     name: !eval "'%s-02-01' %(datetime.now().year)"
-    rate: 1.250000
--
-  I create currency USD in OpenERP for March of 1.111111 Rate
--
-  !record {model: res.currency.rate, id: mar_usd}:
-    currency_id: base.USD
+    rate: 0.900000
+-
+  I create currency EUR in OpenERP for March of 0.600000 Rate
+-
+  !record {model: res.currency.rate, id: mar_eur}:
+    currency_id: base.EUR
     name: !eval "'%s-03-01' %(datetime.now().year)"
-    rate: 1.111111
--
-  I create currency USD in OpenERP for April of 1.052632 Rate
--
-  !record {model: res.currency.rate, id: apr_usd}:
-    currency_id: base.USD
+    rate: 0.600000
+-
+  I create currency EUR in OpenERP for April of 0.500000 Rate
+-
+  !record {model: res.currency.rate, id: apr_eur}:
+    currency_id: base.EUR
     name: !eval "'%s-04-01' %(datetime.now().year)"
-    rate: 1.052632
+    rate: 0.500000
+-
+  I create a bank journal with USD as currency
+-
+  !record {model: account.journal, id: bank_journal_USD}:
+    name: Bank Journal(USD)
+    code: BUSD
+    type: bank
+    analytic_journal_id: account.sit
+    sequence_id: account.sequence_bank_journal
+    default_debit_account_id: account.cash
+    default_credit_account_id: account.cash
+    company_id: base.main_company
 -
   I create a bank journal with EUR as currency
 -
@@ -56,29 +68,17 @@
     type: bank
     analytic_journal_id: account.sit
     sequence_id: account.sequence_bank_journal
-    default_debit_account_id: account.cash
-    default_credit_account_id: account.cash
-    company_id: base.main_company
--
-  I create a bank journal with USD as currency
--
-  !record {model: account.journal, id: bank_journal_USD}:
-    name: Bank Journal(USD)
-    code: BUSD
-    type: bank
-    analytic_journal_id: account.sit
-    sequence_id: account.sequence_bank_journal
-    default_debit_account_id: account_cash_usd_id
-    default_credit_account_id: account_cash_usd_id
-    currency: base.USD
-    company_id: base.main_company
--
-  I create the first invoice on 1st January for 200 USD
+    default_debit_account_id: account_cash_eur_id
+    default_credit_account_id: account_cash_eur_id
+    currency: base.EUR
+    company_id: base.main_company
+-
+  I create the first invoice on 1st January for 200 EUR
 -
   !record {model: account.invoice, id: account_first_invoice_jan}:
     account_id: account.a_recv
     company_id: base.main_company
-    currency_id: base.USD
+    currency_id: base.EUR
     date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
     period_id: account.period_1
     invoice_line:
@@ -96,7 +96,7 @@
 -
   !workflow {model: account.invoice, action: invoice_open, ref: account_first_invoice_jan}
 -
-  I check that first invoice move is correct for debtor account(debit - credit == 150)
+  I check that first invoice move is correct for debtor account(debit - credit == 250)
 -
   !python {model: account.invoice}: |
     invoice_id = self.browse(cr, uid, ref("account_first_invoice_jan"))
@@ -104,14 +104,14 @@
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
-    assert (move_line.debit - move_line.credit == 150.00), "Invoice move is incorrect for debtors account"
+    assert (move_line.debit - move_line.credit == 250.00), "Invoice move is incorrect for debtors account"
 -
-  I create the second invoice on 1st February for 100 USD
+  I create the second invoice on 1st February for 100 EUR
 -
   !record {model: account.invoice, id: account_second_invoice_feb}:
     account_id: account.a_recv
     company_id: base.main_company
-    currency_id: base.USD
+    currency_id: base.EUR
     date_invoice: !eval "'%s-02-01' %(datetime.now().year)"
     period_id: account.period_2
     invoice_line:
@@ -129,7 +129,7 @@
 -
   !workflow {model: account.invoice, action: invoice_open, ref: account_second_invoice_feb}
 -
-  I check that second invoice move is correct for debtor account (debit - credit == 80)
+  I check that second invoice move is correct for debtor account (debit - credit == 111.11)
 -
   !python {model: account.invoice}: |
     invoice_id = self.browse(cr, uid, ref("account_second_invoice_feb"))
@@ -137,7 +137,7 @@
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
-    assert (move_line.debit - move_line.credit == 80), "Invoice move is incorrect for debtors account"
+    assert (move_line.debit - move_line.credit == 111.11), "Invoice move is incorrect for debtors account"
 -
   I set the context that will be used for the encoding of all the vouchers of this file
 -
@@ -150,7 +150,7 @@
     account_id: account.cash
     amount: 200.0
     company_id: base.main_company
-    journal_id: bank_journal_EUR
+    journal_id: bank_journal_USD
     partner_id: base.res_partner_19
     period_id: account.period_3
     date: !eval time.strftime("%Y-03-01")
@@ -194,31 +194,31 @@
     for move_line in move_line_obj.browse(cr, uid, move_lines):
         assert move_line.state == 'valid', "Voucher move is not valid"
 -
-  I check the residual amount of Invoice1, should be 55.56 in residual currency and 20 in amount_residual
+  I check the residual amount of Invoice1, should be 158.0 in residual currency and 180 in amount_residual
 -
   !python {model: account.invoice}: |
     invoice_id = self.browse(cr, uid, ref("account_first_invoice_jan"))
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
-    assert (move_line.amount_residual_currency == 55.56 and move_line.amount_residual == 20) , "Residual amount is not correct for first Invoice. Got %s USD (%s EUR)" %(move_line.amount_residual_currency, move_line.amount_residual)
+    assert (move_line.amount_residual_currency == 158.0 and move_line.amount_residual == 180.0) , "Residual amount is not correct for first Invoice. Got %s USD (%s EUR)" %(move_line.amount_residual_currency, move_line.amount_residual)
 -
-  I check the residual amuont of Invoice2, should be 22.22 in residual currency and 10 in amount_residual
+  I check the residual amuont of Invoice2, should be 58.0 in residual currency and 41.11 in amount_residual
 -
    !python {model: account.invoice}: |
     invoice_id = self.browse(cr, uid, ref("account_second_invoice_feb"))
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
-    assert (move_line.amount_residual_currency == 22.22 and move_line.amount_residual == 10) , "Residual amount is not correct for second Invoice"
+    assert (move_line.amount_residual_currency == 58.0 and move_line.amount_residual == 41.11) , "Residual amount is not correct for second Invoice"
 -
-  I create the second voucher of payment with values 80 USD, journal USD
+  I create the second voucher of payment with values 80 EUR, journal EUR
 -
   !record {model: account.voucher, id: account_voucher_2_case2a, view: view_vendor_receipt_form}:
     account_id: account.cash
     amount: 80
     company_id: base.main_company
-    journal_id: bank_journal_USD
+    journal_id: bank_journal_EUR
     partner_id: base.res_partner_19
     period_id: account.period_3
     date: !eval time.strftime("%Y-04-01")
@@ -237,20 +237,20 @@
     voucher_id = self.browse(cr, uid, ref('account_voucher_2_case2a'))
     data = []
     for item in voucher_id.line_cr_ids:
-        if item.amount_unreconciled == 55.56:
-            data += [(item.id, 55.56)]
+        if item.amount_unreconciled == 158.0:
+            data += [(item.id, 158.0)]
         else:
-            data += [(item.id, 22.22)]
+            data += [(item.id, 58.0)]
     for line_id, amount in data:
         self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher_id.state=='draft'), "Voucher is not in draft state"
 -
-  I check that writeoff amount computed is 2.22
+  I check that writeoff amount computed is -136.0
 -
   !python {model: account.voucher}: |
     voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
     voucher_id = self.browse(cr, uid, voucher[0])
-    assert (round(voucher_id.writeoff_amount, 2) == 2.22), "Writeoff amount is not 2.22$"
+    assert (round(voucher_id.writeoff_amount, 2) == -136.0), "Writeoff amount is not -136.0$"
 -
   I confirm the voucher
 -
@@ -268,11 +268,11 @@
 -
   I check that my debtor account is correct
 -
-  I check that the debtor account has 2 new lines with -55.56 and -22.22 in amount_currency columns and their credit columns are respectively 52.78 and 21.11 and currency is USD($).
+  I check that the debtor account has 2 new lines with -158.0 and -58.0 in amount_currency columns and their credit columns are respectively 52.78 and 21.11 and currency is USD($).
 -
   I check that my currency rate difference is correct.
 -
-  I check that my writeoff is correct. 2.11 in credit and 2.22 in amount_currency
+  I check that my writeoff is correct. 2.11 in credit and -136.0 in amount_currency
 -
   !python {model: account.voucher}: |
     voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 2 SUPPL USD/EUR DR EUR'), ('partner_id', '=', ref('base.res_partner_19'))])
@@ -307,7 +307,7 @@
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.amount_residual_currency == 0.0 and move_line.amount_residual == 0.0 and invoice_id.state == 'paid') , "Residual amount is not correct for first Invoice"
--    
+-   
   I check the residual amuont of invoice 2, should be 0 in residual currency and 0 in amount_residual and paid
 -
    !python {model: account.invoice}: |

=== renamed file 'account_voucher/test/case2_suppl_usd_eur.yml' => 'account_voucher/test/case2_suppl_eur_usd.yml'
--- account_voucher/test/case2_suppl_usd_eur.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case2_suppl_eur_usd.yml	2014-05-14 12:25:54 +0000
@@ -21,7 +21,7 @@
     sequence_id: account.sequence_bank_journal
     default_debit_account_id: account.cash
     default_credit_account_id: account.cash
-    currency: base.EUR
+    currency: base.USD
     company_id: base.main_company
 -
   I create a bank journal with USD as currency

=== renamed file 'account_voucher/test/case3_eur_eur.yml' => 'account_voucher/test/case3_usd_usd.yml'
--- account_voucher/test/case3_eur_eur.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case3_usd_usd.yml	2014-05-14 12:25:54 +0000
@@ -1,11 +1,11 @@
 -
-  In order to check the Account_voucher module with multi-currency in OpenERP, 
-  I create 2 Invoices in EUR and make 2 Payments in EUR based on the currency rating on that particular date.
--
-  I create currency EUR in OpenERP for January of 1.000000 Rate
--
-  !record {model: res.currency.rate, id: jan_eur}:
-    currency_id: base.EUR
+  In order to check the Account_voucher module with multi-currency in OpenERP,
+  I create 2 Invoices in USD and make 2 Payments in USD based on the currency rating on that particular date.
+-
+  I create currency USD in OpenERP for January of 1.000000 Rate
+-
+  !record {model: res.currency.rate, id: jan_USD}:
+    currency_id: base.USD
     name: !eval "'%s-01-01' %(datetime.now().year)"
     rate: 1.000000
 -
@@ -16,11 +16,11 @@
     ids = self.search(cr, uid, [('name', 'ilike', 'debtor')])
     self.write(cr, uid, ids, {'currency_id': False})
 -
-  I create a bank journal with EUR as currency
+  I create a bank journal with USD as currency
 -
-  !record {model: account.journal, id: bank_journal_EUR}:
-    name: Bank Journal(EUR)
-    code: BEUR
+  !record {model: account.journal, id: bank_journal_USD}:
+    name: Bank Journal(USD)
+    code: BUSD
     type: bank
     analytic_journal_id: account.sit
     sequence_id: account.sequence_bank_journal
@@ -28,12 +28,12 @@
     default_credit_account_id: account.cash
     company_id: base.main_company
 -
-  I create the first invoice on 1st January for 150 EUR
+  I create the first invoice on 1st January for 150 USD
 -
   !record {model: account.invoice, id: account_first_invoice_jan_eur}:
     account_id: account.a_recv
     company_id: base.main_company
-    currency_id: base.EUR
+    currency_id: base.USD
     date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
     period_id: account.period_1
     invoice_line:
@@ -61,12 +61,12 @@
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.debit - move_line.credit == 150.00), "Invoice move is incorrect for debtors account"
 -
-  I create the second invoice on 1st February for 80 EUR
+  I create the second invoice on 1st February for 80 USD
 -
   !record {model: account.invoice, id: account_second_invoice_feb_eur}:
     account_id: account.a_recv
     company_id: base.main_company
-    currency_id: base.EUR
+    currency_id: base.USD
     date_invoice: !eval "'%s-02-01' %(datetime.now().year)"
     period_id: account.period_1
     invoice_line:
@@ -105,7 +105,7 @@
     account_id: account.cash
     amount: 120.0
     company_id: base.main_company
-    journal_id: bank_journal_EUR
+    journal_id: bank_journal_USD
     partner_id: base.res_partner_19
     period_id: account.period_3
     date: !eval time.strftime("%Y-03-01")
@@ -192,7 +192,7 @@
     account_id: account.cash
     amount: 120.0
     company_id: base.main_company
-    journal_id: bank_journal_EUR
+    journal_id: bank_journal_USD
     partner_id: base.res_partner_19
     period_id: account.period_3
     date: !eval time.strftime("%Y-04-01")
@@ -263,7 +263,7 @@
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.amount_residual_currency == 0 and move_line.amount_residual == 0) , "Residual amount is not correct for first Invoice"
--    
+-
   I check the residual amuont of Invoice2 is -10
 -
    !python {model: account.invoice}: |

=== modified file 'account_voucher/test/case4_cad_chf.yml'
--- account_voucher/test/case4_cad_chf.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case4_cad_chf.yml	2014-05-14 12:25:54 +0000
@@ -11,33 +11,33 @@
       'expense_currency_exchange_account_id': ref('account.o_expense')}
     self.write(cr, uid, ref('base.main_company'), vals)
 -
-  I create currency CAD in OpenERP for January of 1.338800 Rate
+  I create currency CAD in OpenERP for January of 1.0431 Rate
 -
   !record {model: res.currency.rate, id: jan_cad}:
     currency_id: base.CAD
     name: !eval "'%s-01-01' %(datetime.now().year)"
-    rate: 1.338800
+    rate: 1.0431
 -
-  I create currency CAD in OpenERP for March of 2.000000 Rate
+  I create currency CAD in OpenERP for March of 1.7043 Rate
 -
   !record {model: res.currency.rate, id: mar_cad}:
     currency_id: base.CAD
     name: !eval "'%s-03-01' %(datetime.now().year)"
-    rate: 2.000000
+    rate: 1.7043
 -
-  I create currency CHF in OpenERP for January of 1.308600 Rate
+  I create currency CHF in OpenERP for January of 1.0196 Rate
 -
   !record {model: res.currency.rate, id: jan_chf}:
     currency_id: base.CHF
     name: !eval "'%s-01-01' %(datetime.now().year)"
-    rate: 1.308600
+    rate: 1.0196
 -
-  I create currency CHF in OpenERP for March of 1.250000 Rate
+  I create currency CHF in OpenERP for March of 0.961 Rate
 -
   !record {model: res.currency.rate, id: mar_chf}:
     currency_id: base.CHF
     name: !eval "'%s-03-01' %(datetime.now().year)"
-    rate: 1.25000
+    rate: 0.961
 -
   I create a cash account with currency CHF
 -
@@ -85,7 +85,7 @@
 -
   !workflow {model: account.invoice, action: invoice_open, ref: account_first_invoice_jan_cad}
 -
-  I check that first invoice move is correct for debtor account (debit - credit == 149.39)
+  I check that first invoice move is correct for debtor account (debit - credit == 191.74)
 -
   !python {model: account.invoice}: |
     invoice_id = self.browse(cr, uid, ref("account_first_invoice_jan_cad"))
@@ -93,7 +93,7 @@
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
-    assert (move_line.debit - move_line.credit == 149.39), "Invoice move is incorrect for debtors account"
+    assert (move_line.debit - move_line.credit == 191.74), "Invoice move is incorrect for debtors account"
 -
   I set the context that will be used for the encoding of all the vouchers of this file
 -
@@ -124,20 +124,20 @@
     voucher_id = self.browse(cr, uid, ref('account_voucher_1_case4'))
     data = []
     for item in voucher_id.line_cr_ids:
-        if item.amount_unreconciled == 186.74:
-            data += [(item.id, 186.74)]
+        if item.amount_unreconciled == 184.26:
+            data += [(item.id, 184.26)]
         else:
             data += [(item.id, 0.0)]
     for line_id, amount in data:
         self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher_id.state=='draft'), "Voucher is not in draft state"
 -
-  I check that writeoff amount computed is 13.26
+  I check that writeoff amount computed is 15.74
 -
   !python {model: account.voucher}: |
     voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 4'), ('partner_id', '=', ref('base.res_partner_19'))])
     voucher_id = self.browse(cr, uid, voucher[0])
-    assert (round(voucher_id.writeoff_amount,2) == 13.26), "Writeoff amount is not 13.26 CHF"
+    assert (round(voucher_id.writeoff_amount,2) == 15.74), "Writeoff amount is not 15.74 CHF"
 -
   I confirm the voucher
 -
@@ -163,7 +163,7 @@
 -
   I check that my currency rate difference is correct. 0 in debit with 98.78 CAD as amount_currency
 -
-  I check that my writeoff is correct. 11.05 credit and -13.26 amount_currency
+  I check that my writeoff is correct. 11.05 credit and -15.74 amount_currency
 -
   !python {model: account.voucher}: |
     voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 4'), ('partner_id', '=', ref('base.res_partner_19'))])
@@ -171,15 +171,15 @@
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
     for move_line in move_line_obj.browse(cr, uid, move_lines):
-        if move_line.amount_currency == 200:
-            assert move_line.debit == 160.00, "Bank account has wrong entry."
-        elif move_line.amount_currency == -298.78:
-            assert move_line.credit == 149.39, "Debtor account has wrong entry."
+        if move_line.amount_currency == 200.0:
+            assert move_line.debit == 208.12, "Bank account has wrong entry."
+        elif move_line.amount_currency == -326.78:
+            assert move_line.credit == 191.74, "Debtor account has wrong entry."
         elif move_line.debit == 0.00 and move_line.credit == 0.00:
-            assert move_line.amount_currency == 98.78, "Incorrect Currency Difference, got %s as amount_currency (expected 98.78)." % (move_line.amount_currency)
+            assert move_line.amount_currency == 126.78, "Incorrect Currency Difference, got %s as amount_currency (expected 98.78)." % (move_line.amount_currency)
             assert move_line.currency_id.id == ref('base.CAD'), "Incorrect Currency Difference, got %s (expected 'CAD')" % (move_line.currency_id.name)
-        elif move_line.credit == 10.61:
-            assert move_line.amount_currency == -13.26, "Writeoff amount is wrong."
+        elif move_line.credit == 16.38:
+            assert move_line.amount_currency == -15.74, "Writeoff amount is wrong."
         else:
             assert False, "Wrong entry"
 -

=== modified file 'account_voucher/test/case5_suppl_usd_usd.yml'
--- account_voucher/test/case5_suppl_usd_usd.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case5_suppl_usd_usd.yml	2014-05-14 12:25:54 +0000
@@ -1,30 +1,30 @@
 -
-  In order to check the Account_voucher module with multi-currency in OpenERP, 
-  I create a supplier invoices in USD and make the payment in USD but with another exchange rate and with a write-off
+  In order to check the Account_voucher module with multi-currency in OpenERP,
+  I create a supplier invoices in EUR and make the payment in EUR but with another exchange rate and with a write-off
 -
   I create a cash account with currency USD
 -
-  !record {model: account.account, id: account_cash_usd_id2}:
-    currency_id: base.USD
-    name: "cash account in usd"
-    code: "Xcash usd2"
+  !record {model: account.account, id: account_cash_eur_id2}:
+    currency_id: base.EUR
+    name: "cash account in eur"
+    code: "Xcash eur2"
     type: 'liquidity'
     user_type: "account.data_account_type_cash"
 
 -
-  I create currency USD in OpenERP for November of 1.8 Rate
+  I create currency EUR in OpenERP for November of 0.9 Rate
 -
-  !record {model: res.currency.rate, id: nov_usd}:
-    currency_id: base.USD
+  !record {model: res.currency.rate, id: nov_eur}:
+    currency_id: base.EUR
     name: !eval "'%s-11-01' %(datetime.now().year)"
-    rate: 1.8
--
-  I create currency USD in OpenERP for December of 1.5 Rate
--
-  !record {model: res.currency.rate, id: dec_usd}:
-    currency_id: base.USD
+    rate: 0.9
+-
+  I create currency EUR in OpenERP for December of 0.8 Rate
+-
+  !record {model: res.currency.rate, id: dec_eur}:
+    currency_id: base.EUR
     name: !eval "'%s-12-01' %(datetime.now().year)"
-    rate: 1.5
+    rate: 0.8
 -
   I set the income and expense currency accounts on the main company
 -
@@ -35,7 +35,19 @@
       'expense_currency_exchange_account_id': ref('account.o_expense')}
     self.write(cr, uid, ref('base.main_company'), vals)
 -
-  I create a bank journal with EUR as currency
+  I create a bank journal with USD as currency
+-
+  !record {model: account.journal, id: bank_journal_USD}:
+    name: Bank Journal(USD)
+    code: BUSD
+    type: bank
+    analytic_journal_id: account.sit
+    sequence_id: account.sequence_bank_journal
+    default_debit_account_id: account.cash
+    default_credit_account_id: account.cash
+    company_id: base.main_company
+-
+  I create a bank journal with USD as currency
 -
   !record {model: account.journal, id: bank_journal_EUR}:
     name: Bank Journal(EUR)
@@ -43,21 +55,9 @@
     type: bank
     analytic_journal_id: account.sit
     sequence_id: account.sequence_bank_journal
-    default_debit_account_id: account.cash
-    default_credit_account_id: account.cash
-    company_id: base.main_company
--
-  I create a bank journal with USD as currency
--
-  !record {model: account.journal, id: bank_journal_USD}:
-    name: Bank Journal(USD)
-    code: BUSD
-    type: bank
-    analytic_journal_id: account.sit
-    sequence_id: account.sequence_bank_journal
-    default_debit_account_id: account_cash_usd_id2
-    default_credit_account_id: account_cash_usd_id2
-    currency: base.USD
+    default_debit_account_id: account_cash_eur_id2
+    default_credit_account_id: account_cash_eur_id2
+    currency: base.EUR
     company_id: base.main_company
 -
   I set the context as would do the action in supplier invoice menuitem
@@ -65,12 +65,12 @@
   !context
     'default_type': 'in_invoice'
 -
-  I create the invoice on 1st november for 1000 USD
+  I create the invoice on 1st november for 1000 EUR
 -
   !record {model: account.invoice, id: account_supplier_invoice_november, view: account.invoice_supplier_form}:
     account_id: account.a_pay
     company_id: base.main_company
-    currency_id: base.USD
+    currency_id: base.EUR
     date_invoice: !eval "'%s-11-01' %(datetime.now().year)"
     period_id: account.period_1
     invoice_line:
@@ -89,7 +89,7 @@
 -
   !workflow {model: account.invoice, action: invoice_open, ref: account_supplier_invoice_november}
 -
-  I check that first invoice move is correct for creditor account(debit - credit == -555.56)
+  I check that first invoice move is correct for creditor account(debit - credit == -1111.11)
 -
   !python {model: account.invoice}: |
     invoice_id = self.browse(cr, uid, ref("account_supplier_invoice_november"))
@@ -97,7 +97,7 @@
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
-    assert (move_line.debit - move_line.credit == -555.56), "Invoice move is incorrect for creditor account"
+    assert (move_line.debit - move_line.credit == -1111.11), "Invoice move is incorrect for creditor account"
     assert (move_line.amount_currency == -1000), "Amount currency is incorrect for creditor account"
 -
   I set the context that will be used for the encoding of all the vouchers of this file
@@ -105,13 +105,13 @@
   !context
     'type': 'payment'
 -
-  I create the voucher of payment with values $950, journal USD
+  I create the voucher of payment with values $950, journal EUR
 -
   !record {model: account.voucher, id: account_voucher_case_5_supplier_flow, view: view_vendor_payment_form}:
     account_id: account.cash
     amount: 950.0
     company_id: base.main_company
-    journal_id: bank_journal_USD
+    journal_id: bank_journal_EUR
     name: 'Payment: Case Basic SUPPLIER USD/USD'
     partner_id: base.res_partner_19
     period_id: account.period_12
@@ -151,24 +151,24 @@
 -
   I check that my creditor account is correct
 -
-  I check that the bank entry is -$950 and 633.33€ as amount_currency and credit, respectively.
--
-  I check that the creditor account has 1 new line with $1000 and 666.67€ as amount_currency and debit, respectively.
--
-  I check that my currency rate difference is correct (111.11€ in debit/credit with no amount_currency)
--
-  I check that my writeoff is correct. 33.34€ in credit with -$50 as amount currency
+  I check that the bank entry is -$950 and 1187.5€ as amount_currency and credit, respectively.
+-
+  I check that the creditor account has 1 new line with $1000 and 1250.0€ as amount_currency and debit, respectively.
+-
+  I check that my currency rate difference is correct (138.89€ in debit/credit with no amount_currency)
+-
+  I check that my writeoff is correct. 62.5€ in credit with -$50 as amount currency
 -
   !python {model: account.voucher}: |
     voucher_id = self.browse(cr, uid, ref('account_voucher_case_5_supplier_flow'))
     for move_line in voucher_id.move_id.line_id:
         if move_line.amount_currency == -950.00:
-            assert move_line.credit == 633.33, "Wrong bank entry."
-        elif move_line.credit == 111.11 or move_line.debit == 111.11:
+            assert move_line.credit == 1187.5, "Wrong bank entry."
+        elif move_line.credit == 138.89 or move_line.debit == 138.89:
             assert move_line.amount_currency == 0.00, "Incorrect Currency Difference."
-        elif move_line.credit == 33.34:
+        elif move_line.credit == 62.5:
             assert move_line.amount_currency == -50.0, "Writeoff amount is wrong."
-        elif move_line.debit == 666.67:
+        elif move_line.debit == 1250.0:
             assert move_line.amount_currency == 1000.0, "Wrong supplier entry."
         else:
             assert False, "Wrong entry. Unrecognized account move line"

=== renamed file 'account_voucher/test/case_eur_usd.yml' => 'account_voucher/test/case_usd_eur.yml'
--- account_voucher/test/case_eur_usd.yml	2013-10-27 12:31:04 +0000
+++ account_voucher/test/case_usd_eur.yml	2014-05-14 12:25:54 +0000
@@ -5,45 +5,45 @@
   !context
     uid: 'res_users_account_voucher_manager'
 -
-  In order to check the payment with multi-currency in OpenERP, 
-  I create an invoice in EUR and make payment in USD based on the currency rating.
+  In order to check the payment with multi-currency in OpenERP,
+  I create an invoice in USD and make payment in EUR based on the currency rating.
 -
-  I update the Currency USD in OpenERP for January with rate 1.200000
+  I update the Currency EUR in OpenERP for January with rate 1.400000
 -
   !python {model: res.currency.rate}: |
     from datetime import datetime
-    curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'USD')])[0]
+    curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'EUR')])[0]
     date = '%s-01-01' %(datetime.now().year)
     ids = self.search(cr, uid, [('currency_id','=',curr_id), ('name', '=', date)])
-    self.write(cr, uid, ids, {'rate': 1.200000})
--
-  I update the Currency USD in OpenERP for February with rate 1.400000
--
-  !record {model: res.currency.rate, id: feb_usd}:
-    currency_id: base.USD
+    self.write(cr, uid, ids, {'rate': 1.400000})
+-
+  I update the Currency EUR in OpenERP for February with rate 1.600000
+-
+  !record {model: res.currency.rate, id: feb_eur}:
+    currency_id: base.EUR
     name: !eval "'%s-02-01' %(datetime.now().year)"
-    rate: 1.400000
--
-  I create a bank account with USD as currency
--
-  !record {model: account.account, id: account_eur_usd_id}:
-    currency_id: base.USD
-    name: "Bank usd"
-    code: "BUSD"
+    rate: 1.600000
+-
+  I create a bank account with EUR as currency
+-
+  !record {model: account.account, id: account_usd_eur_id}:
+    currency_id: base.EUR
+    name: "Bank eur"
+    code: "BEUR"
     type: 'liquidity'
     user_type: account.data_account_type_asset
 -
-  I create a bank journal with USD as currency
+  I create a bank journal with EUR as currency
 -
-  !record {model: account.journal, id: bank_journal_USD1}:
-    name: Bank Journal Test(USD)
-    code: BEUSD
+  !record {model: account.journal, id: bank_journal_EUR1}:
+    name: Bank Journal Test(EUR)
+    code: BEEUR
     type: bank
     analytic_journal_id: account.sit
     sequence_id: account.sequence_bank_journal
-    default_debit_account_id: account_eur_usd_id
-    default_credit_account_id: account_eur_usd_id
-    currency: base.USD
+    default_debit_account_id: account_usd_eur_id
+    default_credit_account_id: account_usd_eur_id
+    currency: base.EUR
     company_id: base.main_company
 -
   On the first of January, I create an invoice of 1000€
@@ -51,7 +51,7 @@
   !record {model: account.invoice, id: account_invoice_eur_usd}:
     account_id: account.a_recv
     company_id: base.main_company
-    currency_id: base.EUR
+    currency_id: base.USD
     date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
     period_id: account.period_1
     invoice_line:
@@ -90,7 +90,7 @@
     account_id: account.cash
     amount: 1350.0
     company_id: base.main_company
-    journal_id: bank_journal_USD1
+    journal_id: bank_journal_EUR1
     name: 'payment: Case EUR/USD'
     partner_id: base.res_partner_19
     period_id: account.period_5
@@ -105,17 +105,17 @@
     data = []
     voucher = self.browse(cr, uid, ref('account_voucher_eur_usd_case'))
     for item in voucher.line_cr_ids:
-        if item.amount_unreconciled == 1400:
-            data += [(item.id, 1400)]
+        if item.amount_unreconciled == 1600:
+            data += [(item.id, 1600)]
     for line_id, amount in data:
         self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher.state=='draft'), "Voucher is not in draft state"
 -
-  I check that writeoff amount computed is -50.0
+  I check that writeoff amount computed is -250.0
 -
   !python {model: account.voucher}: |
     voucher = self.browse(cr, uid, ref('account_voucher_eur_usd_case'))
-    assert (voucher.writeoff_amount == -50.0), "Writeoff amount is not -50.0"
+    assert (voucher.writeoff_amount == -250.0), "Writeoff amount is not -250.0"
 -
   I confirm the voucher
 -
@@ -150,9 +150,9 @@
     voucher = self.browse(cr, uid, ref('account_voucher_eur_usd_case'))
     for move_line in voucher.move_ids:
         if move_line.amount_currency == 1350:
-            assert move_line.debit == 964.29,"debtor account is not correct"
-        if move_line.amount_currency == 50:
-            assert move_line.debit == 35.71,"write off bank account is not correct"
+            assert move_line.debit == 843.75,"debtor account is not correct"
+        if move_line.amount_currency == 250.0:
+            assert move_line.debit == 156.25,"write off bank account is not correct"
         if move_line.amount_currency == 0.0:
             assert move_line.credit == 1000,"total reconcile is not correct of invoice"
 -

=== modified file 'account_voucher/test/sales_payment.yml'
--- account_voucher/test/sales_payment.yml	2014-04-24 12:35:38 +0000
+++ account_voucher/test/sales_payment.yml	2014-05-14 12:25:54 +0000
@@ -9,7 +9,7 @@
   !record {model: account.invoice, id: account_invoice_0}:
     account_id: account.a_recv
     company_id: base.main_company
-    currency_id: base.EUR
+    currency_id: base.USD
     invoice_line:
       - account_id: account.a_sale
         name: '[PCSC234] PC Assemble SC234'
@@ -44,7 +44,7 @@
   !python {model: account.voucher}: |
     vals = {}
     journal_id = self.default_get(cr, uid, ['journal_id']).get('journal_id',None)
-    voucher = self.recompute_voucher_lines(cr, uid, [], ref("base.res_partner_19"), journal_id, 450.0, ref('base.EUR'), 'receipt', False)
+    voucher = self.recompute_voucher_lines(cr, uid, [], ref("base.res_partner_19"), journal_id, 450.0, ref('base.USD'), 'receipt', False)
     assert (voucher['value'].get('writeoff_amount') == 0.0), "Writeoff amount calculated by recompute_voucher_lines() is not 0.0"
     res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_19"), journal_id, 0.0, 1, ttype='receipt', date=False)
     vals = {

=== modified file 'multi_company/multi_company_demo.xml'
--- multi_company/multi_company_demo.xml	2014-05-07 18:29:17 +0000
+++ multi_company/multi_company_demo.xml	2014-05-14 12:25:54 +0000
@@ -53,7 +53,7 @@
         <record id="res_company_oerp_editor" model="res.company">
             <field name="partner_id" ref="res_partner_oerp_editor"/>
             <field name="parent_id" ref="base.main_company"/>
-            <field name="currency_id" ref="base.EUR"/>
+            <field name="currency_id" ref="base.USD"/>
             <field name="name">OpenERP Editor</field>
         </record>
         <record id="res_company_oerp_us" model="res.company">
@@ -71,13 +71,13 @@
         <record id="res_company_oerp_in" model="res.company">
             <field name="partner_id" ref="res_partner_oerp_in"/>
             <field name="parent_id" ref="res_company_oerp_editor"/>
-            <field name="currency_id" ref="base.EUR"/>
+            <field name="currency_id" ref="base.INR"/>
             <field name="name">OpenERP IN</field>
         </record>
         <record id="res_company_odoo" model="res.company">
             <field name="partner_id" ref="res_partner_odoo"/>
             <field name="parent_id" ref="base.main_company"/>
-            <field name="currency_id" ref="base.EUR"/>
+            <field name="currency_id" ref="base.USD"/>
             <field name="name">Odoo</field>
         </record>
 
@@ -407,7 +407,7 @@
         </record>
         <record id="project.project_project_5" model="project.project">
         <field name="company_id" ref="res_company_oerp_in"/>
-        <field name="currency_id" ref="base.EUR"/>
+        <field name="currency_id" ref="base.INR"/>
         </record>
 
         <record id="project.project_task_19" model="project.task">

=== modified file 'purchase/test/fifo_price.yml'
--- purchase/test/fifo_price.yml	2013-11-28 13:33:02 +0000
+++ purchase/test/fifo_price.yml	2014-05-14 12:25:54 +0000
@@ -144,7 +144,7 @@
   We will temporarily change the currency rate on the sixth of June to have the same results all year
 - 
   !record {model: res.currency.rate, id: base.rateUSDbis}:
-    rate: 1.2834
+    rate: 1.0000
     currency_id: base.USD
     name: !eval time.strftime('%Y-06-06')
 - 
@@ -220,10 +220,10 @@
     picking_obj = self.pool.get('stock.picking').browse(cr, uid, ref("outgoing_fifo_shipment_cur"))
     picking_obj.do_transfer(context=context)
 - 
-  Check rounded price is 102 euro (because last outgoing shipment was made of 19.5kg at 80€ and 30kg at $150 (rate=1.2834)
+  Check rounded price is 122.0 euro (because last outgoing shipment was made of 19.5kg at 80€ and 30kg at $150 (rate=1.0000)
 - 
   !python {model: product.product}: |
-    assert round(self.browse(cr, uid, ref("product_fifo_icecream")).standard_price) == 102, "Product price not updated accordingly. %s found instead of 102 (rounded values)" %(round(self.browse(cr, uid, ref("product_fifo_icecream")).standard_price),)
+    assert round(self.browse(cr, uid, ref("product_fifo_icecream")).standard_price) == 122.0, "Product price not updated accordingly. %s found instead of 102 (rounded values)" %(round(self.browse(cr, uid, ref("product_fifo_icecream")).standard_price),)
 - 
   Do a delivery of an extra 10 kg
 - 
@@ -252,11 +252,11 @@
     picking_obj = self.pool.get('stock.picking').browse(cr, uid, ref("outgoing_fifo_shipment_ret"))
     picking_obj.do_transfer(context=context)
 - 
-  Check rounded price is 150.0 / 1.2834
+  Check rounded price is 150.0 / 1.0000
 - 
   !python {model: product.product}: |
     product = self.browse(cr, uid, ref("product_fifo_icecream"))
-    assert round(product.standard_price) == round(150.0 / 1.2834), "Product price not updated accordingly. %s found instead of %s" %(product.standard_price, round(150.0/1.2834))
+    assert round(product.standard_price) == round(150.0 / 1.0000), "Product price not updated accordingly. %s found instead of %s" %(product.standard_price, round(150.0/1.0000))
     assert product.qty_available == 0.0, 'Wrong quantity in stock after first reception'
 - 
   Let us create some outs to get negative stock for a new product using the same config

=== modified file 'purchase/test/process/edi_purchase_order.yml'
--- purchase/test/process/edi_purchase_order.yml	2012-11-29 22:26:45 +0000
+++ purchase/test/process/edi_purchase_order.yml	2014-05-14 12:25:54 +0000
@@ -50,8 +50,8 @@
                 "__id": "base:724f9v70-dv70-1v70-8v70-701a04e25v70.EUR",
                 "__module": "base",
                 "__model": "res.currency",
-                "code": "EUR",
-                "symbol": "€",
+                "code": "USD",
+                "symbol": "$",
         },
         "date_order": "2011-09-13", 
         "partner_id": ["sale:724f9v70-dv70-1v70-8v70-701a04e25v70.res_partner_test22", "Junjun wala"],
@@ -118,7 +118,6 @@
     assert len(order_new.partner_id.bank_ids) == 1, "Expected 1 bank entry related to partner"
     bank_info = order_new.partner_id.bank_ids[0]
     assert bank_info.acc_number == "Guys bank: 123477777-156113", 'Expected "Guys bank: 123477777-156113", got %s' % bank_info.acc_number
-
     assert order_new.pricelist_id.name == 'Default Purchase Pricelist' , "Default Purchase Pricelist was not automatically assigned"
     assert order_new.amount_total == 350, "Amount total is not same"
     assert order_new.amount_untaxed == 350, "untaxed amount is not same"
@@ -151,8 +150,8 @@
                 "__id": "base:724f93ec-ddd0-11e0-88ec-701a04e25543.EUR",
                 "__module": "base",
                 "__model": "res.currency",
-                "code": "EUR",
-                "symbol": "€",
+                "code": "USD",
+                "symbol": "$",
         },  
         "date_order": "2011-09-13",
         "partner_id": ["sale:724f93ec-ddd0-11e0-88ec-701a04e25543.res_partner_test22", "Junjun wala"],
@@ -219,7 +218,6 @@
     assert len(order_new.partner_id.bank_ids) == 1, "Expected 1 bank entry related to partner"
     bank_info = order_new.partner_id.bank_ids[0]
     assert bank_info.acc_number == "Another bank: 123477700-156113", 'Expected "Another bank: 123477700-156113", got %s' % bank_info.acc_number
-
     assert order_new.pricelist_id.name == 'Default Purchase Pricelist' , "Default Purchase Pricelist was not automatically assigned"
     assert order_new.amount_total == 350, "Amount total is not same"
     assert order_new.amount_untaxed == 350, "untaxed amount is not same"
@@ -234,4 +232,4 @@
             assert purchase_line.price_unit == 20 , "unit price is not same, got %s, expected 20"%(purchase_line.price_unit,)
             assert purchase_line.product_qty == 10 , "product qty is not same"
         else:
-            raise AssertionError('unknown order line: %s' % purchase_line)
\ No newline at end of file
+            raise AssertionError('unknown order line: %s' % purchase_line)

=== modified file 'report_intrastat/test/report_intrastat_report.yml'
--- report_intrastat/test/report_intrastat_report.yml	2014-04-02 16:40:53 +0000
+++ report_intrastat/test/report_intrastat_report.yml	2014-05-14 12:25:54 +0000
@@ -2,7 +2,7 @@
   In order to test the PDF reports defined on an invoice, we will create a Invoice Record
 -
   !record {model: account.invoice, id: test_invoice_1}:
-    currency_id: base.EUR
+    currency_id: base.USD
     company_id: base.main_company
     partner_id: base.res_partner_1
     state: draft

=== modified file 'sale/test/edi_sale_order.yml'
--- sale/test/edi_sale_order.yml	2013-10-31 18:56:33 +0000
+++ sale/test/edi_sale_order.yml	2014-05-14 12:25:54 +0000
@@ -49,8 +49,8 @@
                 "__id": "base:5af12v70-dv70-1v70-bv70-701a04e25v70.EUR",
                 "__module": "base",
                 "__model": "res.currency",
-                "code": "EUR",
-                "symbol": "€",
+                "code": "USD",
+                "symbol": "$",
         },
         "company_id": ["base:5af12v70-dv70-1v70-bv70-701a04e25v70.main_company", "Client S.A."],
         "company_address": {
@@ -101,7 +101,6 @@
     assert len(order_new.partner_id.bank_ids) == 1, "Expected 1 bank entry related to partner"
     bank_info = order_new.partner_id.bank_ids[0]
     assert bank_info.acc_number == "Another bank: 032465700-156700", 'Expected "Another bank: 032465700-156700", got %s' % bank_info.acc_number
-
     assert order_new.pricelist_id.name == 'Public Pricelist' , "Public Price list was not automatically assigned"
     assert order_new.amount_total == 350, "Amount total is wrong"
     assert order_new.amount_untaxed == 350, "Untaxed amount is wrong"
@@ -135,8 +134,8 @@
                 "__id": "base:5af1272e-dd26-11e0-b65e-701a04e25543.EUR",
                 "__module": "base",
                 "__model": "res.currency",
-                "code": "EUR",
-                "symbol": "€",
+                "code": "USD",
+                "symbol": "$",
         },
         "company_id": ["base:5af1272e-dd26-11e0-b65e-701a04e25543.main_company", "Client S.A."],
         "company_address": {

=== modified file 'sale_crm/sale_crm_demo.xml'
--- sale_crm/sale_crm_demo.xml	2013-12-13 09:40:16 +0000
+++ sale_crm/sale_crm_demo.xml	2014-05-14 12:25:54 +0000
@@ -17,7 +17,7 @@
         <!-- Invoice for Direct Marketing -->
 
         <record id="test_crm_sale_invoice_1" model="account.invoice">
-            <field name="currency_id" ref="base.EUR"/>
+            <field name="currency_id" ref="base.USD"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="partner_id" ref="base.res_partner_1"/>
             <field name="journal_id" ref="account.sales_journal"/>
@@ -65,7 +65,7 @@
         <!-- Invoice for Indirect Marketing -->
 
         <record id="test_crm_sale_invoice_2" model="account.invoice">
-            <field name="currency_id" ref="base.EUR"/>
+            <field name="currency_id" ref="base.USD"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="partner_id" ref="base.res_partner_1"/>
             <field name="journal_id" ref="account.sales_journal"/>