X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FUpgrade.pm;h=eb2587b3492e319a5d1f969bef0a3fffa0ff3222;hp=2a480f872598443441ef2864bca5867360427746;hb=f4ee374e9bbb313234278c7231c046f8e07086f0;hpb=da9ab0af53220f6f1cb0e4d31ce7de81dd591783

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 2a480f872..eb2587b34 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -203,8 +203,9 @@ sub upgrade_overlimit_groups {
 sub upgrade_invoice_from {
   my ($conf, $agentnum, $agentonly) = @_;
   if (
-      (!$conf->exists('invoice_from_name',$agentnum,$agentonly)) && 
-      ($conf->config('invoice_from',$agentnum,$agentonly) =~ /\<(.*)\>/)
+          ! $conf->exists('invoice_from_name',$agentnum,$agentonly)
+       && $conf->exists('invoice_from',$agentnum,$agentonly)
+       && $conf->config('invoice_from',$agentnum,$agentonly) =~ /\<(.*)\>/
   ) {
     my $realemail = $1;
     $realemail =~ s/^\s*//; # remove leading spaces