From 162721e73b3162f02db9c1b5a406fb58c82489ee Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 4 Sep 2012 10:03:27 +0200 Subject: [PATCH 1/1] Bug 5356: Followup: Add basket billing and delivery place on export pdf (layout3pages) --- acqui/pdfformat/layout3pages.pm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/acqui/pdfformat/layout3pages.pm b/acqui/pdfformat/layout3pages.pm index 324b88e..0f1f14a 100644 --- a/acqui/pdfformat/layout3pages.pm +++ b/acqui/pdfformat/layout3pages.pm @@ -29,7 +29,7 @@ use strict; use warnings; use utf8; -use C4::Branch qw(GetBranchDetail); +use C4::Branch qw(GetBranchDetail GetBranchName); BEGIN { use Exporter (); @@ -92,7 +92,12 @@ sub printorders { $text->font( $pdf->corefont("Times", -encoding => "utf8"), 6/mm ); $text->translate(20/mm, ($height-15)/mm); $text->text("Order N°".$basketgroup->{'id'}.". Basket N° ".$basket->{basketno}.". ".$basket->{booksellernote}); - + $text->translate(20/mm, ($height-20)/mm); + $text->text( ( $basket->{billingplace} ? "Billing at " . C4::Branch::GetBranchName( $basket->{billingplace} ) : "" ) + . ( $basket->{billingplace} and $basket->{deliveryplace} ? " and " : "" ) + . ( $basket->{deliveryplace} ? "delivery at " . C4::Branch::GetBranchName( $basket->{deliveryplace}) : "" ) + ); + my $pdftable = new PDF::Table(); my $abaskets; my $arrbasket; -- 1.7.10.4