From 9a9a15317b4c68a827575d61ccfa94341f4caa11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Tue, 24 Mar 2020 11:32:55 +0100
Subject: [PATCH] Fix compute address in case street, zip or city are not
defined
---
models/hr_expense.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/models/hr_expense.py b/models/hr_expense.py
index bffc0ff..5a075e3 100644
--- a/models/hr_expense.py
+++ b/models/hr_expense.py
@@ -122,12 +122,17 @@ class CGScopExpense(models.Model):
# Global function
# ------------------------------------------------------
def _format_address(self, partner):
- address = partner.street
+ address = partner.street or ''
if partner.street2:
address += '\n' + partner.street2
if partner.street3:
address += '\n' + partner.street3
- address += '\n' + partner.zip + ' ' + partner.city
+ if partner.zip:
+ address += '\n' + partner.zip
+ if partner.city:
+ address += ' ' + partner.city
+ elif partner.city:
+ address += '\n' + partner.city
return address
def _get_coord(self, address):
--
GitLab