@@ -, +, @@ account --- --- is the same as the amount of suggestions in the suggestions page. --- C4/Suggestions.pm | 14 ++++++++------ suggestion/suggestion.pl | 6 ++++-- 2 files changed, 12 insertions(+), 8 deletions(-) --- a/C4/Suggestions.pm +++ a/C4/Suggestions.pm @@ -135,12 +135,14 @@ sub SearchSuggestion { if ( C4::Context->preference('IndependentBranches') ) { my $userenv = C4::Context->userenv; if ($userenv) { - if ( !C4::Context->IsSuperLibrarian() && !$suggestion->{branchcode} ) + if ( !C4::Context->IsSuperLibrarian()) { - push @sql_params, $$userenv{branch}; - push @query, q{ - AND (suggestions.branchcode=? OR suggestions.branchcode='') - }; + if( !$suggestion->{branchcode} || $suggestion->{branchcode} eq $userenv->{branch}){ + push @sql_params, $$userenv{branch}; + push @query, q{ + AND (suggestions.branchcode=? OR suggestions.branchcode='') + }; + } } } } else { @@ -405,7 +407,7 @@ sub CountSuggestion { FROM suggestions LEFT JOIN borrowers ON borrowers.borrowernumber=suggestions.suggestedby WHERE STATUS=? - AND (borrowers.branchcode='' OR borrowers.branchcode=?) + AND (suggestions.branchcode='' OR suggestions.branchcode=?) }; $sth = $dbh->prepare($query); $sth->execute( $status, $userenv->{branch} ); --- a/suggestion/suggestion.pl +++ a/suggestion/suggestion.pl @@ -261,8 +261,10 @@ if ($op=~/else/) { my @allsuggestions; foreach my $criteriumvalue ( @criteria_dv ) { # By default, display suggestions from current working branch - unless ( exists $$suggestion_ref{'branchcode'} ) { - $$suggestion_ref{'branchcode'} = C4::Context->userenv->{'branch'}; + if (C4::Context->preference('IndependentBranches') && !C4::Context->IsSuperLibrarian()) { + unless ( exists $$suggestion_ref{'branchcode'} ) { + $$suggestion_ref{'branchcode'} = C4::Context->userenv->{'branch'}; + } } my $definedvalue = defined $$suggestion_ref{$displayby} && $$suggestion_ref{$displayby} ne ""; --