[Erp5-report] r38773 tatuya - in /erp5/trunk/bt5/erp5_base: WorkflowTemplateItem/portal_wor...

[nobody at svn.erp5.org]

Author: tatuya
Date: Thu Sep 30 06:46:18 2010
New Revision: 38773

URL: http://svn.erp5.org?rev=38773&view=rev
Log:
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/WorkflowTemplateItem/portal_workflow/movement_resource_interaction_workflow/scripts/Movement_copyBaseContributionFromResource.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=38773&r1=38772&r2=38773&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] Thu Sep 30 06:46:18 2010
@@ -54,12 +54,10 @@
 \n
 resource = movement.getResourceValue()\n
 if resource is not None:\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
+  # We can over-write base contribution list always.\n
+  # Because when we change the resource, we need to set all the base contribution into movement.\n
+  # Imagine that we buy a product which have complex tax definitions with discounting.\n
+  movement.setBaseContributionList(resource.getBaseContributionList())\n
 </string> </value>
         </item>
         <item>
@@ -110,7 +108,6 @@ 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/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/change_log?rev=38773&r1=38772&r2=38773&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/change_log [utf8] Thu Sep 30 06:46:18 2010
@@ -1,4 +1,7 @@
 2010-09-28 tatuya
+* Fix a issue that all the base contribution are not copied when change the resource on a movement.
+
+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

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=38773&r1=38772&r2=38773&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Thu Sep 30 06:46:18 2010
@@ -1 +1 @@
-867
\ No newline at end of file
+868
\ No newline at end of file