[Erp5-report] r38741 tatuya - /erp5/trunk/products/ERP5/Document/DeliveryLine.py

[nobody at svn.erp5.org]

Author: tatuya
Date: Wed Sep 29 10:23:17 2010
New Revision: 38741

URL: http://svn.erp5.org?rev=38741&view=rev
Log:
Revert r38738, 38737, 38736.
For fix the bug, we do not care the backward compatibility because movement_resource_interaction_workflow created for fix an existed bug and introduced a new feature. This means that movement_resource_interaction_workflow has not fixed the bug completly. So, we can think another better way.(which no need to do hardcoding).

Modified:
    erp5/trunk/products/ERP5/Document/DeliveryLine.py

Modified: erp5/trunk/products/ERP5/Document/DeliveryLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/DeliveryLine.py?rev=38741&r1=38740&r2=38741&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/DeliveryLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/DeliveryLine.py [utf8] Wed Sep 29 10:23:17 2010
@@ -75,7 +75,6 @@ class DeliveryLine(Movement, XMLObject, 
     # Multiple inheritance definition
     updateRelatedContent = XMLMatrix.updateRelatedContent
 
-
     # Force in _edit to modify variation_base_category_list first
     security.declarePrivate( '_edit' )
     def _edit(self, REQUEST=None, force_update = 0, **kw):
@@ -86,33 +85,8 @@ class DeliveryLine(Movement, XMLObject, 
 
       # If variations and resources are set at the same time, resource must be
       # set before any variation.
-      # Also, resource must be set before the categories: use, quantity_unit, base_contribution.
-      # Because we use the resource to set the *default* category values in
-      # movement_resource_interaction_worfklow, and we want to set the *proper*
-      # category values when they are existed in the **kw parameter.
-      # Thereby we set the resource first, then, set the rest.
-      if kw.has_key('resource_value_list'):
-        self._setResourceValueList( kw['resource_value_list'] )
-      elif kw.has_key('resource_value_set'):
-        self._setResourceValueSet( kw['resource_value_set'] )
-      elif kw.has_key('resouce_value'):
+      if kw.has_key('resource_value'):
         self._setResourceValue( kw['resource_value'] )
-      # We also take care the resource, as well as resource_value. For example in builders,
-      # we usually set resource instead of resource_value.
-      if kw.has_key('resource_list'):
-        self._setResourceList( kw['resource_list'] )
-      elif kw.has_key('resource_set'):
-        self._setResourceSet( kw['resource_set'])
-      elif kw.has_key('resource'):
-        self._setResource( kw['resource'] )
-      # also resource_uid
-      if kw.has_key('resource_uid_list'):
-        self._setResourceUidList( kw['resource_uid_list'] )
-      elif kw.has_key('resource_uid_set'):
-        self._setResourceUidSet( kw['resource_uid_set'])
-      elif kw.has_key('resource_uid'):
-        self._setResourceUid( kw['resource_uid'] )
-
       # We must first prepare the variation_base_category_list before we do the edit of the rest
       #LOG('in edit', 0, str(kw))
       if kw.has_key('variation_base_category_list'):