From 97eff5b68b78f3fc77c586bbce15d523b7c826ec Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@odoo.com>
Date: Fri, 24 Aug 2018 16:09:40 +0200
Subject: [PATCH] [FIX] account: usability in account.journal form view

---
 addons/account/views/account_view.xml                | 12 ++++++------
 .../views/account_journal_views.xml                  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index 66712742be1..a68202630cd 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -335,6 +335,11 @@
                             </page>
                             <page name="advanced_settings" string="Advanced Settings">
                                 <group>
+                                    <group string="Control-Access" groups="base.group_no_one">
+                                        <div class="text-muted" colspan="2">Keep empty for no control</div>
+                                        <field name="type_control_ids" widget="many2many_tags"/>
+                                        <field name="account_control_ids" widget="many2many_tags"/>
+                                    </group>
                                     <group string="Payment Method Types" attrs="{'invisible': [('type', 'not in', ['bank', 'cash'])]}">
                                         <field name="inbound_payment_method_ids" widget="many2many_checkboxes"/>
                                         <field name="outbound_payment_method_ids" widget="many2many_checkboxes"/>
@@ -355,12 +360,7 @@
                                         </div>
                                         <div class="content-group" attrs="{'invisible': [('alias_domain', '!=', False)]}">
                                             <a type='action' name='%(action_open_settings)d' class="btn btn-link" role="button"><i class="fa fa-fw o_button_icon fa-arrow-right"/> Configure Email Servers</a>
-                                    </div>
-                                    </group>
-                                    <group string="Control-Access" groups="base.group_no_one">
-                                        <div class="text-muted" colspan="2">Keep empty for no control</div>
-                                        <field name="type_control_ids" widget="many2many_tags"/>
-                                        <field name="account_control_ids" widget="many2many_tags"/>
+                                        </div>
                                     </group>
                                 </group>
                             </page>
diff --git a/addons/account_check_printing/views/account_journal_views.xml b/addons/account_check_printing/views/account_journal_views.xml
index 2bb5ad31f47..105be343746 100644
--- a/addons/account_check_printing/views/account_journal_views.xml
+++ b/addons/account_check_printing/views/account_journal_views.xml
@@ -27,7 +27,7 @@
             <field name="inherit_id" ref="account.view_account_journal_form" />
             <field name="arch" type="xml">
                 <xpath expr="//page[@name='advanced_settings']/group" position="inside">
-                    <group string="Check Printing" attrs="{'invisible': [('check_printing_payment_method_selected', '=', False)]}">
+                    <group string="Check Printing" attrs="{'invisible': ['|', ('type', '!=', 'bank'), ('check_printing_payment_method_selected', '=', False)]}">
                         <field name="check_printing_payment_method_selected" invisible="1"/>
                         <field name="check_sequence_id" invisible="1"/>
                         <field name="check_manual_sequencing"/>