]> git.koha-community.org Git - koha.git/commit
Bug 17872: Fix small error in GetBudgetHierarchy and one of its calls
authorMarcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tue, 10 Jan 2017 09:03:36 +0000 (10:03 +0100)
committerJulian Maurice <julian.maurice@biblibre.com>
Fri, 21 Apr 2017 11:09:57 +0000 (13:09 +0200)
commitcfe5a1b29d24e050357ccb8998d5dd16fd5c4568
tree6d8e5ed1806a0349ea70966a53947acd4a1eef9a
parent841b7173344d17e4320e6eedec39836d6924c8b1
Bug 17872: Fix small error in GetBudgetHierarchy and one of its calls

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>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 476179a12311b32643087cc8ec10c31409bb1b99)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 3079f7a72515a22062bd9a65ec546cfcd6d9bb66)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
C4/Budgets.pm
admin/aqbudgetperiods.pl
admin/aqbudgets.pl