Bugzilla – Attachment 28314 Details for
Bug 12110
Display the order vendor note in basket and basketgroup CSV and PDF
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12110 [PATCH 2/2] QA followup : french and german translation
0002-Bug-12110-PATCH-2-2-QA-followup-french-and-german-tr.patch (text/plain), 4.29 KB, created by
Mathieu Saby
on 2014-05-18 19:43:16 UTC
(
hide
)
Description:
Bug 12110 [PATCH 2/2] QA followup : french and german translation
Filename:
MIME Type:
Creator:
Mathieu Saby
Created:
2014-05-18 19:43:16 UTC
Size:
4.29 KB
patch
obsolete
>From c5283ea5506a708ad7034ee2d6bf6287c1028850 Mon Sep 17 00:00:00 2001 >From: Mathieu Saby <mathsabypro@gmail.com> >Date: Sun, 18 May 2014 21:30:53 +0200 >Subject: Bug 12110 [PATCH 2/2] QA followup : french and german translation > >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" > >--- > 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}).'%', >-- >1.7.9.5 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12110
:
27310
|
28111
|
28168
|
28314
|
28381
|
28382
|
28383