gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/new/bug_5211'

This commit is contained in:
Paul Poulain 2011-12-06 11:36:57 +01:00
parent c70ff88205 1713133fdd
commit 7267ea91ac
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
C4/Circulation.pm
View File

@ -3021,7 +3021,7 @@ sub ReturnLostItem{
sub LostItem{
my ($itemnumber, $mark_returned) = @_;
my ($itemnumber, $mark_returned, $charge_fee) = @_;
my $dbh = C4::Context->dbh();
my $sth=$dbh->prepare("SELECT issues.*,items.*,biblio.title
@ -3036,7 +3036,8 @@ sub LostItem{
# if a borrower lost the item, add a replacement cost to the their record
if ( my $borrowernumber = $issues->{borrowernumber} ){
C4::Accounts::chargelostitem($borrowernumber, $itemnumber, $issues->{'replacementprice'}, "Lost Item $issues->{'title'} $issues->{'barcode'}");
C4::Accounts::chargelostitem($borrowernumber, $itemnumber, $issues->{'replacementprice'}, "Lost Item $issues->{'title'} $issues->{'barcode'}")
if $charge_fee;
#FIXME : Should probably have a way to distinguish this from an item that really was returned.
#warn " $issues->{'borrowernumber'} / $itemnumber ";
MarkIssueReturned($borrowernumber,$itemnumber) if $mark_returned;

2
catalogue/updateitem.pl
View File

@ -74,6 +74,6 @@ if (defined $itemnotes) { # i.e., itemnotes parameter passed from form
ModItem($item_changes, $biblionumber, $itemnumber);
LostItem($itemnumber, 'MARK RETURNED') if $itemlost;
LostItem($itemnumber, 'MARK RETURNED', 'CHARGE FEE') if $itemlost;
print $cgi->redirect("moredetail.pl?biblionumber=$biblionumber&itemnumber=$itemnumber#item$itemnumber");

2
misc/cronjobs/longoverdue.pl
View File

@ -154,7 +154,7 @@ foreach my $startrange (sort keys %$lost) {
printf ("Due %s: item %5s from borrower %5s to lost: %s\n", $row->{date_due}, $row->{itemnumber}, $row->{borrowernumber}, $lostvalue) if($verbose);
if($confirm) {
ModItem({ itemlost => $lostvalue }, $row->{'biblionumber'}, $row->{'itemnumber'});
LostItem($row->{'itemnumber'}) if( $charge && $charge eq $lostvalue);
LostItem($row->{'itemnumber'}, undef, 'CHARGE FEE') if( $charge && $charge eq $lostvalue);
}
$count++;
}

2
tools/batchMod.pl
View File

@ -177,7 +177,7 @@ if ($op eq "action") {
UpdateMarcWith( $marcitem, $localmarcitem );
eval{
if ( my $item = ModItemFromMarc( $localmarcitem, $itemdata->{biblionumber}, $itemnumber ) ) {
LostItem($itemnumber, 'MARK RETURNED') if $item->{itemlost};
LostItem($itemnumber, 'MARK RETURNED', 'CHARGE FEE') if $item->{itemlost};
}
};
}