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

diff --combined FS/FS/Conf.pm
index 802794c,927f2c3..029f1a1
--- 1/FS/FS/Conf.pm
--- 2/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@@ -593,6 -593,21 +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
@@@ -958,7 -973,7 +973,7 @@@ sub reason_type_options 
    {
      'key'         => 'business-onlinepayment',
      'section'     => 'billing',
 -    'description' => '<a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a> support, at least three lines: processor, login, and password.  An optional fourth line specifies the action or actions (multiple actions are separated with `,\': for example: `Authorization Only, Post Authorization\').    Optional additional lines are passed to Business::OnlinePayment as %processor_options.',
 +    'description' => '<a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a> support, at least three lines: processor, login, and password.  An optional fourth line specifies the action or actions (multiple actions are separated with `,\': for example: `Authorization Only, Post Authorization\').    Optional additional lines are passed to Business::OnlinePayment as %processor_options.  For more detailed information and examples see the <a href="http://www.freeside.biz/mediawiki/index.php/Freeside:3:Documentation:Administration:Real-time_Processing">real-time credit card processing documentation</a>.',
      'type'        => 'textarea',
    },