From 3726ce6c6208f89cd70e59e01e081fba59744605 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 14 Apr 2013 16:29:40 +0200 Subject: [PATCH] Bug 10023: Change degree notation for number to No. This patch changes N to No. in three templates. To test: 1) Search for a vendor with visible baskets. Check that the first column of the basket table in the is now labelled No. 2) Print a PDF order in acquisitons with layout2pages. 3) Print a PDF oder in acquisitons with layout3pages. Check both generated PDFs for the correct syntax. Note: you need to switch the system preference OrderPdfFormat in order to test 2) and 3). The 2 possible settings are: pdfformat::layout3pages pdfformat::layout2pages It's not only Koha - git bz doesn't like the degree notation either. Signed-off-by: Owen Leonard I prefer "No." over "#" and my survey of the templates shows that "No." appears more often. Looks like something to add to our style guide. Passed-QA-by: Marcel de Rooy Signed-off-by: Jared Camins-Esakov (cherry picked from commit 7d3d347774cf44c02ca133798ead8c99849699ed) Signed-off-by: Jared Camins-Esakov --- acqui/pdfformat/layout2pages.pm | 2 +- acqui/pdfformat/layout3pages.pm | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/acqui/pdfformat/layout2pages.pm b/acqui/pdfformat/layout2pages.pm index 88accddbd6..66e2ba03d7 100644 --- a/acqui/pdfformat/layout2pages.pm +++ b/acqui/pdfformat/layout2pages.pm @@ -82,7 +82,7 @@ sub printorders { my $abaskets; my $arrbasket; - my @keys = ('Basket#', 'Document', 'Qty', 'RRP tax inc.', 'Discount', 'GST', 'Total tax exc.', 'Total tax inc.'); + my @keys = ('Basket (No.)', 'Document', 'Qty', 'RRP tax inc.', 'Discount', 'GST', 'Total tax exc.', 'Total tax inc.'); for my $bkey (@keys) { push(@$arrbasket, $bkey); } diff --git a/acqui/pdfformat/layout3pages.pm b/acqui/pdfformat/layout3pages.pm index 47fb37ab57..aabf2a498b 100644 --- a/acqui/pdfformat/layout3pages.pm +++ b/acqui/pdfformat/layout3pages.pm @@ -92,7 +92,7 @@ sub printorders { # add basketgroup number $text->font( $pdf->corefont("Times", -encoding => "utf8"), 6/mm ); $text->translate(20/mm, ($height-15)/mm); - $text->text("Order# ".$basketgroup->{'id'}.". Basket# ".$basket->{basketno}.". ".$basket->{booksellernote}); + $text->text("Order no. ".$basketgroup->{'id'}.". Basket no. ".$basket->{basketno}.". ".$basket->{booksellernote}); $text->translate(20/mm, ($height-20)/mm); $text->font( $pdf->corefont("Times", -encoding => "utf8"), 4/mm ); $text->text( ( $basket->{billingplace} ? "Billing at " . C4::Branch::GetBranchName( $basket->{billingplace} ) : "" ) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index 1f0cc101d5..9aaf34e539 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -87,7 +87,7 @@ $(document).ready(function() { - + -- 2.39.5
#No. Name Item count Biblio count