===================================================================
RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- RT/Invoicing/rt_invoices.pl	2011/03/24 00:05:47	1.20
+++ RT/Invoicing/rt_invoices.pl	2011/03/24 21:03:49	1.21
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $AFresh1: rt_invoices.pl,v 1.19 2011/03/22 05:27:12 andrew Exp $
+# $AFresh1: rt_invoices.pl,v 1.20 2011/03/23 23:05:47 andrew Exp $
 ########################################################################
 # Copyright (c) 2011 Andrew Fresh <andrew@afresh1.com>
 #
@@ -176,8 +176,8 @@
     $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 );
+    $invoice->{from}         = make_address($from);
+    $invoice->{to}           = make_address( $cust->{address} || $custid );
 
     $state->{lastinvoice}++;
     $invoice->{id} = $state->{lastinvoice};
@@ -210,9 +210,8 @@
     File::Path::make_path($invoice_dir);
     my $file = join '/', $invoice_dir, $invoice->{file};
 
-    my $tt = Template->new(
-        INCLUDE_PATH => $config->get('template_dir'),
-    )|| die $Template::ERROR, "\n";
+    my $tt = Template->new( INCLUDE_PATH => $config->get('template_dir'), )
+        || die $Template::ERROR, "\n";
 
     $tt->process( $config->get('invoice_template'), $invoice, $file )
         or die $tt->error . "\n";
@@ -316,7 +315,7 @@
 sub make_invoice {
     my ($cust) = @_;
 
-    my $day  = $cust->{day}       ||= 1;
+    my $day  = $cust->{day}       ||= 0;
     my $per  = $cust->{per}       ||= 'week';
     my $freq = $cust->{frequency} ||= 1;
 
@@ -330,7 +329,8 @@
     my $billends = DateTime->now->set( hour => 0, minute => 0, second => 0 );
 
     # XXX This is helpful, but monthly and billday > 28 == !!!
-    $billends->subtract( days => 1 ) while $billends->$day_method != $day;
+    $billends->subtract( days => 1 )
+        while $day && $billends->$day_method != $day;
 
     my $date = $billends->clone->subtract( $per => $freq );
 
@@ -406,7 +406,7 @@
         $date = $enddate->clone if $date > $enddate;
 
         # XXX This is helpful, but monthly and billday > 28 == !!!
-        $date->subtract( days => 1 ) while $date->$day_method != $day;
+        $date->subtract( days => 1 ) while $day && $date->$day_method != $day;
 
         my $end = $date->clone->subtract( seconds => 1 );