From 6bb0261d6bcda7949f5aeab7d5ef95134a2ee26c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 May 2017 18:42:54 +0200 Subject: [PATCH] Add report_address property on purchase issue6438 review38321004 --- CHANGELOG | 2 ++ purchase.odt | Bin 12307 -> 12310 bytes purchase.py | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index e1616fab7a..e9fa785aac 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +* Add report_address property on purchase + Version 4.4.0 - 2017-05-01 * Bug fixes (see mercurial logs for details) * Add purchase price on product view from line diff --git a/purchase.odt b/purchase.odt index 59e024168341bb337df4c3f2c99f5b234ba541db..2ba000af750adeccc91671a6d9cbacf1ff0c6f02 100644 GIT binary patch delta 7322 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 delta 7411 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 aq5LP^zv2l)oMdoYkR48DWNq*-)c*s{aGBBo diff --git a/purchase.py b/purchase.py index cb69ff9e16..1017841718 100644 --- a/purchase.py +++ b/purchase.py @@ -574,6 +574,13 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin): 'shipment_state': state, }) + @property + def report_address(self): + if self.invoice_address: + return self.invoice_address.full_address + else: + return '' + @property def delivery_full_address(self): if self.warehouse and self.warehouse.address: