[Erp5-report] r38742 tatuya - in /erp5/trunk/bt5/erp5_base: WorkflowTemplateItem/portal_wor...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Sep 29 11:17:42 CEST 2010
Author: tatuya
Date: Wed Sep 29 11:17:37 2010
New Revision: 38742
URL: http://svn.erp5.org?rev=38742&view=rev
Log:
2010-09-28 tatuya
* Stop overwriting a value by movement_resource_interaraction_workflow when the categories are already set a valid value as the new resource.
Modified:
erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyBaseContributionFromResource.xml
erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyQuantityUnitFromResource.xml
erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyUseFromResource.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/scripts/Movement_copyBaseContributionFromResource.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyBaseContributionFromResource.xml?rev=38742&r1=38741&r2=38742&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyBaseContributionFromResource.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyBaseContributionFromResource.xml [utf8] Wed Sep 29 11:17:37 2010
@@ -2,10 +2,7 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
- <tuple>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- <tuple/>
- </tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
@@ -57,7 +54,12 @@
\n
resource = movement.getResourceValue()\n
if resource is not None:\n
- movement.setBaseContributionList(resource.getBaseContributionList())\n
+ # if the movement already have a base contribution which is valid for this resource, don\'t change it\n
+ movement_base_contribution = movement.getBaseContribution()\n
+ if movement_base_contribution and movement_base_contribution in resource.getBaseContributionList():\n
+ return\n
+ # otherwise initialise to the default base contribution\n
+ movement.setBaseContribution(resource.getDefaultBaseContribution())\n
</string> </value>
</item>
<item>
@@ -108,6 +110,7 @@ if resource is not None:\n
<string>_getattr_</string>
<string>resource</string>
<string>None</string>
+ <string>movement_base_contribution</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyQuantityUnitFromResource.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyQuantityUnitFromResource.xml?rev=38742&r1=38741&r2=38742&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyQuantityUnitFromResource.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyQuantityUnitFromResource.xml [utf8] Wed Sep 29 11:17:37 2010
@@ -2,10 +2,7 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
- <tuple>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- <tuple/>
- </tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
@@ -57,6 +54,11 @@
\n
resource = movement.getResourceValue()\n
if resource is not None:\n
+ # if the movement already have a quantity unit which is valid for this resource, don\'t change it\n
+ movement_quantity_unit = movement.getQuantityUnit()\n
+ if movement_quantity_unit and movement_quantity_unit in resource.getQuantityUnitList():\n
+ return\n
+ # otherwise initialise to the default quantity unit\n
movement.setQuantityUnit(resource.getDefaultQuantityUnit())\n
</string> </value>
</item>
@@ -108,6 +110,7 @@ if resource is not None:\n
<string>_getattr_</string>
<string>resource</string>
<string>None</string>
+ <string>movement_quantity_unit</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyUseFromResource.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyUseFromResource.xml?rev=38742&r1=38741&r2=38742&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyUseFromResource.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyUseFromResource.xml [utf8] Wed Sep 29 11:17:37 2010
@@ -2,10 +2,7 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
- <tuple>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- <tuple/>
- </tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
@@ -57,6 +54,11 @@
\n
resource = movement.getResourceValue()\n
if resource is not None:\n
+ # if the movement already have a use which is valid for this resource, don\'t change it\n
+ movement_use = movement.getUse()\n
+ if movement_use and movement_use in resource.getUseList():\n
+ return\n
+ # otherwise initialise to the default use\n
movement.setUse(resource.getDefaultUse())\n
</string> </value>
</item>
@@ -108,6 +110,7 @@ if resource is not None:\n
<string>_getattr_</string>
<string>resource</string>
<string>None</string>
+ <string>movement_use</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_base/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/change_log?rev=38742&r1=38741&r2=38742&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/change_log [utf8] Wed Sep 29 11:17:37 2010
@@ -1,4 +1,7 @@
2010-09-28 tatuya
+* Stop overwriting a value by movement_resource_interaraction_workflow when the categories are already set a valid value as the new resource.
+
+2010-09-28 tatuya
* Previous commits(r38692,38707) were not solved the issue that movement_resource_interaction_workflow prevents the delivery buliding. So, revert them.
2010-09-28 tatuya
Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=38742&r1=38741&r2=38742&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Wed Sep 29 11:17:37 2010
@@ -1 +1 @@
-866
\ No newline at end of file
+867
\ No newline at end of file
More information about the Erp5-report
mailing list