From: Galen Charlton <galen.charlton@liblime.com>
Date: Mon, 27 Apr 2009 19:39:36 +0000 (-0500)
Subject: bug 2893: tweaks to AllowNotForLoanOverride (DB rev 030)
X-Git-Tag: new_acq_a_porter~195
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=46037ac61ae99ef053d89cf1b2b73472b970c3c8;hp=43e49768065f20b0d774e5a84f1781f6d7c28799;p=koha_fer

bug 2893: tweaks to AllowNotForLoanOverride (DB rev 030)

* 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.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
---

diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 1c6ed74cf2..69a03253d5 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 70d55544c5..56fcf2fee5 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 4b0b5dfc0a..48c8cb63ac 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 5e89ad341a..c590834d10 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