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

(-)a/C4/Acquisition.pm (-1 / +3 lines)
Lines 377-389 sub GetBasketGroupAsCSV { Link Here
377
                booksellerpostal => $bookseller->{postal},
377
                booksellerpostal => $bookseller->{postal},
378
                contractnumber => $contract->{contractnumber},
378
                contractnumber => $contract->{contractnumber},
379
                contractname => $contract->{contractname},
379
                contractname => $contract->{contractname},
380
            };
381
            my $temp = {
380
                basketgroupdeliveryplace => $basketgroup->{deliveryplace},
382
                basketgroupdeliveryplace => $basketgroup->{deliveryplace},
381
                basketgroupbillingplace  => $basketgroup->{billingplace},
383
                basketgroupbillingplace  => $basketgroup->{billingplace},
382
                basketdeliveryplace      => $basket->{deliveryplace},
384
                basketdeliveryplace      => $basket->{deliveryplace},
383
                basketbillingplace       => $basket->{billingplace},
385
                basketbillingplace       => $basket->{billingplace},
384
            };
386
            };
385
            for my $place (qw( basketgroupdeliveryplace basketgroupbillingplace basketdeliveryplace basketbillingplace )) {
387
            for my $place (qw( basketgroupdeliveryplace basketgroupbillingplace basketdeliveryplace basketbillingplace )) {
386
                if ( my $library = Koha::Libraries->find( $row->{deliveryplace} ) ) {
388
                if ( my $library = Koha::Libraries->find( $temp->{$place} ) ) {
387
                    $row->{$place} = $library->branchname;
389
                    $row->{$place} = $library->branchname;
388
                }
390
                }
389
            }
391
            }
(-)a/C4/Auth.pm (-3 / +4 lines)
Lines 35-41 use Koha::Caches; Link Here
35
use Koha::AuthUtils qw(get_script_name hash_password);
35
use Koha::AuthUtils qw(get_script_name hash_password);
36
use Koha::Libraries;
36
use Koha::Libraries;
37
use Koha::LibraryCategories;
37
use Koha::LibraryCategories;
38
use Koha::Libraries;
39
use POSIX qw/strftime/;
38
use POSIX qw/strftime/;
40
use List::MoreUtils qw/ any /;
39
use List::MoreUtils qw/ any /;
41
use Encode qw( encode is_utf8);
40
use Encode qw( encode is_utf8);
Lines 1076-1082 sub checkauth { Link Here
1076
                    # if they specify at login, use that
1075
                    # if they specify at login, use that
1077
                    if ( $query->param('branch') ) {
1076
                    if ( $query->param('branch') ) {
1078
                        $branchcode = $query->param('branch');
1077
                        $branchcode = $query->param('branch');
1079
                        $branchname = Koha::Libraries->find($branchcode)->branchname;
1078
                        my $library = Koha::Libraries->find($branchcode);
1079
                        $branchname = $library? $library->branchname: '';
1080
                    }
1080
                    }
1081
                    my $branches = { map { $_->branchcode => $_->unblessed } Koha::Libraries->search };
1081
                    my $branches = { map { $_->branchcode => $_->unblessed } Koha::Libraries->search };
1082
                    if ( C4::Context->boolean_preference('IndependentBranches') && C4::Context->boolean_preference('Autolocation') ) {
1082
                    if ( C4::Context->boolean_preference('IndependentBranches') && C4::Context->boolean_preference('Autolocation') ) {
Lines 1526-1532 sub check_api_auth { Link Here
1526
                # if they specify at login, use that
1526
                # if they specify at login, use that
1527
                if ( $query->param('branch') ) {
1527
                if ( $query->param('branch') ) {
1528
                    $branchcode = $query->param('branch');
1528
                    $branchcode = $query->param('branch');
1529
                    $branchname = Koha::Libraries->find($branchcode)->branchname;
1529
                    my $library = Koha::Libraries->find($branchcode);
1530
                    $branchname = $library? $library->branchname: '';
1530
                }
1531
                }
1531
                my $branches = { map { $_->branchcode => $_->unblessed } Koha::Libraries->search };
1532
                my $branches = { map { $_->branchcode => $_->unblessed } Koha::Libraries->search };
1532
                foreach my $br ( keys %$branches ) {
1533
                foreach my $br ( keys %$branches ) {
(-)a/C4/Search.pm (-1 lines)
Lines 31-37 use C4::XSLT; Link Here
31
use C4::Reserves;    # GetReserveStatus
31
use C4::Reserves;    # GetReserveStatus
32
use C4::Debug;
32
use C4::Debug;
33
use C4::Charset;
33
use C4::Charset;
34
use Koha::Libraries;
35
use YAML;
34
use YAML;
36
use URI::Escape;
35
use URI::Escape;
37
use Business::ISBN;
36
use Business::ISBN;
(-)a/svc/holds (-1 / +1 lines)
Lines 30-35 use C4::Context; Link Here
30
30
31
use Koha::DateUtils;
31
use Koha::DateUtils;
32
use Koha::Holds;
32
use Koha::Holds;
33
use Koha::Libraries;
33
34
34
my $input = new CGI;
35
my $input = new CGI;
35
36
36
- 

Return to bug 15758