Merge lp:~agilebg/account-invoice-report/7.0-bug-1205611-elbati into lp:~account-core-editors/account-invoice-report/7.0

Proposed by Lorenzo Battistini
Status: Merged
Merged at revision: 38
Proposed branch: lp:~agilebg/account-invoice-report/7.0-bug-1205611-elbati
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:~agilebg/account-invoice-report/7.0-bug-1205611-elbati
Reviewer Review Type Date Requested Status
Stefan Rijnhart (Opener) Approve
Nicolas Bessi - Camptocamp (community) Approve
Review via email: mp+177250@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote :

LGTM

review: Approve
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

LGTM

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-06-19 09:16:40 +0000
3+++ invoice_webkit/report/account_invoice.mako 2013-07-27 10:40:38 +0000
4@@ -364,7 +364,7 @@
5 %if inv.note2 :
6 <p class="std_text">${inv.note2 | n}</p>
7 %endif
8- %if inv.fiscal_position :
9+ %if inv.fiscal_position and inv.fiscal_position.note :
10 <br/>
11 <p class="std_text">
12 ${inv.fiscal_position.note | n}

Subscribers

People subscribed via source and target branches