Bugzilla – Attachment 45840 Details for
Bug 15049
Add warning about "No active currency" to Acquisitions start page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15049: (followup) Add warning about "No active currency"
Bug-15049-followup-Add-warning-about-No-active-cur.patch (text/plain), 3.47 KB, created by
Marc Véron
on 2015-12-18 15:05:04 UTC
(
hide
)
Description:
Bug 15049: (followup) Add warning about "No active currency"
Filename:
MIME Type:
Creator:
Marc Véron
Created:
2015-12-18 15:05:04 UTC
Size:
3.47 KB
patch
obsolete
>From 7b8bfa78973473ba44eba33760508b3eb191fd13 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch> >Date: Fri, 18 Dec 2015 16:01:12 +0100 >Subject: [PATCH] Bug 15049: (followup) Add warning about "No active currency" > >Fix translatibiity issues and use include in admin/aqplan.tt as well. >See comment #24 >--- > .../prog/en/includes/budgets-active-currency.inc | 2 +- > .../intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt | 14 ++++++++------ > 3 files changed, 10 insertions(+), 8 deletions(-) > >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 fbaa7e8..1862059 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 >@@ -6,7 +6,7 @@ > <div class="dialog alert"> > <h3>No active currency is defined</h3> > [% IF CAN_user_parameters_parameters_remaining_permissions %] >- <p>Please <a href="/cgi-bin/koha/admin/currency.pl">specify an active currency</a>.</p> >+ <p><a href="/cgi-bin/koha/admin/currency.pl">Please specify an active currency.</a></p> > [% ELSE %] > <p>Your administrator must specify an active currency.</p> > [% 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 ab06267..82f201f 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 >@@ -101,7 +101,7 @@ $(document).ready(function() { > [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %] > [% 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> >+ <div class="dialog alert"><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">You must define a budget in Administration</a></div> > [% ELSE %] > <div class="dialog alert">Your administrator must define a budget in Administration</div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >index 9b2f2af..86a1962 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >@@ -85,13 +85,15 @@ > > [% IF ( budget_lines ) %] > >- [% IF ( currency ) %]<p><b>Currency = [% currency %]</b>. >- [% IF ( show_actual ) %] >- <b>Each cell contain both actual and estimated values.</b> >+ [% IF ( currency ) %]<p><b>Currency = [% currency %].</b> >+ [% IF ( show_actual ) %] >+ <b>Each cell contain both actual and estimated values.</b> >+ [% ELSE %] >+ <b>Cells contain estimated values only.</b> >+ [% END %] >+ </p> > [% ELSE %] >- <b>Cells contain estimated values only.</b> >- [% END %] >- </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> >+ [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %] > [% IF ( show_actual ) %] > <p><b>Each cell contain both actual and estimated values.</b></p> > [% ELSE %] >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15049
:
43744
|
44017
|
44070
|
44071
|
44076
|
44148
|
44152
|
45274
|
45778
|
45779
|
45840
|
45995
|
45996
|
45997
|
45998