projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
httemplate
/
misc
/
print-invoice.cgi
diff --git
a/httemplate/misc/print-invoice.cgi
b/httemplate/misc/print-invoice.cgi
index
a5500bf
..
aeef687
100755
(executable)
--- a/
httemplate/misc/print-invoice.cgi
+++ b/
httemplate/misc/print-invoice.cgi
@@
-1,23
+1,19
@@
-<%
+<% $cgi->redirect("${p}view/cust_main.cgi?$custnum") %>
+<%init>
-my $conf = new FS::Conf;
-
my $lpr = $conf->config('lpr
');
+die "access denied"
+
unless $FS::CurrentUser::CurrentUser->access_right('Resend invoices
');
#untaint invnum
my($query) = $cgi->keywords;
#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 $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: $!";
- 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');
my $custnum = $cust_bill->getfield('custnum');
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum#history");
-
-%>
+</%init>