X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=admin%2Faqbudgets.pl;h=db99759639d7b5fff0dd72bf92a8ef6e2d9c21f9;hb=4913d3a1d7a024b846bbeafe98bbd133d2798533;hp=34a4021be1a756c724e128bedf6ce2ebcae4974e;hpb=b2fa851ccaca0d61d5de6c35752d368f540fb02e;p=koha_gimpoz

diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl
index 34a4021be1..db99759639 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');
 
@@ -62,20 +64,18 @@ my $show         = $input->param('show'); # SET TO 1, BY A FORM SUMBIT
 $show_mine       = $input->param('show_mine') if $show == 1;
 
 # IF USER DOESNT HAVE PERM FOR AN 'ADD', THEN REDIRECT TO THE DEFAULT VIEW...
-if  (  not defined $template->{param_map}->{'CAN_user_acquisition_budget_add_del'}  &&  $op ==  'add_form'  )   {
+if  (  not defined $template->{VARS}->{'CAN_user_acquisition_budget_add_del'}  &&  $op ==  'add_form'  )   {
     $op = '';
 }
-
 my $num=FormatNumber;
 
 my $script_name               = "/cgi-bin/koha/admin/aqbudgets.pl";
 my $budget_hash               = $input->Vars;
 my $budget_id                 = $$budget_hash{budget_id};
 my $budget_permission         = $input->param('budget_permission');
-my $budget_period_dropbox     = $input->param('budget_period_dropbox');
+my $filter_budgetbranch       = $input->param('filter_budgetbranch');
 #filtering non budget keys
 delete $$budget_hash{$_} foreach grep {/filter|^op$|show/} keys %$budget_hash;
-my $filter_budgetbranch       = $input->param('filter_budgetbranch');
 my $filter_budgetname         = $input->param('filter_budgetname');
 $template->param(
     notree => ($filter_budgetbranch or $show_mine)
@@ -90,7 +90,7 @@ $template->param(
 # ------- get periods stuff ------------------
 
 # USED FOR PERMISSION COMPARISON LATER
-my $borrower_id         = $template->{param_map}->{'USER_INFO'}[0]->{'borrowernumber'};
+my $borrower_id         = $template->{VARS}->{'USER_INFO'}[0]->{'borrowernumber'};
 my $user                = GetMemberDetails($borrower_id);
 my $user_branchcode     = $user->{'branchcode'};
 
@@ -121,7 +121,6 @@ $template->param(auth_cats_loop => GetBudgetAuthCats($$period{budget_period_id})
 # Used to create form to add or  modify a record
 if ($op eq 'add_form') {
 #### ------------------- ADD_FORM -------------------------
-
     # if no buget_id is passed then its an add
     #  pass the period_id to build the dropbox - because we only want to show  budgets from this period
     my $dropbox_disabled;
@@ -225,9 +224,7 @@ if ($op eq 'add_form') {
         }
     }
     my $branches = GetBranches();
-    my $budget_period_dropbox = GetBudgetPeriodsDropbox($$period{budget_period_id} );
     $template->param(
-        budget_period_dropbox     => $budget_period_dropbox,
         budget_id                 => $budget_id,
         %$period,
     );
@@ -249,7 +246,7 @@ if ($op eq 'add_form') {
         # PERMISSIONS
         unless($staffflags->{'superlibrarian'} % 2   == 1 ) {
             #IF NO PERMS, THEN DISABLE EDIT/DELETE
-            unless ( $template->{param_map}->{'CAN_user_acquisition_budget_modify'} ) {
+            unless ( $template->{VARS}->{'CAN_user_acquisition_budget_modify'} ) {
                 $budget->{'budget_lock'} = 1;
             }
             # check budget permission
@@ -323,7 +320,11 @@ if ($op eq 'add_form') {
         );
     }
 
-    my $budget_period_total = $num->format_price($$period{budget_period_total}) if $$period{budget_period_total};
+    my $budget_period_total;
+    if ( $period->{budget_period_total} ) {
+        $budget_period_total =
+          $num->format_price( $period->{budget_period_total} );
+    }
     $template->param(
         else                   => 1,
         budget                 => \@loop,