[FIX] sale, sale_timesheet: unnecessary complex domain
The use case was not supported anyway.
This reverts a0fed3b845
This commit is contained in:
@@ -17,16 +17,7 @@ class SaleOrderLine(models.Model):
|
||||
# To filter on analyic lines linked to an expense
|
||||
expense_type_id = self.env.ref('account.data_account_type_expenses', raise_if_not_found=False)
|
||||
expense_type_id = expense_type_id and expense_type_id.id
|
||||
domain = [
|
||||
('so_line', 'in', self.ids),
|
||||
'|',
|
||||
('amount', '<', 0),
|
||||
'&',
|
||||
('amount', '=', 0),
|
||||
'|',
|
||||
('move_id', '=', False),
|
||||
('move_id.account_id.user_type_id', '=', expense_type_id)
|
||||
]
|
||||
domain = [('so_line', 'in', self.ids), ('amount', '<=', 0.0)]
|
||||
|
||||
data = self.env['account.analytic.line'].read_group(
|
||||
domain,
|
||||
|
||||
@@ -144,16 +144,5 @@ class SaleOrderLine(models.Model):
|
||||
# To filter on analyic lines linked to an expense
|
||||
expense_type_id = self.env.ref('account.data_account_type_expenses', raise_if_not_found=False)
|
||||
expense_type_id = expense_type_id and expense_type_id.id
|
||||
domain = [
|
||||
('so_line', 'in', self.ids),
|
||||
'|',
|
||||
'|',
|
||||
('amount', '<', 0.0),
|
||||
('project_id', '!=', False),
|
||||
'&',
|
||||
('amount', '=', 0),
|
||||
'|',
|
||||
('move_id', '=', False),
|
||||
('move_id.account_id.user_type_id', '=', expense_type_id)
|
||||
]
|
||||
domain = [('so_line', 'in', self.ids), '|', ('amount', '<=', 0.0), ('project_id', '!=', False)]
|
||||
return super(SaleOrderLine, self)._compute_analytic(domain=domain)
|
||||
|
||||
Reference in New Issue
Block a user