From d4d4cf0dd581b42aa2b3834bf8d19e9221524d6c Mon Sep 17 00:00:00 2001 From: Nick Clemens <nick@bywatersolutions.com> Date: Sun, 16 Sep 2018 03:50:13 +0000 Subject: [PATCH] Bug 20656: (follow-up) Don't display title for F or FU fines (it is in description) Signed-off-by: Josef Moravec <josef.moravec@gmail.com> --- .../prog/en/modules/members/moremember-print.tt | 35 +++++++++++++++++----- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt index 089a6e5..1000adf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt @@ -109,13 +109,34 @@ <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 %] - [% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber %]&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> + [% 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 %] + + [% IF ( account.itemnumber AND account.accounttype != 'F' AND account.accounttype != 'FU' ) %] + <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber %]&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 %] -- 2.1.4