better default paydate for letters

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index a4350b8..9030f7e 100644 (file)
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -5654,7 +5654,9 @@ sub generate_letter {
   my %letter_data = map { $_ => $self->$_ } $self->fields;
   $letter_data{payinfo} = $self->mask_payinfo;
 
-  my $paydate = $self->paydate || '2037-12';
+  #my $paydate = $self->paydate || '2037-12';
+  my $paydate = $self->paydate =~ /^\S+$/ ? $self->paydate : '2037-12';
+
   my $payby = $self->payby;
   my ($payyear,$paymonth,$payday) = split (/-/,$paydate);
   my $expire_time = timelocal(0,0,0,$payday,--$paymonth,$payyear);