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->itemtype : undef )->{'returnbranch'} || "homebranch";
278
    my $hbr = GetBranchItemRule($biblio->{'homebranch'}, $itemtype ? $itemtype->itemtype : undef )->{'returnbranch'} || "homebranch";
278
    my $returnbranch = $biblio->{$hbr} ;
279
    $returnbranch = $biblio->{$hbr};
279
280
280
    my $materials = $biblio->{'materials'};
281
    my $materials = $biblio->{'materials'};
281
    my $avcode = GetAuthValCode('items.materials');
282
    my $avcode = GetAuthValCode('items.materials');
Lines 641-651 $itemnumber = GetItemnumberFromBarcode( $barcode ); Link Here
641
if ( $itemnumber ) {
642
if ( $itemnumber ) {
642
   my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber );
643
   my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber );
643
    $holdingBranch //= '';
644
    $holdingBranch //= '';
644
    $collectionBranch //= '';
645
    $collectionBranch //= $returnbranch;
645
    if ( ! ( $holdingBranch eq $collectionBranch ) ) {
646
    if ( ! ( $holdingBranch eq $collectionBranch ) ) {
646
        $template->param(
647
        $template->param(
647
          collectionItemNeedsTransferred => 1,
648
          collectionItemNeedsTransferred => 1,
648
          collectionBranch => GetBranchName($collectionBranch),
649
          collectionBranchName => GetBranchName($collectionBranch),
650
          collectionBranch => $collectionBranch,
649
          itemnumber => $itemnumber,
651
          itemnumber => $itemnumber,
650
        );
652
        );
651
    }
653
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-3 / +2 lines)
Lines 146-155 $(document).ready(function () { Link Here
146
146
147
[% IF ( collectionItemNeedsTransferred ) %]
147
[% IF ( collectionItemNeedsTransferred ) %]
148
 <div id="rotating-collection" class="dialog message">
148
 <div id="rotating-collection" class="dialog message">
149
        <h3>Please transfer item to: [% collectionBranch %]</h3>
149
        <h3>Please transfer item to: [% collectionBranchName %]</h3>
150
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
150
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
151
            <p>This item is part of a rotating collection.</p>
151
            <p>This item is part of a rotating collection.</p>
152
            <p><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% returnbranch %]&amp;op=slip'); return true;">Print slip</a></p>
152
            <p><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% collectionBranch %]&amp;op=slip'); return true;">Print slip</a></p>
153
</div>
153
</div>
154
[% END %]
154
[% END %]
155
155
156
- 

Return to bug 15564