https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17829
--- Comment #9 from Tomás Cohen Arazi <tomasco...@gmail.com> --- (In reply to Tomás Cohen Arazi from comment #8) > (In reply to Jonathan Druart from comment #7) > > Remote branch has been rebased. > > It doesn't apply due to updatedatabase.pl conflicts... I'm sorry, the updatedatabase.pl merge problem was not the problem (easy fix). The problem was in Circulation.pm: diff --cc C4/Circulation.pm index 7e65a80,789a85f..0000000 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@@ -1903,16 -1904,15 +1904,23 @@@ sub AddReturn } if ($borrowernumber) { ++<<<<<<< HEAD ++======= + if ( ( C4::Context->preference('CalculateFinesOnReturn') && $is_overdue ) || $return_date ) { + _CalculateAndUpdateFine( { issue => $issue, item => $item, borrower => $borrower, return_date => $return_date } ); + } + ++>>>>>>> dadae20... Bug 17680: C4::Circulation - Remove GetItemIssue, complex calls eval { - MarkIssueReturned( $borrowernumber, $item->{'itemnumber'}, + my $issue_id = MarkIssueReturned( $borrowernumber, $item->{'itemnumber'}, $circControlBranch, $return_date, $borrower->{'privacy'} ); + $issue->{issue_id} = $issue_id; }; - if ( $@ ) { + unless ( $@ ) { + if ( ( C4::Context->preference('CalculateFinesOnReturn') && $issue->{'overdue'} ) || $return_date ) { + _CalculateAndUpdateFine( { issue => $issue, item => $item, borrower => $borrower, return_date => $return_date } ); + } + } else { $messages->{'Wrongbranch'} = { Wrongbranch => $branch, Rightbranch => $message -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/