Merge remote-tracking branch 'origin/new/bug_7986'

koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc

@@ -15,7 +15,6 @@
 [% IF ( searching ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Searching" href="/cgi-bin/koha/admin/preferences.pl?tab=searching">Searching</a></li>
 [% IF ( serials ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Serials" href="/cgi-bin/koha/admin/preferences.pl?tab=serials">Serials</a></li>
 [% IF ( staff_client ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Staff client" href="/cgi-bin/koha/admin/preferences.pl?tab=staff_client">Staff client</a></li>
-[% IF ( tools ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Tools" href="/cgi-bin/koha/admin/preferences.pl?tab=tools">Tools</a></li>
 [% IF ( web_services ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Web services" href="/cgi-bin/koha/admin/preferences.pl?tab=web_services">Web services</a></li>
 </ul>
 </div>

koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref

@@ -116,11 +116,14 @@ Circulation:
                   no: "Do not"
             - update a bibliographic record's total issues count whenever an item is issued (WARNING! This increases server load significantly; if performance is a concern, use the update_totalissues.pl cron job to update the total issues count).
         -
+            - Use the
+            - pref: ExportWithCsvProfile
+            - CSV profile when exporting patron checkout history (enter CSV Profile name)
+        -
+            - The following fields should be excluded from the patron checkout history CSV or iso2709 export
             - pref: ExportRemoveFields
-            - choices:
-                yes: Export
-                no: "Don't export"
-            - fields for csv or iso2709 export
+            - (separate fields with space, e.g. 100a 200b 300c)
+
     Checkout Policy:
         -
             - pref: AllowNotForLoanOverride

koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/tools.pref

@@ -1,4 +0,0 @@
-Tools:
-    -
-        - pref: ExportWithCsvProfile
-        - CSV profile for export