From e21e40ad8446e79316e476cded7c694207c2c3bf Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Thu, 26 Mar 2020 21:30:06 +0000 Subject: [PATCH] Bug 25010: Fix typo 'rewewal' in debit types This fixes a typo in the debit type description of RENT_DAILY_RENEW 1) Go to Administration > Debit types 2) Show all debit types 3) Check for the typo 4) Apply patch 5) Verify that the typo is gone 6) Check account_debit_types table for type: SELECT * FROM account_debit_types; 7) Run database update 8) Repeat and verify typo is gone Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize --- installer/data/mysql/account_debit_types.sql | 2 +- installer/data/mysql/atomicupdate/bug_25010_rewewal.perl | 8 ++++++++ installer/data/mysql/updatedatabase.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc | 2 +- .../opac-tmpl/bootstrap/en/includes/account-table.inc | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_25010_rewewal.perl diff --git a/installer/data/mysql/account_debit_types.sql b/installer/data/mysql/account_debit_types.sql index 671704be53..4e70bab286 100644 --- a/installer/data/mysql/account_debit_types.sql +++ b/installer/data/mysql/account_debit_types.sql @@ -10,6 +10,6 @@ INSERT INTO account_debit_types ( code, description, can_be_invoiced, can_be_sol ('RENT', 'Rental fee', 0, 0, NULL, 1), ('RENT_DAILY', 'Daily rental fee', 0, 0, NULL, 1), ('RENT_RENEW', 'Renewal of rental item', 0, 0, NULL, 1), -('RENT_DAILY_RENEW', 'Rewewal of daily rental item', 0, 0, NULL, 1), +('RENT_DAILY_RENEW', 'Renewal of daily rental item', 0, 0, NULL, 1), ('RESERVE', 'Hold fee', 0, 0, NULL, 1), ('RESERVE_EXPIRED', 'Hold waiting too long', 0, 0, NULL, 1); diff --git a/installer/data/mysql/atomicupdate/bug_25010_rewewal.perl b/installer/data/mysql/atomicupdate/bug_25010_rewewal.perl new file mode 100644 index 0000000000..bfac380796 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_25010_rewewal.perl @@ -0,0 +1,8 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + # you can use $dbh here like: + $dbh->do( "UPDATE account_debit_types SET description = REPLACE(description,'Rewewal','Renewal') WHERE description like '%Rewewal%'" ); + + # Always end with this (adjust the bug info) + NewVersion( $DBversion, 25010, "Fix typo in account_debit_type description"); +} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index cfa0318787..f5ef8e2e47 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -19781,7 +19781,7 @@ if ( CheckVersion($DBversion) ) { ('RENT', 'Rental fee', 0, NULL, 1), ('RENT_DAILY', 'Daily rental fee', 0, NULL, 1), ('RENT_RENEW', 'Renewal of rental item', 0, NULL, 1), - ('RENT_DAILY_RENEW', 'Rewewal of daily rental item', 0, NULL, 1), + ('RENT_DAILY_RENEW', 'Renewal of daily rental item', 0, NULL, 1), ('RESERVE', 'Hold fee', 0, NULL, 1) } ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc index 172acc6347..3e37c8d407 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc @@ -22,7 +22,7 @@ [%- CASE 'RENT' -%]Rental fee [%- CASE 'RENT_DAILY' -%]Daily rental fee [%- CASE 'RENT_RENEW' -%]Renewal of rental item - [%- CASE 'RENT_DAILY_RENEW' -%]Rewewal of daily rental item + [%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item [%- CASE 'RESERVE' -%]Hold fee [%- CASE 'RESERVE_EXPIRED' -%]Hold waiting too long [%- CASE 'Payout' -%]Payout diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc index a193b11a4c..93f9eeb920 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc @@ -190,7 +190,7 @@ [%- CASE 'RENT' -%]Rental fee [%- CASE 'RENT_DAILY' -%]Daily rental fee [%- CASE 'RENT_RENEW' -%]Renewal of rental item - [%- CASE 'RENT_DAILY_RENEW' -%]Rewewal of daily rental item + [%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item [%- CASE 'RESERVE' -%]Hold fee [%- CASE 'RESERVE_EXPIRED' -%]Hold waiting too long [%- CASE -%][% account.debit_type.description | html %] -- 2.39.5