From f1ff3e3b976079ed3219b5d97c68ca1487c3cf80 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Tue, 21 Apr 2015 11:56:16 +0200 Subject: [PATCH] Bug 7981: Follow-up - Fix qa script complaints - Fix updatedatabase, moving the update entry into the right spot - Fix some tabs Signed-off-by: Kyle M Hall Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart --- installer/data/mysql/updatedatabase.pl | 16 +++++++++------- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index de8d97e..318712b 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8507,13 +8507,6 @@ if ( CheckVersion($DBversion) ) { "); print "Upgrade to $DBversion done (Bug 10500 - Improve isbn matching when importing records)\n"; - -$DBversion = "3.15.00.XXX"; -if ( CheckVersion($DBversion) ) { - $dbh->do(q{ - DELETE FROM systempreferences WHERE variable = 'HomeOrHoldingBranchReturn'; - }); - print "Upgrade to $DBversion done (Bug 7981 - Transfer message on return. HomeOrHoldingBranchReturn syspref removed in favour of circulation rules.)\n"; SetVersion($DBversion); } @@ -10511,6 +10504,15 @@ if ( CheckVersion($DBversion) ) { SetVersion ($DBversion); } +$DBversion = "3.21.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + DELETE FROM systempreferences WHERE variable = 'HomeOrHoldingBranchReturn'; + }); + print "Upgrade to $DBversion done (Bug 7981 - Transfer message on return. HomeOrHoldingBranchReturn syspref removed in favour of circulation rules.)\n"; + SetVersion($DBversion); +} + # DEVELOPER PROCESS, search for anything to execute in the db_update directory # 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 a831c80..6dbbd5b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -289,7 +289,7 @@ $(document).ready(function () { [% IF ( soundon ) %] [% END %] -

This item needs to be transferred to [% Branches.GetName( returnbranchname ) %]

+

This item needs to be transferred to [% Branches.GetName( returnbranchname ) %]

Transfer now?
[% IF itemnumber %] @@ -297,7 +297,7 @@ $(document).ready(function () { [% END %] - + -- 2.1.0