[Erp5-report] r15177 - /erp5/trunk/products/ERP5Form/PlanningBox.py

[nobody at svn.erp5.org]

Author: rafael
Date: Mon Jul  9 16:29:22 2007
New Revision: 15177

URL: http://svn.erp5.org?rev=15177&view=rev
Log:

Added Support to aquisition when is check for the right Domain.


Modified:
    erp5/trunk/products/ERP5Form/PlanningBox.py

Modified: erp5/trunk/products/ERP5Form/PlanningBox.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/PlanningBox.py?rev=15177&r1=15176&r2=15177&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/PlanningBox.py (original)
+++ erp5/trunk/products/ERP5Form/PlanningBox.py Mon Jul  9 16:29:22 2007
@@ -1312,13 +1312,14 @@
         new_object_list = []
         if domain_obj.getPortalType() == 'Domain':
           category_obj = domain_obj.getMembershipCriterionCategory()
-          membership_base_category = domain_obj.getMembershipCriterionBaseCategory()
-          if (category_obj is not None) and (membership_base_category is not None):
-            category_value = (membership_base_category + '/' + category_obj.getRelativeUrl())
-            for selected_object in object_list:
-              if category_value in selected_object.getCategoriesList():
-                 new_object_list.append(selected_object)
-            object_list = new_object_list
+          base_category_list = domain_obj.getMembershipCriterionBaseCategoryList()
+          for bc in base_category_list:
+            if (category_obj is not None) and (bc is not None):
+              category_value = category_obj.getRelativeUrl()
+              for s_obj in object_list:
+                if s_obj._getDefaultAcquiredCategoryMembership(bc) == category_value:
+                  new_object_list.append(s_obj)
+          object_list = new_object_list
 
         if exception_uid_list not in ([],None) :
           # Filter folders if parent tree :