===================================================================
RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- RT/Invoicing/rt_invoices.pl	2011/03/22 05:55:27	1.18
+++ RT/Invoicing/rt_invoices.pl	2011/03/22 06:27:12	1.19
@@ -172,7 +172,11 @@
     next unless $invoice->{total} > 0 || $invoice->{total_due};
 
     $invoice->{info} = $config->get('info');
-    $invoice->{from} = make_address( $config->get('from') );
+    my $from = $config->get('from');
+    $from = get_user($from) if !ref $from;
+
+    $invoice->{organization} = $from->{organization} || $from->{name};
+    $invoice->{from} = make_address( $from );
     $invoice->{to}   = make_address( $cust->{address} || $custid );
 
     $state->{lastinvoice}++;