X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fcust_bill.cgi;h=116cd6dcc347f3a9441e90ffb0c17fb434981a4e;hb=e6b504f1d05efe176bb91c40cca089b41d2d2f49;hp=53d7bc0510d479d335a46cba3f8c603b584a219d;hpb=0ebeec96313dd7edfca340f01f8fbbbac1f4aa1d;p=freeside.git
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 53d7bc051..116cd6dcc 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,7 +21,20 @@ 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 '
';
+
+my $conf = new FS::Conf;
+if ( $conf->exists('invoice_latex') ) {
+ print menubar(
+ 'View typeset invoice' => "${p}view/cust_bill-pdf.cgi?$invnum.pdf",
+ ), '
';
+}
#false laziness with search/cust_bill_event.cgi
@@ -30,13 +44,27 @@ foreach my $cust_bill_event (
) {
my $status = $cust_bill_event->status;
$status .= ': '. $cust_bill_event->statustext if $cust_bill_event->statustext;
- print '
'; -print $cust_bill->print_text; +print $cust_bill->print_text('', $templatename); #formatting print <