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

(-)a/C4/Letters.pm (-8 / +1 lines)
Lines 792-801 sub _parseletter { Link Here
792
        $values->{'dateexpiry'} = output_pref({ dt => dt_from_string( $values->{'dateexpiry'} ), dateonly => 1 });
792
        $values->{'dateexpiry'} = output_pref({ dt => dt_from_string( $values->{'dateexpiry'} ), dateonly => 1 });
793
    }
793
    }
794
794
795
# if ( $table eq 'reserves' && $values->{'waitingdate'}) {
796
#      $values->{'waitingdate'} = output_pref({ dt => dt_from_string( $values->{'waitingdate'} ), dateonly => 1 });
797
#  }
798
799
    if ($letter->{content} && $letter->{content} =~ /<<today>>/) {
795
    if ($letter->{content} && $letter->{content} =~ /<<today>>/) {
800
        my $todaysdate = output_pref( DateTime->now() );
796
        my $todaysdate = output_pref( DateTime->now() );
801
        $letter->{content} =~ s/<<today>>/$todaysdate/go;
797
        $letter->{content} =~ s/<<today>>/$todaysdate/go;
Lines 811-819 sub _parseletter { Link Here
811
            my $av = Koha::AuthorisedValues->search({ category => 'ROADTYPE', authorised_value => $val });
807
            my $av = Koha::AuthorisedValues->search({ category => 'ROADTYPE', authorised_value => $val });
812
            $val = $av->count ? $av->next->lib : '';
808
            $val = $av->count ? $av->next->lib : '';
813
        }
809
        }
814
warn $table;
810
815
warn $field;
816
warn $val;
817
        # Dates replacement
811
        # Dates replacement
818
        my $replacedby   = defined ($val) ? $val : '';
812
        my $replacedby   = defined ($val) ? $val : '';
819
        if (    $replacedby
813
        if (    $replacedby
820
- 

Return to bug 8367