Bug 5084 - hide funds that are part of an inactive budget

Prevents inactive funds from showing in the aquisitions module, they
still show in the administration.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

diff --git a/C4/Budgets.pm b/C4/Budgets.pm
index 005bba8..0882756 100644 (file)
--- a/C4/Budgets.pm
+++ b/C4/Budgets.pm
@@ -492,9 +492,13 @@ sub GetBudgetHierarchy {
        my $dbh   = C4::Context->dbh;
        my $query = qq|
                     SELECT aqbudgets.*
-                    FROM aqbudgets |;
-    # show only period X if requested
+                    FROM aqbudgets 
+                    LEFT JOIN aqbudgetperiods 
+                    ON aqbudgetperiods.budget_period_id=aqbudgets.budget_period_id |;
        my @where_strings;
+    # Pick out the active ones
+    push @where_strings, 'aqbudgetperiods.budget_period_active=1';
+    # show only period X if requested
     if ($budget_period_id) {
         push @where_strings," aqbudgets.budget_period_id = ?";
         push @bind_params, $budget_period_id;