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

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

Return to bug 14576