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

(-)a/C4/Letters.pm (-1 / +17 lines)
Lines 34-39 use Date::Calc qw( Add_Delta_Days ); Link Here
34
use Encode;
34
use Encode;
35
use Carp;
35
use Carp;
36
36
37
use Data::Printer;
38
37
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
39
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
38
40
39
BEGIN {
41
BEGIN {
Lines 617-623 sub _parseletter { Link Here
617
        $letter->{content} =~ s/<<today>>/$todaysdate/go;
619
        $letter->{content} =~ s/<<today>>/$todaysdate/go;
618
    }
620
    }
619
621
622
    my @dates = qq|  issues.date_due  issues.date  old_issues.date_due
623
        old_issues.returndate old_issues.issuedate |;
624
620
    while ( my ($field, $val) = each %$values ) {
625
    while ( my ($field, $val) = each %$values ) {
626
627
        # Bug 9084 - Dates in notices should be formatted 
628
        # according to dateformat system preference
629
        my $match = "$table.$field";
630
        if ( grep /$match/, @dates ) {
631
632
            #display dateonly, if timestamp has trailing '23:59:00'
633
            my $dateonly = 0;
634
            $dateonly = 1 if $val =~ /23:59:00$/;
635
            $val = output_pref( dt_from_string($val), undef, undef, $dateonly );
636
        }
637
621
        my $replacetablefield = "<<$table.$field>>";
638
        my $replacetablefield = "<<$table.$field>>";
622
        my $replacefield = "<<$field>>";
639
        my $replacefield = "<<$field>>";
623
        $val =~ s/\p{P}(?=$)//g if $val;
640
        $val =~ s/\p{P}(?=$)//g if $val;
624
- 

Return to bug 9084