[Erp5-report] r35571 kazuhiko - in /erp5/trunk/bt5: erp5_base/SkinTemplateItem/portal_skins...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon May 24 16:17:41 CEST 2010
Author: kazuhiko
Date: Mon May 24 16:17:38 2010
New Revision: 35571
URL: http://svn.erp5.org?rev=35571&view=rev
Log:
* 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_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_updateSimulation.xml
erp5/trunk/bt5/erp5_base/bt/revision
erp5/trunk/bt5/erp5_bpm/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml
erp5/trunk/bt5/erp5_bpm/bt/revision
erp5/trunk/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml
erp5/trunk/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_createOrderRule.xml
erp5/trunk/bt5/erp5_mrp/bt/revision
erp5/trunk/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_buildSaleOrder.xml
erp5/trunk/bt5/erp5_open_trade/bt/change_log
erp5/trunk/bt5/erp5_open_trade/bt/revision
Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_updateSimulation.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_updateSimulation.xml?rev=35571&r1=35570&r2=35571&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_updateSimulation.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_updateSimulation.xml [utf8] Mon May 24 16:17:38 2010
@@ -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 @@
<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>
Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=35571&r1=35570&r2=35571&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Mon May 24 16:17:38 2010
@@ -1,1 +1,1 @@
-750
+751
Modified: erp5/trunk/bt5/erp5_bpm/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_bpm/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml?rev=35571&r1=35570&r2=35571&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_bpm/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_bpm/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml [utf8] Mon May 24 16:17:38 2010
@@ -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 @@
<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>
Modified: erp5/trunk/bt5/erp5_bpm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_bpm/bt/revision?rev=35571&r1=35570&r2=35571&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_bpm/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_bpm/bt/revision [utf8] Mon May 24 16:17:38 2010
@@ -1,1 +1,1 @@
-254
+255
Modified: erp5/trunk/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml?rev=35571&r1=35570&r2=35571&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml [utf8] Mon May 24 16:17:38 2010
@@ -74,10 +74,10 @@
]\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
Modified: erp5/trunk/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_createOrderRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_createOrderRule.xml?rev=35571&r1=35570&r2=35571&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_createOrderRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_createOrderRule.xml [utf8] Mon May 24 16:17:38 2010
@@ -64,9 +64,11 @@
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 @@
<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>
Modified: erp5/trunk/bt5/erp5_mrp/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/bt/revision?rev=35571&r1=35570&r2=35571&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/bt/revision [utf8] Mon May 24 16:17:38 2010
@@ -1,1 +1,1 @@
-441
+442
Modified: erp5/trunk/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_buildSaleOrder.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_buildSaleOrder.xml?rev=35571&r1=35570&r2=35571&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_buildSaleOrder.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/scripts/OpenOrder_buildSaleOrder.xml [utf8] Mon May 24 16:17:38 2010
@@ -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 @@
<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>
Modified: erp5/trunk/bt5/erp5_open_trade/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_open_trade/bt/change_log?rev=35571&r1=35570&r2=35571&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_open_trade/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_open_trade/bt/change_log [utf8] Mon May 24 16:17:38 2010
@@ -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.
Modified: erp5/trunk/bt5/erp5_open_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_open_trade/bt/revision?rev=35571&r1=35570&r2=35571&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_open_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_open_trade/bt/revision [utf8] Mon May 24 16:17:38 2010
@@ -1,1 +1,1 @@
-15
+16
More information about the Erp5-report
mailing list