diff --git a/addons/website_sale/views/res_config_settings_views.xml b/addons/website_sale/views/res_config_settings_views.xml
index 6127270874d..f98d1c2fc3f 100644
--- a/addons/website_sale/views/res_config_settings_views.xml
+++ b/addons/website_sale/views/res_config_settings_views.xml
@@ -304,32 +304,32 @@
                     </div>
                 </div>
 
-                <h2>Invoicing</h2>
-                <div class="row mt16 o_settings_container" id="sale_invoicing_settings">
-                   <div class="col-xs-12 col-md-6 o_setting_box" id="invoicing_policy_setting" title="The mode selected here applies as invoicing policy of any new product created but not of products already existing.">
-                        <div class="o_setting_left_pane">
-                            <field name="module_account_invoicing" nolabel="1"/>
-                        </div>
-                        <div class="o_setting_right_pane">
-                            <label for="module_account_invoicing"/>
-                            <div class="text-muted">
-                                Issue invoices to customers
-                            </div>
-                            <div class="content-group" attrs="{'invisible': [('module_account_invoicing', '=', False)]}">
-                                <div class="mt16">
-                                    <field name="default_invoice_policy" class="o_light_label" widget="radio"/>
+                <field name='module_account_invoicing' invisible="1"/>
+                <div attrs="{'invisible': [('module_account_invoicing', '=', False)]}">
+                    <h2>Invoicing</h2>
+                    <div class="row mt16 o_settings_container" id="sale_invoicing_settings">
+                       <div class="col-xs-12 col-md-6 o_setting_box" id="invoicing_policy_setting" title="The mode selected here applies as invoicing policy of any new product created but not of products already existing.">
+                            <div class="o_setting_right_pane">
+                                <label string="Invoicing Policy"/>
+                                <div class="text-muted">
+                                    Issue invoices to customers
+                                </div>
+                                <div class="content-group">
+                                    <div class="mt16">
+                                        <field name="default_invoice_policy" class="o_light_label" widget="radio"/>
+                                    </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="col-xs-12 col-md-6 o_setting_box" attrs="{'invisible': ['|', ('default_invoice_policy', '=', 'delivery'), ('module_account_invoicing', '=', False)]}">
-                        <div class="o_setting_left_pane">
-                            <field name="automatic_invoice" nolabel="1"/>
-                        </div>
-                        <div class="o_setting_right_pane">
-                            <label for="automatic_invoice"/>
-                            <div class="text-muted">
-                                Generate the invoice automatically when the order is confirmed
+                        <div class="col-xs-12 col-md-6 o_setting_box" attrs="{'invisible': [('default_invoice_policy', '=', 'delivery')]}">
+                            <div class="o_setting_left_pane">
+                                <field name="automatic_invoice" nolabel="1"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label for="automatic_invoice"/>
+                                <div class="text-muted">
+                                    Generate the invoice automatically when the order is confirmed
+                                </div>
                             </div>
                         </div>
                     </div>