From 61e4290aea8521864f116f4df1b9ccbd34307fce Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Wed, 4 Jan 2017 13:44:56 +0100
Subject: [PATCH] [IMP] account: Apply some fine tunings on new account
 settings form

---
 addons/account/models/res_config.py                 |  4 ----
 addons/account/views/res_config_view.xml            |  2 +-
 addons/account_accountant/models/res_config.py      |  6 ++++--
 addons/account_accountant/views/res_config_view.xml | 12 ++++++++++++
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/addons/account/models/res_config.py b/addons/account/models/res_config.py
index 1d4b0cc6d95..dea258f4350 100644
--- a/addons/account/models/res_config.py
+++ b/addons/account/models/res_config.py
@@ -36,10 +36,6 @@ class AccountConfigSettings(models.TransientModel):
         implied_group='account.group_proforma_invoices',
         help="Allows you to put invoices in pro-forma state.")
     module_account_reports_followup = fields.Boolean("Enable payment followup management")
-    tax_cash_basis_journal_id = fields.Many2one(
-        'account.journal',
-        related='company_id.tax_cash_basis_journal_id',
-        string="Tax Cash Basis Journal",)
     default_sale_tax_id = fields.Many2one('account.tax', string="Default Sale Tax",
         default_model="account.config.settings", company_dependent=True, oldname="default_sale_tax")
     default_purchase_tax_id = fields.Many2one('account.tax', string="Default Purchase Tax",
diff --git a/addons/account/views/res_config_view.xml b/addons/account/views/res_config_view.xml
index 06b971b087a..e8387537fc0 100644
--- a/addons/account/views/res_config_view.xml
+++ b/addons/account/views/res_config_view.xml
@@ -233,7 +233,7 @@
                                 <div class="o_setting_left_pane">
                                     <field name="module_account_sepa" class="oe_inline" widget="upgrade_boolean"/>
                                 </div>
-                                <div class="o_setting_right_pane">
+                                <div class="o_setting_right_pane" name="sepa_right_pane">
                                     <label string="SEPA Payments" for="module_account_sepa"/>
                                     <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/>
                                     <div class="text-muted">
diff --git a/addons/account_accountant/models/res_config.py b/addons/account_accountant/models/res_config.py
index f1d93c46e26..c3824c62bf2 100644
--- a/addons/account_accountant/models/res_config.py
+++ b/addons/account_accountant/models/res_config.py
@@ -27,5 +27,7 @@ class AccountConfigSettings(models.TransientModel):
         related='company_id.transfer_account_id',
         domain=lambda self: [('reconcile', '=', True), ('user_type_id.id', '=', self.env.ref('account.data_account_type_current_assets').id)],
         help="Intermediary account used when moving money from a liquidity account to another")
-    module_account_tax_cash_basis = fields.Boolean(string="Allow Tax Cash Basis",
-                                        help='Generate tax cash basis entrie when reconciliating entries')
+    tax_cash_basis_journal_id = fields.Many2one(
+        'account.journal',
+        related='company_id.tax_cash_basis_journal_id',
+        string="Tax Cash Basis Journal",)
diff --git a/addons/account_accountant/views/res_config_view.xml b/addons/account_accountant/views/res_config_view.xml
index f0c1b34a219..dff65902427 100644
--- a/addons/account_accountant/views/res_config_view.xml
+++ b/addons/account_accountant/views/res_config_view.xml
@@ -60,6 +60,18 @@
                     </div>
                 </div>
             </div>
+            <div id="eu_service" position="after">
+                <div class="col-xs-12 col-md-6 o_setting_box">
+                    <div class="o_setting_left_pane"/>
+                    <div class="o_setting_right_pane">
+                        <label for="id" string="Cash Basis"/>
+                        <div class="text-muted">
+                            Declare taxes at payment date.
+                        </div>
+                        <field name="tax_cash_basis_journal_id"/>
+                    </div>
+                </div>
+            </div>
             <div id="analytic" position="after">
                 <h2>Automated Entries</h2>
                 <div class="row mt16 o_settings_container" id="recommended_apps">