From 7af4feb078a406244a990f6d4c02428b81416919 Mon Sep 17 00:00:00 2001
From: prro-odoo <prro@odoo.com>
Date: Mon, 5 Jul 2021 14:11:02 +0000
Subject: [PATCH] [FW][FIX] sale_project,sale_timesheet: display Sale Order
 button w/o need for Billable

Previously, the button Sale Order in a Project form could only be seen when the sale_timesheet module (installed automatically with the Timesheet, Sales and Project apps) is installed.
Now, only the Sales and Project apps are needed to be able to display the Sale Order button.

opw-2530161

closes odoo/odoo#74048

X-original-commit: 42fcb59373fda8c82b2402b5524160215553df68
Signed-off-by: Simon Goffin (sig) <sig@openerp.com>
Signed-off-by: prro-odoo <proose@users.noreply.github.com>
---
 addons/sale_project/models/project.py              | 13 +++++++++++++
 addons/sale_project/views/project_task_views.xml   |  9 +++++++++
 addons/sale_timesheet/models/project.py            | 12 ------------
 addons/sale_timesheet/views/project_task_views.xml |  7 -------
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/addons/sale_project/models/project.py b/addons/sale_project/models/project.py
index a10415efe77..32783704447 100644
--- a/addons/sale_project/models/project.py
+++ b/addons/sale_project/models/project.py
@@ -42,6 +42,19 @@ class Project(models.Model):
             overview.project_overview = True
         (self - overview).project_overview = False
 
+    def action_view_so(self):
+        self.ensure_one()
+        action_window = {
+            "type": "ir.actions.act_window",
+            "res_model": "sale.order",
+            "name": "Sales Order",
+            "views": [[False, "form"]],
+            "context": {"create": False, "show_sale": True},
+            "res_id": self.sale_order_id.id
+        }
+        return action_window
+
+
 class ProjectTask(models.Model):
     _inherit = "project.task"
 
diff --git a/addons/sale_project/views/project_task_views.xml b/addons/sale_project/views/project_task_views.xml
index 175887c0150..b941231bd8b 100644
--- a/addons/sale_project/views/project_task_views.xml
+++ b/addons/sale_project/views/project_task_views.xml
@@ -28,6 +28,15 @@
         <field name="model">project.project</field>
         <field name="inherit_id" ref="project.edit_project"/>
         <field name="arch" type="xml">
+            <xpath expr="//button[@name='%(project.act_project_project_2_project_task_all)d']" position="before">
+                <button class="d-none d-md-inline oe_stat_button"
+                        type="object" name="action_view_so" icon="fa-dollar"
+                        attrs="{'invisible': [('sale_order_id', '=', False)]}"
+                        string="Sales Order"
+                        groups="sales_team.group_sale_salesman_all_leads">
+                    <field name="sale_order_id" attrs="{'invisible': True}"/> 
+                </button>
+            </xpath>
             <xpath expr="//field[@name='partner_id']" position="attributes">
                 <attribute name="options">{'always_reload': True}</attribute>
                 <attribute name="context">{'res_partner_search_mode': 'customer'}</attribute>
diff --git a/addons/sale_timesheet/models/project.py b/addons/sale_timesheet/models/project.py
index cb0d8c6411e..4da21b2a440 100644
--- a/addons/sale_timesheet/models/project.py
+++ b/addons/sale_timesheet/models/project.py
@@ -241,18 +241,6 @@ class Project(models.Model):
             },
         }
 
-    def action_view_so(self):
-        self.ensure_one()
-        action_window = {
-            "type": "ir.actions.act_window",
-            "res_model": "sale.order",
-            "name": "Sales Order",
-            "views": [[False, "form"]],
-            "context": {"create": False, "show_sale": True},
-            "res_id": self.sale_order_id.id
-        }
-        return action_window
-
     # ----------------------------
     #  Project Updates
     # ----------------------------
diff --git a/addons/sale_timesheet/views/project_task_views.xml b/addons/sale_timesheet/views/project_task_views.xml
index 34a6ecc88da..1d9f588af7a 100644
--- a/addons/sale_timesheet/views/project_task_views.xml
+++ b/addons/sale_timesheet/views/project_task_views.xml
@@ -9,13 +9,6 @@
             <xpath expr="//button[@name='%(project.action_project_task_burndown_chart_report)d']" position="after">
                 <button string="Costs / Revenues" class="oe_stat_button" type="object" name="action_view_timesheet" icon="fa-puzzle-piece" attrs="{'invisible': [('allow_billable', '=', False)]}" groups="project.group_project_manager"/>
             </xpath>
-            <xpath expr="//button[@name='%(project.act_project_project_2_project_task_all)d']" position="before">
-                <button class="d-none d-md-inline oe_stat_button"
-                        type="object" name="action_view_so" icon="fa-dollar"
-                        attrs="{'invisible': ['|', ('allow_billable', '=', False), ('sale_order_id', '=', False)]}"
-                        string="Sales Order"
-                        groups="sales_team.group_sale_salesman_all_leads"/>
-            </xpath>
             <xpath expr="//header" position="inside">
                 <button name="action_make_billable" string="Create Sales Order" type="object" attrs="{'invisible': [('display_create_order', '=', False)]}" groups="sales_team.group_sale_salesman"/>
             </xpath>