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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt (-1 / +4 lines)
Line 1 Link Here
1
[%- BLOCK -%]Contract name,Order number,Entry date,ISBN,Author,Title,Publication year,Publisher,Collection title,Note for vendor,Quantity,RRP,Delivery place,Billing place[%- END -%]
1
[%- USE Koha -%]
2
[%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%]
3
4
[%- BLOCK -%]Contract name[% delimiter %]Order number[% delimiter %]Entry date[% delimiter %]ISBN[% delimiter %]Author[% delimiter %]Title[% delimiter %]Publication year[% delimiter %]Publisher[% delimiter %]Collection title[% delimiter %]Note for vendor[% delimiter %]Quantity[% delimiter %]RRP[% delimiter %]Delivery place[% delimiter %]Billing place[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt (-1 / +4 lines)
Line 1 Link Here
1
[%- BLOCK -%]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[%- END -%]
1
[%- USE Koha -%]
2
[%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%]
3
4
[%- BLOCK -%]Account number[% delimiter %]Basket name[% delimiter %]Order number[% delimiter %]Author[% delimiter %]Title[% delimiter %]Publisher[% delimiter %]Publication year[% delimiter %]Collection title[% delimiter %]ISBN[% delimiter %]Quantity[% delimiter %]RRP tax included[% delimiter %]RRP tax excluded[% delimiter %]Discount[% delimiter %]Estimated cost tax included[% delimiter %]Estimated cost tax excluded[% delimiter %]Note for vendor[% delimiter %]Entry date[% delimiter %]Bookseller name[% delimiter %]Bookseller physical address[% delimiter %]Bookseller postal address[% delimiter %]Contract number[% delimiter %]Contract name[% delimiter %]Basket group delivery place[% delimiter %]Basket group billing place[% delimiter %]Basket delivery place[% delimiter %]Basket billing place[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/lateorders.tt (-1 / +4 lines)
Line 1 Link Here
1
[%- BLOCK -%]ORDER DATE,ESTIMATED DELIVERY DATE,VENDOR,INFORMATION,TOTAL COST,BASKET,CLAIMS COUNT,CLAIMED DATE[%- END -%]
1
[%- USE Koha -%]
2
[%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%]
3
4
[%- BLOCK -%]ORDER DATE[%- delimiter -%]ESTIMATED DELIVERY DATE[%- delimiter -%]VENDOR[%- delimiter -%]INFORMATION[%- delimiter -%]TOTAL COST[%- delimiter -%]BASKET[%- delimiter -%]CLAIMS COUNT[%- delimiter -%]CLAIMED DATE[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basket.tt (-1 / +18 lines)
Lines 1-6 Link Here
1
[%- USE Koha -%]
2
[%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%]
3
1
[%- INCLUDE csv_headers/acqui/basket.tt -%]
4
[%- INCLUDE csv_headers/acqui/basket.tt -%]
2
[%- INCLUDE empty_line.inc -%]
5
[%- INCLUDE empty_line.inc -%]
6
3
[%- FOREACH r IN rows -%]
7
[%- FOREACH r IN rows -%]
4
"[% r.contractname %]",[% r.ordernumber %],[% r.entrydate %],[% r.isbn %],"[% r.author %]","[% r.title %]",[% r.publicationyear %],"[% r.publishercode %]","[% r.collectiontitle %]","[% r.notes %]",[% r.quantity %],[% r.rrp %],"[% r.deliveryplace %]","[% r.billingplace %]"
8
"[% r.contractname %]"[%- delimiter -%]
9
[% r.ordernumber %][%- delimiter -%]
10
[% r.entrydate %][%- delimiter -%]
11
[% r.isbn %][%- delimiter -%]
12
"[% r.author %]"[%- delimiter -%]
13
"[% r.title %]"[%- delimiter -%]
14
[% r.publicationyear %][%- delimiter -%]
15
"[% r.publishercode %]"[%- delimiter -%]
16
"[% r.collectiontitle %]"[%- delimiter -%]
17
"[% r.notes %]"[%- delimiter -%]
18
[% r.quantity %][%- delimiter -%]
19
[% r.rrp %][%- delimiter -%]
20
"[% r.deliveryplace %]"[%- delimiter -%]
21
"[% r.billingplace %]"
5
[%- INCLUDE empty_line.inc -%]
22
[%- INCLUDE empty_line.inc -%]
6
[%- END -%]
23
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basketgroup.tt (-1 / +31 lines)
Lines 1-6 Link Here
1
[%- USE Koha -%]
2
[%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%]
3
1
[%- USE Price -%]
4
[%- USE Price -%]
2
[%- INCLUDE csv_headers/acqui/basketgroup.tt -%]
5
[%- INCLUDE csv_headers/acqui/basketgroup.tt -%]
3
[%- INCLUDE empty_line.inc -%]
6
[%- INCLUDE empty_line.inc -%]
4
[%- 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 %]"
7
8
[%- FOREACH r IN rows -%]
9
[% r.clientnumber %][%- delimiter -%]
10
"[% r.basketname %]"[%- delimiter -%]
11
[% r.ordernumber %][%- delimiter -%]
12
"[% r.author %]"[%- delimiter -%]
13
"[% r.title %]"[%- delimiter -%]
14
"[% r.publishercode %]"[%- delimiter -%]
15
[% r.publicationyear %][%- delimiter -%]
16
"[% r.collectiontitle %]"[%- delimiter -%]
17
[% r.isbn %][%- delimiter -%]
18
[% r.quantity %][%- delimiter -%]
19
[% r.rrp_tax_included | $Price %][%- delimiter -%]
20
[% r.rrp_tax_excluded | $Price %][%- delimiter -%]
21
[% r.discount %][%- delimiter -%]
22
[% r.ecost_tax_included | $Price %][%- delimiter -%]
23
[% r.ecost_tax_excluded | $Price %][%- delimiter -%]
24
"[% r.notes %]"[%- delimiter -%]
25
[% r.entrydate %][%- delimiter -%]
26
"[% r.booksellername %]"[%- delimiter -%]
27
"[% r.bookselleraddress %]"[%- delimiter -%]
28
"[% r.booksellerpostal %]"[%- delimiter -%]
29
[% r.contractnumber %][%- delimiter -%]
30
"[% r.contractname %]"[%- delimiter -%]
31
"[% r.basketgroupdeliveryplace %]"[%- delimiter -%]
32
"[% r.basketgroupbillingplace %]"[%- delimiter -%]
33
"[% r.basketdeliveryplace %]"[%- delimiter -%]
34
"[% r.basketbillingplace %]"
5
[%- INCLUDE empty_line.inc -%]
35
[%- INCLUDE empty_line.inc -%]
6
[%- END -%]
36
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/lateorders.tt (-3 / +16 lines)
Lines 1-8 Link Here
1
[%- USE Koha -%]
2
[%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%]
3
1
[%- USE KohaDates -%]
4
[%- USE KohaDates -%]
2
[%- INCLUDE csv_headers/acqui/lateorders.tt -%]
5
[%- INCLUDE csv_headers/acqui/lateorders.tt -%]
3
[%- INCLUDE empty_line.inc -%]
6
[%- INCLUDE empty_line.inc -%]
7
4
[%- FOREACH o IN orders -%]
8
[%- FOREACH o IN orders -%]
5
"[% o.orderdate %] ([% o.latesince %] days)","[% o.estimateddeliverydate | $KohaDates %]","[% o.supplier (o.supplierid) %]","[% o.title %] [% IF o.author %]Author: [% o.author %].[% END %][% IF o.publisher %]Published by: [% o.publisher %].[% END %]","[% o.unitpricesupplier %] x [% o.quantity_to_receive %] = [% o.subtotal %] ([% o.budget %])","[% o.basketname %] ([% o.basketno %])","[% o.claims_count %]","[% o.claimed_date %]"
9
"[% o.orderdate %] ([% o.latesince %] days)"[%- delimiter -%]
10
"[% o.estimateddeliverydate | $KohaDates %]"[%- delimiter -%]
11
"[% o.supplier (o.supplierid) %]"[%- delimiter -%]
12
"[% o.title %] [% IF o.author %]Author: [% o.author %].[% END %][% IF o.publisher %]Published by: [% o.publisher %].[% END %]"[%- delimiter -%]
13
"[% o.unitpricesupplier %] x [% o.quantity_to_receive %] = [% o.subtotal %] ([% o.budget %])"[%- delimiter -%]
14
"[% o.basketname %] ([% o.basketno %])"[%- delimiter -%]
15
"[% o.claims_count %]"[%- delimiter -%]
16
"[% o.claimed_date %]"
6
[%- INCLUDE empty_line.inc -%]
17
[%- INCLUDE empty_line.inc -%]
7
[%- END -%]
18
[%- END -%]
8
,,Total orders in late, [% orders.size %]
19
[%- delimiter -%]
20
[%- delimiter -%]
21
"Total orders in late"[%- delimiter -%]
22
[% orders.size %]
9
- 

Return to bug 19928