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

(-)a/Koha/Template/Plugin/Koha.pm (+7 lines)
Lines 55-60 sub Preference { Link Here
55
    return C4::Context->preference( $pref );
55
    return C4::Context->preference( $pref );
56
}
56
}
57
57
58
sub CSVDelimiter {
59
    my ( $self, $val ) = @_;
60
    my $sep = $val || C4::Context->preference('CSVDelimiter') || ',';
61
    $sep = "\t" if $sep eq 'tabulation';
62
    return $sep;
63
}
64
58
sub Version {
65
sub Version {
59
    my $version_string = Koha::version();
66
    my $version_string = Koha::version();
60
    my ( $major, $minor, $maintenance, $development ) = split( '\.', $version_string );
67
    my ( $major, $minor, $maintenance, $development ) = split( '\.', $version_string );
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc (-1 / +1 lines)
Lines 5-11 Link Here
5
[%- USE AuthorisedValues -%]
5
[%- USE AuthorisedValues -%]
6
[%- SET biblio = item.biblio -%]
6
[%- SET biblio = item.biblio -%]
7
[%- SET biblioitem = item.biblioitem -%]
7
[%- SET biblioitem = item.biblioitem -%]
8
[%- SET delimiter = Koha.Preference( 'CSVDelimiter' ) || ',' -%]
8
[%- SET delimiter = Koha.CSVDelimiter() -%]
9
"[% biblio.title | replace('"', '""') | $raw %] [% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %]by [% END %][% biblio.author | replace('"', '""') | $raw %]"
9
"[% biblio.title | replace('"', '""') | $raw %] [% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %]by [% END %][% biblio.author | replace('"', '""') | $raw %]"
10
[%- delimiter | $raw -%]
10
[%- delimiter | $raw -%]
11
"[% (biblioitem.publicationyear || biblio.copyrightdate) | replace('"', '""') | $raw %]"
11
"[% (biblioitem.publicationyear || biblio.copyrightdate) | replace('"', '""') | $raw %]"
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt (-1 / +1 lines)
Lines 1-4 Link Here
1
[%- USE Koha -%]
1
[%- USE Koha -%]
2
[%- SET delimiter = Koha.Preference( 'CSVDelimiter' ) || ',' -%]
2
[%- SET delimiter = Koha.CSVDelimiter() -%]
3
3
4
[%- BLOCK -%]Contract name[% delimiter | html %]Order number[% delimiter | html %]Entry date[% delimiter | html %]ISBN[% delimiter | html %]Author[% delimiter | html %]Title[% delimiter | html %]Publication year[% delimiter | html %]Publisher[% delimiter | html %]Collection title[% delimiter | html %]Note for vendor[% delimiter | html %]Quantity[% delimiter | html %]RRP[% delimiter | html %]Delivery place[% delimiter | html %]Billing place[%- END -%]
4
[%- BLOCK -%]Contract name[% delimiter | html %]Order number[% delimiter | html %]Entry date[% delimiter | html %]ISBN[% delimiter | html %]Author[% delimiter | html %]Title[% delimiter | html %]Publication year[% delimiter | html %]Publisher[% delimiter | html %]Collection title[% delimiter | html %]Note for vendor[% delimiter | html %]Quantity[% delimiter | html %]RRP[% delimiter | html %]Delivery place[% delimiter | html %]Billing place[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt (-1 / +1 lines)
Lines 1-4 Link Here
1
[%- USE Koha -%]
1
[%- USE Koha -%]
2
[%- SET delimiter = Koha.Preference( 'CSVDelimiter' ) || ',' -%]
2
[%- SET delimiter = Koha.CSVDelimiter() -%]
3
3
4
[%- BLOCK -%]Account number[% delimiter | html %]Basket name[% delimiter | html %]Order number[% delimiter | html %]Author[% delimiter | html %]Title[% delimiter | html %]Publisher[% delimiter | html %]Publication year[% delimiter | html %]Collection title[% delimiter | html %]ISBN[% delimiter | html %]Quantity[% delimiter | html %]RRP tax included[% delimiter | html %]RRP tax excluded[% delimiter | html %]Discount[% delimiter | html %]Estimated cost tax included[% delimiter | html %]Estimated cost tax excluded[% delimiter | html %]Note for vendor[% delimiter | html %]Entry date[% delimiter | html %]Bookseller name[% delimiter | html %]Bookseller physical address[% delimiter | html %]Bookseller postal address[% delimiter | html %]Contract number[% delimiter | html %]Contract name[% delimiter | html %]Basket group delivery place[% delimiter | html %]Basket group billing place[% delimiter | html %]Basket delivery place[% delimiter | html %]Basket billing place[%- END -%]
4
[%- BLOCK -%]Account number[% delimiter | html %]Basket name[% delimiter | html %]Order number[% delimiter | html %]Author[% delimiter | html %]Title[% delimiter | html %]Publisher[% delimiter | html %]Publication year[% delimiter | html %]Collection title[% delimiter | html %]ISBN[% delimiter | html %]Quantity[% delimiter | html %]RRP tax included[% delimiter | html %]RRP tax excluded[% delimiter | html %]Discount[% delimiter | html %]Estimated cost tax included[% delimiter | html %]Estimated cost tax excluded[% delimiter | html %]Note for vendor[% delimiter | html %]Entry date[% delimiter | html %]Bookseller name[% delimiter | html %]Bookseller physical address[% delimiter | html %]Bookseller postal address[% delimiter | html %]Contract number[% delimiter | html %]Contract name[% delimiter | html %]Basket group delivery place[% delimiter | html %]Basket group billing place[% delimiter | html %]Basket delivery place[% delimiter | html %]Basket billing place[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/lateorders.tt (-1 / +1 lines)
Lines 1-4 Link Here
1
[%- USE Koha -%]
1
[%- USE Koha -%]
2
[%- SET delimiter = Koha.Preference('CSVDelimiter') || ',' -%]
2
[%- SET delimiter = Koha.CSVDelimiter() -%]
3
3
4
[%- BLOCK -%]ORDER DATE[%- delimiter | html -%]ESTIMATED DELIVERY DATE[%- delimiter | html -%]VENDOR[%- delimiter | html -%]INFORMATION[%- delimiter | html -%]TOTAL COST[%- delimiter | html -%]BASKET[%- delimiter | html -%]CLAIMS COUNT[%- delimiter | html -%]CLAIMED DATE[%- delimiter | html -%]INTERNAL NOTE[%- delimiter | html -%]VENDOR NOTE[%- delimiter | html -%]ISBN[%- END -%]
4
[%- BLOCK -%]ORDER DATE[%- delimiter | html -%]ESTIMATED DELIVERY DATE[%- delimiter | html -%]VENDOR[%- delimiter | html -%]INFORMATION[%- delimiter | html -%]TOTAL COST[%- delimiter | html -%]BASKET[%- delimiter | html -%]CLAIMS COUNT[%- delimiter | html -%]CLAIMED DATE[%- delimiter | html -%]INTERNAL NOTE[%- delimiter | html -%]VENDOR NOTE[%- delimiter | html -%]ISBN[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/catalogue/itemsearch.tt (-1 / +1 lines)
Lines 1-6 Link Here
1
[%- USE raw -%]
1
[%- USE raw -%]
2
[%- USE Koha -%]
2
[%- USE Koha -%]
3
[%- SET delimiter = Koha.Preference('CSVDelimiter') || ',' -%]
3
[%- SET delimiter = Koha.CSVDelimiter() -%]
4
[%- BLOCK -%]
4
[%- BLOCK -%]
5
"Title"
5
"Title"
6
[%- delimiter | $raw -%]
6
[%- delimiter | $raw -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basket.tt (-1 / +1 lines)
Lines 1-5 Link Here
1
[%- USE Koha -%]
1
[%- USE Koha -%]
2
[%- SET delimiter = Koha.Preference( 'CSVDelimiter' ) || ',' -%]
2
[%- SET delimiter = Koha.CSVDelimiter() -%]
3
3
4
[%- INCLUDE csv_headers/acqui/basket.tt -%]
4
[%- INCLUDE csv_headers/acqui/basket.tt -%]
5
[%- INCLUDE empty_line.inc -%]
5
[%- INCLUDE empty_line.inc -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basketgroup.tt (-1 / +1 lines)
Lines 1-5 Link Here
1
[%- USE Koha -%]
1
[%- USE Koha -%]
2
[%- SET delimiter = Koha.Preference( 'CSVDelimiter' ) || ',' -%]
2
[%- SET delimiter = Koha.CSVDelimiter() -%]
3
3
4
[%- USE Price -%]
4
[%- USE Price -%]
5
[%- INCLUDE csv_headers/acqui/basketgroup.tt -%]
5
[%- INCLUDE csv_headers/acqui/basketgroup.tt -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/lateorders.tt (-2 / +1 lines)
Lines 1-5 Link Here
1
[%- USE Koha -%]
1
[%- USE Koha -%]
2
[%- SET delimiter = Koha.Preference( 'CSVDelimiter' ) || ',' -%]
2
[%- SET delimiter = Koha.CSVDelimiter() -%]
3
3
4
[%- USE KohaDates -%]
4
[%- USE KohaDates -%]
5
[%- INCLUDE csv_headers/acqui/lateorders.tt -%]
5
[%- INCLUDE csv_headers/acqui/lateorders.tt -%]
6
- 

Return to bug 28327