Merge lp:~agilebg/account-invoice-report/7.0-bug-1208389-elbati into lp:~account-core-editors/account-invoice-report/7.0

[Lorenzo Battistini]

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve

[Leonardo Pistone (lepistone)]

LGTM no test

review: Approve

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks! Merged with the target 7.0 branch. I checked the 6.1 series branch and I saw the bug does not apply as it already contains a similar line.

review: Approve

=== modified file 'invoice_webkit/report/account_invoice.mako'
--- invoice_webkit/report/account_invoice.mako	2013-07-15 13:32:00 +0000
+++ invoice_webkit/report/account_invoice.mako	2013-08-05 09:06:25 +0000
@@ -273,7 +273,7 @@
         <tbody>
         %for line in inv.invoice_line :
             <tr >
-                <td>${line.product_id and line.product_id.code or ''} ${line.product_id and line.product_id.name or ''}</td>
+                <td>${line.name or ''}</td>
                 <td class="amount">${formatLang(line.quantity or 0.0,digits=get_digits(dp='Account'))}</td>
                 <td class="amount">${line.uos_id and line.uos_id.name or ''}</td>
                 <td class="amount">${formatLang(line.price_unit)}</td>