@@ -, +, @@
like new order form
---
acqui/parcels.pl | 24 +++++++++++++++-----
.../prog/en/modules/acqui/neworderempty.tt | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 23 ++++++++++++++++++-
3 files changed, 41 insertions(+), 8 deletions(-)
--- a/acqui/parcels.pl
+++ a/acqui/parcels.pl
@@ -179,13 +179,25 @@ if ($count_parcels) {
$template->param( searchresults => $loopres, count => $count_parcels );
}
-my $budgets = GetBudgets();
-my @budgets_loop;
-foreach my $budget (@$budgets) {
- next unless CanUserUseBudget($loggedinuser, $budget, $flags);
- push @budgets_loop, $budget;
+# build budget list
+my $budget_loop = [];
+my $budgets = GetBudgetHierarchy;
+foreach my $r (@{$budgets}) {
+ next unless (CanUserUseBudget($loggedinuser, $r, $flags));
+ if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) {
+ next;
+ }
+ push @{$budget_loop}, {
+ b_id => $r->{budget_id},
+ b_txt => $r->{budget_name},
+ b_active => $r->{budget_period_active},
+ };
}
+@{$budget_loop} =
+ sort { uc( $a->{b_txt}) cmp uc( $b->{b_txt}) } @{$budget_loop};
+
+
$template->param(
orderby => $order,
filter => $code,
@@ -196,7 +208,7 @@ $template->param(
shipmentdate_today => C4::Dates->new()->output(),
booksellerid => $booksellerid,
GST => C4::Context->preference('gist'),
- budgets => \@budgets_loop,
+ budgets => $budget_loop,
);
output_html_with_http_headers $input, $cookie, $template->output;
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -426,7 +426,7 @@ $(document).ready(function()
[% ELSE %]
[% IF ( budget_loo.b_active ) %]
- [% ELSE %]
+ [% ELSE %]
[% END %]
[% END %]
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -16,6 +16,20 @@
var parcelst = $("#parcelst").dataTable($.extend(true, {}, dataTablesDefaults, {
"sPaginationType": "four_button"
} ) );
+
+ //keep a copy of all budgets before removing the inactives
+ var budgetId = $("#shipmentcost_budgetid");
+ var disabledBudgetsCopy = budgetId.html();
+ $('.b_inactive').remove();
+
+ $('#showallfunds').click(function() {
+ if ($(this).is(":checked")) {
+ budgetId.html(disabledBudgetsCopy); //Puts back all the funds
+ }
+ else {
+ $('.b_inactive').remove();
+ }
+ });
});
//]]>
@@ -172,9 +186,16 @@
+
+
+
--