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

[Henri-Damien LAURENT]

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch: 	rel_2_2
Changes by:	Henri-Damien LAURENT <hdl at savannah.gnu.org>	06/04/06 15:39:59

Modified files:
	C4/Circulation : Circ2.pm 
	koha-tmpl/intranet-tmpl/default/en/circ: circulation.tmpl 

Log message:
	Adding a new control depending on IndependantBranches for issues.
	When librarian is not of th same HOLDINGBranch of the item, he cannot issue a book.
	
	circulation.tmpl contains the error message.
	
	If IndependantBranches set to 0, circulation behavior is unchanged.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/Circulation/Circ2.pm.diff?only_with_tag=rel_2_2&tr1=1.87.2.12&tr2=1.87.2.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl.diff?only_with_tag=rel_2_2&tr1=1.35.2.9&tr2=1.35.2.10&r1=text&r2=text

Patches:
Index: koha/C4/Circulation/Circ2.pm
diff -u koha/C4/Circulation/Circ2.pm:1.87.2.12 koha/C4/Circulation/Circ2.pm:1.87.2.13
--- koha/C4/Circulation/Circ2.pm:1.87.2.12	Tue Jan 24 14:57:06 2006
+++ koha/C4/Circulation/Circ2.pm	Thu Apr  6 15:39:58 2006
@@ -3,7 +3,7 @@
 
 package C4::Circulation::Circ2;
 
-# $Id: Circ2.pm,v 1.87.2.12 2006/01/24 14:57:06 hdl Exp $
+# $Id: Circ2.pm,v 1.87.2.13 2006/04/06 15:39:58 hdl Exp $
 
 #package to deal with Returns
 #written 3/11/99 by olwen at katipo.co.nz
@@ -747,6 +747,13 @@
 	if ($iteminformation->{'restricted'} == 1) {
 		$issuingimpossible{RESTRICTED} = 1;
 	}
+	if (C4::Context->preference("IndependantBranches")){
+		my $userenv = C4::Context->userenv;
+		if (($userenv)&&($userenv->{flags} != 1)){
+			$issuingimpossible{NOTSAMEBRANCH} = 1 if ($iteminformation->{'holdingbranch'} ne $userenv->{branch} ) ;
+		}
+	}
+
 
 
 
Index: koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:1.35.2.9 koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:1.35.2.10
--- koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:1.35.2.9	Mon Apr  3 12:40:14 2006
+++ koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl	Thu Apr  6 15:39:58 2006
@@ -165,6 +165,9 @@
 	<div id="bloc25">
 		<!-- TMPL_IF NAME="IMPOSSIBLE" -->
 		<h2 class="problem">Issuing impossible</h2>
+			<!-- TMPL_IF NAME="NOTSAMEBRANCH" -->
+				<p class="problem">You are trying to issue a book which is not in your branch.</p>
+			<!-- /TMPL_IF -->
 			<!-- TMPL_IF NAME="INVALID_DATE" -->
 				<p class="problem">The due date is invalid</p>
 			<!-- /TMPL_IF -->