Bugzilla – Attachment 62066 Details for
Bug 17872
Fix small error in GetBudgetHierarchy and one of its calls
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17872: Fix small error in GetBudgetHierarchy and one of its calls
Bug-17872-Fix-small-error-in-GetBudgetHierarchy-an.patch (text/plain), 2.65 KB, created by
Jonathan Druart
on 2017-04-11 21:39:09 UTC
(
hide
)
Description:
Bug 17872: Fix small error in GetBudgetHierarchy and one of its calls
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2017-04-11 21:39:09 UTC
Size:
2.65 KB
patch
obsolete
>From 811467e77ec15b6f46b477fbcfc7d38297c84c64 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Tue, 10 Jan 2017 10:03:36 +0100 >Subject: [PATCH] Bug 17872: Fix small error in GetBudgetHierarchy and one of > its calls >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >In aqbudgetperiods.pl a commented line is removed that contains a >wrong userenv hash key. Should be branch instead of branchcode. > >In aqbudgets GetBudgetHierarchy is called with the same wrong userenv >hash key. Should be userenv->{branch}. >This made another bug visible: if you call GetBudgetHierarchy with a >branch and without owner, the where clause should take into account >that the branchcode can be empty (not null). > >Test plan: >[1] Run Budgets.t >[2] Run aqbudgets.pl from Administration >[3] Add the show_mine=1 parameter in the URL >[4] Change owner of one of the funds and repeat step 2 and 3. > >t/Budgets.t returns green. Followed test plan, works as expected. >Signed-off-by: Marc Véron <veron@veron.ch> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > C4/Budgets.pm | 2 +- > admin/aqbudgetperiods.pl | 2 -- > admin/aqbudgets.pl | 3 +-- > 3 files changed, 2 insertions(+), 5 deletions(-) > >diff --git a/C4/Budgets.pm b/C4/Budgets.pm >index cf2939f..c68fbec 100644 >--- a/C4/Budgets.pm >+++ b/C4/Budgets.pm >@@ -511,7 +511,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 7ce5783..ca2171f 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 483ff8f..97664df 100755 >--- a/admin/aqbudgets.pl >+++ b/admin/aqbudgets.pl >@@ -237,8 +237,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; >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17872
:
58723
|
62064
| 62066