Merge lp:~julie-w/unifield-server/US-5688 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_budget/msf_budget_tools.py'
--- bin/addons/msf_budget/msf_budget_tools.py	2017-02-09 10:35:44 +0000
+++ bin/addons/msf_budget/msf_budget_tools.py	2019-03-20 14:43:45 +0000
@@ -247,18 +247,6 @@
     def _get_cost_center_ids(self, cr, uid, browse_cost_center):
         return self.pool.get('account.analytic.account').search(cr, uid, [('parent_id', 'child_of', browse_cost_center.id)])
 
-    def _create_account_destination_domain(self, account_destination_list):
-        if len(account_destination_list) == 0:
-            return ['&',
-                    ('general_account_id', 'in', []),
-                    ('destination_id', 'in', [])]
-        elif len(account_destination_list) == 1:
-            return ['&',
-                    ('general_account_id', '=', account_destination_list[0][0]),
-                    ('destination_id', '=', account_destination_list[0][1])]
-        else:
-            return ['|'] + self._create_account_destination_domain([account_destination_list[0]]) + self._create_account_destination_domain(account_destination_list[1:])
-
     def _get_actual_amounts(self, cr, uid, output_currency_id, domain=[], context=None):
         # Input: domain for the selection of analytic lines (cost center, date, etc...)
         # Output: a dict of list {(general_account_id, destination_id): [jan_actual, feb_actual,...]}
@@ -279,7 +267,21 @@
             res[account_id, destination_id] = [0] * 12
 
         # fill search domain (one search for all analytic lines)
-        domain += self._create_account_destination_domain(account_destination_ids)
+        account_dest_combinations = {}
+        # create a dict with key = account, and value = list of the related possible destinations
+        for acc_dest_id in account_destination_ids:
+            if acc_dest_id[0] not in account_dest_combinations:
+                account_dest_combinations[acc_dest_id[0]] = []
+            account_dest_combinations[acc_dest_id[0]].append(acc_dest_id[1])
+        i = 0
+        for acc in account_dest_combinations:
+            i += 1
+            if i < len(account_dest_combinations):
+                # don't add the "or" at least iteration
+                domain.append('|')
+            domain.append('&')
+            domain.append(('general_account_id', '=', acc))
+            domain.append(('destination_id', 'in', account_dest_combinations[acc]))
 
         # Analytic domain is now done; lines are retrieved and added
         analytic_line_obj = self.pool.get('account.analytic.line')