From 0a617dc0cb20bfde6b6113d82cdc8781e9c7f423 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 1 Aug 2022 14:23:59 +0000
Subject: [PATCH] [IMP] sale_project: merge milestone salesman attributes view
 in its base

Part-of: odoo/odoo#98551
---
 .../sale_project/views/project_task_views.xml | 35 ++++++++-----------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/addons/sale_project/views/project_task_views.xml b/addons/sale_project/views/project_task_views.xml
index 16a27e81712..9fb9ad05cd3 100644
--- a/addons/sale_project/views/project_task_views.xml
+++ b/addons/sale_project/views/project_task_views.xml
@@ -181,8 +181,10 @@
             <xpath expr="//field[@name='name']" position="after">
                 <field name="project_partner_id" invisible="1"/>
                 <field name="allow_billable" invisible="1"/>
-                <field name="sale_line_id" optional="hide" options="{'no_open': True}" readonly="1"/>
-                <field name="quantity_percentage" optional="hide" widget="percentage" readonly="1"/>
+                <field name="sale_line_id" optional="hide" options="{'no_open': True}" readonly="1" groups="!sales_team.group_sale_salesman"/>
+                <field name="sale_line_id" optional="hide" options="{'no_create': True}" groups="sales_team.group_sale_salesman"/>
+                <field name="quantity_percentage" optional="hide" widget="percentage" readonly="1" groups="!sales_team.group_sale_salesman"/>
+                <field name="quantity_percentage" optional="hide" widget="percentage" groups="sales_team.group_sale_salesman"/>
             </xpath>
         </field>
     </record>
@@ -193,28 +195,19 @@
         <field name="inherit_id" ref="sale_project.project_milestone_view_tree"/>
         <field name="mode">primary</field>
         <field name="arch" type="xml">
-            <field name="sale_line_id" position="attributes">
+            <xpath expr="//field[@name='sale_line_id'][1]" position="attributes">
                 <attribute name="optional">show</attribute>
-            </field>
-            <field name="quantity_percentage" position="attributes">
+            </xpath>
+            <xpath expr="//field[@name='sale_line_id'][2]" position="attributes">
                 <attribute name="optional">show</attribute>
-            </field>
+            </xpath>
+            <xpath expr="//field[@name='quantity_percentage'][1]" position="attributes">
+                <attribute name="optional">show</attribute>
+            </xpath>
+            <xpath expr="//field[@name='quantity_percentage'][2]" position="attributes">
+                <attribute name="optional">show</attribute>
+            </xpath>
         </field>
     </record>
 
-    <record id="project_milestone_view_tree_salesman" model="ir.ui.view">
-        <field name="name">project.milestone.view.tree.inherit.salesman</field>
-        <field name="model">project.milestone</field>
-        <field name="inherit_id" ref="project_milestone_view_tree"/>
-        <field name="groups_id" eval="[Command.link(ref('sales_team.group_sale_salesman'))]"/>
-        <field name="arch" type="xml">
-            <field name="sale_line_id" position="attributes">
-                <attribute name="options">{'no_create': True}</attribute>
-                <attribute name="readonly">0</attribute>
-            </field>
-            <field name="quantity_percentage" position="attributes">
-                <attribute name="readonly">0</attribute>
-            </field>
-        </field>
-    </record>
 </odoo>