From ec50dc9623c48be5d2fb387b375c2bae8ebb69bb Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Sat, 2 May 2020 15:42:18 +0200 Subject: [PATCH] Bug 24163: (QA follow-up) Fix wordings --- installer/data/mysql/atomicupdate/bug_24163.perl | 2 +- installer/data/mysql/en/optional/csv_profiles.yml | 6 +++--- .../intranet-tmpl/prog/en/modules/tools/csv-profiles.tt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_24163.perl b/installer/data/mysql/atomicupdate/bug_24163.perl index f595db9102..6488cdfe8e 100644 --- a/installer/data/mysql/atomicupdate/bug_24163.perl +++ b/installer/data/mysql/atomicupdate/bug_24163.perl @@ -2,7 +2,7 @@ $DBversion = 'XXX'; # will be replaced by the RM if( CheckVersion( $DBversion ) ) { $dbh->do(q{ INSERT IGNORE INTO export_format( profile, description, content, csv_separator, type, used_for ) VALUES - ("Late orders (csv profile)", "default CSV export for late orders", 'Title[% separator %]Author[% separator %]Publication year[% separator %]ISBN[% separator %]Quantity[% separator %]Number of claims + ("Late orders (CSV profile)", "Default CSV export for late orders", 'Title[% separator %]Author[% separator %]Publication year[% separator %]ISBN[% separator %]Quantity[% separator %]Number of claims [% FOR order IN orders ~%] [%~ SET biblio = order.biblio ~%] "[% biblio.title %]"[% separator ~%] diff --git a/installer/data/mysql/en/optional/csv_profiles.yml b/installer/data/mysql/en/optional/csv_profiles.yml index a4862ac2c5..6e871d5825 100644 --- a/installer/data/mysql/en/optional/csv_profiles.yml +++ b/installer/data/mysql/en/optional/csv_profiles.yml @@ -28,14 +28,14 @@ tables: multiline: [ content ] rows: - profile: "issues to claim" - description: "default CSV export for serial issue claims" + description: "Default CSV export for serial issue claims" content: - "SUPPLIER=aqbooksellers.name|TITLE=subscription.title|ISSUE NUMBER=serial.serialseq|LATE SINCE=serial.planneddate" csv_separator: "," type: sql used_for: late_issues - - profile: "Late orders (csv profile)" - description: "default CSV export for late orders" + - profile: "Late orders (CSV profile)" + description: "Default CSV export for late orders" content: - 'Title[% separator %]Author[% separator %]Publication year[% separator %]ISBN[% separator %]Quantity[% separator %]Number of claims' - '[% FOR order IN orders ~%]' diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt index 6365ede514..675d8ccea2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt @@ -210,7 +210,7 @@

Example: Name=subscription.name|Title=subscription.title|Issue number=serial.serialseq

For late issues claims you can use data from following tables: serial, subscription, biblio, biblioitems and aqbookseller.

For basket exports you can use data from following tables: biblio, biblioitems, aqorders, aqbudgets and aqbasket.

-

For late orders exports you must provide a Template Toolkit syntax that will generate the whole CSV file..

+

For exporting late orders you must provide a profile in Template Toolkit syntax to generate the CSV file.

-- 2.20.1