Attachment #94088 for bug #23049

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

Lines 449-455 $debit_type can be any of: Link Here

(-)a/Koha/Account.pm (-2 / +2 lines)
449	- RESERVE_EXPIRED	449	- RESERVE_EXPIRED
450	- LOST	450	- LOST
451	- sundry	451	- sundry
452	- new_card	452	- NEW_CARD
453	- OVERDUE	453	- OVERDUE
454	- PROCESSING	454	- PROCESSING
455	- RENT	455	- RENT
Lines 742-748 our $account_type_debit = { Link Here
742	'ACCOUNT_RENEW' => 'ACCOUNT_RENEW',	742	'ACCOUNT_RENEW' => 'ACCOUNT_RENEW',
743	'RESERVE_EXPIRED' => 'RESERVE_EXPIRED',	743	'RESERVE_EXPIRED' => 'RESERVE_EXPIRED',
744	'LOST_ITEM' => 'LOST',	744	'LOST_ITEM' => 'LOST',
745	'new_card' => 'N',	745	'NEW_CARD' => 'NEW_CARD',
746	'OVERDUE' => 'OVERDUE',	746	'OVERDUE' => 'OVERDUE',
747	'PROCESSING' => 'PROCESSING',	747	'PROCESSING' => 'PROCESSING',
748	'RENT' => 'RENT',	748	'RENT' => 'RENT',

Lines 3-9 INSERT INTO account_debit_types ( code, description, can_be_added_manually, defa Link Here

(-)a/installer/data/mysql/account_debit_types.sql (-1 / +1 lines)
3	('ACCOUNT_RENEW', 'Account renewal fee', 0, NULL, 1),	3	('ACCOUNT_RENEW', 'Account renewal fee', 0, NULL, 1),
4	('LOST', 'Lost item', 1, NULL, 1),	4	('LOST', 'Lost item', 1, NULL, 1),
5	('M', 'Manual fee', 1, NULL, 0),	5	('M', 'Manual fee', 1, NULL, 0),
6	('N', 'New card fee', 1, NULL, 1),	6	('NEW_CARD', 'New card fee', 1, NULL, 1),
7	('OVERDUE', 'Overdue fine', 0, NULL, 1),	7	('OVERDUE', 'Overdue fine', 0, NULL, 1),
8	('PROCESSING', 'Lost item processing fee', 0, NULL, 1),	8	('PROCESSING', 'Lost item processing fee', 0, NULL, 1),
9	('RENT', 'Rental fee', 0, NULL, 1),	9	('RENT', 'Rental fee', 0, NULL, 1),

Lines 43-49 if ( CheckVersion($DBversion) ) { Link Here

(-)a/installer/data/mysql/atomicupdate/bug_23049_debit.perl (-1 / +8 lines)
43	('RESERVE_EXPIRED', 'Hold waiting too long', 0, NULL, 1),	43	('RESERVE_EXPIRED', 'Hold waiting too long', 0, NULL, 1),
44	('LOST', 'Lost item', 1, NULL, 1),	44	('LOST', 'Lost item', 1, NULL, 1),
45	('M', 'Manual fee', 1, NULL, 0),	45	('M', 'Manual fee', 1, NULL, 0),
46	('N', 'New card fee', 1, NULL, 1),	46	('NEW_CARD', 'New card fee', 1, NULL, 1),
47	('OVERDUE', 'Overdue fine', 0, NULL, 1),	47	('OVERDUE', 'Overdue fine', 0, NULL, 1),
48	('PROCESSING', 'Lost item processing fee', 0, NULL, 1),	48	('PROCESSING', 'Lost item processing fee', 0, NULL, 1),
49	('RENT', 'Rental fee', 0, NULL, 1),	49	('RENT', 'Rental fee', 0, NULL, 1),
Lines 75-80 if ( CheckVersion($DBversion) ) { Link Here
75	}	75	}
76	);	76	);
77		77
		78	# Update accountype 'N' to 'NEW_CARD'
		79	$dbh->do(
		80	qq{
		81	UPDATE accountlines SET accounttype = 'NEW_CARD' WHERE accounttype = 'N'
		82	}
		83	);
		84
78	# Moving MANUAL_INV to account_debit_types	85	# Moving MANUAL_INV to account_debit_types
79	$dbh->do(	86	$dbh->do(
80	qq{	87	qq{

Lines 3-9 INSERT INTO account_debit_types ( code, description, can_be_added_manually, defa Link Here

(-)a/installer/data/mysql/en/mandatory/account_debit_types.sql (-1 / +1 lines)
3	('ACCOUNT_RENEW', 'Account renewal fee', 0, NULL, 1),	3	('ACCOUNT_RENEW', 'Account renewal fee', 0, NULL, 1),
4	('LOST', 'Lost item', 1, NULL, 1),	4	('LOST', 'Lost item', 1, NULL, 1),
5	('M', 'Manual fee', 1, NULL, 0),	5	('M', 'Manual fee', 1, NULL, 0),
6	('N', 'New card fee', 1, NULL, 1),	6	('NEW_CARD', 'New card fee', 1, NULL, 1),
7	('OVERDUE', 'Overdue fine', 0, NULL, 1),	7	('OVERDUE', 'Overdue fine', 0, NULL, 1),
8	('PROCESSING', 'Lost item processing fee', 0, NULL, 1),	8	('PROCESSING', 'Lost item processing fee', 0, NULL, 1),
9	('RENT', 'Rental fee', 0, NULL, 1),	9	('RENT', 'Rental fee', 0, NULL, 1),

Lines 17-23 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc (-1 / +1 lines)
17	[%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee	17	[%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee
18	[%- CASE 'LOST' -%]Lost item	18	[%- CASE 'LOST' -%]Lost item
19	[%- CASE 'M' -%]Sundry	19	[%- CASE 'M' -%]Sundry
20	[%- CASE 'N' -%]New card	20	[%- CASE 'NEW_CARD' -%]New card
21	[%- CASE 'OVERDUE' -%]Fine	21	[%- CASE 'OVERDUE' -%]Fine
22	[%- CASE 'PROCESSING' -%]Lost item processing fee	22	[%- CASE 'PROCESSING' -%]Lost item processing fee
23	[%- CASE 'RENT' -%]Rental fee	23	[%- CASE 'RENT' -%]Rental fee

Lines 188-194 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc (-2 / +1 lines)
188	[%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee	188	[%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee
189	[%- CASE 'LOST' -%]Lost item	189	[%- CASE 'LOST' -%]Lost item
190	[%- CASE 'M' -%]Sundry	190	[%- CASE 'M' -%]Sundry
191	[%- CASE 'N' -%]New card	191	[%- CASE 'NEW_CARD' -%]New card
192	[%- CASE 'OVERDUE' -%]Fine	192	[%- CASE 'OVERDUE' -%]Fine
193	[%- CASE 'PROCESSING' -%]Lost item processing fee	193	[%- CASE 'PROCESSING' -%]Lost item processing fee
194	[%- CASE 'RENT' -%]Rental fee	194	[%- CASE 'RENT' -%]Rental fee
195	-

Return to bug 23049