make agent available to invoice templates, backport freeside-daily -p from HEAD

2 files changed, 14 insertions, 6 deletions

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 48b154d6e..980ec4e49 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1140,11 +1140,12 @@ sub print_text {
 
   #setup template variables
   package FS::cust_bill::_template; #!
-  use vars qw( $invnum $date $page $total_pages @address $overdue @buf );
+  use vars qw( $invnum $date $page $total_pages @address $overdue @buf $agent );
 
   $invnum = $self->invnum;
   $date = $self->_date;
   $page = 1;
+  $agent = $self->cust_main->agent->agent;
 
   if ( $FS::cust_bill::invoice_lines ) {
     $total_pages =
@@ -1212,7 +1213,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.41.2.17 2002-12-20 13:02:56 steve Exp $
+$Id: cust_bill.pm,v 1.41.2.18 2002-12-23 15:22:46 ivan Exp $
 
 =head1 BUGS
 
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 1db786120..c82dc07a0 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -11,16 +11,19 @@ use FS::cust_main;
 
 &untaint_argv;	#what it sounds like  (eww)
 use vars qw($opt_d $opt_v);
-getopts("d:v");
+getopts("p:d:v");
 my $user = shift or die &usage;
 
 adminsuidsetup $user;
 
 $FS::cust_main::Debug = 1 if $opt_v;
 
+my %search;
+$search{'payby'} = $opt_p if $opt_p;
+
 my @cust_main = @ARGV
-  ? map { qsearchs('cust_main', { custnum => $_ } ) } @ARGV
-  : qsearch('cust_main', {} )
+  ? map { qsearchs('cust_main', { custnum => $_, %search } ) } @ARGV
+  : qsearch('cust_main', \%search )
 ;
 
 #we're at now now (and later).
@@ -95,7 +98,7 @@ freeside-daily - Run daily billing and invoice collection events.
 
 =head1 SYNOPSIS
 
-  freeside-daily [ -d 'date' ] user [ custnum custnum ... ]
+  freeside-daily [ -d 'date' ] [ -p 'payby' ] [ -v ] user [ custnum custnum ... ]
 
 =head1 DESCRIPTION
 
@@ -110,6 +113,10 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
   -d: Pretend it's 'date'.  Date is in any format Date::Parse is happy with,
       but be careful.
 
+  -p: Only process customers with the specified payby (CARD, CHEK, BILL, COMP, LECB)
+
+  -v: enable debugging
+
 user: From the mapsecrets file - see config.html from the base documentation
 
 custnum: if one or more customer numbers are specified, only bills those