[Erp5-report] r38707 tatuya - in /erp5/trunk/bt5/erp5_base: WorkflowTemplateItem/portal_wor...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Sep 28 12:35:02 CEST 2010
Author: tatuya
Date: Tue Sep 28 12:34:58 2010
New Revision: 38707
URL: http://svn.erp5.org?rev=38707&view=rev
Log:
2010-09-28 tatuya
* Stop to overwriting a value by movement_resource_interaraction_workflow when the movement is created by a builder.
Modified:
erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions/setBaseContribution.xml
erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions/setQuantityUnit.xml
erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions/setUse.xml
erp5/trunk/bt5/erp5_base/bt/change_log
erp5/trunk/bt5/erp5_base/bt/revision
Modified: erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions/setBaseContribution.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions/setBaseContribution.xml?rev=38707&r1=38706&r2=38707&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions/setBaseContribution.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions/setBaseContribution.xml [utf8] Tue Sep 28 12:34:58 2010
@@ -40,12 +40,16 @@
</item>
<item>
<key> <string>description</string> </key>
- <value> <string></string> </value>
+ <value> <string>Set a value from the resource except when the movement is created by builders.\r\n
+\r\n
+In the Expression, getOid() returns None when the movement is not persistent as a ZODB object.\r\n
+Using getOid(), we predict that it is created by builders. Also, we check whether the builder intended to set a value or not.\r\n
+When the movement already has a value in the end of the transaction, we use it instead of coping from the resource.</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
- <none/>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
@@ -87,4 +91,32 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>expr</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>python:not(here.getOid() is None and here.getBaseContribution() is not None)</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions/setQuantityUnit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions/setQuantityUnit.xml?rev=38707&r1=38706&r2=38707&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions/setQuantityUnit.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions/setQuantityUnit.xml [utf8] Tue Sep 28 12:34:58 2010
@@ -40,12 +40,16 @@
</item>
<item>
<key> <string>description</string> </key>
- <value> <string></string> </value>
+ <value> <string>Set a value from the resource except when the movement is created by builders.\r\n
+\r\n
+In the Expression, getOid() returns None when the movement is not persistent as a ZODB object.\r\n
+Using getOid(), we predict that it is created by builders. Also, we check whether the builder intended to set a value or not.\r\n
+When the movement already has a value in the end of the transaction, we use it instead of coping from the resource.</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
- <none/>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
@@ -87,4 +91,32 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>expr</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>python:not(here.getOid() is None and here.getQuantityUnit() is not None)</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions/setUse.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions/setUse.xml?rev=38707&r1=38706&r2=38707&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions/setUse.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/interactions/setUse.xml [utf8] Tue Sep 28 12:34:58 2010
@@ -40,12 +40,16 @@
</item>
<item>
<key> <string>description</string> </key>
- <value> <string></string> </value>
+ <value> <string>Set a value from the resource except when the movement is created by builders.\r\n
+\r\n
+In the Expression, getOid() returns None when the movement is not persistent as a ZODB object.\r\n
+Using getOid(), we predict that it is created by builders. Also, we check whether the builder intended to set a value or not.\r\n
+When the movement already has a value in the end of the transaction, we use it instead of coping from the resource.</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
- <none/>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
@@ -87,4 +91,32 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="Guard" module="Products.DCWorkflow.Guard"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>expr</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>python:not (here.getOid() is None and here.getUse() is not None)</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_base/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/change_log?rev=38707&r1=38706&r2=38707&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/change_log [utf8] Tue Sep 28 12:34:58 2010
@@ -1,3 +1,6 @@
+2010-09-28 tatuya
+* Stop to overwriting a value by movement_resource_interaraction_workflow when the movement is created by a builder.
+
2010-09-28 yo
* Make the interaction update_simulation called only once.
Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=38707&r1=38706&r2=38707&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Tue Sep 28 12:34:58 2010
@@ -1 +1 @@
-853
\ No newline at end of file
+854
\ No newline at end of file
More information about the Erp5-report
mailing list