[Koha-patches] [PATCH] Bug 5963: Modify GetBudgetsHierarchy to returns all funds

[Julian Maurice]

GetBudgetHierarchy now returns all funds, not only those that are part
of an active budget.
Fixed a layout problem.
---
 C4/Budgets.pm                                      |    1 -
 .../prog/en/modules/acqui/neworderempty.tmpl       |    4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/C4/Budgets.pm b/C4/Budgets.pm
index 2d86d07..85cdfe9 100644
--- a/C4/Budgets.pm
+++ b/C4/Budgets.pm
@@ -498,7 +498,6 @@ sub GetBudgetHierarchy {
     # show only period X if requested
 	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 = ?";
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index 60d0c30..fb57ff1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -311,7 +311,9 @@ $(document).ready(function()
                     <!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
                 </select>
-                <!--/TMPL_IF--> <span class="label">&nbsp;Show all :</span><input type="checkbox" id="showallbudgets" />
+                <label for="showallbudgets" style="float:none;width:auto;">&nbsp;Show all:</label>
+                <input type="checkbox" id="showallbudgets" />
+                <!--/TMPL_IF-->
             </li>
 		<li>
                 <!-- TMPL_IF name="close" -->
-- 
1.7.4.1