From 636633d6a127bcb05e786242e7711a02331078e4 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Fri, 14 May 2010 08:27:48 +0000 Subject: [PATCH] treat as the property is None if parent delivery is missing. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35318 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5/Document/ParentDeliveryPropertyMovementGroup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/product/ERP5/Document/ParentDeliveryPropertyMovementGroup.py b/product/ERP5/Document/ParentDeliveryPropertyMovementGroup.py index 93425d2d23..d6a040f32d 100644 --- a/product/ERP5/Document/ParentDeliveryPropertyMovementGroup.py +++ b/product/ERP5/Document/ParentDeliveryPropertyMovementGroup.py @@ -68,8 +68,7 @@ class ParentDeliveryPropertyMovementGroup(PropertyMovementGroup): 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 @@ class ParentDeliveryPropertyMovementGroup(PropertyMovementGroup): 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. -- 2.30.9