[Erp5-report] r24601 - /erp5/trunk/products/ERP5/Document/OrderBuilder.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Nov 14 21:08:14 CET 2008
Author: kazuhiko
Date: Fri Nov 14 21:08:13 2008
New Revision: 24601
URL: http://svn.erp5.org?rev=24601&view=rev
Log:
These changes are required if we override some methods to pass
additional parameter, and/or we try to build documents by temp
movements.
* getting original delivery document in more robust way.
* avoid passing needless **kw parameters.
Modified:
erp5/trunk/products/ERP5/Document/OrderBuilder.py
Modified: erp5/trunk/products/ERP5/Document/OrderBuilder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderBuilder.py?rev=24601&r1=24600&r2=24601&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderBuilder.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/OrderBuilder.py [utf8] Fri Nov 14 21:08:13 2008
@@ -347,7 +347,7 @@
delivery_to_update_list=delivery_to_update_list,
divergence_list=divergence_list,
activate_kw=activate_kw,
- force_update=force_update, **kw)
+ force_update=force_update)
delivery_list.extend(new_delivery_list)
force_update = 0
else:
@@ -369,7 +369,9 @@
if delivery is None:
# Create delivery
try:
- old_delivery = movement_group.getMovementList()[0].getDeliveryValue()
+ old_delivery = self._searchUpByPortalType(
+ movement_group.getMovementList()[0].getDeliveryValue(),
+ self.getDeliveryPortalType())
except AttributeError:
old_delivery = None
if old_delivery is None:
@@ -379,10 +381,9 @@
portal_type=self.getDeliveryPortalType(),
id=new_delivery_id,
created_by_builder=1,
- activate_kw=activate_kw,**kw)
+ activate_kw=activate_kw)
else:
# from duplicated original delivery
- old_delivery = old_delivery.getExplanationValue()
cp = tryMethodCallWithTemporaryPermission(
delivery_module, 'Copy or Move',
lambda parent, *ids:
More information about the Erp5-report
mailing list