pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] sale_timesheet: Non billable timesheets

Browse Source 
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>
This commit is contained in:
Laurent Stukkens (LTU)
2020-12-14 16:10:09 +00:00
committed by Goffin Simon
parent a18c8846f4
commit 8c006367f9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale_timesheet/views/hr_timesheet_views.xml
+2 -2
View File
@@ -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')]"/>