[Erp5-report] r31108 jerome - in /erp5/trunk/bt5/erp5_budget: WorkflowTemplateItem/portal_w...

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Dec  7 09:15:54 2009
New Revision: 31108

URL: http://svn.erp5.org?rev=31108&view=rev
Log:
Fix the way categories are cleaned up before beeing copied, remove obsolete comment

Modified:
    erp5/trunk/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow.xml
    erp5/trunk/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts/setMembershipCriterionCategoryListFromVariationCategory.xml
    erp5/trunk/bt5/erp5_budget/bt/revision

Modified: erp5/trunk/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow.xml?rev=31108&r1=31107&r2=31108&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow.xml [utf8] Mon Dec  7 09:15:54 2009
@@ -23,8 +23,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>TODO:\r\n
- changing a membership must be "recursive" (or budget line/cell membership method should dynamically read from their parent)</string> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>groups</string> </key>

Modified: erp5/trunk/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts/setMembershipCriterionCategoryListFromVariationCategory.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts/setMembershipCriterionCategoryListFromVariationCategory.xml?rev=31108&r1=31107&r2=31108&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts/setMembershipCriterionCategoryListFromVariationCategory.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts/setMembershipCriterionCategoryListFromVariationCategory.xml [utf8] Mon Dec  7 09:15:54 2009
@@ -56,18 +56,19 @@
             <value> <string>budget = sci[\'object\']\n
 \n
 membership_criterion_category_list = budget.getMembershipCriterionCategoryList()\n
+\n
 for base_category in budget.getMembershipCriterionBaseCategoryList():\n
   if base_category in budget.getVariationBaseCategoryList():\n
-    # Remove all previous membership from the same base\n
+    # Remove all previous memberships from the same base\n
     cleaned_membership_criterion_category_list = []\n
     for membership_criterion_category in membership_criterion_category_list:\n
       if not membership_criterion_category.startswith("%s/" % base_category):\n
         cleaned_membership_criterion_category_list.append(membership_criterion_category)\n
     # Add the new one\n
-    membership_criterion_category_list.extend(\n
+    cleaned_membership_criterion_category_list.extend(\n
          budget.getVariationCategoryList(base_category_list=base_category))\n
 \n
-budget.setMembershipCriterionCategoryList(membership_criterion_category_list)\n
+budget.setMembershipCriterionCategoryList(cleaned_membership_criterion_category_list)\n
 </string> </value>
         </item>
         <item>

Modified: erp5/trunk/bt5/erp5_budget/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_budget/bt/revision?rev=31108&r1=31107&r2=31108&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_budget/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_budget/bt/revision [utf8] Mon Dec  7 09:15:54 2009
@@ -1,1 +1,1 @@
-267
+269