Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/new/bug_8606'

Browse source
This commit is contained in:
Paul Poulain 2012-09-20 14:58:39 +02:00
commit 050f932b3b
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
C4/Letters.pm
View file

@ -148,9 +148,12 @@ my %letter;
sub getletter { sub getletter {
my ( $module, $code, $branchcode ) = @_; my ( $module, $code, $branchcode ) = @_;
$branchcode ||= '';
if ( C4::Context->preference('IndependantBranches') if ( C4::Context->preference('IndependantBranches')
and $branchcode and $branchcode
and C4::Context->userenv ) { and C4::Context->userenv ) {
$branchcode = C4::Context->userenv->{'branch'}; $branchcode = C4::Context->userenv->{'branch'};
} }

23
misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl vendored
View file

@ -127,20 +127,17 @@ foreach my $type (@types) {
my $date = C4::Dates->new( $issues->{'date_due'}, 'iso' ); my $date = C4::Dates->new( $issues->{'date_due'}, 'iso' );
my $due_date = $date->output('metric'); my $due_date = $date->output('metric');
# gets the placeholder message, and enqueues the letter my $letter = C4::Letters::GetPreparedLetter(
my $letter = getletter( $module, $code ); module => $module,
die "No letter found for type $type!... dying\n" unless $letter; letter_code => $code,
tables => {
borrowers => $issues->{'borrowernumber'},
biblio => $issues->{'biblionumber'},
biblioitems => $issues->{'biblionumber'}
},
);
# covers basic variable parsing in letter die "No letter found for type $type!... dying\n" unless $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'} );
my $message_id = 0; my $message_id = 0;
if ($outfile) { if ($outfile) {