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

(-)a/C4/Acquisition.pm (-2 / +2 lines)
Lines 310-316 sub GetBasketAsCSV { Link Here
310
            publicationyear => $bd->{'publicationyear'},
310
            publicationyear => $bd->{'publicationyear'},
311
            publishercode => $bd->{'publishercode'},
311
            publishercode => $bd->{'publishercode'},
312
            collectiontitle => $bd->{'collectiontitle'},
312
            collectiontitle => $bd->{'collectiontitle'},
313
            notes => $order->{'order_internalnote'},
313
            notes => $order->{'order_vendornote'},
314
            quantity => $order->{'quantity'},
314
            quantity => $order->{'quantity'},
315
            rrp => $order->{'rrp'},
315
            rrp => $order->{'rrp'},
316
            deliveryplace => C4::Branch::GetBranchName( $basket->{'deliveryplace'} ),
316
            deliveryplace => C4::Branch::GetBranchName( $basket->{'deliveryplace'} ),
Lines 381-387 sub GetBasketGroupAsCSV { Link Here
381
                rrp => $order->{rrp},
381
                rrp => $order->{rrp},
382
                discount => $bookseller->{discount},
382
                discount => $bookseller->{discount},
383
                ecost => $order->{ecost},
383
                ecost => $order->{ecost},
384
                notes => $order->{order_internalnote},
384
                notes => $order->{order_vendornote},
385
                entrydate => $order->{entrydate},
385
                entrydate => $order->{entrydate},
386
                booksellername => $bookseller->{name},
386
                booksellername => $bookseller->{name},
387
                bookselleraddress => $bookseller->{address1},
387
                bookselleraddress => $bookseller->{address1},
(-)a/acqui/basketgroup.pl (-1 / +1 lines)
Lines 214-220 sub printbasketgrouppdf{ Link Here
214
                itemtype => ( $ord->{itemtype} and $bib->{itemtype} ? $itemtypes->{$bib->{itemtype}}->{description} : undef ),
214
                itemtype => ( $ord->{itemtype} and $bib->{itemtype} ? $itemtypes->{$bib->{itemtype}}->{description} : undef ),
215
                en => ( $en ? $en : undef ),
215
                en => ( $en ? $en : undef ),
216
            };
216
            };
217
            for my $key ( qw/ gstrate author title itemtype publishercode discount quantity rrpgsti rrpgste gstgsti gstgste ecostgsti ecostgste gstvalue totalgste totalgsti / ) {
217
            for my $key ( qw/ gstrate author title itemtype publishercode discount quantity rrpgsti rrpgste gstgsti gstgste ecostgsti ecostgste gstvalue totalgste totalgsti order_vendornote / ) {
218
                $ba_order->{$key} = $ord->{$key};
218
                $ba_order->{$key} = $ord->{$key};
219
            }
219
            }
220
220
(-)a/acqui/pdfformat/layout2pages.pm (-1 / +1 lines)
Lines 93-99 sub printorders { Link Here
93
            $arrbasket = undef;
93
            $arrbasket = undef;
94
            push( @$arrbasket,
94
            push( @$arrbasket,
95
                $basket->{basketno},
95
                $basket->{basketno},
96
                $line->{title} . " / " . $line->{author} . ( $line->{isbn} ? " ISBN : " . $line->{isbn} : '' ) . ( $line->{en} ? " EN : " . $line->{en} : '' ) . ", " . $line->{itemtype} . ( $line->{publishercode} ? ' published by '. $line->{publishercode} : ""),
96
                $line->{title} . " / " . $line->{author} . ( $line->{isbn} ? " ISBN : " . $line->{isbn} : '' ) . ( $line->{en} ? " EN : " . $line->{en} : '' ) . ", " . $line->{itemtype} . ( $line->{publishercode} ? ' published by '. $line->{publishercode} : "").( $line->{order_vendornote} ? "\n----------------\nNotes for vendor : " . $line->{order_vendornote} : '' ) ,
97
                $line->{quantity},
97
                $line->{quantity},
98
                $num->format_price($line->{rrpgsti}),
98
                $num->format_price($line->{rrpgsti}),
99
                $num->format_price($line->{discount}).'%',
99
                $num->format_price($line->{discount}).'%',
(-)a/acqui/pdfformat/layout3pages.pm (-1 / +1 lines)
Lines 111-117 sub printorders { Link Here
111
        foreach my $line (@{$orders->{$basket->{basketno}}}) {
111
        foreach my $line (@{$orders->{$basket->{basketno}}}) {
112
            $arrbasket = undef;
112
            $arrbasket = undef;
113
            push( @$arrbasket,
113
            push( @$arrbasket,
114
                $line->{title} . " / " . $line->{author} . ( $line->{isbn} ? " ISBN : " . $line->{isbn} : '' ) . ( $line->{en} ? " EN : " . $line->{en} : '' ) . ", " . $line->{itemtype} . ( $line->{publishercode} ? ' published by '. $line->{publishercode} : ""),
114
                $line->{title} . " / " . $line->{author} . ( $line->{isbn} ? " ISBN : " . $line->{isbn} : '' ) . ( $line->{en} ? " EN : " . $line->{en} : '' ) . ", " . $line->{itemtype} . ( $line->{publishercode} ? ' published by '. $line->{publishercode} : "").( $line->{order_vendornote} ? "\n----------------\nNotes for vendor : " . $line->{order_vendornote} : '' ) ,
115
                $line->{quantity},
115
                $line->{quantity},
116
                $num->format_price($line->{rrpgste}),
116
                $num->format_price($line->{rrpgste}),
117
                $num->format_price($line->{rrpgsti}),
117
                $num->format_price($line->{rrpgsti}),
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt (-1 / +1 lines)
Line 1 Link Here
1
Contract name,Order number,Entry date,ISBN,Author,Title,Publication year,Publisher,Collection title,Internal note,Quantity,RRP,Delivery place,Billing place
1
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 (-2 / +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,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
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
2
- 

Return to bug 12110