@@ -, +, @@ translation - 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é") --- 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(-) --- a/acqui/pdfformat/layout2pages.pm +++ a/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}).'%', --- a/acqui/pdfformat/layout2pagesde.pm +++ a/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}).'%', --- a/acqui/pdfformat/layout3pages.pm +++ a/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}), --- a/acqui/pdfformat/layout3pagesfr.pm +++ a/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}).'%', --