Browse Source

Bug 23049: Update 'N' to 'NEW_CARD' for consistency

Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
remotes/origin/19.11.x
Martin Renvoize 3 years ago
parent
commit
7f0cdb83cf
Signed by: martin.renvoize GPG Key ID: 422B469130441A0F
  1. 4
      Koha/Account.pm
  2. 2
      installer/data/mysql/account_debit_types.sql
  3. 9
      installer/data/mysql/atomicupdate/bug_23049_debit.perl
  4. 2
      installer/data/mysql/en/mandatory/account_debit_types.sql
  5. 2
      koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
  6. 2
      koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc

4
Koha/Account.pm

@ -449,7 +449,7 @@ $debit_type can be any of:
- RESERVE_EXPIRED
- LOST
- sundry
- new_card
- NEW_CARD
- OVERDUE
- PROCESSING
- RENT
@ -742,7 +742,7 @@ our $account_type_debit = {
'ACCOUNT_RENEW' => 'ACCOUNT_RENEW',
'RESERVE_EXPIRED' => 'RESERVE_EXPIRED',
'LOST_ITEM' => 'LOST',
'new_card' => 'N',
'NEW_CARD' => 'NEW_CARD',
'OVERDUE' => 'OVERDUE',
'PROCESSING' => 'PROCESSING',
'RENT' => 'RENT',

2
installer/data/mysql/account_debit_types.sql

@ -3,7 +3,7 @@ INSERT INTO account_debit_types ( code, description, can_be_added_manually, defa
('ACCOUNT_RENEW', 'Account renewal fee', 0, NULL, 1),
('LOST', 'Lost item', 1, NULL, 1),
('M', 'Manual fee', 1, NULL, 0),
('N', 'New card fee', 1, NULL, 1),
('NEW_CARD', 'New card fee', 1, NULL, 1),
('OVERDUE', 'Overdue fine', 0, NULL, 1),
('PROCESSING', 'Lost item processing fee', 0, NULL, 1),
('RENT', 'Rental fee', 0, NULL, 1),

9
installer/data/mysql/atomicupdate/bug_23049_debit.perl

@ -43,7 +43,7 @@ if ( CheckVersion($DBversion) ) {
('RESERVE_EXPIRED', 'Hold waiting too long', 0, NULL, 1),
('LOST', 'Lost item', 1, NULL, 1),
('M', 'Manual fee', 1, NULL, 0),
('N', 'New card fee', 1, NULL, 1),
('NEW_CARD', 'New card fee', 1, NULL, 1),
('OVERDUE', 'Overdue fine', 0, NULL, 1),
('PROCESSING', 'Lost item processing fee', 0, NULL, 1),
('RENT', 'Rental fee', 0, NULL, 1),
@ -75,6 +75,13 @@ if ( CheckVersion($DBversion) ) {
}
);
# Update accountype 'N' to 'NEW_CARD'
$dbh->do(
qq{
UPDATE accountlines SET accounttype = 'NEW_CARD' WHERE accounttype = 'N'
}
);
# Moving MANUAL_INV to account_debit_types
$dbh->do(
qq{

2
installer/data/mysql/en/mandatory/account_debit_types.sql

@ -3,7 +3,7 @@ INSERT INTO account_debit_types ( code, description, can_be_added_manually, defa
('ACCOUNT_RENEW', 'Account renewal fee', 0, NULL, 1),
('LOST', 'Lost item', 1, NULL, 1),
('M', 'Manual fee', 1, NULL, 0),
('N', 'New card fee', 1, NULL, 1),
('NEW_CARD', 'New card fee', 1, NULL, 1),
('OVERDUE', 'Overdue fine', 0, NULL, 1),
('PROCESSING', 'Lost item processing fee', 0, NULL, 1),
('RENT', 'Rental fee', 0, NULL, 1),

2
koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc

@ -17,7 +17,7 @@
[%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee
[%- CASE 'LOST' -%]Lost item
[%- CASE 'M' -%]Sundry
[%- CASE 'N' -%]New card
[%- CASE 'NEW_CARD' -%]New card
[%- CASE 'OVERDUE' -%]Fine
[%- CASE 'PROCESSING' -%]Lost item processing fee
[%- CASE 'RENT' -%]Rental fee

2
koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc

@ -188,7 +188,7 @@
[%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee
[%- CASE 'LOST' -%]Lost item
[%- CASE 'M' -%]Sundry
[%- CASE 'N' -%]New card
[%- CASE 'NEW_CARD' -%]New card
[%- CASE 'OVERDUE' -%]Fine
[%- CASE 'PROCESSING' -%]Lost item processing fee
[%- CASE 'RENT' -%]Rental fee

Loading…
Cancel
Save