@@ -, +, @@ "delimiter" - Basketgroup: there was an unnecessary space. " RRP tax excluded" replaced by "RRP tax excluded" - Late orders: - leading spaces before every line - surrounding spaces for [% orders.size %] - quoted "Total orders in late" to no worry about additional spaces - Late orders: additional spaces which shouldn't be a problem because all the fields are enclosed by quotes. /cgi-bin/koha/acqui/basket.pl?basketno=XXXXX Leave the file open for future comparison to ensure that there are no regressions. (tick the close this basket group check box) Leave the file open for future comparison to ensure that there are no regressions. orders of different vendors. Leave the file open for future comparison to ensure that there are no regressions. 1. cd misc/translator 2. perl translate update YOUR_LANG 3. manually edit the po file, remove the fuzzy tags. And translate the string. You can just copy the original and replace some parts by gibberish. 4. perl translate install YOUR_LANG - delimiter syspref is honored - the headers are translatable - there is no whitespace regression (additional newlines or spaces) --- .../prog/en/includes/csv_headers/acqui/basket.tt | 5 +++- .../en/includes/csv_headers/acqui/basketgroup.tt | 5 +++- .../en/includes/csv_headers/acqui/lateorders.tt | 5 +++- .../prog/en/modules/acqui/csv/basket.tt | 19 ++++++++++++- .../prog/en/modules/acqui/csv/basketgroup.tt | 32 +++++++++++++++++++++- .../prog/en/modules/acqui/csv/lateorders.tt | 18 ++++++++++-- 6 files changed, 77 insertions(+), 7 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt @@ -1, +1,4 @@ -[%- 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 -%] +[%- USE Koha -%] +[%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%] + +[%- 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 +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt @@ -1, +1,4 @@ -[%- 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 -%] +[%- USE Koha -%] +[%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%] + +[%- 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 +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/lateorders.tt @@ -1, +1,4 @@ -[%- BLOCK -%]ORDER DATE,ESTIMATED DELIVERY DATE,VENDOR,INFORMATION,TOTAL COST,BASKET,CLAIMS COUNT,CLAIMED DATE[%- END -%] +[%- USE Koha -%] +[%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%] + +[%- 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 +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basket.tt @@ -1,6 +1,23 @@ +[%- USE Koha -%] +[%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%] + [%- INCLUDE csv_headers/acqui/basket.tt -%] [%- INCLUDE empty_line.inc -%] + [%- FOREACH r IN rows -%] -"[% 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 %]" +"[% r.contractname %]"[%- delimiter -%] +[% r.ordernumber %][%- delimiter -%] +[% r.entrydate %][%- delimiter -%] +[% r.isbn %][%- delimiter -%] +"[% r.author %]"[%- delimiter -%] +"[% r.title %]"[%- delimiter -%] +[% r.publicationyear %][%- delimiter -%] +"[% r.publishercode %]"[%- delimiter -%] +"[% r.collectiontitle %]"[%- delimiter -%] +"[% r.notes %]"[%- delimiter -%] +[% r.quantity %][%- delimiter -%] +[% r.rrp %][%- delimiter -%] +"[% r.deliveryplace %]"[%- delimiter -%] +"[% r.billingplace %]" [%- INCLUDE empty_line.inc -%] [%- END -%] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basketgroup.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basketgroup.tt @@ -1,6 +1,36 @@ +[%- USE Koha -%] +[%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%] + [%- USE Price -%] [%- INCLUDE csv_headers/acqui/basketgroup.tt -%] [%- INCLUDE empty_line.inc -%] -[%- 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 %]" + +[%- FOREACH r IN rows -%] +[% r.clientnumber %][%- delimiter -%] +"[% r.basketname %]"[%- delimiter -%] +[% r.ordernumber %][%- delimiter -%] +"[% r.author %]"[%- delimiter -%] +"[% r.title %]"[%- delimiter -%] +"[% r.publishercode %]"[%- delimiter -%] +[% r.publicationyear %][%- delimiter -%] +"[% r.collectiontitle %]"[%- delimiter -%] +[% r.isbn %][%- delimiter -%] +[% r.quantity %][%- delimiter -%] +[% r.rrp_tax_included | $Price %][%- delimiter -%] +[% r.rrp_tax_excluded | $Price %][%- delimiter -%] +[% r.discount %][%- delimiter -%] +[% r.ecost_tax_included | $Price %][%- delimiter -%] +[% r.ecost_tax_excluded | $Price %][%- delimiter -%] +"[% r.notes %]"[%- delimiter -%] +[% r.entrydate %][%- delimiter -%] +"[% r.booksellername %]"[%- delimiter -%] +"[% r.bookselleraddress %]"[%- delimiter -%] +"[% r.booksellerpostal %]"[%- delimiter -%] +[% r.contractnumber %][%- delimiter -%] +"[% r.contractname %]"[%- delimiter -%] +"[% r.basketgroupdeliveryplace %]"[%- delimiter -%] +"[% r.basketgroupbillingplace %]"[%- delimiter -%] +"[% r.basketdeliveryplace %]"[%- delimiter -%] +"[% r.basketbillingplace %]" [%- INCLUDE empty_line.inc -%] [%- END -%] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/lateorders.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/lateorders.tt @@ -1,8 +1,22 @@ +[%- USE Koha -%] +[%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%] + [%- USE KohaDates -%] [%- INCLUDE csv_headers/acqui/lateorders.tt -%] [%- INCLUDE empty_line.inc -%] + [%- FOREACH o IN orders -%] -"[% 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 %]" +"[% o.orderdate %] ([% o.latesince %] days)"[%- delimiter -%] +"[% o.estimateddeliverydate | $KohaDates %]"[%- delimiter -%] +"[% o.supplier (o.supplierid) %]"[%- delimiter -%] +"[% o.title %] [% IF o.author %]Author: [% o.author %].[% END %][% IF o.publisher %]Published by: [% o.publisher %].[% END %]"[%- delimiter -%] +"[% o.unitpricesupplier %] x [% o.quantity_to_receive %] = [% o.subtotal %] ([% o.budget %])"[%- delimiter -%] +"[% o.basketname %] ([% o.basketno %])"[%- delimiter -%] +"[% o.claims_count %]"[%- delimiter -%] +"[% o.claimed_date %]" [%- INCLUDE empty_line.inc -%] [%- END -%] -,,Total orders in late, [% orders.size %] +[%- delimiter -%] +[%- delimiter -%] +"Total orders in late"[%- delimiter -%] +[% orders.size %] --