View | Details | Raw Unified | Return to bug 8836
Collapse All | Expand All

(-)a/circ/returns.pl (-14 / +10 lines)
Lines 551-570 $template->param( Link Here
551
    BlockReturnOfWithdrawnItems => C4::Context->preference("BlockReturnOfWithdrawnItems"),
551
    BlockReturnOfWithdrawnItems => C4::Context->preference("BlockReturnOfWithdrawnItems"),
552
);
552
);
553
553
554
### Comment out rotating collections for now to allow it a little more time to bake
554
my $itemnumber = GetItemnumberFromBarcode( $query->param('barcode') );
555
### for 3.4; in particular, must ensure that it doesn't fight with transfers required
555
if ( $itemnumber ) {
556
### to fill hold requests
556
   my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber );
557
### -- Galen Charlton 2010-10-06
557
    if ( ! ( $holdingBranch eq $collectionBranch ) ) {
558
#my $itemnumber = GetItemnumberFromBarcode( $query->param('barcode') );
558
        $template->param(
559
#if ( $itemnumber ) {
559
          collectionItemNeedsTransferred => 1,
560
#   my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber );
560
          collectionBranch => GetBranchName($collectionBranch),
561
#    if ( ! ( $holdingBranch eq $collectionBranch ) ) {
561
        );
562
#        $template->param(
562
    }
563
#          collectionItemNeedsTransferred => 1,
563
}
564
#          collectionBranch => GetBranchName($collectionBranch),
565
#        );
566
#    }
567
#}                                                                                                            
568
564
569
# actually print the page!
565
# actually print the page!
570
output_html_with_http_headers $query, $cookie, $template->output;
566
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt (-3 lines)
Lines 142-153 Link Here
142
    <dd>Enter a barcode to generate a printable spine label. For use with dedicated label printers</dd>
142
    <dd>Enter a barcode to generate a printable spine label. For use with dedicated label printers</dd>
143
    [% END %]
143
    [% END %]
144
144
145
<!--
146
    [% IF ( CAN_user_tools_rotating_collections ) %]
145
    [% IF ( CAN_user_tools_rotating_collections ) %]
147
    <dt><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a></dt>
146
    <dt><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a></dt>
148
    <dd>Manage Rotating Collections</dd>
147
    <dd>Manage Rotating Collections</dd>
149
    [% END %]
148
    [% END %]
150
-->
151
149
152
    [% IF ( CAN_user_tools_marc_modification_templates ) %]
150
    [% IF ( CAN_user_tools_marc_modification_templates ) %]
153
    <dt><a href="/cgi-bin/koha/tools/marc_modification_templates.pl">MARC modification templates</a></dt>
151
    <dt><a href="/cgi-bin/koha/tools/marc_modification_templates.pl">MARC modification templates</a></dt>
154
- 

Return to bug 8836