Bugzilla – Attachment 2275 Details for
Bug 4913
Budget planning pages should show currency name instead of symbol
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed fix
0001-Fix-for-Bug-4913-Budget-pages-should-show-currency-n.patch (text/plain), 6.14 KB, created by
Owen Leonard
on 2010-06-25 19:50:55 UTC
(
hide
)
Description:
Proposed fix
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2010-06-25 19:50:55 UTC
Size:
6.14 KB
patch
obsolete
>From 5957e693dc80c1e96c8a6cd5f9aaae327e94b092 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 25 Jun 2010 09:32:08 -0400 >Subject: [PATCH] Fix for Bug 4913 - Budget pages should show currency name instead of symbol > >This patch adds a new include file to handle the display of the active >currency name and a warning if no currency is active. >--- > admin/aqbudgetperiods.pl | 4 +++- > admin/aqbudgets.pl | 4 +++- > admin/aqplan.pl | 5 +++-- > .../prog/en/includes/budgets-active-currency.inc | 1 + > .../prog/en/modules/admin/aqbudgetperiods.tmpl | 4 +++- > .../prog/en/modules/admin/aqbudgets.tmpl | 6 +++--- > .../prog/en/modules/admin/aqplan.tmpl | 2 +- > 7 files changed, 17 insertions(+), 9 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc > >diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl >index 62383f1..39f3cd0 100755 >--- a/admin/aqbudgetperiods.pl >+++ b/admin/aqbudgetperiods.pl >@@ -82,7 +82,9 @@ my ($template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user( > > > my $cur = GetCurrency(); >-$template->param( cur => $cur->{symbol} ); >+$template->param( symbol => $cur->{symbol}, >+ currency => $cur->{currency} >+ ); > my $cur_format = C4::Context->preference("CurrencyFormat"); > my $num; > >diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl >index 95f5f26..6142f69 100755 >--- a/admin/aqbudgets.pl >+++ b/admin/aqbudgets.pl >@@ -52,7 +52,9 @@ my ($template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user( > ); > > my $cur = GetCurrency(); >-$template->param( cur => $cur->{symbol} ); >+$template->param( symbol => $cur->{symbol}, >+ currency => $cur->{currency} >+ ); > > my $op = $input->param('op'); > >diff --git a/admin/aqplan.pl b/admin/aqplan.pl >index da47179..6d6bd35 100755 >--- a/admin/aqplan.pl >+++ b/admin/aqplan.pl >@@ -60,7 +60,9 @@ my $budget_period_id = $input->param('budget_period_id'); > my $period = GetBudgetPeriod($budget_period_id); > my $count = GetPeriodsCount(); > my $cur = GetCurrency; >- >+$template->param( symbol => $cur->{symbol}, >+ currency => $cur->{currency} >+ ); > $template->param( period_button_only => 1 ) if $count == 0; > > >@@ -452,7 +454,6 @@ $template->param( > show_actual => $show_actual, > show_percent => $show_percent, > show_mine => $show_mine, >- cur => $cur->{symbol}, > cur_format => $cur_format, > CGIextChoice => $CGIextChoice, > CGIsepChoice => $CGIsepChoice, >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 >new file mode 100644 >index 0000000..a4571f9 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc >@@ -0,0 +1 @@ >+<!-- TMPL_IF name="currency" --><p><b>Currency = <!-- TMPL_VAR NAME="currency" --></b></p><!-- TMPL_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><!-- /TMPL_IF --> >\ No newline at end of file >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl >index 204574b..e09da73 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl >@@ -254,7 +254,9 @@ > <!-- DEFAULT display budget periods list --> > <!-- TMPL_IF name="else" --> > <h2>Budgets administration</h2> >- <!-- TMPL_IF name="cur" --><p><b>Currency = <!-- TMPL_VAR name="cur" --></b></p><!-- TMPL_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><!-- /TMPL_IF --> >+ >+ <!-- TMPL_INCLUDE NAME="budgets-active-currency.inc" --> >+ > <table id="periodsh"> > <thead> > <tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl >index ce4d7da..1be8c73 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl >@@ -157,9 +157,10 @@ > <!-- TMPL_UNLESS name="delete_confirm" --><!-- TMPL_INCLUDE NAME="budgets-admin-toolbar.inc" --><!-- /TMPL_UNLESS --> > <!-- TMPL_IF name="else" --> > >-<!-- TMPL_UNLESS NAME="cur" --><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><!-- /TMPL_UNLESS --> >- > <h1>Funds for '<!-- TMPL_VAR name="budget_period_description" -->'</h1> >+ >+<!-- TMPL_INCLUDE NAME="budgets-active-currency.inc" --> >+ > <table id="budgeth"> > <thead> > <tr> >@@ -240,7 +241,6 @@ > </tbody> > </table> > >-<!-- TMPL_IF name="cur" --><p><b>Currency = <!-- TMPL_VAR NAME="cur" --> <!-- TMPL_VAR NAME="cur_format" --></b></p><!-- /TMPL_IF --> > <!-- TMPL_IF NAME="pagination_bar" --><div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div><!-- /TMPL_IF --> > <!-- /TMPL_IF --> <!-- else --> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl >index 627b3f7..cae1a90 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl >@@ -139,7 +139,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () { > > <!-- TMPL_IF NAME="budget_lines" --> > >- <!-- TMPL_IF name="cur" --><p><b>Currency = <!-- TMPL_VAR name="cur" --></b></p><!-- TMPL_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><!-- /TMPL_IF --> >+ <!-- TMPL_INCLUDE NAME="budgets-active-currency.inc" --> > > <table id="plan" width="100%"> > <thead> >-- >1.7.0.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 4913
: 2275