upstream/2025.10.0 #10

Merged
simon merged 121 commits from upstream/2025.10.0 into master 2025-12-18 22:18:54 +00:00
Showing only changes of commit ef9863518b - Show all commits
+1 -1
View File
@@ -259,7 +259,7 @@ class Invoice(models.Model):
parts = [
self.invoice_from_name,
self.invoice_from,
" ".join(s for s in [self.invoice_from_zipcode, self.invoice_from_city, state_name] if s)
" ".join(s for s in [self.invoice_from_zipcode, self.invoice_from_city, state_name] if s),
self.invoice_from_country.name if self.invoice_from_country else "",
]
return '\n'.join([p.strip() for p in parts if p and p.strip()])