Fix compute address in case street, zip or city are not defined

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):