Commit 025528a1 authored by Koha user's avatar Koha user Committed by Paul Poulain

Bug 8606 - Talking Tech broken by Bug 7001

The patches for bug 7001 removed the parseletter subroutine from
C4::Letters without updating the talking tech script to use the
new alternative. This patch rectifies that situation.
Signed-off-by: Chris Cormack's avatarChris Cormack <chris@bigballofwax.co.nz>
parent dd2de858
......@@ -148,9 +148,12 @@ my %letter;
sub getletter {
my ( $module, $code, $branchcode ) = @_;
$branchcode |= '';
if ( C4::Context->preference('IndependantBranches')
and $branchcode
and C4::Context->userenv ) {
$branchcode = C4::Context->userenv->{'branch'};
}
......
......@@ -127,20 +127,17 @@ foreach my $type (@types) {
my $date = C4::Dates->new( $issues->{'date_due'}, 'iso' );
my $due_date = $date->output('metric');
# gets the placeholder message, and enqueues the letter
my $letter = getletter( $module, $code );
die "No letter found for type $type!... dying\n" unless $letter;
my $letter = C4::Letters::GetPreparedLetter(
module => $module,
letter_code => $code,
tables => {
borrowers => $issues->{'borrowernumber'},
biblio => $issues->{'biblionumber'},
biblioitems => $issues->{'biblionumber'}
},
);
# covers basic variable parsing in letter
$letter =
C4::Letters::parseletter( $letter, 'borrowers',
$issues->{'borrowernumber'} );
$letter =
C4::Letters::parseletter( $letter, 'biblio',
$issues->{'biblionumber'} );
$letter =
C4::Letters::parseletter( $letter, 'biblioitems',
$issues->{'biblionumber'} );
die "No letter found for type $type!... dying\n" unless $letter;
my $message_id = 0;
if ($outfile) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment