From 81f94e1d65dec33a72aa3c06405e02876ed176c1 Mon Sep 17 00:00:00 2001
From: "Nicolas (vin)" <vin@odoo.com>
Date: Tue, 8 Feb 2022 13:29:42 +0000
Subject: [PATCH] [IMP] account: improve discount fields in move view

As of now, the discount field is either only shown in
debug mode or if the sale module is installed and a
setting is set in sale.
This field should be shown in the view, and not depend
on a setting from another app.
This is especially true as it could be filled by the ocr
or when uploading from an edi, and it would be inconsistent
if the user couldn't display it.

Task id #2758965

closes odoo/odoo#85737

X-original-commit: eb1a77753debdb034ad00ce10d908f4b9ee264ad
Signed-off-by: Josse Colpaert <jco@odoo.com>
Signed-off-by: Nicolas Viseur <vin@odoo.com>
---
 addons/account/views/account_move_views.xml | 2 +-
 addons/sale/views/account_views.xml         | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml
index d204f65b7a1..8e8772de425 100644
--- a/addons/account/views/account_move_views.xml
+++ b/addons/account/views/account_move_views.xml
@@ -1026,7 +1026,7 @@
                                                 <field name="quantity"/>
                                                 <field name="product_uom_id" groups="uom.group_uom"/>
                                                 <field name="price_unit"/>
-                                                <field name="discount" groups="product.group_discount_per_so_line"/>
+                                                <field name="discount" string="Disc.%"/>
                                                 <field name="currency_id" invisible="1"/>
                                             </group>
                                             <group>
diff --git a/addons/sale/views/account_views.xml b/addons/sale/views/account_views.xml
index 503ac00249d..db7aa2796f7 100644
--- a/addons/sale/views/account_views.xml
+++ b/addons/sale/views/account_views.xml
@@ -31,9 +31,6 @@
         <field name="model">account.move</field>
         <field name="inherit_id" ref="account.view_move_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='invoice_line_ids']//field[@name='discount']" position="attributes">
-                <attribute name="groups">product.group_discount_per_so_line</attribute>
-            </xpath>
             <xpath expr="//group[@name='sale_info_group']/field[@name='invoice_user_id']" position="after">
                 <field name="team_id" kanban_view_ref="%(sales_team.crm_team_view_kanban)s"/>
             </xpath>