From eea4d6ee73f953dd6ccd93f5bfe7e12b0856fada Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 15 Oct 2012 15:50:27 +0200
Subject: [PATCH] [IMP] account, account_voucher: moved some fields from
 res.company to accounting settings + removed duplicated fields (in company
 form view AND accounting settings)

bzr revid: qdp-launchpad@openerp.com-20121015135027-fbapd9h06gtixpep
---
 addons/account/company_view.xml               | 12 ---------
 addons/account/res_config_view.xml            |  2 +-
 addons/account_voucher/account_voucher.py     | 15 +++++++++++
 .../account_voucher/account_voucher_view.xml  | 25 ++++++++++++-------
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 73eb450ac2f..d5ab6d7753a 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -15,17 +15,5 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_company_inherit_1_form">
-            <field name="name">res.company.form.inherit</field>
-            <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="model">res.company</field>
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='account_grp']" position="inside">
-                    <field name="tax_calculation_rounding_method"/>
-                    <field name="paypal_account"  placeholder="e.g. sales@openerp.com"/>
-                </xpath>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 0e4b1fa64c4..728eefe8078 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -121,7 +121,7 @@
                         </div>
                         <label for="id" string="Features"/>
                         <div>
-                            <div>
+                            <div name="group_multi_currency">
                                 <field name="group_multi_currency" class="oe_inline"/>
                                 <label for="group_multi_currency"/>
                             </div>
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index f97f3f6af3c..648576443a0 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -42,6 +42,21 @@ class res_company(osv.osv):
 
 res_company()
 
+class account_config_settings(osv.osv_memory):
+    _inherit = 'account.config.settings'
+    _columns = {
+        'income_currency_exchange_account_id': fields.related(
+            'company_id', 'income_currency_exchange_account_id',
+            type='many2one',
+            relation='account.account',
+            string="Gain Exchange Rate Account"),
+        'expense_currency_exchange_account_id': fields.related(
+            'company_id', 'expense_currency_exchange_account_id',
+            type="many2one",
+            relation='account.account',
+            string="Loss Exchange Rate Account"),
+    }
+
 class account_voucher(osv.osv):
     def _check_paid(self, cr, uid, ids, name, args, context=None):
         res = {}
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index f8bab444453..4b02d697982 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -249,16 +249,23 @@
             </field>
         </record>
 
-        <!-- res.company form view -->
-        <record model="ir.ui.view" id="view_company_inherit_currency_xchange_form">
-            <field name="name">res.company.form.inherit</field>
-            <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="model">res.company</field>
+        <!-- res.config form view -->
+        <record model="ir.ui.view" id="view_account_settings_currency_xchange_form">
+            <field name="name">account.config.settings.inherit</field>
+            <field name="inherit_id" ref="account.view_account_config_settings"/>
+            <field name="model">account.config.settings</field>
+            <field name="priority">20</field>
             <field name="arch" type="xml">
-                <field name="currency_id" position="after">
-                      <field name="income_currency_exchange_account_id"/>
-                      <field name="expense_currency_exchange_account_id"/>
-                </field>
+                <xpath expr="//div[@name='group_multi_currency']" position="after">
+                    <group attrs="{'invisible': [('group_multi_currency', '&lt;&gt;', True)]}" col="2">
+                        <group>
+                            <field name="income_currency_exchange_account_id"/>
+                            <field name="expense_currency_exchange_account_id"/>
+                        </group>
+                        <group>
+                        </group>
+                    </group>
+                </xpath>
             </field>
         </record>