@@ -, +, @@ --- C4/Auth.pm | 9 +--- C4/Branch.pm | 19 ------- C4/Search.pm | 3 ++ Koha/Template/Plugin/Branches.pm | 21 ++++---- acqui/basketgroup.pl | 7 +-- acqui/basketheader.pl | 10 +--- acqui/neworderempty.pl | 18 ------- admin/aqbudgetperiods.pl | 3 -- admin/aqbudgets.pl | 6 +-- admin/aqplan.pl | 2 - admin/clone-rules.pl | 4 -- admin/smart-rules.pl | 13 +---- catalogue/search.pl | 20 +------ cataloguing/additem.pl | 22 ++++---- circ/bookcount.pl | 12 +++-- circ/branchtransfers.pl | 1 - circ/overdue.pl | 3 -- circ/selectbranchprinter.pl | 4 +- circ/view_holdsqueue.pl | 2 - course_reserves/add_items.pl | 2 - .../prog/en/includes/budgets-admin-search.inc | 9 ++-- .../prog/en/includes/doc-head-close.inc | 1 + .../prog/en/includes/html_helpers.inc | 9 ++++ .../prog/en/modules/acqui/basketgroup.tt | 24 ++------- .../prog/en/modules/acqui/basketheader.tt | 21 ++------ .../prog/en/modules/admin/aqbudgets.tt | 12 ++--- .../prog/en/modules/admin/clone-rules.tt | 63 +++++++++------------- .../prog/en/modules/admin/smart-rules.tt | 30 +++++++---- .../prog/en/modules/admin/transport-cost-matrix.tt | 5 +- koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 4 +- .../prog/en/modules/catalogue/advsearch.tt | 8 +-- .../prog/en/modules/circ/bookcount.tt | 12 ++--- .../prog/en/modules/circ/branchtransfers.tt | 11 +--- .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 25 +++------ .../prog/en/modules/circ/selectbranchprinter.tt | 9 +--- .../prog/en/modules/circ/view_holdsqueue.tt | 14 +++-- .../en/modules/course_reserves/add_items-step2.tt | 8 +-- .../prog/en/modules/members/member.tt | 8 +-- .../prog/en/modules/members/memberentrygen.tt | 13 ++--- .../prog/en/modules/reports/bor_issues_top.tt | 4 +- .../prog/en/modules/reports/borrowers_stats.tt | 13 ++--- .../prog/en/modules/reports/cat_issues_top.tt | 13 ++--- .../prog/en/modules/reports/catalogue_out.tt | 8 +-- .../prog/en/modules/reports/catalogue_stats.tt | 9 ++-- .../prog/en/modules/reports/issues_avg_stats.tt | 5 +- .../modules/reports/issues_by_borrower_category.tt | 5 +- .../prog/en/modules/reports/issues_stats.tt | 15 ++---- .../prog/en/modules/reports/itemslost.tt | 7 +-- .../prog/en/modules/reports/itemtypes.tt | 8 +-- .../prog/en/modules/reports/reserves_stats.tt | 15 ++---- .../prog/en/modules/reports/serials_stats.tt | 8 +-- .../prog/en/modules/reserve/request.tt | 22 ++------ .../prog/en/modules/serials/checkexpiration.tt | 17 ++---- .../prog/en/modules/tools/holidays.tt | 12 ++--- .../prog/en/modules/tools/import_borrowers.tt | 7 +-- .../prog/en/modules/tools/inventory.tt | 8 +-- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 12 ++--- .../prog/en/modules/tools/overduerules.tt | 9 +--- .../bootstrap/en/includes/doc-head-close.inc | 1 + .../bootstrap/en/includes/html_helpers.inc | 9 ++++ .../opac-tmpl/bootstrap/en/includes/masthead.inc | 10 ++-- .../bootstrap/en/includes/opac-topissues.inc | 11 +--- .../bootstrap/en/modules/opac-advsearch.tt | 9 ++-- .../bootstrap/en/modules/opac-memberentry.tt | 9 +--- .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 17 ++---- .../bootstrap/en/modules/opac-suggestions.tt | 11 ++-- members/memberentry.pl | 11 ++-- members/members-home.pl | 30 +---------- opac/opac-memberentry.pl | 2 - opac/opac-reserve.pl | 5 +- opac/opac-suggestions.pl | 5 +- opac/opac-topissues.pl | 2 - opac/opac-user.pl | 18 ------- reports/bor_issues_top.pl | 12 ----- reports/borrowers_stats.pl | 10 ---- reports/cat_issues_top.pl | 2 - reports/catalogue_out.pl | 2 - reports/catalogue_stats.pl | 2 - reports/guided_reports.pl | 10 ++-- reports/issues_avg_stats.pl | 1 - reports/issues_by_borrower_category.plugin | 2 - reports/issues_stats.pl | 2 - reports/itemslost.pl | 7 +-- reports/itemtypes.plugin | 6 --- reports/reserves_stats.pl | 2 - reports/serials_stats.pl | 3 +- reserve/request.pl | 15 +----- serials/checkexpiration.pl | 8 +-- serials/claims.pl | 3 -- t/db_dependent/Branch.t | 5 -- t/db_dependent/Holds/LocalHoldsPriority.t | 3 -- t/db_dependent/Holds/RevertWaitingStatus.t | 7 +-- t/db_dependent/Reserves.t | 5 +- tools/batchMod.pl | 18 +++---- tools/holidays.pl | 21 -------- tools/import_borrowers.pl | 4 -- tools/inventory.pl | 11 ---- tools/letter.pl | 20 +------ tools/modborrowers.pl | 4 +- tools/overduerules.pl | 3 -- 100 files changed, 285 insertions(+), 717 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/html_helpers.inc --- a/C4/Auth.pm +++ a/C4/Auth.pm @@ -29,7 +29,6 @@ require Exporter; use C4::Context; use C4::Templates; # to get the template use C4::Languages; -use C4::Branch; # GetBranches use C4::Search::History; use Koha; use Koha::AuthUtils qw(get_script_name hash_password); @@ -513,7 +512,6 @@ sub get_template_and_user { $template->param( OpacAdditionalStylesheet => C4::Context->preference("OpacAdditionalStylesheet"), AnonSuggestions => "" . C4::Context->preference("AnonSuggestions"), - BranchesLoop => GetBranchesLoop($opac_name), BranchCategoriesLoop => $library_categories, opac_name => $opac_name, LibraryName => "" . C4::Context->preference("LibraryName"), @@ -1079,7 +1077,7 @@ sub checkauth { $branchcode = $query->param('branch'); $branchname = Koha::Libraries->find($branchcode)->branchname; } - my $branches = GetBranches(); + my $branches = C4::Branch::GetBranches(); if ( C4::Context->boolean_preference('IndependentBranches') && C4::Context->boolean_preference('Autolocation') ) { # we have to check they are coming from the right ip range @@ -1090,7 +1088,6 @@ sub checkauth { } } - my @branchesloop; foreach my $br ( keys %$branches ) { # now we work with the treatment of ip @@ -1207,7 +1204,6 @@ sub checkauth { my $template_name = ( $type eq 'opac' ) ? 'opac-auth.tt' : 'auth.tt'; my $template = C4::Templates::gettemplate( $template_name, $type, $query ); $template->param( - branchloop => GetBranchesLoop(), OpacAdditionalStylesheet => C4::Context->preference("OpacAdditionalStylesheet"), opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"), login => 1, @@ -1531,8 +1527,7 @@ sub check_api_auth { $branchcode = $query->param('branch'); $branchname = Koha::Libraries->find($branchcode)->branchname; } - my $branches = GetBranches(); - my @branchesloop; + my $branches = C4::Branch::GetBranches(); foreach my $br ( keys %$branches ) { # now we work with the treatment of ip --- a/C4/Branch.pm +++ a/C4/Branch.pm @@ -29,7 +29,6 @@ BEGIN { @EXPORT = qw( &GetBranch &GetBranches - &GetBranchesLoop &mybranch ); @EXPORT_OK = qw( &onlymine &mybranch ); @@ -83,8 +82,6 @@ Create a branch selector with the following code. [% END %] -=head4 Note that you often will want to just use GetBranchesLoop, for exactly the example above. - =cut sub GetBranches { @@ -135,22 +132,6 @@ sub mybranch { return C4::Context->userenv->{branch} || ''; } -sub GetBranchesLoop { # since this is what most pages want anyway - my $branch = @_ ? shift : mybranch(); # optional first argument is branchcode of "my branch", if preselection is wanted. - my $onlymine = @_ ? shift : onlymine(); - my $branches = GetBranches($onlymine); - my @loop; - foreach my $branchcode ( sort { uc($branches->{$a}->{branchname}) cmp uc($branches->{$b}->{branchname}) } keys %$branches ) { - push @loop, { - value => $branchcode, - branchcode => $branchcode, - selected => ($branchcode eq $branch) ? 1 : 0, - branchname => $branches->{$branchcode}->{branchname}, - }; - } - return \@loop; -} - =head2 GetBranch $branch = GetBranch( $query, $branches ); --- a/C4/Search.pm +++ a/C4/Search.pm @@ -337,6 +337,9 @@ sub getRecords { my @results; my $results_hashref = (); + # TODO simplify this structure ( { branchcode => $branchname } is enought) and remove this parameter + $branches ||= { map { $_->branchcode => { branchname => $_->branchname } } Koha::Libraries->search }; + # Initialize variables for the faceted results objects my $facets_counter = {}; my $facets_info = {}; --- a/Koha/Template/Plugin/Branches.pm +++ a/Koha/Template/Plugin/Branches.pm @@ -67,24 +67,25 @@ sub all { SELECT branchcode, branchname FROM branches |; - if ( C4::Branch::onlymine + if ( C4::Context->preference('IndependentBranches') and C4::Context->userenv + && !C4::Context->IsSuperLibrarian() and C4::Context->userenv->{branch} ) { $query .= q| WHERE branchcode = ? |; push @params, C4::Context->userenv->{branch}; } - $query .= q| ORDER BY branchname|; - my $branches = $dbh->selectall_arrayref( $query, { Slice => {} }, @params ); - - if ( $selected ) { - for my $branch ( @$branches ) { - if ( $branch->{branchcode} eq $selected ) { - $branch->{selected} = 1; - } + my $libraries = $dbh->selectall_arrayref( $query, { Slice => {} }, @params ); + + for my $l ( @$libraries ) { + if ( $selected and $l->{branchcode} eq $selected + or not $selected and C4::Context->userenv and $l->{branchcode} eq C4::Context->userenv->{branch} + ) { + $l->{selected} = 1; } } - return $branches; + + return $libraries; } 1; --- a/acqui/basketgroup.pl +++ a/acqui/basketgroup.pl @@ -52,7 +52,6 @@ use C4::Output; use CGI qw ( -utf8 ); use C4::Acquisition qw/CloseBasketgroup ReOpenBasketgroup GetOrders GetBasketsByBasketgroup GetBasketsByBookseller ModBasketgroup NewBasketgroup DelBasketgroup GetBasketgroups ModBasket GetBasketgroup GetBasket GetBasketGroupAsCSV/; -use C4::Branch qw/GetBranches/; use C4::Members qw/GetMember/; use Koha::EDI qw/create_edi_order get_edifact_ean/; @@ -272,10 +271,8 @@ if ( $op eq "add" ) { $billingplace = $billingplace || $borrower->{'branchcode'}; $deliveryplace = $deliveryplace || $borrower->{'branchcode'}; - my $branches = C4::Branch::GetBranchesLoop( $billingplace ); - $template->param( billingplaceloop => $branches ); - $branches = C4::Branch::GetBranchesLoop( $deliveryplace ); - $template->param( deliveryplaceloop => $branches ); + $template->param( billingplace => $billingplace ); + $template->param( deliveryplace => $deliveryplace ); $template->param( booksellerid => $booksellerid ); # the template will display a unique basketgroup --- a/acqui/basketheader.pl +++ a/acqui/basketheader.pl @@ -121,20 +121,14 @@ if ( $op eq 'add_form' ) { booksellerid => $booksellerid, basketno => $basketno, booksellers => \@booksellers, - deliveryplace => $basket->{deliveryplace}, - billingplace => $basket->{billingplace}, is_standing => $basket->{is_standing}, ); my $billingplace = $basket->{'billingplace'} || C4::Context->userenv->{"branch"}; my $deliveryplace = $basket->{'deliveryplace'} || C4::Context->userenv->{"branch"}; - # Build the combobox to select the billing place - - my $branches = C4::Branch::GetBranchesLoop( $billingplace ); - $template->param( billingplaceloop => $branches ); - $branches = C4::Branch::GetBranchesLoop( $deliveryplace ); - $template->param( deliveryplaceloop => $branches ); + $template->param( billingplace => $billingplace ); + $template->param( deliveryplace => $deliveryplace ); #End Edit } elsif ( $op eq 'add_validate' ) { --- a/acqui/neworderempty.pl +++ a/acqui/neworderempty.pl @@ -210,24 +210,6 @@ $suggestion = GetSuggestionInfo($suggestionid) if $suggestionid; my @currencies = Koha::Acquisition::Currencies->search; my $active_currency = Koha::Acquisition::Currencies->get_active; -# build branches list -my $onlymine = - C4::Context->preference('IndependentBranches') - && C4::Context->userenv - && !C4::Context->IsSuperLibrarian() - && C4::Context->userenv->{branch}; -my $branches = GetBranches($onlymine); -my @branchloop; -foreach my $thisbranch ( sort {$branches->{$a}->{'branchname'} cmp $branches->{$b}->{'branchname'}} keys %$branches ) { - my %row = ( - value => $thisbranch, - branchname => $branches->{$thisbranch}->{'branchname'}, - ); - $row{'selected'} = 1 if( $thisbranch && $data->{branchcode} && $thisbranch eq $data->{branchcode}) ; - push @branchloop, \%row; -} -$template->param( branchloop => \@branchloop ); - # build bookfund list my $borrower= GetMember('borrowernumber' => $loggedinuser); my ( $flags, $homebranch )= ($borrower->{'flags'},$borrower->{'branchcode'}); --- a/admin/aqbudgetperiods.pl +++ a/admin/aqbudgetperiods.pl @@ -281,14 +281,11 @@ foreach my $result ( @{$results} ) { push( @period_inactive_loop, $budgetperiod ); } -my $branchloop = C4::Branch::GetBranchesLoop(); - my $tab = $input->param('tab') ? $input->param('tab') - 1 : 0; $template->param( period_active_loop => \@period_active_loop, period_inactive_loop => \@period_inactive_loop, tab => $tab, - branchloop => $branchloop, ); $template->param($op=>1); --- a/admin/aqbudgets.pl +++ a/admin/aqbudgets.pl @@ -96,12 +96,11 @@ my $user_branchcode = $user->{'branchcode'}; $template->param( show_mine => $show_mine, op => $op, + selected_branchcode => $filter_budgetbranch, ); my $budget; -my $branchloop = C4::Branch::GetBranchesLoop($filter_budgetbranch); - $template->param(auth_cats_loop => GetBudgetAuthCats( $budget_period_id )) if $budget_period_id; @@ -153,7 +152,7 @@ if ($op eq 'add_form') { $row{selected} = 1 if $budget and $thisbranch eq $budget->{'budget_branchcode'}; push @branchloop_select, \%row; } - + # populates the YUI planning button my $categories = GetAuthorisedValueCategories(); my @auth_cats_loop1 = (); @@ -343,7 +342,6 @@ if ( $op eq 'list' ) { spent_total => $spent_total, ordered_total => $ordered_total, available_total => $available_total, - branchloop => $branchloop, filter_budgetname => $filter_budgetname, ); --- a/admin/aqplan.pl +++ a/admin/aqplan.pl @@ -394,7 +394,6 @@ if ( $output eq "file" ) { exit(1); } -my $branchloop = C4::Branch::GetBranchesLoop(); $template->param( authvals_row => \@authvals_row, budget_lines => \@budget_lines, @@ -411,7 +410,6 @@ $template->param( authvals => \@authvals_row, hide_cols_loop => \@hide_cols, - branchloop => $branchloop, ); output_html_with_http_headers $input, $cookie, $template->output; --- a/admin/clone-rules.pl +++ a/admin/clone-rules.pl @@ -33,7 +33,6 @@ use C4::Output; use C4::Auth; use C4::Koha; use C4::Debug; -use C4::Branch; # GetBranchesLoop my $input = new CGI; my $dbh = C4::Context->dbh; @@ -49,13 +48,10 @@ my ($template, $loggedinuser, $cookie) my $frombranch = $input->param("frombranch"); my $tobranch = $input->param("tobranch"); -my $branchloop = GetBranchesLoop; $template->param(frombranch => $frombranch) if ($frombranch); $template->param(tobranch => $tobranch) if ($tobranch); -$template->param(branchloop => $branchloop); - if ($frombranch && $tobranch) { my $error; --- a/admin/smart-rules.pl +++ a/admin/smart-rules.pl @@ -459,16 +459,6 @@ $template->param( defaultRefundRule => Koha::RefundLostItemFeeRules->_default_rule ); -my $branches = GetBranches(); -my @branchloop; -for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) { - push @branchloop, { - value => $thisbranch, - selected => $thisbranch eq $branch, - branchname => $branches->{$thisbranch}->{'branchname'}, - }; -} - my $patron_categories = Koha::Patron::Categories->search({}, { order_by => ['description'] }); my @row_loop; @@ -622,8 +612,7 @@ $template->param( patron_categories => $patron_categories, itemtypeloop => \@itemtypes, rules => \@sorted_row_loop, - branchloop => \@branchloop, - humanbranch => ($branch ne '*' ? $branches->{$branch}->{branchname} : ''), + humanbranch => ($branch ne '*' ? $branch : ''), current_branch => $branch, definedbranch => scalar(@sorted_row_loop)>0 ); --- a/catalogue/search.pl +++ a/catalogue/search.pl @@ -214,25 +214,9 @@ if($cgi->cookie("intranet_bib_list")){ } # load the branches -my $branches = GetBranches(); - -# Populate branch_loop with all branches sorted by their name. If -# IndependentBranches is activated, set the default branch to the borrower -# branch, except for superlibrarian who need to search all libraries. -my $user = C4::Context->userenv; -my @branch_loop = map { - { - value => $_, - branchname => $branches->{$_}->{branchname}, - selected => $user->{branch} eq $_ && C4::Branch::onlymine(), - } -} sort { - $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} -} keys %$branches; - my $categories = Koha::LibraryCategories->search( { categorytype => 'searchdomain' }, { order_by => [ 'categorytype', 'categorycode' ] } ); -$template->param(branchloop => \@branch_loop, searchdomainloop => $categories); +$template->param(searchdomainloop => $categories); # load the Type stuff my $itemtypes = GetItemTypes; @@ -537,7 +521,7 @@ eval { my $itemtypes = GetItemTypes; ( $error, $results_hashref, $facets ) = $searcher->search_compat( $query, $simple_query, \@sort_by, \@servers, - $results_per_page, $offset, $expanded_facet, $branches, + $results_per_page, $offset, $expanded_facet, undef, $itemtypes, $query_type, $scan ); }; --- a/cataloguing/additem.pl +++ a/cataloguing/additem.pl @@ -29,9 +29,9 @@ use C4::Items; use C4::Context; use C4::Circulation; use C4::Koha; -use C4::Branch; use C4::ClassSource; use Koha::DateUtils; +use Koha::Libraries; use List::MoreUtils qw/any/; use C4::Search; use Storable qw(thaw freeze); @@ -170,9 +170,9 @@ sub generate_subfield_form { # builds list, depending on authorised value... if ( $subfieldlib->{authorised_value} eq "branches" ) { foreach my $thisbranch (@$branches) { - push @authorised_values, $thisbranch->{value}; - $authorised_lib{$thisbranch->{value}} = $thisbranch->{branchname}; - $value = $thisbranch->{value} if $thisbranch->{selected} && !$value; + push @authorised_values, $thisbranch->{branchcode}; + $authorised_lib{$thisbranch->{branchcode}} = $thisbranch->{branchname}; + $value = $thisbranch->{branchcode} if $thisbranch->{selected} && !$value; } } elsif ( $subfieldlib->{authorised_value} eq "itemtypes" ) { @@ -858,13 +858,11 @@ my $i=0; my $pref_itemcallnumber = C4::Context->preference('itemcallnumber'); -my $onlymine = - C4::Context->preference('IndependentBranches') - && C4::Context->userenv - && !C4::Context->IsSuperLibrarian() - && C4::Context->userenv->{branch}; my $branch = $input->param('branch') || C4::Context->userenv->{branch}; -my $branches = GetBranchesLoop($branch,$onlymine); # build once ahead of time, instead of multiple times later. +my $libraries = Koha::Libraries->search({}, { order_by => ['branchname'] })->unblessed;# build once ahead of time, instead of multiple times later. +for my $library ( @$libraries ) { + $library->{selected} = 1 if $library->{branchcode} eq $branch +} # We generate form, from actuel record @fields = (); @@ -879,7 +877,7 @@ if($itemrecord){ next if ($tagslib->{$tag}->{$subfieldtag}->{'tab'} ne "10"); - my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $branches, $biblionumber, $temp, \@loop_data, $i, $restrictededition); + my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $libraries, $biblionumber, $temp, \@loop_data, $i, $restrictededition); push @fields, "$tag$subfieldtag"; push (@loop_data, $subfield_data); $i++; @@ -903,7 +901,7 @@ foreach my $tag ( keys %{$tagslib}){ my @values = (undef); @values = $itemrecord->field($tag)->subfield($subtag) if ($itemrecord && defined($itemrecord->field($tag)) && defined($itemrecord->field($tag)->subfield($subtag))); for my $value (@values){ - my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $branches, $biblionumber, $temp, \@loop_data, $i, $restrictededition); + my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $libraries, $biblionumber, $temp, \@loop_data, $i, $restrictededition); push (@loop_data, $subfield_data); $i++; } --- a/circ/bookcount.pl +++ a/circ/bookcount.pl @@ -32,6 +32,7 @@ use C4::Auth; use C4::Branch; # GetBranches use C4::Biblio; # GetBiblioItemData use Koha::DateUtils; +use Koha::Libraries; my $input = new CGI; my $itm = $input->param('itm'); @@ -69,10 +70,11 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); -my $branchloop = GetBranchesLoop(C4::Context->userenv->{branch}); -foreach (@$branchloop) { - $_->{issues} = issuesat($itm, $_->{value}); - $_->{seen} = lastseenat( $itm, $_->{value} ) || undef; +my $libraries = Koha::Libraries->search({}, { order_by => ['branchname'] })->unblessed; +for my $library ( @$libraries ) { + $library->{selected} = 1 if $library->{branchcode} eq C4::Context->userenv->{branch}; + $library->{issues} = issuesat($itm, $library->{branchcode}); + $library->{seen} = lastseenat( $itm, $library->{branchcode} ) || undef; } $template->param( @@ -85,7 +87,7 @@ $template->param( holdingbranch => $holdingbranch, lastdate => $lastdate ? $lastdate : 0, count => $count, - branchloop => $branchloop, + libraries => $libraries, ); output_html_with_http_headers $input, $cookie, $template->output; --- a/circ/branchtransfers.pl +++ a/circ/branchtransfers.pl @@ -236,7 +236,6 @@ $template->param( cancelled => $cancelled, setwaiting => $setwaiting, trsfitemloop => \@trsfitemloop, - branchoptionloop => GetBranchesLoop($tobranchcd), errmsgloop => \@errmsgloop, CircAutocompl => C4::Context->preference("CircAutocompl") ); --- a/circ/overdue.pl +++ a/circ/overdue.pl @@ -214,9 +214,6 @@ if (@patron_attr_filter_loop) { $template->param( patron_attr_header_loop => [ map { { header => $_->{description} } } grep { ! $_->{isclone} } @patron_attr_filter_loop ], - branchloop => GetBranchesLoop($branchfilter, $onlymine), - homebranchloop => GetBranchesLoop( $homebranchfilter, $onlymine ), - holdingbranchloop => GetBranchesLoop( $holdingbranchfilter, $onlymine ), branchfilter => $branchfilter, homebranchfilter => $homebranchfilter, holdingbranchfilter => $homebranchfilter, --- a/circ/selectbranchprinter.pl +++ a/circ/selectbranchprinter.pl @@ -26,7 +26,7 @@ use C4::Output; use C4::Auth qw/:DEFAULT get_session/; use C4::Print; # GetPrinters use C4::Koha; -use C4::Branch; # GetBranches GetBranchesLoop +use C4::Branch; # GetBranches use Koha::Libraries; @@ -136,7 +136,7 @@ if (scalar @updated and not scalar @recycle_loop) { $template->param( referer => $referer, printerloop => \@printerloop, - branchloop => GetBranchesLoop($branch), + branch => $branch, recycle_loop=> \@recycle_loop, ); --- a/circ/view_holdsqueue.pl +++ a/circ/view_holdsqueue.pl @@ -30,7 +30,6 @@ use C4::Output; use C4::Biblio; use C4::Items; use C4::Koha; # GetItemTypes -use C4::Branch; # GetBranches use C4::HoldsQueue qw(GetHoldsQueueItems); my $query = new CGI; @@ -72,7 +71,6 @@ foreach my $thisitemtype ( sort keys %$itemtypes ) { } $template->param( - branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}), itemtypeloop => \@itemtypesloop, ); --- a/course_reserves/add_items.pl +++ a/course_reserves/add_items.pl @@ -26,7 +26,6 @@ use C4::Auth; use C4::Output; use C4::Koha; use C4::Biblio; -use C4::Branch; use C4::CourseReserves qw(GetCourse GetCourseItem GetCourseReserve ModCourseItem ModCourseReserve); @@ -73,7 +72,6 @@ if ( $action eq 'lookup' ) { ccodes => GetAuthorisedValues('CCODE'), locations => GetAuthorisedValues('LOC'), itypes => GetItemTypes( style => 'array' ), - branches => GetBranchesLoop(), return => $return, ); --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc @@ -1,4 +1,5 @@ [% USE Koha %] +[% USE Branches %]