X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=b7fb1cd26c42f2ba0df141ac3f0614e400c303eb;hp=688ee10e8620ed2ea305f3ad0a5dd4c771efdd6a;hb=46ca67d352957406bedb44680a9266e20f3cfd2c;hpb=7fe9f776655a9a7fc3b93b4f0e06c8b8193834b6

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 688ee10e8..b7fb1cd26 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -592,6 +592,21 @@ sub config_items {
   ( @config_items, $self->_orbase_items(@_) );
 }
 
+=item invoice_from_full [ AGENTNUM ]
+
+Returns values of invoice_from and invoice_from_name, appropriately combined
+based on their current values.
+
+=cut
+
+sub invoice_from_full {
+  my ($self, $agentnum) = @_;
+  return $self->config('invoice_from_name', $agentnum ) ?
+         $self->config('invoice_from_name', $agentnum ) . ' <' .
+         $self->config('invoice_from', $agentnum ) . '>' :
+         $self->config('invoice_from', $agentnum );
+}
+
 =back
 
 =head1 SUBROUTINES