From 21fbb9776a5fbd1838b189f1f7cf8c5d40663e14 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 19 Jul 2017 11:26:15 +0200
Subject: [PATCH] [FIX] sale, sale_timesheet: unnecessary complex domain

The use case was not supported anyway.

This reverts a0fed3b845ce6720c3cba5dba4496a8e558c7376
---
 addons/sale/models/sale_analytic.py        | 11 +----------
 addons/sale_timesheet/models/sale_order.py | 13 +------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/addons/sale/models/sale_analytic.py b/addons/sale/models/sale_analytic.py
index 591f865c18a..a7359c9d7ac 100644
--- a/addons/sale/models/sale_analytic.py
+++ b/addons/sale/models/sale_analytic.py
@@ -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,
diff --git a/addons/sale_timesheet/models/sale_order.py b/addons/sale_timesheet/models/sale_order.py
index 4f38a6c9bfb..12e729e2999 100644
--- a/addons/sale_timesheet/models/sale_order.py
+++ b/addons/sale_timesheet/models/sale_order.py
@@ -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)