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 218-224 sub printbasketgrouppdf{ Link Here
218
                en => ( $en ? $en : undef ),
218
                en => ( $en ? $en : undef ),
219
                edition => ( $edition ? $edition : undef ),
219
                edition => ( $edition ? $edition : undef ),
220
            };
220
            };
221
            for my $key ( qw/ gstrate author title itemtype publishercode copyrightdate publicationyear discount quantity rrpgsti rrpgste gstgsti gstgste ecostgsti ecostgste gstvalue totalgste totalgsti / ) {
221
            for my $key ( qw/ gstrate author title itemtype publishercode copyrightdate publicationyear discount quantity rrpgsti rrpgste gstgsti gstgste ecostgsti ecostgste gstvalue totalgste totalgsti order_vendornote / ) {
222
                $ba_order->{$key} = $ord->{$key};
222
                $ba_order->{$key} = $ord->{$key};
223
            }
223
            }
224
224
(-)a/acqui/pdfformat/layout2pages.pm (-1 / +1 lines)
Lines 113-119 sub printorders { Link Here
113
            }
113
            }
114
            push( @$arrbasket,
114
            push( @$arrbasket,
115
                $basket->{basketno},
115
                $basket->{basketno},
116
                $titleinfo,
116
                $titleinfo. ($line->{order_vendornote} ? "\n----------------\nNotes for vendor : " . $line->{order_vendornote} : '' ),
117
                $line->{quantity},
117
                $line->{quantity},
118
                $num->format_price($line->{rrpgsti}),
118
                $num->format_price($line->{rrpgsti}),
119
                $num->format_price($line->{discount}).'%',
119
                $num->format_price($line->{discount}).'%',
(-)a/acqui/pdfformat/layout3pages.pm (-1 / +1 lines)
Lines 132-138 sub printorders { Link Here
132
                    ( $line->{copyrightdate} ? ' '. $line->{copyrightdate} : '');
132
                    ( $line->{copyrightdate} ? ' '. $line->{copyrightdate} : '');
133
            }
133
            }
134
            push( @$arrbasket,
134
            push( @$arrbasket,
135
                $titleinfo,
135
                $titleinfo. ($line->{order_vendornote} ? "\n----------------\nNotes for vendor : " . $line->{order_vendornote} : '' ),
136
                $line->{quantity},
136
                $line->{quantity},
137
                $num->format_price($line->{rrpgste}),
137
                $num->format_price($line->{rrpgste}),
138
                $num->format_price($line->{rrpgsti}),
138
                $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