From b9bd5cf119f23e8d89d5cf64b6963770f9861494 Mon Sep 17 00:00:00 2001 From: Christophe Croullebois Date: Thu, 21 Oct 2010 11:10:07 +0200 Subject: [PATCH] [SIGNED-OFF] Bug 5962 : Budgets showing when they shouldn't (MT #4717) Bug in Koha 3.2 on acqui-home.pl Content-Type: text/plain; charset="utf-8" In the screen all the budgets with budget_branchcode=NULL were displayed even if the budget_owner_id was not NULL. This patch fixes the bug Signed-off-by: Katrin Fischer To test: 1) Add a new fund, leave library empty, owned by yourself 2) Go into the database and change aqbudgets.budget_branchcode to be NULL 3) Check acq home. Before patch the fund will not show up, although it's owned by you. After patch it will. --- C4/Budgets.pm | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/C4/Budgets.pm b/C4/Budgets.pm index 0882756..9d3e94b 100644 --- a/C4/Budgets.pm +++ b/C4/Budgets.pm @@ -506,8 +506,9 @@ sub GetBudgetHierarchy { # show only budgets owned by me, my branch or everyone if ($owner) { if ($branchcode) { - push @where_strings,qq{ (budget_owner_id = ? OR budget_branchcode = ? OR (budget_branchcode IS NULL or budget_branchcode="" AND (budget_owner_id IS NULL OR budget_owner_id="")))}; - push @bind_params, ($owner, $branchcode); + push @where_strings, + qq{ (budget_owner_id = ? OR budget_branchcode = ? OR ((budget_branchcode IS NULL or budget_branchcode="") AND (budget_owner_id IS NULL OR budget_owner_id="")))}; + push @bind_params, ( $owner, $branchcode ); } else { push @where_strings, ' (budget_owner_id = ? OR budget_owner_id IS NULL or budget_owner_id ="") '; push @bind_params, $owner; -- 1.7.1