X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fsend_email.pm;h=537a562bb2c63ed4dff81e809700a8a39b30b626;hb=57bdfd4f7e70cab525c9a4bce7f26015517a81ed;hp=05f6236338f3b820f72d5db24b911a73619e7c2d;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git

diff --git a/FS/FS/part_export/send_email.pm b/FS/FS/part_export/send_email.pm
index 05f623633..537a562bb 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);
   },
@@ -85,6 +85,7 @@ tie my %options, 'Tie::IxHash', (
   '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.'