[Erp5-report] r19281 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Feb 12 17:16:03 CET 2008
Author: kazuhiko
Date: Tue Feb 12 17:16:02 2008
New Revision: 19281
URL: http://svn.erp5.org?rev=19281&view=rev
Log:
2007-02-12 kazuhiko
* use related_simulation_movement_path_list to reduce activity dependencies.
Modified:
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_copyOrderProperties.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml
erp5/trunk/bt5/erp5_trade/bt/change_log
erp5/trunk/bt5/erp5_trade/bt/revision
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml?rev=19281&r1=19280&r2=19281&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml Tue Feb 12 17:16:02 2008
@@ -72,9 +72,7 @@
# Modify state\n
packing_list_state = packing_list.getSimulationState()\n
if packing_list_state == "draft":\n
- packing_list.portal_workflow.doActionFor(\n
- packing_list, \'confirm_action\',\n
- comment=Message(\'erp5_ui\', "Initialized by Delivery Builder"))\n
+ packing_list.confirm(comment=Message(\'erp5_ui\', \'Initialized by Delivery Builder\'))\n
</string> </value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_copyOrderProperties.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_copyOrderProperties.xml?rev=19281&r1=19280&r2=19281&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_copyOrderProperties.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_copyOrderProperties.xml Tue Feb 12 17:16:02 2008
@@ -65,22 +65,26 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>packing_list = context\n
+ <value> <string>if related_simulation_movement_path_list is None:\n
+ raise RuntimeError, \'related_simulation_movement_path_list is missing. Update ERP5 Product.\'\n
+\n
+packing_list = context\n
\n
# First, copy Order properties\n
packing_list.PackingList_copyOrderProperties()\n
\n
# Then, modify state\n
-activity = packing_list.activate(\n
- after_method_id=[\'immediateReindexObject\',\n
- \'recursiveImmediateReindexObject\'])\n
-activity.Delivery_confirm()\n
+confirm_tag = \'%s_confirm\' % packing_list.getPath()\n
+packing_list.activate(after_path_and_method_id=(related_simulation_movement_path_list,\n
+ (\'immediateReindexObject\',\'recursiveImmediateReindexObject\')),\n
+ tag=confirm_tag).Delivery_confirm()\n
\n
# First set the packing_list in the building state\n
packing_list.startBuilding()\n
# Then an activity should put the causality state in diverged or solved\n
-# XXX after_method_id is not good, it should be after_group_id, but not yet implemented\n
-packing_list.activate(after_method_id=(\'immediateReindexObject\',\'recursiveImmediateReindexObject\',\'Delivery_confirm\')).updateCausalityState()\n
+packing_list.activate(after_path_and_method_id=(related_simulation_movement_path_list,\n
+ (\'immediateReindexObject\',\'recursiveImmediateReindexObject\')),\n
+ after_tag=confirm_tag).updateCausalityState()\n
</string> </value>
</item>
<item>
@@ -97,7 +101,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string></string> </value>
+ <value> <string>related_simulation_movement_path_list=None</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -117,16 +121,19 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>0</int> </value>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
+ <string>related_simulation_movement_path_list</string>
+ <string>None</string>
+ <string>RuntimeError</string>
<string>context</string>
<string>packing_list</string>
<string>_getattr_</string>
- <string>activity</string>
+ <string>confirm_tag</string>
</tuple>
</value>
</item>
@@ -138,7 +145,9 @@
<item>
<key> <string>func_defaults</string> </key>
<value>
- <none/>
+ <tuple>
+ <none/>
+ </tuple>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml?rev=19281&r1=19280&r2=19281&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml Tue Feb 12 17:16:02 2008
@@ -65,7 +65,10 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>from Products.ERP5Type.Message import Message\n
+ <value> <string>if related_simulation_movement_path_list is None:\n
+ raise RuntimeError, \'related_simulation_movement_path_list is missing. Update ERP5 Product.\'\n
+\n
+from Products.ERP5Type.Message import Message\n
\n
packing_list = context\n
\n
@@ -76,15 +79,13 @@
packing_list_state = packing_list.getSimulationState()\n
\n
if packing_list_state == "draft":\n
- packing_list.portal_workflow.doActionFor(\n
- packing_list, \'confirm_action\',\n
- comment=Message(\'erp5_ui\', "Initialized by Delivery Builder"))\n
+ packing_list.confirm(comment=Message(\'erp5_ui\', \'Initialized by Delivery Builder\'))\n
\n
# First set the packing_list in the building state\n
packing_list.startBuilding()\n
# Then an activity should put the causality state in diverged or solved\n
-# XXX after_method_id is not good, it should be after_group_id, but not yet implemented\n
-packing_list.activate(after_method_id=(\'immediateReindexObject\',\'recursiveImmediateReindexObject\',\'Delivery_confirm\')).updateCausalityState(fast=1)\n
+packing_list.activate(after_path_and_method_id=(related_simulation_movement_path_list,\n
+ (\'immediateReindexObject\',\'recursiveImmediateReindexObject\'))).updateCausalityState(fast=1)\n
</string> </value>
</item>
<item>
@@ -101,7 +102,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string></string> </value>
+ <value> <string>related_simulation_movement_path_list=None</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -121,12 +122,15 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>0</int> </value>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
+ <string>related_simulation_movement_path_list</string>
+ <string>None</string>
+ <string>RuntimeError</string>
<string>Products.ERP5Type.Message</string>
<string>Message</string>
<string>context</string>
@@ -144,7 +148,9 @@
<item>
<key> <string>func_defaults</string> </key>
<value>
- <none/>
+ <tuple>
+ <none/>
+ </tuple>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_trade/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/change_log?rev=19281&r1=19280&r2=19281&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_trade/bt/change_log Tue Feb 12 17:16:02 2008
@@ -1,3 +1,6 @@
+2007-02-12 kazuhiko
+* use related_simulation_movement_path_list to reduce activity dependencies.
+
2007-11-14 kazuhiko
* check if simulation state is draft or not before calling 'calculate' workflow method otherwise causality state can remain calculating.
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=19281&r1=19280&r2=19281&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision Tue Feb 12 17:16:02 2008
@@ -1,1 +1,1 @@
-181
+182
More information about the Erp5-report
mailing list