* Improve activity dependencies for Delivery_updateAppliedRule, eg....

* 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@35555 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml

@@ -79,14 +79,15 @@ if builder_by_ptype.has_key(delivery_portal_type) :\n
   if delivery_portal_type == \'Pay Sheet Transaction\':\n
     PRIORITY     = 3\n
     pay_sheet    = delivery\n
-    previous_tag = pay_sheet.getPath() + \'_firstUpdateAppliedRule\'\n
-    expand_tag   = pay_sheet.getPath() + \'_expand\'\n
+    path         = pay_sheet.getPath()\n
+    tag          = \'%s_updateAppliedRule\' % path\n
+    expand_tag   = \'%s_expand\' % path\n
     activate_kw  = { \'tag\'     : expand_tag\n
                    , \'priority\': PRIORITY\n
                    }\n
 \n
-    pay_sheet.activate( tag       = expand_tag\n
-                      , after_tag = previous_tag\n
+    pay_sheet.activate( tag       = tag\n
+                      , after_tag = expand_tag\n
                       , priority  = PRIORITY\n
                       ).updateAppliedRule( rule_reference = \'default_invoice_rule\'\n
                                          , activate_kw = activate_kw\n
@@ -119,10 +120,10 @@ if builder_by_ptype.has_key(delivery_portal_type) :\n
   build_trade_model_tag = \'invoice_transaction_build_trade_model_%s\' % \\\n
                                  delivery.getRelativeUrl()\n
   build_accounting_tag = \'invoice_transaction_build_accounting_%s\' % delivery.getRelativeUrl()\n
-  update_applied_rule_tag = \'%s_updateAppliedRule\' % delivery.getPath()\n
+  expand_tag = \'%s_expand\' % delivery.getPath()\n
   builder.activate(\n
       activity=\'SQLQueue\',\n
-      after_tag=(update_applied_rule_tag,\n
+      after_tag=(expand_tag,\n
                  build_trade_model_tag,),\n
       tag=build_accounting_tag,\n
       activate_kw=dict(tag=build_accounting_tag)).build(\n
@@ -133,7 +134,7 @@ if builder_by_ptype.has_key(delivery_portal_type) :\n
   portal_deliveries.payment_transaction_builder.activate(\n
                       activity=\'SQLQueue\',\n
                       after_tag=( build_trade_model_tag,\n
-                                  update_applied_rule_tag,\n
+                                  expand_tag,\n
                                   build_accounting_tag, ),\n
                       ).build(\n
                           explanation_uid=explanation_uid_list)\n
@@ -194,7 +195,8 @@ if builder_by_ptype.has_key(delivery_portal_type) :\n
                             <string>builder</string>
                             <string>PRIORITY</string>
                             <string>pay_sheet</string>
-                            <string>previous_tag</string>
+                            <string>path</string>
+                            <string>tag</string>
                             <string>expand_tag</string>
                             <string>activate_kw</string>
                             <string>explanation_uid_list</string>
@@ -202,7 +204,6 @@ if builder_by_ptype.has_key(delivery_portal_type) :\n
                             <string>order</string>
                             <string>build_trade_model_tag</string>
                             <string>build_accounting_tag</string>
-                            <string>update_applied_rule_tag</string>
                             <string>dict</string>
                           </tuple>
                         </value>

bt5/erp5_accounting/bt/change_log

+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-05-05 Jérome
 * Add an action to add create an initial balance transaction, from an accounting period.
 

bt5/erp5_accounting/bt/revision

-1213
+1214
\ No newline at end of file

bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_simulation_interaction_workflow/scripts/Delivery_reindexRelatedSimulationMovement.xml

@@ -72,7 +72,7 @@ because that delivery builder builds after that tag.\n
 """\n
 \n
 delivery = state_change[\'object\']\n
-tag = \'%s_updateAppliedRule\' % delivery.getPath()\n
+tag = \'%s_expand\' % delivery.getPath()\n
 delivery.applyToDeliveryRelatedMovement(method_id=\'recursiveReindexObject\',\n
                                         activate_kw=dict(tag=tag))\n
 </string> </value>

bt5/erp5_base/bt/change_log

+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-05-20 kazuhiko
 * Add checkboxes for force_update property of Property Movement Group and Category Movement Group.
 

bt5/erp5_base/bt/revision

-749
+750
\ No newline at end of file

bt5/erp5_bpm/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_updateAppliedRule.xml

@@ -57,27 +57,31 @@
 \n
 activate_kw = {}\n
 related_order = packing_list.getCausalityValue()\n
-after_tag_list = []\n
+path = packing_list.getPath()\n
+tag = \'%s_updateAppliedRule\' % path\n
+expand_tag = \'%s_expand\' % path\n
+activate_kw = {\'tag\':expand_tag,\'priority\':3}\n
+after_tag_list = [expand_tag]\n
 if related_order is not None:\n
-  after_tag_list.append(related_order.getPath() + \'_firstUpdateAppliedRule\')\n
-  after_tag_list.append(related_order.getPath() + \'_expand\')\n
-tag = packing_list.getPath()+\'_expand\'\n
-activate_kw = {\'tag\':tag,\'priority\':3}\n
+  # XXX is it really required?\n
+  after_tag_list.append(\'%s_expand\' % related_order.getPath())\n
 \n
 packing_list.activate(after_tag=after_tag_list,\n
                       tag=tag,\n
-                      priority=3).updateAppliedRule(rule_reference=packing_list.getRuleReference(),\n
-                                                    activate_kw=activate_kw)\n
+                      priority=3).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
 \n
 \n
 # Make sure to reindex related simulation movement if we are already\n
 # simulated, call reindexObject, not immediateReindexObject so that\n
 # catalogObjectList will be called with many objects\n
+# XXX is it really required?\n
 packing_list.activate(after_tag=after_tag_list,\n
                       tag=tag,\n
                       priority=3).applyToDeliveryRelatedMovement(method_id=\'reindexObject\')\n
 \n
-packing_list.startBuilding()\n
+if packing_list.getCausalityState() == \'draft\':\n
+  packing_list.startBuilding()\n
+# XXX is it really required?\n
 packing_list.activate(\n
   after_tag = tag,\n
 ).updateCausalityState()\n
@@ -124,9 +128,11 @@ packing_list.activate(\n
                             <string>activate_kw</string>
                             <string>_getattr_</string>
                             <string>related_order</string>
+                            <string>path</string>
+                            <string>tag</string>
+                            <string>expand_tag</string>
                             <string>after_tag_list</string>
                             <string>None</string>
-                            <string>tag</string>
                           </tuple>
                         </value>
                     </item>

bt5/erp5_bpm/bt/change_log

+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'})
+
 2009-07-02 luke
 * change purpose of this business template
 

bt5/erp5_bpm/bt/revision

-253
+254
\ No newline at end of file

bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/scripts/PackingList_updateAppliedRule.xml

@@ -57,24 +57,31 @@
 \n
 activate_kw = {}\n
 related_order = packing_list.getCausalityValue()\n
-after_tag_list = []\n
+path = packing_list.getPath()\n
+tag = \'%s_updateAppliedRule\' % path\n
+expand_tag = \'%s_expand\' % path\n
+activate_kw = {\'tag\':expand_tag,\'priority\':3}\n
+after_tag_list = [expand_tag]\n
 if related_order is not None:\n
-  after_tag_list.append(related_order.getPath() + \'_firstUpdateAppliedRule\')\n
-  after_tag_list.append(related_order.getPath() + \'_expand\')\n
-tag = packing_list.getPath()+\'_expand\'\n
-activate_kw = {\'tag\':tag,\'priority\':3}\n
+  # XXX is it really required?\n
+  after_tag_list.append(\'%s_expand\' % related_order.getPath())\n
 \n
-packing_list.activate(after_tag=after_tag_list,tag=tag,\n
-    priority=3).updateAppliedRule(rule_reference=\'default_delivery_rule\',activate_kw=activate_kw)\n
+packing_list.activate(after_tag=after_tag_list,\n
+                      tag=tag,\n
+                      priority=3).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
 \n
 \n
 # Make sure to reindex related simulation movement if we are already\n
 # simulated, call reindexObject, not immediateReindexObject so that\n
 # catalogObjectList will be called with many objects\n
-packing_list.activate(after_tag=after_tag_list,tag=tag,\n
+# XXX is it really required?\n
+packing_list.activate(after_tag=after_tag_list,\n
+                      tag=tag,\n
                       priority=3).applyToDeliveryRelatedMovement(method_id=\'reindexObject\')\n
 \n
-packing_list.startBuilding()\n
+if packing_list.getCausalityState() == \'draft\':\n
+  packing_list.startBuilding()\n
+# XXX is it really required?\n
 packing_list.activate(\n
   after_tag = tag,\n
 ).updateCausalityState()\n
@@ -121,9 +128,11 @@ packing_list.activate(\n
                             <string>activate_kw</string>
                             <string>_getattr_</string>
                             <string>related_order</string>
+                            <string>path</string>
+                            <string>tag</string>
+                            <string>expand_tag</string>
                             <string>after_tag_list</string>
                             <string>None</string>
-                            <string>tag</string>
                           </tuple>
                         </value>
                     </item>

bt5/erp5_mrp/bt/change_log

+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-02 yusei
 * Remove short title.
 

bt5/erp5_mrp/bt/revision

-440
+441
\ No newline at end of file

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/PackingList_updateAppliedRule.xml

@@ -53,32 +53,35 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>LOG=lambda msg:context.log("PackingList_updateAppliedRule", msg)\n
-LOG=lambda msg:\'DISABLED\'\n
-\n
-packing_list = state_change[\'object\']\n
-\n
+            <value> <string>packing_list = state_change[\'object\']\n
 \n
 activate_kw = {}\n
 related_order = packing_list.getCausalityValue()\n
-after_tag_list = []\n
+path = packing_list.getPath()\n
+tag = \'%s_updateAppliedRule\' % path\n
+expand_tag = \'%s_expand\' % path\n
+activate_kw = {\'tag\':expand_tag,\'priority\':3}\n
+after_tag_list = [expand_tag]\n
 if related_order is not None:\n
-  after_tag_list.append(related_order.getPath() + \'_firstUpdateAppliedRule\')\n
-  after_tag_list.append(related_order.getPath() + \'_expand\')\n
-tag = packing_list.getPath()+\'_expand\'\n
-activate_kw = {\'tag\':tag,\'priority\':3}\n
+  # XXX is it really required?\n
+  after_tag_list.append(\'%s_expand\' % related_order.getPath())\n
 \n
-packing_list.activate(after_tag=after_tag_list,tag=tag,\n
-    priority=3).updateAppliedRule(rule_reference=\'default_delivery_rule\', activate_kw=activate_kw)\n
+packing_list.activate(after_tag=after_tag_list,\n
+                      tag=tag,\n
+                      priority=3).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
 \n
 \n
 # Make sure to reindex related simulation movement if we are already\n
 # simulated, call reindexObject, not immediateReindexObject so that\n
 # catalogObjectList will be called with many objects\n
-packing_list.activate(after_tag=after_tag_list,tag=tag,\n
+# XXX is it really required?\n
+packing_list.activate(after_tag=after_tag_list,\n
+                      tag=tag,\n
                       priority=3).applyToDeliveryRelatedMovement(method_id=\'reindexObject\')\n
 \n
-packing_list.startBuilding()\n
+if packing_list.getCausalityState() == \'draft\':\n
+  packing_list.startBuilding()\n
+# XXX is it really required?\n
 packing_list.activate(\n
   after_tag = tag,\n
 ).updateCausalityState()\n
@@ -120,15 +123,16 @@ packing_list.activate(\n
                           <tuple>
                             <string>state_change</string>
                             <string>kw</string>
-                            <string>LOG</string>
                             <string>_getitem_</string>
                             <string>packing_list</string>
                             <string>activate_kw</string>
                             <string>_getattr_</string>
                             <string>related_order</string>
+                            <string>path</string>
+                            <string>tag</string>
+                            <string>expand_tag</string>
                             <string>after_tag_list</string>
                             <string>None</string>
-                            <string>tag</string>
                           </tuple>
                         </value>
                     </item>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_buildTaskReport.xml

@@ -55,10 +55,12 @@
             <key> <string>_body</string> </key>
             <value> <string>task = state_change[\'object\']\n
 \n
-previous_tag = task.getPath() + \'_firstUpdateAppliedRule\'\n
-expand_tag = task.getPath() + \'_expand\'\n
-activate_kw = {\'tag\':expand_tag,\'priority\':3}\n
-task.activate(tag=expand_tag,after_tag=previous_tag).updateAppliedRule(rule_reference = \'default_order_rule\',activate_kw=activate_kw)\n
+path = task.getPath()\n
+tag = \'%s_updateAppliedRule\' % path\n
+expand_tag = \'%s_expand\' % path\n
+activate_kw = {\'tag\':expand_tag, \'priority\':3}\n
+\n
+task.activate(tag=tag, after_tag=expand_tag).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
 \n
 delivery_builder = task.portal_deliveries.task_report_builder\n
 delivery_builder.activate(activity=\'SQLQueue\',after_tag=expand_tag).build(explanation_uid=task.getUid())\n
@@ -102,7 +104,8 @@ delivery_builder.activate(activity=\'SQLQueue\',after_tag=expand_tag).build(expl
                             <string>_getitem_</string>
                             <string>task</string>
                             <string>_getattr_</string>
-                            <string>previous_tag</string>
+                            <string>path</string>
+                            <string>tag</string>
                             <string>expand_tag</string>
                             <string>activate_kw</string>
                             <string>delivery_builder</string>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_createOrderRule.xml

@@ -55,9 +55,12 @@
             <key> <string>_body</string> </key>
             <value> <string>task = state_change[\'object\']\n
 \n
-tag = task.getPath() + \'_firstUpdateAppliedRule\'\n
-activate_kw = {\'tag\':tag,\'priority\':3}\n
-task.activate(tag=tag).updateAppliedRule(rule_reference = \'default_order_rule\',activate_kw=activate_kw)\n
+path = task.getPath()\n
+tag = \'%s_updateAppliedRule\' % path\n
+expand_tag = \'%s_expand\' % path\n
+activate_kw = {\'tag\':expand_tag, \'priority\':3}\n
+\n
+task.activate(tag=tag, after_tag=expand_tag).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
 </string> </value>
         </item>
         <item>
@@ -99,7 +102,9 @@ task.activate(tag=tag).updateAppliedRule(rule_reference = \'default_order_rule\'
                             <string>_getitem_</string>
                             <string>task</string>
                             <string>_getattr_</string>
+                            <string>path</string>
                             <string>tag</string>
+                            <string>expand_tag</string>
                             <string>activate_kw</string>
                           </tuple>
                         </value>

bt5/erp5_project/bt/change_log

+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-04-09 kazuhiko
 * Make it possible to sort/search on Project Module view.
 * Allow Assignor to update validated Projects.

bt5/erp5_project/bt/revision

-762
+763
\ No newline at end of file

bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml

@@ -55,12 +55,12 @@
             <key> <string>_body</string> </key>
             <value> <string>order = state_change[\'object\']\n
 \n
-previous_tag = order.getPath() + \'_firstUpdateAppliedRule\'\n
-expand_tag = order.getPath() + \'_expand\'\n
-activate_kw = {\'tag\':expand_tag,\'priority\':3}\n
-order.activate(tag=expand_tag, after_tag=previous_tag).updateAppliedRule(\n
-             rule_reference=\'default_order_rule\', 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
 \n
 order_portal_type = order.getPortalType()\n
 builder_dict = {\n
@@ -111,7 +111,8 @@ delivery_builder.activate(activity=\'SQLQueue\',after_tag=expand_tag).build(expl
                             <string>_getitem_</string>
                             <string>order</string>
                             <string>_getattr_</string>
-                            <string>previous_tag</string>
+                            <string>path</string>
+                            <string>tag</string>
                             <string>expand_tag</string>
                             <string>activate_kw</string>
                             <string>order_portal_type</string>

bt5/erp5_trade/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=\'default_order_rule\',\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=\'default_order_rule\',
                             <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>

bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_updateAppliedRule.xml

@@ -57,27 +57,31 @@
 \n
 activate_kw = {}\n
 related_order = packing_list.getCausalityValue()\n
-after_tag_list = []\n
+path = packing_list.getPath()\n
+tag = \'%s_updateAppliedRule\' % path\n
+expand_tag = \'%s_expand\' % path\n
+activate_kw = {\'tag\':expand_tag,\'priority\':3}\n
+after_tag_list = [expand_tag]\n
 if related_order is not None:\n
-  after_tag_list.append(related_order.getPath() + \'_firstUpdateAppliedRule\')\n
-  after_tag_list.append(related_order.getPath() + \'_expand\')\n
-tag = packing_list.getPath()+\'_expand\'\n
-activate_kw = {\'tag\':tag,\'priority\':3}\n
+  # XXX is it really required?\n
+  after_tag_list.append(\'%s_expand\' % related_order.getPath())\n
 \n
 packing_list.activate(after_tag=after_tag_list,\n
                       tag=tag,\n
-                      priority=3).updateAppliedRule(rule_reference=\'default_delivery_rule\',\n
-                                                    activate_kw=activate_kw)\n
+                      priority=3).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
 \n
 \n
 # Make sure to reindex related simulation movement if we are already\n
 # simulated, call reindexObject, not immediateReindexObject so that\n
 # catalogObjectList will be called with many objects\n
+# XXX is it really required?\n
 packing_list.activate(after_tag=after_tag_list,\n
                       tag=tag,\n
                       priority=3).applyToDeliveryRelatedMovement(method_id=\'reindexObject\')\n
 \n
-packing_list.startBuilding()\n
+if packing_list.getCausalityState() == \'draft\':\n
+  packing_list.startBuilding()\n
+# XXX is it really required?\n
 packing_list.activate(\n
   after_tag = tag,\n
 ).updateCausalityState()\n
@@ -124,9 +128,11 @@ packing_list.activate(\n
                             <string>activate_kw</string>
                             <string>_getattr_</string>
                             <string>related_order</string>
+                            <string>path</string>
+                            <string>tag</string>
+                            <string>expand_tag</string>
                             <string>after_tag_list</string>
                             <string>None</string>
-                            <string>tag</string>
                           </tuple>
                         </value>
                     </item>

bt5/erp5_trade/bt/change_log

+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-05-24 yusei
 * Update Movement_getUseItemList. Add an empty select option to the result.
 

bt5/erp5_trade/bt/revision

-944
+945
\ No newline at end of file