From b6e0f1ad59e8a6b1b5a2b3a899466fafd8c339dc Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Tue, 20 Mar 2018 15:28:24 +0100
Subject: [PATCH] [FIX] sale,sale_payment: remove implicit dependency of `sale`
 on `payment` module

This worked by accident only because `payment` module is auto-installed
when `account` is installed.

opw-1829812
---
 addons/sale/views/res_config_settings_views.xml |  3 ---
 addons/sale_payment/__manifest__.py             |  1 +
 addons/sale_payment/views/settings.xml          | 15 +++++++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 addons/sale_payment/views/settings.xml

diff --git a/addons/sale/views/res_config_settings_views.xml b/addons/sale/views/res_config_settings_views.xml
index 651c9cf5909..feac0835056 100644
--- a/addons/sale/views/res_config_settings_views.xml
+++ b/addons/sale/views/res_config_settings_views.xml
@@ -169,9 +169,6 @@
                                         <field name="portal_confirmation_options" class="o_light_label" widget="radio"
                                             attrs="{'required': [('portal_confirmation', '=', True)]}"/>
                                     </div>
-                                <div attrs="{'invisible': [('portal_confirmation_options', '!=', 'pay')]}">
-                                    <button name='%(payment.action_payment_acquirer)d' icon="fa-arrow-right" type="action" string="Payment Acquirers" class="btn-link"/>
-                                </div>
                                 </div>
                             </div>
                         </div>
diff --git a/addons/sale_payment/__manifest__.py b/addons/sale_payment/__manifest__.py
index 02916e3cbf3..bb53a6f1e82 100644
--- a/addons/sale_payment/__manifest__.py
+++ b/addons/sale_payment/__manifest__.py
@@ -20,6 +20,7 @@ Provide tools for sale-related payment
         'views/crm_team_views.xml',
         'views/sale_order_views.xml',
         'views/sale_portal_templates.xml',
+        'views/settings.xml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/sale_payment/views/settings.xml b/addons/sale_payment/views/settings.xml
new file mode 100644
index 00000000000..a0379056a6f
--- /dev/null
+++ b/addons/sale_payment/views/settings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+  <record id="res_config_settings_view_form" model="ir.ui.view">
+    <field name="name">res.config.settings.view.form.inherit.sale_payment</field>
+    <field name="model">res.config.settings</field>
+    <field name="inherit_id" ref="sale.res_config_settings_view_form" />
+    <field name="arch" type="xml">
+      <xpath expr="//field[@name='portal_confirmation_options']/.." position="after">
+        <div attrs="{'invisible': [('portal_confirmation_options', '!=', 'pay')]}">
+          <button name='%(payment.action_payment_acquirer)d' icon="fa-arrow-right" type="action" string="Payment Acquirers" class="btn-link"/>
+        </div>
+      </xpath>
+    </field>
+  </record>
+</odoo>