@@ -, +, @@ basketgroup CSV and PDF - 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 --- C4/Acquisition.pm | 4 ++-- acqui/basketgroup.pl | 2 +- acqui/pdfformat/layout2pages.pm | 2 +- acqui/pdfformat/layout3pages.pm | 2 +- .../intranet-tmpl/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(-) --- a/C4/Acquisition.pm +++ a/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}, --- a/acqui/basketgroup.pl +++ a/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}; } --- a/acqui/pdfformat/layout2pages.pm +++ a/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}).'%', --- a/acqui/pdfformat/layout3pages.pm +++ a/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}), --- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt +++ a/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 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt +++ a/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 --