Bug 22789: Set non_priority column as boolean in schema

[koha-ffzg.git] / acqui / neworderempty.pl

diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index 29acca7..d9505d1 100755 (executable)
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -60,8 +60,6 @@ if this order comes from a suggestion.
 =item breedingid
 the item's id in the breeding reservoir
 
-=item close
-
 =back
 
 =cut
@@ -106,15 +104,12 @@ my $ordernumber          = $input->param('ordernumber') || '';
 our $biblionumber    = $input->param('biblionumber');
 our $basketno        = $input->param('basketno');
 my $suggestionid    = $input->param('suggestionid');
-my $close           = $input->param('close');
 my $uncertainprice  = $input->param('uncertainprice');
 my $import_batch_id = $input->param('import_batch_id'); # if this is filled, we come from a staged file, and we will return here after saving the order !
 my $from_subscriptionid  = $input->param('from_subscriptionid');
 my $data;
 my $new = 'no';
 
-my $budget_name;
-
 our ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
     {
         template_name   => "acqui/neworderempty.tt",
@@ -168,12 +163,13 @@ if ( $ordernumber eq '' and defined $params->{'breedingid'}){
         exit;
     }
     #from this point: add a new record
-        my $bibitemnum;
-        $params->{'frameworkcode'} or $params->{'frameworkcode'} = "";
-        ( $biblionumber, $bibitemnum ) = AddBiblio( $marcrecord, $params->{'frameworkcode'} );
-        # get the price if there is one.
-        $listprice = GetMarcPrice($marcrecord, $marcflavour);
-        SetImportRecordStatus($params->{'breedingid'}, 'imported');
+    C4::Acquisition::FillWithDefaultValues($marcrecord, {only_mandatory => 1});
+    my $bibitemnum;
+    $params->{'frameworkcode'} or $params->{'frameworkcode'} = "";
+    ( $biblionumber, $bibitemnum ) = AddBiblio( $marcrecord, $params->{'frameworkcode'} );
+    # get the price if there is one.
+    $listprice = GetMarcPrice($marcrecord, $marcflavour);
+    SetImportRecordStatus($params->{'breedingid'}, 'imported');
 }
 
 
@@ -230,14 +226,16 @@ if ( not $ordernumber ) {    # create order
                     }
                 }
 
-                if ( $value eq '' ) {
+                if ( $value ) {
 
-                    # get today date & replace <<YYYY>>, <<MM>>, <<DD>> if provided in the default value
+                    # get today date & replace <<YYYY>>, <<YY>>, <<MM>>, <<DD>> if provided in the default value
                     my $today_dt = dt_from_string;
                     my $year     = $today_dt->strftime('%Y');
+                    my $shortyear = $today_dt->strftime('%y');
                     my $month    = $today_dt->strftime('%m');
                     my $day      = $today_dt->strftime('%d');
                     $value =~ s/<<YYYY>>/$year/g;
+                    $value =~ s/<<YY>>/$shortyear/g;
                     $value =~ s/<<MM>>/$month/g;
                     $value =~ s/<<DD>>/$day/g;
 
@@ -260,7 +258,6 @@ if ( not $ordernumber ) {    # create order
 }
 else {    #modify order
     $data   = GetOrder($ordernumber);
-    $biblionumber = $data->{'biblionumber'};
     $budget_id = $data->{'budget_id'};
 
     $template->param(
@@ -277,6 +274,7 @@ else {    #modify order
         push @order_users, $order_patron if $order_patron;
     }
 }
+$biblionumber = $data->{biblionumber};
 
 # We can have:
 # - no ordernumber but a biblionumber: from a subscription, from an existing record
@@ -324,9 +322,6 @@ my $budget_loop = [];
 my $budgets = GetBudgetHierarchy;
 foreach my $r (@{$budgets}) {
     next unless (CanUserUseBudget($patron, $r, $userflags));
-    if (!defined $r->{budget_amount} || $r->{budget_amount} <0) {
-        next;
-    }
     push @{$budget_loop}, {
         b_id  => $r->{budget_id},
         b_txt => $r->{budget_name},
@@ -338,11 +333,6 @@ foreach my $r (@{$budgets}) {
     };
 }
 
-if ($close) {
-    $budget_id      =  $data->{'budget_id'};
-    $budget_name    =   $budget->{'budget_name'};
-
-}
 
 $template->param( sort1 => $data->{'sort1'} );
 $template->param( sort2 => $data->{'sort2'} );
@@ -364,8 +354,19 @@ my @itemtypes;
 @itemtypes = Koha::ItemTypes->search unless C4::Context->preference('item-level_itypes');
 
 if ( defined $from_subscriptionid ) {
-    my $lastOrderReceived = GetLastOrderReceivedFromSubscriptionid $from_subscriptionid;
-    if ( defined $lastOrderReceived ) {
+    # Get the last received order for this subscription
+    my $lastOrderReceived = Koha::Acquisition::Orders->search(
+        {
+            subscriptionid => $from_subscriptionid,
+            datereceived   => { '!=' => undef }
+        },
+        {
+            order_by =>
+              [ { -desc => 'datereceived' }, { -desc => 'ordernumber' } ]
+        }
+    );
+    if ( $lastOrderReceived->count ) {
+        $lastOrderReceived = $lastOrderReceived->next->unblessed; # FIXME We should send the object to the template
         $budget_id              = $lastOrderReceived->{budgetid};
         $data->{listprice}      = $lastOrderReceived->{listprice};
         $data->{uncertainprice} = $lastOrderReceived->{uncertainprice};
@@ -375,6 +376,7 @@ if ( defined $from_subscriptionid ) {
         $data->{replacementprice} = $lastOrderReceived->{replacementprice};
         $data->{ecost}          = $lastOrderReceived->{ecost};
         $data->{quantity}       = $lastOrderReceived->{quantity};
+        $data->{unitprice}       = $lastOrderReceived->{unitprice};
         $data->{order_internalnote} = $lastOrderReceived->{order_internalnote};
         $data->{order_vendornote}   = $lastOrderReceived->{order_vendornote};
         $data->{sort1}          = $lastOrderReceived->{sort1};
@@ -393,12 +395,6 @@ if ( defined $from_subscriptionid ) {
 # Find the items.barcode subfield for barcode validations
 my (undef, $barcode_subfield) = GetMarcFromKohaField( 'items.barcode' );
 
-# fill template
-$template->param(
-    close        => $close,
-    budget_id    => $budget_id,
-    budget_name  => $budget_name
-) if ($close);
 
 # get option values for gist syspref
 my @gst_values = map {
@@ -410,6 +406,7 @@ my $quantity = $input->param('rr_quantity_to_order') ?
       $data->{'quantity'};
 $quantity //= 0;
 
+# fill template
 $template->param(
     existing         => $biblionumber,
     ordernumber           => $ordernumber,
@@ -465,6 +462,7 @@ $template->param(
     listprice        => sprintf( "%.2f", $data->{listprice} || $data->{price} || $listprice),
     total            => sprintf( "%.2f", ($data->{ecost} || 0) * ($data->{'quantity'} || 0) ),
     ecost            => sprintf( "%.2f", $data->{ecost} || 0),
+    unitprice        => sprintf( "%.2f", $data->{unitprice} || 0),
     publishercode    => $data->{'publishercode'},
     barcode_subfield => $barcode_subfield,
     import_batch_id  => $import_batch_id,