View | Details | Raw Unified | Return to bug 13321
Collapse All | Expand All

(-)a/C4/Acquisition.pm (-2 / +4 lines)
Lines 367-375 sub GetBasketGroupAsCSV { Link Here
367 
                collectiontitle => $bd->{collectiontitle},
 367 
                collectiontitle => $bd->{collectiontitle},
368 
                isbn => $order->{isbn},
 368 
                isbn => $order->{isbn},
369 
                quantity => $order->{quantity},
 369 
                quantity => $order->{quantity},
370 
                rrp => $order->{rrp},
 370 
                rrp_tax_included => $order->{rrp_tax_included},
371 
                rrp_tax_excluded => $order->{rrp_tax_excluded},
371 
                discount => $bookseller->{discount},
 372 
                discount => $bookseller->{discount},
372 
                ecost => $order->{ecost},
 373 
                ecost_tax_included => $order->{ecost_tax_included},
374 
                ecost_tax_excluded => $order->{ecost_tax_excluded},
373 
                notes => $order->{order_vendornote},
 375 
                notes => $order->{order_vendornote},
374 
                entrydate => $order->{entrydate},
 376 
                entrydate => $order->{entrydate},
375 
                booksellername => $bookseller->{name},
 377 
                booksellername => $bookseller->{name},
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt (-1 / +1 lines)
Line 1 Link Here
1 
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
 1 
Account number,Basket name,Order number,Author,Title,Publisher,Publication year,Collection title,ISBN,Quantity,RRP tax included, RRP tax excluded,Discount,Estimated cost tax included,Estimated cost tax excluded,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
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basketgroup.tt (-2 / +2 lines)
Lines 1-3 Link Here
1 
[% USE Price %]
1 
[% INCLUDE csv_headers/acqui/basketgroup.tt %]
 2 
[% INCLUDE csv_headers/acqui/basketgroup.tt %]
2 
[% FOREACH r IN rows %][% r.clientnumber %],"[% r.basketname %]",[% r.ordernumber %],"[% r.author %]","[% r.title %]","[% r.publishercode %]",[% r.publicationyear %],"[% r.collectiontitle %]",[% r.isbn %],[% r.quantity %],[% r.rrp %],[% r.discount %],[% r.ecost %],"[% r.notes %]",[% r.entrydate %],"[% r.booksellername %]","[% r.bookselleraddress %]","[% r.booksellerpostal %]",[% r.contractnumber %],"[% r.contractname %]","[% r.basketgroupdeliveryplace %]","[% r.basketgroupbillingplace %]","[% r.basketdeliveryplace %]","[% r.basketbillingplace %]"
 3 
[% FOREACH r IN rows %][% r.clientnumber %],"[% r.basketname %]",[% r.ordernumber %],"[% r.author %]","[% r.title %]","[% r.publishercode %]",[% r.publicationyear %],"[% r.collectiontitle %]",[% r.isbn %],[% r.quantity %],[% r.rrp_tax_included | $Price %],[% r.rrp_tax_excluded | $Price %],[% r.discount %],[% r.ecost_tax_included | $Price %],[% r.ecost_tax_excluded | $Price %],"[% r.notes %]",[% r.entrydate %],"[% r.booksellername %]","[% r.bookselleraddress %]","[% r.booksellerpostal %]",[% r.contractnumber %],"[% r.contractname %]","[% r.basketgroupdeliveryplace %]","[% r.basketgroupbillingplace %]","[% r.basketdeliveryplace %]","[% r.basketbillingplace %]"
3 
[% END %]
 4 
[% END %]
4 
-

Return to bug 13321