X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fsend_email.pm;h=a54fa16006bc29a33353bc6de3e9e8af27549598;hp=6ba131f1816ea304f39f9718ed286e8744d16917;hb=1a320aa8f679a355bd3678ccceb5d7ecf7b0aeba;hpb=aa38c070977cf63365a4d26a3e4a7e5049ad70d0

diff --git a/FS/FS/part_export/send_email.pm b/FS/FS/part_export/send_email.pm
index 6ba131f18..a54fa1600 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);
 
@@ -18,12 +17,13 @@ my %template_select = (
     $templates{$_[0]};
   },
   option_values => sub {
-    %templates = (0 => '',
+    %templates = (
+      0 => '',
       map { $_->msgnum, $_->msgname } 
-      qsearch({ table => 'msg_template',
-                hashref => {},
-                order_by => 'ORDER BY msgnum ASC'
-              })
+        qsearch({ table    => 'msg_template',
+                  hashref  => { disabled => '', },
+                  order_by => 'ORDER BY msgnum ASC'
+                })
     );
     sort keys (%templates);
   },
@@ -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,