@@ -, +, @@ translatable settigs. Doc type = item type, Branch = library --- .../prog/en/modules/reports/catalogue_out.tt | 45 ++++++++++++------- reports/catalogue_out.pl | 4 +- 2 files changed, 30 insertions(+), 19 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt @@ -40,24 +40,35 @@ [% FOREACH mainloo IN mainloop %] [% IF ( mainloo.loopfilter ) %]

Filtered on:

- [% FOREACH loopfilte IN mainloo.loopfilter %] - [% IF ( loopfilte.err ) %] -

Error: - [% ELSE %] -

- [% END %] - [% IF ( loopfilte.sql ) %] - - [% loopfilte.crit | html %] = [% loopfilte.filter | html %] - - [% ELSE %] - [% loopfilte.crit | html %] = [% loopfilte.filter | html %] - [% IF ( loopfilte.crit == "by" ) %] - [% group_by = loopfilte.filter %] +

[% END %] [% IF ( mainloo.looptables ) %] @@ -78,7 +89,7 @@ [% ELSIF ( group_by=="homebranch" ) %] [% Branches.GetName( looptable.coltitle ) | html %] [% ELSE %] - [% looptable.coltitle | html %] + Ungrouped [% END %] --- a/reports/catalogue_out.pl +++ a/reports/catalogue_out.pl @@ -76,8 +76,8 @@ sub calculate { if ( ( $i == 1 ) and ( @$filters[ $i - 1 ] ) ) { $cell{err} = 1 if ( @$filters[$i] < @$filters[ $i - 1 ] ); } - $cell{crit} = "Branch" if ( $i == 0 ); - $cell{crit} = "Doc Type" if ( $i == 1 ); + $cell{crit} = "homelibrary" if ( $i == 0 ); + $cell{crit} = "itemtype" if ( $i == 1 ); push @loopfilter, \%cell; } } --