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

(-)a/admin/aqbudgetperiods.pl (-5 lines)
Lines 117-127 if ( $op eq 'add_form' ) { Link Here
117
    ## add or modify a budget period (preparation)
117
    ## add or modify a budget period (preparation)
118
    ## get information about the budget period that must be modified
118
    ## get information about the budget period that must be modified
119
119
120
121
    if ($budget_period_id) {    # MOD
120
    if ($budget_period_id) {    # MOD
122
		my $budgetperiod_hash=GetBudgetPeriod($budget_period_id);
121
		my $budgetperiod_hash=GetBudgetPeriod($budget_period_id);
123
        # get dropboxes
122
        # get dropboxes
124
		FormatData($budgetperiod_hash);
125
123
126
        my $editnum = new Number::Format(
124
        my $editnum = new Number::Format(
127
            'int_curr_symbol'   => '',
125
            'int_curr_symbol'   => '',
Lines 160-166 elsif ( $op eq 'delete_confirm' ) { Link Here
160
    my $total = 0;
158
    my $total = 0;
161
    my $data = GetBudgetPeriod( $budget_period_id);
159
    my $data = GetBudgetPeriod( $budget_period_id);
162
160
163
	FormatData($data);
164
	$$data{'budget_period_total'}=$num->format_price(  $data->{'budget_period_total'});
161
	$$data{'budget_period_total'}=$num->format_price(  $data->{'budget_period_total'});
165
    $template->param(
162
    $template->param(
166
		%$data
163
		%$data
Lines 260-266 my @period_active_loop; Link Here
260
257
261
foreach my $result ( @{$results}[ $first .. $last ] ) {
258
foreach my $result ( @{$results}[ $first .. $last ] ) {
262
    my $budgetperiod = $result;
259
    my $budgetperiod = $result;
263
    FormatData($budgetperiod);
264
    $budgetperiod->{'budget_period_total'}     = $num->format_price( $budgetperiod->{'budget_period_total'} );
260
    $budgetperiod->{'budget_period_total'}     = $num->format_price( $budgetperiod->{'budget_period_total'} );
265
    $budgetperiod->{budget_active} = 1;
261
    $budgetperiod->{budget_active} = 1;
266
    push( @period_active_loop, $budgetperiod );
262
    push( @period_active_loop, $budgetperiod );
Lines 279-285 my $last = min( $first + $inactivepagesize - 1, scalar @{$results} - 1, ); Link Here
279
my @period_inactive_loop;
275
my @period_inactive_loop;
280
foreach my $result ( @{$results}[ $first .. $last ] ) {
276
foreach my $result ( @{$results}[ $first .. $last ] ) {
281
    my $budgetperiod = $result;
277
    my $budgetperiod = $result;
282
    FormatData($budgetperiod);
283
    $budgetperiod->{'budget_period_total'} = $num->format_price( $budgetperiod->{'budget_period_total'} );
278
    $budgetperiod->{'budget_period_total'} = $num->format_price( $budgetperiod->{'budget_period_total'} );
284
    $budgetperiod->{budget_active} = 1;
279
    $budgetperiod->{budget_active} = 1;
285
    push( @period_inactive_loop, $budgetperiod );
280
    push( @period_inactive_loop, $budgetperiod );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt (-12 / +12 lines)
Lines 1-3 Link Here
1
[% USE KohaDates %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
3
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
Lines 187-193 Link Here
187
188
188
    <li>
189
    <li>
189
    <label class="required" for="budget_period_startdate">Start date</label>
190
    <label class="required" for="budget_period_startdate">Start date</label>
190
    <input type="text" size="10" id="budget_period_startdate" name="budget_period_startdate"   value="[% budget_period_startdate %]"  />
191
    <input type="text" size="10" id="budget_period_startdate" name="budget_period_startdate"   value="[% budget_period_startdate | $KohaDates %]"  />
191
    <img src="/intranet-tmpl/prog/en/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="Show start date calendar" />
192
    <img src="/intranet-tmpl/prog/en/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="Show start date calendar" />
192
    <script type="text/javascript">
193
    <script type="text/javascript">
193
        Calendar.setup({
194
        Calendar.setup({
Lines 203-209 Link Here
203
    <li>
204
    <li>
204
205
205
    <label class="required" for="budget_period_enddate">End date</label>
206
    <label class="required" for="budget_period_enddate">End date</label>
206
    <input type="text" size="10" id="budget_period_enddate" name="budget_period_enddate" value="[% budget_period_enddate %]" />
207
    <input type="text" size="10" id="budget_period_enddate" name="budget_period_enddate" value="[% budget_period_enddate | $KohaDates  %]" />
207
    <img src="/intranet-tmpl/prog/en/lib/calendar/cal.gif" border="0" id="openCalendarTo" style="cursor: pointer;" alt="Show end date calendar" />
208
    <img src="/intranet-tmpl/prog/en/lib/calendar/cal.gif" border="0" id="openCalendarTo" style="cursor: pointer;" alt="Show end date calendar" />
208
209
209
    <script type="text/javascript">
210
    <script type="text/javascript">
Lines 246-252 Link Here
246
    <ol>
247
    <ol>
247
    <li>
248
    <li>
248
    <label class="required" for="budget_period_startdate">Start date</label>
249
    <label class="required" for="budget_period_startdate">Start date</label>
249
    <input type="text" size="10" id="budget_period_startdate" name="budget_period_startdate"   value="[% budget_period_startdate %]"  />
250
    <input type="text" size="10" id="budget_period_startdate" name="budget_period_startdate"   value="[% budget_period_startdate | $KohaDates  %]"  />
250
    <img src="/intranet-tmpl/prog/en/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="Show start date calendar" />
251
    <img src="/intranet-tmpl/prog/en/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="Show start date calendar" />
251
    <script type="text/javascript">
252
    <script type="text/javascript">
252
        Calendar.setup({
253
        Calendar.setup({
Lines 262-268 Link Here
262
    <li>
263
    <li>
263
264
264
    <label class="required" for="budget_period_enddate">End date</label>
265
    <label class="required" for="budget_period_enddate">End date</label>
265
    <input type="text" size="10" id="budget_period_enddate" name="budget_period_enddate" value="[% budget_period_enddate %]" />
266
    <input type="text" size="10" id="budget_period_enddate" name="budget_period_enddate" value="[% budget_period_enddate | $KohaDates  %]" />
266
    <img src="/intranet-tmpl/prog/en/lib/calendar/cal.gif" border="0" id="openCalendarTo" style="cursor: pointer;" alt="Show end date calendar" />
267
    <img src="/intranet-tmpl/prog/en/lib/calendar/cal.gif" border="0" id="openCalendarTo" style="cursor: pointer;" alt="Show end date calendar" />
267
268
268
    <script type="text/javascript">
269
    <script type="text/javascript">
Lines 368-376 Link Here
368
      <table id="activeperiodst">
369
      <table id="activeperiodst">
369
        <thead>
370
        <thead>
370
          <tr>
371
          <tr>
371
            <th>Budget Name</th>
372
            <th>Budget name</th>
372
            <th>Start Date</th>
373
            <th>Start date</th>
373
            <th>End Date</th>
374
            <th>End date</th>
374
            <th>Locked</th>
375
            <th>Locked</th>
375
            <th>Total</th>
376
            <th>Total</th>
376
            <th>Actions</th>
377
            <th>Actions</th>
Lines 380-387 Link Here
380
            [% FOREACH period_active IN period_active_loop %]
381
            [% FOREACH period_active IN period_active_loop %]
381
              <tr>
382
              <tr>
382
              <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_active.budget_period_id %]" title="View funds for [% period_active.budget_period_description %]">[% period_active.budget_period_description %]</a></td>
383
              <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_active.budget_period_id %]" title="View funds for [% period_active.budget_period_description %]">[% period_active.budget_period_description %]</a></td>
383
              <td>[% period_active.budget_period_startdate %]</td>
384
              <td>[% period_active.budget_period_startdate | $KohaDates %]</td>
384
              <td>[% period_active.budget_period_enddate %]</td>
385
              <td>[% period_active.budget_period_enddate | $KohaDates %]</td>
385
              <td>
386
              <td>
386
                [% IF ( period_active.budget_period_locked ) %]
387
                [% IF ( period_active.budget_period_locked ) %]
387
                  <span style="color:green;">Locked</span>&nbsp;
388
                  <span style="color:green;">Locked</span>&nbsp;
Lines 423-430 Link Here
423
                    <tr class="highlight">
424
                    <tr class="highlight">
424
                [% END %]
425
                [% END %]
425
                <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_loo.budget_period_id %]" title="View funds for [% period_loo.budget_period_description %]">[% period_loo.budget_period_description %]</a></td>
426
                <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_loo.budget_period_id %]" title="View funds for [% period_loo.budget_period_description %]">[% period_loo.budget_period_description %]</a></td>
426
                <td>[% period_loo.budget_period_startdate %]</td>
427
                <td>[% period_loo.budget_period_startdate | $KohaDates %]</td>
427
                <td>[% period_loo.budget_period_enddate %]</td>
428
                <td>[% period_loo.budget_period_enddate | $KohaDates %]</td>
428
                <td> [% IF ( period_loo.budget_period_locked ) %]<span style="color:green;">Locked</span>&nbsp;[% ELSE %][% END %] </td>
429
                <td> [% IF ( period_loo.budget_period_locked ) %]<span style="color:green;">Locked</span>&nbsp;[% ELSE %][% END %] </td>
429
                <td align='right'>[% period_loo.budget_period_total %]</td>
430
                <td align='right'>[% period_loo.budget_period_total %]</td>
430
                <td>
431
                <td>
431
- 

Return to bug 8117