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

(-)a/installer/data/mysql/atomicupdate/bug_24603.perl (-1 / +1 lines)
Lines 5-11 if ( CheckVersion($DBversion) ) { Link Here
5
        qq{
5
        qq{
6
            INSERT IGNORE INTO account_credit_types (code, description, can_be_added_manually, is_system)
6
            INSERT IGNORE INTO account_credit_types (code, description, can_be_added_manually, is_system)
7
            VALUES
7
            VALUES
8
              ('CANCELLATION', 'A cancellation applied to a patron charge', 0, 1)
8
              ('CANCELLATION', 'Cancelled charge', 0, 1)
9
        }
9
        }
10
    );
10
    );
11
11
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc (-1 / +2 lines)
Lines 8-13 Link Here
8
            [%- CASE 'CREDIT'           -%]Credit
8
            [%- CASE 'CREDIT'           -%]Credit
9
            [%- CASE 'LOST_FOUND'       -%]Lost item fee refund
9
            [%- CASE 'LOST_FOUND'       -%]Lost item fee refund
10
            [%- CASE 'REFUND'           -%]Refund
10
            [%- CASE 'REFUND'           -%]Refund
11
            [%- CASE 'CANCELLATION'     -%]Cancelled charge
11
            [%- CASE                    -%][% account.credit_type.description | html %]
12
            [%- CASE                    -%][% account.credit_type.description | html %]
12
        [%- END -%]
13
        [%- END -%]
13
    [%- ELSIF account.debit_type_code -%]
14
    [%- ELSIF account.debit_type_code -%]
Lines 42-47 Link Here
42
        [%- CASE 'Lost Item'      -%]<span>Lost item returned</span>
43
        [%- CASE 'Lost Item'      -%]<span>Lost item returned</span>
43
        [%- CASE 'Writeoff'       -%]<span>Writeoff</span>
44
        [%- CASE 'Writeoff'       -%]<span>Writeoff</span>
44
        [%- CASE 'Void Payment'   -%]<span>Void payment</span>
45
        [%- CASE 'Void Payment'   -%]<span>Void payment</span>
46
        [%- CASE 'CANCELLATION'   -%]<span>Cancelled charge</span>
45
        [%- CASE                  -%][% account_offset.type | html %]
47
        [%- CASE                  -%][% account_offset.type | html %]
46
    [%- END -%]
48
    [%- END -%]
47
[%- END -%]
49
[%- END -%]
48
- 

Return to bug 24603