gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 20656: Better formatting for print summary 

This patch is a slightly edited c&p from boraccount.tt

1 - Manually add a credit with no notes to patron
2 - Print summary
3 - Inspect the line
4 - Note that td has extra newlines and no words
5 - Apply patch
6 - Print summary again
7 - Note better formatting

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 4df6a3ef79)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Nick Clemens 2018-04-24 20:58:50 +00:00 committed by Martin Renvoize
parent fd13428bc5
commit 3199778b5c
No known key found for this signature in database
GPG Key ID: 422B469130441A0F
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
View File

@ -93,32 +93,36 @@
</table>
[% END %]
[% IF accounts && totaldue != 0 %]
<table>
<table id="table_account_fines">
<caption>Account fines and payments</caption>
<tr>
<th>Description of charges</th>
<th>Date</th>
<th>Amount</th>
<th>Outstanding</th>
</tr>
<thead>
<tr>
<th>Date</th>
<th>Description of charges</th>
<th>Note</th>
<th>Amount</th>
<th>Outstanding</th>
</tr>
</thead>
[% FOREACH account IN accounts %]
<tr>
<td>
[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber %]&amp;itemnumber=[% account.itemnumber %]">[% END %]
[% account.description %]&nbsp;[% IF account.itemnumber AND account.accounttype != 'F' AND account.accounttype != 'FU' %] [% account.item.biblio.title |html %][% END %]
[% IF ( account.itemnumber ) %]</a>[% END %]
</td>
<td>[% account.date | $KohaDates %]</td>
<td style="text-align:right;">[% account.amount | $Price %]</td>
<td style="text-align:right;">[% account.amountoutstanding | $Price %]</td>
</tr>
<tr>
<td>[% account.date | $KohaDates %]</td>
<td>
[% INCLUDE 'accounttype.inc' accountline => account %]
[%- IF account.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %]
[%- IF account.description %], [% account.description | html %][% END %]
&nbsp;[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber %]&amp;itemnumber=[% account.itemnumber | html %]">[% account.item.biblio.title | html %]</a>[% END %]</td>
<td>[% account.note | html_line_break %]</td>
[% IF ( account.amount < 0 ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount | $Price | html %]</td>
[% IF ( account.amountoutstanding < 0 ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding | $Price | html %]</td>
</tr>
[% END %]
<tfoot>
<tr>
<td colspan="3">Total due</td>
<td colspan="2" style="text-align:right;">[% totaldue | $Price %]</td>
<td colspan="4">Total due</td>
<td colspan="2" style="text-align:right;">[% totaldue | $Price | html %]</td>
</tr>
</tfoot>
</table>