Bug 18115 - Fix use of Objects as hashref in acqui/addorderiso2709.pl - Bug 15503...

Fix use of 'gstrate' for 'tax_rate'

Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>

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 );
                     }
                 }

diff --git a/t/db_dependent/Acquisition/OrderUsers.t b/t/db_dependent/Acquisition/OrderUsers.t
index 4a50440..b63f5a2 100644 (file)
--- a/t/db_dependent/Acquisition/OrderUsers.t
+++ b/t/db_dependent/Acquisition/OrderUsers.t
@@ -50,7 +50,6 @@ my $order = Koha::Acquisition::Order->new(
         entrydate        => '01-01-2014',
         currency         => 'EUR',
         notes            => "This is a note1",
-        gstrate          => 0.0500,
         orderstatus      => 1,
         quantityreceived => 0,
         rrp              => 10,