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

Proposed by Vincent Renaville@camptocamp on 2014-05-01
Status: Merged
Approved by: Yannick Vaucher @ Camptocamp on 2014-05-02
Approved revision: 57
Merged at revision: 57
Proposed branch: lp:~camptocamp/account-invoice-report/account-invoice-webkit-line-description-vre
Merge into: lp:~account-core-editors/account-invoice-report/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
invoice_webkit/report/account_invoice.mako (+1/-1)
To merge this branch: bzr merge lp:~camptocamp/account-invoice-report/account-invoice-webkit-line-description-vre
Reviewer Review Type Date Requested Status
Yannick Vaucher @ Camptocamp code review, no test Approve on 2014-05-02
Romain Deheele - Camptocamp (community) code review Approve on 2014-05-02
Pedro Manuel Baeza code review 2014-05-01 Approve on 2014-05-01
Review via email: mp+217929@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Pedro Manuel Baeza (pedro.baeza) wrote :

Very needed change. Thanks.

Regards.

review: Approve (code review)

LGTM,

Romain

review: Approve (code review)

LGTM

review: Approve (code review, no test)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'invoice_webkit/report/account_invoice.mako'
2--- invoice_webkit/report/account_invoice.mako 2014-03-05 10:38:09 +0000
3+++ invoice_webkit/report/account_invoice.mako 2014-05-01 15:25:51 +0000
4@@ -325,7 +325,7 @@
5 <div class="nobreak">
6 <table style="width:100%">
7 <tr>
8- <td class="main_col1">${line.product_id and line.product_id.code or ''} ${line.product_id and line.product_id.name or ''}</td>
9+ <td class="main_col1">${line.name.replace('\n','<br/>') or '' | n}</td>
10 <td class="amount main_col2">${formatLang(line.quantity or 0.0,digits=get_digits(dp='Account'))}</td>
11 <td class="amount main_col3">${line.uos_id and line.uos_id.name or ''}</td>
12 <td class="amount main_col4">${formatLang(line.price_unit)}</td>

Subscribers

People subscribed via source and target branches