X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_pay.pm;h=98eba704b7f43033e660d287f2a752a5d5685884;hp=421f0200eb5c486260c505b024cae24c4a3a3525;hb=d5ae9f38bdea9e3de50f76aa8caf06956b4fb706;hpb=d4dabf21a2c9022dfb7023fb5df49f1536b2f29a

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 421f0200e..98eba704b 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw( @ISA $conf $unsuspendauto $smtpmachine $invoice_from );
 use Date::Format;
 use Mail::Header;
-use Mail::Internet;
+use Mail::Internet 1.44;
 use Business::CreditCard;
 use FS::UID qw( dbh );
 use FS::Record qw( dbh qsearch qsearchs dbh );
@@ -152,8 +152,6 @@ sub insert {
     }
   }
 
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
   #false laziness w/ cust_credit::insert
   if ( $unsuspendauto && $old_balance && $cust_main->balance <= 0 ) {
     my @errors = $cust_main->unsuspend;
@@ -165,6 +163,8 @@ sub insert {
   }
   #eslaf
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
   '';
 
 }
@@ -264,8 +264,8 @@ sub delete {
   if ( $conf->config('deletepayments') ne '' ) {
 
     my $cust_main = qsearchs('cust_main',{ 'custnum' => $self->custnum });
-    #false laziness w/FS::cust_bill::send
-    $ENV{MAILADDRESS} = $conf->config('invoice_from'); #??? well as good as any
+    #false laziness w/FS::cust_bill::send & fs_signup_server
+    $ENV{MAILADDRESS} = $invoice_from; #??? well as good as any
     my $header = new Mail::Header ( [
       "From: $invoice_from",
       "To: ". $conf->config('deletepayments'),
@@ -405,7 +405,7 @@ sub unapplied {
 
 =head1 VERSION
 
-$Id: cust_pay.pm,v 1.18 2002-03-18 19:49:10 ivan Exp $
+$Id: cust_pay.pm,v 1.21 2002-06-04 14:35:52 ivan Exp $
 
 =head1 BUGS