@@ -, +, @@ GetHierarchy --- C4/Budgets.pm | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) --- a/C4/Budgets.pm +++ a/C4/Budgets.pm @@ -573,12 +573,20 @@ sub GetBudgetHierarchy { GROUP BY shipmentcost_budgetid |, 'budget_id'); - my $recursiveAdd; - $recursiveAdd = sub { - my ($budget, $parent) = @_; + + foreach my $budget (@sort) { + if ($budget->{budget_parent_id} == undef) { + _recursiveAdd( $budget, undef, $hr_budget_spent, $hr_budget_spent_shipment, $hr_budget_ordered, $hr_budget_ordered_shipment ); + } + } + return \@sort; +} + +sub _recursiveAdd { + my ($budget, $parent, $hr_budget_spent, $hr_budget_spent_shipment, $hr_budget_ordered, $hr_budget_ordered_shipment ) = @_; foreach my $child (@{$budget->{children}}){ - $recursiveAdd->($child, $budget); + _recursiveAdd($child, $budget, $hr_budget_spent, $hr_budget_spent_shipment, $hr_budget_ordered, $hr_budget_ordered_shipment ); } $budget->{budget_spent} += $hr_budget_spent->{$budget->{budget_id}}->{budget_spent}; @@ -593,15 +601,6 @@ sub GetBudgetHierarchy { $parent->{total_spent} += $budget->{total_spent}; $parent->{total_ordered} += $budget->{total_ordered}; } - }; - - foreach my $budget (@sort) { - if ($budget->{budget_parent_id} == undef) { - $recursiveAdd->($budget); - } - } - - return \@sort; } # Recursive method to add a budget and its chidren to an array --