Bug 17708: Fix use statements

[koha.git] / acqui / addorderiso2709.pl

diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
index 18ba56e..24dc8e5 100755 (executable)
--- a/acqui/addorderiso2709.pl
+++ b/acqui/addorderiso2709.pl
@@ -259,9 +259,9 @@ if ($op eq ""){
                         # in this case, the price will be x100 when unformatted ! Replace the . by a , to get a proper price calculation
                         $price =~ s/\./,/ if C4::Context->preference("CurrencyFormat") eq "FR";
                         $price = Koha::Number::Price->new($price)->unformat;
-                        $orderinfo{gstrate} = $bookseller->{gstrate};
-                        my $c = $c_discount ? $c_discount : $bookseller->{discount} / 100;
-                        if ( $bookseller->{listincgst} ) {
+                        $orderinfo{tax_rate} = $bookseller->tax_rate;
+                        my $c = $c_discount ? $c_discount : $bookseller->discount / 100;
+                        if ( $bookseller->listincgst ) {
                             if ( $c_discount ) {
                                 $orderinfo{ecost} = $price;
                                 $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
@@ -271,10 +271,10 @@ if ($op eq ""){
                             }
                         } else {
                             if ( $c_discount ) {
-                                $orderinfo{ecost} = $price / ( 1 + $orderinfo{gstrate} );
+                                $orderinfo{ecost} = $price / ( 1 + $orderinfo{tax_rate} );
                                 $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
                             } else {
-                                $orderinfo{rrp}   = $price / ( 1 + $orderinfo{gstrate} );
+                                $orderinfo{rrp}   = $price / ( 1 + $orderinfo{tax_rate} );
                                 $orderinfo{ecost} = $orderinfo{rrp} * ( 1 - $c );
                             }
                         }
@@ -327,9 +327,9 @@ if ($op eq ""){
                 # in this case, the price will be x100 when unformatted ! Replace the . by a , to get a proper price calculation
                 $price =~ s/\./,/ if C4::Context->preference("CurrencyFormat") eq "FR";
                 $price = Koha::Number::Price->new($price)->unformat;
-                $orderinfo{gstrate} = $bookseller->{gstrate};
-                my $c = $c_discount ? $c_discount : $bookseller->{discount} / 100;
-                if ( $bookseller->{listincgst} ) {
+                $orderinfo{tax_rate} = $bookseller->tax_rate;
+                my $c = $c_discount ? $c_discount : $bookseller->discount / 100;
+                if ( $bookseller->listincgst ) {
                     if ( $c_discount ) {
                         $orderinfo{ecost} = $price;
                         $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
@@ -339,10 +339,10 @@ if ($op eq ""){
                     }
                 } else {
                     if ( $c_discount ) {
-                        $orderinfo{ecost} = $price / ( 1 + $orderinfo{gstrate} );
+                        $orderinfo{ecost} = $price / ( 1 + $orderinfo{tax_rate} );
                         $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
                     } else {
-                        $orderinfo{rrp}   = $price / ( 1 + $orderinfo{gstrate} );
+                        $orderinfo{rrp}   = $price / ( 1 + $orderinfo{tax_rate} );
                         $orderinfo{ecost} = $orderinfo{rrp} * ( 1 - $c );
                     }
                 }