X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fsend_email.pm;h=84e7cb54fea91cbb4a9c3f14bd5f3cc59e62c8ee;hb=8b310db7a6bd5216b6df9bc9843ce99898a7bee9;hp=05f6236338f3b820f72d5db24b911a73619e7c2d;hpb=fb4ab1073f0d15d660c6cdc4e07afebf68ef3924;p=freeside.git

diff --git a/FS/FS/part_export/send_email.pm b/FS/FS/part_export/send_email.pm
index 05f623633..84e7cb54f 100644
--- a/FS/FS/part_export/send_email.pm
+++ b/FS/FS/part_export/send_email.pm
@@ -6,7 +6,6 @@ use FS::part_export;
 use FS::Record qw(qsearch qsearchs);
 use FS::Conf;
 use FS::msg_template;
-use FS::Misc qw(send_email);
 
 @ISA = qw(FS::part_export);
 
@@ -21,7 +20,8 @@ my %template_select = (
     %templates = (0 => '',
       map { $_->msgnum, $_->msgname } 
       qsearch({ table => 'msg_template',
-                hashref => {},
+                hashref => { disabled => { 'op'    => '!=',
+                                           'value' => 1 }},
                 order_by => 'ORDER BY msgnum ASC'
               })
     );
@@ -80,11 +80,14 @@ tie my %options, 'Tie::IxHash', (
 );
 
 %info = (
-  'svc'      => [qw( svc_acct svc_broadband svc_phone svc_domain )],
+  'svc'      => [qw( svc_acct svc_hardware svc_broadband svc_phone svc_domain
+                     svc_dsl svc_circuit svc_fiber
+                )],
   'desc'     =>
   'Send an email message',
   'options'  => \%options,
   'nodomain' => '',
+  'no_machine' => 1,
   'notes'    => ' 
   Send an email message.  The subject and body of the message
   will be generated from a message template.'