From 27a165363261741ecf5c10187a572f1278be0a17 Mon Sep 17 00:00:00 2001
From: Agustin Moyano <agustinmoyano@theke.io>
Date: Thu, 23 May 2019 00:15:47 -0300
Subject: [PATCH] Bug 20691: (follow-up) Fix qa fails

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../bootstrap/en/includes/account-table.inc          | 12 ++++++------
 .../opac-tmpl/bootstrap/en/modules/opac-user.tt      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
index c51efbe358..cab63bc0eb 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
@@ -117,9 +117,9 @@
 [% END %]
 
 [% FOREACH r IN relatives %]
-    <h3 id="g[% r.patron.id %]">[% r.patron.firstname %] [% r.patron.surname %]'s fines and charges</h3>
+    <h3 id="g[% r.patron.id | html %]">[% r.patron.firstname | html %] [% r.patron.surname | html %]'s fines and charges</h3>
 
-    <table class="table table-bordered table-striped" id="finestable-[% r.id %]">
+    <table class="table table-bordered table-striped" id="finestable-[% r.id | html %]">
         <thead>
             <tr>
                 <th class="title-string">Date</th>
@@ -134,12 +134,12 @@
             [% FOREACH a IN r.accountlines %]
                 [% SET account_sum = account_sum + a.amountoutstanding %]
                 <tr>
-                    <td><span title="[% a.date %]">[% a.date | $KohaDates %]</span></td>
+                    <td><span title="[% a.date | html %]">[% a.date | $KohaDates %]</span></td>
                     <td>
                         [% PROCESS account_type_description account=a %]
-                        [%- IF a.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', a.payment_type, 1) %][% END %]
-                        [%- IF a.description %], [% a.description %][% END %]
-                        [% IF a.itemnumber %]([% a.item.biblio.title %])[% END %]
+                        [%- IF a.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', a.payment_type, 1) | html %][% END %]
+                        [%- IF a.description %], [% a.description | html %][% END %]
+                        [% IF a.itemnumber %]([% a.item.biblio.title | html %])[% END %]
                     </td>
                     [% IF ( a.amount < 0 ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% a.amount | $Price %]</td>
                     [% IF ( a.amountoutstanding < 0 ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% a.amountoutstanding | $Price %]</td>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index 339f0b8637..66a47cea6f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -424,8 +424,8 @@
                                         <tbody>
                                             [% FOREACH r IN relatives_with_fines %]
                                             <tr>
-                                                <td>[% r.firstname %] [% r.surname %] currently owes fines and charges amounting to:</td>
-                                                <td><a href="/cgi-bin/koha/opac-account.pl#g[% r.id %]">[% r.account.balance | $Price %]</a></td>
+                                                <td>[% r.firstname | html %] [% r.surname | html %] currently owes fines and charges amounting to:</td>
+                                                <td><a href="/cgi-bin/koha/opac-account.pl#g[% r.id | uri %]">[% r.account.balance | $Price %]</a></td>
                                             </tr>
                                             [% END %]
                                         </tbody>
-- 
2.39.5