From ed6ec7075a97e821c48f5655a618b418721fd4bf Mon Sep 17 00:00:00 2001 From: Jonathan Druart 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 --- 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' %] [% INCLUDE 'doc-head-close.inc' %] @@ -187,7 +188,7 @@
  • - + Show start date calendar