From c9a7291b0d513f89408727b4abc799234d0f8729 Mon Sep 17 00:00:00 2001
From: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date: Mon, 31 Aug 2009 10:58:11 +0200
Subject: [PATCH] Removing memberofinstitution management

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
---
 circ/circulation.pl                           | 22 -------------------
 .../prog/en/modules/circ/circulation.tmpl     | 12 ++++------
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index bfe18885d4..e0adbf5d57 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -116,7 +116,6 @@ my $stickyduedate  = $query->param('stickyduedate') || $session->param('stickydu
 my $duedatespec    = $query->param('duedatespec')   || $session->param('stickyduedate');
 my $issueconfirmed = $query->param('issueconfirmed');
 my $cancelreserve  = $query->param('cancelreserve');
-my $organisation   = $query->param('organisations');
 my $print          = $query->param('print');
 my $newexpiry      = $query->param('dateexpiry');
 my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
@@ -686,25 +685,6 @@ if ( $borrower->{'category_type'} eq 'C') {
     $template->param( 'catcode' =>    $catcodes->[0])  if $cnt == 1;
 }
 
-my $CGIorganisations;
-my $member_of_institution;
-if ( C4::Context->preference("memberofinstitution") ) {
-    my $organisations = get_institutions();
-    my @orgs;
-    my %org_labels;
-    foreach my $organisation ( keys %$organisations ) {
-        push @orgs, $organisation;
-        $org_labels{$organisation} =
-          $organisations->{$organisation}->{'surname'};
-    }
-    $member_of_institution = 1;
-    $CGIorganisations      = CGI::popup_menu(
-        -id     => 'organisations',
-        -name   => 'organisations',
-        -labels => \%org_labels,
-        -values => \@orgs,
-    );
-}
 
 $amountold = $temp[1];
 
@@ -741,8 +721,6 @@ $template->param(
     todayissues       => \@todaysissues,
     previssues        => \@previousissues,
     inprocess         => $inprocess,
-    memberofinstution => $member_of_institution,
-    CGIorganisations  => $CGIorganisations,
 	is_child          => ($borrower->{'category_type'} eq 'C'),
     circview => 1,
 );
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 c43201a96f..fcfae66285 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -146,7 +146,9 @@ function refocus(calendar) {
 <!-- TMPL_ELSE -->
 <div id="doc3" class="yui-t2">
 
-   <div id="bd">
+   <div id="bd"><!-- TMPL_UNLESS NAME="CGIselectborrower" -->
+<!-- TMPL_IF NAME="borrowernumber" --><div class="yui-b"><!-- TMPL_INCLUDE NAME="circ-menu.inc" --></div><!-- /TMPL_IF -->
+<!-- /TMPL_UNLESS -->
 	<div id="yui-main">
 	<div class="yui-b">
 <!-- /TMPL_IF -->
@@ -287,10 +289,6 @@ function refocus(calendar) {
         <!-- /TMPL_IF -->
         </ul>
 
-    <!-- TMPL_IF NAME="memberofinstution" -->
-    <p><!-- TMPL_VAR NAME="CGIorganisations" --></p>
-    <!-- /TMPL_IF -->
-
 </div></div>
     <!--/TMPL_IF --> <!-- /impossible -->
 
@@ -764,8 +762,6 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 
 </div>
 </div>
-<!-- TMPL_UNLESS NAME="CGIselectborrower" --><!-- TMPL_IF NAME="borrowernumber" --><div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
-</div><!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
+</div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-- 
2.39.5