From 139b2aec3fce04334c1b0b7ed09e145d5ee49474 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Mon, 24 May 2010 14:17:38 +0000
Subject: [PATCH] * Improve activity dependencies for
Delivery_updateAppliedRule, eg.
delivery.activate(tag='(path)_updateAppliedRule',
after_tag='(path)_expand').Delivery_updateAppliedRule(activate_kw={'tag':'(path)_expand'})
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35571 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_base/Delivery_updateSimulation.xml | 8 ++++----
bt5/erp5_base/bt/revision | 2 +-
.../order_workflow/scripts/Order_createOrderRule.xml | 12 ++++++++----
bt5/erp5_bpm/bt/revision | 2 +-
.../scripts/Order_buildPackingList.xml | 4 ++--
.../scripts/Order_createOrderRule.xml | 10 +++++++---
bt5/erp5_mrp/bt/revision | 2 +-
.../scripts/OpenOrder_buildSaleOrder.xml | 12 +++++++-----
bt5/erp5_open_trade/bt/change_log | 3 +++
bt5/erp5_open_trade/bt/revision | 2 +-
10 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_updateSimulation.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_updateSimulation.xml
index 560a6f205f..ec4a5cabf3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_updateSimulation.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_updateSimulation.xml
@@ -56,18 +56,18 @@
<value> <string>delivery = context\n
delivery_path = delivery.getPath()\n
path_and_method_id = (delivery_path, (\'immediateReindexObject\',\'recursiveImmediateReindexObject\'))\n
-after_tag = (delivery_path + \'_firstUpdateAppliedRule\', delivery_path + \'_expand\')\n
+expand_tag = delivery_path + \'_expand\'\n
tag = delivery_path + \'_updateAppliedRule\'\n
\n
priority = 3\n
\n
activate_kw = { \n
- \'tag\': tag,\n
+ \'tag\': expand_tag,\n
\'priority\': priority,\n
}\n
delivery.activate(\n
after_path_and_method_id=path_and_method_id,\n
- after_tag=after_tag,\n
+ after_tag=expand_tag,\n
tag=tag,\n
priority=priority,\n
).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
@@ -112,7 +112,7 @@ delivery.activate(\n
<string>_getattr_</string>
<string>delivery_path</string>
<string>path_and_method_id</string>
- <string>after_tag</string>
+ <string>expand_tag</string>
<string>tag</string>
<string>priority</string>
<string>activate_kw</string>
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index 66079bda3a..deadc0f238 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-750
\ No newline at end of file
+751
\ No newline at end of file
diff --git a/bt5/erp5_bpm/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml b/bt5/erp5_bpm/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml
index e5aea09ed3..4adc25fee9 100644
--- a/bt5/erp5_bpm/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml
+++ b/bt5/erp5_bpm/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml
@@ -55,10 +55,12 @@
<key> <string>_body</string> </key>
<value> <string>order = state_change[\'object\']\n
\n
-tag = order.getPath() + \'_firstUpdateAppliedRule\'\n
-activate_kw = {\'tag\':tag,\'priority\':3}\n
-order.activate(tag=tag).updateAppliedRule(rule_reference=order.getRuleReference(),\n
- activate_kw=activate_kw)\n
+path = order.getPath()\n
+tag = \'%s_updateAppliedRule\' % path\n
+expand_tag = \'%s_expand\' % path\n
+activate_kw = {\'tag\':expand_tag, \'priority\':3}\n
+\n
+order.activate(tag=tag, after_tag=expand_tag).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
</string> </value>
</item>
<item>
@@ -100,7 +102,9 @@ order.activate(tag=tag).updateAppliedRule(rule_reference=order.getRuleReference(
<string>_getitem_</string>
<string>order</string>
<string>_getattr_</string>
+ <string>path</string>
<string>tag</string>
+ <string>expand_tag</string>
<string>activate_kw</string>
</tuple>
</value>
diff --git a/bt5/erp5_bpm/bt/revision b/bt5/erp5_bpm/bt/revision
index dd4a90065c..b8e817d4f8 100644
--- a/bt5/erp5_bpm/bt/revision
+++ b/bt5/erp5_bpm/bt/revision
@@ -1 +1 @@
-254
\ No newline at end of file
+255
\ No newline at end of file
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml
index 32f4a3b1a0..51e285bb2e 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml
@@ -74,10 +74,10 @@ else:\n
]\n
\n
order_path = order.getPath()\n
-previous_tag = order_path + \'_firstUpdateAppliedRule\'\n
+tag = order_path + \'_updateAppliedRule\'\n
expand_tag = order_path + \'_expand\'\n
activate_kw = {\'tag\':expand_tag, \'priority\':3}\n
-order.activate(tag=expand_tag, after_tag=previous_tag).updateAppliedRule(rule_reuference=rule_reference, activate_kw=activate_kw)\n
+order.activate(tag=tag, after_tag=expand_tag).updateAppliedRule(rule_reuference=rule_reference, activate_kw=activate_kw)\n
\n
for i in xrange(len(builder_list)):\n
if i > 0:\n
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_createOrderRule.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_createOrderRule.xml
index 7370b69877..4da861f722 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_createOrderRule.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_createOrderRule.xml
@@ -64,9 +64,11 @@ if (business_process is not None and\n
else:\n
rule_reference=\'default_production_order_rule\'\n
\n
-tag = order.getPath() + \'_firstUpdateAppliedRule\'\n
-activate_kw = {\'tag\':tag,\'priority\':3}\n
-order.activate(tag=tag).updateAppliedRule(rule_reference=rule_reference, activate_kw=activate_kw)\n
+path = order.getPath()\n
+tag = \'%s_updateAppliedRule\' % path\n
+expand_tag = \'%s_expand\' % path\n
+activate_kw = {\'tag\':expand_tag, \'priority\':3}\n
+order.activate(tag=tag, after_tag=expand_tag).updateAppliedRule(rule_reference=rule_reference, activate_kw=activate_kw)\n
</string> </value>
</item>
<item>
@@ -112,7 +114,9 @@ order.activate(tag=tag).updateAppliedRule(rule_reference=rule_reference, activat
<string>None</string>
<string>context</string>
<string>rule_reference</string>
+ <string>path</string>
<string>tag</string>
+ <string>expand_tag</string>
<string>activate_kw</string>
</tuple>
</value>
diff --git a/bt5/erp5_mrp/bt/revision b/bt5/erp5_mrp/bt/revision
index 2ae9f6c7cb..2be0b3c11a 100644
--- a/bt5/erp5_mrp/bt/revision
+++ b/bt5/erp5_mrp/bt/revision
@@ -1 +1 @@
-441
\ No newline at end of file
+442
\ No newline at end of file
diff --git a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_buildSaleOrder.xml b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_buildSaleOrder.xml
index 22ed002a23..ebecad1e9e 100644
--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_buildSaleOrder.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_buildSaleOrder.xml
@@ -56,13 +56,14 @@
<value> <string>order = state_change[\'object\']\n
transition_kw = state_change[\'kwargs\']\n
\n
-previous_tag = order.getPath() + \'_firstUpdateAppliedRule\'\n
-expand_tag = order.getPath() + \'_expand\'\n
-activate_kw = {\'tag\':expand_tag,\'priority\':3}\n
+path = order.getPath()\n
+tag = \'%s_updateAppliedRule\' % path\n
+expand_tag = \'%s_expand\' % path\n
+activate_kw = {\'tag\':expand_tag, \'priority\':3}\n
kw = {}\n
if transition_kw.get(\'calculation_base_date\') is not None:\n
kw[\'calculation_base_date\'] = transition_kw[\'calculation_base_date\']\n
-order.activate(tag=expand_tag, after_tag=previous_tag).updateAppliedRule(\n
+order.activate(tag=tag, after_tag=expand_tag).updateAppliedRule(\n
rule_reference=\'default_open_order_rule\', activate_kw=activate_kw, **kw)\n
\n
\n
@@ -111,7 +112,8 @@ if order_portal_type == \'Open Sale Order\':\n
<string>order</string>
<string>transition_kw</string>
<string>_getattr_</string>
- <string>previous_tag</string>
+ <string>path</string>
+ <string>tag</string>
<string>expand_tag</string>
<string>activate_kw</string>
<string>kw</string>
diff --git a/bt5/erp5_open_trade/bt/change_log b/bt5/erp5_open_trade/bt/change_log
index f6795a1e74..848c72a4c8 100644
--- a/bt5/erp5_open_trade/bt/change_log
+++ b/bt5/erp5_open_trade/bt/change_log
@@ -1,3 +1,6 @@
+2010-05-24 kazuhiko
+* Improve activity dependencies for Delivery_updateAppliedRule, eg. delivery.activate(tag='(path)_updateAppliedRule', after_tag='(path)_expand').Delivery_updateAppliedRule(activate_kw={'tag':'(path)_expand'})
+
2010-03-17 tatuya
* Add a type based method Script (Python) so that Open Sale Order document will find the root applied rule.
diff --git a/bt5/erp5_open_trade/bt/revision b/bt5/erp5_open_trade/bt/revision
index 3f10ffe7a4..19c7bdba7b 100644
--- a/bt5/erp5_open_trade/bt/revision
+++ b/bt5/erp5_open_trade/bt/revision
@@ -1 +1 @@
-15
\ No newline at end of file
+16
\ No newline at end of file
--
2.30.9