[Erp5-report] r35318 kazuhiko - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri May 14 10:27:48 2010
New Revision: 35318

URL: http://svn.erp5.org?rev=35318&view=rev
Log:
treat as the property is None if parent delivery is missing.

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

Modified: erp5/trunk/products/ERP5/Document/ParentDeliveryPropertyMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/ParentDeliveryPropertyMovementGroup.py?rev=35318&r1=35317&r2=35318&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/ParentDeliveryPropertyMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/ParentDeliveryPropertyMovementGroup.py [utf8] Fri May 14 10:27:48 2010
@@ -68,8 +68,7 @@
   def _getParentDelivery(self, movement):
     # try to find local payment conditions from the upper level delivery
     rule = movement.getParentValue()
-    movement = rule.getParentValue()
-    delivery = movement.getDeliveryValue()
+    delivery = None
     while delivery is None and not(rule.isRootAppliedRule()):
       rule = movement.getParentValue()
       movement = rule.getParentValue()
@@ -77,6 +76,8 @@
     return delivery
 
   def _getProperty(self, document, property_id):
+    if document is None:
+      return None
     # XXX here we don't use Base.getProperty() but try to call accessor
     # directly to make acquired property
     # (eg. payment_condition_efficiency) working.