use partner.is_company as indicator for company address

models/dp_delivery_carrier.py

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