[Erp5-report] r25183 - /erp5/trunk/products/ERP5/Document/Movement.py

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Jan 19 18:47:11 2009
New Revision: 25183

URL: http://svn.erp5.org?rev=25183&view=rev
Log:
use edit_order argument to force setting resource before other paramters

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

Modified: erp5/trunk/products/ERP5/Document/Movement.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Movement.py?rev=25183&r1=25182&r2=25183&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Movement.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Movement.py [utf8] Mon Jan 19 18:47:11 2009
@@ -808,7 +808,7 @@
   setDestinationCredit = setSourceDebit
 
   security.declarePrivate('_edit')
-  def _edit(self, **kw):
+  def _edit(self, edit_order=(), **kw):
     """Overloaded _edit to support setting debit and credit at the same time,
     which is required for the GUI. Also sets the resource first, because
     _setVariationCategoryList needs the resource to be set.
@@ -822,11 +822,9 @@
       quantity += (kw.pop('destination_debit') or 0 -
                    kw.pop('destination_credit') or 0)
       kw['quantity'] = quantity
-    if 'resource' in kw:
-      self._setResource(kw.pop('resource'))
-    if 'resource_value' in kw:
-      self._setResourceValue(kw.pop('resource_value'))
-    return XMLObject._edit(self, **kw)
+    if not edit_order:
+      edit_order = ('resource', 'resource_value')
+    return XMLObject._edit(self, edit_order=edit_order, **kw)
 
   # Debit and credit methods for asset
   security.declareProtected( Permissions.AccessContentsInformation,