From 15974afb1a59f5bf99e8c97462f767507340520b Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Thu, 24 May 2018 08:17:09 +0200
Subject: [PATCH] Bug 7651: (follow-up) Correct visibility on admin sidebar

This patch corrects visibility of links to the different
acquisition pages from the admin sidebar.

It also makes a correction to the links on the acq start
page:
- Budgets = period_manage
- Funds = budget_manage

To test:
- Follow the test plan of the first patch

Signed-off-by: Charles Farmer <charles.farmer@inLibro.com>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 .../prog/en/includes/acquisitions-menu.inc    |  6 ++++--
 .../prog/en/includes/admin-menu.inc           | 20 ++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
index 7ef091747e..c043e4eef6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
@@ -10,12 +10,14 @@
                 <li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li>
             [% END %]
         </ul>
-        [% IF ( CAN_user_acquisition_budget_manage || CAN_user_parameters || CAN_user_acquisition_edi_manage ) %]
+        [% IF ( CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || CAN_user_parameters || CAN_user_acquisition_edi_manage ) %]
             <h5>Administration</h5>
             <ul>
                 <li><a href="/cgi-bin/koha/admin/admin-home.pl">Administration home</a></li>
-                [% IF ( CAN_user_acquisition_budget_manage ) %]
+                [% IF ( CAN_user_acquisition_period_manage ) %]
                     <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
+                [% END %]
+                [% IF ( CAN_user_acquisition_budget_manage ) %]
                     <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
                 [% END %]
                 [% IF ( CAN_user_acquisition_currencies_manage ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
index d41968e204..974bccf832 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
@@ -42,15 +42,25 @@
     [% END %]
 </ul>
 
+[% IF ( CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || CAN_user_parameters || CAN_user_acquisition_edi_manage ) %]
 <h5>Acquisition parameters</h5>
 
 <ul>
-    <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></li>
-    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
-    <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
-    <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
-    <li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
+    [% IF ( CAN_user_acquisition_currencies_manage ) %]
+        <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></li>
+    [% END %]
+    [% IF ( CAN_user_acquisition_period_manage ) %]
+        <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
+    [% END %]
+    [% IF ( CAN_user_acquisition_budget_manage ) %]
+        <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
+    [% END %]
+    [% IF ( CAN_user_acquisition_edi_manage ) %]
+        <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
+        <li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
+    [% END %]
 </ul>
+[% END %]
 
 [% IF CAN_user_plugins %]
 <h5>Plugins</h5>
-- 
2.39.5