use partner.is_company as indicator for company address

This commit is contained in:
Harald Welte 2016-07-15 17:03:20 +02:00
parent 590f728a68
commit 663fde65f4
1 changed files with 10 additions and 6 deletions

View File

@ -60,13 +60,17 @@ class DPDeliveryCarrier(models.Model):
zipcode = partner.zip, zipcode = partner.zip,
city = partner.city, city = partner.city,
country = country) country = country)
if partner.parent_id.name: if partner.is_company:
person = None
if partner.name:
person = partner.name
return im.build_comp_addr(company = partner.parent_id.name, return im.build_comp_addr(company = partner.parent_id.name,
address = addr, address = addr)
person = person) else:
if partner.parent_id.name:
person = None
if partner.name:
person = partner.name
return im.build_comp_addr(company = partner.parent_id.name,
address = addr,
person = person)
else: else:
(first, last) = split_first_lastname(partner.name) (first, last) = split_first_lastname(partner.name)
return im.build_pers_addr(first = first, return im.build_pers_addr(first = first,