Bug 13321: Rename variables

[koha.git] / acqui / finishreceive.pl

diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl
index 111eadc..0a62887 100755 (executable)
--- a/acqui/finishreceive.pl
+++ b/acqui/finishreceive.pl
@@ -56,7 +56,6 @@ my $booksellerid     = $input->param('booksellerid');
 my $cnt              = 0;
 my $ecost            = $input->param('ecost');
 my $rrp              = $input->param('rrp');
-my $order_internalnote = $input->param("order_internalnote");
 my $bookfund         = $input->param("bookfund");
 my $order            = GetOrder($ordernumber);
 my $new_ordernumber  = $ordernumber;
@@ -83,40 +82,40 @@ if ($quantityrec > $origquantityrec ) {
         }
     }
 
+    $order->{order_internalnote} = $input->param("order_internalnote");
     $order->{rrp} = $rrp;
     $order->{ecost} = $ecost;
     $order->{unitprice} = $unitprice;
+
+    # FIXME is it still useful?
     my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
     if ( $bookseller->{listincgst} ) {
         if ( not $bookseller->{invoiceincgst} ) {
-            $order->{rrp} = $order->{rrp} * ( 1 + $order->{gstrate} );
-            $order->{ecost} = $order->{ecost} * ( 1 + $order->{gstrate} );
-            $order->{unitprice} = $order->{unitprice} * ( 1 + $order->{gstrate} );
+            $order->{rrp} = $order->{rrp} * ( 1 + $order->{tax_rate} );
+            $order->{ecost} = $order->{ecost} * ( 1 + $order->{tax_rate} );
+            $order->{unitprice} = $order->{unitprice} * ( 1 + $order->{tax_rate} );
         }
     } else {
         if ( $bookseller->{invoiceincgst} ) {
-            $order->{rrp} = $order->{rrp} / ( 1 + $order->{gstrate} );
-            $order->{ecost} = $order->{ecost} / ( 1 + $order->{gstrate} );
-            $order->{unitprice} = $order->{unitprice} / ( 1 + $order->{gstrate} );
+            $order->{rrp} = $order->{rrp} / ( 1 + $order->{tax_rate} );
+            $order->{ecost} = $order->{ecost} / ( 1 + $order->{tax_rate} );
+            $order->{unitprice} = $order->{unitprice} / ( 1 + $order->{tax_rate} );
         }
     }
 
     # save the quantity received.
     if ( $quantityrec > 0 ) {
-        ($datereceived, $new_ordernumber) = ModReceiveOrder({
-              biblionumber     => $biblionumber,
-              ordernumber      => $ordernumber,
-              quantityreceived => $quantityrec,
-              user             => $user,
-              cost             => $order->{unitprice},
-              ecost            => $order->{ecost},
-              invoiceid        => $invoiceid,
-              rrp              => $order->{rrp},
-              budget_id        => $bookfund,
-              datereceived     => $datereceived,
-              received_items   => \@received_items,
-              order_internalnote  => $order_internalnote,
-        } );
+        ( $datereceived, $new_ordernumber ) = ModReceiveOrder(
+            {
+                biblionumber     => $biblionumber,
+                order            => $order,
+                quantityreceived => $quantityrec,
+                user             => $user,
+                invoice          => $invoice,
+                budget_id        => $bookfund,
+                received_items   => \@received_items,
+            }
+        );
     }
 
     # now, add items if applicable