[Koha-patches] [[HEAD][reconciliation]] Removing memberofinstitution management

[Henri-Damien LAURENT]

---
 circ/circulation.pl                                |   21 --------------------
 .../prog/en/modules/circ/circulation.tmpl          |   11 ++-------
 2 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 2145fbb..a446b07 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -114,7 +114,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
@@ -626,24 +625,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,
-    );
-}
 
 $template->param(
     issued_itemtypes_count_loop => \@issued_itemtypes_count_loop,
@@ -678,8 +659,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 b57b131..f8982e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -70,8 +70,9 @@ $.tablesorter.addParser({
 <!-- 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 -->
@@ -199,10 +200,6 @@ $.tablesorter.addParser({
         <!-- /TMPL_IF -->
         </ul>
 
-    <!-- TMPL_IF NAME="memberofinstution" -->
-    <p><!-- TMPL_VAR NAME="CGIorganisations" --></p>
-    <!-- /TMPL_IF -->
-
 </div></div>
     <!--/TMPL_IF --> <!-- /impossible -->
 
@@ -620,8 +617,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" -->
-- 
1.6.0.4