Attachment #55347 for bug #15758

View | Details | Raw Unified | Return to bug 15758
Collapse All | Expand All




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::Caches;

        $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"),

                        $branchcode = $query->param('branch');
                        $branchname = Koha::Libraries->find($branchcode)->branchname;
                    }
                    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

                        }
                    }

                    my @branchesloop;
                    foreach my $br ( keys %$branches ) {

                        #     now we work with the treatment of ip

    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,

                    $branchcode = $query->param('branch');
                    $branchname = Koha::Libraries->find($branchcode)->branchname;
                }
                my $branches = C4::Branch::GetBranches();
                my @branchesloop;
                foreach my $br ( keys %$branches ) {

                    #     now we work with the treatment of ip




	@EXPORT = qw(
		&GetBranch
		&GetBranches
		&GetBranchesLoop
		&mybranch
	);
    @EXPORT_OK = qw( &onlymine &mybranch );

            [% END %]
    </select>

=head4 Note that you often will want to just use GetBranchesLoop, for exactly the example above.

=cut

sub GetBranches {

    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 );

Lines 337-342 sub getRecords { Link Here

(-)a/C4/Search.pm (+3 lines)
337	my @results;	337	my @results;
338	my $results_hashref = ();	338	my $results_hashref = ();
339		339
		340	# TODO simplify this structure ( { branchcode => $branchname } is enought) and remove this parameter
		341	$branches \|\|= { map { $_->branchcode => { branchname => $_->branchname } } Koha::Libraries->search };
		342
340	# Initialize variables for the faceted results objects	343	# Initialize variables for the faceted results objects
341	my $facets_counter = {};	344	my $facets_counter = {};
342	my $facets_info = {};	345	my $facets_info = {};




        SELECT branchcode, branchname
        FROM branches
    |;
    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};
    }
    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 $libraries;
}

1;




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/;


    $billingplace  = $billingplace  || $borrower->{'branchcode'};
    $deliveryplace = $deliveryplace || $borrower->{'branchcode'};

    $template->param( billingplace => $billingplace );
    $template->param( deliveryplace => $deliveryplace );
    $branches = C4::Branch::GetBranchesLoop( $deliveryplace );
    $template->param( deliveryplaceloop => $branches );
    $template->param( booksellerid => $booksellerid );

    # the template will display a unique basketgroup




                    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"};

    $template->param( billingplace => $billingplace );
    $template->param( deliveryplace => $deliveryplace );
    my $branches = C4::Branch::GetBranchesLoop( $billingplace );
    $template->param( billingplaceloop => $branches );
    $branches = C4::Branch::GetBranchesLoop( $deliveryplace );
    $template->param( deliveryplaceloop => $branches );

#End Edit
} elsif ( $op eq 'add_validate' ) {




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'});




    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);




$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;


        $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 = ();

        spent_total            => $spent_total,
        ordered_total          => $ordered_total,
        available_total        => $available_total,
        branchloop             => $branchloop,
        filter_budgetname      => $filter_budgetname,
    );


Lines 394-400 if ( $output eq "file" ) { Link Here

(-)a/admin/aqplan.pl (-2 lines)
394	exit(1);	394	exit(1);
395	}	395	}
396		396
397	my $branchloop = C4::Branch::GetBranchesLoop();
398	$template->param(	397	$template->param(
399	authvals_row => \@authvals_row,	398	authvals_row => \@authvals_row,
400	budget_lines => \@budget_lines,	399	budget_lines => \@budget_lines,
Lines 411-417 $template->param( Link Here
411		410
412	authvals => \@authvals_row,	411	authvals => \@authvals_row,
413	hide_cols_loop => \@hide_cols,	412	hide_cols_loop => \@hide_cols,
414	branchloop => $branchloop,
415	);	413	);
416		414
417	output_html_with_http_headers $input, $cookie, $template->output;	415	output_html_with_http_headers $input, $cookie, $template->output;




use C4::Auth;
use C4::Koha;
use C4::Debug;
use C4::Branch; # GetBranchesLoop

my $input = new CGI;
my $dbh = C4::Context->dbh;


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;	




    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;

    patron_categories => $patron_categories,
                        itemtypeloop => \@itemtypes,
                        rules => \@sorted_row_loop,
                        humanbranch => ($branch ne '*' ? $branch : ''),
                        humanbranch => ($branch ne '*' ? $branches->{$branch}->{branchname} : ''),
                        current_branch => $branch,
                        definedbranch => scalar(@sorted_row_loop)>0
                        );




}

# 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(searchdomainloop => $categories);

# load the Type stuff
my $itemtypes = GetItemTypes;

    my $itemtypes = GetItemTypes;
    ( $error, $results_hashref, $facets ) = $searcher->search_compat(
        $query,            $simple_query, \@sort_by,       \@servers,
        $results_per_page, $offset,       $expanded_facet, undef,
        $itemtypes,        $query_type,   $scan
    );
};




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);

            # builds list, depending on authorised value...
            if ( $subfieldlib->{authorised_value} eq "branches" ) {
                foreach my $thisbranch (@$branches) {
                    push @authorised_values, $thisbranch->{branchcode};
                    $authorised_lib{$thisbranch->{branchcode}} = $thisbranch->{branchname};
                    $value = $thisbranch->{branchcode} if $thisbranch->{selected} && !$value;
                }
            }
            elsif ( $subfieldlib->{authorised_value} eq "itemtypes" ) {


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 $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 = ();


            next if ($tagslib->{$tag}->{$subfieldtag}->{'tab'} ne "10");

            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++;

        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}, $libraries, $biblionumber, $temp, \@loop_data, $i, $restrictededition);
            push (@loop_data, $subfield_data);
            $i++;
        }




use C4::Branch; # GetBranches
use C4::Biblio; # GetBiblioItemData
use Koha::DateUtils;
use Koha::Libraries;

my $input        = new CGI;
my $itm          = $input->param('itm');

    }
);

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(

    holdingbranch           => $holdingbranch,
    lastdate                => $lastdate ? $lastdate : 0,
    count                   => $count,
    libraries               => $libraries,
);

output_html_with_http_headers $input, $cookie, $template->output;

Lines 236-242 $template->param( Link Here

(-)a/circ/branchtransfers.pl (-1 lines)
236	cancelled => $cancelled,	236	cancelled => $cancelled,
237	setwaiting => $setwaiting,	237	setwaiting => $setwaiting,
238	trsfitemloop => \@trsfitemloop,	238	trsfitemloop => \@trsfitemloop,
239	branchoptionloop => GetBranchesLoop($tobranchcd),
240	errmsgloop => \@errmsgloop,	239	errmsgloop => \@errmsgloop,
241	CircAutocompl => C4::Context->preference("CircAutocompl")	240	CircAutocompl => C4::Context->preference("CircAutocompl")
242	);	241	);

Lines 214-222 if (@patron_attr_filter_loop) { Link Here

(-)a/circ/overdue.pl (-3 lines)
214		214
215	$template->param(	215	$template->param(
216	patron_attr_header_loop => [ map { { header => $_->{description} } } grep { ! $_->{isclone} } @patron_attr_filter_loop ],	216	patron_attr_header_loop => [ map { { header => $_->{description} } } grep { ! $_->{isclone} } @patron_attr_filter_loop ],
217	branchloop => GetBranchesLoop($branchfilter, $onlymine),
218	homebranchloop => GetBranchesLoop( $homebranchfilter, $onlymine ),
219	holdingbranchloop => GetBranchesLoop( $holdingbranchfilter, $onlymine ),
220	branchfilter => $branchfilter,	217	branchfilter => $branchfilter,
221	homebranchfilter => $homebranchfilter,	218	homebranchfilter => $homebranchfilter,
222	holdingbranchfilter => $homebranchfilter,	219	holdingbranchfilter => $homebranchfilter,

Lines 26-32 use C4::Output; Link Here

(-)a/circ/selectbranchprinter.pl (-2 / +2 lines)
26	use C4::Auth qw/:DEFAULT get_session/;	26	use C4::Auth qw/:DEFAULT get_session/;
27	use C4::Print; # GetPrinters	27	use C4::Print; # GetPrinters
28	use C4::Koha;	28	use C4::Koha;
29	use C4::Branch; # GetBranches GetBranchesLoop	29	use C4::Branch; # GetBranches
30		30
31	use Koha::Libraries;	31	use Koha::Libraries;
32		32
Lines 136-142 if (scalar @updated and not scalar @recycle_loop) { Link Here
136	$template->param(	136	$template->param(
137	referer => $referer,	137	referer => $referer,
138	printerloop => \@printerloop,	138	printerloop => \@printerloop,
139	branchloop => GetBranchesLoop($branch),	139	branch => $branch,
140	recycle_loop=> \@recycle_loop,	140	recycle_loop=> \@recycle_loop,
141	);	141	);
142		142

Lines 30-36 use C4::Output; Link Here

(-)a/circ/view_holdsqueue.pl (-2 lines)
30	use C4::Biblio;	30	use C4::Biblio;
31	use C4::Items;	31	use C4::Items;
32	use C4::Koha; # GetItemTypes	32	use C4::Koha; # GetItemTypes
33	use C4::Branch; # GetBranches
34	use C4::HoldsQueue qw(GetHoldsQueueItems);	33	use C4::HoldsQueue qw(GetHoldsQueueItems);
35		34
36	my $query = new CGI;	35	my $query = new CGI;
Lines 72-78 foreach my $thisitemtype ( sort keys %$itemtypes ) { Link Here
72	}	71	}
73		72
74	$template->param(	73	$template->param(
75	branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}),
76	itemtypeloop => \@itemtypesloop,	74	itemtypeloop => \@itemtypesloop,
77	);	75	);
78		76

Lines 26-32 use C4::Auth; Link Here

(-)a/course_reserves/add_items.pl (-2 lines)
26	use C4::Output;	26	use C4::Output;
27	use C4::Koha;	27	use C4::Koha;
28	use C4::Biblio;	28	use C4::Biblio;
29	use C4::Branch;
30		29
31	use C4::CourseReserves qw(GetCourse GetCourseItem GetCourseReserve ModCourseItem ModCourseReserve);	30	use C4::CourseReserves qw(GetCourse GetCourseItem GetCourseReserve ModCourseItem ModCourseReserve);
32		31
Lines 73-79 if ( $action eq 'lookup' ) { Link Here
73	ccodes => GetAuthorisedValues('CCODE'),	72	ccodes => GetAuthorisedValues('CCODE'),
74	locations => GetAuthorisedValues('LOC'),	73	locations => GetAuthorisedValues('LOC'),
75	itypes => GetItemTypes( style => 'array' ),	74	itypes => GetItemTypes( style => 'array' ),
76	branches => GetBranchesLoop(),
77	return => $return,	75	return => $return,
78	);	76	);
79		77




[% USE Koha %]
[% USE Branches %]
<div class="gradient">
<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Fund Admin Resident Search Box -->


            <label for="filter_budgetbranch">Library: </label>
            <select name="filter_budgetbranch" id="filter_budgetbranch" style="width:10em;">
                <option value=""></option>
                    [% FOREACH branchloo IN Branches.all( selected => selected_branchcode ) %]
                        [% IF branchloo.selected %]
                        <option value="[% branchloo.branchcode %]" selected="selected">[% branchloo.branchname %]</option>
                        [% ELSE %]
                        <option value="[% branchloo.branchcode %]" >[% branchloo.branchname %]</option>
                        [% END %]
                    [% END %]
            </select>

Lines 43-48 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc (+1 lines)
43	<script type="text/javascript" src="[% interface %]/[% theme %]/js/staff-global.js"></script>	43	<script type="text/javascript" src="[% interface %]/[% theme %]/js/staff-global.js"></script>
44		44
45	[% INCLUDE 'validator-strings.inc' %]	45	[% INCLUDE 'validator-strings.inc' %]
		46	[% PROCESS 'html_helpers.inc' %]
46	[% IF ( IntranetUserJS ) %]	47	[% IF ( IntranetUserJS ) %]
47	<script type="text/javascript">	48	<script type="text/javascript">
48	//<![CDATA[	49	//<![CDATA[

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc (+9 lines)
	1	[% BLOCK options_for_libraries %]
	2	[% FOREACH l IN libraries %]
	3	[% IF l.selected %]
	4	<option value="[% l.branchcode \| html %]" selected="selected">[% l.branchname %]</option>
	5	[% ELSE %]
	6	<option value="[% l.branchcode \| html %]">[% l.branchname %]</option>
	7	[% END%]
	8	[% END %]
	9	[% END %]




                                                <label for="billingplace">Billing place:</label>
                                                <select name="billingplace" id="billingplace" style="width:13em;">
                                                    <option value="">--</option>
                                                    [% PROCESS options_for_libraries libraries => Branches.all( selected => billingplace ) %]
                                                        [% IF ( billingplaceloo.selected ) %]<option value="[% billingplaceloo.value %]" selected="selected">[% billingplaceloo.branchname %]</option>
                                                        [% ELSE %]<option value="[% billingplaceloo.value %]">[% billingplaceloo.branchname %]</option>[% END%]
                                                    [% END %]
                                                </select>
                                            [% ELSE %]
                                                <span class="label">Billing place:</span>
                                                <input name="billingplace" id="billingplace" type ="hidden" value="[% billingplace %]" />[% Branches.GetName( billingplace ) %]
                                                    [% IF ( billingplaceloo.selected ) %]
                                                        <input name="billingplace" id="billingplace" type ="hidden" value="[% billingplaceloo.value %]" />[% billingplaceloo.branchname %]
                                                    [% END %]
                                                [% END %]
                                            [% END %]
                                        </li>
                                        [% UNLESS (closedbg) %]

                                                <label for="deliveryplace">Delivery place:</label>
                                                <select name="deliveryplace" id="deliveryplace" style="width:13em;">
                                                    <option value="">--</option>
                                                    [% PROCESS options_for_libraries libraries => Branches.all( selected => deliveryplace ) %]
                                                <select>
                                                        [% ELSE %]<option value="[% deliveryplaceloo.value %]">[% deliveryplaceloo.branchname %]</option>[% END %]
                                                    [% END %]
                                                    <select>
                                            </li>
                                            <li><p>or</p></li>
                                            <li>

                                                        <input name="freedeliveryplace" id="freedeliveryplace" type ="hidden" value="[% freedeliveryplace %]" />[% freedeliveryplace %]
                                                        <input name="deliveryplace" id="deliveryplace" type ="hidden" value="" />
                                                    [% ELSE %]
                                                        <input name="deliveryplace" id="deliveryplace" type ="hidden" value="[% deliveryplace %]" />[% Branches.GetName( deliveryplace ) %]
                                                            [% IF ( deliveryplaceloo.selected ) %]
                                                                <input name="deliveryplace" id="deliveryplace" type ="hidden" value="[% deliveryplaceloo.value %]" />[% deliveryplaceloo.branchname %]
                                                            [% END %]
                                                        [% END %]
                                                        <input name="freedeliveryplace" id="freedeliveryplace" type ="hidden" value="" />
                                                    [% END %]
                                                </li>




[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Acquisitions &rsaquo;
[% IF ( add_form ) %]

                    <label for="billingplace">Billing place:</label>
                    <select name="billingplace" id="billingplace">
                        <option value="">--</option>
                        [% PROCESS options_for_libraries libraries => Branches.all( selected => billingplace ) %]
                            [% IF ( billingplace.selected ) %]
                                <option value="[% billingplace.value %]" selected="selected">
                            [% ELSE %]
                                <option value="[% billingplace.value %]">
                            [% END %]
                                [% billingplace.branchname %]
                            </option>
                        [% END %]
                    </select>
                </li>
                <li>
                    <label for="deliveryplace">Delivery place:</label>
                    <select name="deliveryplace" id="deliveryplace">
                        <option value="">--</option>
                        [% PROCESS options_for_libraries libraries => Branches.all( selected => deliveryplace ) %]
                            [% IF ( deliveryplace.selected ) %]
                                <option value="[% deliveryplace.value %]" selected="selected">
                            [% ELSE %]
                                <option value="[% deliveryplace.value %]">
                            [% END %]
                                [% deliveryplace.branchname %]
                            </option>
                        [% END %]
                    </select>
                </li>
                <li>




    <li>
    <label for="budget_branchcode">Library: </label>
    <select name="budget_branchcode" id="budget_branchcode">
        <option value=""></option>
        [% PROCESS options_for_libraries libraries => branchloop_select %]
        [% UNLESS ( branchloop_selec.selected ) %] <option value="[% branchloop_selec.value %]" > [% ELSE %] <option value="[% branchloop_selec.value %]" selected="selected"> [% END %] [% branchloop_selec.value %]-[% branchloop_selec.branchname %]</option>
    [% END %]
    </select>
    </li>


            <label for="filter_budgetbranch2">Library: </label>
            <select name="filter_budgetbranch" id="filter_budgetbranch2" style="width:10em;">
                <option value=""></option>
                [% PROCESS options_for_libraries libraries => branchloop_select %]
                [% UNLESS ( branchloo.selected ) %]<option value="[% branchloo.value %]">
                [% ELSE %]<option value="[% branchloo.value %]" selected="selected">[% END %]
                [% branchloo.branchname %]</option>
                [% END %]
            </select>
        </li>
        <li class="radio">




    [% ELSE %]

    <p class="help">Use carefully! If the destination library already has circulation and fine rules, they will be deleted without warning!</p>
    <form action="/cgi-bin/koha/admin/clone-rules.pl" method="post">
        [% UNLESS ( frombranch ) %]
            <fieldset>
                <legend>Please choose a library to clone rules from:</legend>
                <label for="frombranch">Source library:</label>
                <select name="frombranch" id="frombranch">
                    <option value="">Default</option>
                    [% PROCESS options_for_libraries libraries => Branches.all() %]
                </select>
                [% IF ( tobranch ) %]<input type="hidden" name="tobranch" value="[% tobranch %]" />[% END %]
            </fieldset>
        [% END %]
				[% END %]
			[% END %]
		</select>
		[% IF ( tobranch ) %]<input type="hidden" name="tobranch" value="[% tobranch %]" />[% END %]
	    </fieldset>
	    [% END %]

        [% UNLESS ( tobranch ) %]
            <fieldset>
            <legend>Please choose the library to clone the rules to:</legend>
            <label for="tobranch">Destination library:</label>
            <select name="tobranch" id="tobranch">
                <option value="">Default</option>
                [% PROCESS options_for_libraries libraries => Branches.all() %]
            </select>
            [% IF ( frombranch ) %]<input type="hidden" name="frombranch" value="[% frombranch %]" />[% END %]
            </fieldset>
        [% END %]
        <input type="submit" value="Submit" />
    </form>
		</select>
		[% IF ( frombranch ) %]<input type="hidden" name="frombranch" value="[% frombranch %]" />[% END %]
	    </fieldset>
	[% END %]
	<input type="submit" value="Submit" />
    <a href="/cgi-bin/koha/admin/smart-rules.pl" class="cancel">Cancel</a>
	</form>

    [% END %]
    </div>




[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Administration &rsaquo; Circulation and fine rules</title>
[% INCLUDE 'doc-head-close.inc' %]

    <div id="yui-main">
    <div class="yui-b">
    <h1 class="parameters">
        [% IF humanbranch %]
            Defining circulation and fine rules for "[% Branches.GetName( humanbranch ) %]"
        [% ELSE %]
            Defining circulation and fine rules for all libraries
        [% END %]

        Select a library :
            <select name="branch" id="branch" style="width:20em;">
                <option value="*">All libraries</option>
                [% PROCESS options_for_libraries libraries => Branches.all( selected => current_branch ) %]
				[% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
            [% END %]
            </select>
        </form>
        [% IF ( definedbranch ) %]
            <form action="/cgi-bin/koha/admin/clone-rules.pl" method="post">
                <label for="tobranch"><strong>Clone these rules to:</strong></label>
                <input type="hidden" name="frombranch" value="[% current_branch %]" />
                <select name="tobranch" id="tobranch">
                    [% FOREACH l IN Branches.all() %]
                        <option value="[% l.value %]">[% l.branchname %]</option>
                    [% END %]
                </select>
                <input type="submit" value="Clone" />
            </form>
        [% END %]

        <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
            <input type="hidden" name="op" value="add" />

        </form>
    </div>
    <div id="defaults-for-this-library" class="container">
    <h3>Default checkout, hold and return policy[% IF humanbranch %] for [% Branches.GetName( humanbranch ) %][% END %]</h3>
        <p>You can set a default maximum number of checkouts, hold policy and return policy that will be used if none is defined below for a particular item type or category.</p>
        <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
            <input type="hidden" name="op" value="set-branch-defaults" />

    </div>
    [% IF ( show_branch_cat_rule_form ) %]
    <div id="holds-policy-by-patron-category" class="container">
    <h3>[% IF humanbranch %]Checkout limit by patron category for [% Branches.GetName( humanbranch ) %][% ELSE %]Default checkout limit by patron category[% END %]</h3>
        <p>For this library, you can specify the maximum number of loans that
            a patron of a given category can make, regardless of the item type.
        </p>

    </div>

    <div id="holds-policy-by-item-type" class="container">
    <h3>[% IF humanbranch %]Holds policy by item type for [% Branches.GetName( humanbranch ) %][% ELSE %]Default holds policy by item type[% END %]</h3>
        <p>
            For this library, you can edit rules for given itemtypes, regardless
            of the patron's category.

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt (-2 / +3 lines)
		1	[% USE Branches %]
1	[% INCLUDE 'doc-head-open.inc' %]	2	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Administration &rsaquo; Transport cost matrix</title>	3	<title>Koha &rsaquo; Administration &rsaquo; Transport cost matrix</title>
3	[% INCLUDE 'doc-head-close.inc' %]	4	[% INCLUDE 'doc-head-close.inc' %]
Lines 100-107 $(document).ready(function(){ Link Here
100	<table>	101	<table>
101	<tr>	102	<tr>
102	<th>From \ To</th>	103	<th>From \ To</th>
103	[% FOR b IN branchloop %]	104	[% FOR b IN Branches.all() %]
104	<th>[% b.name %]</th>	105	<th>[% b.branchname %]</th>
105	[% END %]	106	[% END %]
106	</tr>	107	</tr>
107	[% FOR bf IN branchfromloop %]	108	[% FOR bf IN branchfromloop %]

Lines 57-64 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt (-2 / +2 lines)
57	<p><label for="branch">Library:</label>	57	<p><label for="branch">Library:</label>
58	<select name="branch" id="branch" class="input" tabindex="3">	58	<select name="branch" id="branch" class="input" tabindex="3">
59	<option value="">My library</option>	59	<option value="">My library</option>
60	[% FOREACH branchloo IN branchloop %]	60	[% FOREACH l IN Branches.all() %]
61	<option value="[% branchloo.branchcode %]">[% branchloo.branchname %]</option>	61	<option value="[% l.branchcode %]">[% l.branchname %]</option>
62	[% END %]	62	[% END %]
63	</select>	63	</select>
64	</p>[% END %]	64	</p>[% END %]




<fieldset id="select-libs">
        <p><label for="branchloop">Individual libraries:</label><select name="limit" id="branchloop" onchange='if(this.value != ""){document.getElementById("categoryloop").disabled=true;} else {document.getElementById("categoryloop").disabled=false;}'>
        <option value="">All libraries</option>
        [% PROCESS options_for_libraries libraries => Branches.all() %]
        [% IF ( branchloo.selected ) %]
        <option value="branch:[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
        [% ELSE %]
        <option value="branch:[% branchloo.value %]">[% branchloo.branchname %]</option>
        [% END %]
        [% END %]
        </select></p>
    <!-- <input type="hidden" name="limit" value="branch: MAIN" /> -->
        [% IF ( searchdomainloop ) %]




        <th>No. of times checked out</th>
        <th>Last seen</th>
    </tr>
    [% FOREACH library IN libraries %]
    [% IF library.selected %]
        <tr class="mybranch">
    [% ELSE %]
        <tr>
    [% END %]
            <td>[% library.branchname %]</td>
            <td>[% library.issues %]</td>
            <td>[% IF library.seen %]
                    [% library.seen | $KohaDates with_hours => 1 %]
                [% ELSE %]
                    <span>Never</span>
                [% END %]




[% USE Koha %]
[% USE Branches %]
[% USE ItemTypes %]
[% USE AuthorisedValues %]
[% INCLUDE 'doc-head-open.inc' %]

			<li>
                <label for="tobranchcd">Destination library: </label>
                    <select name="tobranchcd" id="tobranchcd">
                        [% PROCESS options_for_libraries libraries => Branches.all( selected => tobranchcd ) %]
						[% IF ( branchoptionloo.selected ) %]
                            <option value="[% branchoptionloo.value %]" selected="selected">
						[% ELSE %]
                            <option value="[% branchoptionloo.value %]">
						[% END %]
                                [% branchoptionloo.branchname %]
                            </option>
                        [% END %]
                    </select>
            </li>
            <li>




        <label>Item home library:</label>
        <select name="homebranch" id="homebranch">
            <option value="">Any</option>
            [% PROCESS options_for_libraries libraries => Branches.all( selected => homebranchfilter ) %]
            <option value="[% homebranchloo.value |html %]" selected="selected">[% homebranchloo.branchname %]</option>[% ELSE %]
            <option value="[% homebranchloo.value |html %]">[% homebranchloo.branchname %]</option>[% END %]
            [% END %]
        </select>
    </li>

    <li>
        <label>Item holding library:</label>
        <select name="holdingbranch" id="holdingbranch">
            <option value="">Any</option>
            [% PROCESS options_for_libraries libraries => Branches.all( selected => holdingbranchfilter ) %]
            <option value="[% holdingbranchloo.value |html %]" selected="selected">[% holdingbranchloo.branchname %]</option>[% ELSE %]
            <option value="[% holdingbranchloo.value |html %]">[% holdingbranchloo.branchname %]</option>[% END %]
            [% END %]
        </select>
    </li>

    <li>
        <label>Library of the patron:</label>
        <select name="branch" id="branch">
            <option value="">Any</option>
            [% PROCESS options_for_libraries libraries => Branches.all( selected => branchfilter ) %]
        </select>
        <option value="[% branchloo.value |html %]">[% branchloo.branchname %]</option>[% END %]
      [% END %]
      </select>
    </li>

    <li><label for="order">Sort by:</label> <select name="order" id="order">




[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Circulation &rsaquo; Set library</title>
[% INCLUDE 'doc-head-close.inc' %]

    [% ELSE %]
        <li><label for="branch">Choose library:</label>
        <select name="branch" id="branch">
            [% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
            [% IF ( branchloo.selected ) %]
            <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
            [% ELSE %]
            <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
            [% END %]
        [% END %]
        </select></li>
    [% END %]
<!--




<form name="f" action="/cgi-bin/koha/circ/view_holdsqueue.pl" method="post">
	<fieldset class="rows">
	<ol>
        <li>
            <label for="branchlimit">Library: </label>
            <select name="branchlimit" id="branchlimit">
                <option value="">All</option>
                [% PROCESS options_for_libraries libraries => Branches.all() %]
            </select>
        </li>
				<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
				[% END %]
            [% END %]
            </select></li>
			<!-- FIXME Not working yet
			<li><label for="itemtypeslimit">Item Type: </label><select name="itemtypeslimit" id="itemtypeslimit">
                <option value="">All</option>




[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Course reserves &rsaquo; Add items</title>
[% INCLUDE 'doc-head-close.inc' %]

                        <label class="required" for="holdingbranch">Holding library:</label>
                        <select id="holdingbranch" name="holdingbranch">
                            <option value="">LEAVE UNCHANGED</option>
                            [% FOREACH b IN Branches.all() %]
                            [% FOREACH b IN branches %]
                                [% IF course_item.holdingbranch && ( ( course.enabled == 'yes' && b.value == item.holdingbranch ) || ( course.enabled == 'no' && b.value == course_item.holdingbranch ) ) %]
                                    <option value="[% b.branchcode %]" selected="selected">[% b.branchname %]</option>
                                [% ELSE %]
                                    <option value="[% b.branchcode %]">[% b.branchname %]</option>
                                [% END %]
                            [% END %]
                        </select>




                [% IF branches.size != 1 %]
                  <option value="">Any</option>
                [% END %]
                [% PROCESS options_for_libraries libraries => branches %]
                  [% IF b.selected %]
                    <option selected="selected" value="[% b.branchcode %]">[% b.branchname %]</option>
                  [% ELSE %]
                    <option value="[% b.branchcode %]">[% b.branchname %]</option>
                  [% END %]
                [% END %]
              </select>
            </li>
          </ol>




[% USE Koha %]
[% USE KohaDates %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</title>
[% INCLUDE 'doc-head-close.inc' %]

    <li>
        <label for="libraries" class="required">Library:</label>
        <select name="branchcode" size="1" id="libraries">
            [% PROCESS options_for_libraries libraries => Branches.all( selected => userbranch ) %]
        </select>
        <span class="required">Required</span>
          [%- ELSE -%]
            <option value="[% branchloo.branchcode %]">[% branchloo.branchname %]</option>
          [%- END -%]
        [%- END %]
      </select>
      <span class="required">Required</span>
    </li>
        [% END %]
    <li>

Lines 141-148 function Dopop(link) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt (-2 / +2 lines)
141	<li>	141	<li>
142	<label for="branch">Library: </label>	142	<label for="branch">Library: </label>
143	<select name="Filter" id="branch"><option value="" > Any library</option>	143	<select name="Filter" id="branch"><option value="" > Any library</option>
144	[% FOREACH branchloo IN branchloop %]	144	[% FOREACH l IN Branches.all( unfiltered => 1 ) %]
145	<option value="[% branchloo.value %]" >[% branchloo.branchname %] </option>	145	<option value="[% l.branchcode %]" >[% l.branchname %] </option>
146	[% END %]	146	[% END %]
147	</select> </li>	147	</select> </li>
148	<li>	148	<li>




[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Reports [% IF ( do_it ) %]&rsaquo; Patrons statistics &rsaquo; Results[% ELSE %]&rsaquo; Patrons statistics[% END %]</title>
[% INCLUDE 'doc-head-close.inc' %]

			<td><input type="radio" name="Line"   value="branchcode" /></td>
			<td><input type="radio" name="Column" value="branchcode" /></td>
			<td>
                <select name="Filter"  size="1" id="branch">
                <option value=""></option>
                [% FOREACH l IN Branches.all() %]
                    <option value="[% l.branchcode %]">[% l.branchcode %] - [% l.branchname || 'UNKNOWN' %]</option>
                [% END %]
                </select>
			</td>
			</tr>
		    <tr>




[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Reports &rsaquo; Most-circulated items[% IF ( do_it ) %] &rsaquo; Results[% END %]</title>
[% INCLUDE 'doc-head-close.inc' %]

        <li><label for="fromRO">Check-in date from</label> <input type="text" size="10" id="fromRO" name="Filter" />
        <label for="toRO" class="inline">To: </label> <input type="text" size="10" id="toRO" name="Filter" value="" />
                    <span class="hint">[% INCLUDE 'date-format.inc' %]</span></li>
        <li>
            <label for="branch">Library: </label>
            <select name="Filter" id="branch"><option value="" > Any library</option>
                [% PROCESS options_for_libraries libraries => Branches.all() %]
            </select>
        </li>
      <li> 
        <label for="documenttype">Item type: </label><select name="Filter" id="documenttype"><option value="" > Any item type</option>
    [% FOREACH itemtypeloo IN itemtypeloop %]




			<li><label for="branch">Library: </label>
	<select name="Filter" id="branch">
        <option value="">Any library</option>
        [% PROCESS options_for_libraries libraries => Branches.all() %]
      [% IF ( branchloo.selected ) %]
        <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
      [% ELSE %]
        <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
      [% END %]
    [% END %]
    </select></li>
      <li> 
        <label for="documenttype">Item type: </label><select name="Filter" id="documenttype">

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt (-5 / +4 lines)
		1	[% USE Branches %]
1	[% INCLUDE 'doc-head-open.inc' %]	2	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Reports [% IF ( do_it ) %]&rsaquo; Catalog statistics &rsaquo; Results[% ELSE %]&rsaquo; Catalog statistics[% END %]</title>	3	<title>Koha &rsaquo; Reports [% IF ( do_it ) %]&rsaquo; Catalog statistics &rsaquo; Results[% ELSE %]&rsaquo; Catalog statistics[% END %]</title>
3	[% INCLUDE 'doc-head-close.inc' %]	4	[% INCLUDE 'doc-head-close.inc' %]
Lines 160-170 Link Here
160	<td><input type="radio" name="Line" value="items.homebranch" /></td>	161	<td><input type="radio" name="Line" value="items.homebranch" /></td>
161	<td><input type="radio" name="Column" value="items.homebranch" /></td>	162	<td><input type="radio" name="Column" value="items.homebranch" /></td>
162	<td><select name="Filter" id="branch">	163	<td><select name="Filter" id="branch">
163	<option value=""> </option>	164	<option value=""> </option>
164	[% FOREACH CGIBranc IN CGIBranch %]	165	[% PROCESS options_for_libraries libraries => Branches.all() %]
165	[% IF ( CGIBranc.selected ) %]<option value="[% CGIBranc.value %]" selected="selected">[% CGIBranc.branchname %]</option>[% ELSE %]<option value="[% CGIBranc.value %]">[% CGIBranc.branchname %]</option>[% END %]	166	</select>
166	[% END %]
167	</select>
168	</td>	167	</td>
169	</tr>	168	</tr>
170	<tr>	169	<tr>

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt (-3 / +2 lines)
		1	[% USE Branches %]
1	[% INCLUDE 'doc-head-open.inc' %]	2	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Reports &rsaquo; Average checkout period</title>	3	<title>Koha &rsaquo; Reports &rsaquo; Average checkout period</title>
3	[% INCLUDE 'doc-head-close.inc' %]	4	[% INCLUDE 'doc-head-close.inc' %]
Lines 181-189 Link Here
181	<td>	182	<td>
182	<select name="Filter" size="1" id="branch">	183	<select name="Filter" size="1" id="branch">
183	<option value=""></option>	184	<option value=""></option>
184	[%- FOREACH branchloo IN branchloop %]	185	[% PROCESS options_for_libraries libraries => Branches.all() %]
185	<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
186	[%- END %]
187	</select>	186	</select>
188	</td>	187	</td>
189	</tr>	188	</tr>

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tt (-2 / +3 lines)
		1	[% USE Branches %]
1	[% INCLUDE 'doc-head-open.inc' %]	2	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Reports &rsaquo; Checkouts by patron category</title>	3	<title>Koha &rsaquo; Reports &rsaquo; Checkouts by patron category</title>
3	[% INCLUDE 'doc-head-close.inc' %]	4	[% INCLUDE 'doc-head-close.inc' %]
Lines 68-75 Link Here
68	<label for="branch">Select a library:</label>	69	<label for="branch">Select a library:</label>
69	<select name="value" size="1" id="branch">	70	<select name="value" size="1" id="branch">
70	<option value=""></option>	71	<option value=""></option>
71	[%- FOREACH branchloo IN branchloop %]	72	[%- FOREACH l IN Branches.all() %]
72	<option value="[% branchloo.branchcode %]">[% branchloo.branchname %]</option>	73	<option value="[% l.branchcode %]">[% l.branchname %]</option>
73	[%- END %]	74	[%- END %]
74	</select>	75	</select>
75	</li>	76	</li>




[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Reports &rsaquo; Circulation statistics [% IF ( do_it ) %]&rsaquo; Results[% END %]</title>
[% INCLUDE 'doc-head-close.inc' %]

            <td><input type="radio" name="Line" value="branch" /></td>
            <td><input type="radio" name="Column" value="branch" /></td>
            <td><select name="Filter" id="branch">
                <option value=""> </option>
                [% PROCESS options_for_libraries libraries => Branches.all() %]
[% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
				[% END %]
               </select>
             </td> 
        </tr>

            <td><input type="radio" name="Column" value="items.homebranch" /></td>
            <td><select name="Filter" id="homebranch">
                    <option value=""> </option>
                    [% PROCESS options_for_libraries libraries => Branches.all() %]
                        [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
				    [% END %]
                </select>
            </td>
        </tr>

            <td><input type="radio" name="Column" value="items.holdingbranch" /></td>
            <td><select name="Filter" id="holdingbranch">
                    <option value=""> </option>
                    [% PROCESS options_for_libraries libraries => Branches.all() %]
                        [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
				    [% END %]
                </select>
            </td>
        </tr>




	<li><label for="barcodefilter">Barcode: </label><input type="text" name="barcodefilter" id="barcodefilter" size="6" /></li>
	<li><label for="branchfilter">Library: </label><select name="branchfilter" id="branchfilter">
                <option value="">All</option>
                [% PROCESS options_for_libraries libraries => Branches.all() %]
                [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
				[% ELSE %]
				<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
				[% END %]
            [% END %]
            </select></li>
    <li><label for="itemtypesfilter">Item type: </label><select name="itemtypesfilter" id="itemtypesfilter">
                <option value="">All</option>




                <label for="value">Select a library:</label>
                <select name="value" size="1" id="value">
                  <option value=""></option>
                  [% PROCESS options_for_libraries libraries => Branches.all() %]
                 [% IF ( branchloo.selected ) -%]
                  <option value="[% branchloo.branchcode %]" selected="selected">[% branchloo.branchname %]</option>
                 [%- ELSE -%]
                  <option value="[% branchloo.branchcode %]">[% branchloo.branchname %]</option>
                 [%- END -%]
                [%- END %]
                </select>
                <span class="tip">Select none to see all libraries</span>
              </li>




[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Reports &rsaquo; Holds statistics [% IF ( do_it ) %]&rsaquo; Results[% END %]</title>
[% INCLUDE 'doc-head-close.inc' %]

            <td><input type="radio" name="Column" value="reserves.branchcode" /></td>
            <td><select name="filter_reserves.branchcode" id="resbranchcode">
               <option value=""> </option>
                [% PROCESS options_for_libraries libraries => Branches.all() %]
[% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
				[% END %]
               </select>
             </td> 
        </tr>

            <td><input type="radio" name="Column" value="items.holdingbranch" /></td>
            <td><select name="filter_items.holdingbranch" id="holdingbranch">
               <option value=""> </option>
                [% PROCESS options_for_libraries libraries => Branches.all() %]
[% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
				[% END %]
               </select>
             </td> 
        </tr>

            <td><input type="radio" name="Line" value="items.homebranch" /></td>
            <td><input type="radio" name="Column" value="items.homebranch" /></td>
            <td><select name="filter_items.homebranch" id="homebranch">
                <option value=""> </option>
                [% PROCESS options_for_libraries libraries => Branches.all() %]
[% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
				[% END %]
               </select>
             </td> 
        </tr>




		    	</label>
		    	<select name="branchcode"  id="branchcode">
				<option value="">Any library</option>
                [% PROCESS options_for_libraries libraries => Branches.all() %]
                        [% IF ( branche.selected ) %]
                            <option value="[% branche.value %]" selected="selected">[% branche.branchname %]</option>
                        [% ELSE %]
                            <option value="[% branche.value %]">[% branche.branchname %]</option>
                        [% END %]
					[% END %]
		    	</select>

		    </li>




        <li>
            <label for="pickup">Pickup at:</label>
            <select name="pickup" size="1" id="pickup">
                [% PROCESS options_for_libraries libraries => Branches.all() %]
              [% IF ( branchloo.selected ) -%]
                <option value="[% branchloo.branchcode %]" selected="selected">[% branchloo.branchname %]</option>
              [%- ELSE -%]
                <option value="[% branchloo.branchcode %]">[% branchloo.branchname %]</option>
              [%- END -%]
            [%- END %]
            </select>
        </li>


            Item being transferred to <b> [% reserveloo.wbrname %]</b> <input type="hidden" name="pickup" value="[% reserveloo.wbrcode %]" />
         [% END %]
    [% ELSE %]
        <select name="pickup">
            [% PROCESS options_for_libraries libraries => Branches.all( selected => reserveloo.branchcode ) %]
        </select>
            <option value="[% branchloo.branchcode %]" selected="selected">
        [% ELSE %]
            <option value="[% branchloo.branchcode %]">
        [% END %]
              [% branchloo.branchname %]
            </option>
      [% END %]
          </select>
    [% END %]
        </td>
        <td>




[% USE Branches %]
[% USE KohaDates %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Serials &rsaquo; Check expiration</title>


        <li><label for="issn">ISSN:</label>
        <input id="issn" type="text" name="issn" size="15" value="[% issn | html %]" /></li>
        [% IF can_change_library %]
        <li><label for="branch">Library:</label>
        <select id="branch" name="branch">
            <option value="">All</option>
            [% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
                [% IF branch.selected %]
                    <option selected="selected" value="[% branch.branchcode %]">
                [% ELSE %]
                    <option value="[% branch.branchcode %]">
                [% END %]
                    [% branch.branchname %]
                </option>
            [% END %]
        </select>
        </li>
        [% END %]

        <tr>
            <th>ISSN</th>
            <th>Title</th>
            [% IF can_change_library %]<th>Library</th>[% END %]
            <th>OPAC note</th>
            <th>Nonpublic note</th>
            <th>Expiration date</th>

                [% END %]
                </a>
            </td>
            [% IF can_change_library %]<td>
                [% Branches.GetName( subscriptions_loo.branchcode ) %]
            </td>[% END %]
            <td>




    <div class="yui-u first">
        <label for="branch">Define the holidays for:</label>
            <select id="branch" name="branch">
                [% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
                    [% IF ( branchloo.selected ) %]
                        <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
                    [% ELSE %]
                        <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
                    [% END %]
                [% END %]
            </select>
    
    <!-- ******************************** FLAT PANELS ******************************************* -->

  <label for="branchcode">Copy holidays to:</label>
  <select id="branchcode" name="branchcode">
    <option value=""></option>
    [% FOREACH l IN Branches.all() %]
    <option value="[% l.branchcode %]">[% l.branchname %]</option>
    [% END %]
  </select>
    <input type="submit" value="Copy" />

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt (-3 / +4 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE Branches %]
2	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Koha &rsaquo; Tools &rsaquo; Import patrons [% IF ( uploadborrowers ) %]&rsaquo; Results[% END %]</title>	4	<title>Koha &rsaquo; Tools &rsaquo; Import patrons [% IF ( uploadborrowers ) %]&rsaquo; Results[% END %]</title>
4	[% INCLUDE 'doc-head-close.inc' %]	5	[% INCLUDE 'doc-head-close.inc' %]
Lines 137-145 Link Here
137	<label class="description" for="branchcode">[% borrower_field.description %]: </label>	138	<label class="description" for="branchcode">[% borrower_field.description %]: </label>
138	<select id="branchcode" name="branchcode">	139	<select id="branchcode" name="branchcode">
139	<option value="" selected="selected"></option>	140	<option value="" selected="selected"></option>
140	[% FOREACH branch IN branches %]	141	[% FOREACH library IN Branches.all() %]
141	<option value="[% branch.branchcode %]">	142	<option value="[% library.branchcode %]">
142	[% branch.branchname %]</option>	143	[% library.branchname %]</option>
143	[% END %]	144	[% END %]
144	</select><span class="field_hint">[% borrower_field.field %]</span>	145	</select><span class="field_hint">[% borrower_field.field %]</span>
145	</li>	146	</li>




        </li><li>
        <label for="branchloop">Library: </label><select id="branchloop" name="branchcode" style="width:12em;">
            <option value="">All libraries</option>
            [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode ) %]
            [% IF ( branchloo.selected ) %]
                <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
            [% ELSE %]
                <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
            [% END %]
        [% END %]
        </select>
        </li>
        [% IF (authorised_values) %]




        Select a library :
            <select name="branchcode" id="branch" style="width:20em;">
                <option value="*">All libraries</option>
                [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode ) %]
                [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
            [% END %]
            </select>
      </p>
    [% END %]

		[% IF ( letter && !independant_branch) %]
            [% select_for_copy = BLOCK %]
            <select name="branchcode">
                [% FOREACH l IN Branches.all() %]
                <option value="[% l.branchcode %]">Copy to [% l.branchname %]</option>
                [% END %]
            </select>
            [% END %]

                    <label for="branch">Library:</label>
                    <select name="branchcode" id="branch" style="width:20em;">
                        <option value="">All libraries</option>
                        [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode ) %]
                        [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
                    [% END %]
                    </select>
                [% ELSE %]
                    <span class="label">Library:</span>




            <label for="branch">Select a library:</label>
                <select id="branch" name="branch">
                    <option value="">Default</option>
                    [% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
                        [% IF ( branchloo.selected ) %]
                            <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
                        [% ELSE %]
                            <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
                        [% END %]
                    [% END %]
                </select>
                <input type="submit" value="Select" />
            </form>

Lines 55-57 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc (+1 lines)
55	</script>	55	</script>
56	<script type="text/javascript" src="[% interface %]/[% theme %]/lib/modernizr.min.js"></script>	56	<script type="text/javascript" src="[% interface %]/[% theme %]/lib/modernizr.min.js"></script>
57	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/font-awesome/css/font-awesome.min.css" />	57	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/font-awesome/css/font-awesome.min.css" />
		58	[% PROCESS 'html_helpers.inc' %]

Line 0 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/html_helpers.inc (+9 lines)
	1	[% BLOCK options_for_libraries %]
	2	[% FOREACH l IN libraries %]
	3	[% IF l.selected %]
	4	<option value="[% l.branchcode %]" selected="selected">[% l.branchname %]</option>
	5	[% ELSE %]
	6	<option value="[% l.branchcode %]">[% l.branchname %]</option>
	7	[% END%]
	8	[% END %]
	9	[% END %]

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-3 / +7 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE Branches %]
2	[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]	3	[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
3	<div id="wrap">	4	<div id="wrap">
4	<div id="header-region" class="noprint">	5	<div id="header-region" class="noprint">
Lines 228-236 Link Here
228	<select name="branch_group_limit" id="select_library">	229	<select name="branch_group_limit" id="select_library">
229	<option value="">All libraries</option>	230	<option value="">All libraries</option>
230	[% IF BranchCategoriesLoop %]<optgroup label="Libraries">[% END %]	231	[% IF BranchCategoriesLoop %]<optgroup label="Libraries">[% END %]
231	[% FOREACH BranchesLoo IN BranchesLoop %]	232	[% FOREACH BranchesLoo IN Branches.all( selected => opac_name ) %]
232	[% IF ( BranchesLoo.selected ) %]<option selected="selected" value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>	233	[% IF BranchesLoo.selected %]
233	[% ELSE %]<option value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>[% END %]	234	<option selected="selected" value="branch:[% BranchesLoo.branchcode %]">[% BranchesLoo.branchname %]</option>
		235	[% ELSE %]
		236	<option value="branch:[% BranchesLoo.branchcode %]">[% BranchesLoo.branchname %]</option>
		237	[% END %]
234	[% END %]	238	[% END %]
235	[% IF BranchCategoriesLoop %]	239	[% IF BranchCategoriesLoop %]
236	</optgroup>	240	</optgroup>




[% USE Koha %]
[% USE Branches %]

<div id="search-facets">
    <form method="get" action="/cgi-bin/koha/opac-topissues.pl">

                <li><label for="branch">From: </label>
                            <select name="branch" id="branch">
                                <option value="">All libraries</option>
                                [% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
                                    [% IF ( branchloo.selected ) %]
                                        <option value="[% branchloo.value %]" selected="selected">
                                    [% ELSE %]
                                        <option value="[% branchloo.value %]">
                                    [% END %]
                                            [% branchloo.branchname %]
                                        </option>
                                [% END %]
                            </select></li>

                [% AdvancedSearchTypes = Koha.Preference('AdvancedSearchTypes').split('\|') %]




[% USE Koha %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Advanced search</title>
[% INCLUDE 'doc-head-close.inc' %]

                                    <label for="branchloop">Library:</label>
                                    <select name="limit" id="branchloop">
                                    <option value="">All libraries</option>
                                    [% FOREACH BranchesLoo IN Branches.all( selected => opac_name ) %]
                                        [% IF BranchesLoo.selected %]
                                            <option value="branch:[% BranchesLoo.branchcode %]" selected="selected">[% BranchesLoo.branchname %]</option>
                                        [% ELSE %]
                                            <option value="branch:[% BranchesLoo.branchcode %]">[% BranchesLoo.branchname %]</option>
                                        [% END %]
                                    [% END %]
                                    </select>




[% USE Categories %]
[% USE Koha %]
[% USE Branches %]
[% USE KohaDates %]
[% SET userupdateview = 1 %]


                                        Home library:</label>

                                        <select id="borrower_branchcode" name="borrower_branchcode">
                                            [% PROCESS options_for_libraries libraries => Branches.all( selected => borrower.branchcode ) %]
                                                [% IF b.value == borrower.branchcode %]
                                                    <option value="[% b.value %]" selected="selected">[% b.branchname %]</option>
                                                [% ELSE %]
                                                    <option value="[% b.value %]">[% b.branchname %]</option>
                                                [% END %]
                                            [% END %]
                                        </select>
                                    </li>
                                [% END %]




[% USE Koha %]
[% USE Branches %]
[% USE KohaDates %]
[% USE Price %]
[% USE ItemTypes %]

                                                                <label for="branch_[% bibitemloo.biblionumber %]">Pick up location:</label>
                                                                [% UNLESS ( bibitemloo.holdable ) %]
                                                                    <select name="branch" id="branch_[% bibitemloo.biblionumber %]" disabled="disabled">
                                                                        [% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
                                                                            [% IF ( branchloo.selected ) %]
                                                                                <option value="[% branchloo.branchcode %]" selected="selected">[% branchloo.branchname %]</option>
                                                                            [% ELSE %]
                                                                                <option value="[% branchloo.branchcode %]">[% branchloo.branchname %]</option>
                                                                            [% END %]
                                                                        [% END %]
                                                                    </select>
                                                                [% ELSE %]
                                                                    <select name="branch" id="branch_[% bibitemloo.biblionumber %]">
                                                                        [% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
                                                                            [% IF ( branchloo.selected ) %]
                                                                                <option value="[% branchloo.branchcode %]" selected="selected">[% branchloo.branchname %]</option>
                                                                            [% ELSE %]
                                                                                <option value="[% branchloo.branchcode %]">[% branchloo.branchname %]</option>
                                                                            [% END %]
                                                                        [% END %]
                                                                    </select>
                                                                [% END # / UNLESS bibitemloo.holdable %]
                                                            </li>




[% USE Koha %]
[% USE Branches %]
[% USE AuthorisedValues %]
[% USE KohaDates %]
[% INCLUDE 'doc-head-open.inc' %]

                                        <li><label for="itemtype">Item type:</label>
                                            [% PROCESS 'av-build-dropbox.inc' name="itemtype", category="SUGGEST_FORMAT", size = 20 %]
                                        </li>
                                        [% IF branchcode %]
                                            <li><label for="branch">Library:</label>
                                                <select name="branchcode" id="branch">
                                                    [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode ) %]
                                                        [% IF ( branchloo.selected ) %]
                                                            <option value="[% branchloo.branchcode %]" selected="selected">[% branchloo.branchname %]</option>
                                                        [% ELSE %]
                                                            <option value="[% branchloo.branchcode %]">[% branchloo.branchname %]</option>
                                                        [% END %]
                                                    [% END %]
                                                </select>
                                            </li>
                                        [% END %]




use Koha::Patron::Debarments;
use Koha::Cities;
use Koha::DateUtils;
use Koha::Libraries;
use Koha::Patron::Categories;
use Koha::Token;
use Email::Valid;

}

# get Branch Loop
# in modify mod: userbranch value comes from borrowers table
# in add    mod: userbranch value comes from branches table (ip correspondence)

my $userbranch = '';
if (C4::Context->userenv && C4::Context->userenv->{'branch'}) {

if (defined ($data{'branchcode'}) and ( $op eq 'modify' || $op eq 'duplicate' || ( $op eq 'add' && $category_type eq 'C' ) )) {
    $userbranch = $data{'branchcode'};
}
$template->param( userbranch => $userbranch );

if ( Koha::Libraries->search->count < 1 ){

if( !$branchloop ){
    $no_add = 1;
    $template->param(no_branches => 1);
}

  check_member    => $check_member,#to know if the borrower already exist(=>1) or not (=>0) 
  "op$op"   => 1);

$template->param( branchloop => $branchloop ) if ( $branchloop );
$template->param(
  nodouble  => $nodouble,
  borrowernumber  => $borrowernumber, #register number




use C4::Output;
use C4::Context;
use C4::Members;
use C4::Branch;
use Koha::Patron::Modifications;
use Koha::Libraries;
use Koha::List::Patron;

                 debug => 1,
                 });

my $branches = GetBranches;
my @branchloop;
if ( C4::Branch::onlymine ) {
    my $userenv = C4::Context->userenv;
    my $library = Koha::Libraries->find( $userenv->{'branch'} );
    push @branchloop, {
        value => $library->id,
        branchcode => $library->branchcode,
        branchname => $library->branchname,
        selected => 1
    }
} else {
    foreach (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %{$branches}) {
        my $selected = 0;
        $selected = 1 if $branch and $branch eq $_;
        push @branchloop, {
            value => $_,
            branchcode => $_,
            branchname => $branches->{$_}->{branchname},
            selected => $selected
        };
    }
}

my $no_add = 0;
if( Koha::Libraries->search->count < 1){
    $no_add = 1;
    $template->param(no_branches => 1);
} 
else {
    $template->param(branchloop=>\@branchloop);
}

my @categories = Koha::Patron::Categories->search_limited;

Lines 29-35 use C4::Form::MessagingPreferences; Link Here

(-)a/opac/opac-memberentry.pl (-2 lines)
29	use Koha::Patrons;	29	use Koha::Patrons;
30	use Koha::Patron::Modification;	30	use Koha::Patron::Modification;
31	use Koha::Patron::Modifications;	31	use Koha::Patron::Modifications;
32	use C4::Branch qw(GetBranchesLoop);
33	use C4::Scrubber;	32	use C4::Scrubber;
34	use Email::Valid;	33	use Email::Valid;
35	use Koha::DateUtils;	34	use Koha::DateUtils;
Lines 70-76 $template->param( Link Here
70	action => $action,	69	action => $action,
71	hidden => GetHiddenFields( $mandatory, 'registration' ),	70	hidden => GetHiddenFields( $mandatory, 'registration' ),
72	mandatory => $mandatory,	71	mandatory => $mandatory,
73	branches => GetBranchesLoop(),
74	OPACPatronDetails => C4::Context->preference('OPACPatronDetails'),	72	OPACPatronDetails => C4::Context->preference('OPACPatronDetails'),
75	);	73	);
76		74




($branches->{$branch}) or $branch = "";     # Confirm branch is real
$template->param( branch => $branch );

# make branch selection options...
my $branchloop = GetBranchesLoop($branch);

# Is the person allowed to choose their branch
my $OPACChooseBranch = (C4::Context->preference("OPACAllowUserToChooseBranch")) ? 1 : 0;



    my $record = GetMarcBiblio($biblioNum);
    # Init the bib item with the choices for branch pickup
    my %biblioLoopIter;

    # Get relevant biblio data.
    my $biblioData = $biblioDataHash{$biblioNum};




use Encode qw( encode );
use C4::Auth;    # get_template_and_user
use C4::Members;
use C4::Branch;
use C4::Koha;
use C4::Output;
use C4::Suggestions;

    }
    my $branchcode = $input->param('branchcode') || $borr->{'branchcode'} || $userbranch || '' ;

    $template->param( branchcode => $branchcode );
    my $branchloop = GetBranchesLoop($branchcode);
    $template->param( branchloop => $branchloop );
}

my $mandatoryfields = '';

Lines 100-105 $template->param( Link Here

(-)a/opac/opac-topissues.pl (-2 lines)
100	results => \@results,	100	results => \@results,
101	);	101	);
102		102
103	$template->param(branchloop => GetBranchesLoop($branch));
104
105	output_html_with_http_headers $input, $cookie, $template->output;	103	output_html_with_http_headers $input, $cookie, $template->output;




}
$template->param( show_barcode => 1 ) if $show_barcode;

# load the branches
my $branches = GetBranches();
my @branch_loop;
for my $branch_hash ( sort keys %{$branches} ) {
    my $selected;
    if ( C4::Context->preference('SearchMyLibraryFirst') ) {
        $selected =
          ( C4::Context->userenv
              && ( $branch_hash eq C4::Context->userenv->{branch} ) );
    }
    push @branch_loop,
      { value      => "branch: $branch_hash",
        branchname => $branches->{$branch_hash}->{'branchname'},
        selected   => $selected,
      };
}
$template->param( branchloop => \@branch_loop );

# now the reserved items....
my $reserves = Koha::Holds->search( { borrowernumber => $borrowernumber } );





use C4::Auth;
use C4::Output;
use C4::Context;
use C4::Branch; # GetBranches
use C4::Koha;
use C4::Circulation;
use C4::Members;

# here each element returned by map is a hashref, get it?
my @mime  = ( map { {type =>$_} } (split /[;:]/, 'CSV') ); # FIXME translation
my $delims = GetDelimiterChoices;
my $branches = GetBranches;
my @branchloop;
foreach (sort keys %$branches) {
# 	my $selected = 1 if $thisbranch eq $branch;
	my %row = ( value => $_,
#				selected => $selected,
				branchname => $branches->{$_}->{branchname},
			);
	push @branchloop, \%row;
}

my $itemtypes = GetItemTypes;
my @itemtypeloop;

$template->param(
	    mimeloop => \@mime,
	  CGIseplist => $delims,
	  branchloop => \@branchloop,
	itemtypeloop => \@itemtypeloop,
patron_categories => $patron_categories,
);




my $basename = $input->param("basename");
our $sep     = $input->param("sep");
$sep = "\t" if ($sep and $sep eq 'tabulation');
my $selected_branch; # = $input->param("?");

our $branches = GetBranches;

my ($template, $borrowernumber, $cookie)
	= get_template_and_user({template_name => $fullreportname,

	my $req;
    my $patron_categories = Koha::Patron::Categories->search({}, {order_by => ['description']});
    $template->param( patron_categories => $patron_categories );
	my @branchloop;
	foreach (sort {$branches->{$a}->{branchname} cmp $branches->{$b}->{branchname}} keys %$branches) {
		my $line = {branchcode => $_, branchname => $branches->{$_}->{branchname} || 'UNKNOWN'};
		$line->{selected} = 'selected' if ($selected_branch and $selected_branch eq $_);
		push @branchloop, $line;
	}
	$template->param(BRANCH_LOOP => \@branchloop);
 	$req = $dbh->prepare("SELECT DISTINCTROW zipcode FROM borrowers WHERE zipcode IS NOT NULL AND zipcode <> '' ORDER BY zipcode");
 	$req->execute;
	$template->param(   ZIP_LOOP => $req->fetchall_arrayref({}));

Lines 23-29 use strict; Link Here

(-)a/reports/cat_issues_top.pl (-2 lines)
23	use C4::Auth;	23	use C4::Auth;
24	use CGI qw ( -utf8 );	24	use CGI qw ( -utf8 );
25	use C4::Context;	25	use C4::Context;
26	use C4::Branch; # GetBranches
27	use C4::Output;	26	use C4::Output;
28	use C4::Koha;	27	use C4::Koha;
29	use C4::Circulation;	28	use C4::Circulation;
Lines 159-165 if ($do_it) { Link Here
159	$template->param(	158	$template->param(
160	CGIextChoice => $CGIextChoice,	159	CGIextChoice => $CGIextChoice,
161	CGIsepChoice => $CGIsepChoice,	160	CGIsepChoice => $CGIsepChoice,
162	branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}),
163	itemtypeloop =>\@itemtypeloop,	161	itemtypeloop =>\@itemtypeloop,
164	ccodeloop =>\@ccodeloop,	162	ccodeloop =>\@ccodeloop,
165	shelvinglocloop =>\@shelvinglocloop,	163	shelvinglocloop =>\@shelvinglocloop,

Lines 24-30 use CGI qw ( -utf8 ); Link Here

(-)a/reports/catalogue_out.pl (-2 lines)
24	use C4::Auth;	24	use C4::Auth;
25	use C4::Context;	25	use C4::Context;
26	use C4::Debug;	26	use C4::Debug;
27	use C4::Branch; # GetBranchesLoop
28	use C4::Output;	27	use C4::Output;
29	use C4::Koha; # GetItemTypes	28	use C4::Koha; # GetItemTypes
30	# use Date::Manip; # TODO: add not borrowed since date X criteria	29	# use Date::Manip; # TODO: add not borrowed since date X criteria
Lines 78-84 foreach ( Link Here
78		77
79	$template->param(	78	$template->param(
80	itemtypeloop => \@itemtypeloop,	79	itemtypeloop => \@itemtypeloop,
81	branchloop => GetBranchesLoop(),
82	);	80	);
83	output_html_with_http_headers $input, $cookie, $template->output;	81	output_html_with_http_headers $input, $cookie, $template->output;
84		82

Lines 23-29 use strict; Link Here

(-)a/reports/catalogue_stats.pl (-2 lines)
23	use C4::Auth;	23	use C4::Auth;
24	use CGI qw ( -utf8 );	24	use CGI qw ( -utf8 );
25	use C4::Context;	25	use C4::Context;
26	use C4::Branch; # GetBranches
27	use C4::Output;	26	use C4::Output;
28	use C4::Koha;	27	use C4::Koha;
29	use C4::Reports;	28	use C4::Reports;
Lines 156-162 if ($do_it) { Link Here
156		155
157	$template->param(	156	$template->param(
158	itemtypes => $itemtypes,	157	itemtypes => $itemtypes,
159	CGIBranch => GetBranchesLoop( C4::Context->userenv->{'branch'} ),
160	locationloop => \@locations,	158	locationloop => \@locations,
161	authvals => \@authvals,	159	authvals => \@authvals,
162	CGIextChoice => \@mime,	160	CGIextChoice => \@mime,




use C4::Output;
use C4::Debug;
use C4::Koha qw/GetFrameworksLoop/;
use C4::Branch;
use C4::Context;
use Koha::Caches;
use C4::Log;
use Koha::DateUtils qw/dt_from_string output_pref/;
use Koha::AuthorisedValue;
use Koha::AuthorisedValues;
use Koha::Libraries;
use Koha::Patron::Categories;

=head1 NAME

                    my %authorised_lib;
                    # builds list, depending on authorised value...
                    if ( $authorised_value eq "branches" ) {
                        my $libraries = Koha::Libraries->search( {}, { order_by => ['branchname'] } );
                        while ( my $library = $libraries->next ) {
                            push @authorised_values, $library->branchcode;
                            $authorised_lib{$library->branchcode} = $library->branchname;
                        }
                    }
                    elsif ( $authorised_value eq "itemtypes" ) {

Lines 154-160 if ($do_it) { Link Here

(-)a/reports/issues_avg_stats.pl (-1 lines)
154	$template->param(	154	$template->param(
155	patron_categories => $patron_categories,	155	patron_categories => $patron_categories,
156	itemtypes => $itemtypes,	156	itemtypes => $itemtypes,
157	branchloop => GetBranchesLoop(),
158	hassort1 => $hassort1,	157	hassort1 => $hassort1,
159	hassort2 => $hassort2,	158	hassort2 => $hassort2,
160	HlghtSort2 => $hglghtsort2,	159	HlghtSort2 => $hglghtsort2,

Lines 66-73 the hashes are then translated to hash / arrays to be returned to manager.pl & s Link Here

(-)a/reports/issues_by_borrower_category.plugin (-2 lines)
66	sub set_parameters {	66	sub set_parameters {
67	my ($template) = @_;	67	my ($template) = @_;
68		68
69	$template->param( branchloop => GetBranchesLoop() );
70
71	my $patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['categorycode']});	69	my $patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['categorycode']});
72	$template->param( patron_categories => $patron_categories );	70	$template->param( patron_categories => $patron_categories );
73	return $template;	71	return $template;

Lines 26-32 use Date::Manip; Link Here

(-)a/reports/issues_stats.pl (-2 lines)
26	use C4::Auth;	26	use C4::Auth;
27	use C4::Debug;	27	use C4::Debug;
28	use C4::Context;	28	use C4::Context;
29	use C4::Branch; # GetBranches
30	use C4::Koha;	29	use C4::Koha;
31	use C4::Output;	30	use C4::Output;
32	use C4::Circulation;	31	use C4::Circulation;
Lines 156-162 $template->param( Link Here
156	itemtypeloop => \@itemtypeloop,	155	itemtypeloop => \@itemtypeloop,
157	locationloop => \@locations,	156	locationloop => \@locations,
158	ccodeloop => \@ccodes,	157	ccodeloop => \@ccodes,
159	branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}),
160	hassort1=> $hassort1,	158	hassort1=> $hassort1,
161	hassort2=> $hassort2,	159	hassort2=> $hassort2,
162	Bsort1 => $Bsort1,	160	Bsort1 => $Bsort1,




use C4::Biblio;
use C4::Items;
use C4::Koha;                  # GetItemTypes
use C4::Branch; # GetBranches
use Koha::DateUtils;

my $query = new CGI;

                 );
}

# getting all branches.
#my $branches = GetBranches;
#my $branch   = C4::Context->userenv->{"branchname"};

# getting all itemtypes
my $itemtypes = &GetItemTypes();
my @itemtypesloop;

# get lost statuses
my $lost_status_loop = C4::Koha::GetAuthorisedValues( 'LOST' );

$template->param(
                  itemtypeloop   => \@itemtypesloop,
                  loststatusloop => $lost_status_loop,
);




use C4::Search;
use C4::Output;
use C4::Koha;
use C4::Branch; # GetBranches
=head1

=cut

sub set_parameters {
    my ($template) = @_;
    my $userbranch = '';
    if (C4::Context->userenv && C4::Context->userenv->{'branch'}) {
        $userbranch = C4::Context->userenv->{'branch'};
    }
    $template->param( branchloop => GetBranchesLoop($userbranch) );
    return $template;
}


Lines 26-32 use CGI qw ( -utf8 ); Link Here

(-)a/reports/reserves_stats.pl (-2 lines)
26	use C4::Auth;	26	use C4::Auth;
27	use C4::Debug;	27	use C4::Debug;
28	use C4::Context;	28	use C4::Context;
29	use C4::Branch; # GetBranches
30	use C4::Koha;	29	use C4::Koha;
31	use C4::Output;	30	use C4::Output;
32	use C4::Reports;	31	use C4::Reports;
Lines 164-170 $template->param( Link Here
164	itemtypeloop => \@itemtypeloop,	163	itemtypeloop => \@itemtypeloop,
165	locationloop => \@locations,	164	locationloop => \@locations,
166	ccodeloop => \@ccodes,	165	ccodeloop => \@ccodes,
167	branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}),
168	hassort1=> $hassort1,	166	hassort1=> $hassort1,
169	hassort2=> $hassort2,	167	hassort2=> $hassort2,
170	Bsort1 => $Bsort1,	168	Bsort1 => $Bsort1,

Lines 22-28 use warnings; Link Here

(-)a/reports/serials_stats.pl (-2 / +1 lines)
22	use C4::Auth;	22	use C4::Auth;
23	use CGI qw ( -utf8 );	23	use CGI qw ( -utf8 );
24	use C4::Context;	24	use C4::Context;
25	use C4::Branch; # GetBranches
26	use C4::Output;	25	use C4::Output;
27	use C4::Koha;	26	use C4::Koha;
28	use C4::Reports;	27	use C4::Reports;
Lines 153-159 if($do_it){ Link Here
153	CGIextChoice => $CGIextChoice,	152	CGIextChoice => $CGIextChoice,
154	CGIsepChoice => $CGIsepChoice,	153	CGIsepChoice => $CGIsepChoice,
155	booksellers => \@booksellers,	154	booksellers => \@booksellers,
156	branches => GetBranchesLoop(C4::Context->userenv->{'branch'}));	155	);
157	}	156	}
158		157
159	output_html_with_http_headers $input, $cookie, $template->output;	158	output_html_with_http_headers $input, $cookie, $template->output;




my $branches = GetBranches();
my $itemtypes = GetItemTypes();

my $userbranch = '';
if (C4::Context->userenv && C4::Context->userenv->{'branch'}) {
    $userbranch = C4::Context->userenv->{'branch'};
}


# Select borrowers infos
my $findborrower = $input->param('findborrower');
$findborrower = '' unless defined $findborrower;

        $reserve{'suspend_until'}  = $res->suspend_until();
        $reserve{'reserve_id'}     = $res->reserve_id();
        $reserve{itemtype}         = $res->itemtype();
        $reserve{branchcode}       = $res->branchcode();
        if ( C4::Context->preference('IndependentBranches') && $flags->{'superlibrarian'} != 1 ) {
            $reserve{'branchloop'} = [ Koha::Libraries->find( $res->branchcode() ) ];
        }
        else {
            $reserve{'branchloop'} = GetBranchesLoop( $res->branchcode() );
        }

        push( @reserveloop, \%reserve );
    }

    my $time = time();

    $template->param(
                     branchloop  => GetBranchesLoop($userbranch),
                     time        => $time,
                     fixedRank   => $fixedRank,
                    );




use CGI qw ( -utf8 );
use C4::Auth;
use C4::Serials; # GetExpirationDate
use C4::Branch;
use C4::Output;
use C4::Context;
use Koha::DateUtils;

    );
}

my $can_change_library;;
if (  !C4::Context->preference("IndependentBranches")
    or C4::Context->IsSuperLibrarian()
    or ( ref $flags->{serials}  and $flags->{serials}->{superserials} )
    or ( !ref $flags->{serials} and $flags->{serials} == 1 ) )
{
    $can_change_library = 1;
}

$template->param (
    (uc(C4::Context->preference("marcflavour"))) => 1,
    can_change_library => $can_change_library,
    branch => $branch,
);

output_html_with_http_headers $query, $cookie, $template->output;




use C4::Output;
use C4::Context;
use C4::Letters;
use C4::Branch;    # GetBranches GetBranchesLoop
use C4::Koha qw( GetAuthorisedValues );

use Koha::AdditionalField;

    }
}

my $branchloop = GetBranchesLoop();

my @serialnums=$input->multi_param('serialid');
if (@serialnums) { # i.e. they have been flagged to generate claims

        missingissues => \@missingissues,
        supplierid => $supplierid,
        claimletter => $claimletter,
        branchloop   => $branchloop,
        additional_fields_for_subscription => $additional_fields,
        csv_profiles => [ Koha::CsvProfiles->search({ type => 'sql' }) ],
        letters => $letters,

Lines 38-44 can_ok( Link Here

(-)a/t/db_dependent/Branch.t (-5 lines)
38	'C4::Branch', qw(	38	'C4::Branch', qw(
39	GetBranch	39	GetBranch
40	GetBranches	40	GetBranches
41	GetBranchesLoop
42	mybranch	41	mybranch
43	)	42	)
44	);	43	);
Lines 198-205 is( Koha::LibraryCategories->search->count, $count_cat + 3, "Two categories adde Link Here
198	#TODO later: test mybranchine and onlymine	197	#TODO later: test mybranchine and onlymine
199	# Actually we cannot mock C4::Context->userenv in unit tests	198	# Actually we cannot mock C4::Context->userenv in unit tests
200		199
201	#Test GetBranchesLoop
202	my $loop = GetBranchesLoop;
203	is( scalar(@$loop), Koha::Libraries->search->count, 'There is the right number of branches' );
204
205	$schema->storage->txn_rollback;	200	$schema->storage->txn_rollback;

Lines 63-71 foreach ( 1 .. $borrowers_count ) { Link Here

(-)a/t/db_dependent/Holds/LocalHoldsPriority.t (-3 lines)
63		63
64	my $biblionumber = $bibnum;	64	my $biblionumber = $bibnum;
65		65
66	my @branches = GetBranchesLoop();
67	my $branch = $branches[0][0]{value};
68
69	# Create five item level holds	66	# Create five item level holds
70	my $i = 1;	67	my $i = 1;
71	foreach my $borrowernumber (@borrowernumbers) {	68	foreach my $borrowernumber (@borrowernumbers) {




use C4::Members;
use C4::Reserves;

use Koha::Libraries;

use t::lib::TestBuilder;

my $schema = Koha::Database->schema;


my $biblionumber = $bibnum;

my $branchcode = Koha::Libraries->search->next->branchcode;
my $branch   = $branches[0][0]{value};

# Create five item level holds
foreach my $borrowernumber (@borrowernumbers) {
    AddReserve(
        $branchcode,
        $borrowernumber,
        $biblionumber,
        my $bibitems   = q{},

Lines 113-122 my $notes = ''; Link Here

(-)a/t/db_dependent/Reserves.t (-3 / +2 lines)
113	my $checkitem = undef;	113	my $checkitem = undef;
114	my $found = undef;	114	my $found = undef;
115		115
116	my @branches = GetBranchesLoop();	116	my $branchcode = Koha::Libraries->search->next->branchcode;
117	my $branch = $branches[0][0]{value};
118		117
119	AddReserve($branch, $borrowernumber, $biblionumber,	118	AddReserve($branchcode, $borrowernumber, $biblionumber,
120	$bibitems, $priority, $resdate, $expdate, $notes,	119	$bibitems, $priority, $resdate, $expdate, $notes,
121	$title, $checkitem, $found);	120	$title, $checkitem, $found);
122		121




$query  .= qq{ GROUP BY lib ORDER BY lib, lib_opac};
my $authorised_values_sth = $dbh->prepare( $query );

my $libraries = Koha::Libraries->search({}, { order_by => ['branchname'] })->unblessed;# build once ahead of time, instead of multiple times later.

# Adding a default choice, in case the user does not want to modify the branch
my $nochange_branch = { branchname => '', value => '', selected => 1 };
unshift (@$libraries, $nochange_branch);

my $pref_itemcallnumber = C4::Context->preference('itemcallnumber');


	my @authorised_values;
	my %authorised_lib;
	# builds list, depending on authorised value...

    if ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "branches" ) {
        foreach my $library (@$libraries) {
            push @authorised_values, $library->{branchcode};
            $authorised_lib{$library->{branchcode}} = $library->{branchname};
        }
        $value = "";
    }
    elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) {
        push @authorised_values, "";
        my $itemtypes = GetItemTypes( style => 'array' );




$keydate =~ s/-/\//g;

my $branch= $input->param('branch') || C4::Context->userenv->{'branch'};
# Set all the branches.
my $onlymine =
  (      C4::Context->preference('IndependentBranches')
      && C4::Context->userenv
      && !C4::Context->IsSuperLibrarian()
      && C4::Context->userenv->{branch} ? 1 : 0 );
if ( $onlymine ) { 
    $branch = C4::Context->userenv->{'branch'};
}
my $branches   = GetBranches($onlymine);
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'},
      };
}

# branches calculated - put branch codes in a single string so they can be passed in a form
my $branchcodes = join '|', keys %{$branches};


$template->param(
    WEEK_DAYS_LOOP           => \@week_days,
    branchloop               => \@branchloop,
    HOLIDAYS_LOOP            => \@holidays,
    EXCEPTION_HOLIDAYS_LOOP  => \@exception_holidays,
    DAY_MONTH_HOLIDAYS_LOOP  => \@day_month_holidays,




use C4::Auth;
use C4::Output;
use C4::Context;
use C4::Branch qw/GetBranchesLoop/;
use C4::Members;
use C4::Members::Attributes qw(:all);
use C4::Members::AttributeTypes;

        debug           => 1,
});

# get the branches and pass them to the template
my $branches = GetBranchesLoop();
$template->param( branches => $branches ) if ( $branches );
# get the patron categories and pass them to the template
my @patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['description']});
$template->param( categories => \@patron_categories );




    }
);


my $branches = GetBranches();
my @branch_loop;
for my $branch_hash (keys %$branches) {
    push @branch_loop, {value => "$branch_hash",
                       branchname => $branches->{$branch_hash}->{'branchname'},
                       selected => ($branch_hash eq $branchcode?1:0)};
}

@branch_loop = sort {$a->{branchname} cmp $b->{branchname}} @branch_loop;
my @authorised_value_list;
my $authorisedvalue_categories = '';


}
$statussth =~ s, and $,,g;
$template->param(
    branchloop               => \@branch_loop,
    authorised_values        => \@authorised_value_list,
    today                    => dt_from_string,
    minlocation              => $minlocation,




    $template->param(
        oldbranchcode => $oldbranchcode,
        branchcode => $branchcode,
        branchloop => _branchloop($branchcode),
        copying => 1,
        modify => 0,
    );


    $template->param(
        module     => $module,
        branchloop => _branchloop($branchcode),
        SQLfieldnames => $field_selection,
        branchcode => $branchcode,
    );


    $template->param(
        letter => $loop_data,
        branchcode => $branchcode,
    );
}

sub _branchloop {
    my ($branchcode) = @_;

    my $branches = GetBranches();
    my @branchloop;
    for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
        push @branchloop, {
            value      => $thisbranch,
            selected   => $branchcode && $thisbranch eq $branchcode,
            branchname => $branches->{$thisbranch}->{'branchname'},
        };
    }

    return \@branchloop;
}

sub add_fields {
    my @tables = @_;
    my @fields = ();




use Modern::Perl;
use CGI qw ( -utf8 );
use C4::Auth;
use C4::Branch;
use C4::Koha;
use C4::Members;
use C4::Members::Attributes;

use List::MoreUtils qw /any uniq/;
use Koha::DateUtils qw( dt_from_string );
use Koha::List::Patron;
use Koha::Libraries;
use Koha::Patron::Categories;

my $input = new CGI;

        if @notfoundcardnumbers;

    # Construct drop-down list values
    my $branches = Koha::Libraries->search({}, { order_by => ['branchname'] })->unblessed;
    my @branches_option;
    push @branches_option, { value => $_->{value}, lib => $_->{branchname} } for @$branches;
    unshift @branches_option, { value => "", lib => "" };




use C4::Output;
use C4::Auth;
use C4::Koha;
use C4::Branch;
use C4::Letters;
use C4::Members;
use C4::Overdues;

        $input_saved = 1;
    }
}
my $branchloop = GetBranchesLoop($branch);

my $letters = C4::Letters::GetLettersAvailableForALibrary(
    {


$template->param(
    table => ( @first or @second or @third ? 1 : 0 ),
    branchloop => $branchloop,
    branch => $branch,
    tabs => \@tabs,
    message_transport_types => $message_transport_types,
- 

Return to bug 15758

Lines 281-294 foreach my $result ( @{$results} ) { Link Here

(-)a/admin/aqbudgetperiods.pl (-3 lines)
281	push( @period_inactive_loop, $budgetperiod );	281	push( @period_inactive_loop, $budgetperiod );
282	}	282	}
283		283
284	my $branchloop = C4::Branch::GetBranchesLoop();
285
286	my $tab = $input->param('tab') ? $input->param('tab') - 1 : 0;	284	my $tab = $input->param('tab') ? $input->param('tab') - 1 : 0;
287	$template->param(	285	$template->param(
288	period_active_loop => \@period_active_loop,	286	period_active_loop => \@period_active_loop,
289	period_inactive_loop => \@period_inactive_loop,	287	period_inactive_loop => \@period_inactive_loop,
290	tab => $tab,	288	tab => $tab,
291	branchloop => $branchloop,
292	);	289	);
293		290
294	$template->param($op=>1);	291	$template->param($op=>1);

Lines 461-476 $template->param( Link Here

(-)a/admin/smart-rules.pl (-12 / +1 lines)
461	defaultRefundRule => Koha::RefundLostItemFeeRules->_default_rule	461	defaultRefundRule => Koha::RefundLostItemFeeRules->_default_rule
462	);	462	);
463		463
464	my $branches = GetBranches();
465	my @branchloop;
466	for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
467	push @branchloop, {
468	value => $thisbranch,
469	selected => $thisbranch eq $branch,
470	branchname => $branches->{$thisbranch}->{'branchname'},
471	};
472	}
473
474	my $patron_categories = Koha::Patron::Categories->search({}, { order_by => ['description'] });	464	my $patron_categories = Koha::Patron::Categories->search({}, { order_by => ['description'] });
475		465
476	my @row_loop;	466	my @row_loop;
Lines 624-631 $template->param( Link Here
624	patron_categories => $patron_categories,	614	patron_categories => $patron_categories,
625	itemtypeloop => \@itemtypes,	615	itemtypeloop => \@itemtypes,
626	rules => \@sorted_row_loop,	616	rules => \@sorted_row_loop,
627	branchloop => \@branchloop,	617	humanbranch => ($branch ne '*' ? $branch : ''),
628	humanbranch => ($branch ne '*' ? $branches->{$branch}->{branchname} : ''),
629	current_branch => $branch,	618	current_branch => $branch,
630	definedbranch => scalar(@sorted_row_loop)>0	619	definedbranch => scalar(@sorted_row_loop)>0
631	);	620	);

Lines 521-530 var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt (-9 / +3 lines)
521	<li>	521	<li>
522	<label for="budget_branchcode">Library: </label>	522	<label for="budget_branchcode">Library: </label>
523	<select name="budget_branchcode" id="budget_branchcode">	523	<select name="budget_branchcode" id="budget_branchcode">
524	<option value=""></option>	524	<option value=""></option>
525	[% FOREACH branchloop_selec IN branchloop_select %]	525	[% PROCESS options_for_libraries libraries => branchloop_select %]
526	[% UNLESS ( branchloop_selec.selected ) %] <option value="[% branchloop_selec.value %]" > [% ELSE %] <option value="[% branchloop_selec.value %]" selected="selected"> [% END %] [% branchloop_selec.value %]-[% branchloop_selec.branchname %]</option>
527	[% END %]
528	</select>	526	</select>
529	</li>	527	</li>
530		528
Lines 655-665 var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") Link Here
655	<label for="filter_budgetbranch2">Library: </label>	653	<label for="filter_budgetbranch2">Library: </label>
656	<select name="filter_budgetbranch" id="filter_budgetbranch2" style="width:10em;">	654	<select name="filter_budgetbranch" id="filter_budgetbranch2" style="width:10em;">
657	<option value=""></option>	655	<option value=""></option>
658	[% FOREACH branchloo IN branchloop %]	656	[% PROCESS options_for_libraries libraries => branchloop_select %]
659	[% UNLESS ( branchloo.selected ) %]<option value="[% branchloo.value %]">
660	[% ELSE %]<option value="[% branchloo.value %]" selected="selected">[% END %]
661	[% branchloo.branchname %]</option>
662	[% END %]
663	</select>	657	</select>
664	</li>	658	</li>
665	<li class="radio">	659	<li class="radio">

Lines 252-264 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt (-7 / +1 lines)
252	<fieldset id="select-libs">	252	<fieldset id="select-libs">
253	<p><label for="branchloop">Individual libraries:</label><select name="limit" id="branchloop" onchange='if(this.value != ""){document.getElementById("categoryloop").disabled=true;} else {document.getElementById("categoryloop").disabled=false;}'>	253	<p><label for="branchloop">Individual libraries:</label><select name="limit" id="branchloop" onchange='if(this.value != ""){document.getElementById("categoryloop").disabled=true;} else {document.getElementById("categoryloop").disabled=false;}'>
254	<option value="">All libraries</option>	254	<option value="">All libraries</option>
255	[% FOREACH branchloo IN branchloop %]	255	[% PROCESS options_for_libraries libraries => Branches.all() %]
256	[% IF ( branchloo.selected ) %]
257	<option value="branch:[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
258	[% ELSE %]
259	<option value="branch:[% branchloo.value %]">[% branchloo.branchname %]</option>
260	[% END %]
261	[% END %]
262	</select></p>	256	</select></p>
263	<!-- <input type="hidden" name="limit" value="branch: MAIN" /> -->	257	<!-- <input type="hidden" name="limit" value="branch: MAIN" /> -->
264	[% IF ( searchdomainloop ) %]	258	[% IF ( searchdomainloop ) %]

Lines 506-518 function filterByFirstLetterSurname(letter) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-7 / +1 lines)
506	[% IF branches.size != 1 %]	506	[% IF branches.size != 1 %]
507	<option value="">Any</option>	507	<option value="">Any</option>
508	[% END %]	508	[% END %]
509	[% FOREACH b IN branches %]	509	[% PROCESS options_for_libraries libraries => branches %]
510	[% IF b.selected %]
511	<option selected="selected" value="[% b.branchcode %]">[% b.branchname %]</option>
512	[% ELSE %]
513	<option value="[% b.branchcode %]">[% b.branchname %]</option>
514	[% END %]
515	[% END %]
516	</select>	510	</select>
517	</li>	511	</li>
518	</ol>	512	</ol>

Lines 29-35 require Exporter; Link Here

(-)a/C4/Auth.pm (-7 / +2 lines)
29	use C4::Context;	29	use C4::Context;
30	use C4::Templates; # to get the template	30	use C4::Templates; # to get the template
31	use C4::Languages;	31	use C4::Languages;
32	use C4::Branch; # GetBranches
33	use C4::Search::History;	32	use C4::Search::History;
34	use Koha;	33	use Koha;
35	use Koha::Caches;	34	use Koha::Caches;
Lines 514-520 sub get_template_and_user { Link Here
514	$template->param(	513	$template->param(
515	OpacAdditionalStylesheet => C4::Context->preference("OpacAdditionalStylesheet"),	514	OpacAdditionalStylesheet => C4::Context->preference("OpacAdditionalStylesheet"),
516	AnonSuggestions => "" . C4::Context->preference("AnonSuggestions"),	515	AnonSuggestions => "" . C4::Context->preference("AnonSuggestions"),
517	BranchesLoop => GetBranchesLoop($opac_name),
518	BranchCategoriesLoop => $library_categories,	516	BranchCategoriesLoop => $library_categories,
519	opac_name => $opac_name,	517	opac_name => $opac_name,
520	LibraryName => "" . C4::Context->preference("LibraryName"),	518	LibraryName => "" . C4::Context->preference("LibraryName"),
Lines 1080-1086 sub checkauth { Link Here
1080	$branchcode = $query->param('branch');	1078	$branchcode = $query->param('branch');
1081	$branchname = Koha::Libraries->find($branchcode)->branchname;	1079	$branchname = Koha::Libraries->find($branchcode)->branchname;
1082	}	1080	}
1083	my $branches = GetBranches();	1081	my $branches = C4::Branch::GetBranches();
1084	if ( C4::Context->boolean_preference('IndependentBranches') && C4::Context->boolean_preference('Autolocation') ) {	1082	if ( C4::Context->boolean_preference('IndependentBranches') && C4::Context->boolean_preference('Autolocation') ) {
1085		1083
1086	# we have to check they are coming from the right ip range	1084	# we have to check they are coming from the right ip range
Lines 1091-1097 sub checkauth { Link Here
1091	}	1089	}
1092	}	1090	}
1093		1091
1094	my @branchesloop;
1095	foreach my $br ( keys %$branches ) {	1092	foreach my $br ( keys %$branches ) {
1096		1093
1097	# now we work with the treatment of ip	1094	# now we work with the treatment of ip
Lines 1208-1214 sub checkauth { Link Here
1208	my $template_name = ( $type eq 'opac' ) ? 'opac-auth.tt' : 'auth.tt';	1205	my $template_name = ( $type eq 'opac' ) ? 'opac-auth.tt' : 'auth.tt';
1209	my $template = C4::Templates::gettemplate( $template_name, $type, $query );	1206	my $template = C4::Templates::gettemplate( $template_name, $type, $query );
1210	$template->param(	1207	$template->param(
1211	branchloop => GetBranchesLoop(),
1212	OpacAdditionalStylesheet => C4::Context->preference("OpacAdditionalStylesheet"),	1208	OpacAdditionalStylesheet => C4::Context->preference("OpacAdditionalStylesheet"),
1213	opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),	1209	opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
1214	login => 1,	1210	login => 1,
Lines 1532-1539 sub check_api_auth { Link Here
1532	$branchcode = $query->param('branch');	1528	$branchcode = $query->param('branch');
1533	$branchname = Koha::Libraries->find($branchcode)->branchname;	1529	$branchname = Koha::Libraries->find($branchcode)->branchname;
1534	}	1530	}
1535	my $branches = GetBranches();	1531	my $branches = C4::Branch::GetBranches();
1536	my @branchesloop;
1537	foreach my $br ( keys %$branches ) {	1532	foreach my $br ( keys %$branches ) {
1538		1533
1539	# now we work with the treatment of ip	1534	# now we work with the treatment of ip

Lines 29-35 BEGIN { Link Here

(-)a/C4/Branch.pm (-19 lines)
29	@EXPORT = qw(	29	@EXPORT = qw(
30	&GetBranch	30	&GetBranch
31	&GetBranches	31	&GetBranches
32	&GetBranchesLoop
33	&mybranch	32	&mybranch
34	);	33	);
35	@EXPORT_OK = qw( &onlymine &mybranch );	34	@EXPORT_OK = qw( &onlymine &mybranch );
Lines 83-90 Create a branch selector with the following code. Link Here
83	[% END %]	82	[% END %]
84	</select>	83	</select>
85		84
86	=head4 Note that you often will want to just use GetBranchesLoop, for exactly the example above.
87
88	=cut	85	=cut
89		86
90	sub GetBranches {	87	sub GetBranches {
Lines 135-156 sub mybranch { Link Here
135	return C4::Context->userenv->{branch} \|\| '';	132	return C4::Context->userenv->{branch} \|\| '';
136	}	133	}
137		134
138	sub GetBranchesLoop { # since this is what most pages want anyway
139	my $branch = @_ ? shift : mybranch(); # optional first argument is branchcode of "my branch", if preselection is wanted.
140	my $onlymine = @_ ? shift : onlymine();
141	my $branches = GetBranches($onlymine);
142	my @loop;
143	foreach my $branchcode ( sort { uc($branches->{$a}->{branchname}) cmp uc($branches->{$b}->{branchname}) } keys %$branches ) {
144	push @loop, {
145	value => $branchcode,
146	branchcode => $branchcode,
147	selected => ($branchcode eq $branch) ? 1 : 0,
148	branchname => $branches->{$branchcode}->{branchname},
149	};
150	}
151	return \@loop;
152	}
153
154	=head2 GetBranch	135	=head2 GetBranch
155		136
156	$branch = GetBranch( $query, $branches );	137	$branch = GetBranch( $query, $branches );

Lines 67-90 sub all { Link Here

(-)a/Koha/Template/Plugin/Branches.pm (-10 / +11 lines)
67	SELECT branchcode, branchname	67	SELECT branchcode, branchname
68	FROM branches	68	FROM branches
69	\|;	69	\|;
70	if ( C4::Branch::onlymine	70	if ( C4::Context->preference('IndependentBranches')
71	and C4::Context->userenv	71	and C4::Context->userenv
		72	&& !C4::Context->IsSuperLibrarian()
72	and C4::Context->userenv->{branch} )	73	and C4::Context->userenv->{branch} )
73	{	74	{
74	$query .= q\| WHERE branchcode = ? \|;	75	$query .= q\| WHERE branchcode = ? \|;
75	push @params, C4::Context->userenv->{branch};	76	push @params, C4::Context->userenv->{branch};
76	}	77	}
77	$query .= q\| ORDER BY branchname\|;	78	my $libraries = $dbh->selectall_arrayref( $query, { Slice => {} }, @params );
78	my $branches = $dbh->selectall_arrayref( $query, { Slice => {} }, @params );	79
79		80	for my $l ( @$libraries ) {
80	if ( $selected ) {	81	if ( $selected and $l->{branchcode} eq $selected
81	for my $branch ( @$branches ) {	82	or not $selected and C4::Context->userenv and $l->{branchcode} eq C4::Context->userenv->{branch}
82	if ( $branch->{branchcode} eq $selected ) {	83	) {
83	$branch->{selected} = 1;	84	$l->{selected} = 1;
84	}
85	}	85	}
86	}	86	}
87	return $branches;	87
		88	return $libraries;
88	}	89	}
89		90
90	1;	91	1;

Lines 52-58 use C4::Output; Link Here

(-)a/acqui/basketgroup.pl (-5 / +2 lines)
52	use CGI qw ( -utf8 );	52	use CGI qw ( -utf8 );
53		53
54	use C4::Acquisition qw/CloseBasketgroup ReOpenBasketgroup GetOrders GetBasketsByBasketgroup GetBasketsByBookseller ModBasketgroup NewBasketgroup DelBasketgroup GetBasketgroups ModBasket GetBasketgroup GetBasket GetBasketGroupAsCSV/;	54	use C4::Acquisition qw/CloseBasketgroup ReOpenBasketgroup GetOrders GetBasketsByBasketgroup GetBasketsByBookseller ModBasketgroup NewBasketgroup DelBasketgroup GetBasketgroups ModBasket GetBasketgroup GetBasket GetBasketGroupAsCSV/;
55	use C4::Branch qw/GetBranches/;
56	use C4::Members qw/GetMember/;	55	use C4::Members qw/GetMember/;
57	use Koha::EDI qw/create_edi_order get_edifact_ean/;	56	use Koha::EDI qw/create_edi_order get_edifact_ean/;
58		57
Lines 272-281 if ( $op eq "add" ) { Link Here
272	$billingplace = $billingplace \|\| $borrower->{'branchcode'};	271	$billingplace = $billingplace \|\| $borrower->{'branchcode'};
273	$deliveryplace = $deliveryplace \|\| $borrower->{'branchcode'};	272	$deliveryplace = $deliveryplace \|\| $borrower->{'branchcode'};
274		273
275	my $branches = C4::Branch::GetBranchesLoop( $billingplace );	274	$template->param( billingplace => $billingplace );
276	$template->param( billingplaceloop => $branches );	275	$template->param( deliveryplace => $deliveryplace );
277	$branches = C4::Branch::GetBranchesLoop( $deliveryplace );
278	$template->param( deliveryplaceloop => $branches );
279	$template->param( booksellerid => $booksellerid );	276	$template->param( booksellerid => $booksellerid );
280		277
281	# the template will display a unique basketgroup	278	# the template will display a unique basketgroup

Lines 121-140 if ( $op eq 'add_form' ) { Link Here

(-)a/acqui/basketheader.pl (-8 / +2 lines)
121	booksellerid => $booksellerid,	121	booksellerid => $booksellerid,
122	basketno => $basketno,	122	basketno => $basketno,
123	booksellers => \@booksellers,	123	booksellers => \@booksellers,
124	deliveryplace => $basket->{deliveryplace},
125	billingplace => $basket->{billingplace},
126	is_standing => $basket->{is_standing},	124	is_standing => $basket->{is_standing},
127	);	125	);
128		126
129	my $billingplace = $basket->{'billingplace'} \|\| C4::Context->userenv->{"branch"};	127	my $billingplace = $basket->{'billingplace'} \|\| C4::Context->userenv->{"branch"};
130	my $deliveryplace = $basket->{'deliveryplace'} \|\| C4::Context->userenv->{"branch"};	128	my $deliveryplace = $basket->{'deliveryplace'} \|\| C4::Context->userenv->{"branch"};
131		129
132	# Build the combobox to select the billing place	130	$template->param( billingplace => $billingplace );
133		131	$template->param( deliveryplace => $deliveryplace );
134	my $branches = C4::Branch::GetBranchesLoop( $billingplace );
135	$template->param( billingplaceloop => $branches );
136	$branches = C4::Branch::GetBranchesLoop( $deliveryplace );
137	$template->param( deliveryplaceloop => $branches );
138		132
139	#End Edit	133	#End Edit
140	} elsif ( $op eq 'add_validate' ) {	134	} elsif ( $op eq 'add_validate' ) {

Lines 210-233 $suggestion = GetSuggestionInfo($suggestionid) if $suggestionid; Link Here

(-)a/acqui/neworderempty.pl (-18 lines)
210	my @currencies = Koha::Acquisition::Currencies->search;	210	my @currencies = Koha::Acquisition::Currencies->search;
211	my $active_currency = Koha::Acquisition::Currencies->get_active;	211	my $active_currency = Koha::Acquisition::Currencies->get_active;
212		212
213	# build branches list
214	my $onlymine =
215	C4::Context->preference('IndependentBranches')
216	&& C4::Context->userenv
217	&& !C4::Context->IsSuperLibrarian()
218	&& C4::Context->userenv->{branch};
219	my $branches = GetBranches($onlymine);
220	my @branchloop;
221	foreach my $thisbranch ( sort {$branches->{$a}->{'branchname'} cmp $branches->{$b}->{'branchname'}} keys %$branches ) {
222	my %row = (
223	value => $thisbranch,
224	branchname => $branches->{$thisbranch}->{'branchname'},
225	);
226	$row{'selected'} = 1 if( $thisbranch && $data->{branchcode} && $thisbranch eq $data->{branchcode}) ;
227	push @branchloop, \%row;
228	}
229	$template->param( branchloop => \@branchloop );
230
231	# build bookfund list	213	# build bookfund list
232	my $borrower= GetMember('borrowernumber' => $loggedinuser);	214	my $borrower= GetMember('borrowernumber' => $loggedinuser);
233	my ( $flags, $homebranch )= ($borrower->{'flags'},$borrower->{'branchcode'});	215	my ( $flags, $homebranch )= ($borrower->{'flags'},$borrower->{'branchcode'});

Lines 96-107 my $user_branchcode = $user->{'branchcode'}; Link Here

(-)a/admin/aqbudgets.pl (-4 / +2 lines)
96	$template->param(	96	$template->param(
97	show_mine => $show_mine,	97	show_mine => $show_mine,
98	op => $op,	98	op => $op,
		99	selected_branchcode => $filter_budgetbranch,
99	);	100	);
100		101
101	my $budget;	102	my $budget;
102		103
103	my $branchloop = C4::Branch::GetBranchesLoop($filter_budgetbranch);
104
105	$template->param(auth_cats_loop => GetBudgetAuthCats( $budget_period_id ))	104	$template->param(auth_cats_loop => GetBudgetAuthCats( $budget_period_id ))
106	if $budget_period_id;	105	if $budget_period_id;
107		106
Lines 153-159 if ($op eq 'add_form') { Link Here
153	$row{selected} = 1 if $budget and $thisbranch eq $budget->{'budget_branchcode'};	152	$row{selected} = 1 if $budget and $thisbranch eq $budget->{'budget_branchcode'};
154	push @branchloop_select, \%row;	153	push @branchloop_select, \%row;
155	}	154	}
156		155
157	# populates the YUI planning button	156	# populates the YUI planning button
158	my $categories = GetAuthorisedValueCategories();	157	my $categories = GetAuthorisedValueCategories();
159	my @auth_cats_loop1 = ();	158	my @auth_cats_loop1 = ();
Lines 343-349 if ( $op eq 'list' ) { Link Here
343	spent_total => $spent_total,	342	spent_total => $spent_total,
344	ordered_total => $ordered_total,	343	ordered_total => $ordered_total,
345	available_total => $available_total,	344	available_total => $available_total,
346	branchloop => $branchloop,
347	filter_budgetname => $filter_budgetname,	345	filter_budgetname => $filter_budgetname,
348	);	346	);
349		347

Lines 33-39 use C4::Output; Link Here

(-)a/admin/clone-rules.pl (-4 lines)
33	use C4::Auth;	33	use C4::Auth;
34	use C4::Koha;	34	use C4::Koha;
35	use C4::Debug;	35	use C4::Debug;
36	use C4::Branch; # GetBranchesLoop
37		36
38	my $input = new CGI;	37	my $input = new CGI;
39	my $dbh = C4::Context->dbh;	38	my $dbh = C4::Context->dbh;
Lines 49-61 my ($template, $loggedinuser, $cookie) Link Here
49		48
50	my $frombranch = $input->param("frombranch");	49	my $frombranch = $input->param("frombranch");
51	my $tobranch = $input->param("tobranch");	50	my $tobranch = $input->param("tobranch");
52	my $branchloop = GetBranchesLoop;
53		51
54	$template->param(frombranch => $frombranch) if ($frombranch);	52	$template->param(frombranch => $frombranch) if ($frombranch);
55	$template->param(tobranch => $tobranch) if ($tobranch);	53	$template->param(tobranch => $tobranch) if ($tobranch);
56		54
57	$template->param(branchloop => $branchloop);
58
59	if ($frombranch && $tobranch) {	55	if ($frombranch && $tobranch) {
60		56
61	my $error;	57	my $error;

Lines 214-238 if($cgi->cookie("intranet_bib_list")){ Link Here

(-)a/catalogue/search.pl (-18 / +2 lines)
214	}	214	}
215		215
216	# load the branches	216	# load the branches
217	my $branches = GetBranches();
218
219	# Populate branch_loop with all branches sorted by their name. If
220	# IndependentBranches is activated, set the default branch to the borrower
221	# branch, except for superlibrarian who need to search all libraries.
222	my $user = C4::Context->userenv;
223	my @branch_loop = map {
224	{
225	value => $_,
226	branchname => $branches->{$_}->{branchname},
227	selected => $user->{branch} eq $_ && C4::Branch::onlymine(),
228	}
229	} sort {
230	$branches->{$a}->{branchname} cmp $branches->{$b}->{branchname}
231	} keys %$branches;
232
233	my $categories = Koha::LibraryCategories->search( { categorytype => 'searchdomain' }, { order_by => [ 'categorytype', 'categorycode' ] } );	217	my $categories = Koha::LibraryCategories->search( { categorytype => 'searchdomain' }, { order_by => [ 'categorytype', 'categorycode' ] } );
234		218
235	$template->param(branchloop => \@branch_loop, searchdomainloop => $categories);	219	$template->param(searchdomainloop => $categories);
236		220
237	# load the Type stuff	221	# load the Type stuff
238	my $itemtypes = GetItemTypes;	222	my $itemtypes = GetItemTypes;
Lines 537-543 eval { Link Here
537	my $itemtypes = GetItemTypes;	521	my $itemtypes = GetItemTypes;
538	( $error, $results_hashref, $facets ) = $searcher->search_compat(	522	( $error, $results_hashref, $facets ) = $searcher->search_compat(
539	$query, $simple_query, \@sort_by, \@servers,	523	$query, $simple_query, \@sort_by, \@servers,
540	$results_per_page, $offset, $expanded_facet, $branches,	524	$results_per_page, $offset, $expanded_facet, undef,
541	$itemtypes, $query_type, $scan	525	$itemtypes, $query_type, $scan
542	);	526	);
543	};	527	};

Lines 29-37 use C4::Items; Link Here

(-)a/cataloguing/additem.pl (-12 / +10 lines)
29	use C4::Context;	29	use C4::Context;
30	use C4::Circulation;	30	use C4::Circulation;
31	use C4::Koha;	31	use C4::Koha;
32	use C4::Branch;
33	use C4::ClassSource;	32	use C4::ClassSource;
34	use Koha::DateUtils;	33	use Koha::DateUtils;
		34	use Koha::Libraries;
35	use List::MoreUtils qw/any/;	35	use List::MoreUtils qw/any/;
36	use C4::Search;	36	use C4::Search;
37	use Storable qw(thaw freeze);	37	use Storable qw(thaw freeze);
Lines 175-183 sub generate_subfield_form { Link Here
175	# builds list, depending on authorised value...	175	# builds list, depending on authorised value...
176	if ( $subfieldlib->{authorised_value} eq "branches" ) {	176	if ( $subfieldlib->{authorised_value} eq "branches" ) {
177	foreach my $thisbranch (@$branches) {	177	foreach my $thisbranch (@$branches) {
178	push @authorised_values, $thisbranch->{value};	178	push @authorised_values, $thisbranch->{branchcode};
179	$authorised_lib{$thisbranch->{value}} = $thisbranch->{branchname};	179	$authorised_lib{$thisbranch->{branchcode}} = $thisbranch->{branchname};
180	$value = $thisbranch->{value} if $thisbranch->{selected} && !$value;	180	$value = $thisbranch->{branchcode} if $thisbranch->{selected} && !$value;
181	}	181	}
182	}	182	}
183	elsif ( $subfieldlib->{authorised_value} eq "itemtypes" ) {	183	elsif ( $subfieldlib->{authorised_value} eq "itemtypes" ) {
Lines 863-875 my $i=0; Link Here
863		863
864	my $pref_itemcallnumber = C4::Context->preference('itemcallnumber');	864	my $pref_itemcallnumber = C4::Context->preference('itemcallnumber');
865		865
866	my $onlymine =
867	C4::Context->preference('IndependentBranches')
868	&& C4::Context->userenv
869	&& !C4::Context->IsSuperLibrarian()
870	&& C4::Context->userenv->{branch};
871	my $branch = $input->param('branch') \|\| C4::Context->userenv->{branch};	866	my $branch = $input->param('branch') \|\| C4::Context->userenv->{branch};
872	my $branches = GetBranchesLoop($branch,$onlymine); # build once ahead of time, instead of multiple times later.	867	my $libraries = Koha::Libraries->search({}, { order_by => ['branchname'] })->unblessed;# build once ahead of time, instead of multiple times later.
		868	for my $library ( @$libraries ) {
		869	$library->{selected} = 1 if $library->{branchcode} eq $branch
		870	}
873		871
874	# We generate form, from actuel record	872	# We generate form, from actuel record
875	@fields = ();	873	@fields = ();
Lines 884-890 if($itemrecord){ Link Here
884		882
885	next if ($tagslib->{$tag}->{$subfieldtag}->{'tab'} ne "10");	883	next if ($tagslib->{$tag}->{$subfieldtag}->{'tab'} ne "10");
886		884
887	my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $branches, $biblionumber, $temp, \@loop_data, $i, $restrictededition);	885	my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $libraries, $biblionumber, $temp, \@loop_data, $i, $restrictededition);
888	push @fields, "$tag$subfieldtag";	886	push @fields, "$tag$subfieldtag";
889	push (@loop_data, $subfield_data);	887	push (@loop_data, $subfield_data);
890	$i++;	888	$i++;
Lines 908-914 foreach my $tag ( keys %{$tagslib}){ Link Here
908	my @values = (undef);	906	my @values = (undef);
909	@values = $itemrecord->field($tag)->subfield($subtag) if ($itemrecord && defined($itemrecord->field($tag)) && defined($itemrecord->field($tag)->subfield($subtag)));	907	@values = $itemrecord->field($tag)->subfield($subtag) if ($itemrecord && defined($itemrecord->field($tag)) && defined($itemrecord->field($tag)->subfield($subtag)));
910	for my $value (@values){	908	for my $value (@values){
911	my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $branches, $biblionumber, $temp, \@loop_data, $i, $restrictededition);	909	my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $libraries, $biblionumber, $temp, \@loop_data, $i, $restrictededition);
912	push (@loop_data, $subfield_data);	910	push (@loop_data, $subfield_data);
913	$i++;	911	$i++;
914	}	912	}

Lines 32-37 use C4::Auth; Link Here

(-)a/circ/bookcount.pl (-5 / +7 lines)
32	use C4::Branch; # GetBranches	32	use C4::Branch; # GetBranches
33	use C4::Biblio; # GetBiblioItemData	33	use C4::Biblio; # GetBiblioItemData
34	use Koha::DateUtils;	34	use Koha::DateUtils;
		35	use Koha::Libraries;
35		36
36	my $input = new CGI;	37	my $input = new CGI;
37	my $itm = $input->param('itm');	38	my $itm = $input->param('itm');
Lines 69-78 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
69	}	70	}
70	);	71	);
71		72
72	my $branchloop = GetBranchesLoop(C4::Context->userenv->{branch});	73	my $libraries = Koha::Libraries->search({}, { order_by => ['branchname'] })->unblessed;
73	foreach (@$branchloop) {	74	for my $library ( @$libraries ) {
74	$_->{issues} = issuesat($itm, $_->{value});	75	$library->{selected} = 1 if $library->{branchcode} eq C4::Context->userenv->{branch};
75	$_->{seen} = lastseenat( $itm, $_->{value} ) \|\| undef;	76	$library->{issues} = issuesat($itm, $library->{branchcode});
		77	$library->{seen} = lastseenat( $itm, $library->{branchcode} ) \|\| undef;
76	}	78	}
77		79
78	$template->param(	80	$template->param(
Lines 85-91 $template->param( Link Here
85	holdingbranch => $holdingbranch,	87	holdingbranch => $holdingbranch,
86	lastdate => $lastdate ? $lastdate : 0,	88	lastdate => $lastdate ? $lastdate : 0,
87	count => $count,	89	count => $count,
88	branchloop => $branchloop,	90	libraries => $libraries,
89	);	91	);
90		92
91	output_html_with_http_headers $input, $cookie, $template->output;	93	output_html_with_http_headers $input, $cookie, $template->output;

Lines 202-219 function submitForm(form) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-19 / +5 lines)
202	<label for="billingplace">Billing place:</label>	202	<label for="billingplace">Billing place:</label>
203	<select name="billingplace" id="billingplace" style="width:13em;">	203	<select name="billingplace" id="billingplace" style="width:13em;">
204	<option value="">--</option>	204	<option value="">--</option>
205	[% FOREACH billingplaceloo IN billingplaceloop %]	205	[% PROCESS options_for_libraries libraries => Branches.all( selected => billingplace ) %]
206	[% IF ( billingplaceloo.selected ) %]<option value="[% billingplaceloo.value %]" selected="selected">[% billingplaceloo.branchname %]</option>
207	[% ELSE %]<option value="[% billingplaceloo.value %]">[% billingplaceloo.branchname %]</option>[% END%]
208	[% END %]
209	</select>	206	</select>
210	[% ELSE %]	207	[% ELSE %]
211	<span class="label">Billing place:</span>	208	<span class="label">Billing place:</span>
212	[% FOREACH billingplaceloo IN billingplaceloop %]	209	<input name="billingplace" id="billingplace" type ="hidden" value="[% billingplace %]" />[% Branches.GetName( billingplace ) %]
213	[% IF ( billingplaceloo.selected ) %]
214	<input name="billingplace" id="billingplace" type ="hidden" value="[% billingplaceloo.value %]" />[% billingplaceloo.branchname %]
215	[% END %]
216	[% END %]
217	[% END %]	210	[% END %]
218	</li>	211	</li>
219	[% UNLESS (closedbg) %]	212	[% UNLESS (closedbg) %]
Lines 221-231 function submitForm(form) { Link Here
221	<label for="deliveryplace">Delivery place:</label>	214	<label for="deliveryplace">Delivery place:</label>
222	<select name="deliveryplace" id="deliveryplace" style="width:13em;">	215	<select name="deliveryplace" id="deliveryplace" style="width:13em;">
223	<option value="">--</option>	216	<option value="">--</option>
224	[% FOREACH deliveryplaceloo IN deliveryplaceloop %]	217	[% PROCESS options_for_libraries libraries => Branches.all( selected => deliveryplace ) %]
225	[% IF ( deliveryplaceloo.selected ) %]<option value="[% deliveryplaceloo.value %]" selected="selected">[% deliveryplaceloo.branchname %]</option>	218	<select>
226	[% ELSE %]<option value="[% deliveryplaceloo.value %]">[% deliveryplaceloo.branchname %]</option>[% END %]
227	[% END %]
228	<select>
229	</li>	219	</li>
230	<li><p>or</p></li>	220	<li><p>or</p></li>
231	<li>	221	<li>
Lines 239-249 function submitForm(form) { Link Here
239	<input name="freedeliveryplace" id="freedeliveryplace" type ="hidden" value="[% freedeliveryplace %]" />[% freedeliveryplace %]	229	<input name="freedeliveryplace" id="freedeliveryplace" type ="hidden" value="[% freedeliveryplace %]" />[% freedeliveryplace %]
240	<input name="deliveryplace" id="deliveryplace" type ="hidden" value="" />	230	<input name="deliveryplace" id="deliveryplace" type ="hidden" value="" />
241	[% ELSE %]	231	[% ELSE %]
242	[% FOREACH deliveryplaceloo IN deliveryplaceloop %]	232	<input name="deliveryplace" id="deliveryplace" type ="hidden" value="[% deliveryplace %]" />[% Branches.GetName( deliveryplace ) %]
243	[% IF ( deliveryplaceloo.selected ) %]
244	<input name="deliveryplace" id="deliveryplace" type ="hidden" value="[% deliveryplaceloo.value %]" />[% deliveryplaceloo.branchname %]
245	[% END %]
246	[% END %]
247	<input name="freedeliveryplace" id="freedeliveryplace" type ="hidden" value="" />	233	<input name="freedeliveryplace" id="freedeliveryplace" type ="hidden" value="" />
248	[% END %]	234	[% END %]
249	</li>	235	</li>

Lines 38-53 $(document).ready(function(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt (-6 / +6 lines)
38	<th>No. of times checked out</th>	38	<th>No. of times checked out</th>
39	<th>Last seen</th>	39	<th>Last seen</th>
40	</tr>	40	</tr>
41	[% FOREACH branchloo IN branchloop %]	41	[% FOREACH library IN libraries %]
42	[% IF ( branchloo.selected ) %]	42	[% IF library.selected %]
43	<tr class="mybranch">	43	<tr class="mybranch">
44	[% ELSE %]	44	[% ELSE %]
45	<tr>	45	<tr>
46	[% END %]	46	[% END %]
47	<td>[% branchloo.branchname %]</td>	47	<td>[% library.branchname %]</td>
48	<td>[% branchloo.issues %]</td>	48	<td>[% library.issues %]</td>
49	<td>[% IF ( branchloo.seen ) %]	49	<td>[% IF library.seen %]
50	[% branchloo.seen \| $KohaDates with_hours => 1 %]	50	[% library.seen \| $KohaDates with_hours => 1 %]
51	[% ELSE %]	51	[% ELSE %]
52	<span>Never</span>	52	<span>Never</span>
53	[% END %]	53	[% END %]

Lines 213-245 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt (-17 / +8 lines)
213	<label>Item home library:</label>	213	<label>Item home library:</label>
214	<select name="homebranch" id="homebranch">	214	<select name="homebranch" id="homebranch">
215	<option value="">Any</option>	215	<option value="">Any</option>
216	[% FOREACH homebranchloo IN homebranchloop %][% IF ( homebranchloo.selected ) %]	216	[% PROCESS options_for_libraries libraries => Branches.all( selected => homebranchfilter ) %]
217	<option value="[% homebranchloo.value \|html %]" selected="selected">[% homebranchloo.branchname %]</option>[% ELSE %]
218	<option value="[% homebranchloo.value \|html %]">[% homebranchloo.branchname %]</option>[% END %]
219	[% END %]
220	</select>	217	</select>
221	</li>	218	</li>
222		219
223	<li>	220	<li>
224	<label>Item holding library:</label>	221	<label>Item holding library:</label>
225	<select name="holdingbranch" id="holdingbranch">	222	<select name="holdingbranch" id="holdingbranch">
226	<option value="">Any</option>	223	<option value="">Any</option>
227	[% FOREACH holdingbranchloo IN holdingbranchloop %][% IF ( holdingbranchloo.selected ) %]	224	[% PROCESS options_for_libraries libraries => Branches.all( selected => holdingbranchfilter ) %]
228	<option value="[% holdingbranchloo.value \|html %]" selected="selected">[% holdingbranchloo.branchname %]</option>[% ELSE %]
229	<option value="[% holdingbranchloo.value \|html %]">[% holdingbranchloo.branchname %]</option>[% END %]
230	[% END %]
231	</select>	225	</select>
232	</li>	226	</li>
233		227
234	<li>	228	<li>
235	<label>Library of the patron:</label><select name="branch" id="branch">	229	<label>Library of the patron:</label>
236	<option value="">Any</option>	230	<select name="branch" id="branch">
237	[% FOREACH branchloo IN branchloop %]	231	<option value="">Any</option>
238	[% IF ( branchloo.selected ) %]	232	[% PROCESS options_for_libraries libraries => Branches.all( selected => branchfilter ) %]
239	<option value="[% branchloo.value \|html %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]	233	</select>
240	<option value="[% branchloo.value \|html %]">[% branchloo.branchname %]</option>[% END %]
241	[% END %]
242	</select>
243	</li>	234	</li>
244		235
245	<li><label for="order">Sort by:</label> <select name="order" id="order">	236	<li><label for="order">Sort by:</label> <select name="order" id="order">

Lines 192-206 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt (-8 / +6 lines)
192	<form name="f" action="/cgi-bin/koha/circ/view_holdsqueue.pl" method="post">	192	<form name="f" action="/cgi-bin/koha/circ/view_holdsqueue.pl" method="post">
193	<fieldset class="rows">	193	<fieldset class="rows">
194	<ol>	194	<ol>
195	<li><label for="branchlimit">Library: </label><select name="branchlimit" id="branchlimit">	195	<li>
		196	<label for="branchlimit">Library: </label>
		197	<select name="branchlimit" id="branchlimit">
196	<option value="">All</option>	198	<option value="">All</option>
197	[% FOREACH branchloo IN branchloop %]	199	[% PROCESS options_for_libraries libraries => Branches.all() %]
198	[% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>	200	</select>
199	[% ELSE %]	201	</li>
200	<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
201	[% END %]
202	[% END %]
203	</select></li>
204	<!-- FIXME Not working yet	202	<!-- FIXME Not working yet
205	<li><label for="itemtypeslimit">Item Type: </label><select name="itemtypeslimit" id="itemtypeslimit">	203	<li><label for="itemtypeslimit">Item Type: </label><select name="itemtypeslimit" id="itemtypeslimit">
206	<option value="">All</option>	204	<option value="">All</option>

Lines 92-104 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt (-7 / +1 lines)
92	<li><label for="branch">Library: </label>	92	<li><label for="branch">Library: </label>
93	<select name="Filter" id="branch">	93	<select name="Filter" id="branch">
94	<option value="">Any library</option>	94	<option value="">Any library</option>
95	[% FOREACH branchloo IN branchloop %]	95	[% PROCESS options_for_libraries libraries => Branches.all() %]
96	[% IF ( branchloo.selected ) %]
97	<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
98	[% ELSE %]
99	<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
100	[% END %]
101	[% END %]
102	</select></li>	96	</select></li>
103	<li>	97	<li>
104	<label for="documenttype">Item type: </label><select name="Filter" id="documenttype">	98	<label for="documenttype">Item type: </label><select name="Filter" id="documenttype">

Lines 102-113 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt (-6 / +1 lines)
102	<li><label for="barcodefilter">Barcode: </label><input type="text" name="barcodefilter" id="barcodefilter" size="6" /></li>	102	<li><label for="barcodefilter">Barcode: </label><input type="text" name="barcodefilter" id="barcodefilter" size="6" /></li>
103	<li><label for="branchfilter">Library: </label><select name="branchfilter" id="branchfilter">	103	<li><label for="branchfilter">Library: </label><select name="branchfilter" id="branchfilter">
104	<option value="">All</option>	104	<option value="">All</option>
105	[% FOREACH branchloo IN branchloop %]	105	[% PROCESS options_for_libraries libraries => Branches.all() %]
106	[% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
107	[% ELSE %]
108	<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
109	[% END %]
110	[% END %]
111	</select></li>	106	</select></li>
112	<li><label for="itemtypesfilter">Item type: </label><select name="itemtypesfilter" id="itemtypesfilter">	107	<li><label for="itemtypesfilter">Item type: </label><select name="itemtypesfilter" id="itemtypesfilter">
113	<option value="">All</option>	108	<option value="">All</option>

Lines 65-77 $(document).ready(function(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt (-7 / +1 lines)
65	<label for="value">Select a library:</label>	65	<label for="value">Select a library:</label>
66	<select name="value" size="1" id="value">	66	<select name="value" size="1" id="value">
67	<option value=""></option>	67	<option value=""></option>
68	[%- FOREACH branchloo IN branchloop %]	68	[% PROCESS options_for_libraries libraries => Branches.all() %]
69	[% IF ( branchloo.selected ) -%]
70	<option value="[% branchloo.branchcode %]" selected="selected">[% branchloo.branchname %]</option>
71	[%- ELSE -%]
72	<option value="[% branchloo.branchcode %]">[% branchloo.branchname %]</option>
73	[%- END -%]
74	[%- END %]
75	</select>	69	</select>
76	<span class="tip">Select none to see all libraries</span>	70	<span class="tip">Select none to see all libraries</span>
77	</li>	71	</li>

Lines 93-105 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt (-7 / +1 lines)
93	</label>	93	</label>
94	<select name="branchcode" id="branchcode">	94	<select name="branchcode" id="branchcode">
95	<option value="">Any library</option>	95	<option value="">Any library</option>
96	[% FOREACH branche IN branches %]	96	[% PROCESS options_for_libraries libraries => Branches.all() %]
97	[% IF ( branche.selected ) %]
98	<option value="[% branche.value %]" selected="selected">[% branche.branchname %]</option>
99	[% ELSE %]
100	<option value="[% branche.value %]">[% branche.branchname %]</option>
101	[% END %]
102	[% END %]
103	</select>	97	</select>
104		98
105	</li>	99	</li>

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt (-12 / +5 lines)
		1	[% USE Branches %]
1	[% USE KohaDates %]	2	[% USE KohaDates %]
2	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Koha &rsaquo; Serials &rsaquo; Check expiration</title>	4	<title>Koha &rsaquo; Serials &rsaquo; Check expiration</title>
Lines 53-71 Link Here
53		54
54	<li><label for="issn">ISSN:</label>	55	<li><label for="issn">ISSN:</label>
55	<input id="issn" type="text" name="issn" size="15" value="[% issn \| html %]" /></li>	56	<input id="issn" type="text" name="issn" size="15" value="[% issn \| html %]" /></li>
56	[% IF (branches_loop.size) %]	57	[% IF can_change_library %]
57	<li><label for="branch">Library:</label>	58	<li><label for="branch">Library:</label>
58	<select id="branch" name="branch">	59	<select id="branch" name="branch">
59	<option value="">All</option>	60	<option value="">All</option>
60	[% FOREACH branch IN branches_loop %]	61	[% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
61	[% IF branch.selected %]
62	<option selected="selected" value="[% branch.branchcode %]">
63	[% ELSE %]
64	<option value="[% branch.branchcode %]">
65	[% END %]
66	[% branch.branchname %]
67	</option>
68	[% END %]
69	</select>	62	</select>
70	</li>	63	</li>
71	[% END %]	64	[% END %]
Lines 96-102 Link Here
96	<tr>	89	<tr>
97	<th>ISSN</th>	90	<th>ISSN</th>
98	<th>Title</th>	91	<th>Title</th>
99	[% IF ( branches_loop.size ) %]<th>Library</th>[% END %]	92	[% IF can_change_library %]<th>Library</th>[% END %]
100	<th>OPAC note</th>	93	<th>OPAC note</th>
101	<th>Nonpublic note</th>	94	<th>Nonpublic note</th>
102	<th>Expiration date</th>	95	<th>Expiration date</th>
Lines 114-120 Link Here
114	[% END %]	107	[% END %]
115	</a>	108	</a>
116	</td>	109	</td>
117	[% IF ( branches_loop.size ) %]<td>	110	[% IF can_change_library %]<td>
118	[% Branches.GetName( subscriptions_loo.branchcode ) %]	111	[% Branches.GetName( subscriptions_loo.branchcode ) %]
119	</td>[% END %]	112	</td>[% END %]
120	<td>	113	<td>

Lines 239-251 td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt (-9 / +3 lines)
239	<div class="yui-u first">	239	<div class="yui-u first">
240	<label for="branch">Define the holidays for:</label>	240	<label for="branch">Define the holidays for:</label>
241	<select id="branch" name="branch">	241	<select id="branch" name="branch">
242	[% FOREACH branchloo IN branchloop %]	242	[% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
243	[% IF ( branchloo.selected ) %]
244	<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
245	[% ELSE %]
246	<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
247	[% END %]
248	[% END %]
249	</select>	243	</select>
250		244
251	<!-- ****************************** FLAT PANELS ***************************************** -->	245	<!-- ****************************** FLAT PANELS ***************************************** -->
Lines 410-417 td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl Link Here
410	<label for="branchcode">Copy holidays to:</label>	404	<label for="branchcode">Copy holidays to:</label>
411	<select id="branchcode" name="branchcode">	405	<select id="branchcode" name="branchcode">
412	<option value=""></option>	406	<option value=""></option>
413	[% FOREACH branchloo IN branchloop %]	407	[% FOREACH l IN Branches.all() %]
414	<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>	408	<option value="[% l.branchcode %]">[% l.branchname %]</option>
415	[% END %]	409	[% END %]
416	</select>	410	</select>
417	<input type="submit" value="Copy" />	411	<input type="submit" value="Copy" />

Lines 139-151 $(document).ready(function(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt (-7 / +1 lines)
139	</li><li>	139	</li><li>
140	<label for="branchloop">Library: </label><select id="branchloop" name="branchcode" style="width:12em;">	140	<label for="branchloop">Library: </label><select id="branchloop" name="branchcode" style="width:12em;">
141	<option value="">All libraries</option>	141	<option value="">All libraries</option>
142	[% FOREACH branchloo IN branchloop %]	142	[% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode ) %]
143	[% IF ( branchloo.selected ) %]
144	<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
145	[% ELSE %]
146	<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
147	[% END %]
148	[% END %]
149	</select>	143	</select>
150	</li>	144	</li>
151	[% IF (authorised_values) %]	145	[% IF (authorised_values) %]

Lines 165-173 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt (-8 / +4 lines)
165	Select a library :	165	Select a library :
166	<select name="branchcode" id="branch" style="width:20em;">	166	<select name="branchcode" id="branch" style="width:20em;">
167	<option value="*">All libraries</option>	167	<option value="*">All libraries</option>
168	[% FOREACH branchloo IN branchloop %]	168	[% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode ) %]
169	[% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
170	[% END %]
171	</select>	169	</select>
172	</p>	170	</p>
173	[% END %]	171	[% END %]
Lines 183-190 $(document).ready(function() { Link Here
183	[% IF ( letter && !independant_branch) %]	181	[% IF ( letter && !independant_branch) %]
184	[% select_for_copy = BLOCK %]	182	[% select_for_copy = BLOCK %]
185	<select name="branchcode">	183	<select name="branchcode">
186	[% FOREACH branchloo IN branchloop %]	184	[% FOREACH l IN Branches.all() %]
187	<option value="[% branchloo.value %]">Copy to [% branchloo.branchname %]</option>	185	<option value="[% l.branchcode %]">Copy to [% l.branchname %]</option>
188	[% END %]	186	[% END %]
189	</select>	187	</select>
190	[% END %]	188	[% END %]
Lines 276-284 $(document).ready(function() { Link Here
276	<label for="branch">Library:</label>	274	<label for="branch">Library:</label>
277	<select name="branchcode" id="branch" style="width:20em;">	275	<select name="branchcode" id="branch" style="width:20em;">
278	<option value="">All libraries</option>	276	<option value="">All libraries</option>
279	[% FOREACH branchloo IN branchloop %]	277	[% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode ) %]
280	[% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
281	[% END %]
282	</select>	278	</select>
283	[% ELSE %]	279	[% ELSE %]
284	<span class="label">Library:</span>	280	<span class="label">Library:</span>

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt (-4 / +5 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE Branches %]
2	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
3	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Advanced search</title>	4	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Advanced search</title>
4	[% INCLUDE 'doc-head-close.inc' %]	5	[% INCLUDE 'doc-head-close.inc' %]
Lines 214-224 Link Here
214	<label for="branchloop">Library:</label>	215	<label for="branchloop">Library:</label>
215	<select name="limit" id="branchloop">	216	<select name="limit" id="branchloop">
216	<option value="">All libraries</option>	217	<option value="">All libraries</option>
217	[% FOREACH BranchesLoo IN BranchesLoop %]	218	[% FOREACH BranchesLoo IN Branches.all( selected => opac_name ) %]
218	[% IF ( BranchesLoo.selected ) %]	219	[% IF BranchesLoo.selected %]
219	<option value="branch:[% BranchesLoo.value %]" selected="selected">[% BranchesLoo.branchname %]</option>	220	<option value="branch:[% BranchesLoo.branchcode %]" selected="selected">[% BranchesLoo.branchname %]</option>
220	[% ELSE %]	221	[% ELSE %]
221	<option value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>	222	<option value="branch:[% BranchesLoo.branchcode %]">[% BranchesLoo.branchname %]</option>
222	[% END %]	223	[% END %]
223	[% END %]	224	[% END %]
224	</select>	225	</select>

Lines 1-5 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt (-7 / +2 lines)
1	[% USE Categories %]	1	[% USE Categories %]
2	[% USE Koha %]	2	[% USE Koha %]
		3	[% USE Branches %]
3	[% USE KohaDates %]	4	[% USE KohaDates %]
4	[% SET userupdateview = 1 %]	5	[% SET userupdateview = 1 %]
5		6
Lines 156-168 Link Here
156	Home library:</label>	157	Home library:</label>
157		158
158	<select id="borrower_branchcode" name="borrower_branchcode">	159	<select id="borrower_branchcode" name="borrower_branchcode">
159	[% FOREACH b IN branches %]	160	[% PROCESS options_for_libraries libraries => Branches.all( selected => borrower.branchcode ) %]
160	[% IF b.value == borrower.branchcode %]
161	<option value="[% b.value %]" selected="selected">[% b.branchname %]</option>
162	[% ELSE %]
163	<option value="[% b.value %]">[% b.branchname %]</option>
164	[% END %]
165	[% END %]
166	</select>	161	</select>
167	</li>	162	</li>
168	[% END %]	163	[% END %]

Lines 42-47 use C4::Form::MessagingPreferences; Link Here

(-)a/members/memberentry.pl (-6 / +5 lines)
42	use Koha::Patron::Debarments;	42	use Koha::Patron::Debarments;
43	use Koha::Cities;	43	use Koha::Cities;
44	use Koha::DateUtils;	44	use Koha::DateUtils;
		45	use Koha::Libraries;
45	use Koha::Patron::Categories;	46	use Koha::Patron::Categories;
46	use Koha::Token;	47	use Koha::Token;
47	use Email::Valid;	48	use Email::Valid;
Lines 595-602 foreach (keys(%flags)) { Link Here
595	}	596	}
596		597
597	# get Branch Loop	598	# get Branch Loop
598	# in modify mod: userbranch value for GetBranchesLoop() comes from borrowers table	599	# in modify mod: userbranch value comes from borrowers table
599	# in add mod: userbranch value come from branches table (ip correspondence)	600	# in add mod: userbranch value comes from branches table (ip correspondence)
600		601
601	my $userbranch = '';	602	my $userbranch = '';
602	if (C4::Context->userenv && C4::Context->userenv->{'branch'}) {	603	if (C4::Context->userenv && C4::Context->userenv->{'branch'}) {
Lines 606-615 if (C4::Context->userenv && C4::Context->userenv->{'branch'}) { Link Here
606	if (defined ($data{'branchcode'}) and ( $op eq 'modify' \|\| $op eq 'duplicate' \|\| ( $op eq 'add' && $category_type eq 'C' ) )) {	607	if (defined ($data{'branchcode'}) and ( $op eq 'modify' \|\| $op eq 'duplicate' \|\| ( $op eq 'add' && $category_type eq 'C' ) )) {
607	$userbranch = $data{'branchcode'};	608	$userbranch = $data{'branchcode'};
608	}	609	}
		610	$template->param( userbranch => $userbranch );
609		611
610	my $branchloop = GetBranchesLoop( $userbranch );	612	if ( Koha::Libraries->search->count < 1 ){
611
612	if( !$branchloop ){
613	$no_add = 1;	613	$no_add = 1;
614	$template->param(no_branches => 1);	614	$template->param(no_branches => 1);
615	}	615	}
Lines 681-687 $template->param( Link Here
681	check_member => $check_member,#to know if the borrower already exist(=>1) or not (=>0)	681	check_member => $check_member,#to know if the borrower already exist(=>1) or not (=>0)
682	"op$op" => 1);	682	"op$op" => 1);
683		683
684	$template->param( branchloop => $branchloop ) if ( $branchloop );
685	$template->param(	684	$template->param(
686	nodouble => $nodouble,	685	nodouble => $nodouble,
687	borrowernumber => $borrowernumber, #register number	686	borrowernumber => $borrowernumber, #register number

Lines 24-30 use C4::Auth; Link Here

(-)a/members/members-home.pl (-29 / +1 lines)
24	use C4::Output;	24	use C4::Output;
25	use C4::Context;	25	use C4::Context;
26	use C4::Members;	26	use C4::Members;
27	use C4::Branch;
28	use Koha::Patron::Modifications;	27	use Koha::Patron::Modifications;
29	use Koha::Libraries;	28	use Koha::Libraries;
30	use Koha::List::Patron;	29	use Koha::List::Patron;
Lines 44-80 my ($template, $loggedinuser, $cookie) Link Here
44	debug => 1,	43	debug => 1,
45	});	44	});
46		45
47	my $branches = GetBranches;
48	my @branchloop;
49	if ( C4::Branch::onlymine ) {
50	my $userenv = C4::Context->userenv;
51	my $library = Koha::Libraries->find( $userenv->{'branch'} );
52	push @branchloop, {
53	value => $library->id,
54	branchcode => $library->branchcode,
55	branchname => $library->branchname,
56	selected => 1
57	}
58	} else {
59	foreach (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %{$branches}) {
60	my $selected = 0;
61	$selected = 1 if $branch and $branch eq $_;
62	push @branchloop, {
63	value => $_,
64	branchcode => $_,
65	branchname => $branches->{$_}->{branchname},
66	selected => $selected
67	};
68	}
69	}
70
71	my $no_add = 0;	46	my $no_add = 0;
72	if(scalar(@branchloop) < 1){	47	if( Koha::Libraries->search->count < 1){
73	$no_add = 1;	48	$no_add = 1;
74	$template->param(no_branches => 1);	49	$template->param(no_branches => 1);
75	}
76	else {
77	$template->param(branchloop=>\@branchloop);
78	}	50	}
79		51
80	my @categories = Koha::Patron::Categories->search_limited;	52	my @categories = Koha::Patron::Categories->search_limited;

Lines 127-135 my $branch = $query->param('branch') \|\| $borr->{'branchcode'} \|\| C4::Context->us Link Here

(-)a/opac/opac-reserve.pl (-4 / +1 lines)
127	($branches->{$branch}) or $branch = ""; # Confirm branch is real	127	($branches->{$branch}) or $branch = ""; # Confirm branch is real
128	$template->param( branch => $branch );	128	$template->param( branch => $branch );
129		129
130	# make branch selection options...
131	my $branchloop = GetBranchesLoop($branch);
132
133	# Is the person allowed to choose their branch	130	# Is the person allowed to choose their branch
134	my $OPACChooseBranch = (C4::Context->preference("OPACAllowUserToChooseBranch")) ? 1 : 0;	131	my $OPACChooseBranch = (C4::Context->preference("OPACAllowUserToChooseBranch")) ? 1 : 0;
135		132
Lines 383-389 foreach my $biblioNum (@biblionumbers) { Link Here
383		380
384	my $record = GetMarcBiblio($biblioNum);	381	my $record = GetMarcBiblio($biblioNum);
385	# Init the bib item with the choices for branch pickup	382	# Init the bib item with the choices for branch pickup
386	my %biblioLoopIter = ( branchloop => $branchloop );	383	my %biblioLoopIter;
387		384
388	# Get relevant biblio data.	385	# Get relevant biblio data.
389	my $biblioData = $biblioDataHash{$biblioNum};	386	my $biblioData = $biblioDataHash{$biblioNum};

Lines 22-28 use CGI qw ( -utf8 ); Link Here

(-)a/opac/opac-suggestions.pl (-4 / +1 lines)
22	use Encode qw( encode );	22	use Encode qw( encode );
23	use C4::Auth; # get_template_and_user	23	use C4::Auth; # get_template_and_user
24	use C4::Members;	24	use C4::Members;
25	use C4::Branch;
26	use C4::Koha;	25	use C4::Koha;
27	use C4::Output;	26	use C4::Output;
28	use C4::Suggestions;	27	use C4::Suggestions;
Lines 202-210 if ( C4::Context->preference("AllowPurchaseSuggestionBranchChoice") ) { Link Here
202	}	201	}
203	my $branchcode = $input->param('branchcode') \|\| $borr->{'branchcode'} \|\| $userbranch \|\| '' ;	202	my $branchcode = $input->param('branchcode') \|\| $borr->{'branchcode'} \|\| $userbranch \|\| '' ;
204		203
205	# make branch selection options...	204	$template->param( branchcode => $branchcode );
206	my $branchloop = GetBranchesLoop($branchcode);
207	$template->param( branchloop => $branchloop );
208	}	205	}
209		206
210	my $mandatoryfields = '';	207	my $mandatoryfields = '';

Lines 272-295 if ($show_barcode) { Link Here

(-)a/opac/opac-user.pl (-18 lines)
272	}	272	}
273	$template->param( show_barcode => 1 ) if $show_barcode;	273	$template->param( show_barcode => 1 ) if $show_barcode;
274		274
275	# load the branches
276	my $branches = GetBranches();
277	my @branch_loop;
278	for my $branch_hash ( sort keys %{$branches} ) {
279	my $selected;
280	if ( C4::Context->preference('SearchMyLibraryFirst') ) {
281	$selected =
282	( C4::Context->userenv
283	&& ( $branch_hash eq C4::Context->userenv->{branch} ) );
284	}
285	push @branch_loop,
286	{ value => "branch: $branch_hash",
287	branchname => $branches->{$branch_hash}->{'branchname'},
288	selected => $selected,
289	};
290	}
291	$template->param( branchloop => \@branch_loop );
292
293	# now the reserved items....	275	# now the reserved items....
294	my $reserves = Koha::Holds->search( { borrowernumber => $borrowernumber } );	276	my $reserves = Koha::Holds->search( { borrowernumber => $borrowernumber } );
295		277