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

diff --git a/FS/FS/part_export/send_email.pm b/FS/FS/part_export/send_email.pm
index 6ba131f18..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,7 +80,9 @@ 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,