Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --combined FS/FS/Misc.pm
index cbf4495,d06653e..18cb275
--- 1/FS/FS/Misc.pm
--- 2/FS/FS/Misc.pm
+++ b/FS/FS/Misc.pm
@@@ -284,8 -284,7 +284,8 @@@ sub send_email 
          'status'    => ($error ? 'failed' : 'sent'),
          'msgtype'   => $options{'msgtype'},
      });
 -    $cust_msg->insert; # ignore errors
 +    my $log_error = $cust_msg->insert;
 +    warn "Error logging message: $log_error\n" if $log_error; # at least warn
    }
    $error;
     
@@@ -414,34 -413,6 +414,6 @@@ sub generate_email 
  
  }
  
- =item process_send_email OPTION => VALUE ...
- 
- Takes arguments as per generate_email() and sends the message.  This 
- will die on any error and can be used in the job queue.
- 
- =cut
- 
- sub process_send_email {
-   my %message = @_;
-   my $error = send_email(generate_email(%message));
-   die "$error\n" if $error;
-   '';
- }
- 
- =item process_send_generated_email OPTION => VALUE ...
- 
- Takes arguments as per send_email() and sends the message.  This 
- will die on any error and can be used in the job queue.
- 
- =cut
- 
- sub process_send_generated_email {
-   my %args = @_;
-   my $error = send_email(%args);
-   die "$error\n" if $error;
-   '';
- }
- 
  =item send_fax OPTION => VALUE ...
  
  Options: