From a745194e45764b7010bbc38bf670fa3517f0fdd4 Mon Sep 17 00:00:00 2001
From: Vincent Larcin <vila@odoo.com>
Date: Fri, 9 Jun 2023 09:30:53 +0200
Subject: [PATCH] [IMP] sale_{project,timesheet}: move project SOL to
 sale_project

This commit moves the "Sales Order Line" field in the project form view from `sale_timesheet` to `sale_project`,
as the field itself is introduced in `sale_project`

Task-3278895
---
 .../sale_project/views/project_task_views.xml | 24 +++++++++++++++++++
 .../views/project_task_views.xml              |  4 ----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/addons/sale_project/views/project_task_views.xml b/addons/sale_project/views/project_task_views.xml
index 469a1d0e97c..b6e111ae102 100644
--- a/addons/sale_project/views/project_task_views.xml
+++ b/addons/sale_project/views/project_task_views.xml
@@ -125,6 +125,30 @@
                     </div>
                 </group>
             </xpath>
+            <xpath expr="//page[@name='settings']//field[@name='analytic_account_id']" position="before">
+                <field name="sale_line_id"
+                    groups="!sales_team.group_sale_salesman"
+                    options="{'no_create': True, 'no_edit': True, 'delete': False, 'no_open': True}"
+                    attrs="{
+                        'invisible': [
+                            '|',
+                                ('allow_billable', '=', False),
+                                ('partner_id', '=', False),
+                        ],
+                    }"
+                />
+                <field name="sale_line_id"
+                    groups="sales_team.group_sale_salesman"
+                    options="{'no_create': True, 'no_edit': True, 'delete': False}"
+                    attrs="{
+                        'invisible': [
+                            '|',
+                                ('allow_billable', '=', False),
+                                ('partner_id', '=', False),
+                        ],
+                    }"
+                />
+            </xpath>
         </field>
     </record>
 
diff --git a/addons/sale_timesheet/views/project_task_views.xml b/addons/sale_timesheet/views/project_task_views.xml
index 257bd6500c5..0d8d68d49f6 100644
--- a/addons/sale_timesheet/views/project_task_views.xml
+++ b/addons/sale_timesheet/views/project_task_views.xml
@@ -12,10 +12,6 @@
             <xpath expr="//button[@name='action_view_sos'][2]" position="attributes">
                 <attribute name="context">{'create_for_project_id': active_id, 'default_project_id': active_id, 'default_partner_id': partner_id, 'default_analytic_account_id': analytic_account_id}</attribute>
             </xpath>
-            <xpath expr="//page[@name='settings']//field[@name='analytic_account_id']" position="before">
-                <field name="sale_line_id" groups="!sales_team.group_sale_salesman" options="{'no_create': True, 'no_edit': True, 'delete': False, 'no_open': True}" attrs="{'invisible': ['|', ('allow_billable', '=', False), ('partner_id', '=', False)]}"/>
-                <field name="sale_line_id" groups="sales_team.group_sale_salesman" options="{'no_create': True, 'no_edit': True, 'delete': False}" attrs="{'invisible': ['|', ('allow_billable', '=', False), ('partner_id', '=', False)]}"/>
-            </xpath>
             <xpath expr="//page[@name='settings']" position="after">
                 <page name="billing_employee_rate" string="Invoicing" attrs="{'invisible': ['|', ('allow_billable', '=', False), ('partner_id', '=', False)]}">
                     <field name="sale_line_employee_ids" context="{'default_sale_line_id': sale_line_id}">