From be132fe428ef0c1dae6e35cb6fd50421f35650e3 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>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit cdfc1c08c96a06d5fe709777374aded10ff4a7ed)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../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 92a0abb861..ce7022f069 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 %]
-                    &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>
+                      [% 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 AND account.accounttype != 'F' AND account.accounttype != 'FU' ) %]
+                          <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 %]
 
-- 
2.39.5