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

(-)a/circ/returns.pl (-14 / +10 lines)
Lines 541-560 $template->param( Link Here
541
    BlockReturnOfWithdrawnItems => C4::Context->preference("BlockReturnOfWithdrawnItems"),
541
    BlockReturnOfWithdrawnItems => C4::Context->preference("BlockReturnOfWithdrawnItems"),
542
);
542
);
543
543
544
### Comment out rotating collections for now to allow it a little more time to bake
544
my $itemnumber = GetItemnumberFromBarcode( $query->param('barcode') );
545
### for 3.4; in particular, must ensure that it doesn't fight with transfers required
545
if ( $itemnumber ) {
546
### to fill hold requests
546
   my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber );
547
### -- Galen Charlton 2010-10-06
547
    if ( ! ( $holdingBranch eq $collectionBranch ) ) {
548
#my $itemnumber = GetItemnumberFromBarcode( $query->param('barcode') );
548
        $template->param(
549
#if ( $itemnumber ) {
549
          collectionItemNeedsTransferred => 1,
550
#   my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber );
550
          collectionBranch => GetBranchName($collectionBranch),
551
#    if ( ! ( $holdingBranch eq $collectionBranch ) ) {
551
        );
552
#        $template->param(
552
    }
553
#          collectionItemNeedsTransferred => 1,
553
}
554
#          collectionBranch => GetBranchName($collectionBranch),
555
#        );
556
#    }
557
#}                                                                                                            
558
554
559
# actually print the page!
555
# actually print the page!
560
output_html_with_http_headers $query, $cookie, $template->output;
556
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt (-3 lines)
Lines 137-148 Link Here
137
    <dd>Enter a barcode to generate a printable spine label. For use with dedicated label printers</dd>
137
    <dd>Enter a barcode to generate a printable spine label. For use with dedicated label printers</dd>
138
    [% END %]
138
    [% END %]
139
139
140
<!--
141
    [% IF ( CAN_user_tools_rotating_collections ) %]
140
    [% IF ( CAN_user_tools_rotating_collections ) %]
142
    <dt><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a></dt>
141
    <dt><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a></dt>
143
	<dd>Manage Rotating Collections</dd>
142
	<dd>Manage Rotating Collections</dd>
144
    [% END %]
143
    [% END %]
145
-->
146
144
147
    [% IF ( CAN_user_tools_stage_marc_import ) %]
145
    [% IF ( CAN_user_tools_stage_marc_import ) %]
148
    <dt><a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC records for import</a></dt>
146
    <dt><a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC records for import</a></dt>
149
- 

Return to bug 8836