Attachment #158011 for bug #27992

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




                interface      => C4::Context->interface,
            }
        );
        my $block_lost_return = C4::Context->preference("BlockReturnOfLostItems") ? 1 : 0;
        my ( $stats_return, $stats_messages, $stats_iteminformation, $stats_borrower) =
        AddReturn( $item_object->barcode, C4::Context->userenv->{'branch'} );
        ModDateLastSeen( $item_object->itemnumber, $block_lost_return ); # FIXME Move to Koha::Item
        return (
            {
                STATS     => 1,
                CHECKEDIN => $stats_return,
                MESSAGES  => $stats_messages,
                ITEM      => $stats_iteminformation,
                BORROWER  => $stats_borrower,
            },
            {}
        );
    }

    if ( $patron->gonenoaddress && $patron->gonenoaddress == 1 ) {





                                [% IF ( STATS ) %]
                                    <li>Local use recorded</li>
                                    [% IF ( CHECKEDIN ) %]
                                        <li>Item returned from: [% INCLUDE 'patron-title.inc' patron=BORROWER %]</li>
                                    [% END %]
                                    [% IF ( MESSAGES.ResFound ) %]
                                        <li>Item on hold, please checkin.</li>
                                    [% END %]
                                    [% IF ( MESSAGES.ReturnClaims ) %]
                                        <li>Item claimed returned, please checkin.</li>
                                    [% END %]
                                    [% IF ( MESSAGES.RecallFound ) %]
                                        <li>Item can fill a recall, please checkin.</li>
                                    [% END %]
                                    [% IF ( MESSAGES.WasLost ) %]
                                        [% IF ( Koha.Preference('BlockReturnOfLostItems') ) %]
                                            <li>Item was lost, cannot be returned.</li>
                                        [% ELSE %]
                                            <li>Item was lost, now found.</li>
                                        [% END %]
                                    [% END %]
                                    [% IF ( MESSAGES.withdrawn ) %]
                                        [% IF ( Koha.Preference('BlockReturnOfWithdrawnItems') ) %]
                                            <li>Item was withdrawn, cannot be returned.</li>
                                        [% ELSE %]
                                            <li>Item was withdrawn</li>
                                        [% END %]
                                    [% END %]
                                [% END %]

                                [% IF ( INVALID_DATE ) %]
                                    <li>The due date &quot;[% INVALID_DATE | $KohaDates %]&quot; is invalid</li>
                                [% END %]
- 

Return to bug 27992

Lines 826-833 sub CanBookBeIssued { Link Here

(-)a/C4/Circulation.pm (-2 / +14 lines)
826	interface => C4::Context->interface,	826	interface => C4::Context->interface,
827	}	827	}
828	);	828	);
829	ModDateLastSeen( $item_object->itemnumber ); # FIXME Move to Koha::Item	829	my $block_lost_return = C4::Context->preference("BlockReturnOfLostItems") ? 1 : 0;
830	return( { STATS => 1 }, {});	830	my ( $stats_return, $stats_messages, $stats_iteminformation, $stats_borrower) =
		831	AddReturn( $item_object->barcode, C4::Context->userenv->{'branch'} );
		832	ModDateLastSeen( $item_object->itemnumber, $block_lost_return ); # FIXME Move to Koha::Item
		833	return (
		834	{
		835	STATS => 1,
		836	CHECKEDIN => $stats_return,
		837	MESSAGES => $stats_messages,
		838	ITEM => $stats_iteminformation,
		839	BORROWER => $stats_borrower,
		840	},
		841	{}
		842	);
831	}	843	}
832		844
833	if ( $patron->gonenoaddress && $patron->gonenoaddress == 1 ) {	845	if ( $patron->gonenoaddress && $patron->gonenoaddress == 1 ) {

Lines 417-424 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +26 lines)
417		417
418	[% IF ( STATS ) %]	418	[% IF ( STATS ) %]
419	<li>Local use recorded</li>	419	<li>Local use recorded</li>
		420	[% IF ( CHECKEDIN ) %]
		421	<li>Item returned from: [% INCLUDE 'patron-title.inc' patron=BORROWER %]</li>
		422	[% END %]
		423	[% IF ( MESSAGES.ResFound ) %]
		424	<li>Item on hold, please checkin.</li>
		425	[% END %]
		426	[% IF ( MESSAGES.ReturnClaims ) %]
		427	<li>Item claimed returned, please checkin.</li>
		428	[% END %]
		429	[% IF ( MESSAGES.RecallFound ) %]
		430	<li>Item can fill a recall, please checkin.</li>
		431	[% END %]
		432	[% IF ( MESSAGES.WasLost ) %]
		433	[% IF ( Koha.Preference('BlockReturnOfLostItems') ) %]
		434	<li>Item was lost, cannot be returned.</li>
		435	[% ELSE %]
		436	<li>Item was lost, now found.</li>
		437	[% END %]
		438	[% END %]
		439	[% IF ( MESSAGES.withdrawn ) %]
		440	[% IF ( Koha.Preference('BlockReturnOfWithdrawnItems') ) %]
		441	<li>Item was withdrawn, cannot be returned.</li>
		442	[% ELSE %]
		443	<li>Item was withdrawn</li>
		444	[% END %]
		445	[% END %]
420	[% END %]	446	[% END %]
421
422	[% IF ( INVALID_DATE ) %]	447	[% IF ( INVALID_DATE ) %]
423	<li>The due date "[% INVALID_DATE \| $KohaDates %]" is invalid</li>	448	<li>The due date "[% INVALID_DATE \| $KohaDates %]" is invalid</li>
424	[% END %]	449	[% END %]
425	-