projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maxsearchrecordsperpage config option
[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
58542c6
..
3077d64
100644
(file)
--- a/
FS/FS/cust_main_invoice.pm
+++ b/
FS/FS/cust_main_invoice.pm
@@
-88,7
+88,7
@@
sub replace {
return "Can't change custnum!" unless $old->custnum == $new->custnum;
return "Can't change custnum!" unless $old->custnum == $new->custnum;
- $new->SUPER::replace;
+ $new->SUPER::replace
($old)
;
}
}
@@
-133,13
+133,14
@@
sub checkdest {
if ( $self->dest eq 'POST' ) {
#contemplate our navel
} elsif ( $self->dest =~ /^(\d+)$/ ) {
if ( $self->dest eq 'POST' ) {
#contemplate our navel
} elsif ( $self->dest =~ /^(\d+)$/ ) {
- return "Unknown local account (specified by svcnum)"
+ return "Unknown local account (specified by svcnum
: ". $self->dest. "
)"
unless qsearchs( 'svc_acct', { 'svcnum' => $self->dest } );
unless qsearchs( 'svc_acct', { 'svcnum' => $self->dest } );
- } elsif ( $self->dest =~ /^([\w\.\-]+)\@(([\w\.\-]+\.)+\w+)$/ ) {
+ } elsif ( $self->dest =~ /^([\w\.\-
\&
]+)\@(([\w\.\-]+\.)+\w+)$/ ) {
my($user, $domain) = ($1, $2);
if ( $domain eq $mydomain ) {
my $svc_acct = qsearchs( 'svc_acct', { 'username' => $user } );
my($user, $domain) = ($1, $2);
if ( $domain eq $mydomain ) {
my $svc_acct = qsearchs( 'svc_acct', { 'username' => $user } );
- return "Unknown local account (specified literally)" unless $svc_acct;
+ return "Unknown local account: $user\@$domain (specified literally)"
+ unless $svc_acct;
$svc_acct->svcnum =~ /^(\d+)$/ or die "Non-numeric svcnum?!";
$self->dest($1);
}
$svc_acct->svcnum =~ /^(\d+)$/ or die "Non-numeric svcnum?!";
$self->dest($1);
}
@@
-158,8
+159,9
@@
Returns the literal email address for this record (or `POST').
sub address {
my $self = shift;
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;
$svc_acct->username . '@' . $mydomain;
} else {
$self->dest;
@@
-170,7
+172,7
@@
sub address {
=head1 VERSION
=head1 VERSION
-$Id: cust_main_invoice.pm,v 1.
4 2001-07-27 17:16:25
ivan Exp $
+$Id: cust_main_invoice.pm,v 1.
8 2001-10-25 16:13:10
ivan Exp $
=head1 BUGS
=head1 BUGS