From 2dab2cc22334ee49b7eb2e67252ca484e63cb6cb Mon Sep 17 00:00:00 2001 From: Mathieu Saby Date: Sat, 19 Apr 2014 20:21:59 +0200 Subject: [PATCH] Bug 12110: Display the order vendor note in basket and basketgroup CSV and PDF This bug adds the "vendor note" for each order in the PDF for basketgroups. The note is displayed only if it exists, just under the bibliographic information. I added a separation line "--------" between bibliographic information and the note, so that it could be visible at 1st glance. It also replaces the internal note with the vendor in the CSV for basket and basketgroup. It is more logical and useful for libraries to export the note made for vendor, as those files are destined to be sent to the vendor. Test plan : - fill a basket with some orders, some with internal notes, some with vendor notes - export the basket in CSV : only the vendor notes should be present - put the basket in a basketgroup - export the basketgroup in CSV : only the vendor notes should be present - Select "English-2 pages" template for basketgroups in Sysprefs - export the basket in PDF : the vendor notes should be present under the bibliographic information - Select "English-3 pages" template for basketgroups in Sysprefs - export the basket in PDF : the vendor notes should be present under the bibliographic information Signed-off-by: Paola Rossi Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton --- C4/Acquisition.pm | 4 ++-- acqui/basketgroup.pl | 2 +- acqui/pdfformat/layout2pages.pm | 2 +- acqui/pdfformat/layout3pages.pm | 2 +- .../prog/en/includes/csv_headers/acqui/basket.tt | 2 +- .../prog/en/includes/csv_headers/acqui/basketgroup.tt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index a14ffe72bf..38646cb73e 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -310,7 +310,7 @@ sub GetBasketAsCSV { publicationyear => $bd->{'publicationyear'}, publishercode => $bd->{'publishercode'}, collectiontitle => $bd->{'collectiontitle'}, - notes => $order->{'order_internalnote'}, + notes => $order->{'order_vendornote'}, quantity => $order->{'quantity'}, rrp => $order->{'rrp'}, deliveryplace => C4::Branch::GetBranchName( $basket->{'deliveryplace'} ), @@ -381,7 +381,7 @@ sub GetBasketGroupAsCSV { rrp => $order->{rrp}, discount => $bookseller->{discount}, ecost => $order->{ecost}, - notes => $order->{order_internalnote}, + notes => $order->{order_vendornote}, entrydate => $order->{entrydate}, booksellername => $bookseller->{name}, bookselleraddress => $bookseller->{address1}, diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl index 8d842703c3..cdb392d721 100755 --- a/acqui/basketgroup.pl +++ b/acqui/basketgroup.pl @@ -218,7 +218,7 @@ sub printbasketgrouppdf{ en => ( $en ? $en : undef ), edition => ( $edition ? $edition : undef ), }; - for my $key ( qw/ gstrate author title itemtype publishercode copyrightdate publicationyear discount quantity rrpgsti rrpgste gstgsti gstgste ecostgsti ecostgste gstvalue totalgste totalgsti / ) { + for my $key ( qw/ gstrate author title itemtype publishercode copyrightdate publicationyear discount quantity rrpgsti rrpgste gstgsti gstgste ecostgsti ecostgste gstvalue totalgste totalgsti order_vendornote / ) { $ba_order->{$key} = $ord->{$key}; } diff --git a/acqui/pdfformat/layout2pages.pm b/acqui/pdfformat/layout2pages.pm index df84c7d229..0beae0fb20 100644 --- a/acqui/pdfformat/layout2pages.pm +++ b/acqui/pdfformat/layout2pages.pm @@ -113,7 +113,7 @@ sub printorders { } push( @$arrbasket, $basket->{basketno}, - $titleinfo, + $titleinfo. ($line->{order_vendornote} ? "\n----------------\nNotes for vendor : " . $line->{order_vendornote} : '' ), $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 d09be338b3..6ef8980c61 100644 --- a/acqui/pdfformat/layout3pages.pm +++ b/acqui/pdfformat/layout3pages.pm @@ -132,7 +132,7 @@ sub printorders { ( $line->{copyrightdate} ? ' '. $line->{copyrightdate} : ''); } push( @$arrbasket, - $titleinfo, + $titleinfo. ($line->{order_vendornote} ? "\n----------------\nNotes for vendor : " . $line->{order_vendornote} : '' ), $line->{quantity}, $num->format_price($line->{rrpgste}), $num->format_price($line->{rrpgsti}), diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt index fdb5781f9e..a2086f65a7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt @@ -1 +1 @@ -Contract name,Order number,Entry date,ISBN,Author,Title,Publication year,Publisher,Collection title,Internal note,Quantity,RRP,Delivery place,Billing place +Contract name,Order number,Entry date,ISBN,Author,Title,Publication year,Publisher,Collection title,Note for vendor,Quantity,RRP,Delivery place,Billing place diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt index fd99445af9..de07b35818 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt @@ -1 +1 @@ -Account number,Basket name,Order number,Author,Title,Publisher,Publication year,Collection title,ISBN,Quantity,RRP,Discount,Estimated cost,Internal note,Entry date,Bookseller name,Bookseller physical address,Bookseller postal address,Contract number,Contract name,Basket group delivery place,Basket group billing place,Basket delivery place,Basket billing place +Account number,Basket name,Order number,Author,Title,Publisher,Publication year,Collection title,ISBN,Quantity,RRP,Discount,Estimated cost,Note for vendor,Entry date,Bookseller name,Bookseller physical address,Bookseller postal address,Contract number,Contract name,Basket group delivery place,Basket group billing place,Basket delivery place,Basket billing place