===================================================================
RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RT/Invoicing/rt_invoices.pl	2011/03/22 00:22:27	1.8
+++ RT/Invoicing/rt_invoices.pl	2011/03/22 01:01:53	1.9
@@ -105,6 +105,7 @@
         }
     }
 
+    $cust->{from} ||= get_user($custid);
     $cust->{invoice} = \%invoice;
 }
 
@@ -180,7 +181,6 @@
         }
     }
 
-    print " Added ticket $project->{id}\n";
     push @{ $invoice->{projects} }, $project;
 }
 
@@ -191,14 +191,12 @@
     my %li = ( custid => $custid, );
 
     foreach my $project ( @{ $invoice->{projects} } ) {
-        print "$project->{title}\n";
         if ( $project->{transactions} ) {
             push @{ $li{transactions} }, @{ $project->{transactions} };
         }
         my $subtotal = 0;
         foreach my $fee ( @{ $project->{fees} } ) {
             my $amount = round( $fee->{count} * $fee->{rate} );
-            print "  $amount (" . ( $fee->{count} * $fee->{rate} ) . ")\n";
             $subtotal += $amount;
         }
         foreach my $expense ( @{ $project->{expenses} } ) {
@@ -206,7 +204,6 @@
         }
         $project->{total} = $subtotal;
         $invoice->{total} += $subtotal;
-        print " Subtotal $subtotal\n";
     }
 
     if ( $invoice->{discount} ) {
@@ -226,6 +223,8 @@
         $invoice->{total_due} = $invoice->{total} + $invoice->{past_due};
     }
 
+    next unless $invoice->{total} > 0 || $invoice->{total_due};
+
     # XXX Here we need to "make_address"
     $invoice->{info} = $config->get('info');
     $invoice->{from} = $config->get('from');
@@ -235,32 +234,27 @@
     $invoice->{id}   = $state->{lastinvoice};
     $invoice->{file} = 'invoice_' . $state->{lastinvoice} . '.pdf';
 
-    foreach my $k (qw/ transactions /) {
-        if    ( $invoice->{$k} ) { $li{$k} = $invoice->{$k} }
-        elsif ( $cust->{$k} )    { $li{$k} = $cust->{$k} }
-    }
-
-    $state->{invoice}->{ $invoice->{end}->ymd }{ $state->{lastinvoice} }
-        = \%li;
-
-    print "Created Invoice\n";
-    print Dump $cust;
-
     foreach my $key (qw/ start end /) {
         if ( exists $invoice->{$key} ) {
             $invoice->{$key} = $invoice->{$key}->strftime('%B %d, %Y');
         }
     }
 
+    foreach my $k (qw/ transactions start end total past_due total_due /) {
+        if    ( $invoice->{$k} ) { $li{$k} = $invoice->{$k} }
+        elsif ( $cust->{$k} )    { $li{$k} = $cust->{$k} }
+    }
+
+    $state->{invoice}->{ $invoice->{end} }{ $invoice->{id} } = \%li;
+
     my $tt = Template->new;
     $tt->process( 'invoice.tex.tt', $invoice, $invoice->{file} )
         or die $tt->error . "\n";
 
-    print "Generated $invoice->{file}\n";
+    printf "Generated %s for %s: \$%.02f\n", $invoice->{file}, $custid,
+        $invoice->{total};
 }
 
-# XXX Save State
-print Dump $state;
 $state->save;
 
 sub round {
@@ -306,7 +300,7 @@
     return unless $custid;
 
     my $cust = $config->get('default') || {};
-    $cust->{to} = get_requestor($custid);
+    $cust->{to} = get_user($custid);
 
     my %invoice = ( end => DateTime->now );
 
@@ -324,22 +318,24 @@
     return $cust;
 }
 
-sub get_requestor {
+sub get_user {
     my ($id) = @_;
 
-    state %requestors;
-    return $requestors{$id} if $requestors{$id};
+    state %users;
+    return $users{$id} if $users{$id};
 
     my %map = (
         address_one   => 'addr1',
         address_two   => 'addr2',
         email_address => 'email',
+        real_name     => 'name',
+        name          => 'username',
     );
 
     $users->id($id);
     $users->retrieve;
 
-    my %requestor;
+    my %user;
     foreach my $m ( keys %{ $users->_attributes } ) {
         next unless $users->can($m);
 
@@ -348,11 +344,11 @@
 
         $m = $map{$m} if exists $map{$m};
 
-        $requestor{$m} = $v;
+        $user{$m} = $v;
     }
 
-    $requestors{$id} = \%requestor;
-    return \%requestor;
+    $users{$id} = \%user;
+    return \%user;
 }
 
 sub make_project {