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

(-)a/circ/returns.pl (-3 / +5 lines)
Lines 249-254 if ($canceltransfer){ Link Here
249
}
249
}
250
250
251
# actually return book and prepare item table.....
251
# actually return book and prepare item table.....
252
my $returnbranch;
252
if ($barcode) {
253
if ($barcode) {
253
    $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace
254
    $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace
254
    $barcode = barcodedecode($barcode) if C4::Context->preference('itemBarcodeInputFilter');
255
    $barcode = barcodedecode($barcode) if C4::Context->preference('itemBarcodeInputFilter');
Lines 275-281 if ($barcode) { Link Here
275
276
276
    # make sure return branch respects home branch circulation rules, default to homebranch
277
    # make sure return branch respects home branch circulation rules, default to homebranch
277
    my $hbr = GetBranchItemRule($biblio->{'homebranch'}, $itemtype->itemtype)->{'returnbranch'} || "homebranch";
278
    my $hbr = GetBranchItemRule($biblio->{'homebranch'}, $itemtype->itemtype)->{'returnbranch'} || "homebranch";
278
    my $returnbranch = $biblio->{$hbr} ;
279
    $returnbranch = $biblio->{$hbr} ;
279
280
280
    $template->param(
281
    $template->param(
281
        title            => $biblio->{'title'},
282
        title            => $biblio->{'title'},
Lines 629-639 $itemnumber = GetItemnumberFromBarcode( $barcode ); Link Here
629
if ( $itemnumber ) {
630
if ( $itemnumber ) {
630
   my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber );
631
   my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber );
631
    $holdingBranch //= '';
632
    $holdingBranch //= '';
632
    $collectionBranch //= '';
633
    $collectionBranch //= $returnbranch;
633
    if ( ! ( $holdingBranch eq $collectionBranch ) ) {
634
    if ( ! ( $holdingBranch eq $collectionBranch ) ) {
634
        $template->param(
635
        $template->param(
635
          collectionItemNeedsTransferred => 1,
636
          collectionItemNeedsTransferred => 1,
636
          collectionBranch => GetBranchName($collectionBranch),
637
          collectionBranchName => GetBranchName($collectionBranch),
638
          collectionBranch => $collectionBranch,
637
          itemnumber => $itemnumber,
639
          itemnumber => $itemnumber,
638
        );
640
        );
639
    }
641
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-3 / +2 lines)
Lines 134-143 $(document).ready(function () { Link Here
134
134
135
[% IF ( collectionItemNeedsTransferred ) %]
135
[% IF ( collectionItemNeedsTransferred ) %]
136
 <div id="rotating-collection" class="dialog message">
136
 <div id="rotating-collection" class="dialog message">
137
        <h3>Please transfer item to: [% collectionBranch %]</h3>
137
        <h3>Please transfer item to: [% collectionBranchName %]</h3>
138
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode %]: [% title %]</a></p>
138
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode %]: [% title %]</a></p>
139
            <p>This item is part of a rotating collection.</p>
139
            <p>This item is part of a rotating collection.</p>
140
            <p><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% returnbranch %]&amp;op=slip'); return true;">Print slip</a></p>
140
            <p><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% collectionBranch %]&amp;op=slip'); return true;">Print slip</a></p>
141
</div>
141
</div>
142
[% END %]
142
[% END %]
143
143
144
- 

Return to bug 15564