From f20545370f4e9b90de1131ab792c07e4de271023 Mon Sep 17 00:00:00 2001
From: "Julien Alardot (jual)" <jual@odoo.com>
Date: Thu, 14 Dec 2023 10:44:59 +0100
Subject: [PATCH] [FIX] hr_expense: Product creation default type

Fix a bug where quick-create of products from the expense form view
would not use the service detailed_type by default. Allowing bugs
when sale_stock module is installed as it would be considered
as a storable product

Also updates the demo data accordingly

task-3458826

closes odoo/odoo#147123

Signed-off-by: Habib Ayob (ayh) <ayh@odoo.com>
Signed-off-by: Julien Alardot (jual) <jual@odoo.com>
---
 addons/hr_expense/data/hr_expense_data.xml   | 4 ++++
 addons/hr_expense/views/hr_expense_views.xml | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/hr_expense/data/hr_expense_data.xml b/addons/hr_expense/data/hr_expense_data.xml
index ab8522d3c5a..7fdfda7350c 100644
--- a/addons/hr_expense/data/hr_expense_data.xml
+++ b/addons/hr_expense/data/hr_expense_data.xml
@@ -6,6 +6,7 @@
             <field name="name">Meals</field>
             <field name="description">Restaurants, business lunches, etc.</field>
             <field name="standard_price">0.0</field>
+            <field name="type">service</field>
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">FOOD</field>
@@ -30,6 +31,7 @@
         <record id="expense_product_mileage" model="product.product">
             <field name="name">Mileage</field>
             <field name="standard_price">1.0</field>
+            <field name="type">service</field>
             <field name="uom_id" ref="uom.product_uom_km"/>
             <field name="uom_po_id" ref="uom.product_uom_km"/>
             <field name="default_code">MIL</field>
@@ -42,6 +44,7 @@
             <field name="name">Gifts</field>
             <field name="description">Gifts to customers or vendors</field>
             <field name="standard_price">0.0</field>
+            <field name="type">service</field>
             <field name="uom_id" ref="uom.product_uom_km"/>
             <field name="uom_po_id" ref="uom.product_uom_km"/>
             <field name="default_code">GIFT</field>
@@ -54,6 +57,7 @@
             <field name="name">Communication</field>
             <field name="description">Phone bills, postage, etc.</field>
             <field name="standard_price">0.0</field>
+            <field name="type">service</field>
             <field name="uom_id" ref="uom.product_uom_km"/>
             <field name="uom_po_id" ref="uom.product_uom_km"/>
             <field name="default_code">COMM</field>
diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml
index 08834baf26e..14753984caa 100644
--- a/addons/hr_expense/views/hr_expense_views.xml
+++ b/addons/hr_expense/views/hr_expense_views.xml
@@ -167,7 +167,7 @@
                             <label for="product_id"/>
                             <div>
                                 <field name="product_id" required="1" readonly="not is_editable"
-                                       context="{'default_can_be_expensed': 1, 'tree_view_ref': 'hr_expense.product_product_expense_tree_view', 'form_view_ref': 'hr_expense.product_product_expense_form_view'}"
+                                       context="{'default_detailed_type': 'service', 'default_can_be_expensed': 1, 'tree_view_ref': 'hr_expense.product_product_expense_tree_view', 'form_view_ref': 'hr_expense.product_product_expense_form_view'}"
                                        class="w-100"/>
                                 <div class="fst-italic" invisible="not is_editable or not product_description or not product_id">
                                     <field name="product_description"/>
@@ -573,7 +573,6 @@
                             <group string="General Information">
                                 <field name="active" invisible="1"/>
                                 <field name="type" invisible="1"/>
-                                <field name="detailed_type" invisible="1"/>
                                 <field name="standard_price" class="w-25"
                                        help="When the cost of an expense product is different than 0, then the user
                                         using this product won't be able to change the amount of the expense,