Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 35524: Fix terminology in basket group CSV export

Browse source 
Bookseller should be vendor to match our preferred terminology.

To test:
* Run:
  prove t/db_dependent/Acquisition/GetBasketGroupAsCSV.t
* Add a basket with at least one order line
* Close basket and add to a basket group
* Close the basket group
* Export as CSV
* Verify headers include "Bookseller"
* Apply patch, restart all
* Repeat export, it should now say "Vendor"
* Rerun tests

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Katrin Fischer 2023-12-10 13:29:29 +00:00 committed by Katrin Fischer
parent d534bad99e
commit 826a6cbdb9
Signed by: kfischer
GPG key ID: 0EF6E2C03357A834
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt
View file

@ -3,6 +3,6 @@
[%- PROCESS 'i18n.inc' -%]
[%- SET delimiter = Koha.CSVDelimiter() -%]
[%- BLOCK -%]
"[% 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 %]"
"[% 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("Vendor name") | html %]"[% delimiter | html %]"[% t("Vendor physical address") | html %]"[% delimiter | html %]"[% t("Vendor 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 %]"
[%- END -%]
[%- END -%]

4
t/db_dependent/Acquisition/GetBasketGroupAsCSV.t
View file

@ -63,7 +63,7 @@ t::lib::Mocks::mock_preference('CSVDelimiter', ',');
my $basketgroup_csv1 = C4::Acquisition::GetBasketGroupAsCSV( $basketgroupid, $query );
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"
'"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","Vendor name","Vendor physical address","Vendor postal address","Contract number","Contract name","Basket group delivery place","Basket group billing place","Basket delivery place","Basket billing place"
,"",'
. $order->ordernumber
. ',"King, Stephen","Test Record","",,"",,3,0.00,0.00,,0.00,0.00,"",2016-01-02,"my vendor","vendor address","",,"","","","",""
@ -74,7 +74,7 @@ Koha::Biblios->find($biblionumber)->delete;
my $basketgroup_csv2 = C4::Acquisition::GetBasketGroupAsCSV( $basketgroupid, $query );
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"
'"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","Vendor name","Vendor physical address","Vendor postal address","Contract number","Contract name","Basket group delivery place","Basket group billing place","Basket delivery place","Basket billing place"
,"",'
. $order->ordernumber
. ',"","","",,"",,3,0.00,0.00,,0.00,0.00,"",2016-01-02,"my vendor","vendor address","",,"","","","",""