X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Faddorder.pl;h=1b05f07cc4513ee6ec4782baa2617e499e074abf;hb=568f32606c2c9c247b2b477193a2d6814f738fa6;hp=1dfa0b1e1cf471dd6345452ffb8a25632da9ef15;hpb=4f44847c11add59ab7d0c55aeffac1fa2835cc1f;p=koha.git

diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 1dfa0b1e1c..1b05f07cc4 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(
@@ -153,6 +225,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 my $orderinfo					= $input->Vars;
 $orderinfo->{'list_price'}    ||=  0;
 $orderinfo->{'uncertainprice'} ||= 0;
+$orderinfo->{subscriptionid} ||= undef;
 
 my $user = $input->remote_user;
 
@@ -161,7 +234,6 @@ my $user = $input->remote_user;
 # modify if $quantity>=0 and $existing='yes'
 # delete if $quantity has been set to 0 by the librarian
 # delete biblio if delbiblio has been set to 1 by the librarian
-my $bibitemnum;
 if ( $orderinfo->{quantity} ne '0' ) {
     #TODO:check to see if biblio exists
     unless ( $$orderinfo{biblionumber} ) {
@@ -193,8 +265,7 @@ if ( $orderinfo->{quantity} ne '0' ) {
         if ($$orderinfo{suggestionid}) {
             ModSuggestion( {suggestionid=>$$orderinfo{suggestionid}, STATUS=>'ORDERED', biblionumber=>$biblionumber} );
         }
-		$orderinfo->{biblioitemnumber}=$bibitemnum;
-		$orderinfo->{biblionumber}=$biblionumber;
+        $orderinfo->{biblionumber}=$biblionumber;
     }
 
     $orderinfo->{unitprice} = $orderinfo->{ecost} if not defined $orderinfo->{unitprice} or $orderinfo->{unitprice} eq '';
@@ -261,6 +332,8 @@ my $basketno=$$orderinfo{basketno};
 my $booksellerid=$$orderinfo{booksellerid};
 if (my $import_batch_id=$$orderinfo{import_batch_id}) {
     print $input->redirect("/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=$import_batch_id&basketno=$basketno&booksellerid=$booksellerid");
+} elsif ( defined $orderinfo->{invoiceid} ) {
+    print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=" . $orderinfo->{invoiceid});
 } else {
     print $input->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=$basketno");
 }