From e8937c549f42bc263f15450c496bedf6505e7bbf Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 3 Oct 2019 12:34:08 +0100 Subject: [PATCH] Bug 23049: (follow-up) Remove MANUAL_INV from AV --- .../data/mysql/atomicupdate/bug_23049_debit.perl | 12 ++++++++++++ installer/data/mysql/mandatory/auth_val_cat.sql | 1 - .../prog/en/modules/admin/authorised_values.tt | 2 -- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_23049_debit.perl b/installer/data/mysql/atomicupdate/bug_23049_debit.perl index 14949991e8..fa1ae786f9 100644 --- a/installer/data/mysql/atomicupdate/bug_23049_debit.perl +++ b/installer/data/mysql/atomicupdate/bug_23049_debit.perl @@ -97,6 +97,18 @@ if ( CheckVersion($DBversion) ) { } ); + # Clean up MANUAL_INV + $dbh->do( + qq{ + DELETE FROM authorised_values WHERE category = 'MANUAL_INV' + } + ); + $dbh->do( + qq{ + DELETE FROM authorised_value_categories WHERE category_name = 'MANUAL_INV' + } + ); + # Add new permission $dbh->do( q{ diff --git a/installer/data/mysql/mandatory/auth_val_cat.sql b/installer/data/mysql/mandatory/auth_val_cat.sql index 70e7d19a95..f39bf93502 100644 --- a/installer/data/mysql/mandatory/auth_val_cat.sql +++ b/installer/data/mysql/mandatory/auth_val_cat.sql @@ -32,7 +32,6 @@ INSERT IGNORE INTO authorised_value_categories( category_name ) ('NOT_LOAN'), ('CCODE'), ('LOC'), - ('MANUAL_INV'), ('BOR_NOTES'), ('OPAC_SUG'), ('SIP_MEDIA_TYPE'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index d42bffcdcd..9c85f9fafd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -381,8 +381,6 @@

Shelving location (usually appears when adding or editing an item). LOC maps to items.location in the Koha database.

[% CASE 'LOST' %]

Descriptions for the items marked as lost (appears when adding or editing an item)

- [% CASE 'MANUAL_INV' %] -

Values for manual invoicing types

[% CASE 'NOT_LOAN' %]

Reasons why a title is not for loan

[% CASE 'OPAC_SUG' %] -- 2.20.1