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

(-)a/C4/Circulation.pm (-4 / +1 lines)
Lines 2349-2358 sub _FixOverduesOnReturn { Link Here
2349
        {
2349
        {
2350
            borrowernumber => $borrowernumber,
2350
            borrowernumber => $borrowernumber,
2351
            itemnumber     => $item,
2351
            itemnumber     => $item,
2352
            -or            => [
2352
            accounttype    => 'FU'
2353
                accounttype => 'FU',
2354
                accounttype => 'O',
2355
            ],
2356
        }
2353
        }
2357
    )->next();
2354
    )->next();
2358
    return 0 unless $accountline;    # no warning, there's just nothing to fix
2355
    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 417-423 $debit_type can be any of: Link Here
417
  - processing
417
  - processing
418
  - rent
418
  - rent
419
  - reserve
419
  - reserve
420
  - overdue
421
  - manual
420
  - manual
422
421
423
=cut
422
=cut
Lines 703-709 our $account_type_debit = { Link Here
703
    'processing'    => 'PF',
702
    'processing'    => 'PF',
704
    'rent'          => 'Rent',
703
    'rent'          => 'Rent',
705
    'reserve'       => 'Res',
704
    'reserve'       => 'Res',
706
    'overdue'       => 'O',
707
    'manual_debit'  => 'M',
705
    'manual_debit'  => 'M',
708
    'hold_expired'  => 'HE'
706
    'hold_expired'  => 'HE'
709
};
707
};
(-)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