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

(-)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,Note for vendor,Quantity,RRP,Delivery place,Billing place
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 -%]
(-)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 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
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 -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/lateorders.tt (-1 / +1 lines)
Line 1 Link Here
1
ORDER DATE,ESTIMATED DELIVERY DATE,VENDOR,INFORMATION,TOTAL COST,BASKET,CLAIMS COUNT,CLAIMED DATE
1
[%- BLOCK -%]ORDER DATE,ESTIMATED DELIVERY DATE,VENDOR,INFORMATION,TOTAL COST,BASKET,CLAIMS COUNT,CLAIMED DATE[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/catalogue/itemsearch.tt (-1 / +1 lines)
Line 1 Link Here
1
Title, Publication date, Publisher, Collection, Barcode, Call number, Home library, Current location, Shelving location, Inventory number, Status, Checkouts
1
[%- BLOCK -%]Title, Publication date, Publisher, Collection, Barcode, Call number, Home library, Current location, Shelving location, Inventory number, Status, Checkouts[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt (-1 / +1 lines)
Line 1 Link Here
1
mfirstname[% sep %]card number[% sep %]firstname[% sep %]branchname[% sep %]date[% sep %]accounttype[% sep %]amount[% sep %]title[% sep %]barcode[% sep %]itype
1
[%- BLOCK -%]mfirstname[% sep %]card number[% sep %]firstname[% sep %]branchname[% sep %]date[% sep %]accounttype[% sep %]amount[% sep %]title[% sep %]barcode[% sep %]itype[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/orders_by_budget.tt (-1 / +1 lines)
Line 1 Link Here
1
Fund[% sep %]"Basket num"[% sep %]"Basket name"[% sep %]"Authorised by"[% sep %]"Biblio number"[% sep %]Title[% sep %]Currency[% sep %]"Vendor price"[% sep %]RRP[% sep %]"Budgeted cost"[% sep %]Quantity[% sep %]"Total RRP"[% sep %]"Total cost"[% sep %]"Entry date"[% sep %]"Date received"[% sep %]"Internal note"[% sep %]"Vendor note"
1
[%- BLOCK -%]Fund[% sep %]"Basket num"[% sep %]"Basket name"[% sep %]"Authorised by"[% sep %]"Biblio number"[% sep %]Title[% sep %]Currency[% sep %]"Vendor price"[% sep %]RRP[% sep %]"Budgeted cost"[% sep %]Quantity[% sep %]"Total RRP"[% sep %]"Total cost"[% sep %]"Entry date"[% sep %]"Date received"[% sep %]"Internal note"[% sep %]"Vendor note"[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basket.tt (-2 / +4 lines)
Lines 1-4 Link Here
1
[% INCLUDE csv_headers/acqui/basket.tt %]
1
[%- INCLUDE csv_headers/acqui/basket.tt -%]
2
[% INCLUDE empty_line.inc -%]
2
[%- FOREACH r IN rows -%]
3
[%- FOREACH r IN rows -%]
3
"[% 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 %]"
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 %]"
4
[% END -%]
5
[%- INCLUDE empty_line.inc %]
6
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basketgroup.tt (-4 / +6 lines)
Lines 1-4 Link Here
1
[% USE Price %]
1
[%- USE Price -%]
2
[% INCLUDE csv_headers/acqui/basketgroup.tt %]
2
[%- INCLUDE csv_headers/acqui/basketgroup.tt -%]
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
[%- INCLUDE empty_line.inc -%]
4
[% END %]
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 %]"
5
[%- INCLUDE empty_line.inc -%]
6
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/lateorders.tt (-4 / +6 lines)
Lines 1-6 Link Here
1
[%- USE KohaDates -%]
1
[%- USE KohaDates -%]
2
[%- INCLUDE csv_headers/acqui/lateorders.tt +%]
2
[%- INCLUDE csv_headers/acqui/lateorders.tt -%]
3
[% FOREACH o IN orders %]
3
[%- INCLUDE empty_line.inc -%]
4
"[% 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 +%]"
4
[%- FOREACH o IN orders -%]
5
[% END +%]
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 %]"
6
[%- INCLUDE empty_line.inc -%]
7
[%- END -%]
6
,,Total orders in late, [% orders.size %]
8
,,Total orders in late, [% orders.size %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch_csv.tt (-3 / +5 lines)
Lines 1-4 Link Here
1
[% INCLUDE csv_headers/catalogue/itemsearch.tt %]
1
[%- INCLUDE csv_headers/catalogue/itemsearch.tt -%]
2
[% FOREACH item IN results -%]
2
[%- INCLUDE empty_line.inc -%]
3
  [% INCLUDE 'catalogue/itemsearch_item.csv.inc' item = item +%]
3
[%- FOREACH item IN results -%]
4
    [%- INCLUDE 'catalogue/itemsearch_item.csv.inc' item = item -%]
5
    [%- INCLUDE empty_line.inc -%]
4
[%- END -%]
6
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/csv/cash_register_stats.tt (-7 / +9 lines)
Lines 1-7 Link Here
1
[% USE ItemTypes %]
1
[%- USE ItemTypes -%]
2
[%- INCLUDE csv_headers/reports/cash_register_stats.tt %]
2
[%- INCLUDE csv_headers/reports/cash_register_stats.tt -%]
3
[%- FOREACH row IN rows # Avoid line breaks in directives because of translatability %]
3
[%- INCLUDE empty_line.inc -%]
4
    [%- FOREACH field IN row; field IF !loop.last; ItemTypes.GetDescription(field) IF loop.last; sep IF !loop.last; END %]
4
[%- FOREACH row IN rows -%]
5
[% END -%]
5
    [%- FOREACH field IN row; field IF !loop.last; ItemTypes.GetDescription(field) IF loop.last; sep IF !loop.last; END -%]
6
TOTAL
6
    [%- INCLUDE empty_line.inc %]
7
[%- FOREACH field IN total; field; sep IF !loop.last; END %]
7
[%- END -%]
8
TOTAL[%- INCLUDE empty_line.inc -%]
9
[%- FOREACH field IN total; field; sep IF !loop.last; END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/csv/orders_by_budget.tt (-7 / +8 lines)
Lines 1-6 Link Here
1
[% INCLUDE csv_headers/reports/orders_by_budget.tt %]
1
[%- INCLUDE csv/headers/reports/orders_by_budget.tt -%]
2
[%- FOREACH row IN rows # Avoid line breaks in directives because of translatability %]
2
[%- INCLUDE empty_line.inc -%]
3
    [%- FOREACH field IN row; field; sep IF !loop.last; END %]
3
[%- FOREACH row IN rows -%]
4
[% END -%]
4
    [%- FOREACH field IN row; field; sep IF !loop.last; END -%]
5
TOTAL
5
    [%- INCLUDE empty_line.inc -%]
6
[%- FOREACH field IN totalrow; field; sep IF !loop.last; END %]
6
[%- END -%]
7
TOTAL[%- INCLUDE empty_line.inc -%]
8
[%- FOREACH field IN totalrow; field; sep IF !loop.last; END -%]
7
- 

Return to bug 18331