Merge lp:~camptocamp/account-invoice-report/7.0-fix-1188224 into lp:~account-core-editors/account-invoice-report/7.0

[Yannick Vaucher @ Camptocamp]

Ensure we remove only the name and not the street from the formatted address.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

works fine

review: Approve (code review, test)

=== modified file 'invoice_webkit/report/account_invoice.mako'
--- invoice_webkit/report/account_invoice.mako	2013-05-27 07:52:26 +0000
+++ invoice_webkit/report/account_invoice.mako	2013-06-06 15:19:24 +0000
@@ -178,7 +178,12 @@
             %else:
             <tr><td class="name">${inv.partner_id.title and inv.partner_id.title.name or ''} ${inv.partner_id.name }</td></tr>
             %endif
-            %for part in inv.partner_id.contact_address.split("\n")[1:]:
+            %if inv.partner_id.parent_id:
+            <% address_lines = inv.partner_id.contact_address.split("\n")[1:] %>
+            %else:
+            <% address_lines = inv.partner_id.contact_address.split("\n") %>
+            %endif
+            %for part in address_lines:
                 %if part:
                 <tr><td>${part}</td></tr>
                 %endif
@@ -189,10 +194,12 @@
             %if inv.partner_id.parent_id:
             <tr><td class="name">${inv.partner_id.parent_id.name or ''}</td></tr>
             <tr><td>${inv.partner_id.title and inv.partner_id.title.name or ''} ${inv.partner_id.name }</td></tr>
+            <% address_lines = inv.partner_id.contact_address.split("\n")[1:] %>
             %else:
             <tr><td class="name">${inv.partner_id.title and inv.partner_id.title.name or ''} ${inv.partner_id.name }</td></tr>
+            <% address_lines = inv.partner_id.contact_address.split("\n") %>
             %endif
-            %for part in inv.partner_id.contact_address.split("\n")[1:]:
+            %for part in address_lines:
                 %if part:
                 <tr><td>${part}</td></tr>
                 %endif