[Erp5-report] r35844 kazuhiko - in /erp5/trunk/bt5/erp5_trade: WorkflowTemplateItem/portal_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Jun 1 09:22:36 CEST 2010
Author: kazuhiko
Date: Tue Jun 1 09:22:35 2010
New Revision: 35844
URL: http://svn.erp5.org?rev=35844&view=rev
Log:
* Use the same dependencies for Delivery_updateApplideRule to make it possible to merge activities.
Modified:
erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml
erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml
erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_updateAppliedRule.xml
erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_model_line_interaction_workflow/scripts/TradeModelLine_updateParentDeliverySimulation.xml
erp5/trunk/bt5/erp5_trade/bt/change_log
erp5/trunk/bt5/erp5_trade/bt/revision
Modified: erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml?rev=35844&r1=35843&r2=35844&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml [utf8] Tue Jun 1 09:22:35 2010
@@ -54,13 +54,23 @@
<item>
<key> <string>_body</string> </key>
<value> <string>order = state_change[\'object\']\n
+order_path = order.getPath()\n
+path_and_method_id = (order_path, (\'immediateReindexObject\',\'recursiveImmediateReindexObject\'))\n
+expand_tag = order_path + \'_expand\'\n
+tag = order_path + \'_updateAppliedRule\'\n
\n
-path = order.getPath()\n
-tag = \'%s_updateAppliedRule\' % path\n
-expand_tag = \'%s_expand\' % path\n
-activate_kw = {\'tag\':expand_tag, \'priority\':3}\n
+priority = 3\n
\n
-order.activate(tag=tag, after_tag=expand_tag).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
+activate_kw = { \n
+ \'tag\': expand_tag,\n
+ \'priority\': priority,\n
+}\n
+order.activate(\n
+ after_path_and_method_id=path_and_method_id,\n
+ after_tag=expand_tag,\n
+ tag=tag,\n
+ priority=priority,\n
+ ).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
\n
order_portal_type = order.getPortalType()\n
builder_dict = {\n
@@ -68,7 +78,7 @@
\'Purchase Order\':\'purchase_packing_list_builder\',\n
\'Internal Order\':\'internal_packing_list_builder\',\n
}\n
-delivery_builder = getattr(order.portal_deliveries, builder_dict[order_portal_type])\n
+delivery_builder = getattr(order.getPortalObject().portal_deliveries, builder_dict[order_portal_type])\n
\n
delivery_builder.activate(activity=\'SQLQueue\', after_tag=(tag, expand_tag)).build(explanation_uid=order.getUid())\n
</string> </value>
@@ -111,9 +121,11 @@
<string>_getitem_</string>
<string>order</string>
<string>_getattr_</string>
- <string>path</string>
+ <string>order_path</string>
+ <string>path_and_method_id</string>
+ <string>expand_tag</string>
<string>tag</string>
- <string>expand_tag</string>
+ <string>priority</string>
<string>activate_kw</string>
<string>order_portal_type</string>
<string>builder_dict</string>
Modified: erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml?rev=35844&r1=35843&r2=35844&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml [utf8] Tue Jun 1 09:22:35 2010
@@ -54,13 +54,23 @@
<item>
<key> <string>_body</string> </key>
<value> <string>order = state_change[\'object\']\n
+order_path = order.getPath()\n
+path_and_method_id = (order_path, (\'immediateReindexObject\',\'recursiveImmediateReindexObject\'))\n
+expand_tag = order_path + \'_expand\'\n
+tag = order_path + \'_updateAppliedRule\'\n
\n
-path = order.getPath()\n
-tag = \'%s_updateAppliedRule\' % path\n
-expand_tag = \'%s_expand\' % path\n
-activate_kw = {\'tag\':expand_tag, \'priority\':3}\n
+priority = 3\n
\n
-order.activate(tag=tag, after_tag=expand_tag).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
+activate_kw = { \n
+ \'tag\': expand_tag,\n
+ \'priority\': priority,\n
+}\n
+order.activate(\n
+ after_path_and_method_id=path_and_method_id,\n
+ after_tag=expand_tag,\n
+ tag=tag,\n
+ priority=priority,\n
+ ).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
</string> </value>
</item>
<item>
@@ -102,9 +112,11 @@
<string>_getitem_</string>
<string>order</string>
<string>_getattr_</string>
- <string>path</string>
+ <string>order_path</string>
+ <string>path_and_method_id</string>
+ <string>expand_tag</string>
<string>tag</string>
- <string>expand_tag</string>
+ <string>priority</string>
<string>activate_kw</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_updateAppliedRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_updateAppliedRule.xml?rev=35844&r1=35843&r2=35844&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_updateAppliedRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_updateAppliedRule.xml [utf8] Tue Jun 1 09:22:35 2010
@@ -60,6 +60,7 @@
path = packing_list.getPath()\n
tag = \'%s_updateAppliedRule\' % path\n
expand_tag = \'%s_expand\' % path\n
+path_and_method_id = (path, (\'immediateReindexObject\',\'recursiveImmediateReindexObject\'))\n
activate_kw = {\'tag\':expand_tag,\'priority\':3}\n
after_tag_list = [expand_tag]\n
if related_order is not None:\n
@@ -68,6 +69,7 @@
\n
packing_list.activate(after_tag=after_tag_list,\n
tag=tag,\n
+ after_path_and_method_id=path_and_method_id,\n
priority=3).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
\n
\n
@@ -77,6 +79,7 @@
# XXX is it really required?\n
packing_list.activate(after_tag=after_tag_list,\n
tag=tag,\n
+ after_path_and_method_id=path_and_method_id,\n
priority=3).applyToDeliveryRelatedMovement(method_id=\'reindexObject\')\n
\n
if packing_list.getCausalityState() == \'draft\':\n
@@ -131,6 +134,7 @@
<string>path</string>
<string>tag</string>
<string>expand_tag</string>
+ <string>path_and_method_id</string>
<string>after_tag_list</string>
<string>None</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_model_line_interaction_workflow/scripts/TradeModelLine_updateParentDeliverySimulation.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_model_line_interaction_workflow/scripts/TradeModelLine_updateParentDeliverySimulation.xml?rev=35844&r1=35843&r2=35844&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_model_line_interaction_workflow/scripts/TradeModelLine_updateParentDeliverySimulation.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_model_line_interaction_workflow/scripts/TradeModelLine_updateParentDeliverySimulation.xml [utf8] Tue Jun 1 09:22:35 2010
@@ -61,8 +61,10 @@
return\n
\n
# copy&paste from delivery_movement_simulation_interaction_workflow/scripts/DeliveryMovement_updateSimulation\n
-path_and_method_id = (delivery.getPath(), (\'immediateReindexObject\',\'recursiveImmediateReindexObject\'))\n
-expand_tag = delivery.getPath() + \'_updateAppliedRule\'\n
+delivery_path = delivery.getPath()\n
+path_and_method_id = (delivery_path, (\'immediateReindexObject\',\'recursiveImmediateReindexObject\'))\n
+expand_tag = delivery_path + \'_updateAppliedRule\'\n
+tag = delivery_path + \'_updateAppliedRule\'\n
\n
priority = 3\n
\n
@@ -72,7 +74,8 @@
}\n
delivery.activate(\n
after_path_and_method_id=path_and_method_id,\n
- tag=expand_tag,\n
+ after_tag=expand_tag,\n
+ tag=tag,\n
priority=priority,\n
).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
@@ -119,6 +122,7 @@
<string>delivery</string>
<string>path_and_method_id</string>
<string>expand_tag</string>
+ <string>tag</string>
<string>priority</string>
<string>activate_kw</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_trade/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/change_log?rev=35844&r1=35843&r2=35844&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/change_log [utf8] Tue Jun 1 09:22:35 2010
@@ -1,3 +1,6 @@
+2010-06-01 kazuhiko
+* Use the same dependencies for Delivery_updateApplideRule to make it possible to merge activities.
+
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'})
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=35844&r1=35843&r2=35844&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Tue Jun 1 09:22:35 2010
@@ -1,1 +1,1 @@
-946
+947
More information about the Erp5-report
mailing list