From ed6ec7075a97e821c48f5655a618b418721fd4bf Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Mon, 11 Jun 2012 11:14:50 +0200
Subject: [PATCH] [SIGNED-OFF] Bug 8117: Followup: Use the KohaDates plugin in
 aqbudgetperiods.tt

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
---
 admin/aqbudgetperiods.pl                           |    5 -----
 .../prog/en/modules/admin/aqbudgetperiods.tt       |   23 ++++++++++----------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl
index c2d2441..9e2f394 100755
--- a/admin/aqbudgetperiods.pl
+++ b/admin/aqbudgetperiods.pl
@@ -117,11 +117,9 @@ if ( $op eq 'add_form' ) {
     ## add or modify a budget period (preparation)
     ## get information about the budget period that must be modified
 
-
     if ($budget_period_id) {    # MOD
 		my $budgetperiod_hash=GetBudgetPeriod($budget_period_id);
         # get dropboxes
-		FormatData($budgetperiod_hash);
 
         my $editnum = new Number::Format(
             'int_curr_symbol'   => '',
@@ -160,7 +158,6 @@ elsif ( $op eq 'delete_confirm' ) {
     my $total = 0;
     my $data = GetBudgetPeriod( $budget_period_id);
 
-	FormatData($data);
 	$$data{'budget_period_total'}=$num->format_price(  $data->{'budget_period_total'});
     $template->param(
 		%$data
@@ -260,7 +257,6 @@ my @period_active_loop;
 
 foreach my $result ( @{$results}[ $first .. $last ] ) {
     my $budgetperiod = $result;
-    FormatData($budgetperiod);
     $budgetperiod->{'budget_period_total'}     = $num->format_price( $budgetperiod->{'budget_period_total'} );
     $budgetperiod->{budget_active} = 1;
     push( @period_active_loop, $budgetperiod );
@@ -279,7 +275,6 @@ my $last = min( $first + $inactivepagesize - 1, scalar @{$results} - 1, );
 my @period_inactive_loop;
 foreach my $result ( @{$results}[ $first .. $last ] ) {
     my $budgetperiod = $result;
-    FormatData($budgetperiod);
     $budgetperiod->{'budget_period_total'} = $num->format_price( $budgetperiod->{'budget_period_total'} );
     $budgetperiod->{budget_active} = 1;
     push( @period_inactive_loop, $budgetperiod );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
index 5fe3466..e6a9afc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
@@ -1,3 +1,4 @@
+[% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
@@ -187,7 +188,7 @@
 
     <li>
     <label class="required" for="budget_period_startdate">Start date</label>
-    <input type="text" size="10" id="budget_period_startdate" name="budget_period_startdate"   value="[% budget_period_startdate %]"  />
+    <input type="text" size="10" id="budget_period_startdate" name="budget_period_startdate"   value="[% budget_period_startdate | $KohaDates %]"  />
     <img src="/intranet-tmpl/prog/en/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="Show start date calendar" />
     <script type="text/javascript">
         Calendar.setup({
@@ -203,7 +204,7 @@
     <li>
 
     <label class="required" for="budget_period_enddate">End date</label>
-    <input type="text" size="10" id="budget_period_enddate" name="budget_period_enddate" value="[% budget_period_enddate %]" />
+    <input type="text" size="10" id="budget_period_enddate" name="budget_period_enddate" value="[% budget_period_enddate | $KohaDates  %]" />
     <img src="/intranet-tmpl/prog/en/lib/calendar/cal.gif" border="0" id="openCalendarTo" style="cursor: pointer;" alt="Show end date calendar" />
 
     <script type="text/javascript">
@@ -246,7 +247,7 @@
     <ol>
     <li>
     <label class="required" for="budget_period_startdate">Start date</label>
-    <input type="text" size="10" id="budget_period_startdate" name="budget_period_startdate"   value="[% budget_period_startdate %]"  />
+    <input type="text" size="10" id="budget_period_startdate" name="budget_period_startdate"   value="[% budget_period_startdate | $KohaDates  %]"  />
     <img src="/intranet-tmpl/prog/en/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="Show start date calendar" />
     <script type="text/javascript">
         Calendar.setup({
@@ -262,7 +263,7 @@
     <li>
 
     <label class="required" for="budget_period_enddate">End date</label>
-    <input type="text" size="10" id="budget_period_enddate" name="budget_period_enddate" value="[% budget_period_enddate %]" />
+    <input type="text" size="10" id="budget_period_enddate" name="budget_period_enddate" value="[% budget_period_enddate | $KohaDates  %]" />
     <img src="/intranet-tmpl/prog/en/lib/calendar/cal.gif" border="0" id="openCalendarTo" style="cursor: pointer;" alt="Show end date calendar" />
 
     <script type="text/javascript">
@@ -368,9 +369,9 @@
       <table id="activeperiodst">
         <thead>
           <tr>
-            <th>Budget Name</th>
-            <th>Start Date</th>
-            <th>End Date</th>
+            <th>Budget name</th>
+            <th>Start date</th>
+            <th>End date</th>
             <th>Locked</th>
             <th>Total</th>
             <th>Actions</th>
@@ -380,8 +381,8 @@
             [% FOREACH period_active IN period_active_loop %]
               <tr>
               <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>
-              <td>[% period_active.budget_period_startdate %]</td>
-              <td>[% period_active.budget_period_enddate %]</td>
+              <td>[% period_active.budget_period_startdate | $KohaDates %]</td>
+              <td>[% period_active.budget_period_enddate | $KohaDates %]</td>
               <td>
                 [% IF ( period_active.budget_period_locked ) %]
                   <span style="color:green;">Locked</span>&nbsp;
@@ -423,8 +424,8 @@
                     <tr class="highlight">
                 [% END %]
                 <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>
-                <td>[% period_loo.budget_period_startdate %]</td>
-                <td>[% period_loo.budget_period_enddate %]</td>
+                <td>[% period_loo.budget_period_startdate | $KohaDates %]</td>
+                <td>[% period_loo.budget_period_enddate | $KohaDates %]</td>
                 <td> [% IF ( period_loo.budget_period_locked ) %]<span style="color:green;">Locked</span>&nbsp;[% ELSE %][% END %] </td>
                 <td align='right'>[% period_loo.budget_period_total %]</td>
                 <td>
-- 
1.7.9.5