From 8da51a29d59321f95a3a2ccfa6e2d7eb41954bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 12 Dec 2013 13:50:05 +0100 Subject: [PATCH] Missing test on address before using it issue3531 review2021002 --- shipment.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/shipment.py b/shipment.py index 06c3ff81f8..62232cfb70 100644 --- a/shipment.py +++ b/shipment.py @@ -260,10 +260,10 @@ class ShipmentIn(Workflow, ModelSQL, ModelView): return Transaction().context.get('company') def on_change_supplier(self): - if not self.supplier: - return {'contact_address': None} - address = self.supplier.address_get() - return {'contact_address': address.id} + address = None + if self.supplier: + address = self.supplier.address_get() + return {'contact_address': address.id if address else None} def on_change_with_supplier_location(self, name=None): if self.supplier: @@ -967,10 +967,10 @@ class ShipmentOut(Workflow, ModelSQL, ModelView): return Transaction().context.get('company') def on_change_customer(self): - if not self.customer: - return {'delivery_address': None} - address = self.customer.address_get(type='delivery') - return {'delivery_address': address.id} + address = None + if self.customer: + address = self.customer.address_get(type='delivery') + return {'delivery_address': address.id if address else None} def on_change_with_customer_location(self, name=None): if self.customer: @@ -1469,11 +1469,11 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView): return Transaction().context.get('company') def on_change_customer(self): - if not self.customer: - return {'delivery_address': None} - address = self.customer.address_get(type='delivery') + address = None + if self.customer: + address = self.customer.address_get(type='delivery') return { - 'delivery_address': address.id, + 'delivery_address': address.id if address else None, } def on_change_with_customer_location(self, name=None):