From 51fa29dabdc70e5ad6dde03f2a566a390d08a9d0 Mon Sep 17 00:00:00 2001
From: "Xavier Bol (xbo)" <xbo@odoo.com>
Date: Mon, 24 Jul 2023 10:50:41 +0000
Subject: [PATCH] [FIX] sale_{project,timesheet}: display allow_billable in
 sale_project

Before this commit, when `sale_project` module is installed and not
`sale_timesheet` module, `allow_billable` field is displayed in
Settings tab in form view of project but not in the form view
simplified. In the simplified one, `allow_billable` field is  only
displayed when `sale_timesheet` is installed.

This commit displays `allow_billable` field in form view simplified
of `project.project` when `sale_project` is installed to be coherent
with the main form view.

closes odoo/odoo#129584

X-original-commit: ae203aa3cccc1187197ff0be98a884ca8ce6d6d1
Related: odoo/enterprise#44566
Related: odoo/upgrade#4975
Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
---
 addons/sale_project/views/project_views.xml   | 20 +++++++++++++++++++
 .../views/project_task_views.xml              | 19 ------------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/addons/sale_project/views/project_views.xml b/addons/sale_project/views/project_views.xml
index 1cad9a2f5df..1a1a1cad6df 100644
--- a/addons/sale_project/views/project_views.xml
+++ b/addons/sale_project/views/project_views.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+    <record id="project_project_view_form_simplified_inherit" model="ir.ui.view">
+        <field name="name">project.project.view.form.simplified.inherit</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.project_project_view_form_simplified"/>
+        <field name="priority">25</field>
+        <field name="arch" type="xml">
+            <xpath expr="//div[hasclass('o_settings_container')]" position="inside">
+                <field name="company_id" invisible="1"/>
+                <setting class="col-lg-12" help="Invoice your time and material to customers" invisible="context.get('hide_allow_billable', False)">
+                    <field name="allow_billable"/>
+                    <div attrs="{'invisible': [('allow_billable', '=', False)]}">
+                        <label for="partner_id"/>
+                        <field name="partner_id" class="ms-1" widget="res_partner_many2one" context="{'res_partner_search_mode': 'customer'}"
+                            options="{'no_create_edit': True, 'no_open': True}" placeholder="Select who to bill..."/>
+                    </div>
+                </setting>
+            </xpath>
+        </field>
+    </record>
+
     <record id="project.open_view_project_all_config" model="ir.actions.act_window">
         <field name="context">{'default_allow_billable': True, 'sale_show_partner_name': True}</field>
     </record>
diff --git a/addons/sale_timesheet/views/project_task_views.xml b/addons/sale_timesheet/views/project_task_views.xml
index a2ad25bcd2c..3810cd32591 100644
--- a/addons/sale_timesheet/views/project_task_views.xml
+++ b/addons/sale_timesheet/views/project_task_views.xml
@@ -45,25 +45,6 @@
         </field>
     </record>
 
-    <record id="project_project_view_form_simplified_inherit" model="ir.ui.view">
-        <field name="name">project.project.view.form.simplified.inherit</field>
-        <field name="model">project.project</field>
-        <field name="inherit_id" ref="hr_timesheet.project_project_view_form_simplified_inherit_timesheet"/>
-        <field name="arch" type="xml">
-            <xpath expr="//div[hasclass('o_settings_container')]" position="inside">
-                <field name="company_id" invisible="1"/>
-                <setting class="col-lg-12" help="Invoice your time and material to customers" invisible="context.get('hide_allow_billable', False)">
-                    <field name="allow_billable"/>
-                    <div attrs="{'invisible': [('allow_billable', '=', False)]}">
-                        <label for="partner_id"/>
-                        <field name="partner_id" class="ms-1" widget="res_partner_many2one" context="{'res_partner_search_mode': 'customer'}"
-                            options="{'no_create_edit': True, 'no_open': True}" placeholder="Select who to bill..."/>
-                    </div>
-                </setting>
-            </xpath>
-        </field>
-    </record>
-
     <record id="project_project_view_kanban_inherit_sale_timesheet" model="ir.ui.view">
         <field name="name">project.project.kanban.inherit.sale.timesheet</field>
         <field name="model">project.project</field>