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

(-)a/circ/returns.pl (-2 / +13 lines)
Lines 413-421 if ($barcode) { Link Here
413
        }
413
        }
414
414
415
    } elsif ( C4::Context->preference('ShowAllCheckins') and !$messages->{'BadBarcode'} and !$needs_confirm and !$bundle_confirm ) {
415
    } elsif ( C4::Context->preference('ShowAllCheckins') and !$messages->{'BadBarcode'} and !$needs_confirm and !$bundle_confirm ) {
416
        $input{duedate}   = 0;
416
        my $duedate = 0;
417
        if( $issue ){
418
            my $date_due_dt = dt_from_string( $issue->date_due, 'sql' );
419
            $duedate = $date_due_dt->strftime('%Y-%m-%d %H:%M');
420
            $input{borrowernumber} = $issue->borrowernumber;
421
            $riborrowernumber{0}   = $borrower->{'borrowernumber'};
422
        }
423
        $input{duedate}   = $duedate;
424
        $input{not_returned}   = 1;
417
        $returneditems{0} = $barcode;
425
        $returneditems{0} = $barcode;
418
        $riduedate{0}     = 0;
426
        $riduedate{0}     = $duedate;
419
        push( @inputloop, \%input );
427
        push( @inputloop, \%input );
420
    }
428
    }
421
    $template->param( privacy => $borrower->{privacy} );
429
    $template->param( privacy => $borrower->{privacy} );
Lines 789-794 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
789
        next unless $item; # FIXME The item has been deleted in the meantime,
797
        next unless $item; # FIXME The item has been deleted in the meantime,
790
                           # we could handle that better displaying a message in the template
798
                           # we could handle that better displaying a message in the template
791
799
800
801
        $ri{not_returned} = 1 unless $returned;
792
        my $biblio = $item->biblio;
802
        my $biblio = $item->biblio;
793
        # FIXME pass $item to the template and we are done here...
803
        # FIXME pass $item to the template and we are done here...
794
        $ri{itembiblionumber}    = $biblio->biblionumber;
804
        $ri{itembiblionumber}    = $biblio->biblionumber;
Lines 810-815 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
810
        $ri{homebranch}          = $item->homebranch;
820
        $ri{homebranch}          = $item->homebranch;
811
        $ri{transferbranch}      = $item->get_transfer ? $item->get_transfer->tobranch : '';
821
        $ri{transferbranch}      = $item->get_transfer ? $item->get_transfer->tobranch : '';
812
        $ri{damaged}             = $item->damaged;
822
        $ri{damaged}             = $item->damaged;
823
        $ri{withdrawn}           = $item->withdrawn;
813
        $ri{transferreason}      = $item->get_transfer ? $item->get_transfer->reason : '';
824
        $ri{transferreason}      = $item->get_transfer ? $item->get_transfer->reason : '';
814
825
815
        $ri{location} = $item->location;
826
        $ri{location} = $item->location;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +6 lines)
Lines 1237-1242 Link Here
1237
                                    [% FOREACH riloo IN riloop %]
1237
                                    [% FOREACH riloo IN riloop %]
1238
                                        <tr>
1238
                                        <tr>
1239
                                            <td class="ci-duedate">
1239
                                            <td class="ci-duedate">
1240
                                                [% IF ( riloo.not_returned ) %]
1241
                                                    <span class="problem">Item was not checked in</span>
1242
                                                [% END %]
1240
                                                [% IF ( riloo.duedate ) %]
1243
                                                [% IF ( riloo.duedate ) %]
1241
                                                    [% IF ( riloo.return_overdue ) %]
1244
                                                    [% IF ( riloo.return_overdue ) %]
1242
                                                        <span class="overdue">[% riloo.duedate | $KohaDates as_due_date => 1 %] (overdue)</span>
1245
                                                        <span class="overdue">[% riloo.duedate | $KohaDates as_due_date => 1 %] (overdue)</span>
Lines 1249-1254 Link Here
1249
                                                [% IF ( riloo.damaged ) %]
1252
                                                [% IF ( riloo.damaged ) %]
1250
                                                    <span class="dmg">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => riloo.damaged ) | html %]</span>
1253
                                                    <span class="dmg">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => riloo.damaged ) | html %]</span>
1251
                                                [% END %]
1254
                                                [% END %]
1255
                                                [% IF ( riloo.withdrawn ) %]
1256
                                                    <span class="withdrawn">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.withdrawn', authorised_value => riloo.withdrawn ) | html %]</span>
1257
                                                [% END %]
1252
                                            </td>
1258
                                            </td>
1253
                                            <td class="ci-title">
1259
                                            <td class="ci-title">
1254
                                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% riloo.itembiblionumber | uri %]">
1260
                                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% riloo.itembiblionumber | uri %]">
1255
- 

Return to bug 8461