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

(-)a/Koha/Illrequest.pm (-3 / +14 lines)
Lines 750-757 EOF Link Here
750
Please let us know if you are able to supply this to us.
750
Please let us know if you are able to supply this to us.
751
751
752
Kind Regards
752
Kind Regards
753
753
EOF
754
EOF
754
755
756
        my $branch = Koha::Libraries->find($params->{current_branchcode})
757
            || die "Invalid current branchcode. Are you logged in as the database user?";
758
        my @address = map { $branch->$_ }
759
            qw/ branchname branchaddress1 branchaddress2 branchaddress3
760
                branchzip branchcity branchstate branchcountry branchphone
761
                branchemail /;
762
        my $address = "";
763
        foreach my $line ( @address ) {
764
            $address .= $line . "\n" if $line;
765
        }
766
767
        $draft->{body} .= $address;
768
755
        my $partners = Koha::Patrons->search({
769
        my $partners = Koha::Patrons->search({
756
            categorycode => $self->_config->partner_code
770
            categorycode => $self->_config->partner_code
757
        });
771
        });
Lines 774-781 EOF Link Here
774
        $to =~ s/\x00/; /;      # Replace others with '; '
788
        $to =~ s/\x00/; /;      # Replace others with '; '
775
        die "No target email addresses found. Either select at least one partner or check your ILL partner library records." if ( !$to );
789
        die "No target email addresses found. Either select at least one partner or check your ILL partner library records." if ( !$to );
776
        # Create the from, replyto and sender headers
790
        # Create the from, replyto and sender headers
777
        $branch = Koha::Libraries->find($params->{current_branchcode})
778
            || die "Invalid current branchcode. Are you logged in as the database user?";
779
        my $from = $branch->branchemail;
791
        my $from = $branch->branchemail;
780
        my $replyto = $branch->branchreplyto || $from;
792
        my $replyto = $branch->branchreplyto || $from;
781
        die "Your branch has no email address. Please set it."
793
        die "Your branch has no email address. Please set it."
782
- 

Return to bug 7317