X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fmisc%2Fprint-invoice.cgi;h=511bdce19168cf3a7a76bfe779afff8d04acf6ba;hb=7ba67eedde17e00f1a8e753790d3386a81cc759a;hp=8c1240c055a8d629543b3c5c717cfc76bb478c8c;hpb=23ec9b00410224868d6be1e47a0d72a6c8b3f6f5;p=freeside.git

diff --git a/httemplate/misc/print-invoice.cgi b/httemplate/misc/print-invoice.cgi
index 8c1240c05..511bdce19 100755
--- a/httemplate/misc/print-invoice.cgi
+++ b/httemplate/misc/print-invoice.cgi
@@ -1,30 +1,18 @@
-<%
+%
+%
+%#untaint invnum
+%my($query) = $cgi->keywords;
+%$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;
+%
+%$cust_bill->print($template);
+%
+%my $custnum = $cust_bill->getfield('custnum');
+%
+%print $cgi->redirect("${p}view/cust_main.cgi?$custnum");
+%
+%
 
-my $conf = new FS::Conf;
-my $lpr = $conf->config('lpr');
-
-#untaint invnum
-my($query) = $cgi->keywords;
-$query =~ /^(\d*)$/;
-my $invnum = $1;
-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') ) {
-          $cust_bill->print_ps;
-          #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";
-
-my $custnum = $cust_bill->getfield('custnum');
-
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum#history");
-
-%>