From 8c006367f9af381b22a705a4bb48dc14bbc8cb86 Mon Sep 17 00:00:00 2001
From: "Laurent Stukkens (LTU)" <ltu@odoo.com>
Date: Mon, 14 Dec 2020 11:40:34 +0000
Subject: [PATCH] [FIX] sale_timesheet: Non billable timesheets

Steps to reproduce the bug:

    - Create new project P with "Billable" unchecked
    - Create a new task T in P and log hours on the timesheet TS
    - Go to Timesheets > All Timesheets and filter for "Billable"

    Bug:

    TS was displayed even if P was not billable

opw:2394624

closes odoo/odoo#63348

X-original-commit: 78491ae8f6b7978444bf789d9ecdd71201afdebe
Signed-off-by: Simon Goffin (sig) <sig@openerp.com>
Co-authored-by: IT-Ideas <ltu@odoo.com>
---
 addons/sale_timesheet/views/hr_timesheet_views.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale_timesheet/views/hr_timesheet_views.xml b/addons/sale_timesheet/views/hr_timesheet_views.xml
index 31a02c6eedb..967ee418960 100644
--- a/addons/sale_timesheet/views/hr_timesheet_views.xml
+++ b/addons/sale_timesheet/views/hr_timesheet_views.xml
@@ -10,8 +10,8 @@
                     <field name="timesheet_invoice_type"/>
                 </xpath>
                 <xpath expr="//filter[@name='month']" position="before">
-                    <filter name="billable_timesheet" string="Billable" domain="[('non_allow_billable', '=', False)]"/>
-                    <filter name="non_billable_timesheet" string="Non Billable" domain="[('non_allow_billable', '=', True)]"/>
+                    <filter name="billable_timesheet" string="Billable" domain="[('so_line', '!=', False), ('non_allow_billable', '=', False)]"/>
+                    <filter name="non_billable_timesheet" string="Non Billable" domain="['|', ('so_line', '=', False), ('non_allow_billable', '=', True)]"/>
                     <separator/>
                     <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')]"/>