Browse Source

Bug 5016: Fix some translation issues with English PDF order templates

Changes made:
- Instead of n° print no.
- Market Identification => Market identification
- GST => Tax

To test:
- Create at least 2 baskets with one or more orders
- Create a basket group with those baskets
- Print the PDF using
  - the 2 page layout
  - the 3 page layout
- Verify that the changes made appear and everything looks correct

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
20.05.x
Katrin Fischer 2 years ago
committed by Martin Renvoize
parent
commit
7472977655
Signed by: martin.renvoize GPG Key ID: 422B469130441A0F
  1. 2
      Koha/pdfformat/layout2pages.pm
  2. 4
      Koha/pdfformat/layout3pages.pm
  3. BIN
      koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.odt
  4. BIN
      koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.pdf
  5. BIN
      koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.odt
  6. BIN
      koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.pdf

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

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

BIN
koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.odt

Binary file not shown.

BIN
koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.pdf

Binary file not shown.

BIN
koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.odt

Binary file not shown.

BIN
koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.pdf

Binary file not shown.
Loading…
Cancel
Save