===================================================================
RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v
retrieving revision 1.18
retrieving revision 1.21
diff -u -r1.18 -r1.21
--- RT/Invoicing/rt_invoices.pl	2011/03/22 05:55:27	1.18
+++ RT/Invoicing/rt_invoices.pl	2011/03/24 21:03:49	1.21
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $AFresh1$
+# $AFresh1: rt_invoices.pl,v 1.20 2011/03/23 23:05:47 andrew Exp $
 ########################################################################
 # Copyright (c) 2011 Andrew Fresh <andrew@afresh1.com>
 #
@@ -172,9 +172,13 @@
     next unless $invoice->{total} > 0 || $invoice->{total_due};
 
     $invoice->{info} = $config->get('info');
-    $invoice->{from} = make_address( $config->get('from') );
-    $invoice->{to}   = make_address( $cust->{address} || $custid );
+    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}++;
     $invoice->{id} = $state->{lastinvoice};
     $invoice->{file} = sprintf 'invoice_%06d.pdf', $state->{lastinvoice};
@@ -206,8 +210,10 @@
     File::Path::make_path($invoice_dir);
     my $file = join '/', $invoice_dir, $invoice->{file};
 
-    my $tt = Template->new;
-    $tt->process( 'invoice.tex.tt', $invoice, $file )
+    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";
 
     printf "Generated %s for %s: \$%.02f\n", $invoice->{file}, $custid,
@@ -309,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;
 
@@ -323,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 );
 
@@ -399,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 );
 
@@ -626,6 +633,12 @@
         }
         when ('invoice_dir') {
             $value = dirname( $self->{file} ) . '/invoices';
+        }
+        when ('template_dir') {
+            $value = dirname( $self->{file} );
+        }
+        when ('invoice_template') {
+            $value = 'invoice.tex.tt';
         }
     }