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

(-)a/C4/Circulation.pm (-4 / +1 lines)
Lines 2329-2338 sub _FixOverduesOnReturn { Link Here
2329
        {
2329
        {
2330
            borrowernumber => $borrowernumber,
2330
            borrowernumber => $borrowernumber,
2331
            itemnumber     => $item,
2331
            itemnumber     => $item,
2332
            -or            => [
2332
            accounttype    => 'FU'
2333
                accounttype => 'FU',
2334
                accounttype => 'O',
2335
            ],
2336
        }
2333
        }
2337
    )->next();
2334
    )->next();
2338
    return 0 unless $accountline;    # no warning, there's just nothing to fix
2335
    return 0 unless $accountline;    # no warning, there's just nothing to fix
(-)a/C4/Overdues.pm (-2 / +1 lines)
Lines 530-536 sub UpdateFine { Link Here
530
    #   "A"   is Account Management Fee
530
    #   "A"   is Account Management Fee
531
    #   "N"   is New Card
531
    #   "N"   is New Card
532
    #   "M"   is Sundry
532
    #   "M"   is Sundry
533
    #   "O"   is Overdue ??
534
    #   "F"   is Fine ??
533
    #   "F"   is Fine ??
535
    #   "FU"  is Fine UPDATE??
534
    #   "FU"  is Fine UPDATE??
536
    #   "Pay" is Payment
535
    #   "Pay" is Payment
Lines 538-544 sub UpdateFine { Link Here
538
    my $sth = $dbh->prepare(
537
    my $sth = $dbh->prepare(
539
        "SELECT * FROM accountlines
538
        "SELECT * FROM accountlines
540
        WHERE borrowernumber=? AND
539
        WHERE borrowernumber=? AND
541
        (( accounttype IN ('O','F','M') AND amountoutstanding<>0 ) OR
540
        (( accounttype IN ('F','M') AND amountoutstanding<>0 ) OR
542
           accounttype = 'FU' )"
541
           accounttype = 'FU' )"
543
    );
542
    );
544
    $sth->execute( $borrowernumber );
543
    $sth->execute( $borrowernumber );
(-)a/Koha/Account.pm (-2 lines)
Lines 416-422 $debit_type can be any of: Link Here
416
  - processing
416
  - processing
417
  - rent
417
  - rent
418
  - reserve
418
  - reserve
419
  - overdue
420
  - manual
419
  - manual
421
420
422
=cut
421
=cut
Lines 701-707 our $account_type_debit = { Link Here
701
    'processing'    => 'PF',
700
    'processing'    => 'PF',
702
    'rent'          => 'Rent',
701
    'rent'          => 'Rent',
703
    'reserve'       => 'Res',
702
    'reserve'       => 'Res',
704
    'overdue'       => 'O',
705
    'manual_debit'  => 'M',
703
    'manual_debit'  => 'M',
706
    'hold_expired'  => 'HE'
704
    'hold_expired'  => 'HE'
707
};
705
};
(-)a/misc/maintenance/fix_accountlines_date.pl (-2 / +1 lines)
Lines 129-135 $dbh->{AutoCommit} = 0; Link Here
129
my $sth = $dbh->prepare("
129
my $sth = $dbh->prepare("
130
SELECT accountlines_id, description
130
SELECT accountlines_id, description
131
  FROM accountlines
131
  FROM accountlines
132
  WHERE accounttype in ('FU', 'F', 'O', 'M')
132
  WHERE accounttype in ('FU', 'F', 'M')
133
;");
133
;");
134
$sth->execute();
134
$sth->execute();
135
135
136
- 

Return to bug 22518