From 4db0093468c407a05725a24486fabb77b1c5b4ee Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 15 Mar 2013 11:20:45 +0100 Subject: [PATCH] Bug 9822: Alert on adding an order to a basket if budget has exceeded 2 DB fields are not used: aqbudgets.encumb and aqbudgets.expend. This patch uses these fields in order to show a warning message if the budget selected for an order has exceeded. Test plan: - Create a new active fund with at least 1 of both warning fields ('Warning at (%)' and 'Warning at (amount)'). - Create a new order for a basket with this new fund and a cost > warning amount defined for the fund (or using %). - Save and check that a warning message appears - Retry playing with all combinations of warning fields --- acqui/addorder.pl | 74 +++++++++++++++++++- admin/aqbudgets.pl | 2 +- .../prog/en/modules/acqui/addorder.tt | 41 +++++++++++ .../prog/en/modules/admin/aqbudgets.tt | 14 ++-- 4 files changed, 123 insertions(+), 8 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt diff --git a/acqui/addorder.pl b/acqui/addorder.pl index 3fa7620..cbad0d3 100755 --- a/acqui/addorder.pl +++ b/acqui/addorder.pl @@ -126,6 +126,7 @@ use C4::Auth; # get_template_and_user use C4::Acquisition; # NewOrder DelOrder ModOrder use C4::Suggestions; # ModStatus use C4::Biblio; # AddBiblio TransformKohaToMarc +use C4::Budgets; use C4::Items; use C4::Output; @@ -135,7 +136,78 @@ use C4::Output; # not just blindly call C4 functions and print a redirect. my $input = new CGI; -### $input + +# Check if order total amount exceed allowed budget +my $confirm_budget_exceeding = $input->param('confirm_budget_exceeding'); +unless($confirm_budget_exceeding) { + my $budget_id = $input->param('budget_id'); + my $total = $input->param('total'); + my $budget = GetBudget($budget_id); + my $budget_spent = GetBudgetSpent($budget_id); + my $budget_ordered = GetBudgetOrdered($budget_id); + my $budget_used = $budget_spent + $budget_ordered; + my $budget_remaining = $budget->{budget_amount} - $budget_used; + my $budget_encumbrance = $budget->{budget_amount} * $budget->{budget_encumb} / 100; + my $budget_expenditure = $budget->{budget_expend}; + + if ( $total > $budget_remaining + || ( ($budget_encumbrance+0) && ($budget_used + $total) > $budget_encumbrance) + || ( ($budget_expenditure+0) && ($budget_used + $total) > $budget_expenditure) ) + { + my ($template, $loggedinuser, $cookie) = get_template_and_user({ + template_name => "acqui/addorder.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => {acquisition => 'order_manage'}, + }); + + my $url = $input->referer(); + unless ( defined $url ) { + my $basketno = $input->param('basketno'); + $url = "/cgi-bin/koha/acqui/basket.pl?basketno=$basketno"; + } + + my $vars = $input->Vars; + my @vars_loop; + foreach (keys %$vars) { + push @vars_loop, { + name => $_, + values => [$input->param($_)], + }; + } + + if( ($budget_encumbrance+0) && ($budget_used + $total) > $budget_encumbrance + && $total <= $budget_remaining) + { + $template->param( + encumbrance_exceeded => 1, + encumbrance => sprintf("%.2f", $budget->{'budget_encumb'}), + ); + } + if( ($budget_expenditure+0) && ($budget_used + $total) > $budget_expenditure + && $total <= $budget_remaining ) + { + my $currency = GetCurrency; + $template->param( + expenditure_exceeded => 1, + expenditure => sprintf("%.2f", $budget_expenditure), + currency => ($currency) ? $currency->{'symbol'} : '', + ); + } + if($total > $budget_remaining){ + $template->param(budget_exceeded => 1); + } + + $template->param( + not_enough_budget => 1, + referer => $url, + vars_loop => \@vars_loop, + ); + output_html_with_http_headers $input, $cookie, $template->output; + exit; + } +} # get_template_and_user used only to check auth & get user id my ( $template, $loggedinuser, $cookie ) = get_template_and_user( diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl index c5f99e3..d232976 100755 --- a/admin/aqbudgets.pl +++ b/admin/aqbudgets.pl @@ -137,7 +137,7 @@ if ($op eq 'add_form') { $dropbox_disabled = BudgetHasChildren($budget_id); my $borrower = &GetMember( borrowernumber=>$budget->{budget_owner_id} ); $budget->{budget_owner_name} = $borrower->{'firstname'} . ' ' . $borrower->{'surname'}; - $$budget{$_}= sprintf("%.2f", $budget->{$_}) for grep{/amount/} keys %$budget; + $$budget{$_}= sprintf("%.2f", $budget->{$_}) for grep{ /amount|encumb|expend/ } keys %$budget; } # build budget hierarchy diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt new file mode 100644 index 0000000..8684b88 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt @@ -0,0 +1,41 @@ +[% INCLUDE "doc-head-open.inc" %] +Koha › Acquisition › Add order +[% INCLUDE "doc-head-close.inc" %] + + + +[% INCLUDE "header.inc" %] + +
+ +
+
+
+ [% IF (not_enough_budget) %] +
+ [% FOREACH var IN vars_loop %] + [% FOREACH val IN var.values %] + + [% END %] + [% END %] + +
+ [% IF (budget_exceeded) %] +

Warning! Order total amount exceeds allowed budget.

+ [% END %] + [% IF (encumbrance_exceeded) %] +

Warning! You will exceed [% encumbrance %]% of your fund.

+ [% END %] + [% IF (expenditure_exceeded) %] +

Warning! You will exceed maximum limit ([% expenditure %][% IF (currency) %] [% currency %][% END %]) for your fund.

+ [% END %] +

Do you want to confirm this order?

+ + +
+
+ [% END %] +
+
+
+[% INCLUDE "intranet-bottom.inc" %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index af0f086..a45a8bd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -341,14 +341,16 @@ -
  • - - +
  • + + + 0 to disable
    • -
  • - - +
  • + + + 0 to disable
  • -- 1.7.10.4