Lines 1678-1684
patron who last borrowed the book.
Link Here
|
1678 |
=cut |
1678 |
=cut |
1679 |
|
1679 |
|
1680 |
sub AddReturn { |
1680 |
sub AddReturn { |
1681 |
my ( $barcode, $branch, $exemptfine, $dropbox ) = @_; |
1681 |
my ( $barcode, $branch, $exemptfine, $dropbox, $return_date) = @_; |
1682 |
|
1682 |
|
1683 |
if ($branch and not GetBranchDetail($branch)) { |
1683 |
if ($branch and not GetBranchDetail($branch)) { |
1684 |
warn "AddReturn error: branch '$branch' not found. Reverting to " . C4::Context->userenv->{'branch'}; |
1684 |
warn "AddReturn error: branch '$branch' not found. Reverting to " . C4::Context->userenv->{'branch'}; |
Lines 1764-1769
sub AddReturn {
Link Here
|
1764 |
} |
1764 |
} |
1765 |
|
1765 |
|
1766 |
if ($borrowernumber) { |
1766 |
if ($borrowernumber) { |
|
|
1767 |
<<<<<<< HEAD |
1767 |
if($issue->{'overdue'}){ |
1768 |
if($issue->{'overdue'}){ |
1768 |
my ( $amount, $type, $unitcounttotal ) = C4::Overdues::CalcFine( $item, $borrower->{categorycode},$branch, $datedue, $today ); |
1769 |
my ( $amount, $type, $unitcounttotal ) = C4::Overdues::CalcFine( $item, $borrower->{categorycode},$branch, $datedue, $today ); |
1769 |
$type ||= q{}; |
1770 |
$type ||= q{}; |
Lines 1776-1781
sub AddReturn {
Link Here
|
1776 |
} |
1777 |
} |
1777 |
} |
1778 |
} |
1778 |
MarkIssueReturned($borrowernumber, $item->{'itemnumber'}, $circControlBranch, '', $borrower->{'privacy'}); |
1779 |
MarkIssueReturned($borrowernumber, $item->{'itemnumber'}, $circControlBranch, '', $borrower->{'privacy'}); |
|
|
1780 |
======= |
1781 |
MarkIssueReturned($borrowernumber, $item->{'itemnumber'}, $circControlBranch, $return_date, $borrower->{'privacy'}); |
1782 |
>>>>>>> Bug 8769 - Allow SIP2 return backdating |
1779 |
$messages->{'WasReturned'} = 1; # FIXME is the "= 1" right? This could be the borrower hash. |
1783 |
$messages->{'WasReturned'} = 1; # FIXME is the "= 1" right? This could be the borrower hash. |
1780 |
} |
1784 |
} |
1781 |
|
1785 |
|