From: Chris Cormack <chris@snaga.liblime.co.nz>
Date: Tue, 13 Nov 2007 21:59:29 +0000 (-0600)
Subject: Fix so with independent branches a staff member cant see who has items out if the... 
X-Git-Tag: v3.00.00-alpha~901
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=24ba695b2bd72f18c8f82076dd7760eaeba09f41;p=koha-ffzg.git

Fix so with independent branches a staff member cant see who has items out if the borrower is from another library/branch

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 91cb0cb72e..7a59204850 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -745,7 +745,7 @@ sub GetItemsInfo {
     my ( $date_due, $count_reserves );
 
     my $isth    = $dbh->prepare(
-        "SELECT issues.*,borrowers.cardnumber,borrowers.surname,borrowers.firstname
+        "SELECT issues.*,borrowers.cardnumber,borrowers.surname,borrowers.firstname,borrowers.branchcode as bcode
         FROM   issues LEFT JOIN borrowers ON issues.borrowernumber=borrowers.borrowernumber
         WHERE  itemnumber = ?
             AND returndate IS NULL"
@@ -759,13 +759,18 @@ sub GetItemsInfo {
             $data->{surname}     = $idata->{surname};
             $data->{firstname}     = $idata->{firstname};
             $datedue                = format_date( $idata->{'date_due'} );
+	    if (C4::Context->preference("IndependantBranches")){
+		my $userenv = C4::Context->userenv;
+		if ( ($userenv) && ( $userenv->{flags} != 1 ) ) { 
+		    $data->{'NOTSAMEBRANCH'} = 1 if ($idata->{'bcode'} ne $userenv->{branch});
+		}
+	    }
         }
         if ( $datedue eq '' ) {
             #$datedue="Available";
             my ( $restype, $reserves ) =
               C4::Reserves::CheckReserves( $data->{'itemnumber'} );
             if ($restype) {
-
                 #$datedue=$restype;
                 $count_reserves = $restype;
             }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index 303f35b45f..8032e7bf0d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -152,7 +152,11 @@
                     <td><!-- TMPL_VAR NAME="description" --></td>
                     <td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR name="location" --> <!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --></td>
                     <td><!-- TMPL_IF name="datedue" -->
-                            On issue to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a>
+		            <!-- TMPL_IF  NAME="NOTSAMEBRANCH" -->
+			      On issue to a borrower from another branch
+			    <!-- TMPL_ELSE -->
+                              On issue to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a>
+			    <!-- /TMPL_IF -->
                         <!-- TMPL_ELSE -->
                             <!-- TMPL_IF name="bi_notforloan" -->
                                 Not For loan (itemtype)
@@ -164,13 +168,13 @@
                                         Item lost
                                     <!-- TMPL_ELSE -->
                                     <!-- TMPL_IF NAME="wthdrawn" -->Item Cancelled
-									<!-- TMPL_ELSE -->
-									  <!-- TMPL_IF NAME="count_reserves" -->
-									    <!-- TMPL_VAR NAME="count_reserves" -->
-									  <!-- TMPL_ELSE -->
-									     Available
-									  <!-- /TMPL_IF -->
-									<!-- /TMPL_IF -->
+				    <!-- TMPL_ELSE -->
+				       <!-- TMPL_IF NAME="count_reserves" -->
+				         <!-- TMPL_VAR NAME="count_reserves" -->
+				       <!-- TMPL_ELSE -->
+				         Available
+				       <!-- /TMPL_IF -->
+				     <!-- /TMPL_IF -->
                                     <!-- /TMPL_IF -->
                                 <!-- /TMPL_IF -->
                             <!-- /TMPL_IF -->