From e9049570ee698c56211a23f6aabd5cd72ac2aa34 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Fri, 6 Jul 2018 19:33:35 +0200
Subject: [PATCH] Add search on supplier on product search view

Move margin fields to sale order line form view (instead of tree view)
---
 sale_margin_no_onchange/sale.py       |  2 +-
 sale_margin_no_onchange/sale_view.xml | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/sale_margin_no_onchange/sale.py b/sale_margin_no_onchange/sale.py
index a4cc439..1d9663d 100644
--- a/sale_margin_no_onchange/sale.py
+++ b/sale_margin_no_onchange/sale.py
@@ -33,7 +33,7 @@ class SaleOrderLine(models.Model):
         string='Margin in Company Currency', readonly=True, store=True,
         compute='_compute_margin', currency_field='company_currency_id')
     margin_rate = fields.Float(
-        string="Margin (%)", readonly=True, store=True,
+        string="Margin Rate", readonly=True, store=True,
         compute='_compute_margin',
         digits=(16, 2), help="Margin rate in percentage of the sale price")
 
diff --git a/sale_margin_no_onchange/sale_view.xml b/sale_margin_no_onchange/sale_view.xml
index 69536ff..a1825d1 100644
--- a/sale_margin_no_onchange/sale_view.xml
+++ b/sale_margin_no_onchange/sale_view.xml
@@ -20,13 +20,17 @@
                 groups="account.group_account_user"/>
             <field name="company_currency_id" invisible="1"/>
         </field>
-        <xpath expr="//field[@name='order_line']/tree/field[@name='price_subtotal']" position="after">
-            <field name="standard_price_sale_currency" groups="base.group_no_one" string="Cost Price Sale Cur."/>
-            <field name="standard_price_company_currency" groups="base.group_no_one" string="Cost Price Comp. Cur."/>
-            <field name="margin_sale_currency" groups="base.group_no_one" string="Margin Sale Cur."/>
-            <field name="margin_company_currency" groups="base.group_no_one" string="Margin Comp. Cur."/>
-            <field name="margin_rate" groups="base.group_no_one"/>
+        <xpath expr="//field[@name='order_line']/form//field[@name='analytic_tag_ids']/.." position="after">
+            <field name="standard_price_sale_currency" groups="base.group_no_one"/>
+            <field name="standard_price_company_currency" groups="base.group_no_one"/>
+            <field name="margin_sale_currency" groups="base.group_no_one"/>
+            <field name="margin_company_currency" groups="base.group_no_one"/>
+            <label for="margin_rate"/>
+            <div name="margin_rate">
+                <field name="margin_rate" groups="base.group_no_one" class="oe_inline"/> %
+            </div>
             <field name="company_currency_id" invisible="1"/>
+            <field name="currency_id" invisible="1"/>
         </xpath>
     </field>
 </record>