Bug 5549 : Daily loans should be due at 23:59

[koha.git] / acqui / addorder.pl

diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 94560c4..279084b 100755 (executable)
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -30,17 +30,21 @@ addorder.pl
 this script allows to add an order.
 It is called by :
 
+=over
+
 =item neworderbiblio.pl to add an order from nothing.
 
 =item neworderempty.pl to add an order from an existing biblio.
 
 =item newordersuggestion.pl to add an order from an existing suggestion.
 
+=back
+
 =head1 CGI PARAMETERS
 
 All of the cgi parameters below are related to the new order.
 
-=over 4
+=over
 
 =item C<ordernumber>
 the number of this new order.
@@ -148,6 +152,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 # get CGI parameters
 my $orderinfo                                  = $input->Vars;
 $orderinfo->{'list_price'}    ||=  0;
+$orderinfo->{'uncertainprice'} ||= 0;
 #my $ordernumber        = $input->param('ordernumber');
 #my $basketno      = $input->param('basketno');
 #my $booksellerid  = $input->param('booksellerid');
@@ -185,6 +190,7 @@ my $user          = $input->remote_user;
 # create if $quantity>=0 and $existing='no'
 # 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
@@ -199,13 +205,15 @@ if ( $orderinfo->{quantity} ne '0' ) {
                 "biblioitems.publishercode"   => $$orderinfo{publishercode}   ? $$orderinfo{publishercode} : "",
                 "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
                 "biblio.copyrightdate"        => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
+                "biblioitems.itemtype"        => $$orderinfo{itemtype} ? $$orderinfo{itemtype} : "",
+                "biblioitems.editionstatement"=> $$orderinfo{editionstatement} ? $$orderinfo{editionstatement} : "",
             });
 
         # create the record in catalogue, with framework ''
         my ($biblionumber,$bibitemnum) = AddBiblio($record,'');
         # change suggestion status if applicable
         if ($$orderinfo{suggestionid}) {
-            ModSuggestion( {suggestionid=>$$orderinfo{suggestionid}, status=>'ORDERED', biblionumber=>$biblionumber} );
+            ModSuggestion( {suggestionid=>$$orderinfo{suggestionid}, STATUS=>'ORDERED', biblionumber=>$biblionumber} );
         }
                $orderinfo->{biblioitemnumber}=$bibitemnum;
                $orderinfo->{biblionumber}=$biblionumber;
@@ -265,6 +273,9 @@ if ( $orderinfo->{quantity} ne '0' ) {
 else { # qty=0, delete the line
     my $biblionumber = $input->param('biblionumber');
     DelOrder( $biblionumber, $$orderinfo{ordernumber} );
+    if ($orderinfo->{delbiblio} == 1){
+     DelBiblio($biblionumber);
+    }
 }
 my $basketno=$$orderinfo{basketno};
 my $booksellerid=$$orderinfo{booksellerid};