From de33a4193c1a7ee36a8db92d08a2d5ab4e6de664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Mon, 17 Jul 2017 13:28:07 +0200
Subject: [PATCH] [FIX] (website_)payment: display website_published field of
 acquirers in payment

As this field is defined directly in payment and is displayed on
acquirer form view let us display it in tree view also directly
in payment instead of website payment.

This is a manual forward-port of commit 5f24bf5df795a2d3cec40be8a68f9a3b1ce824e6.
---
 addons/payment/views/payment_views.xml               |  1 +
 .../website_payment/views/website_payment_view.xml   | 12 ------------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/addons/payment/views/payment_views.xml b/addons/payment/views/payment_views.xml
index adcf9a0716d..82606809f5d 100644
--- a/addons/payment/views/payment_views.xml
+++ b/addons/payment/views/payment_views.xml
@@ -169,6 +169,7 @@
                     <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="provider"/>
+                    <field name="website_published"/>
                     <field name="environment"/>
                 </tree>
             </field>
diff --git a/addons/website_payment/views/website_payment_view.xml b/addons/website_payment/views/website_payment_view.xml
index 173de1fcd66..fda8ad6386b 100644
--- a/addons/website_payment/views/website_payment_view.xml
+++ b/addons/website_payment/views/website_payment_view.xml
@@ -18,17 +18,5 @@
                 </xpath>
             </field>
         </record>
-
-        <record id="acquirer_list_published" model="ir.ui.view">
-            <field name="name">payment.acquirer.tree.published</field>
-            <field name="model">payment.acquirer</field>
-            <field name="inherit_id" ref="payment.acquirer_list"/>
-            <field name="arch" type="xml">
-                <field name="provider" position="after">
-                    <field name="website_published"/>
-                </field>
-            </field>
-        </record>
-
     </data>
 </odoo>