Merge lp:~camptocamp/account-invoice-report/7.0-invoice-webkit-hide-identical-ref into lp:~account-core-editors/account-invoice-report/7.0

Proposed by Guewen Baconnier @ Camptocamp
Status: Merged
Approved by: Yannick Vaucher @ Camptocamp
Approved revision: 46
Merged at revision: 54
Proposed branch: lp:~camptocamp/account-invoice-report/7.0-invoice-webkit-hide-identical-ref
Merge into: lp:~account-core-editors/account-invoice-report/7.0
Diff against target: 21 lines (+2/-2)
1 file modified
invoice_webkit/report/account_invoice.mako (+2/-2)
To merge this branch: bzr merge lp:~camptocamp/account-invoice-report/7.0-invoice-webkit-hide-identical-ref
Reviewer Review Type Date Requested Status
Yannick Vaucher @ Camptocamp code review, no tests Approve
Pedro Manuel Baeza code review Approve
Review via email:

Commit message

do not display the reference if is it the same than the name (when an invoice is generated from the sales orders, it is copied in both fields)

Description of the change

Hide the "Your Reference" field when it is equal to the subject of the invoice.

To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Hi, Guewen,

How is the result when you remove that column? Isn't odd?


review: Needs Information
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

> Hi, Guewen,
> How is the result when you remove that column? Isn't odd?
> Regards.

No, the table always takes 100% of the space.

Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

OK then


review: Approve (code review)
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :


review: Approve (code review, no tests)

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-01-24 14:28:51 +0000
3+++ invoice_webkit/report/account_invoice.mako 2014-03-05 12:05:30 +0000
4@@ -278,7 +278,7 @@
5 <th style="text-align:center;width:120px;">${_("Responsible")}</td>
6 <th style="text-align:center">${_("Payment Term")}</td>
7 <th style="text-align:center">${_("Our reference")}</td>
8- %if inv.reference:
9+ %if inv.reference and inv.reference !=
10 <th style="text-align:center">${_("Your reference")}</td>
11 %endif
12 </tr>
13@@ -288,7 +288,7 @@
14 <td style="text-align:center;width:120px;">${inv.user_id and or ''}</td>
15 <td style="text-align:center">${inv.payment_term and inv.payment_term.note or ''}</td>
16 <td style="text-align:center">${inv.origin or ''}</td>
17- %if inv.reference:
18+ %if inv.reference and inv.reference !=
19 <td style="text-align:center">${inv.reference}</td>
20 %endif
21 </tr>


People subscribed via source and target branches