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

(-)a/C4/Circulation.pm (-4 / +7 lines)
Lines 2132-2138 routine in C<C4::Accounts>. Link Here
2132
=cut
2132
=cut
2133
2133
2134
sub MarkIssueReturned {
2134
sub MarkIssueReturned {
2135
    my ( $borrowernumber, $itemnumber, $dropbox_branch, $returndate, $privacy ) = @_;
2135
    my ( $borrowernumber, $itemnumber, $dropbox_branch, $returndate, $privacy, $set_returndate ) = @_;
2136
2137
    $set_returndate //= 1;
2136
2138
2137
    my $anonymouspatron;
2139
    my $anonymouspatron;
2138
    if ( $privacy == 2 ) {
2140
    if ( $privacy == 2 ) {
Lines 2162-2168 sub MarkIssueReturned { Link Here
2162
    push @bind, $borrowernumber, $itemnumber;
2164
    push @bind, $borrowernumber, $itemnumber;
2163
    # FIXME transaction
2165
    # FIXME transaction
2164
    my $sth_upd  = $dbh->prepare($query);
2166
    my $sth_upd  = $dbh->prepare($query);
2165
    $sth_upd->execute(@bind);
2167
    $sth_upd->execute(@bind) if $set_returndate;
2166
    my $sth_copy = $dbh->prepare('INSERT INTO old_issues SELECT * FROM issues
2168
    my $sth_copy = $dbh->prepare('INSERT INTO old_issues SELECT * FROM issues
2167
                                  WHERE borrowernumber = ?
2169
                                  WHERE borrowernumber = ?
2168
                                  AND itemnumber = ?');
2170
                                  AND itemnumber = ?');
Lines 3643-3649 sub ReturnLostItem{ Link Here
3643
3645
3644
3646
3645
sub LostItem{
3647
sub LostItem{
3646
    my ($itemnumber, $mark_returned) = @_;
3648
    my ($itemnumber, $mark_returned, $set_returndate) = @_;
3647
3649
3648
    my $dbh = C4::Context->dbh();
3650
    my $dbh = C4::Context->dbh();
3649
    my $sth=$dbh->prepare("SELECT issues.*,items.*,biblio.title 
3651
    my $sth=$dbh->prepare("SELECT issues.*,items.*,biblio.title 
Lines 3668-3674 sub LostItem{ Link Here
3668
            #warn " $issues->{'borrowernumber'}  /  $itemnumber ";
3670
            #warn " $issues->{'borrowernumber'}  /  $itemnumber ";
3669
        }
3671
        }
3670
3672
3671
        MarkIssueReturned($borrowernumber,$itemnumber,undef,undef,$borrower->{'privacy'}) if $mark_returned;
3673
        MarkIssueReturned( $borrowernumber, $itemnumber, undef, undef, $borrower->{'privacy'}, $set_returndate )
3674
          if $mark_returned;
3672
    }
3675
    }
3673
}
3676
}
3674
3677
(-)a/misc/cronjobs/longoverdue.pl (-2 / +2 lines)
Lines 308-314 foreach my $startrange (sort keys %$lost) { Link Here
308
            printf ("Due %s: item %5s from borrower %5s to lost: %s\n", $row->{date_due}, $row->{itemnumber}, $row->{borrowernumber}, $lostvalue) if($verbose);
308
            printf ("Due %s: item %5s from borrower %5s to lost: %s\n", $row->{date_due}, $row->{itemnumber}, $row->{borrowernumber}, $lostvalue) if($verbose);
309
            if($confirm) {
309
            if($confirm) {
310
                ModItem({ itemlost => $lostvalue }, $row->{'biblionumber'}, $row->{'itemnumber'});
310
                ModItem({ itemlost => $lostvalue }, $row->{'biblionumber'}, $row->{'itemnumber'});
311
                LostItem($row->{'itemnumber'}, $mark_returned) if( $charge && $charge eq $lostvalue);
311
312
                LostItem( $row->{'itemnumber'}, $mark_returned, 0 ) if ( $charge && $charge eq $lostvalue );
312
            }
313
            }
313
            $count++;
314
            $count++;
314
        }
315
        }
315
- 

Return to bug 17996