gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bug_8299' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2012-12-27 18:50:50 -05:00
parent bfb0d7e130 dd5023e6d4
commit c3bf2b4a3c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misc/cronjobs/overdue_notices.pl
View File

@ -679,7 +679,9 @@ sub parse_letter {
}
my $currency_format;
if ($params->{'letter'}->{'content'} =~ m/<fine>(.*)<\/fine>/o) { # process any fine tags...
if ( defined $params->{'letter'}->{'content'}
and $params->{'letter'}->{'content'} =~ m/<fine>(.*)<\/fine>/o )
{ # process any fine tags...
$currency_format = $1;
$params->{'letter'}->{'content'} =~ s/<fine>.*<\/fine>/<<items.fine>>/o;
}
@ -689,7 +691,7 @@ sub parse_letter {
my $item_format = '';
foreach my $item (@$i) {
my $fine = GetFine($item->{'itemnumber'}, $params->{'borrowernumber'});
if (!$item_format) {
if ( !$item_format and defined $params->{'letter'}->{'content'} ) {
$params->{'letter'}->{'content'} =~ m/(<item>.*<\/item>)/;
$item_format = $1;
}