Lines 1854-1859
sub AddReturn {
Link Here
|
1854 |
undef $branch; |
1854 |
undef $branch; |
1855 |
} |
1855 |
} |
1856 |
$branch = C4::Context->userenv->{'branch'} unless $branch; # we trust userenv to be a safe fallback/default |
1856 |
$branch = C4::Context->userenv->{'branch'} unless $branch; # we trust userenv to be a safe fallback/default |
|
|
1857 |
my $return_date_specified = !!$return_date; |
1857 |
$return_date //= dt_from_string(); |
1858 |
$return_date //= dt_from_string(); |
1858 |
my $messages; |
1859 |
my $messages; |
1859 |
my $patron; |
1860 |
my $patron; |
Lines 1972-1978
sub AddReturn {
Link Here
|
1972 |
MarkIssueReturned( $borrowernumber, $item->itemnumber, $return_date, $patron->privacy ); |
1973 |
MarkIssueReturned( $borrowernumber, $item->itemnumber, $return_date, $patron->privacy ); |
1973 |
}; |
1974 |
}; |
1974 |
unless ( $@ ) { |
1975 |
unless ( $@ ) { |
1975 |
if ( C4::Context->preference('CalculateFinesOnReturn') && !$item->itemlost ) { |
1976 |
if ( ( $return_date_specified || C4::Context->preference('CalculateFinesOnReturn') ) && !$item->itemlost ) { |
1976 |
_CalculateAndUpdateFine( { issue => $issue, item => $item->unblessed, borrower => $patron_unblessed, return_date => $return_date } ); |
1977 |
_CalculateAndUpdateFine( { issue => $issue, item => $item->unblessed, borrower => $patron_unblessed, return_date => $return_date } ); |
1977 |
} |
1978 |
} |
1978 |
} else { |
1979 |
} else { |
1979 |
- |
|
|