From 63ec21f5e2d35a5a04ce381323fc34d9cb3df625 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
Date: Thu, 22 Oct 2015 11:44:23 +0200
Subject: [PATCH] Bug 15049: Add warning about "No active currency" to
Acquisitions start page
If no active currency is defined, Acquisitions does not work properly and software
can occur while receiving.
This patch adds the warning message about missing active currency to Home > Acquisitions
To test:
- Apply patch
- Go to Home > Administration > Currencies & Exchange Rates > Currencies
- Make sure that no active currency is set
- Go to Home > Acquisitions
- Verify that a warning displays:
- If user has at least permission for parameters_remaining_perissions,
the warning should display a link to Currencies and exchange rates (currency.pl)
- If the user has no permission to edit the Currencies and exchange rates,
no link is displayed.
- Set an active currency
- Veryfy that the warning no longer displays
(Amended to remove superfluous line / mv)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described. No errors
Signed-off-by: JM Broust <jean-manuel.broust@univ-lyon2.fr>
---
acqui/acqui-home.pl | 7 +++++++
.../intranet-tmpl/prog/en/includes/budgets-active-currency.inc | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 1 +
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl
index 58ba68e..393a131 100755
--- a/acqui/acqui-home.pl
+++ b/acqui/acqui-home.pl
@@ -129,4 +129,11 @@ $template->param(
suggestions_count => $suggestions_count,
);
+my $cur = GetCurrency();
+if ( $cur ) {
+ $template->param(
+ currency => $cur->{currency},
+ );
+}
+
output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc
index b13fb34..400bbb9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc
@@ -1 +1 @@
-[% IF ( currency ) %]<p><b>Currency = [% currency %]</b></p>[% ELSE %]<div class="dialog alert"><h3>No active currency is defined</h3><p>Please <a href="/cgi-bin/koha/admin/currency.pl">specify an active currency</a>.</p></div>[% END %]
\ No newline at end of file
+[% IF ( currency ) %]<p><b>Currency = [% currency %]</b></p>[% ELSE %]<div class="dialog alert"><h3>No active currency is defined</h3><p>[% IF CAN_user_parameters_parameters_remaining_permissions %]Please <a href="/cgi-bin/koha/admin/currency.pl">specify an active currency</a>.[% ELSE %]Your administrator must specify an active currency.[% END %]</p></div>[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
index a83fe0b..6b521aa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
@@ -98,6 +98,7 @@ $(document).ready(function() {
[% INCLUDE 'acquisitions-toolbar.inc' %]
<h1>Acquisitions</h1>
+ [% INCLUDE 'budgets-active-currency.inc' %]
[% UNLESS ( loop_budget ) %]
[% IF ( CAN_user_acquisition_period_manage ) %]
<div class="dialog alert">You must <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">define a budget</a> in Administration</div>
--
1.7.10.4