From 43843dca9aa50e1548b449ea37a64299012465fb Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Thu, 27 Feb 2014 16:30:29 +0100 Subject: [PATCH] [SIGNED-OFF] Bug 11856: Add publiction year and edition to French acq PDF template MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Follow up to the patch for the English templates - repeat tests with OrderPDFFormat set to pdfformat::layout3pagesfr. Additional change: Translates 'published by' to 'publié par' http://bugs.koha-community.org/show_bug.cgi?id=11859 Signed-off-by: Owen Leonard --- acqui/pdfformat/layout3pagesfr.pm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/acqui/pdfformat/layout3pagesfr.pm b/acqui/pdfformat/layout3pagesfr.pm index 1fdd319..f3bb1d8 100644 --- a/acqui/pdfformat/layout3pagesfr.pm +++ b/acqui/pdfformat/layout3pagesfr.pm @@ -107,10 +107,32 @@ sub printorders { push(@$arrbasket, $bkey); } push(@$abaskets, $arrbasket); + + my $titleinfo; foreach my $line (@{$orders->{$basket->{basketno}}}) { $arrbasket = undef; + $titleinfo = ""; + if ( C4::Context->preference("marcflavour") eq 'UNIMARC' ) { + $titleinfo = $line->{title} . " / " . $line->{author} . + ( $line->{isbn} ? " ISBN : " . $line->{isbn} : '' ) . + ( $line->{en} ? " EN : " . $line->{en} : '' ) . + ( $line->{itemtype} ? ", " . $line->{itemtype} : '' ) . + ( $line->{edition} ? ", " . $line->{edition} : '' ) . + ( $line->{publishercode} ? ' publié par '. $line->{publishercode} : '') . + ( $line->{publicationyear} ? ', '. $line->{publicationyear} : ''); + } + else { # MARC21, NORMARC + $titleinfo = $line->{title} . " " . $line->{author} . + ( $line->{isbn} ? " ISBN : " . $line->{isbn} : '' ) . + ( $line->{en} ? " EN : " . $line->{en} : '' ) . + ( $line->{itemtype} ? " " . $line->{itemtype} : '' ) . + ( $line->{edition} ? ", " . $line->{edition} : '' ) . + ( $line->{publishercode} ? ' publié par '. $line->{publishercode} : '') . + ( $line->{copyrightdate} ? ' '. $line->{copyrightdate} : ''); + } + push( @$arrbasket, - $line->{title} . " / " . $line->{author} . ( $line->{isbn} ? " ISBN : " . $line->{isbn} : '' ) . ( $line->{en} ? " EN : " . $line->{en} : '' ) . ", " . $line->{itemtype} . ( $line->{publishercode} ? ' published by '. $line->{publishercode} : ""), + $titleinfo, $line->{quantity}, $num->format_price($line->{rrpgste}), $num->format_price($line->{rrpgsti}), -- 1.7.9.5