X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=927f2c38c66943b80b60644c13dd933dee513c6b;hb=8f695e657e4f97cbf9ebbf99c3c2dd24bb9aea2f;hp=239e304ddf2af9a0a2be324c5fbda0fd561cd6c9;hpb=fbdaf36fb33a44a453e23bc2dc8d18637b40dae9;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 239e304dd..927f2c38c 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -593,6 +593,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