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

(-)a/C4/Circulation.pm (-2 lines)
Lines 1824-1831 sub AddReturn { Link Here
1824
        }
1824
        }
1825
    }
1825
    }
1826
1826
1827
    my $item = GetItem($itemnumber) or die "GetItem($itemnumber) failed";
1828
1829
        # full item data, but no borrowernumber or checkout info (no issue)
1827
        # full item data, but no borrowernumber or checkout info (no issue)
1830
    my $hbr = GetBranchItemRule($item->{'homebranch'}, $item->{'itype'})->{'returnbranch'} || "homebranch";
1828
    my $hbr = GetBranchItemRule($item->{'homebranch'}, $item->{'itype'})->{'returnbranch'} || "homebranch";
1831
        # get the proper branch to which to return the item
1829
        # get the proper branch to which to return the item
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-49 / +13 lines)
Lines 468-486 Link Here
468
            [% IF ( errmsgloo.NotForLoanStatusUpdated ) %]
468
            [% IF ( errmsgloo.NotForLoanStatusUpdated ) %]
469
                <p class="problem">
469
                <p class="problem">
470
                    Not for loan status updated.
470
                    Not for loan status updated.
471
                <br />Old value:
471
                    <br />Old value:
472
                 [% IF errmsgloo.NotForLoanStatusUpdated.from %]
472
                    [% IF errmsgloo.NotForLoanStatusUpdated.from %]
473
                     [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) %].
473
                        [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) %].
474
                 [% ELSE %]
474
                    [% ELSE %]
475
                     Available for loan.
475
                        Available for loan.
476
                 [% END %]
476
                    [% END %]
477
                     <br />New value:
477
                    <br />New value:
478
                 [% IF errmsgloo.NotForLoanStatusUpdated.to %]
478
                    [% IF errmsgloo.NotForLoanStatusUpdated.to %]
479
                     [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.to ) %].
479
                        [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.to ) %].
480
                 [% ELSE %]
480
                    [% ELSE %]
481
                     Available for loan.
481
                        Available for loan.
482
                 [% END %]
482
                    [% END %]
483
                     </p>
483
                </p>
484
            [% END %]
484
            [% END %]
485
            [% IF ( errmsgloo.ItemLocationUpdated ) %]
485
            [% IF ( errmsgloo.ItemLocationUpdated ) %]
486
                 <p class="problem">
486
                 <p class="problem">
Lines 524-564 Link Here
524
            [% END %]
524
            [% END %]
525
            [% IF ( errmsgloo.waslost ) %]
525
            [% IF ( errmsgloo.waslost ) %]
526
                <p class="problem">Item was lost, now found.</p>
526
                <p class="problem">Item was lost, now found.</p>
527
                [% IF ( LostItemFeeRefunded ) %]
528
                    <p class="problem">A refund has been applied to the borrowing patron's account.</p>
529
                [% ELSE %]
530
                    <p class="problem">Any lost item fees for this item will remain on the patron's account.</p>
531
                [% END %]
532
            [% END %]
533
            [% IF ( errmsgloo.withdrawn ) %]
534
                [% IF BlockReturnOfWithdrawnItems %]
535
                    <h5>Cannot check in</h5>
536
                    <p><strong>NOT CHECKED IN</strong></p>
537
                    <p class="problem">Item is withdrawn.</p>
538
                [% ELSE %]
539
                    <p class="problem">Item is withdrawn.</p>
540
                [% END %]
541
            [% END %]
542
            [% IF ( errmsgloo.debarred ) %]
543
                <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber %]">[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %].</p>
544
            [% END %]
545
            [% IF ( errmsgloo.prevdebarred ) %]
546
                <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p>
547
            [% END %]
548
            [% IF ( errmsgloo.badbarcode ) %]
549
                <p class="problem">No item with barcode: [% errmsgloo.msg | html %]</p>
550
            [% END %]
551
            [% IF ( errmsgloo.ispermanent ) %]
552
                <p class="problem">Please return item to: [% Branches.GetName( errmsgloo.msg ) %]</p>
553
            [% END %]
554
            [% IF ( errmsgloo.notissued ) %]
555
                <p class="problem">Not checked out.</p>
556
            [% END %]
557
            [% IF ( errmsgloo.localuse) %]
558
                <p class="problem">Local use recorded</p>
559
            [% END %]
560
            [% IF ( errmsgloo.waslost ) %]
561
                <p class="problem">Item was lost, now found.</p>
562
                [% IF LostItemFeeRefunded and not Koha.Preference('BlockReturnOfLostItems') %]
527
                [% IF LostItemFeeRefunded and not Koha.Preference('BlockReturnOfLostItems') %]
563
                    <p class="problem">A refund has been applied to the borrowing patron's account.</p>
528
                    <p class="problem">A refund has been applied to the borrowing patron's account.</p>
564
                [% ELSIF Koha.Preference('BlockReturnOfLostItems') %]
529
                [% ELSIF Koha.Preference('BlockReturnOfLostItems') %]
565
- 

Return to bug 14576