X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=ca0612d09cd0adacc2697f44b2967bba1dbcc091;hb=34647c32b50ce3b8ee1b6d3d7aef4ba9d0297bdb;hp=4e0c4383beaa6e75d693d722dcd43c80746634e6;hpb=0fd894c50eaa84169115ccbb682a53f5148a8c9c;p=freeside.git
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 4e0c4383b..ca0612d09 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -3,8 +3,9 @@
#untaint invnum
my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $invnum = $1;
+$query =~ /^((.+)-)?(\d+)$/;
+my $templatename = $2;
+my $invnum = $3;
my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
die "Invoice #$invnum not found!" unless $cust_bill;
@@ -20,27 +21,56 @@ print header('Invoice View', menubar(
print qq!Enter payments (check/cash) against this invoice | !
if $cust_bill->owed > 0;
-print qq!Reprint this invoice!. '
';
+print qq!Reprint this invoice!;
+if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) {
+ print qq! | !.
+ qq!Re-email this invoice!;
+}
+
+print '
';
-print menubar(
- 'View typeset invoice' => "${p}view/cust_bill-pdf.cgi?$invnum",
-), '
';
+my $conf = new FS::Conf;
+if ( $conf->exists('invoice_latex') ) {
+ my $link = "${p}view/cust_bill-pdf.cgi?";
+ $link .= "$templatename-" if $templatename;
+ $link .= "$invnum.pdf";
+ print menubar(
+ 'View typeset invoice' => $link,
+ ), '
';
+}
#false laziness with search/cust_bill_event.cgi
-print table(). '
'; -print $cust_bill->print_text; +print '', $cust_bill->print_text('', $templatename); #formatting print <