From 4c9fae2c3e087ffade587858c031b3157eba1369 Mon Sep 17 00:00:00 2001
From: Tatuya Kamada <tatuya@nexedi.com>
Date: Wed, 16 Nov 2011 14:48:44 +0900
Subject: [PATCH] Revert "check if base_application really matches in
 getGeneratedAmountList()."

This reverts commit 2674ce8498f1bc506258620f12a9eb868bc5680b.

The commit broke amount generator functionality. That caused 20 errors,
and 64 failures in the test suite.
---
 product/ERP5/mixin/amount_generator.py | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/product/ERP5/mixin/amount_generator.py b/product/ERP5/mixin/amount_generator.py
index 7c1aa09489..95a6757720 100644
--- a/product/ERP5/mixin/amount_generator.py
+++ b/product/ERP5/mixin/amount_generator.py
@@ -370,31 +370,7 @@ class AmountGeneratorMixin:
       # Browse recursively the amount generator lines and accumulate
       # applicable values - now execute the method
       accumulateAmountList(self)
-
-    # finally check if base_application matches with input or other
-    # generated amounts, because we no longer ignore 'quantity==0'
-    # amount thus non-matched amount can exist here.
-    delivery_contribution_list = self.getBaseContributionList()
-    index_list = range(len(result))
-    application_set_list = [set(result[i].getBaseApplicationList()) for i in index_list]
-    contribution_list_list = [result[i].getBaseContributionList() for i in index_list]
-    bad_index_list = []
-    good_index_list = []
-    flag = True
-    while flag:
-      flag = False
-      for i in index_list:
-        if i in bad_index_list or i in good_index_list:
-          continue
-        if application_set_list[i].intersection(delivery_contribution_list):
-          good_index_list.append(i)
-          continue
-        if application_set_list[i].intersection(
-          sum([contribution_list_list[j] for j in index_list if j!=i and j not in bad_index_list], [])):
-          continue
-        flag = True
-        bad_index_list.append(i)
-    return [result[i] for i in index_list if i not in bad_index_list]
+    return result
 
   security.declareProtected(Permissions.AccessContentsInformation,
                             'getAggregatedAmountList')
-- 
2.30.9