"fixes"

[freeside.git] / FS / FS / cust_main_invoice.pm

diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm
index d06a718..eb0162f 100644 (file)
--- a/FS/FS/cust_main_invoice.pm
+++ b/FS/FS/cust_main_invoice.pm
@@ -118,8 +118,9 @@ sub check {
 =item checkdest
 
 Checks the dest field only.  If it finds that the account ends in the
-same domain configured in the configuration files, it will change the
-invoice destination from an email address to a service number instead.
+same domain configured as the B<domain> configuration file, it will change the
+invoice destination from an email address to a service number (see
+L<FS::svc_acct>).
 
 =cut
 
@@ -157,8 +158,9 @@ Returns the literal email address for this record (or `POST').
 
 sub address {
   my $self = shift;
-  if ( $self->dest =~ /(\d+)$/ ) {
-    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $1 } );
+  if ( $self->dest =~ /^(\d+)$/ ) {
+    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $1 } )
+      or return undef;
     $svc_acct->username . '@' . $mydomain;
   } else {
     $self->dest;
@@ -169,7 +171,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.3 2001-07-27 06:17:46 thalakan Exp $
+$Id: cust_main_invoice.pm,v 1.5 2001-08-11 00:01:39 ivan Exp $
 
 =head1 BUGS