X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Femail-invoice.cgi;h=34afa90841695d749b7d9e40fcf7a9ead1c7f4e3;hb=f1242ee84dba33d2e58e86ad329f8e3d519c153d;hp=a560a18384b36a239c881b4c9659ccb0696b4c90;hpb=1cd72a6f1bd5ca39410f525779f5ca4ee9228a1c;p=freeside.git

diff --git a/httemplate/misc/email-invoice.cgi b/httemplate/misc/email-invoice.cgi
index a560a1838..34afa9084 100755
--- a/httemplate/misc/email-invoice.cgi
+++ b/httemplate/misc/email-invoice.cgi
@@ -4,16 +4,18 @@ my $conf = new FS::Conf;
 
 #untaint invnum
 my($query) = $cgi->keywords;
-$query =~ /^(\d*)$/;
-my $invnum = $1;
+$query =~ /^((.+)-)?(\d+)$/;
+my $template = $2;
+my $invnum = $3;
 my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Can't find invoice!\n" unless $cust_bill;
 
 my $error = send_email(
-  'from'    => $cust_bill->_agent_invoice_from || $conf->config('invoice_from'),
-  'to'      => [ grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ],
-  'subject' => 'Invoice',
-  'body'    => [ $cust_bill->print_text ],
+  $cust_bill->generate_email(
+    'from'     => 
+      ( $cust_bill->_agent_invoice_from || $conf->config('invoice_from') ),
+    'template' => $template,
+  )
 );
 eidiot($error) if $error;