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

(-)a/C4/Acquisition.pm (+1 lines)
Lines 3028-3033 sub NotifyOrderUsers { Link Here
3028
            module      => 'acquisition',
3028
            module      => 'acquisition',
3029
            letter_code => 'ACQ_NOTIF_ON_RECEIV',
3029
            letter_code => 'ACQ_NOTIF_ON_RECEIV',
3030
            branchcode  => $library->{branchcode},
3030
            branchcode  => $library->{branchcode},
3031
            lang        => $borrower->{lang},
3031
            tables      => {
3032
            tables      => {
3032
                'branches'    => $library,
3033
                'branches'    => $library,
3033
                'borrowers'   => $borrower,
3034
                'borrowers'   => $borrower,
(-)a/C4/Circulation.pm (+2 lines)
Lines 3375-3380 sub SendCirculationAlert { Link Here
3375
                letter_code => $type,
3375
                letter_code => $type,
3376
                branchcode => $branch,
3376
                branchcode => $branch,
3377
                message_transport_type => $_,
3377
                message_transport_type => $_,
3378
                lang => $borrower->{lang},
3378
                tables => {
3379
                tables => {
3379
                    $issues_table => $item->{itemnumber},
3380
                    $issues_table => $item->{itemnumber},
3380
                    'items'       => $item->{itemnumber},
3381
                    'items'       => $item->{itemnumber},
Lines 3392-3397 sub SendCirculationAlert { Link Here
3392
                letter_code => $type,
3393
                letter_code => $type,
3393
                branchcode => $branch,
3394
                branchcode => $branch,
3394
                message_transport_type => $_,
3395
                message_transport_type => $_,
3396
                lang => $borrower->{lang},
3395
                tables => {
3397
                tables => {
3396
                    $issues_table => $item->{itemnumber},
3398
                    $issues_table => $item->{itemnumber},
3397
                    'items'       => $item->{itemnumber},
3399
                    'items'       => $item->{itemnumber},
(-)a/C4/Members.pm (+3 lines)
Lines 1212-1217 sub IssueSlip { Link Here
1212
    # FIXME Check callers before removing this statement
1212
    # FIXME Check callers before removing this statement
1213
    #return unless $borrowernumber;
1213
    #return unless $borrowernumber;
1214
1214
1215
    my $patron = Koha::Patrons->find( $borrowernumber );
1216
1215
    my @issues = @{ GetPendingIssues($borrowernumber) };
1217
    my @issues = @{ GetPendingIssues($borrowernumber) };
1216
1218
1217
    for my $issue (@issues) {
1219
    for my $issue (@issues) {
Lines 1272-1277 sub IssueSlip { Link Here
1272
        module => 'circulation',
1274
        module => 'circulation',
1273
        letter_code => $letter_code,
1275
        letter_code => $letter_code,
1274
        branchcode => $branch,
1276
        branchcode => $branch,
1277
        lang => $patron->lang,
1275
        tables => {
1278
        tables => {
1276
            'branches'    => $branch,
1279
            'branches'    => $branch,
1277
            'borrowers'   => $borrowernumber,
1280
            'borrowers'   => $borrowernumber,
(-)a/C4/Overdues.pm (+3 lines)
Lines 994-999 sub parse_overdues_letter { Link Here
994
        return unless ( exists $params->{$required} && $params->{$required} );
994
        return unless ( exists $params->{$required} && $params->{$required} );
995
    }
995
    }
996
996
997
    my $patron = Koha::Patrons->find( $params->{borrowernumber} );
998
997
    my $substitute = $params->{'substitute'} || {};
999
    my $substitute = $params->{'substitute'} || {};
998
    $substitute->{today} ||= output_pref( { dt => dt_from_string, dateonly => 1} );
1000
    $substitute->{today} ||= output_pref( { dt => dt_from_string, dateonly => 1} );
999
1001
Lines 1034-1039 sub parse_overdues_letter { Link Here
1034
        module => 'circulation',
1036
        module => 'circulation',
1035
        letter_code => $params->{'letter_code'},
1037
        letter_code => $params->{'letter_code'},
1036
        branchcode => $params->{'branchcode'},
1038
        branchcode => $params->{'branchcode'},
1039
        lang => $patron->lang,
1037
        tables => \%tables,
1040
        tables => \%tables,
1038
        substitute => $substitute,
1041
        substitute => $substitute,
1039
        repeat => { item => \@item_tables },
1042
        repeat => { item => \@item_tables },
(-)a/C4/Reserves.pm (+4 lines)
Lines 232-237 sub AddReserve { Link Here
232
            module => 'reserves',
232
            module => 'reserves',
233
            letter_code => 'HOLDPLACED',
233
            letter_code => 'HOLDPLACED',
234
            branchcode => $branch,
234
            branchcode => $branch,
235
            lang => $borrower->{lang},
235
            tables => {
236
            tables => {
236
                'branches'    => $library,
237
                'branches'    => $library,
237
                'borrowers'   => $borrower,
238
                'borrowers'   => $borrower,
Lines 2000-2005 sub _koha_notify_reserve { Link Here
2000
    my %letter_params = (
2001
    my %letter_params = (
2001
        module => 'reserves',
2002
        module => 'reserves',
2002
        branchcode => $hold->branchcode,
2003
        branchcode => $hold->branchcode,
2004
        lang => $borrower->{lang},
2003
        tables => {
2005
        tables => {
2004
            'branches'       => $library,
2006
            'branches'       => $library,
2005
            'borrowers'      => $borrower,
2007
            'borrowers'      => $borrower,
Lines 2345-2350 sub ReserveSlip { Link Here
2345
    my ($branch, $borrowernumber, $biblionumber) = @_;
2347
    my ($branch, $borrowernumber, $biblionumber) = @_;
2346
2348
2347
#   return unless ( C4::Context->boolean_preference('printreserveslips') );
2349
#   return unless ( C4::Context->boolean_preference('printreserveslips') );
2350
    my $patron = Koha::Patrons->find( $borrowernumber );
2348
2351
2349
    my $reserve_id = GetReserveId({
2352
    my $reserve_id = GetReserveId({
2350
        biblionumber => $biblionumber,
2353
        biblionumber => $biblionumber,
Lines 2356-2361 sub ReserveSlip { Link Here
2356
        module => 'circulation',
2359
        module => 'circulation',
2357
        letter_code => 'HOLD_SLIP',
2360
        letter_code => 'HOLD_SLIP',
2358
        branchcode => $branch,
2361
        branchcode => $branch,
2362
        lang => $patron->lang,
2359
        tables => {
2363
        tables => {
2360
            'reserves'    => $reserve,
2364
            'reserves'    => $reserve,
2361
            'branches'    => $reserve->{branchcode},
2365
            'branches'    => $reserve->{branchcode},
(-)a/C4/Suggestions.pm (+2 lines)
Lines 502-512 sub ModSuggestion { Link Here
502
502
503
        # fetch the entire updated suggestion so that we can populate the letter
503
        # fetch the entire updated suggestion so that we can populate the letter
504
        my $full_suggestion = GetSuggestion( $suggestion->{suggestionid} );
504
        my $full_suggestion = GetSuggestion( $suggestion->{suggestionid} );
505
        my $patron = Koha::Patrons->find( $full_suggestion->{suggestedby} );
505
        if (
506
        if (
506
            my $letter = C4::Letters::GetPreparedLetter(
507
            my $letter = C4::Letters::GetPreparedLetter(
507
                module      => 'suggestions',
508
                module      => 'suggestions',
508
                letter_code => $full_suggestion->{STATUS},
509
                letter_code => $full_suggestion->{STATUS},
509
                branchcode  => $full_suggestion->{branchcode},
510
                branchcode  => $full_suggestion->{branchcode},
511
                lang        => $patron->lang,
510
                tables      => {
512
                tables      => {
511
                    'branches'    => $full_suggestion->{branchcode},
513
                    'branches'    => $full_suggestion->{branchcode},
512
                    'borrowers'   => $full_suggestion->{suggestedby},
514
                    'borrowers'   => $full_suggestion->{suggestedby},
(-)a/Koha/ArticleRequest.pm (+1 lines)
Lines 108-113 sub notify { Link Here
108
            module                 => 'circulation',
108
            module                 => 'circulation',
109
            letter_code            => "AR_$status",
109
            letter_code            => "AR_$status",
110
            message_transport_type => 'email',
110
            message_transport_type => 'email',
111
            lang                   => $self->borrower->lang,
111
            tables                 => {
112
            tables                 => {
112
                article_requests => $self->id,
113
                article_requests => $self->id,
113
                borrowers        => $self->borrowernumber,
114
                borrowers        => $self->borrowernumber,
(-)a/Koha/Patron/Discharge.pm (+2 lines)
Lines 107-115 sub generate_as_pdf { Link Here
107
    my ($params) = @_;
107
    my ($params) = @_;
108
    return unless $params->{borrowernumber};
108
    return unless $params->{borrowernumber};
109
109
110
    my $patron = Koha::Patrons->find( $params->{borrowernumber} );
110
    my $letter = C4::Letters::GetPreparedLetter(
111
    my $letter = C4::Letters::GetPreparedLetter(
111
        module      => 'members',
112
        module      => 'members',
112
        letter_code => 'DISCHARGE',
113
        letter_code => 'DISCHARGE',
114
        lang        => $patron->lang,
113
        tables      => { borrowers => $params->{borrowernumber}, branches => $params->{'branchcode'}, },
115
        tables      => { borrowers => $params->{borrowernumber}, branches => $params->{'branchcode'}, },
114
    );
116
    );
115
117
(-)a/Koha/Patron/Password/Recovery.pm (+1 lines)
Lines 144-149 sub SendPasswordRecoveryEmail { Link Here
144
        module      => 'members',
144
        module      => 'members',
145
        letter_code => 'PASSWORD_RESET',
145
        letter_code => 'PASSWORD_RESET',
146
        branchcode  => $borrower->branchcode,
146
        branchcode  => $borrower->branchcode,
147
        lang        => $borrower->lang,
147
        substitute =>
148
        substitute =>
148
          { passwordreseturl => $uuidLink, user => $borrower->userid },
149
          { passwordreseturl => $uuidLink, user => $borrower->userid },
149
    );
150
    );
(-)a/circ/article-request-slip.pl (+3 lines)
Lines 25-30 use C4::Context; Link Here
25
use C4::Output;
25
use C4::Output;
26
use C4::Auth;
26
use C4::Auth;
27
use Koha::ArticleRequests;
27
use Koha::ArticleRequests;
28
use Koha::Patrons;
28
29
29
my $cgi = new CGI;
30
my $cgi = new CGI;
30
31
Lines 43-53 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
43
my $ar = Koha::ArticleRequests->find($id);
44
my $ar = Koha::ArticleRequests->find($id);
44
45
45
$template->param( article_request => $ar );
46
$template->param( article_request => $ar );
47
my $patron = Koha::Patrons->find( $ar->borrowernumber );
46
48
47
my $slip = C4::Letters::GetPreparedLetter(
49
my $slip = C4::Letters::GetPreparedLetter(
48
    module                 => 'circulation',
50
    module                 => 'circulation',
49
    letter_code            => 'AR_SLIP',
51
    letter_code            => 'AR_SLIP',
50
    message_transport_type => 'print',
52
    message_transport_type => 'print',
53
    lang                   => $patron->lang,
51
    tables                 => {
54
    tables                 => {
52
        article_requests => $ar->id,
55
        article_requests => $ar->id,
53
        borrowers        => $ar->borrowernumber,
56
        borrowers        => $ar->borrowernumber,
(-)a/misc/cronjobs/advance_notices.pl (+3 lines)
Lines 58-63 use C4::Overdues; Link Here
58
use Koha::DateUtils;
58
use Koha::DateUtils;
59
use C4::Log;
59
use C4::Log;
60
use Koha::Libraries;
60
use Koha::Libraries;
61
use Koha::Patrons;
61
62
62
=head1 NAME
63
=head1 NAME
63
64
Lines 467-472 sub parse_letter { Link Here
467
    foreach my $required ( qw( letter_code borrowernumber ) ) {
468
    foreach my $required ( qw( letter_code borrowernumber ) ) {
468
        return unless exists $params->{$required};
469
        return unless exists $params->{$required};
469
    }
470
    }
471
    my $patron = Koha::Patrons->find( $params->{borrowernumber} );
470
472
471
    my %table_params = ( 'borrowers' => $params->{'borrowernumber'} );
473
    my %table_params = ( 'borrowers' => $params->{'borrowernumber'} );
472
474
Lines 486-491 sub parse_letter { Link Here
486
        module => 'circulation',
488
        module => 'circulation',
487
        letter_code => $params->{'letter_code'},
489
        letter_code => $params->{'letter_code'},
488
        branchcode => $table_params{'branches'},
490
        branchcode => $table_params{'branches'},
491
        lang => $patron->lang,
489
        substitute => $params->{'substitute'},
492
        substitute => $params->{'substitute'},
490
        tables     => \%table_params,
493
        tables     => \%table_params,
491
        message_transport_type => $params->{message_transport_type},
494
        message_transport_type => $params->{message_transport_type},
(-)a/misc/cronjobs/membership_expiry.pl (+3 lines)
Lines 130-135 use C4::Context; Link Here
130
use C4::Letters;
130
use C4::Letters;
131
use C4::Log;
131
use C4::Log;
132
132
133
use Koha::Patrons;
134
133
# These are defaults for command line options.
135
# These are defaults for command line options.
134
my $confirm;                              # -c: Confirm that the user has read and configured this script.
136
my $confirm;                              # -c: Confirm that the user has read and configured this script.
135
my $nomail;                               # -n: No mail. Will not send any emails.
137
my $nomail;                               # -n: No mail. Will not send any emails.
Lines 185-190 while ( my $recent = $upcoming_mem_expires->next ) { Link Here
185
        module      => 'members',
187
        module      => 'members',
186
        letter_code => $letter_type,
188
        letter_code => $letter_type,
187
        branchcode  => $recent->branchcode,
189
        branchcode  => $recent->branchcode,
190
        lang        => $recent->lang,
188
        tables      => {
191
        tables      => {
189
            borrowers => $recent->borrowernumber,
192
            borrowers => $recent->borrowernumber,
190
            branches  => $recent->branchcode,
193
            branches  => $recent->branchcode,
(-)a/misc/cronjobs/notice_unprocessed_suggestions.pl (+1 lines)
Lines 58-63 for my $number_of_days (@days) { Link Here
58
                module      => 'suggestions',
58
                module      => 'suggestions',
59
                letter_code => 'TO_PROCESS',
59
                letter_code => 'TO_PROCESS',
60
                branchcode  => $patron->{branchcode},
60
                branchcode  => $patron->{branchcode},
61
                lang        => $patron->{lang},
61
                tables      => {
62
                tables      => {
62
                    suggestions => $suggestion->{suggestionid},
63
                    suggestions => $suggestion->{suggestionid},
63
                    branches    => $patron->{branchcode},
64
                    branches    => $patron->{branchcode},
(-)a/misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl (+1 lines)
Lines 123-128 foreach my $type (@types) { Link Here
123
        my $letter = C4::Letters::GetPreparedLetter(
123
        my $letter = C4::Letters::GetPreparedLetter(
124
            module      => $module,
124
            module      => $module,
125
            letter_code => $code,
125
            letter_code => $code,
126
            lang        => 'default', # It does not sound useful to send a lang here
126
            tables      => {
127
            tables      => {
127
                borrowers   => $issues->{'borrowernumber'},
128
                borrowers   => $issues->{'borrowernumber'},
128
                biblio      => $issues->{'biblionumber'},
129
                biblio      => $issues->{'biblionumber'},
(-)a/opac/opac-memberentry.pl (+1 lines)
Lines 153-158 if ( $action eq 'create' ) { Link Here
153
            my $letter = C4::Letters::GetPreparedLetter(
153
            my $letter = C4::Letters::GetPreparedLetter(
154
                module      => 'members',
154
                module      => 'members',
155
                letter_code => 'OPAC_REG_VERIFY',
155
                letter_code => 'OPAC_REG_VERIFY',
156
                lang        => 'default', # Patron does not have a preferred language defined yet
156
                tables      => {
157
                tables      => {
157
                    borrower_modifications => $verification_token,
158
                    borrower_modifications => $verification_token,
158
                },
159
                },
(-)a/opac/opac-shareshelf.pl (-1 / +4 lines)
Lines 169-179 sub notify_owner { Link Here
169
    my $toaddr = C4::Members::GetNoticeEmailAddress( $param->{owner} );
169
    my $toaddr = C4::Members::GetNoticeEmailAddress( $param->{owner} );
170
    return if !$toaddr;
170
    return if !$toaddr;
171
171
172
    my $patron = Koha::Patrons->find( $param->{owner} );
173
172
    #prepare letter
174
    #prepare letter
173
    my $letter = C4::Letters::GetPreparedLetter(
175
    my $letter = C4::Letters::GetPreparedLetter(
174
        module      => 'members',
176
        module      => 'members',
175
        letter_code => 'SHARE_ACCEPT',
177
        letter_code => 'SHARE_ACCEPT',
176
        branchcode  => C4::Context->userenv->{"branch"},
178
        branchcode  => C4::Context->userenv->{"branch"},
179
        lang        => $patron->lang,
177
        tables      => { borrowers => $param->{loggedinuser}, },
180
        tables      => { borrowers => $param->{loggedinuser}, },
178
        substitute  => { listname => $param->{shelfname}, },
181
        substitute  => { listname => $param->{shelfname}, },
179
    );
182
    );
Lines 239-244 sub send_invitekey { Link Here
239
            module      => 'members',
242
            module      => 'members',
240
            letter_code => 'SHARE_INVITE',
243
            letter_code => 'SHARE_INVITE',
241
            branchcode  => C4::Context->userenv->{"branch"},
244
            branchcode  => C4::Context->userenv->{"branch"},
245
            lang        => 'default', # Not sure how we could use something more useful else here
242
            tables      => { borrowers => $param->{loggedinuser}, },
246
            tables      => { borrowers => $param->{loggedinuser}, },
243
            substitute  => {
247
            substitute  => {
244
                listname => $param->{shelfname},
248
                listname => $param->{shelfname},
245
- 

Return to bug 17762