[Erp5-report] r38790 yusei - in /erp5/trunk/bt5/erp5_base: WorkflowTemplateItem/portal_work...

[nobody at svn.erp5.org]

Author: yusei
Date: Thu Sep 30 12:53:02 2010
New Revision: 38790

URL: http://svn.erp5.org?rev=38790&view=rev
Log:
2010-09-30 yusei
* Update movement_resource_interaction_workflow and set quantity unit value to movement forcedly if current value is acquired from resource.

Modified:
    erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyQuantityUnitFromResource.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_copyQuantityUnitFromResource.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyQuantityUnitFromResource.xml?rev=38790&r1=38789&r2=38790&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] Thu Sep 30 12:53:02 2010
@@ -54,10 +54,13 @@
 \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
+  # quantity unit can be acquired from resource.\n
+  # (Amount class has getQuantityUnit method for backward compatibility and it tries to acquire value from resource).\n
+  if movement.hasCategory(\'quantity_unit\'):\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>

Modified: erp5/trunk/bt5/erp5_base/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/change_log?rev=38790&r1=38789&r2=38790&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/change_log [utf8] Thu Sep 30 12:53:02 2010
@@ -1,3 +1,6 @@
+2010-09-30 yusei
+* Update movement_resource_interaction_workflow and set quantity unit value to movement forcedly if current value is acquired from resource.
+
 2010-09-28 tatuya
 * Fix a issue that all the base contribution are not copied when change the resource on a movement.
 

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=38790&r1=38789&r2=38790&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Thu Sep 30 12:53:02 2010
@@ -1 +1 @@
-868
\ No newline at end of file
+869
\ No newline at end of file