Bug 12508: adding an error message if a contract cannot be removed

[koha_fer] / admin / aqbudgets.pl

diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl
index a307448..1a66c9c 100755 (executable)
--- a/admin/aqbudgets.pl
+++ b/admin/aqbudgets.pl
@@ -25,12 +25,13 @@ use CGI;
 use List::Util qw/min/;
 use Number::Format qw(format_price);
 
+use Koha::Database;
 use C4::Auth qw/get_user_subpermissions/;
 use C4::Branch; # GetBranches
 use C4::Dates qw/format_date format_date_in_iso/;
 use C4::Auth;
 use C4::Acquisition;
-use C4::Budgets;   #
+use C4::Budgets;
 use C4::Members;  # calls GetSortDetails()
 use C4::Context;
 use C4::Output;
@@ -68,14 +69,17 @@ if (not defined $template->{VARS}->{'CAN_user_acquisition_budget_add_del'}
 }
 my $num=FormatNumber;
 
-my $budget_hash               = $input->Vars;
-my $budget_id                 = $$budget_hash{budget_id};
+# get only the columns of aqbudgets in budget_hash
+my @columns = Koha::Database->new()->schema->source('Aqbudget')->columns;
+my $budget_hash = { map { join(' ',@columns) =~ /$_/ ? ( $_ => $input->param($_) )  : () } keys( %{$input->Vars()}) } ;
+
+my $budget_id                 = $input->param('budget_id');
 my $budget_period_id          = $input->param('budget_period_id');
 my $budget_permission         = $input->param('budget_permission');
+my $budget_users_ids          = $input->param('budget_users_ids');
 my $filter_budgetbranch       = $input->param('filter_budgetbranch') // '';
 my $filter_budgetname         = $input->param('filter_budgetname');
-#filtering non budget keys
-delete $$budget_hash{$_} foreach grep {/filter|^op$|show/} keys %$budget_hash;
+
 
 # ' ------- get periods stuff ------------------'
 # IF PERIODID IS DEFINED,  GET THE PERIOD - ELSE JUST GET THE ACTIVE PERIOD BY DEFAULT
@@ -234,11 +238,11 @@ if ($op eq 'add_form') {
     $op = 'list';
 } elsif( $op eq 'add_validate' ) {
     my @budgetusersid;
-    if (defined $$budget_hash{'budget_users_ids'}){
-        @budgetusersid = split(':', $budget_hash->{'budget_users_ids'});
+    if (defined $budget_users_ids){
+        @budgetusersid = split(':', $budget_users_ids);
     }
 
-    if ( defined $$budget_hash{budget_id} ) {
+    if (defined $budget_id) {
         if (CanUserModifyBudget($borrowernumber, $budget_hash->{budget_id},
             $staffflags)
         ) {
@@ -273,9 +277,6 @@ if ( $op eq 'list' ) {
        #This Looks WEIRD to me : should budgets be filtered in such a way ppl who donot own it would not see the amount spent on the budget by others ?
 
     foreach my $budget (@budgets) {
-        #Level and sublevels total spent and ordered
-        $budget->{total_spent} = $budget->{budget_spent_sublevels} + $budget->{budget_spent};
-        $budget->{total_ordered} = $budget->{budget_ordered_sublevels} + $budget->{budget_ordered};
         # PERMISSIONS
         unless(CanUserModifyBudget($borrowernumber, $budget, $staffflags)) {
             $budget->{'budget_lock'} = 1;