From 6bbf0d81939502532fcb1a1dfeebfb7c2c20229c Mon Sep 17 00:00:00 2001 From: Mathieu Saby Date: Sun, 18 May 2014 21:30:53 +0200 Subject: [PATCH] Bug 12110 [PATCH 2/2] QA followup : french and german translation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This followup - translates "vendor note" in french and german. - replaces "Notes for vendor" with "Note for vendor" in english template (as there can only be 1 note) - fixes a typo in french template (Qte => Qté, for "Quantité") Test plan : set OrderPdfFormat preference to "French 3-pages" Print a basketgroup containing an order with a vendornote, and check the note is displayed and introduced by "Notes pour le fournisseur" set OrderPdfFormat preference to "German 2-pages" Print a basketgroup containing an order with a vendornote, and check the note is displayed and introduced by "Lieferantennotiz" Signed-off-by: Jonathan Druart --- acqui/pdfformat/layout2pages.pm | 2 +- acqui/pdfformat/layout2pagesde.pm | 2 +- acqui/pdfformat/layout3pages.pm | 2 +- acqui/pdfformat/layout3pagesfr.pm | 5 ++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/acqui/pdfformat/layout2pages.pm b/acqui/pdfformat/layout2pages.pm index 0beae0f..29d6c4b 100644 --- a/acqui/pdfformat/layout2pages.pm +++ b/acqui/pdfformat/layout2pages.pm @@ -113,7 +113,7 @@ sub printorders { } push( @$arrbasket, $basket->{basketno}, - $titleinfo. ($line->{order_vendornote} ? "\n----------------\nNotes for vendor : " . $line->{order_vendornote} : '' ), + $titleinfo. ($line->{order_vendornote} ? "\n----------------\nNote for vendor : " . $line->{order_vendornote} : '' ), $line->{quantity}, $num->format_price($line->{rrpgsti}), $num->format_price($line->{discount}).'%', diff --git a/acqui/pdfformat/layout2pagesde.pm b/acqui/pdfformat/layout2pagesde.pm index d76b882..38a8400 100644 --- a/acqui/pdfformat/layout2pagesde.pm +++ b/acqui/pdfformat/layout2pagesde.pm @@ -113,7 +113,7 @@ sub printorders { } push( @$arrbasket, $basket->{basketno}, - $titleinfo, + $titleinfo. ($line->{order_vendornote} ? "\n----------------\nLieferantennotiz : ". $line->{order_vendornote} : '' ), $line->{quantity}, $line->{quantity}, $num->format_price($line->{rrpgsti}), $num->format_price($line->{discount}).'%', diff --git a/acqui/pdfformat/layout3pages.pm b/acqui/pdfformat/layout3pages.pm index 6ef8980..5640a1c 100644 --- a/acqui/pdfformat/layout3pages.pm +++ b/acqui/pdfformat/layout3pages.pm @@ -132,7 +132,7 @@ sub printorders { ( $line->{copyrightdate} ? ' '. $line->{copyrightdate} : ''); } push( @$arrbasket, - $titleinfo. ($line->{order_vendornote} ? "\n----------------\nNotes for vendor : " . $line->{order_vendornote} : '' ), + $titleinfo. ($line->{order_vendornote} ? "\n----------------\nNote for vendor : " . $line->{order_vendornote} : '' ), $line->{quantity}, $num->format_price($line->{rrpgste}), $num->format_price($line->{rrpgsti}), diff --git a/acqui/pdfformat/layout3pagesfr.pm b/acqui/pdfformat/layout3pagesfr.pm index f3bb1d8..dee65d0 100644 --- a/acqui/pdfformat/layout3pagesfr.pm +++ b/acqui/pdfformat/layout3pagesfr.pm @@ -102,7 +102,7 @@ sub printorders { my $pdftable = new PDF::Table(); my $abaskets; my $arrbasket; - my @keys = ('Document', 'Qte', 'Prix', 'Prix net', '% Remise', 'Remise', 'Taux TVA', 'Total HT', 'Total TTC'); + my @keys = ('Document', 'Qté', 'Prix', 'Prix net', '% Remise', 'Remise', 'Taux TVA', 'Total HT', 'Total TTC'); for my $bkey (@keys) { push(@$arrbasket, $bkey); } @@ -132,8 +132,7 @@ sub printorders { } push( @$arrbasket, - $titleinfo, - $line->{quantity}, + $titleinfo. ($line->{order_vendornote} ? "\n----------------\nNote pour le fournisseur : ". $line->{order_vendornote} : '' ), $line->{quantity}, $num->format_price($line->{rrpgste}), $num->format_price($line->{rrpgsti}), $num->format_price($line->{discount}).'%', -- 2.0.0.rc2