===================================================================
RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RT/Invoicing/rt_invoices.pl	2011/03/22 01:16:32	1.11
+++ RT/Invoicing/rt_invoices.pl	2011/03/22 01:46:41	1.12
@@ -37,7 +37,6 @@
     timeout => $rt_conf->{timeout},
 );
 my $tickets = RT::Client::REST::Ticket->new( rt => $rt );
-my $users = RT::Client::REST::User->new( rt => $rt );
 
 $rt->login( username => $rt_conf->{user}, password => $rt_conf->{pass} );
 
@@ -121,7 +120,7 @@
         }
     }
 
-    $cust->{from} ||= get_user($custid);
+    $cust->{address} ||= get_user($custid);
     $cust->{invoice} = \%invoice;
 }
 
@@ -160,6 +159,7 @@
         next;
     }
     if ( !$cust->{invoice} ) {
+
         #say "Customer has no open invoices for ticket " . $ticket->id;
         next;
     }
@@ -204,7 +204,7 @@
     my $invoice = $cust->{invoice};
     next unless $invoice->{projects} && @{ $invoice->{projects} };
 
-    my %li = ( custid => $custid, );
+    my %li = ( custid => $custid, invdate => DateTime->now->ymd, );
 
     foreach my $project ( @{ $invoice->{projects} } ) {
         if ( $project->{transactions} ) {
@@ -243,8 +243,8 @@
 
     # XXX Here we need to "make_address"
     $invoice->{info} = $config->get('info');
-    $invoice->{from} = $config->get('from');
-    $invoice->{to}   = $cust->{address};
+    $invoice->{from} = make_address( $config->get('from') );
+    $invoice->{to}   = make_address( $cust->{address} );
 
     $state->{lastinvoice}++;
     $invoice->{id}   = $state->{lastinvoice};
@@ -256,7 +256,7 @@
         if    ( $invoice->{$k} ) { $v = $invoice->{$k} }
         elsif ( $cust->{$k} )    { $v = $cust->{$k} }
 
-        if (defined $v && length $v) {
+        if ( defined $v && length $v ) {
             if ( ref $v eq 'DateTime' ) {
                 $li{$k} = $v->ymd;
             }
@@ -325,7 +325,7 @@
     return unless $custid;
 
     my $cust = $config->get('default') || {};
-    $cust->{to} = get_user($custid);
+    $cust->{address} = get_user($custid);
 
     my %invoice = ( end => DateTime->now );
 
@@ -357,7 +357,7 @@
         name          => 'username',
     );
 
-    $users->id($id);
+    my $users = RT::Client::REST::User->new( rt => $rt, id => $id );
     $users->retrieve;
 
     my %user;
@@ -374,6 +374,35 @@
 
     $users{$id} = \%user;
     return \%user;
+}
+
+sub make_address {
+    my ($addr) = @_;
+    my @adr;
+
+    if ( $addr->{organization} ) {
+        push @adr, $addr->{organization};
+    }
+    elsif ( $addr->{name} && !$addr->{attn} ) {
+        push @adr, $addr->{name};
+    }
+
+    if (   ( $addr->{addr1} || $addr->{addr2} )
+        && $addr->{city}
+        && $addr->{state}
+        && $addr->{zip} )
+    {
+        push @adr, $addr->{attn}  if $addr->{attn};
+        push @adr, $addr->{addr1} if $addr->{addr1};
+        push @adr, $addr->{addr2} if $addr->{addr2};
+        push @adr,
+            $addr->{city} . ', ' . $addr->{state} . '  ' . $addr->{zip};
+    }
+    else {
+        push @adr, $addr->{email} if $addr->{email};
+    }
+
+    return join "\n\n", @adr;
 }
 
 sub make_project {