From c713e06e700e330db569b518bc426501d155e973 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Thu, 30 Aug 2018 20:13:37 +0000
Subject: [PATCH] Bug 19383: DBRev 18.06.00.022

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 Koha.pm                                                 |  2 +-
 installer/data/mysql/atomicupdate/bug_19383.sql         |  3 ---
 installer/data/mysql/updatedatabase.pl                  | 12 ++++++++++++
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 16 ++++++++--------
 4 files changed, 21 insertions(+), 12 deletions(-)
 delete mode 100644 installer/data/mysql/atomicupdate/bug_19383.sql

diff --git a/Koha.pm b/Koha.pm
index d50702d1ac..45e49c7e55 100644
--- a/Koha.pm
+++ b/Koha.pm
@@ -29,7 +29,7 @@ use vars qw{ $VERSION };
 # - #4 : the developer version. The 4th number is the database subversion.
 #        used by developers when the database changes. updatedatabase take care of the changes itself
 #        and is automatically called by Auth.pm when needed.
-$VERSION = "18.06.00.021";
+$VERSION = "18.06.00.022";
 
 sub version {
     return $VERSION;
diff --git a/installer/data/mysql/atomicupdate/bug_19383.sql b/installer/data/mysql/atomicupdate/bug_19383.sql
deleted file mode 100644
index 0fd6ab3f00..0000000000
--- a/installer/data/mysql/atomicupdate/bug_19383.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
-('HoldsAutoFill','0',NULL,'If on, librarian will not be asked if hold should be filled, it will be filled automatically','YesNo'),
-('HoldsAutoFillPrintSlip','0',NULL,'If on, hold slip print dialog will be displayed automatically','YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index c168930d0c..bfb528c0df 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -16327,6 +16327,18 @@ if( CheckVersion( $DBversion ) ) {
     print "Upgrade to $DBversion done (Bug 21068 - Remove system preferences NorwegianPatronDB*)\n";
 }
 
+$DBversion = '18.06.00.022';
+if( CheckVersion( $DBversion ) ) {
+    my $dbh = C4::Context->dbh;
+    $dbh->do(q|
+        INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
+        ('HoldsAutoFill','0',NULL,'If on, librarian will not be asked if hold should be filled, it will be filled automatically','YesNo'),
+        ('HoldsAutoFillPrintSlip','0',NULL,'If on, hold slip print dialog will be displayed automatically','YesNo')
+    |);
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 19383 - Add ability to print hold receipts automatically)\n";
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 5306ff2a7e..74b24f6e55 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -55,26 +55,26 @@
     [% IF hold_auto_filled %]
         <div class="dialog alert hold-auto-filled">
             [% IF ( reservenotes ) %]
-                <h4>Notes: [% reservenotes %]</h4>
+                <h4>Notes: [% reservenotes | html %]</h4>
             [% END %]
             <h3>Hold filled for:</h3>
                 <li>
                     [% INCLUDE 'patron-title.inc' patron=patron %]
-                    <span class="patron-category"> - [% patron.category.description %]</span>
+                    <span class="patron-category"> - [% patron.category.description | html %]</span>
                 </li>
 
                 [% INCLUDE display_holdpatron_address %]
 
                 [% IF ( patron.phone ) %]
-                    <li>[% patron.phone  %]</li>
+                    <li>[% patron.phone | html %]</li>
                 [% END %]
 
                 [% IF ( patron.email ) %]
                     <li>
                         [% IF ( transfertodo ) %]
-                            [% patron.email %]
+                            [% patron.email | html %]
                         [% ELSE %]
-                            <a id="boremail" href="mailto:[% patron.email %]">[% patron.email %]</a>
+                            <a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a>
                         [% END %]
                     </li>
                 [% END %]
@@ -92,9 +92,9 @@
                 [% END %]
 
             [% IF ( transfertodo ) %]
-                <h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) %]</h4>
+                <h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) | html %]</h4>
             [% ELSE %]
-                <h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) %]</h4>
+                <h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) | html %]</h4>
             [% END %]
 
             <a href="#" class="btn btn-default print print-slip">
@@ -767,7 +767,7 @@
 
             $(".print-slip").on('click', function(e) {
                 e.preventDefault();
-                Dopop('hold-transfer-slip.pl?borrowernumber=[% patron.borrowernumber %]&amp;biblionumber=[% biblionumber %]');
+                Dopop('hold-transfer-slip.pl?borrowernumber=[% patron.borrowernumber | html %]&amp;biblionumber=[% biblionumber | html %]');
             });
 
             [% IF print_slip %]
-- 
2.11.4.GIT