hopefully fix tax report for taxclass & named tax edge cases

[freeside.git] / bin / sendmail.import

diff --git a/bin/sendmail.import b/bin/sendmail.import
index ef745fc..a55616d 100644 (file)
--- a/bin/sendmail.import
+++ b/bin/sendmail.import
@@ -20,11 +20,11 @@ adminsuidsetup $user;
 #$FS::domain_record::noserial_hack = 1;
 
 use vars qw($defaultdomain);
-$defaultdomain = '295.ca';
+$defaultdomain = 'surferz.net';
 
-use vars qw(@svcpart $forward_svcpart);
-@svcpart = qw( 2 4 );
-$forward_svcpart = 7;
+use vars qw($svcpart $forward_svcpart);
+$svcpart = 2;
+$forward_svcpart = 4;
 
 use vars qw($spooldir);
 $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/sendmail";
@@ -144,9 +144,7 @@ sub svcnum_or_literal {
   my $svc_domain = qsearchs('svc_domain', { 'domain' => $domain } );
   my $domsvc = $svc_domain ? $svc_domain->svcnum : '';
 
-  my @svc_acct = grep { my $svc_acct = $_;
-                        grep { $svc_acct->cust_svc->svcpart == $_ } @svcpart
-                      }
+  my @svc_acct = grep { $_->cust_svc->svcpart == $svcpart }
                    qsearch('svc_acct', {
                      'username' => $username,
                      'domsvc'   => $domsvc,