Attachment #102131 for bug #25010

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

Lines 10-15 INSERT INTO account_debit_types ( code, description, can_be_invoiced, can_be_sol Link Here

(-)a/installer/data/mysql/account_debit_types.sql (-1 / +1 lines)
10	('RENT', 'Rental fee', 0, 0, NULL, 1),	10	('RENT', 'Rental fee', 0, 0, NULL, 1),
11	('RENT_DAILY', 'Daily rental fee', 0, 0, NULL, 1),	11	('RENT_DAILY', 'Daily rental fee', 0, 0, NULL, 1),
12	('RENT_RENEW', 'Renewal of rental item', 0, 0, NULL, 1),	12	('RENT_RENEW', 'Renewal of rental item', 0, 0, NULL, 1),
13	('RENT_DAILY_RENEW', 'Rewewal of daily rental item', 0, 0, NULL, 1),	13	('RENT_DAILY_RENEW', 'Renewal of daily rental item', 0, 0, NULL, 1),
14	('RESERVE', 'Hold fee', 0, 0, NULL, 1),	14	('RESERVE', 'Hold fee', 0, 0, NULL, 1),
15	('RESERVE_EXPIRED', 'Hold waiting too long', 0, 0, NULL, 1);	15	('RESERVE_EXPIRED', 'Hold waiting too long', 0, 0, NULL, 1);

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_25010_rewewal.perl (+8 lines)
	1	$DBversion = 'XXX'; # will be replaced by the RM
	2	if( CheckVersion( $DBversion ) ) {
	3	# you can use $dbh here like:
	4	$dbh->do( "UPDATE account_debit_types SET description = REPLACE(description,'Rewewal','Renewal') WHERE description like '%Rewewal%'" );
	5
	6	# Always end with this (adjust the bug info)
	7	NewVersion( $DBversion, 25010, "Fix typo in account_debit_type description");
	8	}

Lines 19781-19787 if ( CheckVersion($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (-1 / +1 lines)
19781	('RENT', 'Rental fee', 0, NULL, 1),	19781	('RENT', 'Rental fee', 0, NULL, 1),
19782	('RENT_DAILY', 'Daily rental fee', 0, NULL, 1),	19782	('RENT_DAILY', 'Daily rental fee', 0, NULL, 1),
19783	('RENT_RENEW', 'Renewal of rental item', 0, NULL, 1),	19783	('RENT_RENEW', 'Renewal of rental item', 0, NULL, 1),
19784	('RENT_DAILY_RENEW', 'Rewewal of daily rental item', 0, NULL, 1),	19784	('RENT_DAILY_RENEW', 'Renewal of daily rental item', 0, NULL, 1),
19785	('RESERVE', 'Hold fee', 0, NULL, 1)	19785	('RESERVE', 'Hold fee', 0, NULL, 1)
19786	}	19786	}
19787	);	19787	);

Lines 22-28 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc (-1 / +1 lines)
22	[%- CASE 'RENT' -%]Rental fee	22	[%- CASE 'RENT' -%]Rental fee
23	[%- CASE 'RENT_DAILY' -%]Daily rental fee	23	[%- CASE 'RENT_DAILY' -%]Daily rental fee
24	[%- CASE 'RENT_RENEW' -%]Renewal of rental item	24	[%- CASE 'RENT_RENEW' -%]Renewal of rental item
25	[%- CASE 'RENT_DAILY_RENEW' -%]Rewewal of daily rental item	25	[%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item
26	[%- CASE 'RESERVE' -%]Hold fee	26	[%- CASE 'RESERVE' -%]Hold fee
27	[%- CASE 'RESERVE_EXPIRED' -%]Hold waiting too long	27	[%- CASE 'RESERVE_EXPIRED' -%]Hold waiting too long
28	[%- CASE 'Payout' -%]Payout	28	[%- CASE 'Payout' -%]Payout

Lines 190-196 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc (-2 / +1 lines)
190	[%- CASE 'RENT' -%]Rental fee	190	[%- CASE 'RENT' -%]Rental fee
191	[%- CASE 'RENT_DAILY' -%]Daily rental fee	191	[%- CASE 'RENT_DAILY' -%]Daily rental fee
192	[%- CASE 'RENT_RENEW' -%]Renewal of rental item	192	[%- CASE 'RENT_RENEW' -%]Renewal of rental item
193	[%- CASE 'RENT_DAILY_RENEW' -%]Rewewal of daily rental item	193	[%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item
194	[%- CASE 'RESERVE' -%]Hold fee	194	[%- CASE 'RESERVE' -%]Hold fee
195	[%- CASE 'RESERVE_EXPIRED' -%]Hold waiting too long	195	[%- CASE 'RESERVE_EXPIRED' -%]Hold waiting too long
196	[%- CASE -%][% account.debit_type.description \| html %]	196	[%- CASE -%][% account.debit_type.description \| html %]
197	-

Return to bug 25010