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: mp+209436@code.launchpad.net

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?

Regards.

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

Regards.

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

LGTM

review: Approve (code review, no tests)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'invoice_webkit/report/account_invoice.mako'
--- invoice_webkit/report/account_invoice.mako 2014-01-24 14:28:51 +0000
+++ invoice_webkit/report/account_invoice.mako 2014-03-05 12:05:30 +0000
@@ -278,7 +278,7 @@
278 <th style="text-align:center;width:120px;">${_("Responsible")}</td>278 <th style="text-align:center;width:120px;">${_("Responsible")}</td>
279 <th style="text-align:center">${_("Payment Term")}</td>279 <th style="text-align:center">${_("Payment Term")}</td>
280 <th style="text-align:center">${_("Our reference")}</td>280 <th style="text-align:center">${_("Our reference")}</td>
281 %if inv.reference:281 %if inv.reference and inv.reference != inv.name:
282 <th style="text-align:center">${_("Your reference")}</td>282 <th style="text-align:center">${_("Your reference")}</td>
283 %endif283 %endif
284 </tr>284 </tr>
@@ -288,7 +288,7 @@
288 <td style="text-align:center;width:120px;">${inv.user_id and inv.user_id.name or ''}</td>288 <td style="text-align:center;width:120px;">${inv.user_id and inv.user_id.name or ''}</td>
289 <td style="text-align:center">${inv.payment_term and inv.payment_term.note or ''}</td>289 <td style="text-align:center">${inv.payment_term and inv.payment_term.note or ''}</td>
290 <td style="text-align:center">${inv.origin or ''}</td>290 <td style="text-align:center">${inv.origin or ''}</td>
291 %if inv.reference:291 %if inv.reference and inv.reference != inv.name:
292 <td style="text-align:center">${inv.reference}</td>292 <td style="text-align:center">${inv.reference}</td>
293 %endif293 %endif
294 </tr>294 </tr>

Subscribers

People subscribed via source and target branches