X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fprint-invoice.cgi;h=6a4c2d7f14d2cb832df3c9178406f27f0e40c19f;hb=cf8f8aafc5595b31f24a7b0d06289c830d123cb8;hp=144f6156a541868dfcaaa0ee6ef0a64f2b173889;hpb=eb9668a6f3181ee02cb335272c5ee4616e61fd09;p=freeside.git

diff --git a/httemplate/misc/print-invoice.cgi b/httemplate/misc/print-invoice.cgi
index 144f6156a..6a4c2d7f1 100755
--- a/httemplate/misc/print-invoice.cgi
+++ b/httemplate/misc/print-invoice.cgi
@@ -1,26 +1,14 @@
 <%
 
-my $conf = new FS::Conf;
-my $lpr = $conf->config('lpr');
-
 #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;
 
-        open(LPR,"|$lpr") or die "Can't open $lpr: $!";
-
-        if ( $conf->exists('invoice_latex') ) {
-          print LPR $cust_bill->print_ps; #( date )
-        } else {
-          print LPR $cust_bill->print_text; #( date )
-        }
-
-        close LPR
-          or die $! ? "Error closing $lpr: $!"
-                       : "Exit status $? from $lpr";
+$cust_bill->print($template);
 
 my $custnum = $cust_bill->getfield('custnum');