bug_5211: LostItem() - added charge_fee param to control fee charging
Pass charge_fee = yes wherever is LostItem() called, which effectively
means tha there's no change.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1713133fdd)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This commit is contained in:
parent
a77e3480fc
commit
cbcf2cfbd6
|
|
@ -2961,7 +2961,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
|
||||
|
|
@ -2976,7 +2976,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;
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -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++;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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};
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue