diff --git a/C4/Budgets.pm b/C4/Budgets.pm index d0c440025c..be6ec1c9ae 100644 --- a/C4/Budgets.pm +++ b/C4/Budgets.pm @@ -509,7 +509,7 @@ sub GetBudgetHierarchy { } } else { if ($branchcode) { - push @where_strings," (budget_branchcode =? or budget_branchcode is NULL)"; + push @where_strings," (budget_branchcode =? or budget_branchcode is NULL OR budget_branchcode='')"; push @bind_params, $branchcode; } } diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl index f7d8a46dec..afc53e0e59 100755 --- a/admin/aqbudgetperiods.pl +++ b/admin/aqbudgetperiods.pl @@ -198,8 +198,6 @@ elsif ( $op eq 'close_form' ) { my $budgets_to_move = GetBudgetHierarchy($budget_period_id); - # C4::Context->userenv->{branchcode}, $show_mine ? $borrower_id : '') - my $number_of_unreceived_orders = 0; for my $budget (@$budgets_to_move) { diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl index 0e6b744251..aacc861814 100755 --- a/admin/aqbudgets.pl +++ b/admin/aqbudgets.pl @@ -266,8 +266,7 @@ if ( $op eq 'list' ) { ); my @budgets = @{ - GetBudgetHierarchy($$period{budget_period_id}, - C4::Context->userenv->{branchcode}, $show_mine ? $borrower_id : '') + GetBudgetHierarchy( $$period{budget_period_id}, C4::Context->userenv->{branch}, ( $show_mine ? $borrower_id : 0 )) }; my $period_total = 0;