Bug 13321: Rename variables

[koha.git] / acqui / pdfformat / layout2pages.pm

diff --git a/acqui/pdfformat/layout2pages.pm b/acqui/pdfformat/layout2pages.pm
index 55213aa..d2fd2cd 100644 (file)
--- a/acqui/pdfformat/layout2pages.pm
+++ b/acqui/pdfformat/layout2pages.pm
@@ -22,7 +22,7 @@
 
 #you can use any PDF::API2 module, all you need to do is return the stringifyed pdf object from the printpdf sub.
 package pdfformat::layout2pages;
-use vars qw($VERSION @ISA @EXPORT);
+use vars qw(@ISA @EXPORT);
 use MIME::Base64;
 use strict;
 use warnings;
@@ -34,9 +34,7 @@ use Koha::Libraries;
 
 BEGIN {
          use Exporter   ();
-         our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
-       # set the version for version checking
-         $VERSION     = 1.00;
+         our (@ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
        @ISA    = qw(Exporter);
        @EXPORT = qw(printpdf);
 }
@@ -98,11 +96,11 @@ sub printorders {
                 $basket->{basketno},
                 $titleinfo. ($line->{order_vendornote} ? "\n----------------\nNote for vendor : " . $line->{order_vendornote} : '' ),
                 $line->{quantity},
-                Koha::Number::Price->new( $line->{rrpgsti} )->format,
+                Koha::Number::Price->new( $line->{rrp_tax_included} )->format,
                 Koha::Number::Price->new( $line->{discount} )->format . '%',
-                Koha::Number::Price->new( $line->{gstrate} * 100 )->format . '%',
-                Koha::Number::Price->new( $line->{totalgste} )->format,
-                Koha::Number::Price->new( $line->{totalgsti} )->format,
+                Koha::Number::Price->new( $line->{tax_rate} * 100 )->format . '%',
+                Koha::Number::Price->new( $line->{total_tax_excluded} )->format,
+                Koha::Number::Price->new( $line->{total_tax_included} )->format,
             );
             push(@$abaskets, $arrbasket);
         }