From 273065921362f348bf44faf8b7865b8eb5948922 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Sat, 21 Apr 2018 00:40:15 +0000
Subject: [PATCH] Bug 2696: (QA follow-up) Several fixes to template variables

- Fix link to patron account in breadcrumbs
- Fix includes for accounttype.inc to display type correctly
  - in Details for fee
  - in Payments list
- Fix use CGI qw ( -utf8 );
- Remove <br> from within a string for better translation

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/modules/members/accountline-details.tt        | 8 ++++----
 members/accountline-details.pl                            | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
index 5e5a5049d6..aaaa78c871 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
@@ -10,7 +10,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'patron-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Account for [% INCLUDE 'patron-title.inc' %]</a> &rsaquo; Details for account line [% accountline.id %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Account for [% INCLUDE 'patron-title.inc' %]</a> &rsaquo; Details for account line [% accountline.id %]</div>
 
 <div id="doc3" class="yui-t2">
 <div id="bd">
@@ -40,7 +40,7 @@
                                 <span title="[% accountline.date %]">[% accountline.date |$KohaDates %]</span>
                             </td>
                             <td>
-                                [% INCLUDE 'accounttype.inc' accountline => accountline %]
+                                [%- INCLUDE 'accounttype.inc' account => accountline -%]
                                 [%- IF accountline.payment_type -%]
                                     , [% AuthorisedValues.GetByCode('PAYMENT_TYPE', accountline.payment_type) %]
                                 [%- END =%]
@@ -85,7 +85,7 @@
                                 <th>Amount outstanding</th>
                                 <th>Type</th>
                                 <th>Note</th>
-                                <th>Transacting<br/>librarian id</th>
+                                <th>Transacting librarian</th>
                                 <th>Date/Time of change</th>
                                 <th>Amount of change</th>
                                 <th>Type of change</th>
@@ -107,7 +107,7 @@
                                         <td>[% offset_accountline.timestamp | $KohaDates with_hours => 1 %]</td>
                                         <td>[% offset_accountline.amount | $Price %]</td>
                                         <td>[% offset_accountline.amountoutstanding | $Price %]</td>
-                                        <td>[% INCLUDE 'accounttype.inc' accountline => offset_accountline %]</td>
+                                        <td>[% INCLUDE 'accounttype.inc' account => offset_accountline %]</td>
                                         <td>[% offset_accountline.note %]</td>
                                         <td>[% IF offset_accountline.manager_id %]<a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id %]">[% offset_accountline.manager_id %]</a>[% END %]</td>
                                         <td>[% ao.created_on | $KohaDates with_hours => 1 %]</td>
diff --git a/members/accountline-details.pl b/members/accountline-details.pl
index cd22d80baf..856516c48e 100644
--- a/members/accountline-details.pl
+++ b/members/accountline-details.pl
@@ -19,7 +19,7 @@
 
 use Modern::Perl;
 
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Output;
 use C4::Context;
-- 
2.20.1