View | Details | Raw Unified | Return to bug 10262
Collapse All | Expand All

(-)a/C4/Circulation.pm (-12 / +26 lines)
Lines 1785-1803 sub AddReturn { Link Here
1785
        }
1785
        }
1786
1786
1787
        if ($borrowernumber) {
1787
        if ($borrowernumber) {
1788
        if($issue->{'overdue'}){
1788
            if ( $issue->{'overdue'} ) {
1789
                my ( $amount, $type, $unitcounttotal ) = C4::Overdues::CalcFine( $item, $borrower->{categorycode},$branch, $datedue, $today );
1789
                my $control = C4::Context->preference('CircControl');
1790
                my $control_branchcode =
1791
                    ( $control eq 'ItemHomeLibrary' ) ? $item->{homebranch}
1792
                  : ( $control eq 'PatronLibrary' )   ? $borrower->{branchcode}
1793
                  :                                     $issue->{branchcode};
1794
1795
                my ( $amount, $type, $unitcounttotal ) =
1796
                  C4::Overdues::CalcFine( $item, $borrower->{categorycode},
1797
                    $control_branchcode, $datedue, $today );
1798
1790
                $type ||= q{};
1799
                $type ||= q{};
1791
        if ( $amount > 0 && ( C4::Context->preference('finesMode') eq 'production' )) {
1800
1792
          C4::Overdues::UpdateFine(
1801
                if ( $amount > 0
1793
              $issue->{itemnumber},
1802
                    && C4::Context->preference('finesMode') eq 'production' )
1794
              $issue->{borrowernumber},
1803
                {
1795
                      $amount, $type, output_pref($datedue)
1804
                    C4::Overdues::UpdateFine( $issue->{itemnumber},
1796
              );
1805
                        $issue->{borrowernumber},
1797
        }
1806
                        $amount, $type, output_pref($datedue) );
1807
                }
1798
            }
1808
            }
1799
            MarkIssueReturned($borrowernumber, $item->{'itemnumber'}, $circControlBranch, '', $borrower->{'privacy'});
1809
1800
            $messages->{'WasReturned'} = 1;    # FIXME is the "= 1" right?  This could be the borrower hash.
1810
            MarkIssueReturned( $borrowernumber, $item->{'itemnumber'},
1811
                $circControlBranch, '', $borrower->{'privacy'} );
1812
1813
            # FIXME is the "= 1" right?  This could be the borrower hash.
1814
            $messages->{'WasReturned'} = 1;
1815
1801
        }
1816
        }
1802
1817
1803
        ModItem({ onloan => undef }, $issue->{'biblionumber'}, $item->{'itemnumber'});
1818
        ModItem({ onloan => undef }, $issue->{'biblionumber'}, $item->{'itemnumber'});
1804
- 

Return to bug 10262