[Koha-cvs] koha/C4/Circulation Circ2.pm

[Robert Lyon]

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	Robert Lyon <bob_lyon>	06/06/07 02:31:18

Modified files:
	C4/Circulation : Circ2.pm 

Log message:
	merging katipo changes...
	
	fixing syntax mistake and adding specific change allowing workers at a
	library not to have issuing impossible alerts 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&r1=1.108&r2=1.109

Patches:
Index: Circ2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- Circ2.pm	7 Jun 2006 02:07:10 -0000	1.108
+++ Circ2.pm	7 Jun 2006 02:31:18 -0000	1.109
@@ -3,7 +3,7 @@
 
 package C4::Circulation::Circ2;
 
-# $Id: Circ2.pm,v 1.108 2006/06/07 02:07:10 bob_lyon Exp $
+# $Id: Circ2.pm,v 1.109 2006/06/07 02:31:18 bob_lyon Exp $
 
 #package to deal with Returns
 #written 3/11/99 by olwen at katipo.co.nz
@@ -797,8 +797,8 @@
 
 # DEBTS
 	my $amount = checkaccount($env,$borrower->{'borrowernumber'}, $dbh,$duedate);
-        if($C4::Context->preference("IssuingInProcess")){
-	    my $amountlimit = $C4::Context->preference("noissuescharge");
+        if(C4::Context->preference("IssuingInProcess")){
+	    my $amountlimit = C4::Context->preference("noissuescharge");
 	    if ($amount > $amountlimit && !$inprocess) {
 		$issuingimpossible{DEBT} = sprintf("%.2f",$amount);
 	    } elsif ($amount <= $amountlimit && !$inprocess) {
@@ -848,7 +848,7 @@
 		if ($renewstatus == 0) { # no more renewals allowed
 			$issuingimpossible{NO_MORE_RENEWALS} = 1;
 		} else {
-			$needsconfirmation{RENEW_ISSUE} = 1;
+	#		$needsconfirmation{RENEW_ISSUE} = 1;
 		}
 	} elsif ($currentborrower) {
 # issued to someone else
@@ -876,7 +876,16 @@
 			$needsconfirmation{RESERVED} = "$res->{'reservedate'} : $resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'})";
 		}
 	}
+        if(C4::Context->preference("LibraryName") eq "Horowhenua Library Trust"){
+	    if ($borrower->{'categorycode'} eq 'W'){
+		        my %issuingimpossible;
 	return(\%issuingimpossible,\%needsconfirmation);
+	    } else {
+		return(\%issuingimpossible,\%needsconfirmation);
+	    }
+	} else {
+	    return(\%issuingimpossible,\%needsconfirmation);
+	}
 }
 
 =head2 issuebook