From b5705612675c23044a4cbedf291459a0cc4be5cb Mon Sep 17 00:00:00 2001
From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Mon, 10 Nov 2014 20:53:20 +0100
Subject: [PATCH] Bug 10749: Fix typo in budget_add_del permission

Updates the en permission file and adds a database
update to fix the permisson.

The update is done using the description, to not
untranslate non-English permission descriptions.

To test:
- Run the database update on your existing installation
  and check the typo is gone
- Run the web installer and check there are no errors
  and permissions are loaded correctly (and without typos)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Test plan works correctly.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
---
 installer/data/mysql/en/mandatory/userpermissions.sql |  2 +-
 installer/data/mysql/updatedatabase.pl                | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql b/installer/data/mysql/en/mandatory/userpermissions.sql
index 156d919..65c4bb8 100644
--- a/installer/data/mysql/en/mandatory/userpermissions.sql
+++ b/installer/data/mysql/en/mandatory/userpermissions.sql
@@ -25,7 +25,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (11, 'order_manage_all', 'Manage all orders and baskets, regardless of restrictions on them'),
    (11, 'group_manage', 'Manage orders & basketgroups'),
    (11, 'order_receive', 'Manage orders & basket'),
-   (11, 'budget_add_del', 'Add and delete budgets (but cant modify budgets)'),
+   (11, 'budget_add_del', 'Add and delete budgets (but can''t modify budgets)'),
    (11, 'budget_manage_all', 'Manage all budgets'),
    (13, 'edit_news', 'Write news for the OPAC and staff interfaces'),
    (13, 'label_creator', 'Create printable labels and barcodes from catalog and patron data'),
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 8ad77c2..bd97f6a 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -9522,7 +9522,7 @@ if ( CheckVersion($DBversion) ) {
 $DBversion = "3.17.00.057";
 if ( CheckVersion($DBversion) ) {
     print "Upgrade to $DBversion done (Koha 3.18 beta)\n";
-    SetVersion($DBversion);
+    SetVersion ($DBversion);
 }
 
 $DBversion = "3.17.00.058";
@@ -9534,6 +9534,15 @@ if( CheckVersion($DBversion) ){
     SetVersion($DBversion);
 }
 
+$DBversion = "3.17.00.XXX";
+if ( CheckVersion($DBversion) ) {
+    $dbh->do(q{
+        UPDATE permissions SET description = "Add and delete budgets (but can't modifiy budgets)" WHERE description = "Add and delete budgets (but cant modify budgets)";
+    });
+    print "Upgrade to $DBversion done (Bug 10749: Fix typo in budget_add_del permission description)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
-- 
2.1.0