@@ -, +, @@ --- C4/Budgets.pm | 8 ++++---- .../prog/en/modules/admin/authorised_values.tt | 7 ++++++- .../prog/en/modules/admin/categorie.tt | 8 +++++++- .../prog/en/modules/admin/patron-attr-types.tt | 10 ++++++++-- 4 files changed, 25 insertions(+), 8 deletions(-) --- a/C4/Budgets.pm +++ a/C4/Budgets.pm @@ -400,11 +400,11 @@ sub GetAuthvalueDropbox { my $option_list = []; my @authorised_values = ( q{} ); - while (my ($value, $lib) = $sth->fetchrow_array) { + while (my $av = $sth->fetchrow_hashref) { push @{$option_list}, { - value => $value, - label => $lib, - default => ($default eq $value), + value => $av->{authorised_value}, + label => $av->{lib}, + default => ($default eq $av->{authorised_value}), }; } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -274,7 +274,12 @@ [% FOREACH branch IN loo.branches %] [% branches_str = branches_str _ " " _ branch.branchname _ "(" _ branch.branchcode _ ")" %] [% END %] - [% loo.branches.size %] branches limitations + + [% IF loo.branches.size > 1 %] + [% loo.branches.size %] branches limitations + [% ELSE %] + [% loo.branches.size %] branch limitation + [% END %] [% ELSE %] No limitation [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt @@ -371,7 +371,13 @@ Confirm deletion of category [% categorycode |html %][% END %] [% FOREACH branch IN loo.branches %] [% branches_str = branches_str _ " " _ branch.branchname _ "(" _ branch.branchcode _ ")" %] [% END %] - [% loo.branches.size %] branches limitations + + [% IF loo.branches.size > 1 %] + [% loo.branches.size %] branches limitations + [% ELSE %] + [% loo.branches.size %] branch limitation + [% END %] + [% ELSE %] No limitation [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -315,12 +315,18 @@ function CheckAttributeTypeForm(f) { [% item.code |html %] [% item.description %] - [% IF item.branches > 0 %] + [% IF item.branches.size > 0 %] [% branches_str = "" %] [% FOREACH branch IN item.branches %] [% branches_str = branches_str _ " " _ branch.branchname _ "(" _ branch.branchcode _ ")" %] [% END %] - [% item.branches.size %] branches limitations + + [% IF item.branches.size > 1 %] + [% item.branches.size %] branches limitations + [% ELSE %] + [% item.branches.size %] branch limitation + [% END %] + [% ELSE %] No limitation [% END %] --