gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 14388: Funds should be sorted by budget_code 

Before this patch, the funds were sorted by budget_id, which does not
make any sense.

This patch adds a sort by budget_code on the fund list (acqui/acqui-home.pl and
admin/aqbudgets.pl)

Test plan:
On both pages (acqui/acqui-home.pl and admin/aqbudgets.pl) confirm that
the funds are now sorted by fund code (DB column budget_code)

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit e0032c46e9)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
This commit is contained in:
Jonathan Druart 2015-07-02 16:42:16 +01:00 committed by Frédéric Demians
parent eea56d4124
commit 1cd654313b
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
C4/Budgets.pm
View File

@ -529,8 +529,8 @@ sub GetBudgetHierarchy {
# link child to parent
my @first_parents;
foreach ( sort keys %links ) {
my $child = $links{$_};
foreach my $budget ( sort { $a->{budget_code} cmp $b->{budget_code} } values %links ) {
my $child = $links{$budget->{budget_id}};
if ( $child->{'budget_parent_id'} ) {
my $parent = $links{ $child->{'budget_parent_id'} };
if ($parent) {

24
t/db_dependent/Budgets.t
View File

@ -1,5 +1,5 @@
use Modern::Perl;
use Test::More tests => 120;
use Test::More tests => 122;
BEGIN {
use_ok('C4::Budgets')
@ -226,15 +226,6 @@ my $budget_id2 = AddBudget(
budget_amount => $budget_2_total,
}
);
my $budget_id11 = AddBudget(
{
budget_code => 'budget_11',
budget_name => 'budget_11',
budget_period_id => $budget_period_id,
budget_parent_id => $budget_id1,
budget_amount => $budget_11_total,
}
);
my $budget_id12 = AddBudget(
{
budget_code => 'budget_12',
@ -244,6 +235,15 @@ my $budget_id12 = AddBudget(
budget_amount => $budget_12_total,
}
);
my $budget_id11 = AddBudget(
{
budget_code => 'budget_11',
budget_name => 'budget_11',
budget_period_id => $budget_period_id,
budget_parent_id => $budget_id1,
budget_amount => $budget_11_total,
}
);
my $budget_id111 = AddBudget(
{
budget_code => 'budget_111',
@ -424,6 +424,10 @@ $budget_period_id_cloned = C4::Budgets::CloneBudgetPeriod(
}
);
$budget_hierarchy = GetBudgetHierarchy($budget_period_id);
is( $budget_hierarchy->[0]->{children}->[0]->{budget_name}, 'budget_11', 'GetBudgetHierarchy should return budgets ordered by name, first child is budget_11' );
is( $budget_hierarchy->[0]->{children}->[1]->{budget_name}, 'budget_12', 'GetBudgetHierarchy should return budgets ordered by name, second child is budget_12' );
$budget_hierarchy = GetBudgetHierarchy($budget_period_id);
$budget_hierarchy_cloned = GetBudgetHierarchy($budget_period_id_cloned);