Merge lp:~elbati/account-consolidation/account_parallel_currency_7_tests into lp:~account-core-editors/account-consolidation/7.0

[Lorenzo Battistini]

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

This merge proposal target branch is lp:~elbati/account-consolidation/adding_account_parallel_currency_7

If your intention is to merge both branches in lp:account-consolidation/7.0 respecting the right order, the correct way would have been to create this merge proposal against lp:account-consolidation/7.0 but to set lp:~elbati/account-consolidation/adding_account_parallel_currency_7 in the 'prerequisite branch'.

Can you resubmit this merge in this manner please?

review: Needs Resubmitting

[Lorenzo Battistini (elbati)]

On 04/02/2013 11:41 AM, Guewen Baconnier @ Camptocamp wrote:
> Review: Resubmit
>
> This merge proposal target branch is lp:~elbati/account-consolidation/adding_account_parallel_currency_7
>
> If your intention is to merge both branches in lp:account-consolidation/7.0 respecting the right order, the correct way would have been to create this merge proposal against lp:account-consolidation/7.0 but to set lp:~elbati/account-consolidation/adding_account_parallel_currency_7 in the 'prerequisite branch'.

Thank you Guewen

Unmerged revisions

=== modified file 'account_parallel_currency/__init__.py'
--- account_parallel_currency/__init__.py	2013-04-02 17:40:33 +0000
+++ account_parallel_currency/__init__.py	2013-04-02 17:40:33 +0000
@@ -21,4 +21,3 @@
 import account
 import res_company
 import wizard
-import res_user

=== modified file 'account_parallel_currency/__openerp__.py'
--- account_parallel_currency/__openerp__.py	2013-04-02 17:40:33 +0000
+++ account_parallel_currency/__openerp__.py	2013-04-02 17:40:33 +0000
@@ -32,7 +32,7 @@
 A 'Parallel Account Mapping' wizard is provided. It is intended to be run when the same chart of account is used for the parallel companies. It allows to automatically map the 'master' account to 'parallel' accounts, based on account code.
 
 When posting new journal entries, the system checks the configured parallel accounts and automatically generates the parallel entries.
-For each user, it is possible to configure a 'parallel user' (that should be associated to a dummy parent company), used to carry out the parallel registrations. This allows to keep the companies separate, so that users of the master company don't see secondary company data (e.g. currencies and journals) but the system uses his parallel user in order to perform the parallel registrations.
+This is achieved keeping the companies separate, so that users of the master company don't see secondary company data (e.g. currencies and journals) but the system uses the super user in order to perform the parallel registrations.
 """,
     'author': 'Agile Business Group',
     'website': 'http://www.agilebg.com',
@@ -42,10 +42,15 @@
         'account_view.xml',
         'company_view.xml',
         'wizard/do_mapping.xml',
-        'user_view.xml',
         'security/security.xml',
         ],
-    "demo" : [],
+    "demo" : [
+        'account_demo.xml',
+        ],
+    'test': [
+        'test/mapping_parallel_accounts.yml',
+        'test/customer_invoice.yml',
+        ],
     "active": False,
     "installable": True
 }

=== modified file 'account_parallel_currency/account.py'
--- account_parallel_currency/account.py	2013-04-02 17:40:33 +0000
+++ account_parallel_currency/account.py	2013-04-02 17:40:33 +0000
@@ -127,7 +127,7 @@
     
     def button_cancel(self, cr, uid, ids, context=None):
         res = super(account_move, self).button_cancel(cr, uid, ids, context=context)
-        for move in self.browse(cr, uid, ids, context=context):
+        for move in self.browse(cr, SUPERUSER_ID, ids, context=context):
             for parallel_move in move.parallel_move_ids:
                 parallel_move.button_cancel(context=context)
                 parallel_move.unlink(context=context)
@@ -184,9 +184,7 @@
         curr_pool = self.pool.get('res.currency')
         user_pool = self.pool.get('res.users')
         company_pool = self.pool.get('res.company')
-        user = user_pool.browse(cr, uid, uid, context=context)
-        if user.parallel_user_id:
-            uid = user.parallel_user_id.id
+        uid = SUPERUSER_ID
         for move in self.browse(cr, uid, ids, context=context):
             if move.state == 'posted':
                 new_move_lines = []
@@ -246,27 +244,31 @@
                             parallel_sec_curr_iso_code = line.company_id.currency_id.name
                             amount = line.debit or ( - line.credit)
                             
-                        # search parallel currency by ISO code and parallel company
-                        parallel_secondary_curr_ids = curr_pool.search(cr, uid, [
-                            ('name', '=', parallel_sec_curr_iso_code),
-                            ('company_id', '=', parallel_account.company_id.id),
-                            ], context=context)
-                            
-                        if len(parallel_secondary_curr_ids) == 0:
-                            raise orm.except_orm(_('Error !'), _('Currency %s does not exist in company %s !')
-                                % (parallel_sec_curr_iso_code, parallel_account.company_id.name))
-                        if len(parallel_secondary_curr_ids) > 1:
-                            raise orm.except_orm(_('Error !'), _('Too many currencies %s for company %s !')
-                                % (parallel_sec_curr_iso_code, parallel_account.company_id.name))
-                        
-                        # compute parallel base amount from document currency, using move date
-                        context.update({'date': line.date})
-                        parallel_base_amount = curr_pool.compute(cr, uid, parallel_secondary_curr_ids[0],
-                            parallel_account.company_id.currency_id.id, amount,
-                            context=context)
-                            
-                        new_line_values['amount_currency'] = amount or False
-                        new_line_values['currency_id'] = parallel_secondary_curr_ids[0]
+                        parallel_base_amount = amount
+                        if parallel_sec_curr_iso_code != parallel_account.company_id.currency_id.name:
+                            # only if parallel company currency is != master move currency
+                            # search parallel currency by ISO code and parallel company
+                            parallel_secondary_curr_ids = curr_pool.search(cr, uid, [
+                                ('name', '=', parallel_sec_curr_iso_code),
+                                ('company_id', '=', parallel_account.company_id.id),
+                                ], context=context)
+                                
+                            if len(parallel_secondary_curr_ids) == 0:
+                                raise orm.except_orm(_('Error !'), _('Currency %s does not exist in company %s !')
+                                    % (parallel_sec_curr_iso_code, parallel_account.company_id.name))
+                            if len(parallel_secondary_curr_ids) > 1:
+                                raise orm.except_orm(_('Error !'), _('Too many currencies %s for company %s !')
+                                    % (parallel_sec_curr_iso_code, parallel_account.company_id.name))
+                            
+                            # compute parallel base amount from document currency, using move date
+                            context.update({'date': line.date})
+                            parallel_base_amount = curr_pool.compute(cr, uid, parallel_secondary_curr_ids[0],
+                                parallel_account.company_id.currency_id.id, amount,
+                                context=context)
+                            
+                            new_line_values['amount_currency'] = amount
+                            new_line_values['currency_id'] = parallel_secondary_curr_ids[0]
+                            
                         new_line_values['debit'] = 0.0
                         new_line_values['credit'] = 0.0
                         if parallel_base_amount > 0:

=== added file 'account_parallel_currency/account_demo.xml'
--- account_parallel_currency/account_demo.xml	1970-01-01 00:00:00 +0000
+++ account_parallel_currency/account_demo.xml	2013-04-02 17:40:33 +0000
@@ -0,0 +1,504 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--
+        Parallel company
+        -->    
+        
+        <record id="parallel_company" model="res.company">
+            <field name="name" >Parallel company</field>
+            <field name="currency_id" ref="base.CHF"></field>
+        </record>
+        
+        <record id="base.main_company" model="res.company">
+            <field name="parallel_company_ids" eval="[(6,0,[ref('parallel_company')])]"></field>
+        </record>
+        
+        <!--
+        currencies
+        -->
+        
+        <record id="USD" model="res.currency">
+            <field name="name">USD</field>
+            <field name="symbol">$</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="position">before</field>
+            <field name="company_id" ref="parallel_company"/>
+        </record>
+        <record id="rateUSD" model="res.currency.rate">
+            <field name="rate">1.2834</field>
+            <field name="currency_id" ref="USD"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+        <record id="CHF" model="res.currency">
+            <field name="name">CHF</field>
+            <field name="symbol">CHF</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="parallel_company"/>
+        </record>
+        <record id="rateCHF" model="res.currency.rate">
+            <field name="rate">1.3086</field>
+            <field name="currency_id" ref="CHF"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
+        <record id="EUR" model="res.currency">
+            <field name="name">EUR</field>
+            <field name="symbol">€</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="parallel_company"/>
+        </record>
+        <record id="rateEUR" model="res.currency.rate">
+            <field name="currency_id" ref="EUR" />
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+            <field name="rate">1.0</field>
+        </record>
+        
+        <!--
+        Journal
+        -->
+        
+        <record id="parallel_sales_journal" model="account.journal">
+            <field name="name">Parallel Sales Journal - (test)</field>
+            <field name="code">PSAJ</field>
+            <field name="type">sale</field>
+            <field name="company_id" ref="parallel_company"/>
+        </record>
+        <record id="account.sales_journal" model="account.journal">
+            <field name="parallel_journal_ids" eval="[(6,0,[ref('parallel_sales_journal')])]"></field>
+        </record>
+        
+        <!--
+        Fiscal year
+        -->    
+        
+        <record id="data_fiscalyear" model="account.fiscalyear">
+            <field eval="'Fiscal Year X '+time.strftime('%Y')" name="name"/>
+            <field eval="'FY'+time.strftime('%Y')" name="code"/>
+            <field eval="time.strftime('%Y')+'-01-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-12-31'" name="date_stop"/>
+            <field name="company_id" ref="parallel_company"/>
+        </record>
+        
+        <!--
+        Fiscal Periods
+        -->    
+        
+        <record id="period_1" model="account.period">
+            <field eval="'01/'+time.strftime('%Y')" name="code"/>
+            <field eval="'X 01/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
+            <field name="fiscalyear_id" ref="data_fiscalyear"/>
+            <field eval="time.strftime('%Y')+'-01-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-01-31'" name="date_stop"/>
+            <field name="company_id" ref="parallel_company"/>
+        </record>
+        <record id="period_2" model="account.period">
+            <field eval="'02/'+time.strftime('%Y')" name="code"/>
+            <field eval="'X 02/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
+            <field name="fiscalyear_id" ref="data_fiscalyear"/>
+            <field eval="time.strftime('%Y')+'-02-01'" name="date_start"/>
+            <!-- for the last day of February, we have to compute the day before March 1st -->
+            <field eval="(DateTime.today().replace(month=3, day=1) - timedelta(days=1)).strftime('%Y-%m-%d')" name="date_stop"/>
+            <field name="company_id" ref="parallel_company"/>
+        </record>
+        <record id="period_3" model="account.period">
+            <field eval="'03/'+time.strftime('%Y')" name="code"/>
+            <field eval="'X 03/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
+            <field name="fiscalyear_id" ref="data_fiscalyear"/>
+            <field eval="time.strftime('%Y')+'-03-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-03-31'" name="date_stop"/>
+            <field name="company_id" ref="parallel_company"/>
+        </record>
+        <record id="period_4" model="account.period">
+            <field eval="'04/'+time.strftime('%Y')" name="code"/>
+            <field eval="'X 04/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
+            <field name="fiscalyear_id" ref="data_fiscalyear"/>
+            <field eval="time.strftime('%Y')+'-04-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-04-30'" name="date_stop"/>
+            <field name="company_id" ref="parallel_company"/>
+        </record>
+        <record id="period_5" model="account.period">
+            <field eval="'05/'+time.strftime('%Y')" name="code"/>
+            <field eval="'X 05/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
+            <field name="fiscalyear_id" ref="data_fiscalyear"/>
+            <field eval="time.strftime('%Y')+'-05-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-05-31'" name="date_stop"/>
+            <field name="company_id" ref="parallel_company"/>
+        </record>
+        <record id="period_6" model="account.period">
+            <field eval="'06/'+time.strftime('%Y')" name="code"/>
+            <field eval="'X 06/'+time.strftime('%Y')" name="name"/>
+            <field name="fiscalyear_id" ref="data_fiscalyear"/>
+            <field eval="True" name="special"/>
+            <field eval="time.strftime('%Y')+'-06-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-06-30'" name="date_stop"/>
+            <field name="company_id" ref="parallel_company"/>
+        </record>
+        <record id="period_7" model="account.period">
+            <field eval="'07/'+time.strftime('%Y')" name="code"/>
+            <field eval="'X 07/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
+            <field name="fiscalyear_id" ref="data_fiscalyear"/>
+            <field eval="time.strftime('%Y')+'-07-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-07-31'" name="date_stop"/>
+            <field name="company_id" ref="parallel_company"/>
+        </record>
+        <record id="period_8" model="account.period">
+            <field eval="'08/'+time.strftime('%Y')" name="code"/>
+            <field eval="'X 08/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
+            <field name="fiscalyear_id" ref="data_fiscalyear"/>
+            <field eval="time.strftime('%Y')+'-08-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-08-31'" name="date_stop"/>
+            <field name="company_id" ref="parallel_company"/>
+        </record>
+        <record id="period_9" model="account.period">
+            <field eval="'09/'+time.strftime('%Y')" name="code"/>
+            <field eval="'X 09/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
+            <field name="fiscalyear_id" ref="data_fiscalyear"/>
+            <field eval="time.strftime('%Y')+'-09-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-09-30'" name="date_stop"/>
+            <field name="company_id" ref="parallel_company"/>
+        </record>
+        <record id="period_10" model="account.period">
+            <field eval="'10/'+time.strftime('%Y')" name="code"/>
+            <field eval="'X 10/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
+            <field name="fiscalyear_id" ref="data_fiscalyear"/>
+            <field eval="time.strftime('%Y')+'-10-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-10-31'" name="date_stop"/>
+            <field name="company_id" ref="parallel_company"/>
+        </record>
+        <record id="period_11" model="account.period">
+            <field eval="'11/'+time.strftime('%Y')" name="code"/>
+            <field eval="'X 11/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
+            <field name="fiscalyear_id" ref="data_fiscalyear"/>
+            <field eval="time.strftime('%Y')+'-11-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-11-30'" name="date_stop"/>
+            <field name="company_id" ref="parallel_company"/>
+        </record>
+        <record id="period_12" model="account.period">
+            <field eval="'12/'+time.strftime('%Y')" name="code"/>
+            <field eval="'X 12/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
+            <field name="fiscalyear_id" ref="data_fiscalyear"/>
+            <field eval="time.strftime('%Y')+'-12-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-12-31'" name="date_stop"/>
+            <field name="company_id" ref="parallel_company"/>
+        </record>
+        
+        <!--
+        Chart of Accounts
+        -->
+
+        <record id="chart0" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X0</field>
+            <field name="name">Chart For Automated Tests</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_view"/>
+        </record>
+
+        <!-- Balance Sheet -->
+
+        <record id="bal" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X1</field>
+            <field name="name">Balance Sheet - (test)</field>
+            <field ref="chart0" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_view"/>
+        </record>
+
+        <record model="account.account" id="assets_view">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="name">Assets - (test)</field>
+            <field name="code">X10</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="bal"/>
+        </record>
+
+        <record id="fas" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X100</field>
+            <field name="name">Fixed Assets - (test)</field>
+            <field ref="assets_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+        </record>
+
+        <record id="xfa" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X1000</field>
+            <field name="name">Fixed Asset Account - (test)</field>
+            <field ref="fas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+        </record>
+
+        <record id="nca" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X101</field>
+            <field name="name">Net Current Assets - (test)</field>
+            <field ref="assets_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+        </record>
+
+        <record id="cas" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X1100</field>
+            <field name="name">Current Assets - (test)</field>
+            <field ref="nca" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+        </record>
+
+        <record id="stk" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X11001</field>
+            <field name="name">Purchased Stocks - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+        </record>
+
+        <record id="a_recv" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X11002</field>
+            <field name="name">Debtors - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">receivable</field>
+            <field eval="True" name="reconcile"/>
+            <field name="user_type" ref="account.data_account_type_receivable"/>
+        </record>
+
+        <record id="ova" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X11003</field>
+            <field name="name">Output VAT - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+        </record>
+
+        <record id="bnk" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X11004</field>
+            <field name="name">Bank Current Account - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+        </record>
+
+        <record id="cash" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X11005</field>
+            <field name="name">Cash - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+        </record>
+
+        <record id="o_income" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X11006</field>
+            <field name="name">Opening Income - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+        </record>
+        <record id="usd_bnk" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X11007</field>
+            <field name="name">USD Bank Account - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+            <field name="currency_id" ref="base.USD"/>
+        </record>
+
+        <record model="account.account" id="liabilities_view">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="name">Liabilities - (test)</field>
+            <field name="code">X11</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="bal"/>
+        </record>
+
+        <record id="cli" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X110</field>
+            <field name="name">Current Liabilities - (test)</field>
+            <field ref="liabilities_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+        </record>
+
+        <record id="a_pay" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X1111</field>
+            <field name="name">Creditors - (test)</field>
+            <field ref="cli" name="parent_id"/>
+            <field name="type">payable</field>
+            <field eval="True" name="reconcile"/>
+            <field name="user_type" ref="account.data_account_type_payable"/>
+        </record>
+
+        <record id="iva" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X1112</field>
+            <field name="name">Input VAT - (test)</field>
+            <field ref="cli" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+        </record>
+
+        <record id="rsa" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X1113</field>
+            <field name="name">Reserve and Profit/Loss - (test)</field>
+            <field ref="cli" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+        </record>
+
+        <record id="o_expense" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X1114</field>
+            <field name="name">Opening Expense - (test)</field>
+            <field ref="cli" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+        </record>
+
+        <!-- Profit and Loss -->
+
+        <record id="gpf" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X2</field>
+            <field name="name">Profit and Loss - (test)</field>
+            <field ref="chart0" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_view"/>
+        </record>
+
+        <record model="account.account" id="income_view">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="name">Income - (test)</field>
+            <field name="code">X20</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="gpf"/>
+        </record>
+
+        <record model="account.account" id="income_fx_income">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="name">Foreign Exchange Gain - (test)</field>
+            <field name="code">X201</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="income_view"/>
+        </record>
+
+        <record id="rev" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X200</field>
+            <field name="name">Revenue - (test)</field>
+            <field ref="income_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+        </record>
+
+        <record id="a_sale" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X2001</field>
+            <field name="name">Product Sales - (test)</field>
+            <field ref="rev" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+        </record>
+
+        <record model="account.account" id="expense_view">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="name">Expense - (test)</field>
+            <field name="code">X21</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="gpf"/>
+        </record>
+
+
+        <record id="cos" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X210</field>
+            <field name="name">Cost of Sales - (test)</field>
+            <field ref="expense_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+        </record>
+
+        <record id="cog" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X2100</field>
+            <field name="name">Cost of Goods Sold - (test)</field>
+            <field ref="cos" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+        </record>
+
+        <record id="ovr" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X211</field>
+            <field name="name">Overheads - (test)</field>
+            <field ref="expense_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+        </record>
+
+        <record id="a_expense" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X2110</field>
+            <field name="name">Expenses - (test)</field>
+            <field ref="ovr" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+        </record>
+
+        <record model="account.account" id="income_fx_expense">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="name">Foreign Exchange Loss - (test)</field>
+            <field name="code">X2111</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="ovr"/>
+        </record>
+
+        <record id="a_salary_expense" model="account.account">
+            <field name="company_id" ref="parallel_company"/>
+            <field name="code">X2112</field>
+            <field name="name">Salary Expenses - (test)</field>
+            <field ref="ovr" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+        </record>
+    </data>
+</openerp>

=== removed file 'account_parallel_currency/res_user.py'
--- account_parallel_currency/res_user.py	2013-04-02 17:40:33 +0000
+++ account_parallel_currency/res_user.py	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    Copyright (C) 2012-2013 Agile Business Group sagl
-#    (<http://www.agilebg.com>)
-#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published
-#    by the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import fields, orm
-from osv import fields
-
-class res_users(orm.Model):
-    _inherit = "res.users"
-
-    _columns = {
-        'parallel_user_id':fields.many2one('res.users', 'Parallel User', help="Used for parallel registration. Associate it to a dummy parent company"),
-    }

=== added directory 'account_parallel_currency/test'
=== added file 'account_parallel_currency/test/customer_invoice.yml'
--- account_parallel_currency/test/customer_invoice.yml	1970-01-01 00:00:00 +0000
+++ account_parallel_currency/test/customer_invoice.yml	2013-04-02 17:40:33 +0000
@@ -0,0 +1,138 @@
+-
+  In order to test account invoice I create a new customer invoice
+-
+  I will create bank detail
+-
+  !record {model: res.partner.bank, id: res_partner_bank_0}:
+    state: bank
+    company_id: base.main_company
+    partner_id: base.main_partner
+    acc_number: 123456789
+    footer: True
+    bank: base.res_bank_1
+    bank_name: Reserve
+-
+  I create a customer invoice
+-
+  !record {model: account.invoice, id: account_invoice_customer0, view: account.invoice_form}:
+    payment_term: account.account_payment_term_advance
+    partner_bank_id: res_partner_bank_0
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_3
+    reference_type: none
+    name: 'Test Customer Invoice'
+    invoice_line:
+      - product_id: product.product_product_5
+        quantity: 10.0
+-
+  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)
+    invoice_tax_line = {
+        'name':  'Test Tax for Customer Invoice',
+        'manual': 1,
+        'base': base_amt['value']['base_amount'],
+        'amount': amt['value']['tax_amount'],
+        'account_id': ref('account.ova'),
+        'invoice_id': ref("account_invoice_customer0"),
+        }
+    tax = self.create(cr, uid, invoice_tax_line)
+    assert tax, "Tax has not been assigned correctly"
+
+-
+  I check that Initially customer invoice is in the "Draft" state
+-
+  !assert {model: account.invoice, id: account_invoice_customer0}:
+    - state == 'draft'
+-
+  I confirm invoice by clicking on validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_customer0}
+-
+  I check that the invoice state is "Open"
+-
+  !assert {model: account.invoice, id: account_invoice_customer0}:
+    - state == 'open'
+
+-
+  I check moves attached to the invoice
+-
+  !python {model: account.invoice}: |
+    acc_id=self.browse(cr, uid, ref("account_invoice_customer0"))
+    assert acc_id.move_id, "Move not created for open invoice"
+    assert acc_id.move_id.parallel_move_ids, "Parallel move not created for open invoice"
+    for parallel_move in acc_id.move_id.parallel_move_ids:
+        for line in parallel_move.line_id:
+            if line.account_id.id == ref("a_sale"):
+                assert line.credit == 11777.40, "CHF Product Sales must be 11777.40"
+                assert line.amount_currency == -9000.0, "EUR Product Sales must be -9000.0"
+                assert line.currency_id.id == ref("EUR"), "Secondary currency must be EUR"
+
+-
+  I create a customer CHF invoice
+-
+  !record {model: account.invoice, id: account_invoice_customer1, view: account.invoice_form}:
+    partner_bank_id: res_partner_bank_0
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_3
+    reference_type: none
+    name: 'Test Customer CHF Invoice'
+    currency_id: base.CHF
+    invoice_line:
+      - product_id: product.product_product_5
+        quantity: 1.0
+        price_unit: 100.0
+
+-
+  I confirm invoice by clicking on validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_customer1}
+
+-
+  I check moves attached to the invoice
+-
+  !python {model: account.invoice}: |
+    acc_id=self.browse(cr, uid, ref("account_invoice_customer1"))
+    assert acc_id.move_id, "Move not created for open invoice"
+    assert acc_id.move_id.parallel_move_ids, "Parallel move not created for open invoice"
+    for parallel_move in acc_id.move_id.parallel_move_ids:
+        for line in parallel_move.line_id:
+            if line.account_id.id == ref("a_sale"):
+                assert line.credit == 100.0, "CHF Product Sales must be 100.0"
+                assert not line.amount_currency, "amount_currency must be empty"
+                assert not line.currency_id, "currency_id must be empty"
+
+-
+  I create a customer USD invoice
+-
+  !record {model: account.invoice, id: account_invoice_customer2, view: account.invoice_form}:
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_3
+    reference_type: none
+    name: 'Test Customer USD Invoice'
+    currency_id: base.USD
+    invoice_line:
+      - product_id: product.product_product_5
+        quantity: 1.0
+        price_unit: 100.0
+
+-
+  I confirm invoice by clicking on validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_customer2}
+
+-
+  I check moves attached to the invoice
+-
+  !python {model: account.invoice}: |
+    acc_id=self.browse(cr, uid, ref("account_invoice_customer2"))
+    assert acc_id.move_id, "Move not created for open invoice"
+    assert acc_id.move_id.parallel_move_ids, "Parallel move not created for open invoice"
+    for parallel_move in acc_id.move_id.parallel_move_ids:
+        for line in parallel_move.line_id:
+            if line.account_id.id == ref("a_sale"):
+                assert line.credit == 101.96, "USD Product Sales must be 101.96"
+                assert line.amount_currency == -100.0, "USD Product Sales must be -100.0"
+                assert line.currency_id.id == ref("USD"), "Secondary currency must be USD"

=== added file 'account_parallel_currency/test/mapping_parallel_accounts.yml'
--- account_parallel_currency/test/mapping_parallel_accounts.yml	1970-01-01 00:00:00 +0000
+++ account_parallel_currency/test/mapping_parallel_accounts.yml	2013-04-02 17:40:33 +0000
@@ -0,0 +1,11 @@
+-
+  I create the mapping wizard
+-
+  !record {model: account.parallel.mapping, id: account_parallel_mapping_0}:
+    remove_old_mapping: True
+
+-
+  I click on do mapping
+-
+  !python {model: account.parallel.mapping}: |
+    self.do_mapping(cr, uid, [ref("account_parallel_mapping_0")])

=== removed file 'account_parallel_currency/user_view.xml'
--- account_parallel_currency/user_view.xml	2013-04-02 17:40:33 +0000
+++ account_parallel_currency/user_view.xml	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <record id="view_users_form" model="ir.ui.view">
-            <field name="name">res.users.form</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form"></field>
-            <field name="arch" type="xml">
-                <page string="Access Rights" position="inside">
-                    <group string="Parallel Currency" groups="base.group_multi_company">
-                        <field name="parallel_user_id" />
-                    </group>
-                </page>
-            </field>
-        </record>
-    </data>
-</openerp>