Merge lp:~camptocamp/sale-reports/7.0-fix-1188177 into lp:~sale-core-editors/sale-reports/7.0

[Yannick Vaucher @ Camptocamp]

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

[lp:~camptocamp/sale-reports/7.0-fix-1188177]

20. By Yannick Vaucher @ Camptocamp on 2013-06-06

[FIX] sale_order_webkit - missing street in address

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve

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

Works fine

review: Approve (code review, test)

[Nhomar - Vauxoo (nhomar)]

Just to have as record, why you are removing the name?

Regards.!

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Name is removed to be able to set a different font style on it.

Plus, it permits to have reorder company name and contact name.

=== modified file 'sale_order_webkit/report/sale_order.mako'
--- sale_order_webkit/report/sale_order.mako	2013-05-22 14:26:07 +0000
+++ sale_order_webkit/report/sale_order.mako	2013-06-06 15:18:25 +0000
@@ -130,10 +130,12 @@
             %if order.partner_id.parent_id:
             <tr><td class="name">${order.partner_id.parent_id.name or ''}</td></tr>
             <tr><td>${order.partner_id.title and order.partner_id.title.name or ''} ${order.partner_id.name }</td></tr>
+            <% address_lines = order.partner_id.contact_address.split("\n")[1:] %>
             %else:
             <tr><td class="name">${order.partner_id.title and order.partner_id.title.name or ''} ${order.partner_id.name }</td></tr>
+            <% address_lines = order.partner_id.contact_address.split("\n") %>
             %endif
-            %for part in order.partner_id.contact_address.split("\n")[1:]:
+            %for part in address_lines:
                 %if part:
                 <tr><td>${part}</td></tr>
                 %endif
@@ -142,13 +144,15 @@
 
         <table class="shipping">
             <tr><td class="address_title">${_("Shipping address:")}</td></tr>
-            %if order.partner_id.parent_id:
+            %if order.partner_shipping_id.parent_id:
             <tr><td>${order.partner_shipping_id.parent_id.name or ''}</td></tr>
             <tr><td>${order.partner_shipping_id.title and order.partner_shipping_id.title.name or ''} ${order.partner_shipping_id.name }</td></tr>
+            <% address_lines = order.partner_shipping_id.contact_address.split("\n")[1:] %>
             %else:
             <tr><td>${order.partner_shipping_id.title and order.partner_shipping_id.title.name or ''} ${order.partner_shipping_id.name }</td></tr>
+            <% address_lines = order.partner_shipping_id.contact_address.split("\n") %>
             %endif
-            %for part in order.partner_shipping_id.contact_address.split("\n")[1:]:
+            %for part in address_lines:
                 %if part:
                 <tr><td>${part}</td></tr>
                 %endif
@@ -160,10 +164,12 @@
             %if order.partner_invoice_id.parent_id:
             <tr><td>${order.partner_invoice_id.parent_id.name or ''}</td></tr>
             <tr><td>${order.partner_invoice_id.title and order.partner_invoice_id.title.name or ''} ${order.partner_invoice_id.name }</td></tr>
+            <% address_lines = order.partner_invoice_id.contact_address.split("\n")[1:] %>
             %else:
             <tr><td>${order.partner_invoice_id.title and order.partner_invoice_id.title.name or ''} ${order.partner_invoice_id.name }</td></tr>
+            <% address_lines = order.partner_invoice_id.contact_address.split("\n") %>
             %endif
-            %for part in order.partner_invoice_id.contact_address.split("\n")[1:]:
+            %for part in address_lines:
                 %if part:
                 <tr><td>${part}</td></tr>
                 %endif