Bug 7267: Add account number to English PDF templates

To test:
- Switch system preference OrderPdfFormat to pdfformat::layout2pages
- Create one or more baskets with some orders each.
- Add all baskets to one basket group
- Print the basket group
- Check the account number from your vendor shows up with the other
  vendor details
- Repeat with pdfformat::layout3pages

Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 62151ced35329f94e4508b4973521464d48307c9)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b2dd833cc9860b00422ab4f3dd18fda646ff40e5)

diff --git a/acqui/pdfformat/layout2pages.pm b/acqui/pdfformat/layout2pages.pm
index 66e2ba0..335dc0a 100644 (file)
--- a/acqui/pdfformat/layout2pages.pm
+++ b/acqui/pdfformat/layout2pages.pm
@@ -208,6 +208,8 @@ sub printhead {
     $text->text($bookseller->{address2});
     $text->translate(100/mm, ($height-200)/mm);
     $text->text($bookseller->{address3});
+    $text->translate(100/mm, ($height-205)/mm);
+    $text->text($bookseller->{accountnumber});
     
     # print delivery infos
     $text->font( $pdf->corefont("Times-Bold", -encoding => "utf8"), 4/mm );

diff --git a/acqui/pdfformat/layout3pages.pm b/acqui/pdfformat/layout3pages.pm
index 7d00bd5..b9d10aa 100644 (file)
--- a/acqui/pdfformat/layout3pages.pm
+++ b/acqui/pdfformat/layout3pages.pm
@@ -381,6 +381,8 @@ sub printhead {
     $text->text($bookseller->{address2});
     $text->translate(100/mm,  ($height-200)/mm);
     $text->text($bookseller->{address3});
+    $text->translate(100/mm, ($height-205)/mm);
+    $text->text($bookseller->{accountnumber});
     
     # print delivery infos
     $text->font( $pdf->corefont("Times-Bold", -encoding => "utf8"), 4/mm );

diff --git a/koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.odt b/koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.odt
index e072883..ccae7c7 100644 (file)
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 59d0de8..6585b36 100644 (file)
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 8e91458..37c6593 100644 (file)
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 1560e78..33e4800 100644 (file)
Binary files a/koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.pdf and b/koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.pdf differ