diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
index c7a796ed28..c53eabaed6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
@@ -1,5 +1,9 @@
[% USE raw %]
[% USE Koha %]
+[% USE Branches %]
+[% USE ItemTypes %]
+[% USE KohaDates %]
+[% USE AuthorisedValues %]
[% PROCESS 'i18n.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
@@ -46,38 +50,51 @@
[% IF ( do_it ) %]
[% FOREACH mainloo IN mainloop %]
[% IF ( mainloo.loopfilter.size ) %]
-
Filtered on:
- [% FOREACH loopfilte IN mainloo.loopfilter %]
-
- [% SWITCH loopfilte.crit %]
- [% CASE '0' %]
- Placed on (from)
- [% CASE '1' %]
- Placed on (to)
- [% CASE '2' %]
- Received on (from)
- [% CASE '3' %]
- Received on (to)
- [% CASE '4' %]
- Vendor
- [% CASE '5' %]
- Home library
- [% CASE '6' %]
- Collection
- [% CASE '7' %]
- Item type
- [% CASE '8' %]
- Fund
- [% CASE '9' %]
- Sort1
- [% CASE '10' %]
- Sort2
- [% CASE %]
- Unknown filter
- [% END %]
- : [% loopfilte.filter | html %]
-
- [% END %]
+
Filtered on:
+
+ [% FOREACH loopfilte IN mainloo.loopfilter %]
+
+ [% SWITCH loopfilte.crit %]
+ [% CASE '0' %]
+ Placed on (from):
+ [% loopfilte.filter | $KohaDates %]
+ [% CASE '1' %]
+ Placed on (to):
+ [% loopfilte.filter | $KohaDates %]
+ [% CASE '2' %]
+ Received on (from):
+ [% loopfilte.filter | html %]
+ [% CASE '3' %]
+ Received on (to):
+ [% loopfilte.filter | html %]
+ [% CASE '4' %]
+ Vendor:
+ [% loopfilte.filter | html %]
+ [% CASE '5' %]
+ Home library:
+ [% Branches.GetName( loopfilte.filter ) | html %]
+ [% CASE '6' %]
+ Collection:
+ [% AuthorisedValues.GetByCode( 'CCODE', loopfilte.filter ) | html %]
+ [% CASE '7' %]
+ Item type:
+ [% ItemTypes.GetDescription( loopfilte.filter ) | html %]
+ [% CASE '8' %]
+ Fund:
+ [% loopfilte.filter | html %]
+ [% CASE '9' %]
+ Sort1:
+ [% loopfilte.filter | html %]
+ [% CASE '10' %]
+ Sort2:
+ [% loopfilte.filter | html %]
+ [% CASE %]
+ Unknown filter:
+ [% loopfilte.filter | html %]
+ [% END %]
+
+ [% END %]
+
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
index 26338d50f6..1c9f4f4e97 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
@@ -2,6 +2,10 @@
[% USE Branches %]
[% USE Koha %]
[% USE Asset %]
+[% USE Categories %]
+[% USE KohaDates %]
+[% USE AuthorisedValues %]
+[% USE ExtendedAttributeTypes %]
[% PROCESS 'i18n.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
@@ -56,11 +60,75 @@
Patrons statistics
[% IF ( do_it ) %]
[% FOREACH mainloo IN mainloop %]
- [% IF ( mainloo.loopfilter.size>0 ) %]
-
Filtered on:
- [% FOREACH loopfilte IN mainloo.loopfilter %]
-
[% loopfilte.crit | html %] = [% loopfilte.filter | html %]
- [% END %]
+ [% IF ( mainloo.loopfilter.size > 0 ) %]
+
Filtered on:
+
+ [% FOREACH loopfilte IN mainloo.loopfilter %]
+
+ [% SWITCH loopfilte.crit %]
+ [% CASE 'Cat code' %]
+ Patron category:
+ [% Categories.GetName( loopfilte.filter ) | html %]
+ [% CASE 'ZIP/Postal code' %]
+ ZIP/Postal code:
+ [% loopfilte.filter | html %]
+ [% CASE 'Branch code' %]
+ Library:
+ [% Branches.GetName( loopfilte.filter ) | html %]
+ [% CASE 'Date of birth1' %]
+ Date of birth >
+ [% loopfilte.filter | html %]
+ [% CASE 'Date of birth2' %]
+ Date of birth <
+ [% loopfilte.filter | html %]
+ [% CASE 'Sex' %]
+ Gender:
+ [% SWITCH ( loopfilte.filter ) %]
+ [% CASE 'F' %]
+ Female
+ [% CASE 'M' %]
+ Male
+ [% CASE 'O' %]
+ Other
+ [% CASE %]
+ None specified
+ [% END %]
+ [% CASE 'Sort1' %]
+ Patron sort1: [% AuthorisedValues.GetByCode('Bsort1', loopfilte.filter ) | html %]
+ [% CASE 'Sort2' %]
+ Patron sort2: [% AuthorisedValues.GetByCode('Bsort2', loopfilte.filter ) | html %]
+ [% CASE 'Status' %]
+ Status:
+ [% SWITCH loopfilte.filter %]
+ [% CASE 'debarred' %]
+ Restricted
+ [% CASE 'gonenoaddress' %]
+ Gone no address
+ [% CASE 'lost' %]
+ Lost card
+ [% CASE %]
+ [% loopfilte.filter | html %]
+ [% END %]
+ [% CASE 'Activity' %]
+ Activity:
+ [% SWITCH loopfilte.filter %]
+ [% CASE 'active' %]
+ Active
+ [% CASE 'nonactive' %]
+ Inactive
+ [% CASE %]
+ [% loopfilte.filter | html %]
+ [% END %]
+ [% CASE "PA_CLASS" %]
+ [% loopfilte.label | html %]:
+ [% loopfilte.filter | html %]
+ [% CASE %]
+ [% loopfilte.crit | html %]:
+ [% loopfilte.filter | html %]
+ [% END %]
+
+ [% END %]
+
[% END %]
@@ -227,7 +295,7 @@
@@ -244,7 +312,7 @@
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
index d22f295e73..7ba47569ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
@@ -1,6 +1,8 @@
[% USE raw %]
[% USE Koha %]
[% USE Branches %]
+[% USE ItemTypes %]
+[% USE AuthorisedValues %]
[% PROCESS 'i18n.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
@@ -46,12 +48,52 @@
Catalog statistics
[% IF ( do_it ) %]
[% FOREACH mainloo IN mainloop %]
- [% IF ( mainloo.loopfilter ) %]
-
Filtered on:
+
Filtered on:
+
[% FOREACH loopfilte IN mainloo.loopfilter %]
-
[% loopfilte.crit | html %] =[% loopfilte.filter | html %]
+
+ [% SWITCH loopfilte.crit %]
+ [% CASE "Item CallNumber From" %]
+ Item call number from: [% loopfilte.filter | html %]
+ [% CASE "Item CallNumber To" %]
+ Item call number to: [% loopfilte.filter | html %]
+ [% CASE "Item type" %]
+ Item type: [% ItemTypes.GetDescription( loopfilte.filter ) | html %]
+ [% CASE "Publisher" %]
+ Publisher: [% loopfilte.filter | html %]
+ [% CASE "Publication year From" %]
+ Publication year from: [% loopfilte.filter | html %]
+ [% CASE "Publication year To" %]
+ Publication year to: [% loopfilte.filter | html %]
+ [% CASE "Library" %]
+ Library: [% Branches.GetName( loopfilte.filter ) | html %]
+ [% CASE "Shelving Location" %]
+ Location: [% AuthorisedValues.GetByCode( 'LOC', loopfilte.filter ) | html %]
+ [% CASE "Collection Code" %]
+ Collection: [% AuthorisedValues.GetByCode( 'CCODE', loopfilte.filter ) | html %]
+ [% CASE "Status" %]
+ Not for loan: [% AuthorisedValues.GetByCode( 'NOT_LOAN', loopfilte.filter ) | html %]
+ [% CASE "Materials" %]
+ Materials specified: [% loopfilte.filter | html %]
+ [% CASE "Barcode (not like)" %]
+ Barcode (not like): [% loopfilte.filter | html %]
+ [% CASE "Barcode (like)" %]
+ Barcode (like): [% loopfilte.filter | html %]
+ [% CASE "Date acquired (item) from" %]
+ Date acquired (item) from: [% loopfilte.filter | html %]
+ [% CASE "Date acquired (item) to" %]
+ Date acquired (item) to: [% loopfilte.filter | html %]
+ [% CASE "Date deleted (item) from" %]
+ Date deleted (item) from: [% loopfilte.filter | html %]
+ [% CASE "Date deleted (item) to" %]
+ Date deleted (item) to: [% loopfilte.filter | html %]
+ [% CASE %]
+ [% loopfilte.crit | html %]:
+ [% loopfilte.filter | html %]
+ [% END %]
+
[% END %]
- [% END %]
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
index 0b2de47820..9267a8dbff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
@@ -3,7 +3,9 @@
[% USE Branches %]
[% USE Categories %]
[% USE ItemTypes %]
+[% USE KohaDates %]
[% USE AuthorisedValues %]
+[% USE ExtendedAttributeTypes %]
[% PROCESS 'i18n.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
@@ -55,7 +57,7 @@
[% IF ( do_it ) %]
[% FOREACH mainloo IN mainloop %]
[% IF ( mainloo.loopfilter ) %]
-