Merge lp:~romaindeheele/account-invoice-report/account-invoice-report into lp:~account-core-editors/account-invoice-report/7.0

Proposed by Romain Deheele - Camptocamp
Status: Merged
Merged at revision: 37
Proposed branch: lp:~romaindeheele/account-invoice-report/account-invoice-report
Merge into: lp:~account-core-editors/account-invoice-report/7.0
Diff against target: 92 lines (+34/-23)
1 file modified
invoice_webkit/report/account_invoice.mako (+34/-23)
To merge this branch: bzr merge lp:~romaindeheele/account-invoice-report/account-invoice-report
Reviewer Review Type Date Requested Status
Nicolas Bessi - Camptocamp (community) Approve
Yannick Vaucher @ Camptocamp code Approve
Guewen Baconnier @ Camptocamp Approve
Review via email: mp+174752@code.launchpad.net

Description of the change

Change about banking information :
 a div structure replaces table to avoid broken table on page-break.

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

LGTM

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

LGTM

review: Approve (code)
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) 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-15 13:35:31 +0000
4@@ -43,22 +43,33 @@
5 .list_bank_table {
6 text-align:center;
7 border-collapse: collapse;
8-}
9-.list_bank_table th {
10+ page-break-inside: avoid;
11+ display:table;
12+}
13+
14+.act_as_row {
15+ display:table-row;
16+}
17+.list_bank_table .act_as_thead {
18 background-color: #EEEEEE;
19 text-align:left;
20 font-size:12;
21 font-weight:bold;
22 padding-right:3px;
23 padding-left:3px;
24+ white-space:nowrap;
25+ background-clip:border-box;
26+ display:table-cell;
27 }
28-.list_bank_table td {
29+.list_bank_table .act_as_cell {
30 text-align:left;
31 font-size:12;
32 padding-right:3px;
33 padding-left:3px;
34 padding-top:3px;
35 padding-bottom:3px;
36+ white-space:nowrap;
37+ display:table-cell;
38 }
39
40
41@@ -332,31 +343,31 @@
42 <%
43 inv_bank = inv.partner_bank_id
44 %>
45- <table class="list_bank_table" width="100%" >
46+ <div class="list_bank_table act_as_table" style="width:100%;" >
47 <!-- vat value are taken back from commercial id -->
48- <tr>
49- <th style="width:20%;">${_("Bank")}</th>
50- <td style="width:30%;text-align:left;">${inv_bank and inv_bank.bank_name or '-' } </td>
51+ <div class="act_as_row">
52+ <div class="act_as_thead" style="width:20%;">${_("Bank")}</div>
53+ <div class="act_as_cell" style="width:40%;text-align:left;">${inv_bank and inv_bank.bank_name or '-' } </div>
54 %if inv.partner_id and inv.partner_id.vat :
55- <th style="width:20%;">${_("Customer VAT No")}</th>
56- <td style="width:30%;">${inv.partner_id.vat or '-'}</td>
57+ <div class="act_as_thead" style="width:20%;">${_("Customer VAT No")}</div>
58+ <div class="act_as_cell" style="width:20%;">${inv.partner_id.vat or '-'}</div>
59 %else:
60 <!-- conserve table's cells widths -->
61- <td style="width:20%;"></td>
62- <td style="width:30%;"></td>
63+ <div class="act_as_cell" style="width:20%;"></div>
64+ <div class="act_as_cell" style="width:20%;"></div>
65 %endif
66- </tr>
67- <tr>
68- <th style="width:20%;">${_("Bank account")}</th>
69- <td style="width:50%;text-align:left;">${ inv_bank and inv_bank.acc_number or '-' }</td>
70- <th style="width:20%;">${_("Our VAT No")}</th>
71- <td style="width:30%;" class="vat">${inv.company_id.partner_id.vat or '-'}</td>
72- </tr>
73- <tr>
74- <th width="20%">${_("BIC")}</th>
75- <td style="width:30%;">${inv_bank and inv_bank.bank_bic or '-' }</td>
76- </tr>
77- </table>
78+ </div>
79+ <div class="act_as_row">
80+ <div class="act_as_thead" style="width:20%;">${_("Bank account")}</div>
81+ <div class="act_as_cell" style="width:40%;text-align:left;">${ inv_bank and inv_bank.acc_number or '-' }</div>
82+ <div class="act_as_thead" style="width:20%;">${_("Our VAT No")}</div>
83+ <div class="act_as_cell" style="width:20%;" class="vat">${inv.company_id.partner_id.vat or '-'}</div>
84+ </div>
85+ <div class="act_as_row">
86+ <div class="act_as_thead" style="width:20%;">${_("BIC")}</div>
87+ <div class="act_as_cell" style="width:40%;">${inv_bank and inv_bank.bank_bic or '-' }</div>
88+ </div>
89+ </div>
90 <br/>
91 %if inv.comment :
92 <p class="std_text">${inv.comment | carriage_returns}</p>

Subscribers

People subscribed via source and target branches