X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=ca0612d09cd0adacc2697f44b2967bba1dbcc091;hb=34647c32b50ce3b8ee1b6d3d7aef4ba9d0297bdb;hp=3c23d60a8458c7739c0a28877e46903d503392ad;hpb=97c0616b60819a23dbc6d7d6ebf2ff1dc3446e91;p=freeside.git

diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 3c23d60a8..ca0612d09 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -4,7 +4,7 @@
 #untaint invnum
 my($query) = $cgi->keywords;
 $query =~ /^((.+)-)?(\d+)$/;
-my $templatename = $1;
+my $templatename = $2;
 my $invnum = $3;
 
 my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
@@ -31,40 +31,46 @@ print '<BR><BR>';
 
 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' => "${p}view/cust_bill-pdf.cgi?$invnum.pdf",
+    'View typeset invoice' => $link,
   ), '<BR><BR>';
 }
 
 #false laziness with search/cust_bill_event.cgi
 
-print table(). '<TR><TH>Event</TH><TH>Date</TH><TH>Status</TH></TR>';
-foreach my $cust_bill_event (
-  sort { $a->_date <=> $b->_date } $cust_bill->cust_bill_event
-) {
-  my $status = $cust_bill_event->status;
-  $status .= ': '. $cust_bill_event->statustext if $cust_bill_event->statustext;
-  my $part_bill_event = $cust_bill_event->part_bill_event;
-  print '<TR><TD>'. $part_bill_event->event;
-
-  if (
-    $part_bill_event->plan eq 'send_alternate'
-    && $part_bill_event->plandata =~ /^templatename (.*)$/m
+unless ( $templatename ) {
+  print table(). '<TR><TH>Event</TH><TH>Date</TH><TH>Status</TH></TR>';
+  foreach my $cust_bill_event (
+    sort { $a->_date <=> $b->_date } $cust_bill->cust_bill_event
   ) {
-    my $templatename = $1;
-    print qq! ( <A HREF="${p}view/cust_bill.cgi?$templatename-$invnum">!.
-          'view text</A> | '.
-          qq!<A HREF="${p}view/cust_bill-pdf.cgi?$templatename-$invnum.pdf">!.
-          'view typeset</A> )';
+    my $status = $cust_bill_event->status;
+    $status .= ': '. encode_entities($cust_bill_event->statustext)
+      if $cust_bill_event->statustext;
+    my $part_bill_event = $cust_bill_event->part_bill_event;
+    print '<TR><TD>'. $part_bill_event->event;
+  
+    if (
+      $part_bill_event->plan eq 'send_alternate'
+      && $part_bill_event->plandata =~ /^templatename (.*)$/m
+    ) {
+      my $templatename = $1;
+      print qq! ( <A HREF="${p}view/cust_bill.cgi?$templatename-$invnum">!.
+            'view text</A> | '.
+            qq!<A HREF="${p}view/cust_bill-pdf.cgi?$templatename-$invnum.pdf">!.
+            'view typeset</A> )';
+    }
+  
+    print '</TD><TD>'.
+          time2str("%a %b %e %T %Y", $cust_bill_event->_date). '</TD><TD>'.
+          $status. '</TD></TR>';
   }
-
-  print '</TD><TD>'.
-        time2str("%a %b %e %T %Y", $cust_bill_event->_date). '</TD><TD>'.
-        $status. '</TD></TR>';
+  print '</TABLE><BR>';
 }
-print '</TABLE><BR><PRE>';
 
-print $cust_bill->print_text('', $templatename);
+print '<PRE>', $cust_bill->print_text('', $templatename);
 
 	#formatting
 	print <<END;