@@ -, +, @@ --- .../prog/en/modules/tools/access_files.tt | 1 + .../tools/automatic_item_modification_by_age.tt | 2 +- .../prog/en/modules/tools/batchMod-del.tt | 5 ++++ .../prog/en/modules/tools/batchMod-edit.tt | 3 +++ .../prog/en/modules/tools/batch_delete_records.tt | 2 ++ .../en/modules/tools/batch_extend_due_dates.tt | 2 ++ .../en/modules/tools/batch_record_modification.tt | 2 ++ .../prog/en/modules/tools/csv-profiles.tt | 1 + .../prog/en/modules/tools/holidays.tt | 29 +++++++++++----------- .../prog/en/modules/tools/inventory.tt | 1 + .../prog/en/modules/tools/koha-news.tt | 1 + .../intranet-tmpl/prog/en/modules/tools/letter.tt | 3 +++ .../prog/en/modules/tools/manage-marc-import.tt | 4 +++ .../modules/tools/marc_modification_templates.tt | 2 ++ .../prog/en/modules/tools/modborrowers.tt | 2 ++ .../prog/en/modules/tools/overduerules.tt | 1 + .../prog/en/modules/tools/problem-reports.tt | 1 + .../prog/en/modules/tools/quotes-upload.tt | 1 + .../intranet-tmpl/prog/en/modules/tools/quotes.tt | 1 + .../prog/en/modules/tools/scheduler.tt | 3 ++- .../prog/en/modules/tools/stockrotation.tt | 2 ++ .../intranet-tmpl/prog/en/modules/tools/upload.tt | 1 + .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 1 + 23 files changed, 55 insertions(+), 16 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt @@ -38,6 +38,7 @@ [% ELSE %] [% IF ( files_loop ) %] + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt @@ -187,8 +187,8 @@ [% ELSIF rules %]
-

List of rules

Files
Name
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt @@ -42,6 +42,7 @@ [% IF ( itemresults ) %]

Warning, the following barcodes were not found:

[% ELSE %]

Warning: no barcodes were found

[% END %]
List of rules
Age
+ @@ -57,6 +58,7 @@ [% IF ( itemresults ) %]

Warning, the following itemnumbers were not found:

[% ELSE %]

Warning: no itemnumbers were found

[% END %]
Barcodes not found
Barcodes not found
+ @@ -73,6 +75,7 @@

Warning, the following items cannot be deleted:

Itemnumbers not found
Itemnumbers not found
+ @@ -111,6 +114,7 @@

Cannot be deleted
Cannot be deleted
+ [% IF ( show ) %][% END %] @@ -260,6 +264,7 @@

[% not_deleted_items | html %] item(s) could not be deleted: [% FOREACH not_deleted_itemnumber IN not_deleted_itemnumbers %][% not_deleted_itemnumber.itemnumber | html %][% END %]

[% IF ( not_deleted_loop ) %]
Items
 
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt @@ -74,6 +74,7 @@
Items
Itemnumber
+ @@ -97,6 +98,7 @@
Barcodes not found
Barcodes not found
+ @@ -152,6 +154,7 @@

Itemnumbers not found
Itemnumbers not found
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt @@ -143,6 +143,7 @@
Items
 
+ @@ -175,6 +176,7 @@
Biblios
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt @@ -129,6 +129,7 @@ | Clear all
Authorities
+ @@ -178,6 +179,7 @@
Checkouts
 
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt @@ -183,6 +183,7 @@ | Clear all
Checkouts results
Due date
+ @@ -211,6 +212,7 @@ | Clear all
Biblios
 
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt @@ -294,6 +294,7 @@ [% IF csv_profiles %]
Authorities
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt @@ -238,15 +238,12 @@

+

Holidays

[% IF ( EXCEPTION_HOLIDAYS_LOOP ) %] -

Exceptions

-
CSV profiles
CSV profile ID Name
+ @@ -264,14 +261,18 @@ - [% END %] + [% END %]
Exceptions
Date Title[% EXCEPTION_HOLIDAYS_LOO.TITLE | html %] [% EXCEPTION_HOLIDAYS_LOO.DESCRIPTION | html %]
+ [% END %] [% IF ( WEEK_DAYS_LOOP ) %] -

Weekly - Repeatable holidays

+ @@ -293,8 +294,8 @@ [% END %] [% IF ( DAY_MONTH_HOLIDAYS_LOOP ) %] -

Yearly - Repeatable holidays

Weekly - Repeatable holidays
Day of week
+ [% IF ( dateformat == "metric" ) %] @@ -321,12 +322,8 @@ [% END %] [% IF ( HOLIDAYS_LOOP ) %] -

Unique holidays

-
Yearly - Repeatable holidays
+ @@ -345,9 +342,13 @@ - [% END %] + [% END %]
Unique holidays
Date[% HOLIDAYS_LOO.TITLE | html %] [% HOLIDAYS_LOO.DESCRIPTION.replace('\\\r\\\n', '
') | html %]
+ [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt @@ -235,6 +235,7 @@ [% END %] + [% UNLESS uploadedbarcodesflag %][% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt @@ -143,6 +143,7 @@ [% IF ( opac_news_count ) %]
Inventory
Seen
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -172,6 +172,7 @@ [% IF letter %]
News
  Location
+ @@ -488,6 +489,7 @@ [% IF letter.content && letter.content.length > 0 %][% letter.content.length | html %][% ELSE %]0[% END %]/160 characters [% END %]
Letter
Library
+
SQL
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt @@ -275,6 +275,7 @@ [% IF ( did_commit ) %]
Completed import of records
Notice to delete
Library
+ @@ -307,6 +308,7 @@ [% IF ( did_revert ) %]
Success: Import reversed
Import information
Number of records added [% num_added | html %]
+ @@ -342,6 +344,7 @@ [% END %]
Import reverse information
Number of records deleted [% num_deleted | html %]
+ @@ -411,6 +414,7 @@ [% IF import_batch_id && !did_clean %]
Batch list
# File name
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt @@ -84,6 +84,7 @@

MARC modification templates [% template_id | html %]

Records
#
+ @@ -111,6 +112,7 @@ [% IF ( ActionsLoop ) %]
Templates
Template
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt @@ -98,6 +98,7 @@ [% IF ( notfoundcardnumbers ) %]

Warning, the following cardnumbers were not found:

Template actions
Change order
+ @@ -140,6 +141,7 @@
Cardnumbers not found
Cardnumbers not found
+ [% IF ( op == 'show' ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt @@ -80,6 +80,7 @@ [% FOR tab IN tabs %]
Patrons
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt @@ -70,6 +70,7 @@
Rules
 
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt @@ -76,6 +76,7 @@
Problem reports
 
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt @@ -104,6 +104,7 @@

Quotes

[% IF quotes_count > 0 %] + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt @@ -76,8 +76,9 @@
-[% IF ( JOBS ) %]

Jobs already entered

+[% IF ( JOBS ) %]
Quotes
ID
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt @@ -99,6 +99,7 @@ [% IF existing_rotas.size > 0 %]
Jobs already entered
Date/Time Action
+ @@ -438,6 +439,7 @@ [% IF items.count > 0 %]
Stock rotation
Name
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt @@ -191,6 +191,7 @@ [% BLOCK table_results %]
Stock rotation manage items
Barcode
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -303,6 +303,7 @@
Upload results
Filename
+ --
Logs
Date