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

[Nicolas Bessi - Camptocamp]

Fix addresses layout in mako

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

LGTM

review: Approve (code review, no test)

=== modified file 'invoice_webkit/report/account_invoice.mako'
--- invoice_webkit/report/account_invoice.mako	2013-02-08 13:49:46 +0000
+++ invoice_webkit/report/account_invoice.mako	2013-02-14 10:24:19 +0000
@@ -171,13 +171,17 @@
     <% setLang(inv.partner_id.lang) %>
     <div class="address">
         <table class="recipient">
+            %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>
+            %else:
             <tr><td class="name">${inv.partner_id.title and inv.partner_id.title.name or ''} ${inv.partner_id.name }</td></tr>
-            <tr><td>${inv.partner_id.street or ''}</td></tr>
-            <tr><td>${inv.partner_id.street2 or ''}</td></tr>
-            <tr><td>${inv.partner_id.zip or ''} ${inv.partner_id.city or ''}</td></tr>
-            %if inv.partner_id.country_id:
-            <tr><td>${inv.partner_id.country_id.name or ''} </td></tr>
             %endif
+            %for part in inv.partner_id.contact_address.split("\n")[1:]:
+                %if part:
+                <tr><td>${part}</td></tr>
+                %endif
+            %endfor
         </table>
     </div>
     <div>