From 2e053cbc784fa9188927d99a46bb1955a3e57611 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 3 Oct 2019 12:34:08 +0100
Subject: [PATCH] Bug 23049: (follow-up) Remove MANUAL_INV from AV
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>
Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>
---
 installer/data/mysql/atomicupdate/bug_23049_debit.perl       | 12 ++++++++++++
 installer/data/mysql/mandatory/auth_val_cat.sql              |  1 -
 .../intranet-tmpl/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 1494999..fa1ae78 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 70e7d19..f39bf93 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 d42bffc..9c85f9f 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 @@
             <p>Shelving location (usually appears when adding or editing an item). LOC maps to items.location in the Koha database.</p>
         [% CASE 'LOST' %]
             <p>Descriptions for the items marked as lost (appears when adding or editing an item)</p>
-        [% CASE 'MANUAL_INV' %]
-            <p>Values for manual invoicing types</p>
         [% CASE 'NOT_LOAN' %]
             <p>Reasons why a title is not for loan</p>
         [% CASE 'OPAC_SUG' %]
-- 
2.7.4