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

(-)a/Koha/Account/Line.pm (+14 lines)
Lines 22-27 use Data::Dumper; Link Here
22
22
23
use C4::Log qw(logaction);
23
use C4::Log qw(logaction);
24
24
25
use Koha::Account::DebitType;
25
use Koha::Account::Offsets;
26
use Koha::Account::Offsets;
26
use Koha::Database;
27
use Koha::Database;
27
use Koha::Exceptions::Account;
28
use Koha::Exceptions::Account;
Lines 82-87 sub checkout { Link Here
82
    return $self->{_checkout};
83
    return $self->{_checkout};
83
}
84
}
84
85
86
=head3 debit_type
87
88
Return the debit_type linked to this account line
89
90
=cut
91
92
sub debit_type {
93
    my ( $self ) = @_;
94
    my $rs = $self->_result->debit_type;
95
    return unless $rs;
96
    return Koha::Account::DebitType->_new_from_dbic( $rs );
97
}
98
85
=head3 void
99
=head3 void
86
100
87
  $payment_accountline->void();
101
  $payment_accountline->void();
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc (-24 / +31 lines)
Lines 1-28 Link Here
1
[%- BLOCK account_type_description -%]
1
[%- BLOCK account_type_description -%]
2
    [%- SWITCH account.accounttype -%]
2
    <span>
3
        [%- CASE 'Pay'              -%]<span>Payment
3
    [%- IF account.accounttype -%]
4
        [%- CASE 'N'                -%]<span>New card
4
        [%- SWITCH account.accounttype -%]
5
        [%- CASE 'OVERDUE'          -%]<span>Fine
5
            [%- CASE 'Pay'              -%]Payment
6
        [%- CASE 'ACCOUNT'          -%]<span>Account creation fee
6
            [%- CASE 'W'                -%]Writeoff
7
        [%- CASE 'ACCOUNT_RENEW'    -%]<span>Account renewal fee
7
            [%- CASE 'FOR'              -%]Forgiven
8
        [%- CASE 'M'                -%]<span>Sundry
8
            [%- CASE 'PAY'              -%]Payment
9
        [%- CASE 'LOST'             -%]<span>Lost item
9
            [%- CASE 'WO'               -%]Writeoff
10
        [%- CASE 'W'                -%]<span>Writeoff
10
            [%- CASE 'C'                -%]Credit
11
        [%- CASE 'HE'               -%]<span>Hold waiting too long
11
            [%- CASE 'LOST_RETURN'      -%]Lost item fee refund
12
        [%- CASE 'RENT'             -%]<span>Rental fee
12
            [%- CASE                    -%][% account.accounttype | html %]
13
        [%- CASE 'RENT_DAILY'       -%]<span>Daily rental fee
13
        [%- END -%]
14
        [%- CASE 'RENT_RENEW'       -%]<span>Renewal of rental item
14
    [%- ELSIF account.debit_type -%]
15
        [%- CASE 'RENT_DAILY_RENEW' -%]<span>Rewewal of daily rental item
15
       [%- SWITCH account.debit_type -%]
16
        [%- CASE 'FOR'              -%]<span>Forgiven
16
           [%- CASE 'N'                -%]New card
17
        [%- CASE 'PF'               -%]<span>Lost item processing fee
17
           [%- CASE 'OVERDUE'          -%]Fine
18
        [%- CASE 'PAY'              -%]<span>Payment
18
           [%- CASE 'ACCOUNT'          -%]Account creation fee
19
        [%- CASE 'WO'               -%]<span>Writeoff
19
           [%- CASE 'ACCOUNT_RENEW'    -%]Account renewal fee
20
        [%- CASE 'C'                -%]<span>Credit
20
           [%- CASE 'M'                -%]Sundry
21
        [%- CASE 'LOST_RETURN'      -%]<span>Lost item fee refund
21
           [%- CASE 'LOST'             -%]Lost item
22
        [%- CASE 'Res'              -%]<span>Hold fee
22
           [%- CASE 'HE'               -%]Hold waiting too long
23
        [%- CASE                    -%]<span>[% account.accounttype | html %]
23
           [%- CASE 'RENT'             -%]Rental fee
24
           [%- CASE 'RENT_DAILY'       -%]Daily rental fee
25
           [%- CASE 'RENT_RENEW'       -%]Renewal of rental item
26
           [%- CASE 'RENT_DAILY_RENEW' -%]Rewewal of daily rental item
27
           [%- CASE 'PF'               -%]Lost item processing fee
28
           [%- CASE 'Res'              -%]Hold fee
29
           [%- CASE                    -%][% account.debit_type.description | html %]
30
       [%- END -%]
24
    [%- END -%]
31
    [%- END -%]
25
    [%- PROCESS account_status_description account=account -%]</span>
32
    [%- PROCESS account_status_description account=account -%]
33
    </span>
26
[%- END -%]
34
[%- END -%]
27
35
28
[%- BLOCK offset_type_description -%]
36
[%- BLOCK offset_type_description -%]
29
- 

Return to bug 23049