From 6aad47c4fac82c25aacc78456fa373e35a004ec6 Mon Sep 17 00:00:00 2001
From: Charles Farmer <charles.farmer@inLibro.com>
Date: Mon, 13 Aug 2018 16:32:43 -0400
Subject: [PATCH] Bug 12446: (QA follow-up) Cleaning, and fixing, old code
 carried accidentally

Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>
---
 installer/data/mysql/atomicupdate/bug_12446-EnableAdultGarantee.sql | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/installer/data/mysql/atomicupdate/bug_12446-EnableAdultGarantee.sql b/installer/data/mysql/atomicupdate/bug_12446-EnableAdultGarantee.sql
index 56462a7..233d765 100644
--- a/installer/data/mysql/atomicupdate/bug_12446-EnableAdultGarantee.sql
+++ b/installer/data/mysql/atomicupdate/bug_12446-EnableAdultGarantee.sql
@@ -7,5 +7,5 @@ VALUES ('AdditionalGuarantorField','',NULL,'Additional fields name to be transfe
 -- ********* --
 -- STRUCTURE --
 -- ********* --
-ALTER TABLE categories ADD COLUMN `canbeguarantee` tinyint(1) NOT NULL default '0';
+ALTER TABLE categories ADD COLUMN `canbeguarantee` tinyint(1) NOT NULL default '0' AFTER `checkprevcheckout`;
 UPDATE categories SET canbeguarantee = 1 WHERE category_type = 'P' OR category_type = 'C';
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index b7adbbe..cf372ce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -257,7 +257,7 @@
                                                     <tr>
                                                         [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
                                                             <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber | uri %]">[% guarantee.firstname | html %] [% guarantee.surname | html %]</a></td>
-                                                            <td style='text-align:right'>[% guarantee.account.balance %]</td>
+                                                            <td style='text-align:right'>[% guarantee.account.balance | html %]</td>
                                                         [% ELSE %]
                                                             <td>[% guarantee.firstname | html %] [% guarantee.surname | html %]</td>
                                                         [% END %]
@@ -265,7 +265,7 @@
                                                     [% END %]
                                                     [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
                                                        <td>Total</td>
-                                                       <td style='text-align:right'>[% amounttot %]</td>
+                                                       <td style='text-align:right'>[% amounttot | html %]</td>
                                                     [% END %]
                                                 </table>
                                             </li>
-- 
2.7.4