[Koha-patches] [PATCH] bug 2893: tweaks to AllowNotForLoanOverride (DB rev 030)

[Galen Charlton]

* moved to DB rev 030
* assigned AllowNotForLoanOverride to circulation syspref category
* added a hint to the circulation operator: when the
  AllowNotForLoanOverride is ON, if the operator attempts
  to check out an item that is normally not for loan due to
  its item type or because the item is explicitly marked as
  not-for-loan, the operator is given the chance to check
  out the item anyway.
---
 admin/systempreferences.pl                         |    1 +
 installer/data/mysql/updatedatabase.pl             |    2 +-
 .../prog/en/modules/circ/circulation.tmpl          |    4 ++++
 kohaversion.pl                                     |    2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 1c6ed74..69a0325 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -159,6 +159,7 @@ $tabsysprefs{AllowHoldsOnDamagedItems}       = "Circulation";
 $tabsysprefs{UseBranchTransferLimits}        = "Circulation";
 $tabsysprefs{AllowHoldPolicyOverride}        = "Circulation";
 $tabsysprefs{BranchTransferLimitsType}       = "Circulation";
+$tabsysprefs{AllowNotForLoanOverride}        = "Circulation";
 
 # Staff Client
 $tabsysprefs{TemplateEncoding}        = "StaffClient";
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 70d5554..56fcf2f 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2389,7 +2389,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
-$DBversion = "3.01.00.015";
+$DBversion = "3.01.00.030";
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     $dbh->do("INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanation` , `type` ) VALUES ( 'AllowNotForLoanOverride', '0', '', 'If ON, Koha will allow the librarian to loan a not for loan item.', 'YesNo')");
     print "Upgrade to $DBversion done (added AllowNotForLoanOverride system preference)\n";
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 4b0b5df..48c8cb6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -110,6 +110,10 @@ $.tablesorter.addParser({
 <!-- TMPL_IF NAME="TOO_MANY" -->
     <li>Too many checked out (already checked out / max : <!-- TMPL_VAR name="TOO_MANY" -->)</li>
 <!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="NOT_FOR_LOAN_FORCING" -->
+    <li>Item is normally not for loan.  Check out anyway?</li>
+<!-- /TMPL_IF -->
 </ul>
 
 <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
diff --git a/kohaversion.pl b/kohaversion.pl
index 5e89ad3..c590834 100644
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -10,7 +10,7 @@
 use strict;
 
 sub kohaversion {
-    our $VERSION = '3.01.00.029';
+    our $VERSION = '3.01.00.030';
     # version needs to be set this way
     # so that it can be picked up by Makefile.PL
     # during install
-- 
1.5.6.5