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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt (-27 / +1 lines)
Lines 3-34 Link Here
3
    [%- PROCESS 'i18n.inc' -%]
3
    [%- PROCESS 'i18n.inc' -%]
4
    [%- SET delimiter = Koha.CSVDelimiter() -%]
4
    [%- SET delimiter = Koha.CSVDelimiter() -%]
5
    [%- BLOCK -%]
5
    [%- BLOCK -%]
6
        "[% t("Contract name") | html %]"
6
        "[% t("Contract name") | html %]"[% delimiter | html %]"[% t("Order number") | html %]"[% delimiter | html %]"[% t("Entry date") | html %]"[% delimiter | html %]"[% t("ISBN") | html %]"[% delimiter | html %]"[% t("Author") | html %]"[% delimiter | html %]"[% t("Title") | html %]"[% delimiter | html %]"[% t("Publication year") | html %]"[% delimiter | html %]"[% t("Publisher") | html %]"[% delimiter | html %]"[% t("Collection title") | html %]"[% delimiter | html %]"[% t("Note for vendor") | html %]"[% delimiter | html %]"[% t("Quantity") | html %]"[% delimiter | html %]"[% t("RRP") | html %]"[% delimiter | html %]"[% t("Delivery place") | html %]"[% delimiter | html %]"[% t("Billing place") | html %]"
7
        [% delimiter | html %]
8
        "[% t("Order number") | html %]"
9
        [% delimiter | html %]
10
        "[% t("Entry date") | html %]"
11
        [% delimiter | html %]
12
        "[% t("ISBN") | html %]"
13
        [% delimiter | html %]
14
        "[% t("Author") | html %]"
15
        [% delimiter | html %]
16
        "[% t("Title") | html %]"
17
        [% delimiter | html %]
18
        "[% t("Publication year") | html %]"
19
        [% delimiter | html %]
20
        "[% t("Publisher") | html %]"
21
        [% delimiter | html %]
22
        "[% t("Collection title") | html %]"
23
        [% delimiter | html %]
24
        "[% t("Note for vendor") | html %]"
25
        [% delimiter | html %]
26
        "[% t("Quantity") | html %]"
27
        [% delimiter | html %]
28
        "[% t("RRP") | html %]"
29
        [% delimiter | html %]
30
        "[% t("Delivery place") | html %]"
31
        [% delimiter | html %]
32
        "[% t("Billing place") | html %]"
33
    [%- END -%]
7
    [%- END -%]
34
[%- END -%]
8
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt (-51 / +1 lines)
Lines 3-58 Link Here
3
    [%- PROCESS 'i18n.inc' -%]
3
    [%- PROCESS 'i18n.inc' -%]
4
    [%- SET delimiter = Koha.CSVDelimiter() -%]
4
    [%- SET delimiter = Koha.CSVDelimiter() -%]
5
    [%- BLOCK -%]
5
    [%- BLOCK -%]
6
        "[% t("Account number") | html %]"
6
        "[% t("Account number") | html %]"[% delimiter | html %]"[% t("Basket name") | html %]"[% delimiter | html %]"[% t("Order number") | html %]"[% delimiter | html %]"[% t("Author") | html %]"[% delimiter | html %]"[% t("Title") | html %]"[% delimiter | html %]"[% t("Publisher") | html %]"[% delimiter | html %]"[% t("Publication year") | html %]"[% delimiter | html %]"[% t("Collection title") | html %]"[% delimiter | html %]"[% t("ISBN") | html %]"[% delimiter | html %]"[% t("Quantity") | html %]"[% delimiter | html %]"[% t("RRP tax included") | html %]"[% delimiter | html %]"[% t("RRP tax excluded") | html %]"[% delimiter | html %]"[% t("Discount") | html %]"[% delimiter | html %]"[% t("Estimated cost tax included") | html %]"[% delimiter | html %]"[% t("Estimated cost tax excluded") | html %]"[% delimiter | html %]"[% t("Note for vendor") | html %]"[% delimiter | html %]"[% t("Entry date") | html %]"[% delimiter | html %]"[% t("Bookseller name") | html %]"[% delimiter | html %]"[% t("Bookseller physical address") | html %]"[% delimiter | html %]"[% t("Bookseller postal address") | html %]"[% delimiter | html %]"[% t("Contract number") | html %]"[% delimiter | html %]"[% t("Contract name") | html %]"[% delimiter | html %]"[% t("Basket group delivery place") | html %]"[% delimiter | html %]"[% t("Basket group billing place") | html %]"[% delimiter | html %]"[% t("Basket delivery place") | html %]"[% delimiter | html %]"[% t("Basket billing place") | html %]"
7
        [% delimiter | html %]
8
        "[% t("Basket name") | html %]"
9
        [% delimiter | html %]
10
        "[% t("Order number") | html %]"
11
        [% delimiter | html %]
12
        "[% t("Author") | html %]"
13
        [% delimiter | html %]
14
        "[% t("Title") | html %]"
15
        [% delimiter | html %]
16
        "[% t("Publisher") | html %]"
17
        [% delimiter | html %]
18
        "[% t("Publication year") | html %]"
19
        [% delimiter | html %]
20
        "[% t("Collection title") | html %]"
21
        [% delimiter | html %]
22
        "[% t("ISBN") | html %]"
23
        [% delimiter | html %]
24
        "[% t("Quantity") | html %]"
25
        [% delimiter | html %]
26
        "[% t("RRP tax included") | html %]"
27
        [% delimiter | html %]
28
        "[% t("RRP tax excluded") | html %]"
29
        [% delimiter | html %]
30
        "[% t("Discount") | html %]"
31
        [% delimiter | html %]
32
        "[% t("Estimated cost tax included") | html %]"
33
        [% delimiter | html %]
34
        "[% t("Estimated cost tax excluded") | html %]"
35
        [% delimiter | html %]
36
        "[% t("Note for vendor") | html %]"
37
        [% delimiter | html %]
38
        "[% t("Entry date") | html %]"
39
        [% delimiter | html %]
40
        "[% t("Bookseller name") | html %]"
41
        [% delimiter | html %]
42
        "[% t("Bookseller physical address") | html %]"
43
        [% delimiter | html %]
44
        "[% t("Bookseller postal address") | html %]"
45
        [% delimiter | html %]
46
        "[% t("Contract number") | html %]"
47
        [% delimiter | html %]
48
        "[% t("Contract name") | html %]"
49
        [% delimiter | html %]
50
        "[% t("Basket group delivery place") | html %]"
51
        [% delimiter | html %]
52
        "[% t("Basket group billing place") | html %]"
53
        [% delimiter | html %]
54
        "[% t("Basket delivery place") | html %]"
55
        [% delimiter | html %]
56
        "[% t("Basket billing place") | html %]"
57
    [%- END -%]
7
    [%- END -%]
58
[%- END -%]
8
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/lateorders.tt (-21 / +1 lines)
Lines 3-28 Link Here
3
    [%- PROCESS 'i18n.inc' -%]
3
    [%- PROCESS 'i18n.inc' -%]
4
    [%- SET delimiter = Koha.CSVDelimiter() -%]
4
    [%- SET delimiter = Koha.CSVDelimiter() -%]
5
    [%- BLOCK -%]
5
    [%- BLOCK -%]
6
        "[% t("ORDER DATE") | html %]"
6
        "[% t("ORDER DATE") | html %]"[%- delimiter | html -%]"[% t("ESTIMATED DELIVERY DATE") | html %]"[%- delimiter | html -%]"[% t("VENDOR") | html %]"[%- delimiter | html -%]"[% t("INFORMATION") | html %]"[%- delimiter | html -%]"[% t("TOTAL COST") | html %]"[%- delimiter | html -%]"[% t("BASKET") | html %]"[%- delimiter | html -%]"[% t("CLAIMS COUNT") | html %]"[%- delimiter | html -%]"[% t("CLAIMED DATE") | html %]"[%- delimiter | html -%]"[% t("INTERNAL NOTE") | html %]"[%- delimiter | html -%]"[% t("VENDOR NOTE") | html %]"[%- delimiter | html -%]"[% t("ISBN") | html %]"
7
        [%- delimiter | html -%]
8
        "[% t("ESTIMATED DELIVERY DATE") | html %]"
9
        [%- delimiter | html -%]
10
        "[% t("VENDOR") | html %]"
11
        [%- delimiter | html -%]
12
        "[% t("INFORMATION") | html %]"
13
        [%- delimiter | html -%]
14
        "[% t("TOTAL COST") | html %]"
15
        [%- delimiter | html -%]
16
        "[% t("BASKET") | html %]"
17
        [%- delimiter | html -%]
18
        "[% t("CLAIMS COUNT") | html %]"
19
        [%- delimiter | html -%]
20
        "[% t("CLAIMED DATE") | html %]"
21
        [%- delimiter | html -%]
22
        "[% t("INTERNAL NOTE") | html %]"
23
        [%- delimiter | html -%]
24
        "[% t("VENDOR NOTE") | html %]"
25
        [%- delimiter | html -%]
26
        "[% t("ISBN") | html %]"
27
    [%- END -%]
7
    [%- END -%]
28
[%- END -%]
8
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/catalogue/itemsearch.tt (-33 / +1 lines)
Lines 3-39 Link Here
3
[%- PROCESS 'i18n.inc' -%]
3
[%- PROCESS 'i18n.inc' -%]
4
[%- SET delimiter = Koha.CSVDelimiter() -%]
4
[%- SET delimiter = Koha.CSVDelimiter() -%]
5
[%- BLOCK -%]
5
[%- BLOCK -%]
6
    "[% t("Title") | html %]"
6
    "[% t("Title") | html %]"[%- delimiter | $raw -%]"[% t("Publication date") | html %]"[%- delimiter | $raw -%]"[% t("Publisher") | html %]"[%- delimiter | $raw -%]"[% t("Collection") | html %]"[%- delimiter | $raw -%]"[% t("Barcode") | html %]"[%- delimiter | $raw -%]"[% t("Serial enumeration") | html %]"[%- delimiter | $raw -%]"[% t("Call number") | html %]"[%- delimiter | $raw -%]"[% t("Home library") | html %]"[%- delimiter | $raw -%]"[% t("Current library") | html %]"[%- delimiter | $raw -%]"[% t("Shelving location") | html %]"[%- delimiter | $raw -%]"[% t("Item type") | html %]"[%- delimiter | $raw -%]"[% t("Inventory number") | html %]"[%- delimiter | $raw -%]"[% t("Not for loan status") | html %]"[%- delimiter | $raw -%]"[% t("Lost status") | html %]"[%- delimiter | $raw -%]"[% t("Withdrawn status") | html %]"[%- delimiter | $raw -%]"[% t("Checkouts") | html %]"[%- delimiter | $raw -%]"[% t("Due date") | html %]"
7
    [%- delimiter | $raw -%]
8
    "[% t("Publication date") | html %]"
9
    [%- delimiter | $raw -%]
10
    "[% t("Publisher") | html %]"
11
    [%- delimiter | $raw -%]
12
    "[% t("Collection") | html %]"
13
    [%- delimiter | $raw -%]
14
    "[% t("Barcode") | html %]"
15
    [%- delimiter | $raw -%]
16
    "[% t("Serial enumeration") | html %]"
17
    [%- delimiter | $raw -%]
18
    "[% t("Call number") | html %]"
19
    [%- delimiter | $raw -%]
20
    "[% t("Home library") | html %]"
21
    [%- delimiter | $raw -%]
22
    "[% t("Current library") | html %]"
23
    [%- delimiter | $raw -%]
24
    "[% t("Shelving location") | html %]"
25
    [%- delimiter | $raw -%]
26
    "[% t("Item type") | html %]"
27
    [%- delimiter | $raw -%]
28
    "[% t("Inventory number") | html %]"
29
    [%- delimiter | $raw -%]
30
    "[% t("Not for loan status") | html %]"
31
    [%- delimiter | $raw -%]
32
    "[% t("Lost status") | html %]"
33
    [%- delimiter | $raw -%]
34
    "[% t("Withdrawn status") | html %]"
35
    [%- delimiter | $raw -%]
36
    "[% t("Checkouts") | html %]"
37
    [%- delimiter | $raw -%]
38
    "[% t("Due date") | html %]"
39
[%- END -%]
7
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt (-23 / +1 lines)
Lines 1-28 Link Here
1
[% FILTER collapse %]
1
[% FILTER collapse %]
2
    [%- PROCESS 'i18n.inc' -%]
2
    [%- PROCESS 'i18n.inc' -%]
3
    [%- BLOCK -%]
3
    [%- BLOCK -%]
4
        "[% t("Manager name") | html %]"
4
        "[% t("Manager name") | html %]"[% sep | html %]"[% t("Patron cardnumber") | html %]"[% sep | html %]"[% t("Patron name") | html %]"[% sep | html %]"[% t("Transaction library") | html %]"[% sep | html %]"[% t("Transaction date") | html %]"[% sep | html %]"[% t("Updated") | html %]"[% sep | html %]"[% t("Transaction type") | html %]"[% sep |html %]"[% t("Notes") | html %]"[% sep | html %]"[% t("Amount") | html %]"[% sep | html %]"[% t("Title") | html %]"[% sep | html %]"[% t("Barcode") | html %]"[% sep | html %]"[% t("Item type") | html %]"
5
        [% sep | html %]
6
        "[% t("Patron cardnumber") | html %]"
7
        [% sep | html %]
8
        "[% t("Patron name") | html %]"
9
        [% sep | html %]
10
        "[% t("Transaction library") | html %]"
11
        [% sep | html %]
12
        "[% t("Transaction date") | html %]"
13
        [% sep | html %]
14
        "[% t("Updated") | html %]"
15
        [% sep | html %]
16
        "[% t("Transaction type") | html %]"
17
        [% sep |html %]
18
        "[% t("Notes") | html %]"
19
        [% sep | html %]
20
        "[% t("Amount") | html %]"
21
        [% sep | html %]
22
        "[% t("Title") | html %]"
23
        [% sep | html %]
24
        "[% t("Barcode") | html %]"
25
        [% sep | html %]
26
        "[% t("Item type") | html %]"
27
    [%- END -%]
5
    [%- END -%]
28
[%- END -%]
6
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/orders_by_budget.tt (-33 / +1 lines)
Lines 1-38 Link Here
1
[% FILTER collapse %]
1
[% FILTER collapse %]
2
    [%- PROCESS 'i18n.inc' -%]
2
    [%- PROCESS 'i18n.inc' -%]
3
    [%- BLOCK -%]
3
    [%- BLOCK -%]
4
        "[% t("Fund") | html %]"
4
        "[% t("Fund") | html %]"[% sep | html %]"[% t("Basket num") | html %]"[% sep | html %]"[% t("Basket name") | html %]"[% sep | html %]"[% t("Authorised by") | html %]"[% sep | html %]"[% t("Biblio number") | html %]"[% sep | html %]"[% t("Title") | html %]"[% sep | html %]"[% t("Currency") | html %]"[% sep | html %]"[% t("Vendor price") | html %]"[% sep | html %]"[% t("RRP") | html %]"[% sep | html %]"[% t("Budgeted cost") | html %]"[% sep | html %]"[% t("Quantity") | html %]"[% sep | html %]"[% t("Total RRP") | html %]"[% sep | html %]"[% t("Total cost") | html %]"[% sep | html %]"[% t("Entry date") | html %]"[% sep | html %]"[% t("Date received") | html %]"[% sep | html %]"[% t("Internal note") | html %]"[% sep | html %]"[% t("Vendor note") | html %]"
5
        [% sep | html %]
6
        "[% t("Basket num") | html %]"
7
        [% sep | html %]
8
        "[% t("Basket name") | html %]"
9
        [% sep | html %]
10
        "[% t("Authorised by") | html %]"
11
        [% sep | html %]
12
        "[% t("Biblio number") | html %]"
13
        [% sep | html %]
14
        "[% t("Title") | html %]"
15
        [% sep | html %]
16
        "[% t("Currency") | html %]"
17
        [% sep | html %]
18
        "[% t("Vendor price") | html %]"
19
        [% sep | html %]
20
        "[% t("RRP") | html %]"
21
        [% sep | html %]
22
        "[% t("Budgeted cost") | html %]"
23
        [% sep | html %]
24
        "[% t("Quantity") | html %]"
25
        [% sep | html %]
26
        "[% t("Total RRP") | html %]"
27
        [% sep | html %]
28
        "[% t("Total cost") | html %]"
29
        [% sep | html %]
30
        "[% t("Entry date") | html %]"
31
        [% sep | html %]
32
        "[% t("Date received") | html %]"
33
        [% sep | html %]
34
        "[% t("Internal note") | html %]"
35
        [% sep | html %]
36
        "[% t("Vendor note") | html %]"
37
    [%- END -%]
5
    [%- END -%]
38
[%- END -%]
6
[%- END -%]
(-)a/t/db_dependent/Acquisition/GetBasketAsCSV.t (-9 / +14 lines)
Lines 75-85 is($basket_csv1, 'autor,title,quantity Link Here
75
', 'CSV should be generated with user profile');
75
', 'CSV should be generated with user profile');
76
76
77
# Use default template
77
# Use default template
78
t::lib::Mocks::mock_preference('CSVDelimiter', ',');
78
t::lib::Mocks::mock_preference( 'CSVDelimiter', ',' );
79
my $basket_csv2 = C4::Acquisition::GetBasketAsCSV($basketno, $query);
79
my $basket_csv2 = C4::Acquisition::GetBasketAsCSV( $basketno, $query );
80
is($basket_csv2, 'Contract name,Order number,Entry date,ISBN,Author,Title,Publication year,Publisher,Collection title,Note for vendor,Quantity,RRP,Delivery place,Billing place
80
is(
81
"",' . $order->ordernumber  . ',2016-01-02,,"King, Stephen","Test Record",,"","","",3,,"",""
81
    $basket_csv2,
82
', 'CSV should be generated with default template');
82
    '"Contract name","Order number","Entry date","ISBN","Author","Title","Publication year","Publisher","Collection title","Note for vendor","Quantity","RRP","Delivery place","Billing place"
83
"",' . $order->ordernumber . ',2016-01-02,,"King, Stephen","Test Record",,"","","",3,,"",""
84
', 'CSV should be generated with default template'
85
);
83
86
84
my $basket_csv3 = C4::Acquisition::GetBasketAsCSV($basketno, $query, $csv_profile2->export_format_id);
87
my $basket_csv3 = C4::Acquisition::GetBasketAsCSV($basketno, $query, $csv_profile2->export_format_id);
85
is($basket_csv3, 'biblio.author,title,quantity
88
is($basket_csv3, 'biblio.author,title,quantity
Lines 94-103 try { Link Here
94
};
97
};
95
98
96
Koha::Biblios->find($biblionumber)->delete;
99
Koha::Biblios->find($biblionumber)->delete;
97
my $basket_csv4 = C4::Acquisition::GetBasketAsCSV($basketno, $query);
100
my $basket_csv4 = C4::Acquisition::GetBasketAsCSV( $basketno, $query );
98
is($basket_csv4, 'Contract name,Order number,Entry date,ISBN,Author,Title,Publication year,Publisher,Collection title,Note for vendor,Quantity,RRP,Delivery place,Billing place
101
is(
102
    $basket_csv4,
103
    '"Contract name","Order number","Entry date","ISBN","Author","Title","Publication year","Publisher","Collection title","Note for vendor","Quantity","RRP","Delivery place","Billing place"
99
"",' . $order->ordernumber . ',2016-01-02,,"","",,"","","",3,,"",""
104
"",' . $order->ordernumber . ',2016-01-02,,"","",,"","","",3,,"",""
100
', 'CSV should not fail if biblio does not exist');
105
', 'CSV should not fail if biblio does not exist'
101
106
);
102
107
103
$schema->storage->txn_rollback();
108
$schema->storage->txn_rollback();
(-)a/t/db_dependent/Acquisition/GetBasketGroupAsCSV.t (-10 / +18 lines)
Lines 58-73 my $order = Koha::Acquisition::Order->new({ Link Here
58
    entrydate => '2016-01-02',
58
    entrydate => '2016-01-02',
59
})->store;
59
})->store;
60
60
61
my $basketgroup_csv1 = C4::Acquisition::GetBasketGroupAsCSV($basketgroupid, $query);
61
my $basketgroup_csv1 = C4::Acquisition::GetBasketGroupAsCSV( $basketgroupid, $query );
62
is($basketgroup_csv1, '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
62
is(
63
,"",' . $order->ordernumber  . ',"King, Stephen","Test Record","",,"",,3,0.00,0.00,,0.00,0.00,"",2016-01-02,"my vendor","vendor address","",,"","","","",""
63
    $basketgroup_csv1,
64
', 'CSV should be generated');
64
    '"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"
65
,"",'
66
        . $order->ordernumber
67
        . ',"King, Stephen","Test Record","",,"",,3,0.00,0.00,,0.00,0.00,"",2016-01-02,"my vendor","vendor address","",,"","","","",""
68
', 'CSV should be generated'
69
);
65
70
66
Koha::Biblios->find($biblionumber)->delete;
71
Koha::Biblios->find($biblionumber)->delete;
67
my $basketgroup_csv2 = C4::Acquisition::GetBasketGroupAsCSV($basketgroupid, $query);
72
my $basketgroup_csv2 = C4::Acquisition::GetBasketGroupAsCSV( $basketgroupid, $query );
68
is($basketgroup_csv2, '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
73
is(
69
,"",' . $order->ordernumber  . ',"","","",,"",,3,0.00,0.00,,0.00,0.00,"",2016-01-02,"my vendor","vendor address","",,"","","","",""
74
    $basketgroup_csv2,
70
', 'CSV should not fail if biblio does not exist');
75
    '"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"
71
76
,"",'
77
        . $order->ordernumber
78
        . ',"","","",,"",,3,0.00,0.00,,0.00,0.00,"",2016-01-02,"my vendor","vendor address","",,"","","","",""
79
', 'CSV should not fail if biblio does not exist'
80
);
72
81
73
$schema->storage->txn_rollback();
82
$schema->storage->txn_rollback();
74
- 

Return to bug 34043