From 3b87ef6ddad67b4bd7f51dbf5c2eb982fa4330e4 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Tue, 22 Sep 2015 13:19:38 +0200
Subject: [PATCH] [FIX] product_*,website_sale: wrong template inheritance

In v8, some fields were added for the product.pricelist formview by
template inheritance : after the active field. For v9, this active
field was moved in a button_box button (archive stat_button), so the
added fields (inheritance) landed in the stat_button too.
---
 addons/product/pricelist_view.xml                        | 4 +---
 .../product_visible_discount_view.xml                    | 9 ++-------
 addons/website_sale/views/views.xml                      | 2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index a2660631fc3..db191649c61 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -124,9 +124,7 @@
                             </button>
                         </div>
                         <div class="oe_title">
-                            <h1>
-                                <field name="name" placeholder="e.g. USD Retailers"/>
-                            </h1>
+                            <h1><field name="name" placeholder="e.g. USD Retailers"/></h1>
                         </div>
                         <group>
                             <field name="currency_id" groups="base.group_multi_currency"/>
diff --git a/addons/product_visible_discount/product_visible_discount_view.xml b/addons/product_visible_discount/product_visible_discount_view.xml
index f2356722da4..0db34d64703 100644
--- a/addons/product_visible_discount/product_visible_discount_view.xml
+++ b/addons/product_visible_discount/product_visible_discount_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-
         <!-- Product price list -->
         <record model="ir.ui.view" id="product_pricelist_view_tree">
             <field name="name">product.pricelist.tree</field>
@@ -19,14 +18,10 @@
             <field name="model">product.pricelist</field>
             <field name="inherit_id" ref="product.product_pricelist_view"/>
             <field name="arch" type="xml">
-                <field name="active" position="after">
-                    <label for="discount_policy" groups="sale.group_discount_per_so_line"/>
-                        <div groups="sale.group_discount_per_so_line">
-                            <field name="discount_policy" class="oe_inline" widget="radio" />
-                        </div>
+                <field name="currency_id" position="before">
+                    <field name="discount_policy" groups="sale.group_discount_per_so_line" widget="radio"/>
                 </field>
             </field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/website_sale/views/views.xml b/addons/website_sale/views/views.xml
index 71f39b12297..1285d4a1c31 100644
--- a/addons/website_sale/views/views.xml
+++ b/addons/website_sale/views/views.xml
@@ -5,7 +5,7 @@
         <field name="model">product.pricelist</field>
         <field name="inherit_id" ref="product.product_pricelist_view"/>
         <field name="arch" type="xml">
-            <field name="active" position="after">
+            <field name="currency_id" position="before">
                 <field name="code"/>
             </field>
         </field>