View | Details | Raw Unified | Return to bug 4913
Collapse All | Expand All

(-)a/admin/aqbudgetperiods.pl (-1 / +3 lines)
Lines 82-88 my ($template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user( Link Here
82
82
83
83
84
my $cur = GetCurrency();
84
my $cur = GetCurrency();
85
$template->param( cur => $cur->{symbol} );
85
$template->param( symbol => $cur->{symbol},
86
                  currency => $cur->{currency}
87
               );
86
my $cur_format = C4::Context->preference("CurrencyFormat");
88
my $cur_format = C4::Context->preference("CurrencyFormat");
87
my $num;
89
my $num;
88
90
(-)a/admin/aqbudgets.pl (-1 / +3 lines)
Lines 52-58 my ($template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user( Link Here
52
);
52
);
53
53
54
my $cur = GetCurrency();
54
my $cur = GetCurrency();
55
$template->param( cur => $cur->{symbol} );
55
$template->param( symbol => $cur->{symbol},
56
                  currency => $cur->{currency}
57
               );
56
58
57
my $op = $input->param('op');
59
my $op = $input->param('op');
58
60
(-)a/admin/aqplan.pl (-2 / +3 lines)
Lines 60-66 my $budget_period_id = $input->param('budget_period_id'); Link Here
60
my $period = GetBudgetPeriod($budget_period_id);
60
my $period = GetBudgetPeriod($budget_period_id);
61
my $count  = GetPeriodsCount();
61
my $count  = GetPeriodsCount();
62
my $cur    = GetCurrency;
62
my $cur    = GetCurrency;
63
63
$template->param( symbol => $cur->{symbol},
64
                  currency => $cur->{currency}
65
               );
64
$template->param( period_button_only => 1 ) if $count == 0;
66
$template->param( period_button_only => 1 ) if $count == 0;
65
67
66
68
Lines 452-458 $template->param( Link Here
452
    show_actual               => $show_actual,
454
    show_actual               => $show_actual,
453
    show_percent              => $show_percent,
455
    show_percent              => $show_percent,
454
    show_mine                 => $show_mine,
456
    show_mine                 => $show_mine,
455
    cur                       => $cur->{symbol},
456
    cur_format                => $cur_format,
457
    cur_format                => $cur_format,
457
    CGIextChoice              => $CGIextChoice,
458
    CGIextChoice              => $CGIextChoice,
458
    CGIsepChoice              => $CGIsepChoice,
459
    CGIsepChoice              => $CGIsepChoice,
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc (+1 lines)
Line 0 Link Here
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 -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl (-1 / +3 lines)
Lines 254-260 Link Here
254
<!--  DEFAULT  display budget periods list -->
254
<!--  DEFAULT  display budget periods list -->
255
<!-- TMPL_IF name="else" -->
255
<!-- TMPL_IF name="else" -->
256
    <h2>Budgets administration</h2>
256
    <h2>Budgets administration</h2>
257
    <!-- 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 -->
257
258
    <!-- TMPL_INCLUDE NAME="budgets-active-currency.inc" -->
259
258
    <table id="periodsh">
260
    <table id="periodsh">
259
    <thead>
261
    <thead>
260
	    <tr>
262
	    <tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl (-3 / +3 lines)
Lines 157-165 Link Here
157
<!-- TMPL_UNLESS name="delete_confirm" --><!-- TMPL_INCLUDE NAME="budgets-admin-toolbar.inc" --><!-- /TMPL_UNLESS -->
157
<!-- TMPL_UNLESS name="delete_confirm" --><!-- TMPL_INCLUDE NAME="budgets-admin-toolbar.inc" --><!-- /TMPL_UNLESS -->
158
<!-- TMPL_IF name="else" -->
158
<!-- TMPL_IF name="else" -->
159
159
160
<!-- 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 -->
161
162
<h1>Funds for '<!-- TMPL_VAR name="budget_period_description" -->'</h1>
160
<h1>Funds for '<!-- TMPL_VAR name="budget_period_description" -->'</h1>
161
162
<!-- TMPL_INCLUDE NAME="budgets-active-currency.inc" -->
163
163
<table id="budgeth">
164
<table id="budgeth">
164
    <thead>
165
    <thead>
165
        <tr>
166
        <tr>
Lines 240-246 Link Here
240
    </tbody>
241
    </tbody>
241
</table>
242
</table>
242
243
243
<!-- TMPL_IF name="cur" --><p><b>Currency = <!-- TMPL_VAR NAME="cur" --> <!-- TMPL_VAR NAME="cur_format" --></b></p><!-- /TMPL_IF -->
244
<!-- TMPL_IF NAME="pagination_bar" --><div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div><!-- /TMPL_IF -->
244
<!-- TMPL_IF NAME="pagination_bar" --><div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div><!-- /TMPL_IF -->
245
<!-- /TMPL_IF --> <!-- else -->
245
<!-- /TMPL_IF --> <!-- else -->
246
246
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl (-2 / +1 lines)
Lines 139-145 YAHOO.util.Event.onAvailable("popmenu", function () { Link Here
139
139
140
    <!-- TMPL_IF NAME="budget_lines" -->
140
    <!-- TMPL_IF NAME="budget_lines" -->
141
141
142
    <!-- 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 -->
142
    <!-- TMPL_INCLUDE NAME="budgets-active-currency.inc" -->
143
143
144
    <table id="plan" width="100%">
144
    <table id="plan" width="100%">
145
    <thead>
145
    <thead>
146
- 

Return to bug 4913