From aae74a8d08a0d1c8a0c94130b5ed78a57d3178a5 Mon Sep 17 00:00:00 2001
From: Kaylie Kipe <kaylie@hibou.io>
Date: Tue, 11 Jul 2023 21:46:22 +0000
Subject: [PATCH 1/2] [IMP] sale_sourced_by_line: Added optional="hide"
 attribute to sale order views

---
 sale_sourced_by_line/views/sale_views.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sale_sourced_by_line/views/sale_views.xml b/sale_sourced_by_line/views/sale_views.xml
index 20e76f52..4785e951 100644
--- a/sale_sourced_by_line/views/sale_views.xml
+++ b/sale_sourced_by_line/views/sale_views.xml
@@ -10,8 +10,8 @@
                 <field name="warehouse_id"/>
             </xpath>
             <xpath expr="//field[@name='order_line']/tree/field[@name='route_id']" position="before">
-                <field name="date_planned"/>
-                <field name="warehouse_id"/>
+                <field name="date_planned" optional="hide"/>
+                <field name="warehouse_id" optional="hide"/>
             </xpath>
             <xpath expr="//label[@for='commitment_date']" position="before">
                 <field name="date_planned" />

From bb88a2dc1d83423d93c4250ec8b76ccc6bd156ce Mon Sep 17 00:00:00 2001
From: Salomon Chambi <salomon@hibou.pe>
Date: Mon, 31 Jul 2023 22:57:33 +0000
Subject: [PATCH 2/2] [IMP] account_invoice_margin: show margin and margin % in
 the same line

---
 account_invoice_margin/models/account_invoice.py       | 2 +-
 account_invoice_margin/views/account_invoice_views.xml | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/account_invoice_margin/models/account_invoice.py b/account_invoice_margin/models/account_invoice.py
index c3eafb13..edd2e3a7 100644
--- a/account_invoice_margin/models/account_invoice.py
+++ b/account_invoice_margin/models/account_invoice.py
@@ -5,7 +5,7 @@ class AccountMoveLine(models.Model):
     _inherit = "account.move.line"
 
     margin = fields.Monetary(compute='_compute_product_margin', digits='Product Price', store=True,
-                             groups='base.group_user')
+                             string='Margin', groups='base.group_user')
     margin_percent = fields.Float(compute='_compute_product_margin', store=True, string='Margin (%)',
                                   groups='base.group_user')
     purchase_price = fields.Monetary(string='Cost', digits='Product Price',
diff --git a/account_invoice_margin/views/account_invoice_views.xml b/account_invoice_margin/views/account_invoice_views.xml
index 89729da0..39aabe22 100644
--- a/account_invoice_margin/views/account_invoice_views.xml
+++ b/account_invoice_margin/views/account_invoice_views.xml
@@ -7,8 +7,9 @@
         <field name="inherit_id" ref="account.view_move_form"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='amount_residual']" position="after">
-                <field name="margin" groups="base.group_user"/>
-                <span class="oe_inline" groups="base.group_user">
+                <span class="oe_inline oe_right" groups="base.group_user" colspan="2">
+                    <span>Margin:</span>
+                    <field name="margin" class="oe_inline"/>
                     (<field name="margin_percent" nolabel="1" class="oe_inline" widget="percentage"/>)
                 </span>
             </xpath>