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

(-)a/C4/Letters.pm (-1 / +10 lines)
Lines 1370-1375 sub _send_message_by_email { Link Here
1370
        $branch_returnpath = $library->branchreturnpath;
1370
        $branch_returnpath = $library->branchreturnpath;
1371
    }
1371
    }
1372
1372
1373
    my $from_address = $message->{'from_address'} || $library->from_email_address;
1374
    if( !$from_address ) {
1375
        _set_message_status({
1376
            message_id => $message->{'message_id'},
1377
            status     => 'failed',
1378
            delivery_note => 'No from address',
1379
        });
1380
        return;
1381
    };
1373
    my $email = Koha::Email->create(
1382
    my $email = Koha::Email->create(
1374
        {
1383
        {
1375
            to => $to_address,
1384
            to => $to_address,
Lines 1378-1384 sub _send_message_by_email { Link Here
1378
                ? ( bcc => C4::Context->preference('NoticeBcc') )
1387
                ? ( bcc => C4::Context->preference('NoticeBcc') )
1379
                : ()
1388
                : ()
1380
            ),
1389
            ),
1381
            from     => $message->{'from_address'}  || $branch_email,
1390
            from     => $from_address,
1382
            reply_to => $message->{'reply_address'} || $branch_replyto,
1391
            reply_to => $message->{'reply_address'} || $branch_replyto,
1383
            sender   => $branch_returnpath,
1392
            sender   => $branch_returnpath,
1384
            subject  => "" . $message->{subject}
1393
            subject  => "" . $message->{subject}
(-)a/Koha/Patron/Password/Recovery.pm (-1 / +1 lines)
Lines 151-157 sub SendPasswordRecoveryEmail { Link Here
151
151
152
    # define from emails
152
    # define from emails
153
    my $library = $borrower->library;
153
    my $library = $borrower->library;
154
    my $kohaEmail = $library->branchemail || C4::Context->preference('KohaAdminEmailAddress');  # send from patron's branch or Koha Admin
154
    my $kohaEmail = $library->from_email_address; # send from patron's branch or Koha Admin
155
155
156
    my $message_id = C4::Letters::EnqueueLetter(
156
    my $message_id = C4::Letters::EnqueueLetter(
157
        {
157
        {
(-)a/misc/cronjobs/automatic_renewals.pl (-4 / +2 lines)
Lines 212-218 if ( $send_notices && $confirm ) { Link Here
212
            );
212
            );
213
213
214
            my $library = Koha::Libraries->find( $patron->branchcode );
214
            my $library = Koha::Libraries->find( $patron->branchcode );
215
            my $admin_email_address = $library->branchemail || C4::Context->preference('KohaAdminEmailAddress');
215
            my $admin_email_address = $library->from_email_address;
216
216
217
            C4::Letters::EnqueueLetter(
217
            C4::Letters::EnqueueLetter(
218
                {   letter                 => $letter,
218
                {   letter                 => $letter,
Lines 270-277 String that denote the letter code. Link Here
270
sub send_digests {
270
sub send_digests {
271
    my $params = shift;
271
    my $params = shift;
272
272
273
    my $admin_email_address = C4::Context->preference('KohaAdminEmailAddress');
274
275
    PATRON: while ( my ( $borrowernumber, $digest ) = each %{$params->{digests}} ) {
273
    PATRON: while ( my ( $borrowernumber, $digest ) = each %{$params->{digests}} ) {
276
        my $borrower_preferences =
274
        my $borrower_preferences =
277
            C4::Members::Messaging::GetMessagingPreferences(
275
            C4::Members::Messaging::GetMessagingPreferences(
Lines 285-291 sub send_digests { Link Here
285
283
286
        my $patron = Koha::Patrons->find( $borrowernumber );
284
        my $patron = Koha::Patrons->find( $borrowernumber );
287
        my $library = Koha::Libraries->find( $params->{branchcode} );
285
        my $library = Koha::Libraries->find( $params->{branchcode} );
288
        my $from_address = $library->{branchemail} || $admin_email_address;
286
        my $from_address = $library->from_email_address;
289
287
290
        foreach my $transport ( keys %{ $borrower_preferences->{'transports'} } ) {
288
        foreach my $transport ( keys %{ $borrower_preferences->{'transports'} } ) {
291
            my $letter = C4::Letters::GetPreparedLetter (
289
            my $letter = C4::Letters::GetPreparedLetter (
(-)a/misc/cronjobs/membership_expiry.pl (-3 / +1 lines)
Lines 168-174 if( !$expdays ) { Link Here
168
    exit;
168
    exit;
169
}
169
}
170
170
171
my $admin_adress = C4::Context->preference('KohaAdminEmailAddress');
172
warn 'getting upcoming membership expires' if $verbose;
171
warn 'getting upcoming membership expires' if $verbose;
173
my $upcoming_mem_expires = Koha::Patrons->search_upcoming_membership_expires(
172
my $upcoming_mem_expires = Koha::Patrons->search_upcoming_membership_expires(
174
    {
173
    {
Lines 183-189 warn 'found ' . $upcoming_mem_expires->count . ' soon expiring members' Link Here
183
# main loop
182
# main loop
184
$letter_type = 'MEMBERSHIP_EXPIRY' if !$letter_type;
183
$letter_type = 'MEMBERSHIP_EXPIRY' if !$letter_type;
185
while ( my $recent = $upcoming_mem_expires->next ) {
184
while ( my $recent = $upcoming_mem_expires->next ) {
186
    my $from_address = $recent->library->branchemail || $admin_adress;
185
    my $from_address = $recent->library->from_email_address;
187
    my $letter =  C4::Letters::GetPreparedLetter(
186
    my $letter =  C4::Letters::GetPreparedLetter(
188
        module      => 'members',
187
        module      => 'members',
189
        letter_code => $letter_type,
188
        letter_code => $letter_type,
190
- 

Return to bug 28581