===================================================================
RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RT/Invoicing/rt_invoices.pl	2011/03/22 01:46:41	1.12
+++ RT/Invoicing/rt_invoices.pl	2011/03/22 02:16:53	1.13
@@ -47,7 +47,7 @@
 my $customers = $config->get('customers');
 CUSTOMER: while ( my ( $custid, $cust ) = each %{$customers} ) {
 
-    my %invoice = ( end => DateTime->now, );
+    my $invoice = make_invoice();
 
     if ( $cust->{base_rate} ) {
         my $day  = $cust->{day}       || 1;
@@ -61,8 +61,7 @@
             default { die "Unknown per [$cust->{per}]\n" }
         }
 
-        my $billends
-            = DateTime->now->set( hour => 0, minute => 0, second => 0 );
+        my $billends = $invoice->{end}->clone;
         $billends->subtract( days => 1 ) while $billends->$day_method != $day;
 
         my $date = $billends->clone->subtract( $per => $freq );
@@ -97,15 +96,15 @@
             next if $end < $start;
 
             $startdate = $start->clone if !$startdate || $startdate > $start;
-            $invoice{start} ||= $start->clone;
-            $invoice{end} = $end->clone;
+            $invoice->{start} ||= $start->clone;
+            $invoice->{end} = $end->clone;
             my %hours = (
                 start => $start->clone,
                 end   => $end->clone,
                 hours => { %{ $cust->{hours} } },
             );
 
-            push @{ $invoice{hours} }, \%hours;
+            push @{ $invoice->{hours} }, \%hours;
             push @{ $project{fees} },
                 {
                 count    => 1,
@@ -116,12 +115,12 @@
         }
 
         if ( @{ $project{fees} } ) {
-            push @{ $invoice{projects} }, \%project;
+            push @{ $invoice->{projects} }, \%project;
         }
     }
 
     $cust->{address} ||= get_user($custid);
-    $cust->{invoice} = \%invoice;
+    $cust->{invoice} = $invoice;
 }
 
 my @limits = map +{
@@ -327,16 +326,21 @@
     my $cust = $config->get('default') || {};
     $cust->{address} = get_user($custid);
 
-    my %invoice = ( end => DateTime->now );
+    $cust->{match} = [{
+            type => 'requestors',
+            regex => $custid,
+    }];
 
+    my $invoice = make_invoice();
+
     my $lastinvoice = $state->last_invoice($custid);
     if ( $lastinvoice->{date} ) {
         my $last_invoice_date = ymd_to_DateTime( $lastinvoice->{date} );
-        $invoice{start} = $last_invoice_date->clone->add( days => 1 );
+            $invoice->{start} = $last_invoice_date->clone->add( days => 1 );
     }
 
-    if ( !( $invoice{start} && $invoice{start} < $invoice{end} ) ) {
-        $cust->{invoice} = \%invoice;
+    if ( !( $invoice->{start} && $invoice->{start} < $invoice->{end} ) ) {
+        $cust->{invoice} = $invoice;
     }
 
     $customers->{$custid} = $cust;
@@ -374,6 +378,15 @@
 
     $users{$id} = \%user;
     return \%user;
+}
+
+sub make_invoice {
+
+    my $billends
+            = DateTime->now->set( hour => 0, minute => 0, second => 0 );
+    my %invoice = ( end => $billends->clone->subtract( days => 1, seconds => 1 ) );
+
+    return \%invoice;
 }
 
 sub make_address {