Merge lp:~camptocamp/account-invoice-report/account-invoice-webkit-line-description-vre into lp:~account-core-editors/account-invoice-report/7.0

[Vincent Renaville@camptocamp]

Hello,

My fix let the invoice line name instead of product code + name , the description is filed with the product description by default, so you can adapt you line description on each invoice.

[Pedro Manuel Baeza (pedro.baeza)]

Very needed change. Thanks.

Regards.

review: Approve (code review)

[Romain Deheele - Camptocamp (romaindeheele)]

LGTM,

Romain

review: Approve (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM

review: Approve (code review, no test)

=== modified file 'invoice_webkit/report/account_invoice.mako'
--- invoice_webkit/report/account_invoice.mako	2014-03-05 10:38:09 +0000
+++ invoice_webkit/report/account_invoice.mako	2014-05-01 15:25:51 +0000
@@ -325,7 +325,7 @@
               <div class="nobreak">
                 <table style="width:100%">
                   <tr>
-                    <td class="main_col1">${line.product_id and line.product_id.code or ''} ${line.product_id and line.product_id.name or ''}</td>
+                    <td class="main_col1">${line.name.replace('\n','<br/>') or '' | n}</td>
                     <td class="amount main_col2">${formatLang(line.quantity or 0.0,digits=get_digits(dp='Account'))}</td>
                     <td class="amount main_col3">${line.uos_id and line.uos_id.name or ''}</td>
                     <td class="amount main_col4">${formatLang(line.price_unit)}</td>