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

(-)a/C4/Letters.pm (-8 / +1 lines)
Lines 787-796 sub _parseletter { Link Here
787
       $values->{'dateexpiry'} = output_pref({ str => $values->{dateexpiry}, dateonly => 1 });
787
       $values->{'dateexpiry'} = output_pref({ str => $values->{dateexpiry}, dateonly => 1 });
788
   }
788
   }
789
789
790
# if ( $table eq 'reserves' && $values->{'waitingdate'}) {
791
#      $values->{'waitingdate'} = output_pref({ dt => dt_from_string( $values->{'waitingdate'} ), dateonly => 1 });
792
#  }
793
794
    if ($letter->{content} && $letter->{content} =~ /<<today>>/) {
790
    if ($letter->{content} && $letter->{content} =~ /<<today>>/) {
795
        my $todaysdate = output_pref( DateTime->now() );
791
        my $todaysdate = output_pref( DateTime->now() );
796
        $letter->{content} =~ s/<<today>>/$todaysdate/go;
792
        $letter->{content} =~ s/<<today>>/$todaysdate/go;
Lines 806-814 sub _parseletter { Link Here
806
            my $av = Koha::AuthorisedValues->search({ category => 'ROADTYPE', authorised_value => $val });
802
            my $av = Koha::AuthorisedValues->search({ category => 'ROADTYPE', authorised_value => $val });
807
            $val = $av->count ? $av->next->lib : '';
803
            $val = $av->count ? $av->next->lib : '';
808
        }
804
        }
809
warn $table;
805
810
warn $field;
811
warn $val;
812
        # Dates replacement
806
        # Dates replacement
813
        my $replacedby   = defined ($val) ? $val : '';
807
        my $replacedby   = defined ($val) ? $val : '';
814
        if (    $replacedby
808
        if (    $replacedby
815
- 

Return to bug 8367