Skip to content

Commit

Permalink
Merge PR #718 into 16.0
Browse files Browse the repository at this point in the history
Signed-off-by alexey-pelykh
  • Loading branch information
OCA-git-bot committed Oct 10, 2024
2 parents 4ffc0b3 + 1da554e commit 23cc6cd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sale_timesheet_line_exclude/models/account_analytic_line.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ def _compute_timesheet_invoice_type(self):
return res

@api.depends("exclude_from_sale_order")
def _compute_so_line_on_exclude(self):
self._compute_so_line()
def _compute_so_line(self):
return super()._compute_so_line()

def _timesheet_determine_sale_line(self):
self.ensure_one()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,9 @@ def test_write_exclude_from_sale_order(self):
"account_id": self.project.analytic_account_id.id,
}
)
self.assertTrue(timesheet.so_line)
timesheet.write({"exclude_from_sale_order": True})
self.assertFalse(timesheet.so_line)

self.assertEqual(timesheet.timesheet_invoice_type, "non_billable")
self.assertEqual(self.sale_order_line.qty_delivered, 0)
Expand Down

0 comments on commit 23cc6cd

Please sign in to comment.