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

(-)a/C4/Circulation.pm (-2 / +1 lines)
Lines 888-895 sub CanBookBeIssued { Link Here
888
        $alerts{ITEM_LOST} = $code if ( C4::Context->preference("IssueLostItem") eq 'alert' );
888
        $alerts{ITEM_LOST} = $code if ( C4::Context->preference("IssueLostItem") eq 'alert' );
889
    }
889
    }
890
    if ( C4::Context->preference("IndependentBranches") ) {
890
    if ( C4::Context->preference("IndependentBranches") ) {
891
        my $userenv = C4::Context->userenv;
891
        unless ( C4::Context->IsSuperLibrarian() ) {
892
        if ( ($userenv) && ( $userenv->{flags} % 2 != 1 ) ) {
893
            $issuingimpossible{ITEMNOTSAMEBRANCH} = 1
892
            $issuingimpossible{ITEMNOTSAMEBRANCH} = 1
894
              if ( $item->{C4::Context->preference("HomeOrHoldingBranch")} ne $userenv->{branch} );
893
              if ( $item->{C4::Context->preference("HomeOrHoldingBranch")} ne $userenv->{branch} );
895
            $needsconfirmation{BORRNOTSAMEBRANCH} = GetBranchName( $borrower->{'branchcode'} )
894
            $needsconfirmation{BORRNOTSAMEBRANCH} = GetBranchName( $borrower->{'branchcode'} )
(-)a/C4/Items.pm (-2 / +2 lines)
Lines 1263-1269 sub GetItemsInfo { Link Here
1263
            $datedue                = $idata->{'date_due'};
1263
            $datedue                = $idata->{'date_due'};
1264
        if (C4::Context->preference("IndependentBranches")){
1264
        if (C4::Context->preference("IndependentBranches")){
1265
        my $userenv = C4::Context->userenv;
1265
        my $userenv = C4::Context->userenv;
1266
        if ( ($userenv) && ( $userenv->{flags} % 2 != 1 ) ) { 
1266
        unless ( C4::Context->IsSuperLibrarian() ) { 
1267
            $data->{'NOTSAMEBRANCH'} = 1 if ($idata->{'bcode'} ne $userenv->{branch});
1267
            $data->{'NOTSAMEBRANCH'} = 1 if ($idata->{'bcode'} ne $userenv->{branch});
1268
        }
1268
        }
1269
        }
1269
        }
Lines 2698-2704 sub PrepareItemrecordDisplay { Link Here
2698
                    #---- branch
2698
                    #---- branch
2699
                    if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
2699
                    if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
2700
                        if (   ( C4::Context->preference("IndependentBranches") )
2700
                        if (   ( C4::Context->preference("IndependentBranches") )
2701
                            && ( C4::Context->userenv->{flags} % 2 != 1 ) ) {
2701
                            && !C4::Context->IsSuperLibrarian() ) {
2702
                            my $sth = $dbh->prepare( "SELECT branchcode,branchname FROM branches WHERE branchcode = ? ORDER BY branchname" );
2702
                            my $sth = $dbh->prepare( "SELECT branchcode,branchname FROM branches WHERE branchcode = ? ORDER BY branchname" );
2703
                            $sth->execute( C4::Context->userenv->{branch} );
2703
                            $sth->execute( C4::Context->userenv->{branch} );
2704
                            push @authorised_values, ""
2704
                            push @authorised_values, ""
(-)a/C4/Members.pm (-4 / +4 lines)
Lines 259-265 sub Search { Link Here
259
    if ( C4::Context->preference("IndependentBranches") ) { # && !$showallbranches){
259
    if ( C4::Context->preference("IndependentBranches") ) { # && !$showallbranches){
260
        if ( my $userenv = C4::Context->userenv ) {
260
        if ( my $userenv = C4::Context->userenv ) {
261
            my $branch =  $userenv->{'branch'};
261
            my $branch =  $userenv->{'branch'};
262
            if ( ($userenv->{flags} % 2 !=1) && $branch ){
262
            if ( !C4::Context->IsSuperLibrarian() && $branch ){
263
                if (my $fr = ref $filter) {
263
                if (my $fr = ref $filter) {
264
                    if ( $fr eq "HASH" ) {
264
                    if ( $fr eq "HASH" ) {
265
                        $filter->{branchcode} = $branch;
265
                        $filter->{branchcode} = $branch;
Lines 2044-2050 sub GetBorrowersToExpunge { Link Here
2044
    my $filterbranch   = $params->{'branchcode'} ||
2044
    my $filterbranch   = $params->{'branchcode'} ||
2045
                        ((C4::Context->preference('IndependentBranches')
2045
                        ((C4::Context->preference('IndependentBranches')
2046
                             && C4::Context->userenv 
2046
                             && C4::Context->userenv 
2047
                             && C4::Context->userenv->{flags} % 2 !=1 
2047
                             && !C4::Context->IsSuperLibrarian() 
2048
                             && C4::Context->userenv->{branch})
2048
                             && C4::Context->userenv->{branch})
2049
                         ? C4::Context->userenv->{branch}
2049
                         ? C4::Context->userenv->{branch}
2050
                         : "");  
2050
                         : "");  
Lines 2110-2116 sub GetBorrowersWhoHaveNeverBorrowed { Link Here
2110
    my $filterbranch = shift || 
2110
    my $filterbranch = shift || 
2111
                        ((C4::Context->preference('IndependentBranches')
2111
                        ((C4::Context->preference('IndependentBranches')
2112
                             && C4::Context->userenv 
2112
                             && C4::Context->userenv 
2113
                             && C4::Context->userenv->{flags} % 2 !=1 
2113
                             && !C4::Context->IsSuperLibrarian() 
2114
                             && C4::Context->userenv->{branch})
2114
                             && C4::Context->userenv->{branch})
2115
                         ? C4::Context->userenv->{branch}
2115
                         ? C4::Context->userenv->{branch}
2116
                         : "");  
2116
                         : "");  
Lines 2160-2166 sub GetBorrowersWithIssuesHistoryOlderThan { Link Here
2160
    my $filterbranch = shift || 
2160
    my $filterbranch = shift || 
2161
                        ((C4::Context->preference('IndependentBranches')
2161
                        ((C4::Context->preference('IndependentBranches')
2162
                             && C4::Context->userenv 
2162
                             && C4::Context->userenv 
2163
                             && C4::Context->userenv->{flags} % 2 !=1 
2163
                             && !C4::Context->IsSuperLibrarian() 
2164
                             && C4::Context->userenv->{branch})
2164
                             && C4::Context->userenv->{branch})
2165
                         ? C4::Context->userenv->{branch}
2165
                         ? C4::Context->userenv->{branch}
2166
                         : "");  
2166
                         : "");  
(-)a/C4/Serials.pm (-2 / +2 lines)
Lines 492-498 sub GetSubscriptionsFromBiblionumber { Link Here
492
        $subs->{'cannotedit'} =
492
        $subs->{'cannotedit'} =
493
          (      C4::Context->preference('IndependentBranches')
493
          (      C4::Context->preference('IndependentBranches')
494
              && C4::Context->userenv
494
              && C4::Context->userenv
495
              && C4::Context->userenv->{flags} % 2 != 1
495
              && !C4::Context->IsSuperLibrarian() 
496
              && C4::Context->userenv->{branch}
496
              && C4::Context->userenv->{branch}
497
              && $subs->{branchcode}
497
              && $subs->{branchcode}
498
              && ( C4::Context->userenv->{branch} ne $subs->{branchcode} ) );
498
              && ( C4::Context->userenv->{branch} ne $subs->{branchcode} ) );
Lines 632-638 sub GetSubscriptions { Link Here
632
        $line->{'cannotedit'} =
632
        $line->{'cannotedit'} =
633
          (      C4::Context->preference('IndependentBranches')
633
          (      C4::Context->preference('IndependentBranches')
634
              && C4::Context->userenv
634
              && C4::Context->userenv
635
              && C4::Context->userenv->{flags} % 2 != 1
635
              && !C4:Context->IsSuperLibrarian() 
636
              && C4::Context->userenv->{branch}
636
              && C4::Context->userenv->{branch}
637
              && $line->{branchcode}
637
              && $line->{branchcode}
638
              && ( C4::Context->userenv->{branch} ne $line->{branchcode} ) );
638
              && ( C4::Context->userenv->{branch} ne $line->{branchcode} ) );
(-)a/C4/Suggestions.pm (-3 / +3 lines)
Lines 135-141 sub SearchSuggestion { Link Here
135
    if ( C4::Context->preference('IndependentBranches') ) {
135
    if ( C4::Context->preference('IndependentBranches') ) {
136
        my $userenv = C4::Context->userenv;
136
        my $userenv = C4::Context->userenv;
137
        if ($userenv) {
137
        if ($userenv) {
138
            if ( ( $userenv->{flags} % 2 ) != 1 && !$suggestion->{branchcode} )
138
            if ( !C4::Context->IsSuperLibrarian() && !$suggestion->{branchcode} )
139
            {
139
            {
140
                push @sql_params, $$userenv{branch};
140
                push @sql_params, $$userenv{branch};
141
                push @query,      q{
141
                push @query,      q{
Lines 342-348 sub GetSuggestionByStatus { Link Here
342
    if ( C4::Context->preference("IndependentBranches") || $branchcode ) {
342
    if ( C4::Context->preference("IndependentBranches") || $branchcode ) {
343
        my $userenv = C4::Context->userenv;
343
        my $userenv = C4::Context->userenv;
344
        if ($userenv) {
344
        if ($userenv) {
345
            unless ( $userenv->{flags} % 2 == 1 ) {
345
            unless ( C4::Context->IsSuperLibrarian() ) {
346
                push @sql_params, $userenv->{branch};
346
                push @sql_params, $userenv->{branch};
347
                $query .= q{ AND (U1.branchcode = ? OR U1.branchcode ='') };
347
                $query .= q{ AND (U1.branchcode = ? OR U1.branchcode ='') };
348
            }
348
            }
Lines 390-396 sub CountSuggestion { Link Here
390
    my $sth;
390
    my $sth;
391
    my $userenv = C4::Context->userenv;
391
    my $userenv = C4::Context->userenv;
392
    if ( C4::Context->preference("IndependentBranches")
392
    if ( C4::Context->preference("IndependentBranches")
393
        && $userenv->{flags} % 2 != 1 )
393
        && !C4::Context->IsSuperLibrarian() )
394
    {
394
    {
395
        my $query = q{
395
        my $query = q{
396
            SELECT count(*)
396
            SELECT count(*)
(-)a/cataloguing/addbiblio.pl (-4 / +5 lines)
Lines 172-181 sub build_authorized_values_list { Link Here
172
    #---- branch
172
    #---- branch
173
    if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
173
    if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
174
        #Use GetBranches($onlymine)
174
        #Use GetBranches($onlymine)
175
        my $onlymine=C4::Context->preference('IndependentBranches') &&
175
        my $onlymine =
176
                C4::Context->userenv && 
176
             C4::Context->preference('IndependentBranches')
177
                C4::Context->userenv->{flags} % 2 == 0 && 
177
          && C4::Context->userenv
178
                C4::Context->userenv->{branch};
178
          && !C4::Context->IsSuperLibrarian()
179
          && C4::Context->userenv->{branch};
179
        my $branches = GetBranches($onlymine);
180
        my $branches = GetBranches($onlymine);
180
        my @branchloop;
181
        my @branchloop;
181
        foreach my $thisbranch ( sort keys %$branches ) {
182
        foreach my $thisbranch ( sort keys %$branches ) {
(-)a/circ/overdue.pl (-4 / +5 lines)
Lines 91-100 while (my ($itemtype, $description) =$req->fetchrow) { Link Here
91
        itemtypename => $description,
91
        itemtypename => $description,
92
    };
92
    };
93
}
93
}
94
my $onlymine=C4::Context->preference('IndependentBranches') &&
94
my $onlymine =
95
             C4::Context->userenv &&
95
     C4::Context->preference('IndependentBranches')
96
             C4::Context->userenv->{flags} % 2 !=1 &&
96
  && C4::Context->userenv
97
             C4::Context->userenv->{branch};
97
  && !C4::Context->IsSuperLibrarian()
98
  && C4::Context->userenv->{branch};
98
99
99
$branchfilter = C4::Context->userenv->{'branch'} if ($onlymine && !$branchfilter);
100
$branchfilter = C4::Context->userenv->{'branch'} if ($onlymine && !$branchfilter);
100
101
(-)a/members/deletemem.pl (-1 / +1 lines)
Lines 68-74 if ($bor->{category_type} eq "S") { Link Here
68
68
69
if (C4::Context->preference("IndependentBranches")) {
69
if (C4::Context->preference("IndependentBranches")) {
70
    my $userenv = C4::Context->userenv;
70
    my $userenv = C4::Context->userenv;
71
    if (($userenv->{flags} % 2 != 1) && $bor->{'branchcode'}){
71
    if ( !C4::Context->IsSuperLibrarian() && $bor->{'branchcode'}){
72
        unless ($userenv->{branch} eq $bor->{'branchcode'}){
72
        unless ($userenv->{branch} eq $bor->{'branchcode'}){
73
            print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member&error=CANT_DELETE_OTHERLIBRARY");
73
            print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member&error=CANT_DELETE_OTHERLIBRARY");
74
            exit;
74
            exit;
(-)a/members/memberentry.pl (-2 / +2 lines)
Lines 293-299 if ($op eq 'save' || $op eq 'insert'){ Link Here
293
    }
293
    }
294
294
295
  if (C4::Context->preference("IndependentBranches")) {
295
  if (C4::Context->preference("IndependentBranches")) {
296
    if ($userenv && $userenv->{flags} % 2 != 1){
296
    unless ( C4::Context->IsSuperLibrarian() ){
297
      $debug and print STDERR "  $newdata{'branchcode'} : ".$userenv->{flags}.":".$userenv->{branch};
297
      $debug and print STDERR "  $newdata{'branchcode'} : ".$userenv->{flags}.":".$userenv->{branch};
298
      unless (!$newdata{'branchcode'} || $userenv->{branch} eq $newdata{'branchcode'}){
298
      unless (!$newdata{'branchcode'} || $userenv->{branch} eq $newdata{'branchcode'}){
299
        push @errors, "ERROR_branch";
299
        push @errors, "ERROR_branch";
Lines 424-430 if ($nok or !$nodouble){ Link Here
424
} 
424
} 
425
if (C4::Context->preference("IndependentBranches")) {
425
if (C4::Context->preference("IndependentBranches")) {
426
    my $userenv = C4::Context->userenv;
426
    my $userenv = C4::Context->userenv;
427
    if ($userenv->{flags} % 2 != 1 && $data{'branchcode'}){
427
    if ( !C4::Context->IsSuperLibrarian() && $data{'branchcode'} ) {
428
        unless ($userenv->{branch} eq $data{'branchcode'}){
428
        unless ($userenv->{branch} eq $data{'branchcode'}){
429
            print $input->redirect("/cgi-bin/koha/members/members-home.pl");
429
            print $input->redirect("/cgi-bin/koha/members/members-home.pl");
430
            exit;
430
            exit;
(-)a/members/moremember.pl (-8 / +14 lines)
Lines 214-224 $bor{'borrowernumber'} = $borrowernumber; Link Here
214
my $samebranch;
214
my $samebranch;
215
if ( C4::Context->preference("IndependentBranches") ) {
215
if ( C4::Context->preference("IndependentBranches") ) {
216
    my $userenv = C4::Context->userenv;
216
    my $userenv = C4::Context->userenv;
217
    unless ( $userenv->{flags} % 2 == 1 ) {
217
    if ( C4::Context->IsSuperLibrarian() ) {
218
        $samebranch = 1;
219
    }
220
    else {
218
        $samebranch = ( $data->{'branchcode'} eq $userenv->{branch} );
221
        $samebranch = ( $data->{'branchcode'} eq $userenv->{branch} );
219
    }
222
    }
220
    $samebranch = 1 if ( $userenv->{flags} % 2 == 1 );
223
}
221
}else{
224
else {
222
    $samebranch = 1;
225
    $samebranch = 1;
223
}
226
}
224
my $branchdetail = GetBranchDetail( $data->{'branchcode'});
227
my $branchdetail = GetBranchDetail( $data->{'branchcode'});
Lines 336-349 foreach (@$alerts) { Link Here
336
339
337
my $candeleteuser;
340
my $candeleteuser;
338
my $userenv = C4::Context->userenv;
341
my $userenv = C4::Context->userenv;
339
if($userenv->{flags} % 2 == 1){
342
if ( C4::Context->IsSuperLibrarian() ) {
340
    $candeleteuser = 1;
343
    $candeleteuser = 1;
341
}elsif ( C4::Context->preference("IndependentBranches") ) {
344
}
345
elsif ( C4::Context->preference("IndependentBranches") ) {
342
    $candeleteuser = ( $data->{'branchcode'} eq $userenv->{branch} );
346
    $candeleteuser = ( $data->{'branchcode'} eq $userenv->{branch} );
343
}else{
347
}
344
    if( C4::Auth::getuserflags( $userenv->{flags},$userenv->{number})->{borrowers} ) {
348
else {
349
    if ( C4::Auth::getuserflags( $userenv->{flags}, $userenv->{number} )->{borrowers} ) {
345
        $candeleteuser = 1;
350
        $candeleteuser = 1;
346
    }else{
351
    }
352
    else {
347
        $candeleteuser = 0;
353
        $candeleteuser = 0;
348
    }
354
    }
349
}
355
}
(-)a/reserve/request.pl (-1 / +1 lines)
Lines 430-436 foreach my $biblionumber (@biblionumbers) { Link Here
430
                if (! C4::Context->preference("canreservefromotherbranches")){
430
                if (! C4::Context->preference("canreservefromotherbranches")){
431
                    # cant reserve items so need to check if item homebranch and userenv branch match if not we cant reserve
431
                    # cant reserve items so need to check if item homebranch and userenv branch match if not we cant reserve
432
                    my $userenv = C4::Context->userenv;
432
                    my $userenv = C4::Context->userenv;
433
                    if ( ($userenv) && ( $userenv->{flags} % 2 != 1 ) ) {
433
                    unless ( C4::Context->IsSuperLibrarian ) {
434
                        $item->{cantreserve} = 1 if ( $item->{homebranch} ne $userenv->{branch} );
434
                        $item->{cantreserve} = 1 if ( $item->{homebranch} ne $userenv->{branch} );
435
                    }
435
                    }
436
                }
436
                }
(-)a/serials/member-search.pl (-4 / +7 lines)
Lines 82-91 if (defined $member) { Link Here
82
82
83
my ($count,$results);
83
my ($count,$results);
84
84
85
if (C4::Context->preference("IndependentBranches")){
85
if ( C4::Context->preference("IndependentBranches") ) {
86
   if (C4::Context->userenv && C4::Context->userenv->{flags} % 2 !=1 && C4::Context->userenv->{'branch'}){
86
    if (   C4::Context->userenv
87
        $$patron{branchcode}=C4::Context->userenv->{'branch'};
87
        && !C4::Context->IsSuperLibrarian()
88
   }
88
        && C4::Context->userenv->{'branch'} )
89
    {
90
        $$patron{branchcode} = C4::Context->userenv->{'branch'};
91
    }
89
}
92
}
90
$$patron{firstname}.="\%" if ($$patron{firstname});
93
$$patron{firstname}.="\%" if ($$patron{firstname});
91
$$patron{surname}.="\%" if ($$patron{surname});
94
$$patron{surname}.="\%" if ($$patron{surname});
(-)a/serials/subscription-add.pl (-4 / +5 lines)
Lines 120-129 if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') { Link Here
120
    }
120
    }
121
}
121
}
122
122
123
my $onlymine=C4::Context->preference('IndependentBranches') &&
123
my $onlymine =
124
             C4::Context->userenv &&
124
     C4::Context->preference('IndependentBranches')
125
             C4::Context->userenv->{flags} % 2 !=1 &&
125
  && C4::Context->userenv
126
             C4::Context->userenv->{branch};
126
  && !C4::Context->IsSuperLibrarian
127
  && C4::Context->userenv->{branch};
127
my $branches = GetBranches($onlymine);
128
my $branches = GetBranches($onlymine);
128
my $branchloop;
129
my $branchloop;
129
for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %{$branches}) {
130
for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %{$branches}) {
(-)a/serials/subscription-detail.pl (-5 / +6 lines)
Lines 162-172 $template->param( Link Here
162
    routing => C4::Context->preference("RoutingSerials"),
162
    routing => C4::Context->preference("RoutingSerials"),
163
    totalissues => $totalissues,
163
    totalissues => $totalissues,
164
    hemisphere => $hemisphere,
164
    hemisphere => $hemisphere,
165
    cannotedit =>(C4::Context->preference('IndependentBranches') &&
165
    cannotedit => ( C4::Context->preference('IndependentBranches')
166
                C4::Context->userenv &&
166
          && C4::Context->userenv
167
                C4::Context->userenv->{flags} % 2 !=1  &&
167
          && !C4::Context->IsSuperLibrarian() 
168
                C4::Context->userenv->{branch} && $subs->{branchcode} &&
168
          && C4::Context->userenv->{branch}
169
                (C4::Context->userenv->{branch} ne $subs->{branchcode})),
169
          && $subs->{branchcode}
170
          && ( C4::Context->userenv->{branch} ne $subs->{branchcode} ) ),
170
    'periodicity' . $subs->{periodicity} => 1,
171
    'periodicity' . $subs->{periodicity} => 1,
171
    'arrival' . $subs->{dow} => 1,
172
    'arrival' . $subs->{dow} => 1,
172
    'numberpattern' . $subs->{numberpattern} => 1,
173
    'numberpattern' . $subs->{numberpattern} => 1,
(-)a/tools/holidays.pl (-5 / +5 lines)
Lines 57-66 $keydate =~ s/-/\//g; Link Here
57
57
58
my $branch= $input->param('branch') || C4::Context->userenv->{'branch'};
58
my $branch= $input->param('branch') || C4::Context->userenv->{'branch'};
59
# Set all the branches.
59
# Set all the branches.
60
my $onlymine=(C4::Context->preference('IndependentBranches') &&
60
my $onlymine =
61
              C4::Context->userenv &&
61
  (      C4::Context->preference('IndependentBranches')
62
              C4::Context->userenv->{flags} % 2 !=1  &&
62
      && C4::Context->userenv
63
              C4::Context->userenv->{branch}?1:0);
63
      && !C4::Context->IsSuperLibrarian()
64
      && C4::Context->userenv->{branch} ? 1 : 0 );
64
if ( $onlymine ) { 
65
if ( $onlymine ) { 
65
    $branch = C4::Context->userenv->{'branch'};
66
    $branch = C4::Context->userenv->{'branch'};
66
}
67
}
67
- 

Return to bug 10277