From 6e37dcafee872cdea378ba845ef49d702a3fbfc5 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 1 Oct 2020 10:50:17 +0000 Subject: [PATCH] Bug 26583: Remove unneccessary code in AddIssue The lines to calc due date are doubled ModDateLastSeen is not needed as we set the item not lost and we can set the date as we do for date last borrowed and save a DB store Largely this is reading the code and confirming the changes make sense To test: 1 - Apply patch 2 - Check out items, confirm it works as before 3 - prove -v t/db_dependent/Circulation.t Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- C4/Circulation.pm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index ddea115c8f..c66d5d5e52 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1496,14 +1496,6 @@ sub AddIssue { $auto_renew = $rule->rule_value if $rule; } - # Record in the database the fact that the book was issued. - unless ($datedue) { - my $itype = $item_object->effective_itemtype; - $datedue = CalcDateDue( $issuedate, $itype, $branchcode, $borrower ); - - } - $datedue->truncate( to => 'minute' ); - my $issue_attributes = { borrowernumber => $borrower->{'borrowernumber'}, issuedate => $issuedate->strftime('%Y-%m-%d %H:%M:%S'), @@ -1513,6 +1505,8 @@ sub AddIssue { auto_renew => $auto_renew ? 1 : 0, }; + # In the case that the borrower has an on-site checkout + # and SwitchOnSiteCheckouts is enabled this converts it to a regular checkout $issue = Koha::Checkouts->find( { itemnumber => $item_object->itemnumber } ); if ($issue) { $issue->set($issue_attributes)->store; @@ -1540,8 +1534,8 @@ sub AddIssue { $item_object->itemlost(0); $item_object->onloan($datedue->ymd()); $item_object->datelastborrowed( dt_from_string()->ymd() ); + $item_object->datelastseen( dt_from_string()->ymd() ); $item_object->store({log_action => 0}); - ModDateLastSeen( $item_object->itemnumber ); # If it costs to borrow this book, charge it to the patron's account. my ( $charge, $itemtype ) = GetIssuingCharges( $item_object->itemnumber, $borrower->{'borrowernumber'} ); -- 2.39.5