Merge lp:~camptocamp/account-invoice-report/7.0-add-fiscal-position-note-20130411 into lp:~account-core-editors/account-invoice-report/7.0

Proposed by Yannick Vaucher @ Camptocamp
Status: Merged
Merged at revision: 29
Proposed branch: lp:~camptocamp/account-invoice-report/7.0-add-fiscal-position-note-20130411
Merge into: lp:~account-core-editors/account-invoice-report/7.0
Diff against target: 16 lines (+6/-0)
1 file modified
invoice_webkit/report/account_invoice.mako (+6/-0)
To merge this branch: bzr merge lp:~camptocamp/account-invoice-report/7.0-add-fiscal-position-note-20130411
Reviewer Review Type Date Requested Status
Alexandre Fayolle - camptocamp Approve
Yannick Vaucher @ Camptocamp test Approve
Review via email: mp+158308@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

Frederic Clementi asked to remove the Fiscal Position Remark text

review: Needs Fixing (test)
27. By Yannick Vaucher @ Camptocamp

[REM] invoice_webkit - remove useless text 'Fiscal Position Remark from report'

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

useless text removed from report

review: Approve (test)
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) :
review: Approve

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 2013-04-10 11:24:57 +0000
3+++ invoice_webkit/report/account_invoice.mako 2013-04-15 12:03:24 +0000
4@@ -344,6 +344,12 @@
5 %if inv.note2 :
6 <p class="std_text">${inv.note2 | n}</p>
7 %endif
8+ %if inv.fiscal_position :
9+ <br/>
10+ <p class="std_text">
11+ ${inv.fiscal_position.note | n}
12+ </p>
13+ %endif
14 <p style="page-break-after:always"></p>
15 %endfor
16 </body>

Subscribers

People subscribed via source and target branches