Bug 9822: Alert on adding an order to a basket if budget s 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

Signed-off-by: Koha Team Lyon 3 <koha@univ-lyon3.fr>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 42324aa..1b05f07 100755 (executable)
--- 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 f7dcc75..42a39f7 100755 (executable)
--- 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 (file)
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" %]
+<title>Koha &rsaquo; Acquisition &rsaquo; Add order</title>
+[% INCLUDE "doc-head-close.inc" %]
+</head>
+
+<body>
+[% INCLUDE "header.inc" %]
+
+<div id="doc3" class="yui-t7">
+
+<div id="bd">
+  <div id="yui-main">
+    <div class="yui-b">
+      [% IF (not_enough_budget) %]
+        <form action="/cgi-bin/koha/acqui/addorder.pl" method="post">
+          [% FOREACH var IN vars_loop %]
+            [% FOREACH val IN var.values %]
+              <input type="hidden" name="[% var.name %]" value="[% val |html %]" />
+            [% END %]
+          [% END %]
+          <input type="hidden" name="confirm_budget_exceeding" value="1" />
+          <div class="dialog">
+            [% IF (budget_exceeded) %]
+              <p>Warning! Order total amount exceeds allowed budget.</p>
+            [% END %]
+            [% IF (encumbrance_exceeded) %]
+              <p>Warning! You will exceed [% encumbrance %]% of your fund.</p>
+            [% END %]
+            [% IF (expenditure_exceeded) %]
+              <p>Warning! You will exceed maximum limit ([% expenditure %][% IF (currency) %] [% currency %][% END %]) for your fund.</p>
+            [% END %]
+            <p>Do you want to confirm this order?</p>
+            <input type="submit" class="approve" value="Yes, I confirm" />
+            <input type="button" class="deny" value="No, I don't confirm" onclick="window.location.href = '[% referer %]'" />
+          </div>
+        </form>
+      [% END %]
+    </div>
+  </div>
+</div>
+[% 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 0c62416..219a049 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -358,14 +358,16 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
     <input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount %]" size="8" />
     </li>
 
-    <li style="display:none;">
-    <label for="budget_encumb">Encumbrance: </label>
-    <input type="text" name="budget_encumb" id="budget_encumb" value="[% budget_encumb %]" size="8" />
+    <li>
+      <label for="budget_encumb">Warning at (%): </label>
+      <input type="text" name="budget_encumb" id="budget_encumb" value="[% budget_encumb %]" size="10" />
+      <span style="color:grey">0 to disable</span>
     </li>
 
-    <li style="display:none;">
-    <label for="budget_expend">Expenditure: </label>
-    <input type="text" name="budget_expend" id="budget_expend" value="[% budget_expend %]" size="8" />
+    <li>
+      <label for="budget_expend">Warning at (amount): </label>
+      <input type="text" name="budget_expend" id="budget_expend" value="[% budget_expend %]" size="10" /><input type="hidden" name="budget_owner_id" id="budget_owner_id" value="[% budget_owner_id %]" />
+      <span style="color:grey">0 to disable</span>
     </li>
 
     <li>