Skip to content
Snippets Groups Projects
Commit 7ee275a4 authored by Victor Piryns (pivi)'s avatar Victor Piryns (pivi)
Browse files

[FIX] sale_timesheet: don't count expense as record hours on SO


Issue:
Expenses linked to an SO are counted as 1 hour of timesheet linked
to the SO.

Steps to reproduce:
- Install Sales, Timesheets, Expense
- Create an SO and sell a service that creates a Task > Confirm
- Log some timesheet on the task (3h for ex.)
- Create an expense related to the SO, approve it and generate the
  journal entries.
- On the SO, the smart button shows 4h clocked, and when you click
  on it, the expense line is showed, which shouldn't be the case.

Cause:
Incorrect domain taking the `order_line` without filtering on the
fact that they may be expenses or not.

Fix:
Specify the domain on the action to exclude expense lines.

Affected versions:
- 14.0 - count is correct, only action is showing more lines
- 15.0 - same as described in the commit msg
- saas-15.2
- 16.0
- saas-16.1
- saas-16.2
- saas-16.3
- master

opw-3302460

closes odoo/odoo#128432

Signed-off-by: default avatarXavier Bol (xbo) <xbo@odoo.com>
parent 9c25d992
Branches
Tags
No related merge requests found
......@@ -58,7 +58,7 @@ class SaleOrder(models.Model):
'search_default_billable_timesheet': True
} # erase default filters
if self.timesheet_count > 0:
action['domain'] = [('so_line', 'in', self.order_line.ids)]
action['domain'] = [('so_line', 'in', self.order_line.ids), ('project_id', '!=', False)]
else:
action = {'type': 'ir.actions.act_window_close'}
return action
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment