From 1d17e68bdd214852548e36eb17b835bfd04d7b80 Mon Sep 17 00:00:00 2001 From: Yusei Tahara <yusei@nexedi.com> Date: Thu, 30 Sep 2010 10:53:02 +0000 Subject: [PATCH] 2010-09-30 yusei * Update movement_resource_interaction_workflow and set quantity unit value to movement forcedly if current value is acquired from resource. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38790 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../scripts/Movement_copyQuantityUnitFromResource.xml | 11 +++++++---- bt5/erp5_base/bt/change_log | 3 +++ bt5/erp5_base/bt/revision | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyQuantityUnitFromResource.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyQuantityUnitFromResource.xml index 595865de21..32fb735fc5 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyQuantityUnitFromResource.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyQuantityUnitFromResource.xml @@ -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> diff --git a/bt5/erp5_base/bt/change_log b/bt5/erp5_base/bt/change_log index 6f9f41ec2f..0a6f86c433 100644 --- a/bt5/erp5_base/bt/change_log +++ b/bt5/erp5_base/bt/change_log @@ -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. diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index e39afc8dd2..354d30ba65 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -868 \ No newline at end of file +869 \ No newline at end of file -- 2.30.9