From f664a0e44eb46c724b6f7239e3ff6da89e7e6afb Mon Sep 17 00:00:00 2001
From: Kartik Chavda <kcv@odoo.com>
Date: Tue, 5 Apr 2022 05:02:38 +0000
Subject: [PATCH] [IMP] sale_timesheet: add filters in timesheet

In this commit, following filters are added:
    -'billed on milestones'
    -'billed manually'

task-2816490

Part-of: odoo/odoo#88852
---
 addons/sale_timesheet/report/timesheets_analysis_views.xml | 6 ++++--
 addons/sale_timesheet/views/hr_timesheet_views.xml         | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/sale_timesheet/report/timesheets_analysis_views.xml b/addons/sale_timesheet/report/timesheets_analysis_views.xml
index 5a7c6b146b0f9..cabded45bd53e 100644
--- a/addons/sale_timesheet/report/timesheets_analysis_views.xml
+++ b/addons/sale_timesheet/report/timesheets_analysis_views.xml
@@ -60,9 +60,11 @@
                 <field name="so_line" groups="sales_team.group_sale_salesman"/>
             </xpath>
             <xpath expr="//filter[@name='month']" position="before">
-                <filter name="billable_time" string="Billed on Timesheets" domain="[('timesheet_invoice_type', '=', 'billable_time')]"/>
                 <filter name="billable_fixed" string="Billed at a Fixed Price" domain="[('timesheet_invoice_type', '=', 'billable_fixed')]"/>
-                <filter name="non_billable" string="Non Billable" domain="[('timesheet_invoice_type', '=', 'non_billable')]"/>
+                <filter name="billable_time" string="Billed on Timesheets" domain="[('timesheet_invoice_type', '=', 'billable_time')]"/>
+                <filter name="billable_milestones" string="Billed on Milestones" domain="[('timesheet_invoice_type', '=', 'billable_milestones')]"/>
+                <filter name="billable_manual" string="Billed Manually" domain="[('timesheet_invoice_type', '=', 'billable_manual')]"/>
+                <filter name="non_billable" string="Non-Billable" domain="[('timesheet_invoice_type', '=', 'non_billable')]"/>
                 <separator/>
             </xpath>
             <xpath expr="//filter[@name='groupby_employee']" position="after">
diff --git a/addons/sale_timesheet/views/hr_timesheet_views.xml b/addons/sale_timesheet/views/hr_timesheet_views.xml
index a2a6487be3fd6..d379d5b6cfb8e 100644
--- a/addons/sale_timesheet/views/hr_timesheet_views.xml
+++ b/addons/sale_timesheet/views/hr_timesheet_views.xml
@@ -11,9 +11,11 @@
                     <field name="so_line" groups="sales_team.group_sale_salesman"/>
                 </xpath>
                 <xpath expr="//filter[@name='month']" position="before">
-                    <filter name="billable_time" string="Billed on Timesheets" domain="[('timesheet_invoice_type', '=', 'billable_time')]"/>
                     <filter name="billable_fixed" string="Billed at a Fixed Price" domain="[('timesheet_invoice_type', '=', 'billable_fixed')]"/>
-                    <filter name="non_billable" string="Non Billable" domain="[('timesheet_invoice_type', '=', 'non_billable')]"/>
+                    <filter name="billable_time" string="Billed on Timesheets" domain="[('timesheet_invoice_type', '=', 'billable_time')]"/>
+                    <filter name="billable_milestones" string="Billed on Milestones" domain="[('timesheet_invoice_type', '=', 'billable_milestones')]"/>
+                    <filter name="billable_manual" string="Billed Manually" domain="[('timesheet_invoice_type', '=', 'billable_manual')]"/>
+                    <filter name="non_billable" string="Non-Billable" domain="[('timesheet_invoice_type', '=', 'non_billable')]"/>
                     <separator/>
                 </xpath>
                 <xpath expr="//filter[@name='groupby_employee']" position="after">