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

[Nicolas Bessi - Camptocamp]

Add new partner semantic support

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Why do you need to display the commercial_partner_id?

I thought that the normal behavior was to display the contact, which should have the correct name and address related to its company.

In the normal report of the 'account' module, the displayed address is only:

          <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
          <para style="terp_default_8">[[ display_address(o.partner_id) ]]</para>

So what is the rationale for this?

Thanks

review: Needs Information

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Hello,

After a discussion with Frederic we agreed on the fact that if it's a contact of a company we want to have the name of the company above the address in bold. This is done in order to keep coherence of display with the previous block which does exactly the same thing but using parent_id relation field instead of using commercial_partner_id.

Regards

Nicolas

[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-04-15 14:28:40 +0000
+++ invoice_webkit/report/account_invoice.mako	2013-04-24 15:22:43 +0000
@@ -170,6 +170,21 @@
     %for inv in objects:
     <% setLang(inv.partner_id.lang) %>
     <div class="address">
+      %if hasattr(inv, 'commercial_partner_id'):
+        <table class="recipient">
+            %if inv.partner_id.id != inv.commercial_partner_id.id:
+            <tr><td class="name">${inv.commercial_partner_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>
+            %endif
+            %for part in inv.partner_id.contact_address.split("\n")[1:]:
+                %if part:
+                <tr><td>${part}</td></tr>
+                %endif
+            %endfor
+        </table>
+      %else:
         <table class="recipient">
             %if inv.partner_id.parent_id:
             <tr><td class="name">${inv.partner_id.parent_id.name or ''}</td></tr>
@@ -183,6 +198,7 @@
                 %endif
             %endfor
         </table>
+      %endif
     </div>
     <div>
 
@@ -314,6 +330,7 @@
       inv_bank = inv.partner_bank_id
     %>
     <table class="list_bank_table" width="100%" >
+      <!-- vat value are taken back from commercial id -->
         <tr>
             <th style="width:20%;">${_("Bank")}</th>
             <td style="width:30%;text-align:left;">${inv_bank and inv_bank.bank_name or '-' } </td>