From bd8e6edb1d3d7ad95eec6e03aa00d480228c9b61 Mon Sep 17 00:00:00 2001
From: shs-odoo <shs@odoo.com>
Date: Mon, 1 Jun 2020 07:39:08 +0000
Subject: [PATCH] [IMP] hr_expense: Imporve the display of expense banner

currently, the expense banner is displayed on to many menus like:
'expense report > to Pay, to Post'.

so in this commit,the banner should only be visible in the
'My Expenses' and 'My Expense Reports' menus.
and also removed some unused action from hr_expense.

closes odoo/odoo#52241

Taskid: 2267850
Closes: #52241
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr_expense/views/hr_expense_views.xml | 63 +++++---------------
 1 file changed, 15 insertions(+), 48 deletions(-)

diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml
index 2ef7df2cf51..a43642472bb 100644
--- a/addons/hr_expense/views/hr_expense_views.xml
+++ b/addons/hr_expense/views/hr_expense_views.xml
@@ -64,6 +64,19 @@
             </field>
         </record>
 
+        <record id="view_my_expenses_tree" model="ir.ui.view">
+            <field name="name">hr.expense.tree</field>
+            <field name="model">hr.expense</field>
+            <field name="priority">20</field>
+            <field name="inherit_id" ref="hr_expense.view_expenses_tree"/>
+            <field name="mode">primary</field>
+            <field name="arch" type="xml">
+                <xpath expr="//tree" position="attributes">
+                    <attribute name="js_class">hr_expense_tree_dashboard</attribute>
+                </xpath>
+            </field>
+        </record>
+
         <record id="hr_expense_view_form" model="ir.ui.view">
             <field name="name">hr.expense.view.form</field>
             <field name="model">hr.expense</field>
@@ -295,6 +308,7 @@
             <field name="res_model">hr.expense</field>
             <field name="view_mode">tree,kanban,form,graph,pivot,activity</field>
             <field name="search_view_id" ref="hr_expense_view_search"/>
+            <field name="view_id" ref="view_my_expenses_tree"/>
             <field name="context">{'search_default_my_expenses': 1, 'search_default_no_report': 1}</field>
             <field name="help" type="html">
                 <p class="o_view_nocontent_expense_receipt">
@@ -421,22 +435,6 @@
             <field name="act_window_id" ref="hr_expense_product"/>
         </record>
 
-        <record id="action_unsubmitted_expense" model="ir.actions.act_window">
-            <field name="name">Unreported Expenses</field>
-            <field name="res_model">hr.expense</field>
-            <field name="view_mode">tree,kanban,form,pivot,graph</field>
-            <field name="view_id" ref="view_expenses_tree"/>
-            <field name="domain">[]</field>
-            <field name="context">{"search_default_unsubmitted": 1}</field>
-            <field name="help" type="html">
-              <p class="o_view_nocontent_empty_folder">
-                No unreported employee expenses
-              </p><p>
-                From here the accountant will be able to approve as well as refuse the expenses which are verified by the HR Manager.
-              </p>
-            </field>
-        </record>
-
         <record id="view_hr_expense_sheet_tree" model="ir.ui.view">
             <field name="name">hr.expense.sheet.tree</field>
             <field name="model">hr.expense.sheet</field>
@@ -461,6 +459,7 @@
         <record id="view_hr_expense_sheet_dashboard_tree" model="ir.ui.view">
             <field name="name">hr.expense.sheet.dashboard.tree</field>
             <field name="model">hr.expense.sheet</field>
+            <field name="priority">20</field>
             <field name="inherit_id" ref="hr_expense.view_hr_expense_sheet_tree"/>
             <field name="mode">primary</field>
             <field name="arch" type="xml">
@@ -792,38 +791,6 @@
             </field>
         </record>
 
-        <record id="action_request_approve_expense_sheet" model="ir.actions.act_window">
-            <field name="name">Reports to Approve</field>
-            <field name="res_model">hr.expense.sheet</field>
-            <field name="view_mode">tree,kanban,form,pivot,graph</field>
-            <field name="context">{'search_default_submitted': 1}</field>
-            <field name="search_view_id" ref="hr_expense_sheet_view_search"/>
-            <field name="view_id" ref="view_hr_expense_sheet_tree"/>
-            <field name="help" type="html">
-              <p class="o_view_nocontent_smiling_face">
-                Create a new expense
-              </p><p>
-                Once you have created your expense, submit it to your manager who will validate it.
-              </p>
-            </field>
-        </record>
-
-        <record id="action_request_to_post_expense_sheet" model="ir.actions.act_window">
-            <field name="name">Reports to Post</field>
-            <field name="res_model">hr.expense.sheet</field>
-            <field name="view_mode">tree,kanban,form,pivot,graph</field>
-            <field name="context">{'search_default_to_post': 1}</field>
-            <field name="search_view_id" ref="hr_expense_sheet_view_search"/>
-            <field name="view_id" ref="view_hr_expense_sheet_tree"/>
-            <field name="help" type="html">
-              <p class="o_view_nocontent_smiling_face">
-                Create a new expense
-              </p><p>
-                Once you have created your expense, submit it to your manager who will validate it.
-              </p>
-            </field>
-        </record>
-
         <record id="action_hr_expense_sheet_department_to_approve" model="ir.actions.act_window">
             <field name="name">Expense Reports to Approve</field>
             <field name="res_model">hr.expense.sheet</field>