[Erp5-report] r21330 - in /erp5/trunk/bt5/erp5_item: WorkflowTemplateItem/portal_workflow/a...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jun 5 00:13:03 CEST 2008
Author: rafael
Date: Thu Jun 5 00:13:02 2008
New Revision: 21330
URL: http://svn.erp5.org?rev=21330&view=rev
Log:
Make Interaction workflow less intrusive
Modified:
erp5/trunk/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/aggregate_interaction_workflow/scripts/Movement_setQuantity.xml
erp5/trunk/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/aggregate_interaction_workflow/scripts/Movement_setResource.xml
erp5/trunk/bt5/erp5_item/bt/revision
Modified: erp5/trunk/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/aggregate_interaction_workflow/scripts/Movement_setQuantity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/aggregate_interaction_workflow/scripts/Movement_setQuantity.xml?rev=21330&r1=21329&r2=21330&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/aggregate_interaction_workflow/scripts/Movement_setQuantity.xml (original)
+++ erp5/trunk/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/aggregate_interaction_workflow/scripts/Movement_setQuantity.xml Thu Jun 5 00:13:02 2008
@@ -65,12 +65,18 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>order = state_change[\'object\']\n
+ <value> <string encoding="cdata"><![CDATA[
+
+order = state_change[\'object\']\n
\n
item_list = order.getAggregateValueList()\n
quantity = sum([ i.getQuantity() for i in item_list if i.getQuantity() is not None ])\n
-order.setQuantity(quantity)\n
-</string> </value>
+\n
+if quantity > order.getQuantity():\n
+ order.setQuantity(quantity)\n
+
+
+]]></string> </value>
</item>
<item>
<key> <string>_code</string> </key>
Modified: erp5/trunk/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/aggregate_interaction_workflow/scripts/Movement_setResource.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/aggregate_interaction_workflow/scripts/Movement_setResource.xml?rev=21330&r1=21329&r2=21330&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/aggregate_interaction_workflow/scripts/Movement_setResource.xml (original)
+++ erp5/trunk/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/aggregate_interaction_workflow/scripts/Movement_setResource.xml Thu Jun 5 00:13:02 2008
@@ -68,13 +68,14 @@
<value> <string>order = state_change[\'object\']\n
\n
resource_list = [ ]\n
-for item in order.getAggregateValueList():\n
- resource = item.Item_getResourceValue()\n
- if resource not in resource_list or (resource is not None):\n
- resource_list.append(resource)\n
+if order.getResourceValue() in [\'\', None ]:\n
+ for item in order.getAggregateValueList():\n
+ resource = item.Item_getResourceValue()\n
+ if resource not in resource_list or (resource is not None):\n
+ resource_list.append(resource)\n
\n
-if len(resource_list) == 1: \n
- order.setResourceValue(resource)\n
+ if len(resource_list) == 1: \n
+ order.setResourceValue(resource)\n
</string> </value>
</item>
<item>
@@ -121,11 +122,11 @@
<string>_getitem_</string>
<string>order</string>
<string>resource_list</string>
+ <string>_getattr_</string>
+ <string>None</string>
<string>_getiter_</string>
- <string>_getattr_</string>
<string>item</string>
<string>resource</string>
- <string>None</string>
<string>len</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_item/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/revision?rev=21330&r1=21329&r2=21330&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/revision (original)
+++ erp5/trunk/bt5/erp5_item/bt/revision Thu Jun 5 00:13:02 2008
@@ -1,1 +1,1 @@
-44
+45
More information about the Erp5-report
mailing list