Bug 18980: Add js to dynamically show/hide the Anyone remark

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

diff --git a/acqui/pdfformat/layout2pagesde.pm b/acqui/pdfformat/layout2pagesde.pm
index a514eec..08924d3 100644 (file)
--- a/acqui/pdfformat/layout2pagesde.pm
+++ b/acqui/pdfformat/layout2pagesde.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::layout2pagesde;
-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----------------\nLieferantennotiz : ". $line->{order_vendornote} : '' ),                $line->{quantity},
                 $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);
         }
@@ -201,17 +199,17 @@ sub printhead {
     
     # print bookseller infos
     $text->translate(100/mm, ($height-180)/mm);
-    $text->text($bookseller->{name});
+    $text->text($bookseller->name);
     $text->translate(100/mm, ($height-185)/mm);
-    $text->text($bookseller->{postal});
+    $text->text($bookseller->postal);
     $text->translate(100/mm, ($height-190)/mm);
-    $text->text($bookseller->{address1});
+    $text->text($bookseller->address1);
     $text->translate(100/mm, ($height-195)/mm);
-    $text->text($bookseller->{address2});
+    $text->text($bookseller->address2);
     $text->translate(100/mm, ($height-200)/mm);
-    $text->text($bookseller->{address3});
+    $text->text($bookseller->address3);
     $text->translate(100/mm, ($height-205)/mm);
-    $text->text($bookseller->{accountnumber});
+    $text->text($bookseller->accountnumber);
     
     # print delivery infos
     $text->font( $pdf->corefont("Times-Bold", -encoding => "utf8"), 4/mm );