From 819e6216e666b61077d2b9043d25f546708bbfc3 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Sun, 20 May 2018 21:06:25 +0200
Subject: [PATCH] Bug 3849: Improve descriptions of granular acquisition
 permissions

The permissions for acquisitions were not very clearly described.
This patch changes the descriptions in the include file (GUI) and
in the default SQL.

To test:
- Go to any patron account in staff
- Go to more > permissions
- Verify that the meaning of each acquisition permission is clear
  from the description

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 installer/data/mysql/userpermissions.sql       | 18 +++++++++---------
 .../prog/en/includes/permissions.inc           | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/installer/data/mysql/userpermissions.sql b/installer/data/mysql/userpermissions.sql
index 047ec42439..07c7d5de20 100644
--- a/installer/data/mysql/userpermissions.sql
+++ b/installer/data/mysql/userpermissions.sql
@@ -19,16 +19,16 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (10, 'remaining_permissions', 'Remaining permissions for managing fines and fees'),
    (11, 'vendors_manage', 'Manage vendors'),
    (11, 'contracts_manage', 'Manage contracts'),
-   (11, 'period_manage', 'Manage periods'),
-   (11, 'budget_manage', 'Manage budgets'),
-   (11, 'budget_modify', 'Modify budget (can''t create lines, but can modify existing ones)'),
+   (11, 'period_manage', 'Manage budgets'),
+   (11, 'budget_manage', 'Manage funds'),
+   (11, 'budget_modify', 'Modify funds (can''t create lines, but can modify existing ones)'),
    (11, 'planning_manage', 'Manage budget plannings'),
-   (11, 'order_manage', 'Manage orders & basket'),
-   (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 can''t modify budgets)'),
-   (11, 'budget_manage_all', 'Manage all budgets'),
+   (11, 'order_manage', 'Manage baskets and order lines'),
+   (11, 'order_manage_all', 'Manage all baskets and order lines, regardless of restrictions on them'),
+   (11, 'group_manage', 'Manage basket groups'),
+   (11, 'order_receive', 'Receive orders and manage shipments'),
+   (11, 'budget_add_del', 'Add and delete funds (but can''t modify funds)'),
+   (11, 'budget_manage_all', 'Manage all funds'),
    (11, 'edi_manage', 'Manage EDIFACT transmissions'),
    (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/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
index 017ffb918e..f29f6c2084 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
@@ -45,16 +45,16 @@
     [%- CASE 'fast_cataloging' -%]<span>Fast cataloging</span>
     [%- CASE 'remaining_permissions' -%]<span>Remaining permissions for managing fines and fees</span>
     [%- CASE 'writeoff' -%]<span>Write off fines and fees</span>
-    [%- CASE 'budget_add_del' -%]<span>Add and delete budgets (but can't modify budgets)</span>
-    [%- CASE 'budget_manage' -%]<span>Manage budgets</span>
-    [%- CASE 'budget_manage_all' -%]<span>Manage all budgets</span>
-    [%- CASE 'budget_modify' -%]<span>Modify budget (can't create lines, but can modify existing ones)</span>
+    [%- CASE 'budget_add_del' -%]<span>Add and delete funds (but can't modify funds)</span>
+    [%- CASE 'budget_manage' -%]<span>Manage funds</span>
+    [%- CASE 'budget_manage_all' -%]<span>Manage all funds</span>
+    [%- CASE 'budget_modify' -%]<span>Modify funds (can't create lines, but can modify existing ones)</span>
     [%- CASE 'contracts_manage' -%]<span>Manage contracts</span>
-    [%- CASE 'group_manage' -%]<span>Manage orders & basketgroups</span>
-    [%- CASE 'order_manage' -%]<span>Manage orders & basket</span>
-    [%- CASE 'order_manage_all' -%]<span>Manage all orders and baskets, regardless of restrictions on them</span>
-    [%- CASE 'order_receive' -%]<span>Manage orders & basket</span>
-    [%- CASE 'period_manage' -%]<span>Manage periods</span>
+    [%- CASE 'group_manage' -%]<span>Manage basket groups</span>
+    [%- CASE 'order_manage' -%]<span>Manage basket and order lines</span>
+    [%- CASE 'order_manage_all' -%]<span>Manage all baskets and order lines, regardless of restrictions on them</span>
+    [%- CASE 'order_receive' -%]<span>Receive orders and manage shipments</span>
+    [%- CASE 'period_manage' -%]<span>Manage budgets</span>
     [%- CASE 'planning_manage' -%]<span>Manage budget plannings</span>
     [%- CASE 'vendors_manage' -%]<span>Manage vendors</span>
     [%- CASE 'batch_upload_patron_images' -%]<span>Upload patron images in a batch or one at a time</span>
-- 
2.39.5