|
Lines 1696-1702
sub SearchOrders {
Link Here
|
| 1696 |
|
1696 |
|
| 1697 |
my $userenv = C4::Context->userenv; |
1697 |
my $userenv = C4::Context->userenv; |
| 1698 |
if ( C4::Context->preference("IndependentBranches") ) { |
1698 |
if ( C4::Context->preference("IndependentBranches") ) { |
| 1699 |
if ( ( $userenv ) and ( $userenv->{flags} != 1 ) ) { |
1699 |
unless ( C4::Context->IsSuperLibrarian() ) { |
| 1700 |
$query .= q{ |
1700 |
$query .= q{ |
| 1701 |
AND ( |
1701 |
AND ( |
| 1702 |
borrowers.branchcode = ? |
1702 |
borrowers.branchcode = ? |
|
Lines 1892-1902
sub GetParcel {
Link Here
|
| 1892 |
|
1892 |
|
| 1893 |
my @query_params = ( $supplierid, $code, $datereceived ); |
1893 |
my @query_params = ( $supplierid, $code, $datereceived ); |
| 1894 |
if ( C4::Context->preference("IndependentBranches") ) { |
1894 |
if ( C4::Context->preference("IndependentBranches") ) { |
| 1895 |
my $userenv = C4::Context->userenv; |
1895 |
unless ( C4::Context->IsSuperLibrarian() ) { |
| 1896 |
if ( ($userenv) && ( $userenv->{flags} != 1 ) ) { |
|
|
| 1897 |
$strsth .= " and (borrowers.branchcode = ? |
1896 |
$strsth .= " and (borrowers.branchcode = ? |
| 1898 |
or borrowers.branchcode = '')"; |
1897 |
or borrowers.branchcode = '')"; |
| 1899 |
push @query_params, $userenv->{branch}; |
1898 |
push @query_params, C4::Context->userenv->{branch}; |
| 1900 |
} |
1899 |
} |
| 1901 |
} |
1900 |
} |
| 1902 |
$strsth .= " ORDER BY aqbasket.basketno"; |
1901 |
$strsth .= " ORDER BY aqbasket.basketno"; |
|
Lines 2111-2118
sub GetLateOrders {
Link Here
|
| 2111 |
$from .= ' AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) <= CAST(now() AS date)'; |
2110 |
$from .= ' AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) <= CAST(now() AS date)'; |
| 2112 |
} |
2111 |
} |
| 2113 |
if (C4::Context->preference("IndependentBranches") |
2112 |
if (C4::Context->preference("IndependentBranches") |
| 2114 |
&& C4::Context->userenv |
2113 |
&& !C4::Context->IsSuperLibrarian() ) { |
| 2115 |
&& C4::Context->userenv->{flags} != 1 ) { |
|
|
| 2116 |
$from .= ' AND borrowers.branchcode LIKE ? '; |
2114 |
$from .= ' AND borrowers.branchcode LIKE ? '; |
| 2117 |
push @query_params, C4::Context->userenv->{branch}; |
2115 |
push @query_params, C4::Context->userenv->{branch}; |
| 2118 |
} |
2116 |
} |
|
Lines 2308-2317
sub GetHistory {
Link Here
|
| 2308 |
} |
2306 |
} |
| 2309 |
|
2307 |
|
| 2310 |
if ( C4::Context->preference("IndependentBranches") ) { |
2308 |
if ( C4::Context->preference("IndependentBranches") ) { |
| 2311 |
my $userenv = C4::Context->userenv; |
2309 |
unless ( C4::Context->IsSuperLibrarian() ) { |
| 2312 |
if ( $userenv && ($userenv->{flags} || 0) != 1 ) { |
|
|
| 2313 |
$query .= " AND (borrowers.branchcode = ? OR borrowers.branchcode ='' ) "; |
2310 |
$query .= " AND (borrowers.branchcode = ? OR borrowers.branchcode ='' ) "; |
| 2314 |
push @query_params, $userenv->{branch}; |
2311 |
push @query_params, C4::Context->userenv->{branch}; |
| 2315 |
} |
2312 |
} |
| 2316 |
} |
2313 |
} |
| 2317 |
$query .= " ORDER BY id"; |
2314 |
$query .= " ORDER BY id"; |