Account - Invoicing Reports

Merge lp:~nbessi-c2c-deactivatedaccount/account-invoice-report/account-invoice-report-fix-html-fields-and-css into lp:~account-core-editors/account-invoice-report/7.0

  1. account-invoice-report-fix-html-fields-and-css
  2. Merge into 7.0
Proposed by Nicolas Bessi - Camptocamp
Status: Merged
Approved by: Joël Grand-Guillaume @ camptocamp
Approved revision: 11
Merge reported by: Joël Grand-Guillaume @ camptocamp
Merged at revision: not available
Proposed branch: lp:~nbessi-c2c-deactivatedaccount/account-invoice-report/account-invoice-report-fix-html-fields-and-css
Merge into: lp:~account-core-editors/account-invoice-report/7.0
Diff against target: 63 lines (+8/-6)
2 files modified
invoice_webkit/invoice.py (+3/-3)
invoice_webkit/report/account_invoice.mako (+5/-3)
To merge this branch: bzr merge lp:~nbessi-c2c-deactivatedaccount/account-invoice-report/account-invoice-report-fix-html-fields-and-css
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp no test, code review Approve
Review via email: mp+144706@code.launchpad.net

Description of the change

Account invoice text use html fields + small css glitch

To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Seems fine to me

review: Approve (no test, code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'invoice_webkit/invoice.py'
2--- invoice_webkit/invoice.py 2013-01-15 08:16:58 +0000
3+++ invoice_webkit/invoice.py 2013-01-24 14:21:25 +0000
4@@ -40,7 +40,7 @@
5 ('footer', 'Bottom condition')],
6 'type', required=True),
7
8- 'text': fields.text('Condition', translate=True, required=True)}
9+ 'text': fields.html('Condition', translate=True, required=True)}
10
11 class AccountInvoice(Model):
12 """ Add account.condition_text to invoice"""
13@@ -66,8 +66,8 @@
14
15 _columns = {'text_condition1': fields.many2one('account.condition_text', 'Header condition'),
16 'text_condition2': fields.many2one('account.condition_text', 'Footer condition'),
17- 'note1': fields.text('Header'),
18- 'note2': fields.text('Footer'),}
19+ 'note1': fields.html('Header'),
20+ 'note2': fields.html('Footer'),}
21
22
23 class AccountInvoiceLine(Model):
24
25=== modified file 'invoice_webkit/report/account_invoice.mako'
26--- invoice_webkit/report/account_invoice.mako 2013-01-15 08:16:58 +0000
27+++ invoice_webkit/report/account_invoice.mako 2013-01-24 14:21:25 +0000
28@@ -32,6 +32,8 @@
29
30 .formatted_note {
31 border-right:thin solid #EEEEEE;
32+ border-left:thin solid #EEEEEE;
33+ border-top:thin solid #EEEEEE;
34 left:10px;
35 font-size:smaller;
36 }
37@@ -178,7 +180,7 @@
38 <div>
39
40 %if inv.note1 :
41- <p class="std_text"> ${inv.note1 | carriage_returns} </p>
42+ <p class="std_text"> ${inv.note1 | n} </p>
43 %endif
44 </div>
45 <h1 style="clear: both; padding-top: 20px;">
46@@ -240,7 +242,7 @@
47 </tr>
48 %if line.formatted_note:
49 <tr>
50- <td class="formatted_note">
51+ <td class="formatted_note" colspan="7">
52 ${line.formatted_note| n}
53 </td>
54 <tr>
55@@ -329,7 +331,7 @@
56 <p class="std_text">${inv.comment | carriage_returns}</p>
57 %endif
58 %if inv.note2 :
59- <p class="std_text">${inv.note2 | carriage_returns}</p>
60+ <p class="std_text">${inv.note2 | n}</p>
61 %endif
62 <p style="page-break-after:always"></p>
63 %endfor

Subscribers

People subscribed via source and target branches