diff --git a/Koha/pdfformat/layout2pages.pm b/Koha/pdfformat/layout2pages.pm index 90537c37ea..dcb5ec731d 100644 --- a/Koha/pdfformat/layout2pages.pm +++ b/Koha/pdfformat/layout2pages.pm @@ -61,7 +61,7 @@ sub printorders { my $abaskets; my $arrbasket; - my @keys = ('Basket (No.)', 'Document', 'Qty', 'RRP tax inc.', 'Discount', 'GST', 'Total tax exc.', 'Total tax inc.'); + my @keys = ('Basket (no.)', 'Document', 'Qty', 'RRP tax inc.', 'Discount', 'Tax', 'Total tax exc.', 'Total tax inc.'); for my $bkey (@keys) { push(@$arrbasket, $bkey); } diff --git a/Koha/pdfformat/layout3pages.pm b/Koha/pdfformat/layout3pages.pm index 400a883720..78e698e29f 100644 --- a/Koha/pdfformat/layout3pages.pm +++ b/Koha/pdfformat/layout3pages.pm @@ -85,7 +85,7 @@ sub printorders { my $pdftable = new PDF::Table(); my $abaskets; my $arrbasket; - my @keys = ('Document', 'Qty', 'RRP tax exc.', 'RRP tax inc.', 'Discount', 'Discount price', 'GST rate', 'Total tax exc.', 'Total tax inc.'); + my @keys = ('Document', 'Qty', 'RRP tax exc.', 'RRP tax inc.', 'Discount', 'Discount price', 'Tax rate', 'Total tax exc.', 'Total tax inc.'); for my $bkey (@keys) { push(@$arrbasket, $bkey); } @@ -204,7 +204,7 @@ sub printbaskets { my $abaskets; my $arrbasket; # header of the table - my @keys = ('Lot', 'Basket (No.)','Total RRP tax exc.', 'Total RRP tax inc.', 'GST rate', 'GST', 'Total discount', 'Total tax exc.', 'Total tax inc.'); + my @keys = ('Lot', 'Basket (No.)','Total RRP tax exc.', 'Total RRP tax inc.', 'Tax rate', 'Tax', 'Total discount', 'Total tax exc.', 'Total tax inc.'); for my $bkey (@keys) { push(@$arrbasket, $bkey); } diff --git a/koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.odt b/koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.odt index ccae7c7994..67333a289e 100644 Binary files a/koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.odt and b/koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.odt differ diff --git a/koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.pdf b/koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.pdf index 6585b36371..c7d0817ec9 100644 Binary files a/koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.pdf and b/koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.pdf differ diff --git a/koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.odt b/koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.odt index 37c65933b7..b287c81fc3 100644 Binary files a/koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.odt and b/koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.odt differ diff --git a/koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.pdf b/koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.pdf index 33e4800607..78cb698777 100644 Binary files a/koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.pdf and b/koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.pdf differ