From 603ddc0b1bedcd479c5ef4f6d58417a846c9276d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Mon, 16 Dec 2013 13:44:43 +0100
Subject: [PATCH] budget: just copy variation categories as membership
criterions
---
...riterionCategoryListFromVariationCategory.xml | 16 +---------------
bt5/erp5_budget/bt/revision | 2 +-
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts/setMembershipCriterionCategoryListFromVariationCategory.xml b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts/setMembershipCriterionCategoryListFromVariationCategory.xml
index dbea175892..cef54a0a8d 100644
--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts/setMembershipCriterionCategoryListFromVariationCategory.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_interaction_workflow/scripts/setMembershipCriterionCategoryListFromVariationCategory.xml
@@ -51,21 +51,7 @@
<item>
<key> <string>_body</string> </key>
<value> <string>budget = sci[\'object\']\n
-\n
-membership_criterion_category_list = budget.getMembershipCriterionCategoryList()\n
-\n
-# Remove all previous memberships from the same base\n
-cleaned_membership_criterion_category_list = []\n
-for base_category in budget.getMembershipCriterionBaseCategoryList():\n
- if base_category in budget.getVariationBaseCategoryList():\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
- cleaned_membership_criterion_category_list.extend(\n
- budget.getVariationCategoryList(base_category_list=base_category))\n
-\n
-budget.setMembershipCriterionCategoryList(cleaned_membership_criterion_category_list)\n
+budget.setMembershipCriterionCategoryList(budget.getVariationCategoryList())\n
</string> </value>
</item>
<item>
diff --git a/bt5/erp5_budget/bt/revision b/bt5/erp5_budget/bt/revision
index 1c3e15e55e..3456e74000 100644
--- a/bt5/erp5_budget/bt/revision
+++ b/bt5/erp5_budget/bt/revision
@@ -1 +1 @@
-371
\ No newline at end of file
+372
\ No newline at end of file
--
2.30.9