Will things ever be the same again?

It's the final masonize

22 files changed, 2237 insertions, 2169 deletions

diff --git a/httemplate/view/cust_bill-logo.cgi b/httemplate/view/cust_bill-logo.cgi
index 235485f6b..fd6a81a75 100755
--- a/httemplate/view/cust_bill-logo.cgi
+++ b/httemplate/view/cust_bill-logo.cgi
@@ -1,15 +1,16 @@
-<%
-
-my $conf = new FS::Conf;
-
-my($query) = $cgi->keywords;
-$query =~ /^([^\.\/]*)$/;
-my $templatename = $1;
-if ( $templatename && $conf->exists("logo_$templatename.png") ) {
-  $templatename = "_$templatename";
-} else {
-  $templatename = '';
-}
-
-http_header('Content-Type' => 'image/png' );
-%><%= $conf->config_binary("logo$templatename.png") %>
+%
+%
+%my $conf = new FS::Conf;
+%
+%my($query) = $cgi->keywords;
+%$query =~ /^([^\.\/]*)$/;
+%my $templatename = $1;
+%if ( $templatename && $conf->exists("logo_$templatename.png") ) {
+%  $templatename = "_$templatename";
+%} else {
+%  $templatename = '';
+%}
+%
+%http_header('Content-Type' => 'image/png' );
+%
+<% $conf->config_binary("logo$templatename.png") %>
diff --git a/httemplate/view/cust_bill-pdf.cgi b/httemplate/view/cust_bill-pdf.cgi
index ce7ab0c5c..06bb965eb 100755
--- a/httemplate/view/cust_bill-pdf.cgi
+++ b/httemplate/view/cust_bill-pdf.cgi
@@ -1,17 +1,18 @@
-<%
-
-#untaint invnum
-my($query) = $cgi->keywords;
-$query =~ /^((.+)-)?(\d+)(.pdf)?$/;
-my $templatename = $2;
-my $invnum = $3;
-
-my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
-die "Invoice #$invnum not found!" unless $cust_bill;
-
-my $pdf = $cust_bill->print_pdf( '', $templatename);
-
-http_header('Content-Type' => 'application/pdf' );
-http_header('Content-Length' => length($pdf) );
-http_header('Cache-control' => 'max-age=60' );
-%><%= $pdf %>
+%
+%
+%#untaint invnum
+%my($query) = $cgi->keywords;
+%$query =~ /^((.+)-)?(\d+)(.pdf)?$/;
+%my $templatename = $2;
+%my $invnum = $3;
+%
+%my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
+%die "Invoice #$invnum not found!" unless $cust_bill;
+%
+%my $pdf = $cust_bill->print_pdf( '', $templatename);
+%
+%http_header('Content-Type' => 'application/pdf' );
+%http_header('Content-Length' => length($pdf) );
+%http_header('Cache-control' => 'max-age=60' );
+%
+<% $pdf %>
diff --git a/httemplate/view/cust_bill-ps.cgi b/httemplate/view/cust_bill-ps.cgi
index e730a822a..f838e1b17 100755
--- a/httemplate/view/cust_bill-ps.cgi
+++ b/httemplate/view/cust_bill-ps.cgi
@@ -1,13 +1,14 @@
-<%
-
-#untaint invnum
-my($query) = $cgi->keywords;
-$query =~ /^((.+)-)?(\d+)$/;
-my $templatename = $2;
-my $invnum = $3;
-
-my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
-die "Invoice #$invnum not found!" unless $cust_bill;
-
-http_header('Content-Type' => 'application/postscript' );
-%><%= $cust_bill->print_ps( '', $templatename) %>
+%
+%
+%#untaint invnum
+%my($query) = $cgi->keywords;
+%$query =~ /^((.+)-)?(\d+)$/;
+%my $templatename = $2;
+%my $invnum = $3;
+%
+%my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
+%die "Invoice #$invnum not found!" unless $cust_bill;
+%
+%http_header('Content-Type' => 'application/postscript' );
+%
+<% $cust_bill->print_ps( '', $templatename) %>
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 45e19d436..3772e8dd0 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,151 +1,155 @@
-<%
-
-#untaint invnum
-my($query) = $cgi->keywords;
-$query =~ /^((.+)-)?(\d+)$/;
-my $templatename = $2;
-my $invnum = $3;
-
-my $conf = new FS::Conf;
-
-my @payby =  grep /\w/, $conf->config('payby');
-#@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP ))
-@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP ))
-  unless @payby;
-my %payby = map { $_=>1 } @payby;
-
-my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
-die "Invoice #$invnum not found!" unless $cust_bill;
-my $custnum = $cust_bill->getfield('custnum');
-
-#my $printed = $cust_bill->printed;
-
-my $link = $templatename ? "$templatename-$invnum" : $invnum;
-
-%>
-<%= include("/elements/header.html",'Invoice View', menubar(
+%
+%
+%#untaint invnum
+%my($query) = $cgi->keywords;
+%$query =~ /^((.+)-)?(\d+)$/;
+%my $templatename = $2;
+%my $invnum = $3;
+%
+%my $conf = new FS::Conf;
+%
+%my @payby =  grep /\w/, $conf->config('payby');
+%#@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP ))
+%@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP ))
+%  unless @payby;
+%my %payby = map { $_=>1 } @payby;
+%
+%my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
+%die "Invoice #$invnum not found!" unless $cust_bill;
+%my $custnum = $cust_bill->getfield('custnum');
+%
+%#my $printed = $cust_bill->printed;
+%
+%my $link = $templatename ? "$templatename-$invnum" : $invnum;
+%
+%
+
+<% include("/elements/header.html",'Invoice View', menubar(
   "Main Menu" => $p,
   "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
 )) %>
+% if ( $cust_bill->owed > 0
+%        && ( $payby{'BILL'} || $payby{'CASH'} || $payby{'WEST'} || $payby{'MCRD'} )
+%      )
+%   {
+%     my $s = 0;
+%
 
-<% if ( $cust_bill->owed > 0
-        && ( $payby{'BILL'} || $payby{'CASH'} || $payby{'WEST'} || $payby{'MCRD'} )
-      )
-   {
-     my $s = 0;
-%>
 
   Post 
+% if ( $payby{'BILL'} ) { 
 
-  <% if ( $payby{'BILL'} ) { %>
-  
-    <%= $s++ ? ' | ' : '' %>
-    <A HREF="<%= $p %>edit/cust_pay.cgi?payby=BILL;invnum=<%= $invnum %>">check</A>
-  
-  <% } %>
-  
-  <% if ( $payby{'CASH'} ) { %>
-  
-    <%= $s++ ? ' | ' : '' %>
-    <A HREF="<%= $p %>edit/cust_pay.cgi?payby=CASH;invnum=<%= $invnum %>">cash</A>
-  
-  <% } %>
-  
-  <% if ( $payby{'WEST'} ) { %>
   
-    <%= $s++ ? ' | ' : '' %>
-    <A HREF="<%= $p %>edit/cust_pay.cgi?payby=WEST;invnum=<%= $invnum %>">Western Union</A>
+    <% $s++ ? ' | ' : '' %>
+    <A HREF="<% $p %>edit/cust_pay.cgi?payby=BILL;invnum=<% $invnum %>">check</A>
+% } 
+% if ( $payby{'CASH'} ) { 
+
   
-  <% } %>
+    <% $s++ ? ' | ' : '' %>
+    <A HREF="<% $p %>edit/cust_pay.cgi?payby=CASH;invnum=<% $invnum %>">cash</A>
+% } 
+% if ( $payby{'WEST'} ) { 
 
-  <% if ( $payby{'MCRD'} ) { %>
   
-    <%= $s++ ? ' | ' : '' %>
-    <A HREF="<%= $p %>edit/cust_pay.cgi?payby=MCRD;invnum=<%= $invnum %>">manual credit card</A>
+    <% $s++ ? ' | ' : '' %>
+    <A HREF="<% $p %>edit/cust_pay.cgi?payby=WEST;invnum=<% $invnum %>">Western Union</A>
+% } 
+% if ( $payby{'MCRD'} ) { 
+
   
-  <% } %>
+    <% $s++ ? ' | ' : '' %>
+    <A HREF="<% $p %>edit/cust_pay.cgi?payby=MCRD;invnum=<% $invnum %>">manual credit card</A>
+% } 
+
 
   payment against this invoice<BR>
+% } 
 
-<% } %>
 
-<A HREF="<%= $p %>misc/print-invoice.cgi?<%= $link %>">Re-print this invoice</A>
+<A HREF="<% $p %>misc/print-invoice.cgi?<% $link %>">Re-print this invoice</A>
+% if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) { 
 
-<% if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) { %>
-  | <A HREF="<%= $p %>misc/email-invoice.cgi?<%= $link %>">Re-email
+  | <A HREF="<% $p %>misc/email-invoice.cgi?<% $link %>">Re-email
       this invoice</A>
-<% } %>
+% } 
+% if ( $conf->exists('hylafax') && length($cust_bill->cust_main->fax) ) { 
 
-<% if ( $conf->exists('hylafax') && length($cust_bill->cust_main->fax) ) { %>
-  | <A HREF="<%= $p %>misc/fax-invoice.cgi?<%= $link %>">Re-fax
+  | <A HREF="<% $p %>misc/fax-invoice.cgi?<% $link %>">Re-fax
       this invoice</A>
-<% } %>
+% } 
+
 
 <BR><BR>
+% if ( $conf->exists('invoice_latex') ) { 
 
-<% if ( $conf->exists('invoice_latex') ) { %>
-  <A HREF="<%= $p %>view/cust_bill-pdf.cgi?<%= $link %>.pdf">View typeset invoice</A>
+  <A HREF="<% $p %>view/cust_bill-pdf.cgi?<% $link %>.pdf">View typeset invoice</A>
   <BR><BR>
-<% } %>
+% } 
+% #false laziness with search/cust_bill_event.cgi
+%   unless ( $templatename ) { 
 
-<% #false laziness with search/cust_bill_event.cgi
-   unless ( $templatename ) { %>
 
-  <%= table() %>
+  <% 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 .= ': '. encode_entities($cust_bill_event->statustext)
+%      if $cust_bill_event->statustext;
+%    my $part_bill_event = $cust_bill_event->part_bill_event;
+%  
 
-  <% foreach my $cust_bill_event (
-       sort { $a->_date <=> $b->_date } $cust_bill->cust_bill_event
-     ) {
-
-    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;
-  %>
     <TR>
-      <TD><%= $part_bill_event->event %>
-  
-        <% if ( $part_bill_event->templatename ) {
-          my $alt_templatename = $part_bill_event->templatename;
-          my $alt_link = "$alt_templatename-$invnum";
-        %>
-          ( <A HREF="<%= $p %>view/cust_bill.cgi?<%= $alt_link %>">view</A>
-          | <A HREF="<%= $p %>view/cust_bill-pdf.cgi?<%= $alt_link %>.pdf">view
+      <TD><% $part_bill_event->event %>
+% if ( $part_bill_event->templatename ) {
+%          my $alt_templatename = $part_bill_event->templatename;
+%          my $alt_link = "$alt_templatename-$invnum";
+%        
+
+          ( <A HREF="<% $p %>view/cust_bill.cgi?<% $alt_link %>">view</A>
+          | <A HREF="<% $p %>view/cust_bill-pdf.cgi?<% $alt_link %>.pdf">view
               typeset</A>
-          | <A HREF="<%= $p %>misc/print-invoice.cgi?<%= $alt_link %>">re-print</A>
-          <% if ( grep { $_ ne 'POST' }
-                       $cust_bill->cust_main->invoicing_list ) { %>
-            | <A HREF="<%= $p %>misc/email-invoice.cgi?<%= $alt_link %>">re-email</A>
-          <% } %>
-                       
-          <% if ( $conf->exists('hylafax')
-                  && length($cust_bill->cust_main->fax) ) { %>
-            | <A HREF="<%= $p %>misc/fax-invoice.cgi?<%= $alt_link %>">re-fax</A>
-          <% } %>
+          | <A HREF="<% $p %>misc/print-invoice.cgi?<% $alt_link %>">re-print</A>
+% if ( grep { $_ ne 'POST' }
+%                       $cust_bill->cust_main->invoicing_list ) { 
+
+            | <A HREF="<% $p %>misc/email-invoice.cgi?<% $alt_link %>">re-email</A>
+% } 
+% if ( $conf->exists('hylafax')
+%                  && length($cust_bill->cust_main->fax) ) { 
+
+            | <A HREF="<% $p %>misc/fax-invoice.cgi?<% $alt_link %>">re-fax</A>
+% } 
+
 
           )
-        <% } %>
+% } 
+
   
       </TD>
-      <TD><%= time2str("%a %b %e %T %Y", $cust_bill_event->_date) %></TD>
-      <TD><%= $status %></TD>
+      <TD><% time2str("%a %b %e %T %Y", $cust_bill_event->_date) %></TD>
+      <TD><% $status %></TD>
     </TR>
-  <% } %>
+% } 
+
 
   </TABLE>
   <BR>
+% } 
+% if ( $conf->exists('invoice_html') ) { 
+
+  <% join('', $cust_bill->print_html('', $templatename) ) %>
+% } else { 
 
-<% } %>
+  <PRE><% join('', $cust_bill->print_text('', $templatename) ) %></PRE>
+% } 
 
-<% if ( $conf->exists('invoice_html') ) { %>
-  <%= join('', $cust_bill->print_html('', $templatename) ) %>
-<% } else { %>
-  <PRE><%= join('', $cust_bill->print_text('', $templatename) ) %></PRE>
-<% } %>
 
 </BODY></HTML>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 8267fea51..e82a5196c 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,23 +1,25 @@
-<%
+%
+%
+%my $conf = new FS::Conf;
+%
+%my $curuser = $FS::CurrentUser::CurrentUser;
+%
+%die "No customer specified (bad URL)!" unless $cgi->keywords;
+%my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
+%$query =~ /^(\d+)$/;
+%my $custnum = $1;
+%my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
+%die "Customer not found!" unless $cust_main;
+%
+%
 
-my $conf = new FS::Conf;
 
-my $curuser = $FS::CurrentUser::CurrentUser;
+<% include("/elements/header.html","Customer View: ". $cust_main->name ) %>
+% if ( $curuser->access_right('Edit customer') ) { 
 
-die "No customer specified (bad URL)!" unless $cgi->keywords;
-my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
-$query =~ /^(\d+)$/;
-my $custnum = $1;
-my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
-die "Customer not found!" unless $cust_main;
+  <A HREF="<% $p %>edit/cust_main.cgi?<% $custnum %>">Edit this customer</A> | 
+% } 
 
-%>
-
-<%= include("/elements/header.html","Customer View: ". $cust_main->name ) %>
-
-<% if ( $curuser->access_right('Edit customer') ) { %>
-  <A HREF="<%= $p %>edit/cust_main.cgi?<%= $custnum %>">Edit this customer</A> | 
-<% } %>
 
 
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
@@ -33,96 +35,100 @@ function areyousure(href, message) {
 </SCRIPT>
 
 <SCRIPT TYPE="text/javascript">
-
-<%
-my $ban = '';
-if ( $cust_main->payby =~ /^(CARD|DCRD|CHEK|DCHK)$/ ) {
-  $ban = '<BR><P ALIGN="center">'.
-         '<INPUT TYPE="checkbox" NAME="ban" VALUE="1"> Ban this customer\\\'s ';
-  if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) {
-    $ban .= 'credit card';
-  } elsif (  $cust_main->payby =~ /^(CHEK|DCHK)$/ ) {
-    $ban .= 'ACH account';
-  }
-}
-%>
-
-var confirm_cancel = '<FORM METHOD="POST" ACTION="<%= $p %>misc/cust_main-cancel.cgi"> <INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $custnum %>"> <BR><P ALIGN="center"><B>Permanently delete all services and cancel this customer?</B> <%= $ban%><BR><P ALIGN="CENTER"> <INPUT TYPE="submit" VALUE="Cancel customer">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="BUTTON" VALUE="Don\'t cancel" onClick="cClick()"> </FORM> ';
+%
+%my $ban = '';
+%if ( $cust_main->payby =~ /^(CARD|DCRD|CHEK|DCHK)$/ ) {
+%  $ban = '<BR><P ALIGN="center">'.
+%         '<INPUT TYPE="checkbox" NAME="ban" VALUE="1"> Ban this customer\\\'s ';
+%  if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) {
+%    $ban .= 'credit card';
+%  } elsif (  $cust_main->payby =~ /^(CHEK|DCHK)$/ ) {
+%    $ban .= 'ACH account';
+%  }
+%}
+%
+
+
+var confirm_cancel = '<FORM METHOD="POST" ACTION="<% $p %>misc/cust_main-cancel.cgi"> <INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>"> <BR><P ALIGN="center"><B>Permanently delete all services and cancel this customer?</B> <% $ban%><BR><P ALIGN="CENTER"> <INPUT TYPE="submit" VALUE="Cancel customer">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="BUTTON" VALUE="Don\'t cancel" onClick="cClick()"> </FORM> ';
 
 </SCRIPT>
+% if ( $curuser->access_right('Cancel customer')
+%        && $cust_main->ncancelled_pkgs
+%      ) {
+%
 
-<% if ( $curuser->access_right('Cancel customer')
-        && $cust_main->ncancelled_pkgs
-      ) {
-%>
   <A HREF="javascript:void(0);" onClick="overlib(confirm_cancel, CAPTION, 'Confirm cancellation', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, 576, HEIGHT, 128, TEXTSIZE, 3, BGCOLOR, '#ff0000', CGCOLOR, '#ff0000' ); return false; ">Cancel this customer</A> | 
-<% } %>
-
+% } 
+% if ( $conf->exists('deletecustomers')
+%        && $curuser->access_right('Delete customer')
+%      ) {
+%
 
-<% if ( $conf->exists('deletecustomers')
-        && $curuser->access_right('Delete customer')
-      ) {
-%>
-  <A HREF="<%= $p %>misc/delete-customer.cgi?<%= $custnum%>">Delete this customer</A> | 
-<% } %>
+  <A HREF="<% $p %>misc/delete-customer.cgi?<% $custnum%>">Delete this customer</A> | 
+% } 
+% unless ( $conf->exists('disable_customer_referrals') ) { 
 
+  <A HREF="<% popurl(2) %>edit/cust_main.cgi?referral_custnum=<% $custnum %>">Refer a new customer</A> | 
+  <A HREF="<% popurl(2) %>search/cust_main.cgi?referral_custnum=<% $custnum %>">View this customer's referrals</A>
+% } 
 
-<% unless ( $conf->exists('disable_customer_referrals') ) { %>
-  <A HREF="<%= popurl(2) %>edit/cust_main.cgi?referral_custnum=<%= $custnum %>">Refer a new customer</A> | 
-  <A HREF="<%= popurl(2) %>search/cust_main.cgi?referral_custnum=<%= $custnum %>">View this customer's referrals</A>
-<% } %>
 
 
 <BR><BR>
+%
+%my $signupurl = $conf->config('signupurl');
+%if ( $signupurl ) {
+%
+
+  This customer's signup URL: <A HREF="<% $signupurl %>?ref=<% $custnum %>"><% $signupurl %>?ref=<% $custnum %></A><BR><BR>
+% } 
 
-<%
-my $signupurl = $conf->config('signupurl');
-if ( $signupurl ) {
-%>
-  This customer's signup URL: <A HREF="<%= $signupurl %>?ref=<%= $custnum %>"><%= $signupurl %>?ref=<%= $custnum %></A><BR><BR>
-<% } %>
 
 <A NAME="cust_main"></A>
 <TABLE BORDER=0>
 <TR>
   <TD VALIGN="top">
-    <%= include('cust_main/contacts.html', $cust_main ) %>
+    <% include('cust_main/contacts.html', $cust_main ) %>
   </TD>
   <TD VALIGN="top" STYLE="padding-left: 54px">
-    <%= include('cust_main/misc.html', $cust_main ) %>
-    <% if ( $conf->config('payby-default') ne 'HIDE' ) { %>
+    <% include('cust_main/misc.html', $cust_main ) %>
+% if ( $conf->config('payby-default') ne 'HIDE' ) { 
+
       <BR>
-      <%= include('cust_main/billing.html', $cust_main ) %>
-    <% } %>
+      <% include('cust_main/billing.html', $cust_main ) %>
+% } 
+
   </TD>
 </TR>
 </TABLE>
+%
+%if ( defined $cust_main->dbdef_table->column('comments')
+%     && $cust_main->comments =~ /[^\s\n\r]/              ) {
+%
 
-<%
-if ( defined $cust_main->dbdef_table->column('comments')
-     && $cust_main->comments =~ /[^\s\n\r]/              ) {
-%>
 <BR>
 Comments
-<%= ntable("#cccccc") %><TR><TD><%= ntable("#cccccc",2) %>
+<% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
 <TR>
   <TD BGCOLOR="#ffffff">
-    <PRE><%= encode_entities($cust_main->comments) %></PRE>
+    <PRE><% encode_entities($cust_main->comments) %></PRE>
   </TD>
 </TR>
 </TABLE></TABLE>
-<% } %>
+% } 
+% if ( $conf->config('ticket_system') ) { 
 
-<% if ( $conf->config('ticket_system') ) { %>
   <BR>
-  <%= include('cust_main/tickets.html', $cust_main ) %>
-<% } %>
+  <% include('cust_main/tickets.html', $cust_main ) %>
+% } 
+
 
 <BR><BR>
-<%= include('cust_main/packages.html', $cust_main ) %>
+<% include('cust_main/packages.html', $cust_main ) %>
+% if ( $conf->config('payby-default') ne 'HIDE' ) { 
+
+  <% include('cust_main/payment_history.html', $cust_main ) %>
+% } 
 
-<% if ( $conf->config('payby-default') ne 'HIDE' ) { %>
-  <%= include('cust_main/payment_history.html', $cust_main ) %>
-<% } %>
 
-<%= include('/elements/footer.html') %>
+<% include('/elements/footer.html') %>
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 191d3092f..d1be8936f 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -1,182 +1,188 @@
-<%
-  my( $cust_main ) = @_;
-  my @invoicing_list = $cust_main->invoicing_list;
-  my $conf = new FS::Conf;
-  my $money_char = $conf->config('money_char') || '$';
-%>
+%
+%  my( $cust_main ) = @_;
+%  my @invoicing_list = $cust_main->invoicing_list;
+%  my $conf = new FS::Conf;
+%  my $money_char = $conf->config('money_char') || '$';
+%
+
 
 Billing information
-(<A HREF="<%= $p %>misc/bill.cgi?<%= $cust_main->custnum %>">Bill now</A>)
-<%= ntable("#cccccc") %><TR><TD><%= ntable("#cccccc",2) %>
+(<A HREF="<% $p %>misc/bill.cgi?<% $cust_main->custnum %>">Bill now</A>)
+<% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
+%
+%( my $balance = $cust_main->balance )
+%  =~ s/^(\-?)(.*)$/<FONT SIZE=+1>$1<\/FONT>$money_char$2/;
+%
 
-<%
-( my $balance = $cust_main->balance )
-  =~ s/^(\-?)(.*)$/<FONT SIZE=+1>$1<\/FONT>$money_char$2/;
-%>
 
 <TR>
   <TD ALIGN="right">Balance due</TD>
-  <TD BGCOLOR="#ffffff"><B><%= $balance %></B></TD>
+  <TD BGCOLOR="#ffffff"><B><% $balance %></B></TD>
 </TR>
 
 <TR>
   <TD ALIGN="right">Billing&nbsp;type</TD>
   <TD BGCOLOR="#ffffff">
+% if ( $cust_main->payby eq 'CARD' || $cust_main->payby eq 'DCRD' ) { 
 
-<% if ( $cust_main->payby eq 'CARD' || $cust_main->payby eq 'DCRD' ) { %>
 
-    Credit&nbsp;card&nbsp;<%= $cust_main->payby eq 'CARD' ? '(automatic)' : '(on-demand)' %>
+    Credit&nbsp;card&nbsp;<% $cust_main->payby eq 'CARD' ? '(automatic)' : '(on-demand)' %>
   </TD>
 </TR>
 <TR>
   <TD ALIGN="right">Card number</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->payinfo_masked %></TD>
-</TR>
-
-<%
-#false laziness w/elements/select-month_year.html & edit/cust_main/billing.html
-my( $mon, $year );
-my $date = $cust_main->paydate || '12-2037';
-if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
-  ( $mon, $year ) = ( $2, $1 );
-} elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-  ( $mon, $year ) = ( $1, $3 );
-} else {
-  warn "unrecognized expiration date format: $date";
-  ( $mon, $year ) = ( '', '' );
-}
-%>
+  <TD BGCOLOR="#ffffff"><% $cust_main->payinfo_masked %></TD>
+</TR>
+%
+%#false laziness w/elements/select-month_year.html & edit/cust_main/billing.html
+%my( $mon, $year );
+%my $date = $cust_main->paydate || '12-2037';
+%if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
+%  ( $mon, $year ) = ( $2, $1 );
+%} elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+%  ( $mon, $year ) = ( $1, $3 );
+%} else {
+%  warn "unrecognized expiration date format: $date";
+%  ( $mon, $year ) = ( '', '' );
+%}
+%
+
 <TR>
   <TD ALIGN="right">Expiration</TD>
-  <TD BGCOLOR="#ffffff"><%= "$mon/$year" %></TD>
+  <TD BGCOLOR="#ffffff"><% "$mon/$year" %></TD>
 </TR>
+% if ( $cust_main->paystart_month ) { 
 
-<% if ( $cust_main->paystart_month ) { %>
   <TR>
     <TD ALIGN="right">Start date</TD>
-    <TD BGCOLOR="#ffffff"><%= $cust_main->paystart_month. '/'. $cust_main->paystart_year %>
+    <TD BGCOLOR="#ffffff"><% $cust_main->paystart_month. '/'. $cust_main->paystart_year %>
   </TR>
-<% } elsif ( $cust_main->payissue ) { %>
+% } elsif ( $cust_main->payissue ) { 
+
   <TR>
     <TD ALIGN="right">Issue #</TD>
-    <TD BGCOLOR="#ffffff"><%= $cust_main->payissue %>
+    <TD BGCOLOR="#ffffff"><% $cust_main->payissue %>
   </TR>
-<% } %>
+% } 
+
 
 <TR>
   <TD ALIGN="right">Name on card</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->payname %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->payname %></TD>
 </TR>
+% } elsif ( $cust_main->payby eq 'CHEK' || $cust_main->payby eq 'DCHK') {
+%     my( $account, $aba ) = split('@', $cust_main->payinfo );
+%
 
-<% } elsif ( $cust_main->payby eq 'CHEK' || $cust_main->payby eq 'DCHK') {
-     my( $account, $aba ) = split('@', $cust_main->payinfo );
-%>
 
-    Electronic&nbsp;check&nbsp;<%= $cust_main->payby eq 'CHEK' ? '(automatic)' : '(on-demand)' %>
+    Electronic&nbsp;check&nbsp;<% $cust_main->payby eq 'CHEK' ? '(automatic)' : '(on-demand)' %>
   </TD>
 </TR>
 <TR>
   <TD ALIGN="right">ABA/Routing code</TD>
-  <TD BGCOLOR="#ffffff"><%= $aba %></TD>
+  <TD BGCOLOR="#ffffff"><% $aba %></TD>
 </TR>
 <TR>
   <TD ALIGN="right">Account number</TD>
-  <TD BGCOLOR="#ffffff"><%= 'x'x(length($account)-2). substr($account,(length($account)-2)) %></TD>
+  <TD BGCOLOR="#ffffff"><% 'x'x(length($account)-2). substr($account,(length($account)-2)) %></TD>
 </TR>
 <TR>
   <TD ALIGN="right">Bank name</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->payname %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->payname %></TD>
 </TR>
+% } elsif ( $cust_main->payby eq 'LECB' ) {
+%     $cust_main->payinfo =~ /^(\d{3})(\d{3})(\d{4})$/;
+%     my $payinfo = "$1-$2-$3";
+%
 
-<% } elsif ( $cust_main->payby eq 'LECB' ) {
-     $cust_main->payinfo =~ /^(\d{3})(\d{3})(\d{4})$/;
-     my $payinfo = "$1-$2-$3";
-%>
 
     Phone&nbsp;bill&nbsp;billing
   </TD>
 </TR>
 <TR>
   <TD ALIGN="right">Phone number</TD>
-  <TD BGCOLOR="#ffffff"><%= $payinfo %></TD>
+  <TD BGCOLOR="#ffffff"><% $payinfo %></TD>
 </TR>
+% } elsif ( $cust_main->payby eq 'BILL' ) { 
 
-<% } elsif ( $cust_main->payby eq 'BILL' ) { %>
 
     Billing
   </TD>
 </TR>
+% if ( $cust_main->payinfo ) { 
 
-  <% if ( $cust_main->payinfo ) { %>
 <TR>
   <TD ALIGN="right">P.O. </TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->payinfo %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->payinfo %></TD>
 </TR>
-  <% } %>
+% } 
+
 
 <TR>
   <TD ALIGN="right">Attention</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->payname %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->payname %></TD>
 </TR>
+% } elsif ( $cust_main->payby eq 'COMP' ) { 
 
-<% } elsif ( $cust_main->payby eq 'COMP' ) { %>
 
     Complimentary
   </TD>
 </TR>
 <TR>
   <TD ALIGN="right">Authorized&nbsp;by</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->payinfo %></TD>
-</TR>
-
-<%
-#false laziness w/above etc.
-my( $mon, $year );
-my $date = $cust_main->paydate || '12-2037';
-if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
-  ( $mon, $year ) = ( $2, $1 );
-} elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-  ( $mon, $year ) = ( $1, $3 );
-} else {
-  warn "unrecognized expiration date format: $date";
-  ( $mon, $year ) = ( '', '' );
-}
-%>
+  <TD BGCOLOR="#ffffff"><% $cust_main->payinfo %></TD>
+</TR>
+%
+%#false laziness w/above etc.
+%my( $mon, $year );
+%my $date = $cust_main->paydate || '12-2037';
+%if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
+%  ( $mon, $year ) = ( $2, $1 );
+%} elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+%  ( $mon, $year ) = ( $1, $3 );
+%} else {
+%  warn "unrecognized expiration date format: $date";
+%  ( $mon, $year ) = ( '', '' );
+%}
+%
+
 <TR>
   <TD ALIGN="right">Expiration</TD>
-  <TD BGCOLOR="#ffffff"><%= "$mon/$year" %></TD>
+  <TD BGCOLOR="#ffffff"><% "$mon/$year" %></TD>
 </TR>
+% } 
 
-<% } %>
 
 <TR>
   <TD ALIGN="right">Tax&nbsp;exempt</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->tax ? 'yes' : 'no' %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->tax ? 'yes' : 'no' %></TD>
 </TR>
 <TR>
   <TD ALIGN="right">Postal&nbsp;invoices</TD>
   <TD BGCOLOR="#ffffff">
-    <%= ( grep { $_ eq 'POST' } @invoicing_list ) ? 'yes' : 'no' %>
+    <% ( grep { $_ eq 'POST' } @invoicing_list ) ? 'yes' : 'no' %>
   </TD>
 </TR>
 <TR>
   <TD ALIGN="right">FAX&nbsp;invoices</TD>
   <TD BGCOLOR="#ffffff">
-    <%= ( grep { $_ eq 'FAX' } @invoicing_list ) ? 'yes' : 'no' %>
+    <% ( grep { $_ eq 'FAX' } @invoicing_list ) ? 'yes' : 'no' %>
   </TD>
 </TR>
 <TR>
   <TD ALIGN="right">Email&nbsp;invoices</TD>
   <TD BGCOLOR="#ffffff">
-    <%= join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || 'no' %>
+    <% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || 'no' %>
   </TD>
 </TR>
-<% if ( $conf->exists('voip-cust_cdr_spools') ) { %>
+% if ( $conf->exists('voip-cust_cdr_spools') ) { 
+
   <TR>
     <TD ALIGN="right">Spool&nbsp;CDRs</TD>
-    <TD BGCOLOR="#ffffff"><%= $cust_main->spool_cdr ? 'yes' : 'no' %></TD>
+    <TD BGCOLOR="#ffffff"><% $cust_main->spool_cdr ? 'yes' : 'no' %></TD>
   </TR>
-<% } %>
+% } 
+
 
 </TABLE></TD></TR></TABLE>
 
diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 48371550b..9c2b38f9a 100644
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -1,58 +1,64 @@
-<%
-  my( $cust_main ) = @_;
-  my $conf = new FS::Conf;
-%>
+%
+%  my( $cust_main ) = @_;
+%  my $conf = new FS::Conf;
+%
+
 
 Billing address
-<%= ntable("#cccccc") %><TR><TD><%= ntable("#cccccc",2) %>
+<% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
 <TR>
   <TD ALIGN="right">Contact&nbsp;name</TD>
   <TD COLSPAN=3 BGCOLOR="#ffffff">
-    <%= $cust_main->last. ', '. $cust_main->first %>
+    <% $cust_main->last. ', '. $cust_main->first %>
   </TD>
-<% if ( $conf->exists('show_ss') ) { %>
+% if ( $conf->exists('show_ss') ) { 
+
   <TD ALIGN="right">SS#</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->ss || '&nbsp' %></TD>
-<% } %>
+  <TD BGCOLOR="#ffffff"><% $cust_main->ss || '&nbsp' %></TD>
+% } 
+
 </TR>
 <TR>
   <TD ALIGN="right">Company</TD>
-  <TD COLSPAN=5 BGCOLOR="#ffffff"><%= $cust_main->company %></TD>
+  <TD COLSPAN=5 BGCOLOR="#ffffff"><% $cust_main->company %></TD>
 </TR>
 <TR>
   <TD ALIGN="right">Address</TD>
-  <TD COLSPAN=5 BGCOLOR="#ffffff"><%= $cust_main->address1 %></TD>
+  <TD COLSPAN=5 BGCOLOR="#ffffff"><% $cust_main->address1 %></TD>
 </TR>
-<% if ( $cust_main->address2 ) { %>
+% if ( $cust_main->address2 ) { 
+
 <TR>
   <TD ALIGN="right">&nbsp;</TD>
-  <TD COLSPAN=5 BGCOLOR="#ffffff"><%= $cust_main->address2 %></TD>
+  <TD COLSPAN=5 BGCOLOR="#ffffff"><% $cust_main->address2 %></TD>
 </TR>
-<% } %>
+% } 
+
 <TR>
   <TD ALIGN="right">City</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->city %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->city %></TD>
   <TD ALIGN="right">State</TD>
-  <TD BGCOLOR="#ffffff"><%= state_label($cust_main->state, $cust_main->country) %></TD>
+  <TD BGCOLOR="#ffffff"><% state_label($cust_main->state, $cust_main->country) %></TD>
   <TD ALIGN="right">Zip</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->zip %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->zip %></TD>
 </TR>
 <TR>
   <TD ALIGN="right">Country</TD>
-  <TD BGCOLOR="#ffffff"><%= code2country($cust_main->country) %></TD>
-</TR>
-<%
-  my $daytime_label = FS::Msgcat::_gettext('daytime') =~ /^(daytime)?$/
-                        ? 'Day&nbsp;Phone'
-                        : FS::Msgcat::_gettext('daytime');
-  my $night_label = FS::Msgcat::_gettext('night') =~ /^(night)?$/
-                        ? 'Night&nbsp;Phone'
-                        : FS::Msgcat::_gettext('night');
-%>
-<TR>
-  <TD ALIGN="right"><%= $daytime_label %></TD>
+  <TD BGCOLOR="#ffffff"><% code2country($cust_main->country) %></TD>
+</TR>
+%
+%  my $daytime_label = FS::Msgcat::_gettext('daytime') =~ /^(daytime)?$/
+%                        ? 'Day&nbsp;Phone'
+%                        : FS::Msgcat::_gettext('daytime');
+%  my $night_label = FS::Msgcat::_gettext('night') =~ /^(night)?$/
+%                        ? 'Night&nbsp;Phone'
+%                        : FS::Msgcat::_gettext('night');
+%
+
+<TR>
+  <TD ALIGN="right"><% $daytime_label %></TD>
   <TD COLSPAN=6 BGCOLOR="#ffffff">
-    <%= include('/elements/phonenumber.html',
+    <% include('/elements/phonenumber.html',
                   $cust_main->daytime,
                   'callable'=>1
                )
@@ -60,9 +66,9 @@ Billing address
   </TD>
 </TR>
 <TR>
-  <TD ALIGN="right"><%= $night_label %></TD>
+  <TD ALIGN="right"><% $night_label %></TD>
   <TD COLSPAN=6 BGCOLOR="#ffffff">
-    <%= include('/elements/phonenumber.html',
+    <% include('/elements/phonenumber.html',
                   $cust_main->night,
                   'callable'=>1
                )
@@ -72,54 +78,56 @@ Billing address
 <TR>
   <TD ALIGN="right">Fax</TD>
   <TD COLSPAN=5 BGCOLOR="#ffffff">
-    <%= $cust_main->fax || '&nbsp' %>
+    <% $cust_main->fax || '&nbsp' %>
   </TD>
 </TR>
 </TABLE></TD></TR></TABLE>
+% if ( defined $cust_main->dbdef_table->column('ship_last') ) {
+%     my $pre = $cust_main->ship_last ? 'ship_' : '';
+%
 
-<% if ( defined $cust_main->dbdef_table->column('ship_last') ) {
-     my $pre = $cust_main->ship_last ? 'ship_' : '';
-%>
 
 <BR>
 Service address
-<%= ntable("#cccccc") %><TR><TD><%= ntable("#cccccc",2) %>
+<% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
 <TR>
   <TD ALIGN="right">Contact name</TD>
   <TD COLSPAN=5 BGCOLOR="#ffffff">
-    <%= $cust_main->get("${pre}last"). ', '. $cust_main->get("${pre}first") %>
+    <% $cust_main->get("${pre}last"). ', '. $cust_main->get("${pre}first") %>
   </TD>
 </TR>
 <TR>
   <TD ALIGN="right">Company</TD>
-  <TD COLSPAN=5 BGCOLOR="#ffffff"><%= $cust_main->get("${pre}company") %></TD>
+  <TD COLSPAN=5 BGCOLOR="#ffffff"><% $cust_main->get("${pre}company") %></TD>
 </TR>
 <TR>
   <TD ALIGN="right">Address</TD>
-  <TD COLSPAN=5 BGCOLOR="#ffffff"><%= $cust_main->get("${pre}address1") %></TD>
+  <TD COLSPAN=5 BGCOLOR="#ffffff"><% $cust_main->get("${pre}address1") %></TD>
 </TR>
-<% if ( $cust_main->get("${pre}address2") ) { %>
+% if ( $cust_main->get("${pre}address2") ) { 
+
 <TR>
   <TD ALIGN="right">&nbsp;</TD>
-  <TD COLSPAN=5 BGCOLOR="#ffffff"><%= $cust_main->get("${pre}address2") %></TD>
+  <TD COLSPAN=5 BGCOLOR="#ffffff"><% $cust_main->get("${pre}address2") %></TD>
 </TR>
-<% } %>
+% } 
+
 <TR>
   <TD ALIGN="right">City</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->get("${pre}city") %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}city") %></TD>
   <TD ALIGN="right">State</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->get("${pre}state") %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}state") %></TD>
   <TD ALIGN="right">Zip</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->get("${pre}zip") %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}zip") %></TD>
 </TR>
 <TR>
   <TD ALIGN="right">Country</TD>
-  <TD BGCOLOR="#ffffff"><%= code2country( $cust_main->get("${pre}country") ) %></TD>
+  <TD BGCOLOR="#ffffff"><% code2country( $cust_main->get("${pre}country") ) %></TD>
 </TR>
 <TR>
-  <TD ALIGN="right"><%= $daytime_label %></TD>
+  <TD ALIGN="right"><% $daytime_label %></TD>
   <TD COLSPAN=5 BGCOLOR="#ffffff">
-    <%= include('/elements/phonenumber.html',
+    <% include('/elements/phonenumber.html',
                   $cust_main->get("${pre}daytime"),
                   'callable'=>1
                )
@@ -127,9 +135,9 @@ Service address
   </TD>
 </TR>
 <TR>
-  <TD ALIGN="right"><%= $night_label %></TD>
+  <TD ALIGN="right"><% $night_label %></TD>
   <TD COLSPAN=5 BGCOLOR="#ffffff">
-    <%= include('/elements/phonenumber.html',
+    <% include('/elements/phonenumber.html',
                   $cust_main->get("${pre}night"),
                   'callable'=>1
                )
@@ -139,9 +147,9 @@ Service address
 <TR>
   <TD ALIGN="right">Fax</TD>
   <TD COLSPAN=5 BGCOLOR="#ffffff">
-    <%= $cust_main->get("${pre}fax") || '&nbsp' %>
+    <% $cust_main->get("${pre}fax") || '&nbsp' %>
   </TD>
 </TR>
 </TABLE></TD></TR></TABLE>
+% } 
 
-<% } %>
diff --git a/httemplate/view/cust_main/misc.html b/httemplate/view/cust_main/misc.html
index f06a4fbd2..fc033b970 100644
--- a/httemplate/view/cust_main/misc.html
+++ b/httemplate/view/cust_main/misc.html
@@ -1,76 +1,77 @@
-<%
-  my( $cust_main ) = @_;
-  my $conf = new FS::Conf;
-%>
+%
+%  my( $cust_main ) = @_;
+%  my $conf = new FS::Conf;
+%
+
 
-<%= ntable("#cccccc") %><TR><TD><%= &ntable("#cccccc",2) %>
+<% ntable("#cccccc") %><TR><TD><% &ntable("#cccccc",2) %>
 
 <TR>
   <TD ALIGN="right">Customer&nbsp;number</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->custnum %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->custnum %></TD>
 </TR>
 
 <TR>
   <TD ALIGN="right">Status</TD>
-  <TD BGCOLOR="#ffffff"><FONT COLOR="#<%= $cust_main->statuscolor %>"><B><%= ucfirst($cust_main->status) %></B></FONT></TD>
+  <TD BGCOLOR="#ffffff"><FONT COLOR="#<% $cust_main->statuscolor %>"><B><% ucfirst($cust_main->status) %></B></FONT></TD>
 </TR>
+%
+%  my @agents = qsearch( 'agent', {} );
+%  my $agent;
+%  unless ( scalar(@agents) == 1 ) {
+%    $agent = qsearchs('agent',{ 'agentnum' => $cust_main->agentnum } );
+%
 
-<%
-  my @agents = qsearch( 'agent', {} );
-  my $agent;
-  unless ( scalar(@agents) == 1 ) {
-    $agent = qsearchs('agent',{ 'agentnum' => $cust_main->agentnum } );
-%>
 
 <TR>
   <TD ALIGN="right">Agent</TD>
-  <TD BGCOLOR="#ffffff"><%= $agent->agentnum %>: <%= $agent->agent %></TD>
+  <TD BGCOLOR="#ffffff"><% $agent->agentnum %>: <% $agent->agent %></TD>
 </TR>
+%
+%  } else {
+%    $agent = $agents[0];
+%  }
+%
+%  if ( $cust_main->agent_custid ) {
+%
 
-<%
-  } else {
-    $agent = $agents[0];
-  }
-
-  if ( $cust_main->agent_custid ) {
-%>
 
 <TR>
   <TD ALIGN="right">Agent customer ref#</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->agent_custid %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->agent_custid %></TD>
 </TR>
+%
+%  }
+%
+%  unless ( FS::part_referral->num_part_referral == 1 ) {
+%    my $referral = qsearchs('part_referral', {
+%      'refnum' => $cust_main->refnum
+%    } );
+%
 
-<%
-  }
-
-  unless ( FS::part_referral->num_part_referral == 1 ) {
-    my $referral = qsearchs('part_referral', {
-      'refnum' => $cust_main->refnum
-    } );
-%>
 
 <TR>
   <TD ALIGN="right">Advertising&nbsp;source</TD>
-  <TD BGCOLOR="#ffffff"><%= $referral->refnum %>: <%= $referral->referral%></TD>
+  <TD BGCOLOR="#ffffff"><% $referral->refnum %>: <% $referral->referral%></TD>
 </TR>
+% } 
 
-<% } %>
 
 <TR>
   <TD ALIGN="right">Referring&nbsp;Customer</TD>
   <TD BGCOLOR="#ffffff">
+%
+%  my $referring_cust_main = '';
+%  if ( $cust_main->referral_custnum
+%       && ( $referring_cust_main =
+%            qsearchs('cust_main', { custnum => $cust_main->referral_custnum } )
+%          )
+%     ) {
+%
+
 
+<A HREF="<% popurl(1) %>cust_main.cgi?<% $cust_main->referral_custnum %>"><%$cust_main->referral_custnum %>: 
 <%
-  my $referring_cust_main = '';
-  if ( $cust_main->referral_custnum
-       && ( $referring_cust_main =
-            qsearchs('cust_main', { custnum => $cust_main->referral_custnum } )
-          )
-     ) {
-%>
-
-<A HREF="<%= popurl(1) %>cust_main.cgi?<%= $cust_main->referral_custnum %>"><%=$cust_main->referral_custnum %>: 
-<%=
   ( $referring_cust_main->company
       ? $referring_cust_main->company. ' ('.
           $referring_cust_main->last. ', '. $referring_cust_main->first.
@@ -78,15 +79,15 @@
       : $referring_cust_main->last. ', '. $referring_cust_main->first
   )
 %></A>
+% } 
 
-<% } %>
 
   </TD>
 </TR>
 
 <TR>
   <TD ALIGN="right">Order taker</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->otaker %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->otaker %></TD>
 </TR>
 
 </TABLE></TD></TR></TABLE>
diff --git a/httemplate/view/cust_main/order_pkg.html b/httemplate/view/cust_main/order_pkg.html
index ac2d05df2..6edd18c05 100644
--- a/httemplate/view/cust_main/order_pkg.html
+++ b/httemplate/view/cust_main/order_pkg.html
@@ -1,6 +1,7 @@
-<%
-  my( $cust_main ) = @_;
-%>
+%
+%  my( $cust_main ) = @_;
+%
+
 
 <SCRIPT TYPE="text/javascript">
 function enable_order_pkg () {
@@ -12,25 +13,25 @@ function enable_order_pkg () {
 }
 </SCRIPT>
 
-<FORM NAME="OrderPkgForm" ACTION="<%= $p %>edit/process/quick-cust_pkg.cgi" METHOD="POST">
+<FORM NAME="OrderPkgForm" ACTION="<% $p %>edit/process/quick-cust_pkg.cgi" METHOD="POST">
 
-<INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $cust_main->custnum %>">
+<INPUT TYPE="hidden" NAME="custnum" VALUE="<% $cust_main->custnum %>">
 
 <SELECT NAME="pkgpart" onChange="enable_order_pkg()"><OPTION>Order additional package
+%
+%foreach my $part_pkg (
+%  qsearch( 'part_pkg', { 'disabled' => '' }, '',
+%           ' AND 0 < ( SELECT COUNT(*) FROM type_pkgs '.
+%           '             WHERE typenum = '. $cust_main->agent->typenum.
+%           '             AND type_pkgs.pkgpart = part_pkg.pkgpart )'
+%         )
+%) {
+%
 
-<%
-foreach my $part_pkg (
-  qsearch( 'part_pkg', { 'disabled' => '' }, '',
-           ' AND 0 < ( SELECT COUNT(*) FROM type_pkgs '.
-           '             WHERE typenum = '. $cust_main->agent->typenum.
-           '             AND type_pkgs.pkgpart = part_pkg.pkgpart )'
-         )
-) {
-%>
 
-  <OPTION VALUE="<%= $part_pkg->pkgpart %>"><%= $part_pkg->pkg %> - <%= $part_pkg->comment %>
+  <OPTION VALUE="<% $part_pkg->pkgpart %>"><% $part_pkg->pkg %> - <% $part_pkg->comment %>
+% } 
 
-<% } %>
 
 </SELECT>
 
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 9cd1e284f..0278f22e9 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -1,567 +1,575 @@
-<%
-  my( $cust_main ) = @_;
-  my $conf = new FS::Conf;
+%
+%  my( $cust_main ) = @_;
+%  my $conf = new FS::Conf;
+%
+%  my $curuser = $FS::CurrentUser::CurrentUser;
+%
+%  my $packages = get_packages($cust_main, $conf);
+%
 
-  my $curuser = $FS::CurrentUser::CurrentUser;
-
-  my $packages = get_packages($cust_main, $conf);
-%>
 
 <A NAME="cust_pkg"><FONT SIZE="+2">Packages</FONT></A>
+% if ( $curuser->access_right('Order customer package') ) { 
+
+  <% include('order_pkg.html', $cust_main ) %>
+% } 
+% if ( $curuser->access_right('One-time charge')
+%        && $conf->config('payby-default') ne 'HIDE'
+%      ) {
+%
 
-<% if ( $curuser->access_right('Order customer package') ) { %>
-  <%= include('order_pkg.html', $cust_main ) %>
-<% } %>
+  <% include('quick-charge.html', $cust_main ) %>
+% } 
+% if ( $curuser->access_right('Bulk change customer packages') ) { 
 
-<% if ( $curuser->access_right('One-time charge')
-        && $conf->config('payby-default') ne 'HIDE'
-      ) {
-%>
-  <%= include('quick-charge.html', $cust_main ) %>
-<% } %>
+  <A HREF="<% $p %>edit/cust_pkg.cgi?<% $cust_main->custnum %>">Bulk order and cancel packages</A> (preserves services)
+% } 
 
-<% if ( $curuser->access_right('Bulk change customer packages') ) { %>
-  <A HREF="<%= $p %>edit/cust_pkg.cgi?<%= $cust_main->custnum %>">Bulk order and cancel packages</A> (preserves services)
-<% } %>
 
 <BR><BR>
+% if ( @$packages ) { 
 
-<% if ( @$packages ) { %>
 Current packages
-<% } %>
-
-<% if ( $cust_main->num_cancelled_pkgs ) {
-     if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
-          || ( $conf->exists('hidecancelledpackages')
-               && ! $cgi->param('showcancelledpackages')
-             )
-        )
-     {
-       $cgi->param('showcancelledpackages', 1);
-%>
-  ( <a href="<%= $cgi->self_url %>">show
-<%   } else {
-       $cgi->param('showcancelledpackages', 0);
-%>
-  ( <a href="<%= $cgi->self_url %>">hide
-<%   } %>
+% } 
+% if ( $cust_main->num_cancelled_pkgs ) {
+%     if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
+%          || ( $conf->exists('hidecancelledpackages')
+%               && ! $cgi->param('showcancelledpackages')
+%             )
+%        )
+%     {
+%       $cgi->param('showcancelledpackages', 1);
+%
+
+  ( <a href="<% $cgi->self_url %>">show
+%   } else {
+%       $cgi->param('showcancelledpackages', 0);
+%
+
+  ( <a href="<% $cgi->self_url %>">hide
+%   } 
+
  cancelled packages</a> )
-<% } %>
+% } 
+% if ( @$packages ) { 
 
-<% if ( @$packages ) { %>
 
-<%= include('/elements/table-grid.html') %>
+<% include('/elements/table-grid.html') %>
+% my $bgcolor1 = '#eeeeee';
+%   my $bgcolor2 = '#ffffff';
+%   my $bgcolor = '';
+%
 
-<% my $bgcolor1 = '#eeeeee';
-   my $bgcolor2 = '#ffffff';
-   my $bgcolor = '';
-%>
 
 <TR>
   <TH CLASS="grid" BGCOLOR="#cccccc">Package</TH>
   <TH CLASS="grid" BGCOLOR="#cccccc">Status</TH>
   <TH CLASS="grid" BGCOLOR="#cccccc">Services</TH>
 </TR>
+%
+%foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
+%
+%  if ( $bgcolor eq $bgcolor1 ) {
+%    $bgcolor = $bgcolor2;
+%  } else {
+%    $bgcolor = $bgcolor1;
+%  }
+%
+%
+
+
+<!--pkgnum: <%$pkg->{pkgnum}%>-->
+<TR>
+  <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+    <A NAME="cust_pkg<%$pkg->{pkgnum}%>"><%$pkg->{pkgnum}%></A>:
+    <%$pkg->{pkg}%> - <%$pkg->{comment}%><BR>
+    <FONT SIZE=-1>
+% unless ( $pkg->{cancel} ) { 
+% if ( $curuser->access_right('Change customer package') ) { 
 
-<%
-foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
+            (&nbsp;<%pkg_change_link($pkg)%>&nbsp;)
+% } 
+% if ( $curuser->access_right('Edit customer package dates') ) { 
 
-  if ( $bgcolor eq $bgcolor1 ) {
-    $bgcolor = $bgcolor2;
-  } else {
-    $bgcolor = $bgcolor1;
-  }
+            (&nbsp;<%pkg_dates_link($pkg)%>&nbsp;)
+% } 
+% if ( $curuser->access_right('Customize customer package') ) { 
 
-%>
+            (&nbsp;<%pkg_customize_link($pkg,$cust_main->custnum)%>&nbsp;)
+% } 
+% } 
 
-<!--pkgnum: <%=$pkg->{pkgnum}%>-->
-<TR>
-  <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
-    <A NAME="cust_pkg<%=$pkg->{pkgnum}%>"><%=$pkg->{pkgnum}%></A>:
-    <%=$pkg->{pkg}%> - <%=$pkg->{comment}%><BR>
-    <FONT SIZE=-1>
-      <% unless ( $pkg->{cancel} ) { %>
-        <% if ( $curuser->access_right('Change customer package') ) { %>
-            (&nbsp;<%=pkg_change_link($pkg)%>&nbsp;)
-        <% } %>
-        <% if ( $curuser->access_right('Edit customer package dates') ) { %>
-            (&nbsp;<%=pkg_dates_link($pkg)%>&nbsp;)
-        <% } %>
-        <% if ( $curuser->access_right('Customize customer package') ) { %>
-            (&nbsp;<%=pkg_customize_link($pkg,$cust_main->custnum)%>&nbsp;)
-        <% } %>
-      <% } %>
     </FONT>
   </TD>
-  <TD CLASS="inv" BGCOLOR="<%= $bgcolor %>">
+  <TD CLASS="inv" BGCOLOR="<% $bgcolor %>">
     <TABLE CLASS="inv" BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%">
-
-<%
-  sub myfreq {
-    my $part_pkg = shift;
-    my $freq = $part_pkg->freq_pretty;
-    $freq =~ s/ /&nbsp;/g;
-    $freq;
-  }
-
-  #this should use cust_pkg->status and cust_pkg->statuscolor eventually
-
-  my $colspan = $conf->exists('cust_pkg-display_times') ? 8 : 4;
-  my $width = $conf->exists('cust_pkg-display_times') ? '38%' : '56%';
-
-  #false laziness w/edit/REAL_cust_pkg.cgi
-  my( $billed_or_prepaid, $last_bill_or_renewed, $next_bill_or_prepaid_until );
-  unless ( $pkg->{'part_pkg'}->is_prepaid ) {
-    $billed_or_prepaid = 'billed';
-    $last_bill_or_renewed = 'Last&nbsp;bill';
-    $next_bill_or_prepaid_until = 'Next&nbsp;bill';
-  } else {
-    $billed_or_prepaid = 'prepaid';
-    $last_bill_or_renewed = 'Renewed';
-    $next_bill_or_prepaid_until = 'Prepaid&nbsp;until';
-  }
-
-%>
-
-<% if ( $pkg->{cancel} ) { %> <!-- #status: cancelled -->
+%
+%  sub myfreq {
+%    my $part_pkg = shift;
+%    my $freq = $part_pkg->freq_pretty;
+%    $freq =~ s/ /&nbsp;/g;
+%    $freq;
+%  }
+%
+%  #this should use cust_pkg->status and cust_pkg->statuscolor eventually
+%
+%  my $colspan = $conf->exists('cust_pkg-display_times') ? 8 : 4;
+%  my $width = $conf->exists('cust_pkg-display_times') ? '38%' : '56%';
+%
+%  #false laziness w/edit/REAL_cust_pkg.cgi
+%  my( $billed_or_prepaid, $last_bill_or_renewed, $next_bill_or_prepaid_until );
+%  unless ( $pkg->{'part_pkg'}->is_prepaid ) {
+%    $billed_or_prepaid = 'billed';
+%    $last_bill_or_renewed = 'Last&nbsp;bill';
+%    $next_bill_or_prepaid_until = 'Next&nbsp;bill';
+%  } else {
+%    $billed_or_prepaid = 'prepaid';
+%    $last_bill_or_renewed = 'Renewed';
+%    $next_bill_or_prepaid_until = 'Prepaid&nbsp;until';
+%  }
+%
+%
+% if ( $pkg->{cancel} ) { 
+ <!-- #status: cancelled -->
 
   <TR>
-    <TD WIDTH="<%=$width%>" ALIGN="right"><FONT COLOR="#ff0000"><B>Cancelled&nbsp;</B></FONT></TD>
-    <%= pkg_datestr($pkg,'cancel',$conf) %>
+    <TD WIDTH="<%$width%>" ALIGN="right"><FONT COLOR="#ff0000"><B>Cancelled&nbsp;</B></FONT></TD>
+    <% pkg_datestr($pkg,'cancel',$conf) %>
   </TR>
+% unless ( $pkg->{setup} ) { 
 
-  <% unless ( $pkg->{setup} ) { %>
 
     <TR>
-      <TD COLSPAN=<%=$colspan%>>Never billed</TD>
+      <TD COLSPAN=<%$colspan%>>Never billed</TD>
     </TR>
+% } else { 
 
-  <% } else { %>
 
     <TR>
-      <TD WIDTH="<%=$width%>" ALIGN="right">Setup&nbsp;</TD>
-      <%= pkg_datestr($pkg, 'setup',$conf) %>
+      <TD WIDTH="<%$width%>" ALIGN="right">Setup&nbsp;</TD>
+      <% pkg_datestr($pkg, 'setup',$conf) %>
     </TR>
+% if ( $pkg->{'last_bill'} ) { 
 
-    <% if ( $pkg->{'last_bill'} ) { %>
       <TR>
-        <TD WIDTH="<%=$width%>" ALIGN="right"><%= $last_bill_or_renewed %>&nbsp;</TD>
-        <%= pkg_datestr($pkg, 'last_bill',$conf) %>
+        <TD WIDTH="<%$width%>" ALIGN="right"><% $last_bill_or_renewed %>&nbsp;</TD>
+        <% pkg_datestr($pkg, 'last_bill',$conf) %>
       </TR>
-    <% } %>
+% } 
+% if ( $pkg->{'susp'} ) { 
 
-    <% if ( $pkg->{'susp'} ) { %>
       <TR>
-        <TD WIDTH="<%=$width%>" ALIGN="right">Suspended&nbsp;</TD>
-        <%= pkg_datestr($pkg, 'susp',$conf) %>
+        <TD WIDTH="<%$width%>" ALIGN="right">Suspended&nbsp;</TD>
+        <% pkg_datestr($pkg, 'susp',$conf) %>
       </TR>
-    <% } %>
-
-  <% } %>
-
-<% } else { %>
-
-  <% if ( $pkg->{susp} ) { %> <!-- #status: suspended -->
+% } 
+% } 
+% } else { 
+% if ( $pkg->{susp} ) { 
+ <!-- #status: suspended -->
 
     <TR>
-      <TD WIDTH="<%=$width%>" ALIGN="right"><FONT COLOR="#FF9900"><B>Suspended</B>&nbsp;</FONT></TD>
-      <%= pkg_datestr($pkg,'susp',$conf) %>
+      <TD WIDTH="<%$width%>" ALIGN="right"><FONT COLOR="#FF9900"><B>Suspended</B>&nbsp;</FONT></TD>
+      <% pkg_datestr($pkg,'susp',$conf) %>
     </TR>
+% unless ( $pkg->{setup} ) { 
 
-    <% unless ( $pkg->{setup} ) { %>
 
       <TR>
-        <TD COLSPAN=<%=$colspan%>>Never billed</TD>
+        <TD COLSPAN=<%$colspan%>>Never billed</TD>
       </TR>
+% } else { 
 
-    <% } else { %>
 
       <TR>
-        <TD WIDTH="<%=$width%>" ALIGN="right">Setup&nbsp;</TD>
-        <%= pkg_datestr($pkg, 'setup',$conf) %>
+        <TD WIDTH="<%$width%>" ALIGN="right">Setup&nbsp;</TD>
+        <% pkg_datestr($pkg, 'setup',$conf) %>
       </TR>
-      
-    <% } %>
+% } 
+% if ( $pkg->{'last_bill'} ) { 
 
-    <% if ( $pkg->{'last_bill'} ) { %>
       <TR>
-        <TD WIDTH="<%=$width%>" ALIGN="right"><%= $last_bill_or_renewed %>&nbsp;</TD>
-        <%= pkg_datestr($pkg, 'last_bill',$conf) %>
+        <TD WIDTH="<%$width%>" ALIGN="right"><% $last_bill_or_renewed %>&nbsp;</TD>
+        <% pkg_datestr($pkg, 'last_bill',$conf) %>
       </TR>
-    <% } %>
+% } 
+
 
     <!-- # next bill ?? -->
+% if ( $pkg->{'expire'} ) { 
 
-    <% if ( $pkg->{'expire'} ) { %>
       <TR>
-        <TD WIDTH="<%=$width%>" ALIGN="right">Expires&nbsp;</TD>
-        <%= pkg_datestr($pkg, 'expire',$conf) %>
+        <TD WIDTH="<%$width%>" ALIGN="right">Expires&nbsp;</TD>
+        <% pkg_datestr($pkg, 'expire',$conf) %>
       </TR>
-    <% } %>
+% } 
+
 
     <TR>
-      <TD COLSPAN=<%=$colspan%>>
+      <TD COLSPAN=<%$colspan%>>
         <FONT SIZE=-1>
-          <% if ( $curuser->access_right('Unsuspend customer package') ) { %>
-            (&nbsp;<%= pkg_unsuspend_link($pkg) %>&nbsp;)
-          <% } %>
-          <% if ( $curuser->access_right('Cancel customer package') ) { %>
-            (&nbsp;<%= pkg_cancel_link($pkg) %>&nbsp;)
-          <% } %>
+% if ( $curuser->access_right('Unsuspend customer package') ) { 
+
+            (&nbsp;<% pkg_unsuspend_link($pkg) %>&nbsp;)
+% } 
+% if ( $curuser->access_right('Cancel customer package') ) { 
+
+            (&nbsp;<% pkg_cancel_link($pkg) %>&nbsp;)
+% } 
+
         </FONT>
       </TD>
     </TR>
+% } else { 
+ <!-- #status: active -->
+% unless ( $pkg->{setup} ) { 
+ <!-- #not setup -->
+% unless ( $pkg->{'freq'} ) { 
 
-  <% } else { %> <!-- #status: active -->
-
-    <% unless ( $pkg->{setup} ) { %> <!-- #not setup -->
-
-      <% unless ( $pkg->{'freq'} ) { %>
 
         <TR>
-          <TD COLSPAN=<%=$colspan%>>Not&nbsp;yet&nbsp;billed&nbsp;(one-time&nbsp;charge)</TD>
+          <TD COLSPAN=<%$colspan%>>Not&nbsp;yet&nbsp;billed&nbsp;(one-time&nbsp;charge)</TD>
         </TR>
 
         <TR>
-          <TD COLSPAN=<%=$colspan%>>
+          <TD COLSPAN=<%$colspan%>>
             <FONT SIZE=-1>
-              <% if ( $curuser->access_right('Cancel customer package immediately') ) { %>
-                (&nbsp;<%= pkg_cancel_link($pkg) %>&nbsp;)
-              <% } %>
+% if ( $curuser->access_right('Cancel customer package immediately') ) { 
+
+                (&nbsp;<% pkg_cancel_link($pkg) %>&nbsp;)
+% } 
+
             </FONT>
           </TD>
         </TR>
+% } else { 
 
-      <% } else { %>
 
         <TR>
-          <TD COLSPAN=<%=$colspan%>>Not&nbsp;yet&nbsp;billed&nbsp;(<%= $billed_or_prepaid %>&nbsp;<%= myfreq($pkg->{part_pkg}) %>)</TD>
+          <TD COLSPAN=<%$colspan%>>Not&nbsp;yet&nbsp;billed&nbsp;(<% $billed_or_prepaid %>&nbsp;<% myfreq($pkg->{part_pkg}) %>)</TD>
         </TR>
+% } 
+% } else { 
+ <!-- #setup -->
+% unless ( $pkg->{freq} ) { 
 
-      <% } %>
-
-    <% } else { %> <!-- #setup -->
-
-      <% unless ( $pkg->{freq} ) { %>
 
         <TR>
-          <TD COLSPAN=<%=$colspan%>>One-time&nbsp;charge</TD>
+          <TD COLSPAN=<%$colspan%>>One-time&nbsp;charge</TD>
         </TR>
 
         <TR>
-          <TD WIDTH="<%=$width%>" ALIGN="right">Billed&nbsp;</TD>
-          <%= pkg_datestr($pkg,'setup',$conf) %>
+          <TD WIDTH="<%$width%>" ALIGN="right">Billed&nbsp;</TD>
+          <% pkg_datestr($pkg,'setup',$conf) %>
         </TR>
+% } else { 
 
-      <% } else { %>
 
         <TR>
-          <TD COLSPAN=<%=$colspan%>><FONT COLOR="#00CC00"><B>Active</B></FONT>,&nbsp;<%= $billed_or_prepaid %>&nbsp;<%= myfreq($pkg->{part_pkg}) %></TD>
+          <TD COLSPAN=<%$colspan%>><FONT COLOR="#00CC00"><B>Active</B></FONT>,&nbsp;<% $billed_or_prepaid %>&nbsp;<% myfreq($pkg->{part_pkg}) %></TD>
         </TR>
 
         <TR>
-          <TD WIDTH="<%=$width%>" ALIGN="right">Setup&nbsp;</TD>
-          <%= pkg_datestr($pkg, 'setup',$conf) %>
+          <TD WIDTH="<%$width%>" ALIGN="right">Setup&nbsp;</TD>
+          <% pkg_datestr($pkg, 'setup',$conf) %>
         </TR>
+% } 
+% } 
+% if ( $pkg->{'last_bill'} ) { 
 
-      <% } %>
-
-    <% } %>
-
-    <% if ( $pkg->{'last_bill'} ) { %>
       <TR>
-        <TD WIDTH="<%=$width%>" ALIGN="right"><%= $last_bill_or_renewed %>&nbsp;</TD>
-        <%= pkg_datestr($pkg, 'last_bill',$conf) %>
+        <TD WIDTH="<%$width%>" ALIGN="right"><% $last_bill_or_renewed %>&nbsp;</TD>
+        <% pkg_datestr($pkg, 'last_bill',$conf) %>
       </TR>
-    <% } %>
+% } 
+% if ( $pkg->{'next_bill'} ) { 
 
-    <% if ( $pkg->{'next_bill'} ) { %>
       <TR>
-        <TD WIDTH="<%=$width%>" ALIGN="right"><%= $next_bill_or_prepaid_until %>&nbsp;</TD>
-        <%= pkg_datestr($pkg, 'next_bill',$conf) %>
+        <TD WIDTH="<%$width%>" ALIGN="right"><% $next_bill_or_prepaid_until %>&nbsp;</TD>
+        <% pkg_datestr($pkg, 'next_bill',$conf) %>
       </TR>
-    <% } %>
+% } 
+% if ( $pkg->{'expire'} ) { 
 
-    <% if ( $pkg->{'expire'} ) { %>
       <TR>
-        <TD WIDTH="<%=$width%>" ALIGN="right">Expires&nbsp;</TD>
-        <%= pkg_datestr($pkg, 'expire',$conf) %>
+        <TD WIDTH="<%$width%>" ALIGN="right">Expires&nbsp;</TD>
+        <% pkg_datestr($pkg, 'expire',$conf) %>
       </TR>
-    <% } %>
+% } 
+% if ( $pkg->{freq} ) { 
 
-    <% if ( $pkg->{freq} ) { %>
       <TR>
-        <TD COLSPAN=<%=$colspan%>>
+        <TD COLSPAN=<%$colspan%>>
           <FONT SIZE=-1>
-            <% if ( $curuser->access_right('Suspend customer package') ) { %>
-              (&nbsp;<%= pkg_suspend_link($pkg) %>&nbsp;)
-            <% } %>
-            <% if ( $curuser->access_right('Cancel customer package immediately') ) { %>
-              (&nbsp;<%= pkg_cancel_link($pkg) %>&nbsp;)
-            <% } %>
-            <% if ( $curuser->access_right('Cancel customer package later') ) { %>
-              (&nbsp;<%= pkg_expire_link($pkg) %>&nbsp;)
-            <% } %>
+% if ( $curuser->access_right('Suspend customer package') ) { 
+
+              (&nbsp;<% pkg_suspend_link($pkg) %>&nbsp;)
+% } 
+% if ( $curuser->access_right('Cancel customer package immediately') ) { 
+
+              (&nbsp;<% pkg_cancel_link($pkg) %>&nbsp;)
+% } 
+% if ( $curuser->access_right('Cancel customer package later') ) { 
+
+              (&nbsp;<% pkg_expire_link($pkg) %>&nbsp;)
+% } 
+
           <FONT>
         </TD>
       </TR>
-    <% } %>
-
-  <% } %>
+% } 
+% } 
+% } 
 
-<% } %>
 
 </TABLE>
 </TD>
 
-<TD CLASS="inv" BGCOLOR="<%= $bgcolor %>">
+<TD CLASS="inv" BGCOLOR="<% $bgcolor %>">
   <TABLE CLASS="inv" BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%">
+%
+%  foreach my $svcpart (sort {$a->{svcpart} <=> $b->{svcpart}} @{$pkg->{svcparts}}) {
+%    foreach my $service (@{$svcpart->{services}}) {
+%
 
-
-<%
-  foreach my $svcpart (sort {$a->{svcpart} <=> $b->{svcpart}} @{$pkg->{svcparts}}) {
-    foreach my $service (@{$svcpart->{services}}) {
-%>
       <TR>
-        <TD ALIGN="right" VALIGN="top" ROWSPAN=2><%=svc_link($svcpart,$service)%></TD>
-        <TD STYLE="padding-bottom:0px"><B><%=svc_label_link($svcpart,$service)%></B></TD>
+        <TD ALIGN="right" VALIGN="top" ROWSPAN=2><%svc_link($svcpart,$service)%></TD>
+        <TD STYLE="padding-bottom:0px"><B><%svc_label_link($svcpart,$service)%></B></TD>
       </TR>
+% if ( $curuser->access_right('Unprovision customer service') ) { 
 
-      <% if ( $curuser->access_right('Unprovision customer service') ) { %>
         <TR>
-          <TD ALIGN="right" VALIGN="top" STYLE="padding-bottom:5px;padding-top:0px"><FONT SIZE="-2">(&nbsp;<%=svc_unprovision_link($service)%>&nbsp;)</FONT></TD>
+          <TD ALIGN="right" VALIGN="top" STYLE="padding-bottom:5px;padding-top:0px"><FONT SIZE="-2">(&nbsp;<%svc_unprovision_link($service)%>&nbsp;)</FONT></TD>
         </TR>
-      <% } %>
-
-    <% } %>
+% } 
+% } 
+% if ( $curuser->access_right('Provision customer service') 
+%            && $svcpart->{count} < $svcpart->{quantity}
+%          )
+%       {
+%    
 
-    <% if ( $curuser->access_right('Provision customer service') 
-            && $svcpart->{count} < $svcpart->{quantity}
-          )
-       {
-    %>
 
       <TR>
         <TD COLSPAN=2 ALIGN="center" STYLE="padding-bottom:4px;padding-top:0px">
-          <B><%= svc_provision_link($pkg, $svcpart, $conf, $curuser) %></B>
+          <B><% svc_provision_link($pkg, $svcpart, $conf, $curuser) %></B>
         </TD>
       </TR>
+% } 
+% } 
 
-    <% } %>
-
-<% } %>
 
 </TABLE>
 </TD>
+% } #end display packages
+%
 
-<% } #end display packages
-%>
 
 </TABLE>
+% } else { 
 
-<% } else { %>
 <BR>
-<% } %>
-
-<%
-#subroutines
-
-sub get_packages {
-  my $cust_main = shift or return undef;
-  my $conf = shift;
-  
-  my @packages = ();
-  my $method;
-  if (  $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
-     || ( $conf->exists('hidecancelledpackages')
-           && ! $cgi->param('showcancelledpackages') )
-     )
-  {
-    $method = 'ncancelled_pkgs';
-  } else {
-    $method = 'all_pkgs';
-  }
-  
-  foreach my $cust_pkg ( $cust_main->$method() ) {
-  
-    my $part_pkg = $cust_pkg->part_pkg;
-
-    my %pkg = ();
-
-    #to get back to the original object... should use it in the first place!!
-    $pkg{cust_pkg} = $cust_pkg;
-    $pkg{part_pkg} = $part_pkg;
-
-    $pkg{pkgnum} = $cust_pkg->pkgnum;
-    $pkg{pkg} = $part_pkg->pkg;
-    $pkg{pkgpart} = $part_pkg->pkgpart;
-    $pkg{comment} = $part_pkg->getfield('comment');
-    $pkg{freq} = $part_pkg->freq;
-    $pkg{setup} = $cust_pkg->getfield('setup');
-    $pkg{last_bill} = $cust_pkg->getfield('last_bill');
-    $pkg{next_bill} = $cust_pkg->getfield('bill');
-    $pkg{susp} = $cust_pkg->getfield('susp');
-    $pkg{expire} = $cust_pkg->getfield('expire');
-    $pkg{cancel} = $cust_pkg->getfield('cancel');
-
-  
-    my %svcparts = map {
-      $_->svcpart => {
-                       $_->part_svc->hash,
-                       'quantity' => $_->quantity,
-                       'count'    => $cust_pkg->num_cust_svc($_->svcpart),
-                       #'services' => [],
-                     };
-    } $part_pkg->pkg_svc;
-
-    foreach my $cust_svc ( $cust_pkg->cust_svc ) {
-      #warn "svcnum ". $cust_svc->svcnum. " / svcpart ". $cust_svc->svcpart. "\n";
-      my $svc = {
-        'svcnum' => $cust_svc->svcnum,
-        'label'  => ($cust_svc->label)[1],
-      };
-
-      #false laziness with above, to catch extraneous services.  whole
-      #damn thing should be OO...
-      my $svcpart = ( $svcparts{$cust_svc->svcpart} ||= {
-        $cust_svc->part_svc->hash,
-        'quantity' => 0,
-        'count'    => $cust_pkg->num_cust_svc($cust_svc->svcpart),
-        #'services' => [],
-      } );
-
-      push @{$svcpart->{services}}, $svc;
-
-    }
-
-    $pkg{svcparts} = [ values %svcparts ];
-
-    push @packages, \%pkg;
-  
-  }
-  
-  return \@packages;
-
-}
-
-sub svc_link {
-
-  my ($svcpart, $svc) = (shift,shift) or return '';
-  return qq!<A HREF="${p}view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svcpart->{svc}</A>!;
-
-}
-
-sub svc_label_link {
-
-  my ($svcpart, $svc) = (shift,shift) or return '';
-  return qq!<A HREF="${p}view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svc->{label}</A>!;
-
-}
-
-sub svc_provision_link {
-  my ($pkg, $svcpart, $conf, $curuser) = @_;
-  ( my $svc_nbsp = $svcpart->{svc} ) =~ s/\s+/&nbsp;/g;
-  my $num_left = $svcpart->{quantity} - $svcpart->{count};
-  my $pkgnum_svcpart = "pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}";
-
-  my $url;
-  if ( $svcpart->{svcdb} eq 'svc_external'
-       && $conf->exists('svc_external-skip_manual')
-  ) {
-    $url = "${p}edit/process/$svcpart->{svcdb}.cgi?".
-           "pkgnum=$pkg->{pkgnum}&".
-           "svcpart=$svcpart->{svcpart}";
-  } else {
-    $url = "${p}edit/$svcpart->{svcdb}.cgi?$pkgnum_svcpart";
-  }
-
-  my $link = qq!<A CLASS="provision" HREF="$url">!.
-             "Provision&nbsp;$svc_nbsp&nbsp;($num_left)</A>";
-  if ( $conf->exists('legacy_link')
-       && $curuser->access_right('View/link unlinked services')
-     )
-  {
-    $link .= '<BR>'.
-             qq!<A CLASS="provision" HREF="${p}misc/link.cgi?!.
-             qq!$pkgnum_svcpart">!.
-            "Link&nbsp;to&nbsp;legacy&nbsp;$svc_nbsp&nbsp;($num_left)</A>";
-  }
-  $link;
-}
-
-sub svc_unprovision_link {
-  my $svc = shift or return '';
-  qq!<A HREF="javascript:areyousure('${p}misc/unprovision.cgi?$svc->{svcnum}',!.
-  qq!'Permanently unprovision and delete this service?')">Unprovision</A>!;
-}
-
-# This should be generalized to use config options to determine order.
-sub pkgsort_pkgnum_cancel {
-  if ($a->{cancel} and $b->{cancel}) {
-    return ($a->{pkgnum} <=> $b->{pkgnum});
-  } elsif ($a->{cancel} or $b->{cancel}) {
-    return (-1) if ($b->{cancel});
-    return (1) if ($a->{cancel});
-    return (0);
-  } else {
-    return($a->{pkgnum} <=> $b->{pkgnum});
-  }
-}
-
-sub pkg_datestr {
-  my($pkg, $field, $conf) = @_ or return '';
-  return '&nbsp;' unless $pkg->{$field};
-  my $format = '<TD align="left"><B>%b</B></TD>'.
-               '<TD align="right"><B>&nbsp;%o,</B></TD>'.
-               '<TD align="right"><B>&nbsp;%Y</B></TD>';
-  #$format .= '&nbsp;<FONT SIZE=-3>%l:%M:%S%P&nbsp;%z</FONT>'
-  $format .= '<TD ALIGN="right"><B>&nbsp;%l</TD>'.
-             '<TD ALIGN="center"><B>:</B></TD>'.
-             '<TD ALIGN="left"><B>%M</B></TD>'.
-             '<TD ALIGN="left"><B>&nbsp;%P</B></TD>'
-    if $conf->exists('cust_pkg-display_times');
-  ( my $strip = time2str($format, $pkg->{$field}) ) =~ s/ (\d)/$1/g;
-  $strip;
-}
-
-sub pkg_change_link {
-  my $pkg = shift or return '';
-  return qq!<a href="${p}misc/change_pkg.cgi?$pkg->{pkgnum}">!.
-         qq!Change&nbsp;package</a>!;
-}
-
-sub pkg_suspend_link {
-  my $pkg = shift or return '';
-  return qq!<a href="${p}misc/susp_pkg.cgi?$pkg->{pkgnum}">Suspend</a>!;
-}
-
-sub pkg_unsuspend_link {
-  my $pkg = shift or return '';
-  return qq!<a href="${p}misc/unsusp_pkg.cgi?$pkg->{pkgnum}">Unsuspend</a>!;
-}
-
-sub pkg_cancel_link {
-  my $pkg = shift or return '';
-  qq!<A HREF="javascript:areyousure('${p}misc/cancel_pkg.cgi?$pkg->{pkgnum}', !.
-  qq!'Permanently delete included services and cancel this package?')">!.
-  qq!Cancel now</A>!;
-}
-
-sub pkg_expire_link {
-  my $pkg = shift or return '';
-  qq!<A HREF="${p}misc/expire_pkg.cgi?$pkg->{pkgnum}">Cancel later</A>!;
-}
-
-sub pkg_dates_link {
-  my $pkg = shift or return '';
-  qq!<A HREF="${p}edit/REAL_cust_pkg.cgi?$pkg->{pkgnum}">Edit&nbsp;dates</A>!;
-}
-
-sub pkg_customize_link {
-  my $pkg = shift or return '';
-  my $custnum = shift;
-  qq!<A HREF="${p}edit/part_pkg.cgi?keywords=$custnum;clone=$pkg->{pkgpart};!.
-  qq!pkgnum=$pkg->{pkgnum}">Customize</A>!;
-}
-
-%>
+% } 
+%
+%#subroutines
+%
+%sub get_packages {
+%  my $cust_main = shift or return undef;
+%  my $conf = shift;
+%  
+%  my @packages = ();
+%  my $method;
+%  if (  $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
+%     || ( $conf->exists('hidecancelledpackages')
+%           && ! $cgi->param('showcancelledpackages') )
+%     )
+%  {
+%    $method = 'ncancelled_pkgs';
+%  } else {
+%    $method = 'all_pkgs';
+%  }
+%  
+%  foreach my $cust_pkg ( $cust_main->$method() ) {
+%  
+%    my $part_pkg = $cust_pkg->part_pkg;
+%
+%    my %pkg = ();
+%
+%    #to get back to the original object... should use it in the first place!!
+%    $pkg{cust_pkg} = $cust_pkg;
+%    $pkg{part_pkg} = $part_pkg;
+%
+%    $pkg{pkgnum} = $cust_pkg->pkgnum;
+%    $pkg{pkg} = $part_pkg->pkg;
+%    $pkg{pkgpart} = $part_pkg->pkgpart;
+%    $pkg{comment} = $part_pkg->getfield('comment');
+%    $pkg{freq} = $part_pkg->freq;
+%    $pkg{setup} = $cust_pkg->getfield('setup');
+%    $pkg{last_bill} = $cust_pkg->getfield('last_bill');
+%    $pkg{next_bill} = $cust_pkg->getfield('bill');
+%    $pkg{susp} = $cust_pkg->getfield('susp');
+%    $pkg{expire} = $cust_pkg->getfield('expire');
+%    $pkg{cancel} = $cust_pkg->getfield('cancel');
+%
+%  
+%    my %svcparts = map {
+%      $_->svcpart => {
+%                       $_->part_svc->hash,
+%                       'quantity' => $_->quantity,
+%                       'count'    => $cust_pkg->num_cust_svc($_->svcpart),
+%                       #'services' => [],
+%                     };
+%    } $part_pkg->pkg_svc;
+%
+%    foreach my $cust_svc ( $cust_pkg->cust_svc ) {
+%      #warn "svcnum ". $cust_svc->svcnum. " / svcpart ". $cust_svc->svcpart. "\n";
+%      my $svc = {
+%        'svcnum' => $cust_svc->svcnum,
+%        'label'  => ($cust_svc->label)[1],
+%      };
+%
+%      #false laziness with above, to catch extraneous services.  whole
+%      #damn thing should be OO...
+%      my $svcpart = ( $svcparts{$cust_svc->svcpart} ||= {
+%        $cust_svc->part_svc->hash,
+%        'quantity' => 0,
+%        'count'    => $cust_pkg->num_cust_svc($cust_svc->svcpart),
+%        #'services' => [],
+%      } );
+%
+%      push @{$svcpart->{services}}, $svc;
+%
+%    }
+%
+%    $pkg{svcparts} = [ values %svcparts ];
+%
+%    push @packages, \%pkg;
+%  
+%  }
+%  
+%  return \@packages;
+%
+%}
+%
+%sub svc_link {
+%
+%  my ($svcpart, $svc) = (shift,shift) or return '';
+%  return qq!<A HREF="${p}view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svcpart->{svc}</A>!;
+%
+%}
+%
+%sub svc_label_link {
+%
+%  my ($svcpart, $svc) = (shift,shift) or return '';
+%  return qq!<A HREF="${p}view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svc->{label}</A>!;
+%
+%}
+%
+%sub svc_provision_link {
+%  my ($pkg, $svcpart, $conf, $curuser) = @_;
+%  ( my $svc_nbsp = $svcpart->{svc} ) =~ s/\s+/&nbsp;/g;
+%  my $num_left = $svcpart->{quantity} - $svcpart->{count};
+%  my $pkgnum_svcpart = "pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}";
+%
+%  my $url;
+%  if ( $svcpart->{svcdb} eq 'svc_external'
+%       && $conf->exists('svc_external-skip_manual')
+%  ) {
+%    $url = "${p}edit/process/$svcpart->{svcdb}.cgi?".
+%           "pkgnum=$pkg->{pkgnum}&".
+%           "svcpart=$svcpart->{svcpart}";
+%  } else {
+%    $url = "${p}edit/$svcpart->{svcdb}.cgi?$pkgnum_svcpart";
+%  }
+%
+%  my $link = qq!<A CLASS="provision" HREF="$url">!.
+%             "Provision&nbsp;$svc_nbsp&nbsp;($num_left)</A>";
+%  if ( $conf->exists('legacy_link')
+%       && $curuser->access_right('View/link unlinked services')
+%     )
+%  {
+%    $link .= '<BR>'.
+%             qq!<A CLASS="provision" HREF="${p}misc/link.cgi?!.
+%             qq!$pkgnum_svcpart">!.
+%            "Link&nbsp;to&nbsp;legacy&nbsp;$svc_nbsp&nbsp;($num_left)</A>";
+%  }
+%  $link;
+%}
+%
+%sub svc_unprovision_link {
+%  my $svc = shift or return '';
+%  qq!<A HREF="javascript:areyousure('${p}misc/unprovision.cgi?$svc->{svcnum}',!.
+%  qq!'Permanently unprovision and delete this service?')">Unprovision</A>!;
+%}
+%
+%# This should be generalized to use config options to determine order.
+%sub pkgsort_pkgnum_cancel {
+%  if ($a->{cancel} and $b->{cancel}) {
+%    return ($a->{pkgnum} <=> $b->{pkgnum});
+%  } elsif ($a->{cancel} or $b->{cancel}) {
+%    return (-1) if ($b->{cancel});
+%    return (1) if ($a->{cancel});
+%    return (0);
+%  } else {
+%    return($a->{pkgnum} <=> $b->{pkgnum});
+%  }
+%}
+%
+%sub pkg_datestr {
+%  my($pkg, $field, $conf) = @_ or return '';
+%  return '&nbsp;' unless $pkg->{$field};
+%  my $format = '<TD align="left"><B>%b</B></TD>'.
+%               '<TD align="right"><B>&nbsp;%o,</B></TD>'.
+%               '<TD align="right"><B>&nbsp;%Y</B></TD>';
+%  #$format .= '&nbsp;<FONT SIZE=-3>%l:%M:%S%P&nbsp;%z</FONT>'
+%  $format .= '<TD ALIGN="right"><B>&nbsp;%l</TD>'.
+%             '<TD ALIGN="center"><B>:</B></TD>'.
+%             '<TD ALIGN="left"><B>%M</B></TD>'.
+%             '<TD ALIGN="left"><B>&nbsp;%P</B></TD>'
+%    if $conf->exists('cust_pkg-display_times');
+%  ( my $strip = time2str($format, $pkg->{$field}) ) =~ s/ (\d)/$1/g;
+%  $strip;
+%}
+%
+%sub pkg_change_link {
+%  my $pkg = shift or return '';
+%  return qq!<a href="${p}misc/change_pkg.cgi?$pkg->{pkgnum}">!.
+%         qq!Change&nbsp;package</a>!;
+%}
+%
+%sub pkg_suspend_link {
+%  my $pkg = shift or return '';
+%  return qq!<a href="${p}misc/susp_pkg.cgi?$pkg->{pkgnum}">Suspend</a>!;
+%}
+%
+%sub pkg_unsuspend_link {
+%  my $pkg = shift or return '';
+%  return qq!<a href="${p}misc/unsusp_pkg.cgi?$pkg->{pkgnum}">Unsuspend</a>!;
+%}
+%
+%sub pkg_cancel_link {
+%  my $pkg = shift or return '';
+%  qq!<A HREF="javascript:areyousure('${p}misc/cancel_pkg.cgi?$pkg->{pkgnum}', !.
+%  qq!'Permanently delete included services and cancel this package?')">!.
+%  qq!Cancel now</A>!;
+%}
+%
+%sub pkg_expire_link {
+%  my $pkg = shift or return '';
+%  qq!<A HREF="${p}misc/expire_pkg.cgi?$pkg->{pkgnum}">Cancel later</A>!;
+%}
+%
+%sub pkg_dates_link {
+%  my $pkg = shift or return '';
+%  qq!<A HREF="${p}edit/REAL_cust_pkg.cgi?$pkg->{pkgnum}">Edit&nbsp;dates</A>!;
+%}
+%
+%sub pkg_customize_link {
+%  my $pkg = shift or return '';
+%  my $custnum = shift;
+%  qq!<A HREF="${p}edit/part_pkg.cgi?keywords=$custnum;clone=$pkg->{pkgpart};!.
+%  qq!pkgnum=$pkg->{pkgnum}">Customize</A>!;
+%}
+%
+%
+
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index aef5fb8f8..244635c9a 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -1,421 +1,416 @@
-<%
-  my( $cust_main ) = @_;
-  my $custnum = $cust_main->custnum;
+%
+%  my( $cust_main ) = @_;
+%  my $custnum = $cust_main->custnum;
+%
+%  my $conf = new FS::Conf;
+%
+%  my $curuser = $FS::CurrentUser::CurrentUser;
+%
+%  my @payby = grep /\w/, $conf->config('payby');
+%  #@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP ))
+%  @payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP ))
+%    unless @payby;
+%  my %payby = map { $_=>1 } @payby;
+%
+%  my $s = 0;
+%
+%
 
-  my $conf = new FS::Conf;
-
-  my $curuser = $FS::CurrentUser::CurrentUser;
-
-  my @payby = grep /\w/, $conf->config('payby');
-  #@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP ))
-  @payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP ))
-    unless @payby;
-  my %payby = map { $_=>1 } @payby;
-
-  my $s = 0;
-
-%>
 
 <BR><BR><A NAME="history"><FONT SIZE="+2">Payment History</FONT></A><BR>
+% if ( $payby{'BILL'} && $curuser->access_right('Post payment') ) { 
 
-<% if ( $payby{'BILL'} && $curuser->access_right('Post payment') ) { %>
-
-  <%= $s++ ? ' | ' : '' %>
-  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_pay.cgi?popup=1;payby=BILL;custnum=<%= $custnum %>', 392, 336, 'cust_pay_popup' ), CAPTION, 'Enter check payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Enter check payment</A>
-
-<% } %>
-
-<% if ( $payby{'CASH'} && $curuser->access_right('Post payment') ) { %>
-
-  <%= $s++ ? ' | ' : '' %>
-  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_pay.cgi?popup=1;payby=CASH;custnum=<%= $custnum %>', 392, 336, 'cust_pay_popup' ), CAPTION, 'Enter cash payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Enter cash payment</A>
 
-<% } %>
+  <% $s++ ? ' | ' : '' %>
+  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<% $p %>edit/cust_pay.cgi?popup=1;payby=BILL;custnum=<% $custnum %>', 392, 336, 'cust_pay_popup' ), CAPTION, 'Enter check payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Enter check payment</A>
+% } 
+% if ( $payby{'CASH'} && $curuser->access_right('Post payment') ) { 
 
-<% if ( $payby{'WEST'} && $curuser->access_right('Post payment') ) { %>
 
-  <%= $s++ ? ' | ' : '' %>
-  <A HREF="<%= $p %>edit/cust_pay.cgi?payby=WEST;custnum=<%= $custnum %>">Enter Western Union payment</A>
+  <% $s++ ? ' | ' : '' %>
+  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<% $p %>edit/cust_pay.cgi?popup=1;payby=CASH;custnum=<% $custnum %>', 392, 336, 'cust_pay_popup' ), CAPTION, 'Enter cash payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Enter cash payment</A>
+% } 
+% if ( $payby{'WEST'} && $curuser->access_right('Post payment') ) { 
 
-<% } %>
 
-<% if ( ( $payby{'CARD'} || $payby{'DCRD'} )
-        && $curuser->access_right('Process payment')
-      ) {
-%>
+  <% $s++ ? ' | ' : '' %>
+  <A HREF="<% $p %>edit/cust_pay.cgi?payby=WEST;custnum=<% $custnum %>">Enter Western Union payment</A>
+% } 
+% if ( ( $payby{'CARD'} || $payby{'DCRD'} )
+%        && $curuser->access_right('Process payment')
+%      ) {
+%
 
-  <%= $s++ ? ' | ' : '' %>
-  <A HREF="<%= $p %>misc/payment.cgi?payby=CARD;custnum=<%= $custnum %>">Process credit card payment</A>
 
-<% } %>
+  <% $s++ ? ' | ' : '' %>
+  <A HREF="<% $p %>misc/payment.cgi?payby=CARD;custnum=<% $custnum %>">Process credit card payment</A>
+% } 
+% if ( ( $payby{'CHEK'} || $payby{'DCHK'} )
+%        && $curuser->access_right('Process payment')
+%      ) {
+%
 
-<% if ( ( $payby{'CHEK'} || $payby{'DCHK'} )
-        && $curuser->access_right('Process payment')
-      ) {
-%>
 
-  <%= $s++ ? ' | ' : '' %>
-  <A HREF="<%= $p %>misc/payment.cgi?payby=CHEK;custnum=<%= $custnum %>">Process electronic check (ACH) payment</A>
+  <% $s++ ? ' | ' : '' %>
+  <A HREF="<% $p %>misc/payment.cgi?payby=CHEK;custnum=<% $custnum %>">Process electronic check (ACH) payment</A>
+% } 
+% if ( $payby{'MCRD'} && $curuser->access_right('Post payment') ) { 
 
-<% } %>
 
-<% if ( $payby{'MCRD'} && $curuser->access_right('Post payment') ) { %>
+  <% $s++ ? ' | ' : '' %>
+  <A HREF="<% $p %>edit/cust_pay.cgi?payby=MCRD;custnum=<% $custnum %>">Post manual (offline) credit card payment</A>
+% } 
 
-  <%= $s++ ? ' | ' : '' %>
-  <A HREF="<%= $p %>edit/cust_pay.cgi?payby=MCRD;custnum=<%= $custnum %>">Post manual (offline) credit card payment</A>
-
-<% } %>
 
 <BR>
+% if ( $curuser->access_right('Post credit') ) { 
 
-<% if ( $curuser->access_right('Post credit') ) { %>
 
-  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_credit.cgi?<%= $custnum %>', 392, 336, 'cust_credit_popup' ), CAPTION, 'Enter credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Enter credit</A>
+  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<% $p %>edit/cust_credit.cgi?<% $custnum %>', 392, 336, 'cust_credit_popup' ), CAPTION, 'Enter credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Enter credit</A>
 
   <BR>
+% } 
+%
+%#get payment history
+%my @history = ();
+%
+%#invoices
+%foreach my $cust_bill ($cust_main->cust_bill) {
+%  my $pre = ( $cust_bill->owed > 0 )
+%              ? '<B><FONT SIZE="+1" COLOR="#FF0000">Open '
+%              : '';
+%  my $post = ( $cust_bill->owed > 0 ) ? '</FONT></B>' : '';
+%  my $invnum = $cust_bill->invnum;
+%  my $link = $curuser->access_right('View invoices')
+%               ? qq!<A HREF="${p}view/cust_bill.cgi?$invnum">!
+%               : '';
+%  push @history, {
+%    'date'   => $cust_bill->_date,
+%    'desc'   => $link. $pre.
+%                "Invoice #$invnum (Balance \$". $cust_bill->owed. ')'.
+%                $post. ( $link ? '</A>' : '' ),
+%    'charge' => $cust_bill->charged,
+%  };
+%}
+%
+%#payments (some false laziness w/credits)
+%foreach my $cust_pay ($cust_main->cust_pay) {
+%
+%  my $payby = $cust_pay->payby;
+%
+%  my $payinfo;
+%  if ( $payby eq 'CARD' ) {
+%    $payinfo = $cust_pay->payinfo_masked;
+%  } elsif ( $payby eq 'CHEK' && $cust_pay->payinfo =~ /^(\d+)\@(\d+)$/ ) {
+%    $payinfo = "ABA $2, Acct# $1";
+%  } else {
+%    $payinfo = $cust_pay->payinfo;
+%  }
+%  my @cust_bill_pay = $cust_pay->cust_bill_pay;
+%  my @cust_pay_refund = $cust_pay->cust_pay_refund;
+%
+%  my $target = "$payby$payinfo";
+%  $payby =~ s/^BILL$/Check #/ if $payinfo;
+%  $payby =~ s/^CHEK$/Electronic check /;
+%  $payby =~ s/^PREP$/Prepaid card /;
+%  $payby =~ s/^CARD$/Credit card #/; 
+%  $payby =~ s/^COMP$/Complimentary by /; 
+%  $payby =~ s/^CASH$/Cash/;
+%  $payby =~ s/^WEST$/Western Union/;
+%  $payby =~ s/^MCRD$/Manual credit card/;
+%  $payby =~ s/^BILL$//;
+%  my $info = $payby ? " ($payby$payinfo)" : '';
+%
+%  my( $pre, $post, $desc, $apply, $ext ) = ( '', '', '', '', '' );
+%  if (    scalar(@cust_bill_pay)   == 0
+%       && scalar(@cust_pay_refund) == 0 ) {
+%    #completely unapplied
+%    $pre = '<B><FONT COLOR="#FF0000">Unapplied ';
+%    $post = '</FONT></B>';
+%    $apply = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_bill_pay.cgi?!.
+%             $cust_pay->paynum.
+%             qq!', 392, 336, 'cust_bill_pay_popup' ), CAPTION, 'Apply payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
+%
+%  } elsif (    scalar(@cust_bill_pay)   == 1
+%            && scalar(@cust_pay_refund) == 0
+%            && $cust_pay->unapplied == 0     ) {
+%    #applied to one invoice, the usual situation
+%    $desc = ' applied to Invoice #'. $cust_bill_pay[0]->invnum;
+%  } elsif (    scalar(@cust_bill_pay)   == 0
+%            && scalar(@cust_pay_refund) == 1
+%            && $cust_pay->unapplied == 0     ) {
+%    #applied to one refund
+%    $desc = ' refunded on '. time2str("%D", $cust_pay_refund[0]->_date);
+%  } else {
+%    #complicated
+%    $desc = '<BR>';
+%    foreach my $app ( sort { $a->_date <=> $b->_date }
+%                           ( @cust_bill_pay, @cust_pay_refund ) ) {
+%      if ( $app->isa('FS::cust_bill_pay') ) {
+%        $desc .= '&nbsp;&nbsp;'.
+%                 '$'. $app->amount.
+%                 ' applied to Invoice #'. $app->invnum.
+%                 '<BR>';
+%                 #' on '. time2str("%D", $cust_bill_pay->_date).
+%      } elsif ( $app->isa('FS::cust_pay_refund') ) {
+%        $desc .= '&nbsp;&nbsp;'.
+%                 '$'. $app->amount.
+%                 ' refunded on '. time2str("%D", $app->_date).
+%                 '<BR>';
+%      } else {
+%        die "$app is not a FS::cust_bill_pay or FS::cust_pay_refund";
+%      }
+%    }
+%    if ( $cust_pay->unapplied > 0 ) {
+%      $desc .= '&nbsp;&nbsp;'.
+%               '<B><FONT COLOR="#FF0000">$'.
+%               $cust_pay->unapplied. ' unapplied</FONT></B>'.
+%               qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_bill_pay.cgi?!.
+%               $cust_pay->paynum. 
+%               qq!', 392, 336, 'cust_bill_pay_popup' ), CAPTION, 'Apply payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
+%               '<BR>';
+%    }
+%  }
+%
+%  my $refund = '';
+%  my $refund_days = $conf->config('card_refund-days') || 120;
+%  if (    $cust_pay->closed !~ /^Y/i
+%       && $cust_pay->payby =~ /^(CARD|CHEK)$/
+%       && time-$cust_pay->_date < $refund_days*86400
+%       && $cust_pay->unrefunded > 0
+%       && $curuser->access_right('Refund payment')
+%  ) {
+%    $refund = qq! (<A HREF="${p}edit/cust_refund.cgi?payby=$1;!.
+%              qq!paynum=!. $cust_pay->paynum. '"'.
+%              qq! TITLE="Send a refund for this payment to the payment gateway"!.
+%              qq!>refund</A>)!;
+%  }
+%
+%  my $void = '';
+%  if (    $cust_pay->closed !~ /^Y/i
+%       && (    ( $cust_pay->payby eq 'CARD'
+%                 && $curuser->access_right('Credit card void')
+%               )
+%            || ( $cust_pay->payby eq 'CHEK'
+%                 && $curuser->access_right('Echeck void')
+%               )
+%            || ( $cust_pay->payby !~ /^(CARD|CHEK)$/
+%                 && $curuser->access_right('Regular void')
+%               )
+%          )
+%     )
+%  {
+%    $void = qq! (<A HREF="javascript:areyousure('!.
+%            qq!${p}misc/void-cust_pay.cgi?!. $cust_pay->paynum.
+%            qq!', 'Are you sure you want to void this payment?')"!.
+%            qq! TITLE="Void this payment from the database!.
+%              ( $cust_pay->payby =~ /^(CARD|CHEK)$/
+%                ? ' (do not send anything to the payment gateway)'
+%                : '' 
+%              ). '"'.
+%            qq!>void</A>)!;
+%  }
+%
+%  my $delete = '';
+%  if ( $cust_pay->closed !~ /^Y/i
+%       && $conf->exists('deletepayments')
+%       && $curuser->access_right('Delete payment')
+%     )
+%  {
+%    $delete = qq! (<A HREF="javascript:areyousure('!.
+%              qq!${p}misc/delete-cust_pay.cgi?!. $cust_pay->paynum.
+%              qq!', 'Are you sure you want to delete this payment?')"!.
+%              qq! TITLE="Delete this payment from the database completely - not recommended"!.
+%              qq!>delete</A>)!;
+%  }
+%
+%  my $unapply = '';
+%  if (    $cust_pay->closed !~ /^Y/i
+%       && scalar(@cust_bill_pay)           
+%       && $curuser->access_right('Unapply payment')
+%     )
+%  {
+%    $unapply = qq! (<A HREF="javascript:areyousure('!.
+%               qq!${p}misc/unapply-cust_pay.cgi?!. $cust_pay->paynum.
+%               qq!', 'Are you sure you want to unapply this payment?')"!.
+%               qq! TITLE="Keep this payment, but dissociate it from the invoices it is currently applied against"!.
+%               qq!>unapply</A>)!;
+%  }
+%
+%  push @history, {
+%    'date'    => $cust_pay->_date,
+%    'desc'    => $pre. "Payment$post$info$desc".
+%                 "$apply$refund$void$delete$unapply",
+%    'payment' => $cust_pay->paid,
+%    'target'  => $target,
+%  };
+%}
+%
+%#voided payments
+%foreach my $cust_pay_void ($cust_main->cust_pay_void) {
+%
+%  my $payby = $cust_pay_void->payby;
+%  my $payinfo = $payby eq 'CARD'
+%                  ? $cust_pay_void->payinfo_masked
+%                  : $cust_pay_void->payinfo;
+%
+%  $payby =~ s/^BILL$/Check #/ if $payinfo;
+%  $payby =~ s/^CHEK$/Electronic check /;
+%  $payby =~ s/^BILL$//;
+%  $payby =~ s/^(CARD|COMP)$/$1 /;
+%  my $info = $payby ? " ($payby$payinfo)" : '';
+%
+%  my $unvoid = '';
+%  if ( $cust_pay_void->closed !~ /^Y/i
+%       && $curuser->access_right('Unvoid')
+%     )
+%  {
+%    $unvoid = qq! (<A HREF="javascript:areyousure('!.
+%              qq!${p}misc/unvoid-cust_pay_void.cgi?!. $cust_pay_void->paynum.
+%              qq!', 'Are you sure you want to unvoid this payment?')"!.
+%              qq! TITLE="Unvoid this payment from the database!.
+%                ( $cust_pay_void->payby =~ /^(CARD|CHEK)$/
+%                  ? ' (do not send anything to the payment gateway)'
+%                  : '' 
+%                ). '"'.
+%              qq!>unvoid</A>)!;
+%  }
+%
+%  push @history, {
+%    'date'   => $cust_pay_void->_date,
+%    'desc'   => "<DEL>Payment $info</DEL> <I>voided ".
+%                time2str("%D", $cust_pay_void->void_date).
+%                " by ". $cust_pay_void->otaker. '</i>'. $unvoid,
+%    'void_payment' => $cust_pay_void->paid,
+%  };
+%
+%}
+%
+%#credits (some false laziness w/payments)
+%foreach my $cust_credit ($cust_main->cust_credit) {
+%
+%  my @cust_credit_bill = $cust_credit->cust_credit_bill;
+%  my @cust_credit_refund = $cust_credit->cust_credit_refund;
+%
+%  my( $pre, $post, $desc, $apply, $ext ) = ( '', '', '', '', '' );
+%  if (    scalar(@cust_credit_bill)   == 0
+%       && scalar(@cust_credit_refund) == 0 ) {
+%    #completely unapplied
+%    $pre = '<B><FONT COLOR="#FF0000">Unapplied ';
+%    $post = '</FONT></B>';
+%    $apply = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_credit_bill.cgi?!.
+%             $cust_credit->crednum.
+%             qq!', 392, 336, 'cust_credit_bill_popup' ), CAPTION, 'Apply credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
+%  } elsif (    scalar(@cust_credit_bill)   == 1
+%            && scalar(@cust_credit_refund) == 0
+%            && $cust_credit->credited == 0      ) {
+%    #applied to one invoice, the usual situation
+%    $desc = ' applied to Invoice #'. $cust_credit_bill[0]->invnum;
+%  } elsif (    scalar(@cust_credit_bill)   == 0
+%            && scalar(@cust_credit_refund) == 1
+%            && $cust_credit->credited == 0      ) {
+%    #applied to one refund
+%    $desc = ' refunded on '.  time2str("%D", $cust_credit_refund[0]->_date);
+%  } else {
+%    #complicated
+%    $desc = '<BR>';
+%    foreach my $app ( sort { $a->_date <=> $b->_date }
+%                           ( @cust_credit_bill, @cust_credit_refund ) ) {
+%      if ( $app->isa('FS::cust_credit_bill') ) {
+%        $desc .= '&nbsp;&nbsp;'.
+%                 '$'. $app->amount.
+%                 ' applied to Invoice #'. $app->invnum.
+%                 '<BR>';
+%                 #' on '. time2str("%D", $app->_date).
+%      } elsif ( $app->isa('FS::cust_credit_refund') ) {
+%        $desc .= '&nbsp;&nbsp;'.
+%                 '$'. $app->amount.
+%                 ' refunded on '. time2str("%D", $app->_date).
+%                 '<BR>';
+%      } else {
+%        die "$app is not a FS::cust_credit_bill or a FS::cust_credit_refund";
+%      }
+%    }
+%    if ( $cust_credit->credited > 0 ) {
+%      $desc .= '&nbsp;&nbsp;<B><FONT COLOR="#FF0000">$'.
+%               $cust_credit->credited. ' unapplied</FONT></B>'.
+%               qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_credit_bill.cgi?!.
+%               $cust_credit->crednum.
+%               qq!', 392, 336, 'cust_credit_bill_popup' ), CAPTION, 'Apply credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
+%               '<BR>';
+%    }
+%  }
+%#
+%  my $delete = '';
+%  if ( $cust_credit->closed !~ /^Y/i
+%
+%       #s'pose deleting a credit isn't bad like deleting a payment
+%       # and this needs to be generally available until we have credit voiding..
+%       #&& $conf->exists('deletecredits')
+%
+%       && $curuser->access_right('Delete credit')
+%     )
+%  {
+%    $delete = qq! (<A HREF="javascript:areyousure('!.
+%              qq!${p}misc/delete-cust_credit.cgi?!. $cust_credit->crednum.
+%              qq!', 'Are you sure you want to delete this credit?')">!.
+%              qq!delete</A>)!;
+%  }
+%  
+%  my $unapply = '';
+%  if (    $cust_credit->closed !~ /^Y/i
+%       && scalar(@cust_credit_bill)
+%       && $curuser->access_right('Unapply credit')
+%     )
+%  {
+%    $unapply = qq! (<A HREF="javascript:areyousure('!.
+%               qq!${p}misc/unapply-cust_credit.cgi?!. $cust_credit->crednum.
+%               qq!', 'Are you sure you want to unapply this credit?')">!.
+%               qq!unapply</A>)!;
+%  }
+%  
+%  push @history, {
+%    'date'   => $cust_credit->_date,
+%    'desc'   => $pre. "Credit$post by ". $cust_credit->otaker.
+%                ( $cust_credit->reason
+%		    ? ' ('. $cust_credit->reason. ')'
+%		    : ''
+%		).
+%                "$desc$apply$delete$unapply",
+%    'credit' => $cust_credit->amount,
+%  };
+%
+%}
+%
+%#refunds
+%foreach my $cust_refund ($cust_main->cust_refund) {
+%
+%  my $payby = $cust_refund->payby;
+%  my $payinfo = $payby eq 'CARD'
+%                  ? $cust_refund->payinfo_masked
+%                  : $cust_refund->payinfo;
+%
+%  $payby =~ s/^BILL$/Check #/ if $payinfo;
+%  $payby =~ s/^CHEK$/Electronic check /;
+%  $payby =~ s/^(CARD|COMP)$/$1 /;
+%
+%  push @history, {
+%    'date'   => $cust_refund->_date,
+%    'desc'   => "Refund ($payby$payinfo) by ". $cust_refund->otaker,
+%    'refund' => $cust_refund->refund,
+%  };
+%
+%}
+%
+%
+
+
+<% include("/elements/table-grid.html") %>
+% my $bgcolor1 = '#eeeeee';
+%   my $bgcolor2 = '#ffffff';
+%   my $bgcolor = '';
+%
 
-<% } %>
-
-<%
-#get payment history
-my @history = ();
-
-#invoices
-foreach my $cust_bill ($cust_main->cust_bill) {
-  my $pre = ( $cust_bill->owed > 0 )
-              ? '<B><FONT SIZE="+1" COLOR="#FF0000">Open '
-              : '';
-  my $post = ( $cust_bill->owed > 0 ) ? '</FONT></B>' : '';
-  my $invnum = $cust_bill->invnum;
-  my $link = $curuser->access_right('View invoices')
-               ? qq!<A HREF="${p}view/cust_bill.cgi?$invnum">!
-               : '';
-  push @history, {
-    'date'   => $cust_bill->_date,
-    'desc'   => $link. $pre.
-                "Invoice #$invnum (Balance \$". $cust_bill->owed. ')'.
-                $post. ( $link ? '</A>' : '' ),
-    'charge' => $cust_bill->charged,
-  };
-}
-
-#payments (some false laziness w/credits)
-foreach my $cust_pay ($cust_main->cust_pay) {
-
-  my $payby = $cust_pay->payby;
-
-  my $payinfo;
-  if ( $payby eq 'CARD' ) {
-    $payinfo = $cust_pay->payinfo_masked;
-  } elsif ( $payby eq 'CHEK' && $cust_pay->payinfo =~ /^(\d+)\@(\d+)$/ ) {
-    $payinfo = "ABA $2, Acct# $1";
-  } else {
-    $payinfo = $cust_pay->payinfo;
-  }
-  my @cust_bill_pay = $cust_pay->cust_bill_pay;
-  my @cust_pay_refund = $cust_pay->cust_pay_refund;
-
-  my $target = "$payby$payinfo";
-  $payby =~ s/^BILL$/Check #/ if $payinfo;
-  $payby =~ s/^CHEK$/Electronic check /;
-  $payby =~ s/^PREP$/Prepaid card /;
-  $payby =~ s/^CARD$/Credit card #/; 
-  $payby =~ s/^COMP$/Complimentary by /; 
-  $payby =~ s/^CASH$/Cash/;
-  $payby =~ s/^WEST$/Western Union/;
-  $payby =~ s/^MCRD$/Manual credit card/;
-  $payby =~ s/^BILL$//;
-  my $info = $payby ? " ($payby$payinfo)" : '';
-
-  my( $pre, $post, $desc, $apply, $ext ) = ( '', '', '', '', '' );
-  if (    scalar(@cust_bill_pay)   == 0
-       && scalar(@cust_pay_refund) == 0 ) {
-    #completely unapplied
-    $pre = '<B><FONT COLOR="#FF0000">Unapplied ';
-    $post = '</FONT></B>';
-    $apply = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_bill_pay.cgi?!.
-             $cust_pay->paynum.
-             qq!', 392, 336, 'cust_bill_pay_popup' ), CAPTION, 'Apply payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
-
-  } elsif (    scalar(@cust_bill_pay)   == 1
-            && scalar(@cust_pay_refund) == 0
-            && $cust_pay->unapplied == 0     ) {
-    #applied to one invoice, the usual situation
-    $desc = ' applied to Invoice #'. $cust_bill_pay[0]->invnum;
-  } elsif (    scalar(@cust_bill_pay)   == 0
-            && scalar(@cust_pay_refund) == 1
-            && $cust_pay->unapplied == 0     ) {
-    #applied to one refund
-    $desc = ' refunded on '. time2str("%D", $cust_pay_refund[0]->_date);
-  } else {
-    #complicated
-    $desc = '<BR>';
-    foreach my $app ( sort { $a->_date <=> $b->_date }
-                           ( @cust_bill_pay, @cust_pay_refund ) ) {
-      if ( $app->isa('FS::cust_bill_pay') ) {
-        $desc .= '&nbsp;&nbsp;'.
-                 '$'. $app->amount.
-                 ' applied to Invoice #'. $app->invnum.
-                 '<BR>';
-                 #' on '. time2str("%D", $cust_bill_pay->_date).
-      } elsif ( $app->isa('FS::cust_pay_refund') ) {
-        $desc .= '&nbsp;&nbsp;'.
-                 '$'. $app->amount.
-                 ' refunded on '. time2str("%D", $app->_date).
-                 '<BR>';
-      } else {
-        die "$app is not a FS::cust_bill_pay or FS::cust_pay_refund";
-      }
-    }
-    if ( $cust_pay->unapplied > 0 ) {
-      $desc .= '&nbsp;&nbsp;'.
-               '<B><FONT COLOR="#FF0000">$'.
-               $cust_pay->unapplied. ' unapplied</FONT></B>'.
-               qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_bill_pay.cgi?!.
-               $cust_pay->paynum. 
-               qq!', 392, 336, 'cust_bill_pay_popup' ), CAPTION, 'Apply payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
-               '<BR>';
-    }
-  }
-
-  my $refund = '';
-  my $refund_days = $conf->config('card_refund-days') || 120;
-  if (    $cust_pay->closed !~ /^Y/i
-       && $cust_pay->payby =~ /^(CARD|CHEK)$/
-       && time-$cust_pay->_date < $refund_days*86400
-       && $cust_pay->unrefunded > 0
-       && $curuser->access_right('Refund payment')
-  ) {
-    $refund = qq! (<A HREF="${p}edit/cust_refund.cgi?payby=$1;!.
-              qq!paynum=!. $cust_pay->paynum. '"'.
-              qq! TITLE="Send a refund for this payment to the payment gateway"!.
-              qq!>refund</A>)!;
-  }
-
-  my $void = '';
-  if (    $cust_pay->closed !~ /^Y/i
-       && (    ( $cust_pay->payby eq 'CARD'
-                 && $curuser->access_right('Credit card void')
-               )
-            || ( $cust_pay->payby eq 'CHEK'
-                 && $curuser->access_right('Echeck void')
-               )
-            || ( $cust_pay->payby !~ /^(CARD|CHEK)$/
-                 && $curuser->access_right('Regular void')
-               )
-          )
-     )
-  {
-    $void = qq! (<A HREF="javascript:areyousure('!.
-            qq!${p}misc/void-cust_pay.cgi?!. $cust_pay->paynum.
-            qq!', 'Are you sure you want to void this payment?')"!.
-            qq! TITLE="Void this payment from the database!.
-              ( $cust_pay->payby =~ /^(CARD|CHEK)$/
-                ? ' (do not send anything to the payment gateway)'
-                : '' 
-              ). '"'.
-            qq!>void</A>)!;
-  }
-
-  my $delete = '';
-  if ( $cust_pay->closed !~ /^Y/i
-       && $conf->exists('deletepayments')
-       && $curuser->access_right('Delete payment')
-     )
-  {
-    $delete = qq! (<A HREF="javascript:areyousure('!.
-              qq!${p}misc/delete-cust_pay.cgi?!. $cust_pay->paynum.
-              qq!', 'Are you sure you want to delete this payment?')"!.
-              qq! TITLE="Delete this payment from the database completely - not recommended"!.
-              qq!>delete</A>)!;
-  }
-
-  my $unapply = '';
-  if (    $cust_pay->closed !~ /^Y/i
-       && scalar(@cust_bill_pay)           
-       && $curuser->access_right('Unapply payment')
-     )
-  {
-    $unapply = qq! (<A HREF="javascript:areyousure('!.
-               qq!${p}misc/unapply-cust_pay.cgi?!. $cust_pay->paynum.
-               qq!', 'Are you sure you want to unapply this payment?')"!.
-               qq! TITLE="Keep this payment, but dissociate it from the invoices it is currently applied against"!.
-               qq!>unapply</A>)!;
-  }
-
-  push @history, {
-    'date'    => $cust_pay->_date,
-    'desc'    => $pre. "Payment$post$info$desc".
-                 "$apply$refund$void$delete$unapply",
-    'payment' => $cust_pay->paid,
-    'target'  => $target,
-  };
-}
-
-#voided payments
-foreach my $cust_pay_void ($cust_main->cust_pay_void) {
-
-  my $payby = $cust_pay_void->payby;
-  my $payinfo = $payby eq 'CARD'
-                  ? $cust_pay_void->payinfo_masked
-                  : $cust_pay_void->payinfo;
-
-  $payby =~ s/^BILL$/Check #/ if $payinfo;
-  $payby =~ s/^CHEK$/Electronic check /;
-  $payby =~ s/^BILL$//;
-  $payby =~ s/^(CARD|COMP)$/$1 /;
-  my $info = $payby ? " ($payby$payinfo)" : '';
-
-  my $unvoid = '';
-  if ( $cust_pay_void->closed !~ /^Y/i
-       && $curuser->access_right('Unvoid')
-     )
-  {
-    $unvoid = qq! (<A HREF="javascript:areyousure('!.
-              qq!${p}misc/unvoid-cust_pay_void.cgi?!. $cust_pay_void->paynum.
-              qq!', 'Are you sure you want to unvoid this payment?')"!.
-              qq! TITLE="Unvoid this payment from the database!.
-                ( $cust_pay_void->payby =~ /^(CARD|CHEK)$/
-                  ? ' (do not send anything to the payment gateway)'
-                  : '' 
-                ). '"'.
-              qq!>unvoid</A>)!;
-  }
-
-  push @history, {
-    'date'   => $cust_pay_void->_date,
-    'desc'   => "<DEL>Payment $info</DEL> <I>voided ".
-                time2str("%D", $cust_pay_void->void_date).
-                " by ". $cust_pay_void->otaker. '</i>'. $unvoid,
-    'void_payment' => $cust_pay_void->paid,
-  };
-
-}
-
-#credits (some false laziness w/payments)
-foreach my $cust_credit ($cust_main->cust_credit) {
-
-  my @cust_credit_bill = $cust_credit->cust_credit_bill;
-  my @cust_credit_refund = $cust_credit->cust_credit_refund;
-
-  my( $pre, $post, $desc, $apply, $ext ) = ( '', '', '', '', '' );
-  if (    scalar(@cust_credit_bill)   == 0
-       && scalar(@cust_credit_refund) == 0 ) {
-    #completely unapplied
-    $pre = '<B><FONT COLOR="#FF0000">Unapplied ';
-    $post = '</FONT></B>';
-    $apply = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_credit_bill.cgi?!.
-             $cust_credit->crednum.
-             qq!', 392, 336, 'cust_credit_bill_popup' ), CAPTION, 'Apply credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
-  } elsif (    scalar(@cust_credit_bill)   == 1
-            && scalar(@cust_credit_refund) == 0
-            && $cust_credit->credited == 0      ) {
-    #applied to one invoice, the usual situation
-    $desc = ' applied to Invoice #'. $cust_credit_bill[0]->invnum;
-  } elsif (    scalar(@cust_credit_bill)   == 0
-            && scalar(@cust_credit_refund) == 1
-            && $cust_credit->credited == 0      ) {
-    #applied to one refund
-    $desc = ' refunded on '.  time2str("%D", $cust_credit_refund[0]->_date);
-  } else {
-    #complicated
-    $desc = '<BR>';
-    foreach my $app ( sort { $a->_date <=> $b->_date }
-                           ( @cust_credit_bill, @cust_credit_refund ) ) {
-      if ( $app->isa('FS::cust_credit_bill') ) {
-        $desc .= '&nbsp;&nbsp;'.
-                 '$'. $app->amount.
-                 ' applied to Invoice #'. $app->invnum.
-                 '<BR>';
-                 #' on '. time2str("%D", $app->_date).
-      } elsif ( $app->isa('FS::cust_credit_refund') ) {
-        $desc .= '&nbsp;&nbsp;'.
-                 '$'. $app->amount.
-                 ' refunded on '. time2str("%D", $app->_date).
-                 '<BR>';
-      } else {
-        die "$app is not a FS::cust_credit_bill or a FS::cust_credit_refund";
-      }
-    }
-    if ( $cust_credit->credited > 0 ) {
-      $desc .= '&nbsp;&nbsp;<B><FONT COLOR="#FF0000">$'.
-               $cust_credit->credited. ' unapplied</FONT></B>'.
-               qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_credit_bill.cgi?!.
-               $cust_credit->crednum.
-               qq!', 392, 336, 'cust_credit_bill_popup' ), CAPTION, 'Apply credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
-               '<BR>';
-    }
-  }
-#
-  my $delete = '';
-  if ( $cust_credit->closed !~ /^Y/i
-
-       #s'pose deleting a credit isn't bad like deleting a payment
-       # and this needs to be generally available until we have credit voiding..
-       #&& $conf->exists('deletecredits')
-
-       && $curuser->access_right('Delete credit')
-     )
-  {
-    $delete = qq! (<A HREF="javascript:areyousure('!.
-              qq!${p}misc/delete-cust_credit.cgi?!. $cust_credit->crednum.
-              qq!', 'Are you sure you want to delete this credit?')">!.
-              qq!delete</A>)!;
-  }
-  
-  my $unapply = '';
-  if (    $cust_credit->closed !~ /^Y/i
-       && scalar(@cust_credit_bill)
-       && $curuser->access_right('Unapply credit')
-     )
-  {
-    $unapply = qq! (<A HREF="javascript:areyousure('!.
-               qq!${p}misc/unapply-cust_credit.cgi?!. $cust_credit->crednum.
-               qq!', 'Are you sure you want to unapply this credit?')">!.
-               qq!unapply</A>)!;
-  }
-  
-  push @history, {
-    'date'   => $cust_credit->_date,
-    'desc'   => $pre. "Credit$post by ". $cust_credit->otaker.
-                ( $cust_credit->reason
-		    ? ' ('. $cust_credit->reason. ')'
-		    : ''
-		).
-                "$desc$apply$delete$unapply",
-    'credit' => $cust_credit->amount,
-  };
-
-}
-
-#refunds
-foreach my $cust_refund ($cust_main->cust_refund) {
-
-  my $payby = $cust_refund->payby;
-  my $payinfo = $payby eq 'CARD'
-                  ? $cust_refund->payinfo_masked
-                  : $cust_refund->payinfo;
-
-  $payby =~ s/^BILL$/Check #/ if $payinfo;
-  $payby =~ s/^CHEK$/Electronic check /;
-  $payby =~ s/^(CARD|COMP)$/$1 /;
-
-  push @history, {
-    'date'   => $cust_refund->_date,
-    'desc'   => "Refund ($payby$payinfo) by ". $cust_refund->otaker,
-    'refund' => $cust_refund->refund,
-  };
-
-}
-
-%>
-
-<%= include("/elements/table-grid.html") %>
-
-<% my $bgcolor1 = '#eeeeee';
-   my $bgcolor2 = '#ffffff';
-   my $bgcolor = '';
-%>
 
 <TR>
   <TH CLASS="grid" BGCOLOR="#cccccc">Date</TH>
@@ -426,41 +421,41 @@ foreach my $cust_refund ($cust_main->cust_refund) {
   <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Refund</FONT></TH>
   <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Balance</FONT></TH>
 </TR>
+%
+%#display payment history
+%
+%my $balance = 0;
+%my %target = ();
+%my $money_char = $conf->config('money_char') || '$';
+%
+%my $years =  $conf->config('payment_history-years') || 2;
+%my $older_than = time - $years * 31556736; #60*60*24*365.24
+%my $hidden = 0;
+%my $seen = 0;
+%my $old_history = 0;
+%
+%foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
+%
+%  my $display;
+%  if ( $item->{'date'} < $older_than ) {
+%    $display = ' STYLE="display:none" ';
+%    $hidden = 1;
+%  } else {
+%
+%    $display = '';
+%
+%    if ( $hidden && ! $seen++ ) {
+%      ( my $balance_forward = $money_char. $balance ) =~ s/^\$\-/-&nbsp;\$/;
+%    
 
-<%
-#display payment history
-
-my $balance = 0;
-my %target = ();
-my $money_char = $conf->config('money_char') || '$';
-
-my $years =  $conf->config('payment_history-years') || 2;
-my $older_than = time - $years * 31556736; #60*60*24*365.24
-my $hidden = 0;
-my $seen = 0;
-my $old_history = 0;
-
-foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
-
-  my $display;
-  if ( $item->{'date'} < $older_than ) {
-    $display = ' STYLE="display:none" ';
-    $hidden = 1;
-  } else {
-
-    $display = '';
-
-    if ( $hidden && ! $seen++ ) {
-      ( my $balance_forward = $money_char. $balance ) =~ s/^\$\-/-&nbsp;\$/;
-    %>
 
       <TR ID="balance_forward_row">
         <TD CLASS="grid" BGCOLOR="#dddddd">
-          <%= time2str("%D",$item->{'date'}) %>
+          <% time2str("%D",$item->{'date'}) %>
         </TD>
 
         <TD CLASS="grid" BGCOLOR="#dddddd">
-          <I>Starting balance on <%= time2str("%D",$item->{'date'}) %></I>
+          <I>Starting balance on <% time2str("%D",$item->{'date'}) %></I>
           (<A HREF="javascript:void(0);" onClick="show_history();">show prior history</A>)
         </TD>
 
@@ -468,86 +463,90 @@ foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
         <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
         <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
         <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
-        <TD CLASS="grid" BGCOLOR="#dddddd"><I><%= $balance_forward %></I></TD>
+        <TD CLASS="grid" BGCOLOR="#dddddd"><I><% $balance_forward %></I></TD>
 
       </TR>
+%
+%    }
+%
+%  }
+%
+%  if ( $bgcolor eq $bgcolor1 ) {
+%    $bgcolor = $bgcolor2;
+%  } else {
+%    $bgcolor = $bgcolor1;
+%  }
+%
+%  my $charge  = exists($item->{'charge'})
+%                  ? sprintf("$money_char\%.2f", $item->{'charge'})
+%                  : '';
+%
+%  my $payment = exists($item->{'payment'})
+%                  ? sprintf("-&nbsp;$money_char\%.2f", $item->{'payment'})
+%                  : '';
+%
+%  $payment ||= sprintf( "<DEL>-&nbsp;$money_char\%.2f</DEL>",
+%                        $item->{'void_payment'}
+%                      )
+%    if exists($item->{'void_payment'});
+%
+%  my $credit  = exists($item->{'credit'})
+%                  ? sprintf("-&nbsp;$money_char\%.2f", $item->{'credit'})
+%                  : '';
+%
+%  my $refund  = exists($item->{'refund'})
+%                  ? sprintf("$money_char\%.2f", $item->{'refund'})
+%                  : '';
+%
+%  my $target = exists($item->{'target'}) ? $item->{'target'} : '';
+%
+%  $balance += $item->{'charge'}  if exists $item->{'charge'};
+%  $balance -= $item->{'payment'} if exists $item->{'payment'};
+%  $balance -= $item->{'credit'}  if exists $item->{'credit'};
+%  $balance += $item->{'refund'}  if exists $item->{'refund'};
+%  $balance = sprintf("%.2f", $balance);
+%  $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
+%  ( my $showbalance = $money_char. $balance ) =~ s/^\$\-/-&nbsp;\$/;
+%
+%
+
+
+  <TR <% $display ? $display.' ID="old_history'.$old_history++.'"'  : ''%>>
+    <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+% unless ( !$target || $target{$target}++ ) { 
+
+        <A NAME="<% $target %>">
+% } 
+
+      <% time2str("%D",$item->{'date'}) %>
+% if ( $target && $target{$target} == 1 ) { 
 
-    <%
-    }
-
-  }
-
-  if ( $bgcolor eq $bgcolor1 ) {
-    $bgcolor = $bgcolor2;
-  } else {
-    $bgcolor = $bgcolor1;
-  }
-
-  my $charge  = exists($item->{'charge'})
-                  ? sprintf("$money_char\%.2f", $item->{'charge'})
-                  : '';
-
-  my $payment = exists($item->{'payment'})
-                  ? sprintf("-&nbsp;$money_char\%.2f", $item->{'payment'})
-                  : '';
-
-  $payment ||= sprintf( "<DEL>-&nbsp;$money_char\%.2f</DEL>",
-                        $item->{'void_payment'}
-                      )
-    if exists($item->{'void_payment'});
-
-  my $credit  = exists($item->{'credit'})
-                  ? sprintf("-&nbsp;$money_char\%.2f", $item->{'credit'})
-                  : '';
-
-  my $refund  = exists($item->{'refund'})
-                  ? sprintf("$money_char\%.2f", $item->{'refund'})
-                  : '';
-
-  my $target = exists($item->{'target'}) ? $item->{'target'} : '';
-
-  $balance += $item->{'charge'}  if exists $item->{'charge'};
-  $balance -= $item->{'payment'} if exists $item->{'payment'};
-  $balance -= $item->{'credit'}  if exists $item->{'credit'};
-  $balance += $item->{'refund'}  if exists $item->{'refund'};
-  $balance = sprintf("%.2f", $balance);
-  $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
-  ( my $showbalance = $money_char. $balance ) =~ s/^\$\-/-&nbsp;\$/;
-
-%>
-
-  <TR <%= $display ? $display.' ID="old_history'.$old_history++.'"'  : ''%>>
-    <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
-      <% unless ( !$target || $target{$target}++ ) { %>
-        <A NAME="<%= $target %>">
-      <% } %>
-      <%= time2str("%D",$item->{'date'}) %>
-      <% if ( $target && $target{$target} == 1 ) { %>
         </A>
-      <% } %>
+% } 
+
       </FONT>
     </TD>
-    <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
-      <%= $item->{'desc'} %>
+    <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+      <% $item->{'desc'} %>
     </TD>
-    <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
-      <%= $charge  %>
+    <TD ALIGN="right" CLASS="grid" BGCOLOR="<% $bgcolor %>">
+      <% $charge  %>
     </TD>
-    <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
-      <%= $payment %>
+    <TD ALIGN="right" CLASS="grid" BGCOLOR="<% $bgcolor %>">
+      <% $payment %>
     </TD>
-    <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
-      <%= $credit  %>
+    <TD ALIGN="right" CLASS="grid" BGCOLOR="<% $bgcolor %>">
+      <% $credit  %>
     </TD>
-    <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
-      <%= $refund  %>
+    <TD ALIGN="right" CLASS="grid" BGCOLOR="<% $bgcolor %>">
+      <% $refund  %>
     </TD>
-    <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
-      <%= $showbalance %>
+    <TD ALIGN="right" CLASS="grid" BGCOLOR="<% $bgcolor %>">
+      <% $showbalance %>
     </TD>
   </TR>
+% } 
 
-<% } %>
 
 </TABLE>
 
@@ -559,7 +558,7 @@ function show_history () {
   var balance_forward_row = document.getElementById('balance_forward_row');
 
   balance_forward_row.style.display = 'none';
-  for ( var i = 0; i < <%= $old_history %>; i++ ) {
+  for ( var i = 0; i < <% $old_history %>; i++ ) {
     var oldRow = document.getElementById('old_history'+i);
     oldRow.style.display = '';
   }
diff --git a/httemplate/view/cust_main/quick-charge.html b/httemplate/view/cust_main/quick-charge.html
index 2fe3d5f3d..be8b9d838 100644
--- a/httemplate/view/cust_main/quick-charge.html
+++ b/httemplate/view/cust_main/quick-charge.html
@@ -1,16 +1,17 @@
-<%
-  my( $cust_main ) = @_;
-%>
+%
+%  my( $cust_main ) = @_;
+%
 
-<FORM ACTION="<%=$p%>edit/process/quick-charge.cgi" METHOD="POST">
 
-<INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $cust_main->custnum %>">
+<FORM ACTION="<%$p%>edit/process/quick-charge.cgi" METHOD="POST">
+
+<INPUT TYPE="hidden" NAME="custnum" VALUE="<% $cust_main->custnum %>">
 
 Description:<INPUT TYPE="text" NAME="pkg">
 
 Amount:<INPUT TYPE="text" NAME="amount" SIZE=6>
 
-<%= include('/elements/select-taxclass.html') %>
+<% include('/elements/select-taxclass.html') %>
 
 <INPUT TYPE="submit" VALUE="One-time charge">
 
diff --git a/httemplate/view/cust_main/tickets.html b/httemplate/view/cust_main/tickets.html
index 93cb51f25..65cdcbfa7 100644
--- a/httemplate/view/cust_main/tickets.html
+++ b/httemplate/view/cust_main/tickets.html
@@ -1,43 +1,44 @@
-<%
-  my( $cust_main ) = @_;
+%
+%  my( $cust_main ) = @_;
+%
+%  my $conf = new FS::Conf;
+%  my $num = $conf->config('cust_main-max_tickets') || 10;
+%
+%  my @tickets = ();
+%  unless ( $conf->config('ticket_system-custom_priority_field') ) {
+%
+%    @tickets =
+%      @{ FS::TicketSystem->customer_tickets($cust_main->custnum, $num) };
+%
+%  } else {
+%
+%    foreach my $priority (
+%      $conf->config('ticket_system-custom_priority_field-values'), ''
+%    ) {
+%      last if scalar(@tickets) >= $num;
+%      push @tickets, 
+%        @{ FS::TicketSystem->customer_tickets( $cust_main->custnum,
+%                                               $num - scalar(@tickets),
+%                                               $priority,
+%                                             )
+%         };
+%    }
+%
+%  }
+%
+%
 
-  my $conf = new FS::Conf;
-  my $num = $conf->config('cust_main-max_tickets') || 10;
-
-  my @tickets = ();
-  unless ( $conf->config('ticket_system-custom_priority_field') ) {
-
-    @tickets =
-      @{ FS::TicketSystem->customer_tickets($cust_main->custnum, $num) };
-
-  } else {
-
-    foreach my $priority (
-      $conf->config('ticket_system-custom_priority_field-values'), ''
-    ) {
-      last if scalar(@tickets) >= $num;
-      push @tickets, 
-        @{ FS::TicketSystem->customer_tickets( $cust_main->custnum,
-                                               $num - scalar(@tickets),
-                                               $priority,
-                                             )
-         };
-    }
-
-  }
-
-%>
 
 Highest priority tickets
-(<A HREF="<%= FS::TicketSystem->href_customer_tickets($cust_main->custnum) %>">View all tickets for this customer</A>)
-(<A HREF="<%= FS::TicketSystem->href_new_ticket($cust_main, join(', ', grep { $_ !~ /^(POST|FAX)$/ } $cust_main->invoicing_list ) ) %>">New ticket for this customer</A>)
+(<A HREF="<% FS::TicketSystem->href_customer_tickets($cust_main->custnum) %>">View all tickets for this customer</A>)
+(<A HREF="<% FS::TicketSystem->href_new_ticket($cust_main, join(', ', grep { $_ !~ /^(POST|FAX)$/ } $cust_main->invoicing_list ) ) %>">New ticket for this customer</A>)
 
-<%= include("/elements/table-grid.html") %>
+<% include("/elements/table-grid.html") %>
+% my $bgcolor1 = '#eeeeee';
+%   my $bgcolor2 = '#ffffff';
+%   my $bgcolor = '';
+%
 
-<% my $bgcolor1 = '#eeeeee';
-   my $bgcolor2 = '#ffffff';
-   my $bgcolor = '';
-%>
 
 <TR>
   <TH CLASS="grid" BGCOLOR="#cccccc">#</TH>
@@ -46,31 +47,31 @@ Highest priority tickets
   <TH CLASS="grid" BGCOLOR="#cccccc">Queue</TH>
   <TH CLASS="grid" BGCOLOR="#cccccc">Status</TH>
 </TR>
+% foreach my $ticket ( @tickets ) {
+%     my $href = FS::TicketSystem->href_ticket($ticket->{id});
+%     if ( $bgcolor eq $bgcolor1 ) {
+%       $bgcolor = $bgcolor2;
+%     } else {
+%       $bgcolor = $bgcolor1;
+%     }
+%
 
-<% foreach my $ticket ( @tickets ) {
-     my $href = FS::TicketSystem->href_ticket($ticket->{id});
-     if ( $bgcolor eq $bgcolor1 ) {
-       $bgcolor = $bgcolor2;
-     } else {
-       $bgcolor = $bgcolor1;
-     }
-%>
 
 <TR>
 
-  <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><A HREF=<%=$href%>><%= $ticket->{id} %></A></TD>
+  <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><A HREF=<%$href%>><% $ticket->{id} %></A></TD>
 
-  <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><A HREF=<%=$href%>><%= $ticket->{subject} %></A></TD>
+  <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><A HREF=<%$href%>><% $ticket->{subject} %></A></TD>
 
-  <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $ticket->{content} || $ticket->{priority} %></TD>
+  <TD ALIGN="right" CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $ticket->{content} || $ticket->{priority} %></TD>
 
-  <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $ticket->{name} %></TD>
+  <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $ticket->{name} %></TD>
 
-  <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $ticket->{status} %></TD>
+  <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $ticket->{status} %></TD>
 
 </TR>
+% } 
 
-<% } %>
 
 </TABLE>
 
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index a20149ae2..78b42f127 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -1,165 +1,166 @@
 <!-- mason kludge -->
-<%
+%
+%
+%my $conf = new FS::Conf;
+%
+%my %uiview = ();
+%my %uiadd = ();
+%foreach my $part_svc ( qsearch('part_svc',{}) ) {
+%  $uiview{$part_svc->svcpart} = popurl(2). "view/". $part_svc->svcdb . ".cgi";
+%  $uiadd{$part_svc->svcpart}= popurl(2). "edit/". $part_svc->svcdb . ".cgi";
+%}
+%
+%my ($query) = $cgi->keywords;
+%$query =~ /^(\d+)$/;
+%my $pkgnum = $1;
+%
+%#get package record
+%my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+%die "No package!" unless $cust_pkg;
+%my $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
+%
+%my $custnum = $cust_pkg->getfield('custnum');
+%print header('Package View', menubar(
+%  "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum",
+%  'Main Menu' => popurl(2)
+%));
+%
+%#print info
+%my ($susp,$cancel,$expire)=(
+%  $cust_pkg->getfield('susp'),
+%  $cust_pkg->getfield('cancel'),
+%  $cust_pkg->getfield('expire'),
+%);
+%my($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment'));
+%my($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
+%my $otaker = $cust_pkg->getfield('otaker');
+%
+%print <<END;
+%<SCRIPT>
+%function areyousure(href) {
+%    if (confirm("Permanently delete included services and cancel this package?") == true)
+%        window.location.href = href;
+%}
+%</SCRIPT>
+%END
+%
+%print "Package information";
+%print ' (<A HREF="'. popurl(2). 'misc/unsusp_pkg.cgi?'. $pkgnum.
+%      '">unsuspend</A>)'
+%  if ( $susp && ! $cancel );
+%
+%print ' (<A HREF="'. popurl(2). 'misc/susp_pkg.cgi?'. $pkgnum.
+%      '">suspend</A>)'
+%  unless ( $susp || $cancel );
+%
+%print ' (<A HREF="javascript:areyousure(\''. popurl(2). 'misc/cancel_pkg.cgi?'.
+%      $pkgnum.  '\')">cancel</A>)'
+%  unless $cancel;
+%
+%print ' (<A HREF="'. popurl(2). 'edit/REAL_cust_pkg.cgi?'. $pkgnum.
+%      '">edit dates</A>)';
+%
+%print &ntable("#cccccc"), '<TR><TD>', &ntable("#cccccc",2),
+%      '<TR><TD ALIGN="right">Package number</TD><TD BGCOLOR="#ffffff">',
+%      $pkgnum, '</TD></TR>',
+%      '<TR><TD ALIGN="right">Package</TD><TD BGCOLOR="#ffffff">',
+%      $pkg,  '</TD></TR>',
+%      '<TR><TD ALIGN="right">Comment</TD><TD BGCOLOR="#ffffff">',
+%      $comment,  '</TD></TR>',
+%      '<TR><TD ALIGN="right">Setup date</TD><TD BGCOLOR="#ffffff">',
+%      ( $setup ? time2str("%D",$setup) : "(Not setup)" ), '</TD></TR>';
+%
+%print '<TR><TD ALIGN="right">Last bill date</TD><TD BGCOLOR="#ffffff">',
+%      ( $cust_pkg->get('last_bill') ? time2str("%D",$cust_pkg->get('last_bill')) : "&nbsp;" ),
+%      '</TD></TR>'
+%  if $cust_pkg->dbdef_table->column('last_bill');
+%
+%print '<TR><TD ALIGN="right">Next bill date</TD><TD BGCOLOR="#ffffff">',
+%      ( $bill ? time2str("%D",$bill) : "&nbsp;" ), '</TD></TR>';
+%      
+%print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
+%       time2str("%D",$susp), '</TD></TR>' if $susp;
+%print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
+%       time2str("%D",$expire), '</TD></TR>' if $expire;
+%print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
+%       time2str("%D",$cancel), '</TD></TR>' if $cancel;
+%print  '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
+%      $otaker,  '</TD></TR>',
+%      '</TABLE></TD></TR></TABLE>';
+%
+%unless ($expire) {
+%  print <<END;
+%<FORM ACTION="../misc/expire_pkg.cgi" METHOD="post">
+%<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
+%Expire (date): <INPUT TYPE="text" NAME="date" VALUE="" >
+%<INPUT TYPE="submit" VALUE="Cancel later">
+%END
+%}
+%
+%unless ($cancel) {
+%
+%  #services
+%  print '<BR>Service Information', &table();
+%
+%  #list of services this pkgpart includes
+%  my $pkg_svc;
+%  my %pkg_svc;
+%  #foreach $pkg_svc ( qsearch('pkg_svc',{'pkgpart'=> $cust_pkg->pkgpart }) ) {
+%  foreach $pkg_svc ( $cust_pkg->part_pkg->pkg_svc ) {
+%    $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity if $pkg_svc->quantity;
+%  }
+%
+%  #list of records from cust_svc
+%  my $svcpart;
+%  foreach $svcpart (sort {$a <=> $b} keys %pkg_svc) {
+%
+%    my($svc)=qsearchs('part_svc',{'svcpart'=>$svcpart})->getfield('svc');
+%
+%    my(@cust_svc)=qsearch('cust_svc',{'pkgnum'=>$pkgnum, 
+%                                      'svcpart'=>$svcpart,
+%                                     });
+%
+%    my($enum);
+%    for $enum ( 1 .. $pkg_svc{$svcpart} ) {
+%
+%      my($cust_svc);
+%      if ( $cust_svc=shift @cust_svc ) {
+%        my($svcnum)=$cust_svc->svcnum;
+%        my($label, $value, $svcdb) = $cust_svc->label;
+%        print <<END;
+%<TR><TD><A HREF="$uiview{$svcpart}?$svcnum">(View/Edit) $svc: $value<A></TD></TR>
+%END
+%      } else {
+%        print qq!<TR><TD>!.
+%              qq!<A HREF="$uiadd{$svcpart}?pkgnum$pkgnum-svcpart$svcpart">!.
+%              qq!(Provision) $svc</A>!;
+%
+%        print qq! or <A HREF="../misc/link.cgi?pkgnum$pkgnum-svcpart$svcpart">!.
+%              qq!(Link to legacy) $svc</A>!
+%          if $conf->exists('legacy_link');
+%
+%        print '</TD></TR>';
+%      }
+%
+%    }
+%    warn "WARNING: Leftover services pkgnum $pkgnum!" if @cust_svc;; 
+%  }
+%
+%  print "</TABLE><FONT SIZE=-1>",
+%        "Choose (View/Edit) to view or edit an existing service<BR>",
+%        "Choose (Provision) to setup a new service<BR>";
+%
+%  print "Choose (Link to legacy) to link to a legacy (pre-Freeside) service"
+%    if $conf->exists('legacy_link');
+%
+%  print "</FONT>";
+%}
+%
+%#formatting
+%print <<END;
+%  </BODY>
+%</HTML>
+%END
+%
+%
 
-my $conf = new FS::Conf;
-
-my %uiview = ();
-my %uiadd = ();
-foreach my $part_svc ( qsearch('part_svc',{}) ) {
-  $uiview{$part_svc->svcpart} = popurl(2). "view/". $part_svc->svcdb . ".cgi";
-  $uiadd{$part_svc->svcpart}= popurl(2). "edit/". $part_svc->svcdb . ".cgi";
-}
-
-my ($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $pkgnum = $1;
-
-#get package record
-my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-die "No package!" unless $cust_pkg;
-my $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
-
-my $custnum = $cust_pkg->getfield('custnum');
-print header('Package View', menubar(
-  "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum",
-  'Main Menu' => popurl(2)
-));
-
-#print info
-my ($susp,$cancel,$expire)=(
-  $cust_pkg->getfield('susp'),
-  $cust_pkg->getfield('cancel'),
-  $cust_pkg->getfield('expire'),
-);
-my($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment'));
-my($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
-my $otaker = $cust_pkg->getfield('otaker');
-
-print <<END;
-<SCRIPT>
-function areyousure(href) {
-    if (confirm("Permanently delete included services and cancel this package?") == true)
-        window.location.href = href;
-}
-</SCRIPT>
-END
-
-print "Package information";
-print ' (<A HREF="'. popurl(2). 'misc/unsusp_pkg.cgi?'. $pkgnum.
-      '">unsuspend</A>)'
-  if ( $susp && ! $cancel );
-
-print ' (<A HREF="'. popurl(2). 'misc/susp_pkg.cgi?'. $pkgnum.
-      '">suspend</A>)'
-  unless ( $susp || $cancel );
-
-print ' (<A HREF="javascript:areyousure(\''. popurl(2). 'misc/cancel_pkg.cgi?'.
-      $pkgnum.  '\')">cancel</A>)'
-  unless $cancel;
-
-print ' (<A HREF="'. popurl(2). 'edit/REAL_cust_pkg.cgi?'. $pkgnum.
-      '">edit dates</A>)';
-
-print &ntable("#cccccc"), '<TR><TD>', &ntable("#cccccc",2),
-      '<TR><TD ALIGN="right">Package number</TD><TD BGCOLOR="#ffffff">',
-      $pkgnum, '</TD></TR>',
-      '<TR><TD ALIGN="right">Package</TD><TD BGCOLOR="#ffffff">',
-      $pkg,  '</TD></TR>',
-      '<TR><TD ALIGN="right">Comment</TD><TD BGCOLOR="#ffffff">',
-      $comment,  '</TD></TR>',
-      '<TR><TD ALIGN="right">Setup date</TD><TD BGCOLOR="#ffffff">',
-      ( $setup ? time2str("%D",$setup) : "(Not setup)" ), '</TD></TR>';
-
-print '<TR><TD ALIGN="right">Last bill date</TD><TD BGCOLOR="#ffffff">',
-      ( $cust_pkg->get('last_bill') ? time2str("%D",$cust_pkg->get('last_bill')) : "&nbsp;" ),
-      '</TD></TR>'
-  if $cust_pkg->dbdef_table->column('last_bill');
-
-print '<TR><TD ALIGN="right">Next bill date</TD><TD BGCOLOR="#ffffff">',
-      ( $bill ? time2str("%D",$bill) : "&nbsp;" ), '</TD></TR>';
-      
-print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
-       time2str("%D",$susp), '</TD></TR>' if $susp;
-print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
-       time2str("%D",$expire), '</TD></TR>' if $expire;
-print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
-       time2str("%D",$cancel), '</TD></TR>' if $cancel;
-print  '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
-      $otaker,  '</TD></TR>',
-      '</TABLE></TD></TR></TABLE>';
-
-unless ($expire) {
-  print <<END;
-<FORM ACTION="../misc/expire_pkg.cgi" METHOD="post">
-<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
-Expire (date): <INPUT TYPE="text" NAME="date" VALUE="" >
-<INPUT TYPE="submit" VALUE="Cancel later">
-END
-}
-
-unless ($cancel) {
-
-  #services
-  print '<BR>Service Information', &table();
-
-  #list of services this pkgpart includes
-  my $pkg_svc;
-  my %pkg_svc;
-  #foreach $pkg_svc ( qsearch('pkg_svc',{'pkgpart'=> $cust_pkg->pkgpart }) ) {
-  foreach $pkg_svc ( $cust_pkg->part_pkg->pkg_svc ) {
-    $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity if $pkg_svc->quantity;
-  }
-
-  #list of records from cust_svc
-  my $svcpart;
-  foreach $svcpart (sort {$a <=> $b} keys %pkg_svc) {
-
-    my($svc)=qsearchs('part_svc',{'svcpart'=>$svcpart})->getfield('svc');
-
-    my(@cust_svc)=qsearch('cust_svc',{'pkgnum'=>$pkgnum, 
-                                      'svcpart'=>$svcpart,
-                                     });
-
-    my($enum);
-    for $enum ( 1 .. $pkg_svc{$svcpart} ) {
-
-      my($cust_svc);
-      if ( $cust_svc=shift @cust_svc ) {
-        my($svcnum)=$cust_svc->svcnum;
-        my($label, $value, $svcdb) = $cust_svc->label;
-        print <<END;
-<TR><TD><A HREF="$uiview{$svcpart}?$svcnum">(View/Edit) $svc: $value<A></TD></TR>
-END
-      } else {
-        print qq!<TR><TD>!.
-              qq!<A HREF="$uiadd{$svcpart}?pkgnum$pkgnum-svcpart$svcpart">!.
-              qq!(Provision) $svc</A>!;
-
-        print qq! or <A HREF="../misc/link.cgi?pkgnum$pkgnum-svcpart$svcpart">!.
-              qq!(Link to legacy) $svc</A>!
-          if $conf->exists('legacy_link');
-
-        print '</TD></TR>';
-      }
-
-    }
-    warn "WARNING: Leftover services pkgnum $pkgnum!" if @cust_svc;; 
-  }
-
-  print "</TABLE><FONT SIZE=-1>",
-        "Choose (View/Edit) to view or edit an existing service<BR>",
-        "Choose (Provision) to setup a new service<BR>";
-
-  print "Choose (Link to legacy) to link to a legacy (pre-Freeside) service"
-    if $conf->exists('legacy_link');
-
-  print "</FONT>";
-}
-
-#formatting
-print <<END;
-  </BODY>
-</HTML>
-END
-
-%>
diff --git a/httemplate/view/elements/svc_Common.html b/httemplate/view/elements/svc_Common.html
index 0f103e3e0..35434632e 100644
--- a/httemplate/view/elements/svc_Common.html
+++ b/httemplate/view/elements/svc_Common.html
@@ -1,116 +1,116 @@
-<%
-
-  # options example...
-  #
-  # 'table' => 'svc_something'
-  #
-  # 'labels' => {
-  #               'column' => 'Label',
-  #             },
-  #
-  # listref - each item is a literal column name (or method) or (notyet) coderef
-  # if not specified all columns (except for the primary key) will be viewable
-  # 'fields' => [
-  #             ]
-
-  my(%opt) = @_;
-
-  my $table = $opt{'table'};
-
-  my $fields = $opt{'fields'}
-               #|| [ grep { $_ ne 'svcnum' } dbdef->table($table)->columns ];
-               || [ grep { $_ ne 'svcnum' } fields($table) ];
-
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  my $svcnum = $1;
-  my $svc_x = qsearchs( $opt{'table'}, { 'svcnum' => $svcnum } )
-    or die "Unknown svcnum $svcnum in ". $opt{'table'}. " table\n";
-
-  my $cust_svc = $svc_x->cust_svc;
-  my($label, $value, $svcdb) = $cust_svc->label;
-
-  my $pkgnum = $cust_svc->pkgnum;
-
-  my($cust_pkg, $custnum);
-  if ($pkgnum) {
-    $cust_pkg = $cust_svc->cust_pkg;
-    $custnum = $cust_pkg->custnum;
-  } else {
-    $cust_pkg = '';
-    $custnum = '';
-  }
-
-%>
-
-<% if ( $custnum ) { %>
-
-  <%= include("/elements/header.html","View $label: $value", menubar(
+%
+%
+%  # options example...
+%  #
+%  # 'table' => 'svc_something'
+%  #
+%  # 'labels' => {
+%  #               'column' => 'Label',
+%  #             },
+%  #
+%  # listref - each item is a literal column name (or method) or (notyet) coderef
+%  # if not specified all columns (except for the primary key) will be viewable
+%  # 'fields' => [
+%  #             ]
+%
+%  my(%opt) = @_;
+%
+%  my $table = $opt{'table'};
+%
+%  my $fields = $opt{'fields'}
+%               #|| [ grep { $_ ne 'svcnum' } dbdef->table($table)->columns ];
+%               || [ grep { $_ ne 'svcnum' } fields($table) ];
+%
+%  my($query) = $cgi->keywords;
+%  $query =~ /^(\d+)$/;
+%  my $svcnum = $1;
+%  my $svc_x = qsearchs( $opt{'table'}, { 'svcnum' => $svcnum } )
+%    or die "Unknown svcnum $svcnum in ". $opt{'table'}. " table\n";
+%
+%  my $cust_svc = $svc_x->cust_svc;
+%  my($label, $value, $svcdb) = $cust_svc->label;
+%
+%  my $pkgnum = $cust_svc->pkgnum;
+%
+%  my($cust_pkg, $custnum);
+%  if ($pkgnum) {
+%    $cust_pkg = $cust_svc->cust_pkg;
+%    $custnum = $cust_pkg->custnum;
+%  } else {
+%    $cust_pkg = '';
+%    $custnum = '';
+%  }
+%
+%
+% if ( $custnum ) { 
+
+
+  <% include("/elements/header.html","View $label: $value", menubar(
     "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
   )) %>
 
-  <%= include( '/elements/small_custview.html', $custnum, '', 1 ) %>
+  <% include( '/elements/small_custview.html', $custnum, '', 1 ) %>
   <BR>
+% } else { 
 
-<% } else { %>
 
   <SCRIPT>
   function areyousure(href) {
-      if (confirm("Permanently delete this <%= $label %>?") == true)
+      if (confirm("Permanently delete this <% $label %>?") == true)
           window.location.href = href;
   }
   </SCRIPT>
 
-  <%= include("/elements/header.html","View $label: $value", menubar(
+  <% include("/elements/header.html","View $label: $value", menubar(
       "Cancel this (unaudited) $label" =>
             "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')"
   )) %>
+% } 
 
-<% } %>
 
-Service #<B><%= $svcnum %></B>
-| <A HREF="<%=$p%>edit/<%= $opt{'table'} %>.cgi?<%=$svcnum%>">Edit this <%= $label %></A>
+Service #<B><% $svcnum %></B>
+| <A HREF="<%$p%>edit/<% $opt{'table'} %>.cgi?<%$svcnum%>">Edit this <% $label %></A>
 <BR>
 
-<%= ntable("#cccccc") %><TR><TD><%= ntable("#cccccc",2) %>
-
-<% foreach my $f ( @$fields ) {
+<% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
+% foreach my $f ( @$fields ) {
+%
+%     my( $field, $type);
+%     if ( ref($f) ) {
+%       $field = $f->{'field'},
+%       $type  = $f->{'type'} || 'text',
+%     } else {
+%       $field = $f;
+%       $type = 'text';
+%     }
+%
 
-     my( $field, $type);
-     if ( ref($f) ) {
-       $field = $f->{'field'},
-       $type  = $f->{'type'} || 'text',
-     } else {
-       $field = $f;
-       $type = 'text';
-     }
-%>
 
   <TR>
     <TD ALIGN="right">
-      <%= ( $opt{labels} && exists $opt{labels}->{$field} )
+      <% ( $opt{labels} && exists $opt{labels}->{$field} )
               ? $opt{labels}->{$field}
               : $field
       %>
     </TD>
+%
+%      #eventually more options for <SELECT>, etc. fields
+%    
 
-    <%
-      #eventually more options for <SELECT>, etc. fields
-    %>
 
-    <TD BGCOLOR="#ffffff"><%= $svc_x->$field %><TD>
+    <TD BGCOLOR="#ffffff"><% $svc_x->$field %><TD>
 
   </TR>
+% } 
+% foreach (sort { $a cmp $b } $svc_x->virtual_fields) { 
 
-<% } %>
+  <% $svc_x->pvf($_)->widget('HTML', 'view', $svc_x->getfield($_)) %>
+% } 
 
-<% foreach (sort { $a cmp $b } $svc_x->virtual_fields) { %>
-  <%= $svc_x->pvf($_)->widget('HTML', 'view', $svc_x->getfield($_)) %>
-<% } %>
 
 </TABLE></TD></TR></TABLE>
 
 <BR>
-<%= joblisting({'svcnum'=>$svcnum}, 1) %>
+<% joblisting({'svcnum'=>$svcnum}, 1) %>
 
-<%= include('/elements/footer.html') %>
+<% include('/elements/footer.html') %>
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index f4f39084c..9c2fbc94d 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,51 +1,51 @@
-<%
-
-my $conf = new FS::Conf;
-
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $svcnum = $1;
-my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
-die "Unknown svcnum" unless $svc_acct;
-
-#false laziness w/all svc_*.cgi
-my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );
-my $pkgnum = $cust_svc->getfield('pkgnum');
-my($cust_pkg, $custnum);
-if ($pkgnum) {
-  $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
-  $custnum = $cust_pkg->custnum;
-} else {
-  $cust_pkg = '';
-  $custnum = '';
-}
-#eofalse
-
-my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
-die "Unknown svcpart" unless $part_svc;
-my $svc = $part_svc->svc;
-
-die 'Empty domsvc for svc_acct.svcnum '. $svc_acct->svcnum
-  unless $svc_acct->domsvc;
-my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
-die 'Unknown domain (domsvc '. $svc_acct->domsvc.
-    ' for svc_acct.svcnum '. $svc_acct->svcnum. ')'
-  unless $svc_domain;
-my $domain = $svc_domain->domain;
-
-%>
-
-<% if ( $custnum ) { %>
-
-  <%= include("/elements/header.html","View $svc account", menubar(
+%
+%
+%my $conf = new FS::Conf;
+%
+%my($query) = $cgi->keywords;
+%$query =~ /^(\d+)$/;
+%my $svcnum = $1;
+%my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
+%die "Unknown svcnum" unless $svc_acct;
+%
+%#false laziness w/all svc_*.cgi
+%my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );
+%my $pkgnum = $cust_svc->getfield('pkgnum');
+%my($cust_pkg, $custnum);
+%if ($pkgnum) {
+%  $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
+%  $custnum = $cust_pkg->custnum;
+%} else {
+%  $cust_pkg = '';
+%  $custnum = '';
+%}
+%#eofalse
+%
+%my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+%die "Unknown svcpart" unless $part_svc;
+%my $svc = $part_svc->svc;
+%
+%die 'Empty domsvc for svc_acct.svcnum '. $svc_acct->svcnum
+%  unless $svc_acct->domsvc;
+%my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
+%die 'Unknown domain (domsvc '. $svc_acct->domsvc.
+%    ' for svc_acct.svcnum '. $svc_acct->svcnum. ')'
+%  unless $svc_domain;
+%my $domain = $svc_domain->domain;
+%
+%
+% if ( $custnum ) { 
+
+
+  <% include("/elements/header.html","View $svc account", menubar(
     "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
     "Main menu" => $p,
   )) %>
 
-  <%= include( '/elements/small_custview.html', $custnum, '', 1 ) %>
+  <% include( '/elements/small_custview.html', $custnum, '', 1 ) %>
   <BR>
+% } else { 
 
-<% } else { %>
 
   <SCRIPT>
   function areyousure(href) {
@@ -54,76 +54,80 @@ my $domain = $svc_domain->domain;
   }
   </SCRIPT>
   
-  <%= include("/elements/header.html",'Account View', menubar(
+  <% include("/elements/header.html",'Account View', menubar(
     "Cancel this (unaudited) account" =>
             "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')",
     "Main menu" => $p,
   )) %>
+% } 
+% if ( $part_svc->part_export_usage ) {
+%
+%  my $last_bill;
+%  my %plandata;
+%  if ( $cust_pkg ) {
+%    #false laziness w/httemplate/edit/part_pkg... this stuff doesn't really
+%    #belong in plan data
+%    %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
+%                    split("\n", $cust_pkg->part_pkg->plandata );
+%
+%    $last_bill = $cust_pkg->last_bill;
+%  } else {
+%    $last_bill = 0;
+%    %plandata = ();
+%  }
+%
+%  my $seconds = $svc_acct->seconds_since_sqlradacct( $last_bill, time );
+%  my $hour = int($seconds/3600);
+%  my $min = int( ($seconds%3600) / 60 );
+%  my $sec = $seconds%60;
+%
+%  my $input = $svc_acct->attribute_since_sqlradacct(
+%    $last_bill, time, 'AcctInputOctets'
+%  ) / 1048576;
+%  my $output = $svc_acct->attribute_since_sqlradacct(
+%    $last_bill, time, 'AcctOutputOctets'
+%  ) / 1048576;
+%
+%
 
-<% } %>
-
-<% if ( $part_svc->part_export_usage ) {
-
-  my $last_bill;
-  my %plandata;
-  if ( $cust_pkg ) {
-    #false laziness w/httemplate/edit/part_pkg... this stuff doesn't really
-    #belong in plan data
-    %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
-                    split("\n", $cust_pkg->part_pkg->plandata );
-
-    $last_bill = $cust_pkg->last_bill;
-  } else {
-    $last_bill = 0;
-    %plandata = ();
-  }
-
-  my $seconds = $svc_acct->seconds_since_sqlradacct( $last_bill, time );
-  my $hour = int($seconds/3600);
-  my $min = int( ($seconds%3600) / 60 );
-  my $sec = $seconds%60;
-
-  my $input = $svc_acct->attribute_since_sqlradacct(
-    $last_bill, time, 'AcctInputOctets'
-  ) / 1048576;
-  my $output = $svc_acct->attribute_since_sqlradacct(
-    $last_bill, time, 'AcctOutputOctets'
-  ) / 1048576;
-
-%>
 
   RADIUS session information<BR>
-  <%= ntable('#cccccc',2) %>
+  <% ntable('#cccccc',2) %>
   <TR><TD BGCOLOR="#ffffff">
+% if ( $seconds ) { 
+
+    Online <B><% $hour %></B>h <B><% $min %></B>m <B><% $sec %></B>s
+% } else { 
 
-  <% if ( $seconds ) { %>
-    Online <B><%= $hour %></B>h <B><%= $min %></B>m <B><%= $sec %></B>s
-  <% } else { %>
     Has not logged on
-  <% } %>
+% } 
+% if ( $cust_pkg ) { 
+
+    since last bill (<% time2str('%a %b %o %Y', $last_bill) %>)
+% if ( length($plandata{recur_included_hours}) ) { 
+
+    - <% $plandata{recur_included_hours} %> total hours in plan
+% } 
 
-  <% if ( $cust_pkg ) { %>
-    since last bill (<%= time2str('%a %b %o %Y', $last_bill) %>)
-    <% if ( length($plandata{recur_included_hours}) ) { %>
-    - <%= $plandata{recur_included_hours} %> total hours in plan
-    <% } %>
     <BR>
-  <% } else { %>
+% } else { 
+
     (no billing cycle available for unaudited account)<BR>
-  <% } %>
+% } 
 
-  Upload: <B><%= sprintf("%.3f", $input) %></B> megabytes<BR>
-  Download: <B><%= sprintf("%.3f", $output) %></B> megabytes<BR>
 
-  <% my $href = qq!<A HREF="${p}search/sqlradius.cgi?svcnum=$svcnum!; %>
+  Upload: <B><% sprintf("%.3f", $input) %></B> megabytes<BR>
+  Download: <B><% sprintf("%.3f", $output) %></B> megabytes<BR>
+% my $href = qq!<A HREF="${p}search/sqlradius.cgi?svcnum=$svcnum!; 
+
   View session detail:
-      <%= $href %>;begin=<%= $last_bill %>">this billing cycle</A>
-    | <%= $href %>;begin=<%= time-15552000 %>">past six months</A>
-    | <%= $href %>">all sessions</A>
+      <% $href %>;begin=<% $last_bill %>">this billing cycle</A>
+    | <% $href %>;begin=<% time-15552000 %>">past six months</A>
+    | <% $href %>">all sessions</A>
 
   </TD></TR></TABLE><BR>
+% } 
 
-<% } %>
 
 <SCRIPT TYPE="text/javascript">
 function enable_change () {
@@ -134,199 +138,204 @@ function enable_change () {
   }
 }
 </SCRIPT>
-<FORM NAME="OneTrueForm" ACTION="<%=$p%>edit/process/cust_svc.cgi">
-<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%= $svcnum %>">
-<INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%= $pkgnum %>">
-
-<% #print qq!<BR><A HREF="../misc/sendconfig.cgi?$svcnum">Send account information</A>!; %>
-
-<% 
-  my @part_svc = ();
-  if ( $pkgnum ) { 
-    @part_svc = grep {    $_->svcdb   eq 'svc_acct'
-                       && $_->svcpart != $part_svc->svcpart }
-                $cust_pkg->available_part_svc;
-  } else {
-    @part_svc = qsearch('part_svc', {
-      svcdb    => 'svc_acct',
-      disabled => '',
-      svcpart  => { op=>'!=', value=>$part_svc->svcpart },
-    } );
-  }
-%>
+<FORM NAME="OneTrueForm" ACTION="<%$p%>edit/process/cust_svc.cgi">
+<INPUT TYPE="hidden" NAME="svcnum" VALUE="<% $svcnum %>">
+<INPUT TYPE="hidden" NAME="pkgnum" VALUE="<% $pkgnum %>">
+% #print qq!<BR><A HREF="../misc/sendconfig.cgi?$svcnum">Send account information</A>!; 
+% 
+%  my @part_svc = ();
+%  if ( $pkgnum ) { 
+%    @part_svc = grep {    $_->svcdb   eq 'svc_acct'
+%                       && $_->svcpart != $part_svc->svcpart }
+%                $cust_pkg->available_part_svc;
+%  } else {
+%    @part_svc = qsearch('part_svc', {
+%      svcdb    => 'svc_acct',
+%      disabled => '',
+%      svcpart  => { op=>'!=', value=>$part_svc->svcpart },
+%    } );
+%  }
+%
+
+
+Service #<B><% $svcnum %></B>
+| <A HREF="<%$p%>edit/svc_acct.cgi?<%$svcnum%>">Edit this service</A>
+% if ( @part_svc ) { 
 
-Service #<B><%= $svcnum %></B>
-| <A HREF="<%=$p%>edit/svc_acct.cgi?<%=$svcnum%>">Edit this service</A>
-
-<% if ( @part_svc ) { %>
 | <SELECT NAME="svcpart" onChange="enable_change()">
     <OPTION VALUE="">Change service</OPTION>
     <OPTION VALUE="">--------------</OPTION>
-    <% foreach my $opt_part_svc ( @part_svc ) { %>
-      <OPTION VALUE="<%= $opt_part_svc->svcpart %>"><%= $opt_part_svc->svc %></OPTION>
-    <% } %>
+% foreach my $opt_part_svc ( @part_svc ) { 
+
+      <OPTION VALUE="<% $opt_part_svc->svcpart %>"><% $opt_part_svc->svc %></OPTION>
+% } 
+
   </SELECT>
   <INPUT NAME="submit" TYPE="submit" VALUE="Change" disabled>
-<% } %>
+% } 
+
 
-<%= &ntable("#cccccc") %><TR><TD><%= &ntable("#cccccc",2) %>
+<% &ntable("#cccccc") %><TR><TD><% &ntable("#cccccc",2) %>
 
 <TR>
   <TD ALIGN="right">Service</TD>
-  <TD BGCOLOR="#ffffff"><%= $part_svc->svc %></TD>
+  <TD BGCOLOR="#ffffff"><% $part_svc->svc %></TD>
 </TR>
 <TR>
   <TD ALIGN="right">Username</TD>
-  <TD BGCOLOR="#ffffff"><%= $svc_acct->username %></TD>
+  <TD BGCOLOR="#ffffff"><% $svc_acct->username %></TD>
 </TR>
 <TR>
   <TD ALIGN="right">Domain</TD>
-  <TD BGCOLOR="#ffffff"><%= $domain %></TD>
+  <TD BGCOLOR="#ffffff"><% $domain %></TD>
 </TR>
 
 <TR>
   <TD ALIGN="right">Password</TD>
   <TD BGCOLOR="#ffffff">
+% my $password = $svc_acct->_password; 
+% if ( $password =~ /^\*\w+\* (.*)$/ ) {
+%         $password = $1;
+%    
 
-    <% my $password = $svc_acct->_password; %>
-    <% if ( $password =~ /^\*\w+\* (.*)$/ ) {
-         $password = $1;
-    %>
       <I>(login disabled)</I>
-    <% } %>
+% } 
+% if ( $conf->exists('showpasswords') ) { 
+
+      <PRE><% encode_entities($password) %></PRE>
+% } else { 
 
-    <% if ( $conf->exists('showpasswords') ) { %>
-      <PRE><%= encode_entities($password) %></PRE>
-    <% } else { %>
       <I>(hidden)</I>
-    <% } %>
+% } 
+
 
   </TD>
 </TR>
-<% $password = ''; %>
+% $password = ''; 
+% if ( $conf->exists('security_phrase') ) {
+%     my $sec_phrase = $svc_acct->sec_phrase;
+%
 
-<% if ( $conf->exists('security_phrase') ) {
-     my $sec_phrase = $svc_acct->sec_phrase;
-%>
   <TR>
     <TD ALIGN="right">Security phrase</TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct->sec_phrase %></TD>
+    <TD BGCOLOR="#ffffff"><% $svc_acct->sec_phrase %></TD>
   </TR>
-<% } %>
+% } 
+% if ( $svc_acct->popnum ) {
+%    my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
+%
 
-<% if ( $svc_acct->popnum ) {
-    my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
-%>
   <TR>
     <TD ALIGN="right">Access number</TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct_pop->text %></TD>
+    <TD BGCOLOR="#ffffff"><% $svc_acct_pop->text %></TD>
   </TR>
-<% } %>
+% } 
+% if ($svc_acct->uid ne '') { 
 
-<% if ($svc_acct->uid ne '') { %>
   <TR>
     <TD ALIGN="right">UID</TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct->uid %></TD>
+    <TD BGCOLOR="#ffffff"><% $svc_acct->uid %></TD>
   </TR>
-<% } %>
+% } 
+% if ($svc_acct->gid ne '') { 
 
-<% if ($svc_acct->gid ne '') { %>
   <TR>
     <TD ALIGN="right">GID</TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct->gid %></TD>
+    <TD BGCOLOR="#ffffff"><% $svc_acct->gid %></TD>
   </TR>
-<% } %>
+% } 
+% if ($svc_acct->finger ne '') { 
 
-<% if ($svc_acct->finger ne '') { %>
   <TR>
     <TD ALIGN="right">GECOS</TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct->finger %></TD>
+    <TD BGCOLOR="#ffffff"><% $svc_acct->finger %></TD>
   </TR>
-<% } %>
+% } 
+% if ($svc_acct->dir ne '') { 
 
-<% if ($svc_acct->dir ne '') { %>
   <TR>
     <TD ALIGN="right">Home directory</TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct->dir %></TD>
+    <TD BGCOLOR="#ffffff"><% $svc_acct->dir %></TD>
   </TR>
-<% } %>
+% } 
+% if ($svc_acct->shell ne '') { 
 
-<% if ($svc_acct->shell ne '') { %>
   <TR>
     <TD ALIGN="right">Shell</TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct->shell %></TD>
+    <TD BGCOLOR="#ffffff"><% $svc_acct->shell %></TD>
   </TR>
-<% } %>
+% } 
+% if ($svc_acct->quota ne '') { 
 
-<% if ($svc_acct->quota ne '') { %>
   <TR>
     <TD ALIGN="right">Quota</TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct->quota %></TD>
+    <TD BGCOLOR="#ffffff"><% $svc_acct->quota %></TD>
   </TR>
-<% } %>
+% } 
+% if ($svc_acct->slipip) { 
 
-<% if ($svc_acct->slipip) { %>
   <TR>
     <TD ALIGN="right">IP address</TD>
     <TD BGCOLOR="#ffffff">
-      <%= ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' )
+      <% ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' )
             ? "<I>(Dynamic)</I>"
             : $svc_acct->slipip
       %>
     </TD>
   </TR>
-<% } %>
+% } 
+% foreach my $attribute ( grep /^radius_/, $svc_acct->fields ) {
+%  $attribute =~ /^radius_(.*)$/;
+%  my $pattribute = $FS::raddb::attrib{$1};
+%
 
-<% foreach my $attribute ( grep /^radius_/, $svc_acct->fields ) {
-  $attribute =~ /^radius_(.*)$/;
-  my $pattribute = $FS::raddb::attrib{$1};
-%>
   <TR>
-    <TD ALIGN="right">Radius (reply) <%= $pattribute %></TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct->getfield($attribute) %></TD>
+    <TD ALIGN="right">Radius (reply) <% $pattribute %></TD>
+    <TD BGCOLOR="#ffffff"><% $svc_acct->getfield($attribute) %></TD>
   </TR>
-<% } %>
+% } 
+% foreach my $attribute ( grep /^rc_/, $svc_acct->fields ) {
+%  $attribute =~ /^rc_(.*)$/;
+%  my $pattribute = $FS::raddb::attrib{$1};
+%
 
-<% foreach my $attribute ( grep /^rc_/, $svc_acct->fields ) {
-  $attribute =~ /^rc_(.*)$/;
-  my $pattribute = $FS::raddb::attrib{$1};
-%>
   <TR>
-    <TD ALIGN="right">Radius (check) <%= $pattribute %></TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct->getfield($attribute) %></TD>
+    <TD ALIGN="right">Radius (check) <% $pattribute %></TD>
+    <TD BGCOLOR="#ffffff"><% $svc_acct->getfield($attribute) %></TD>
   </TR>
-<% } %>
+% } 
+
 
 <TR>
   <TD ALIGN="right">RADIUS groups</TD>
-  <TD BGCOLOR="#ffffff"><%= join('<BR>', $svc_acct->radius_groups) %></TD>
+  <TD BGCOLOR="#ffffff"><% join('<BR>', $svc_acct->radius_groups) %></TD>
 </TR>
+% if ( $svc_acct->seconds =~ /^\d+$/ ) { 
 
-<% if ( $svc_acct->seconds =~ /^\d+$/ ) { %>
   <TR>
     <TD ALIGN="right">Prepaid time</TD>
-    <TD BGCOLOR="#ffffff"><%= duration_exact($svc_acct->seconds) %></TD>
+    <TD BGCOLOR="#ffffff"><% duration_exact($svc_acct->seconds) %></TD>
   </TR>
-<% } %>
+% } 
+%
+%# Can this be abstracted further?  Maybe a library function like
+%# widget('HTML', 'view', $svc_acct) ?  It would definitely make UI 
+%# style management easier.
+%
+% foreach (sort { $a cmp $b } $svc_acct->virtual_fields) { 
 
-<%
-# Can this be abstracted further?  Maybe a library function like
-# widget('HTML', 'view', $svc_acct) ?  It would definitely make UI 
-# style management easier.
-%>
+  <% $svc_acct->pvf($_)->widget('HTML', 'view', $svc_acct->getfield($_)) %>
+% } 
 
-<% foreach (sort { $a cmp $b } $svc_acct->virtual_fields) { %>
-  <%= $svc_acct->pvf($_)->widget('HTML', 'view', $svc_acct->getfield($_)) %>
-<% } %>
 
 </TABLE></TD></TR></TABLE>
 </FORM>
 <BR><BR>
 
-<%= join("<BR>", $conf->config('svc_acct-notes') ) %>
+<% join("<BR>", $conf->config('svc_acct-notes') ) %>
 <BR><BR>
 
-<%= joblisting({'svcnum'=>$svcnum}, 1) %>
+<% joblisting({'svcnum'=>$svcnum}, 1) %>
 
 </BODY>
 </HTML>
diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index 263fd70f5..1800541f0 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -1,50 +1,51 @@
 <!-- mason kludge -->
-<%
-
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $svcnum = $1;
-my $svc_broadband = qsearchs( 'svc_broadband', { 'svcnum' => $svcnum } )
-  or die "svc_broadband: Unknown svcnum $svcnum";
-
-#false laziness w/all svc_*.cgi
-my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } );
-my $pkgnum = $cust_svc->getfield('pkgnum');
-my($cust_pkg, $custnum);
-if ($pkgnum) {
-  $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
-  $custnum = $cust_pkg->custnum;
-} else {
-  $cust_pkg = '';
-  $custnum = '';
-}
-#eofalse
-
-my $addr_block = $svc_broadband->addr_block;
-my $router = $addr_block->router;
-
-if (not $router) { die "Could not lookup router for svc_broadband (svcnum $svcnum)" };
-
-my (
-     $routername,
-     $routernum,
-     $speed_down,
-     $speed_up,
-     $ip_addr,
-     $ip_gateway,
-     $ip_netmask,
-   ) = (
-     $router->getfield('routername'),
-     $router->getfield('routernum'),
-     $svc_broadband->getfield('speed_down'),
-     $svc_broadband->getfield('speed_up'),
-     $svc_broadband->getfield('ip_addr'),
-     $addr_block->ip_gateway,
-     $addr_block->NetAddr->mask,
-   );
-%>
+%
+%
+%my($query) = $cgi->keywords;
+%$query =~ /^(\d+)$/;
+%my $svcnum = $1;
+%my $svc_broadband = qsearchs( 'svc_broadband', { 'svcnum' => $svcnum } )
+%  or die "svc_broadband: Unknown svcnum $svcnum";
+%
+%#false laziness w/all svc_*.cgi
+%my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } );
+%my $pkgnum = $cust_svc->getfield('pkgnum');
+%my($cust_pkg, $custnum);
+%if ($pkgnum) {
+%  $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
+%  $custnum = $cust_pkg->custnum;
+%} else {
+%  $cust_pkg = '';
+%  $custnum = '';
+%}
+%#eofalse
+%
+%my $addr_block = $svc_broadband->addr_block;
+%my $router = $addr_block->router;
+%
+%if (not $router) { die "Could not lookup router for svc_broadband (svcnum $svcnum)" };
+%
+%my (
+%     $routername,
+%     $routernum,
+%     $speed_down,
+%     $speed_up,
+%     $ip_addr,
+%     $ip_gateway,
+%     $ip_netmask,
+%   ) = (
+%     $router->getfield('routername'),
+%     $router->getfield('routernum'),
+%     $svc_broadband->getfield('speed_down'),
+%     $svc_broadband->getfield('speed_up'),
+%     $svc_broadband->getfield('ip_addr'),
+%     $addr_block->ip_gateway,
+%     $addr_block->NetAddr->mask,
+%   );
+%
+
 
-<%=include("/elements/header.html",'Broadband Service View', menubar(
+<%include("/elements/header.html",'Broadband Service View', menubar(
   ( ( $custnum )
     ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )                                                                       
@@ -55,101 +56,108 @@ my (
 ))
 %>
 
-<A HREF="<%=${p}%>edit/svc_broadband.cgi?<%=$svcnum%>">Edit this information</A>
+<A HREF="<%${p}%>edit/svc_broadband.cgi?<%$svcnum%>">Edit this information</A>
 <BR>
-<%=ntable("#cccccc")%>
+<%ntable("#cccccc")%>
   <TR>
     <TD>
-      <%=ntable("#cccccc",2)%>
+      <%ntable("#cccccc",2)%>
         <TR>
           <TD ALIGN="right">Service number</TD>
-          <TD BGCOLOR="#ffffff"><%=$svcnum%></TD>
+          <TD BGCOLOR="#ffffff"><%$svcnum%></TD>
         </TR>
         <TR>
           <TD ALIGN="right">Router</TD>
-          <TD BGCOLOR="#ffffff"><%=$routernum%>: <%=$routername%></TD>
+          <TD BGCOLOR="#ffffff"><%$routernum%>: <%$routername%></TD>
         </TR>
         <TR>
           <TD ALIGN="right">Download Speed</TD>
-          <TD BGCOLOR="#ffffff"><%=$speed_down%></TD>
+          <TD BGCOLOR="#ffffff"><%$speed_down%></TD>
         </TR>
         <TR>
           <TD ALIGN="right">Upload Speed</TD>
-          <TD BGCOLOR="#ffffff"><%=$speed_up%></TD>
+          <TD BGCOLOR="#ffffff"><%$speed_up%></TD>
         </TR>
         <TR>
           <TD ALIGN="right">IP Address</TD>
-          <TD BGCOLOR="#ffffff"><%=$ip_addr%></TD>
+          <TD BGCOLOR="#ffffff"><%$ip_addr%></TD>
         </TR>
         <TR>
           <TD ALIGN="right">IP Netmask</TD>
-          <TD BGCOLOR="#ffffff"><%=$ip_netmask%></TD>
+          <TD BGCOLOR="#ffffff"><%$ip_netmask%></TD>
         </TR>
         <TR>
           <TD ALIGN="right">IP Gateway</TD>
-          <TD BGCOLOR="#ffffff"><%=$ip_gateway%></TD>
+          <TD BGCOLOR="#ffffff"><%$ip_gateway%></TD>
         </TR>
         <TR COLSPAN="2"><TD></TD></TR>
+%
+%foreach (sort { $a cmp $b } $svc_broadband->virtual_fields) {
+%  print $svc_broadband->pvf($_)->widget('HTML', 'view',
+%                                        $svc_broadband->getfield($_)), "\n";
+%}
+%
+%
 
-<%
-foreach (sort { $a cmp $b } $svc_broadband->virtual_fields) {
-  print $svc_broadband->pvf($_)->widget('HTML', 'view',
-                                        $svc_broadband->getfield($_)), "\n";
-}
-
-%>
       </TABLE>
     </TD>
   </TR>
 </TABLE>
 
 <BR>
-<%=ntable("#cccccc", 2)%>
-<%
-  my $sb_router = qsearchs('router', { svcnum => $svcnum });
-  if ($sb_router) {
-  %>
-  <B>Router associated: <%=$sb_router->routername%> </B>
-  <A HREF="<%=popurl(2)%>edit/router.cgi?<%=$sb_router->routernum%>">
+<%ntable("#cccccc", 2)%>
+%
+%  my $sb_router = qsearchs('router', { svcnum => $svcnum });
+%  if ($sb_router) {
+%  
+
+  <B>Router associated: <%$sb_router->routername%> </B>
+  <A HREF="<%popurl(2)%>edit/router.cgi?<%$sb_router->routernum%>">
     (details)
   </A>
   <BR>
-  <% my @sb_addr_block;
-     if (@sb_addr_block = $sb_router->addr_block) {
-     %>
+% my @sb_addr_block;
+%     if (@sb_addr_block = $sb_router->addr_block) {
+%     
+
   <B>Address space </B>
-  <A HREF="<%=popurl(2)%>browse/addr_block.cgi">
+  <A HREF="<%popurl(2)%>browse/addr_block.cgi">
     (edit)
   </A>
   <BR>
-  <%   print ntable("#cccccc", 1);
-       foreach (@sb_addr_block) { %>
+%   print ntable("#cccccc", 1);
+%       foreach (@sb_addr_block) { 
+
     <TR>
-      <TD><%=$_->ip_gateway%>/<%=$_->ip_netmask%></TD>
+      <TD><%$_->ip_gateway%>/<%$_->ip_netmask%></TD>
     </TR>
-    <% } %>
+% } 
+
   </TABLE>
-  <% } else { %>
+% } else { 
+
   <B>No address space allocated.</B>
-    <% } %>
+% } 
+
   <BR>
-  <%
-  } else {
-%>
+%
+%  } else {
+%
+
 
-<FORM METHOD="GET" ACTION="<%=popurl(2)%>edit/router.cgi">
-  <INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$svcnum%>">
+<FORM METHOD="GET" ACTION="<%popurl(2)%>edit/router.cgi">
+  <INPUT TYPE="hidden" NAME="svcnum" VALUE="<%$svcnum%>">
 Add router named 
-  <INPUT TYPE="text" NAME="routername" SIZE="32" VALUE="Broadband router (<%=$svcnum%>)">
+  <INPUT TYPE="text" NAME="routername" SIZE="32" VALUE="Broadband router (<%$svcnum%>)">
   <INPUT TYPE="submit" VALUE="Add router">
 </FORM>
+%
+%}
+%
 
-<%
-}
-%>
 
 <BR>
-<%=joblisting({'svcnum'=>$svcnum}, 1)%>
+<%joblisting({'svcnum'=>$svcnum}, 1)%>
   </BODY>
 </HTML>
 
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index f39663094..44390bf8b 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -1,38 +1,39 @@
 <!-- mason kludge -->
-<%
+%
+%
+%my($query) = $cgi->keywords;
+%$query =~ /^(\d+)$/;
+%my $svcnum = $1;
+%my $svc_domain = qsearchs('svc_domain',{'svcnum'=>$svcnum});
+%die "Unknown svcnum" unless $svc_domain;
+%
+%my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+%my $pkgnum = $cust_svc->getfield('pkgnum');
+%my($cust_pkg, $custnum);
+%if ($pkgnum) {
+%  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+%  $custnum=$cust_pkg->getfield('custnum');
+%} else {
+%  $cust_pkg = '';
+%  $custnum = '';
+%}
+%
+%my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+%die "Unknown svcpart" unless $part_svc;
+%
+%my $email = '';
+%if ($svc_domain->catchall) {
+%  my $svc_acct = qsearchs('svc_acct',{'svcnum'=> $svc_domain->catchall } );
+%  die "Unknown svcpart" unless $svc_acct;
+%  $email = $svc_acct->email;
+%}
+%
+%my $domain = $svc_domain->domain;
+%
+%
 
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $svcnum = $1;
-my $svc_domain = qsearchs('svc_domain',{'svcnum'=>$svcnum});
-die "Unknown svcnum" unless $svc_domain;
 
-my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-my $pkgnum = $cust_svc->getfield('pkgnum');
-my($cust_pkg, $custnum);
-if ($pkgnum) {
-  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-  $custnum=$cust_pkg->getfield('custnum');
-} else {
-  $cust_pkg = '';
-  $custnum = '';
-}
-
-my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
-die "Unknown svcpart" unless $part_svc;
-
-my $email = '';
-if ($svc_domain->catchall) {
-  my $svc_acct = qsearchs('svc_acct',{'svcnum'=> $svc_domain->catchall } );
-  die "Unknown svcpart" unless $svc_acct;
-  $email = $svc_acct->email;
-}
-
-my $domain = $svc_domain->domain;
-
-%>
-
-<%= include("/elements/header.html",'Domain View', menubar(
+<% include("/elements/header.html",'Domain View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )
@@ -42,12 +43,12 @@ my $domain = $svc_domain->domain;
   "Main menu" => $p,
 )) %>
 
-Service #<%= $svcnum %>
-<BR>Service: <B><%= $part_svc->svc %></B>
-<BR>Domain name: <B><%= $domain %></B>
-<BR>Catch all email <A HREF="<%= ${p} %>misc/catchall.cgi?<%= $svcnum %>">(change)</A>:
-<%= $email ? "<B>$email</B>" : "<I>(none)<I>" %>
-<BR><BR><A HREF="<%= ${p} %>misc/whois.cgi?custnum=<%=$custnum%>;svcnum=<%=$svcnum%>;domain=<%=$domain%>">View whois information.</A>
+Service #<% $svcnum %>
+<BR>Service: <B><% $part_svc->svc %></B>
+<BR>Domain name: <B><% $domain %></B>
+<BR>Catch all email <A HREF="<% ${p} %>misc/catchall.cgi?<% $svcnum %>">(change)</A>:
+<% $email ? "<B>$email</B>" : "<I>(none)<I>" %>
+<BR><BR><A HREF="<% ${p} %>misc/whois.cgi?custnum=<%$custnum%>;svcnum=<%$svcnum%>;domain=<%$domain%>">View whois information.</A>
 <BR><BR>
 <SCRIPT>
   function areyousure(href, message) {
@@ -58,51 +59,58 @@ Service #<%= $svcnum %>
     return confirm("Remove all records and slave from " + document.SlaveForm.recdata.value + "?");
   }
 </SCRIPT>
+% my @records; if ( @records = $svc_domain->domain_record ) { 
 
-<% my @records; if ( @records = $svc_domain->domain_record ) { %>
-  <%= ntable("",2) %>
+  <% ntable("",2) %>
   <tr><th>Zone</th><th>Type</th><th>Data</th></tr>
+% foreach my $domain_record ( @records ) {
+%       my $type = $domain_record->rectype eq '_mstr'
+%                    ? "(slave)"
+%                    : $domain_record->recaf. ' '. $domain_record->rectype;
+%  
 
-  <% foreach my $domain_record ( @records ) {
-       my $type = $domain_record->rectype eq '_mstr'
-                    ? "(slave)"
-                    : $domain_record->recaf. ' '. $domain_record->rectype;
-  %>
 
-    <tr><td><%= $domain_record->reczone %></td>
-    <td><%= $type %></td>
-    <td><%= $domain_record->recdata %>
+    <tr><td><% $domain_record->reczone %></td>
+    <td><% $type %></td>
+    <td><% $domain_record->recdata %>
+% unless ( $domain_record->rectype eq 'SOA' ) { 
+
+      (<A HREF="javascript:areyousure('<%$p%>misc/delete-domain_record.cgi?<%$domain_record->recnum%>', 'Delete \'<% $domain_record->reczone %> <% $type %> <% $domain_record->recdata %>\' ?' )">delete</A>)
+% } 
 
-    <% unless ( $domain_record->rectype eq 'SOA' ) { %>
-      (<A HREF="javascript:areyousure('<%=$p%>misc/delete-domain_record.cgi?<%=$domain_record->recnum%>', 'Delete \'<%= $domain_record->reczone %> <%= $type %> <%= $domain_record->recdata %>\' ?' )">delete</A>)
-    <% } %>
     </td></tr>
-  <% } %>
+% } 
+
   </table>
-<% } %>
+% } 
+
 
 <BR>
-<FORM METHOD="POST" ACTION="<%=$p%>edit/process/domain_record.cgi">
-<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$svcnum%>">
+<FORM METHOD="POST" ACTION="<%$p%>edit/process/domain_record.cgi">
+<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%$svcnum%>">
 <INPUT TYPE="text" NAME="reczone"> 
 <INPUT TYPE="hidden" NAME="recaf" VALUE="IN"> IN 
  <SELECT NAME="rectype">
-<% foreach (qw( A NS CNAME MX PTR TXT) ) { %>
-  <OPTION VALUE="<%=$_%>"><%=$_%></OPTION>
-<% } %>
+% foreach (qw( A NS CNAME MX PTR TXT) ) { 
+
+  <OPTION VALUE="<%$_%>"><%$_%></OPTION>
+% } 
+
  </SELECT>
 <INPUT TYPE="text" NAME="recdata"> <INPUT TYPE="submit" VALUE="Add record">
 </FORM><BR><BR>or<BR><BR>
-<FORM NAME="SlaveForm" METHOD="POST" ACTION="<%=$p%>edit/process/domain_record.cgi">
-<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$svcnum%>">
+<FORM NAME="SlaveForm" METHOD="POST" ACTION="<%$p%>edit/process/domain_record.cgi">
+<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%$svcnum%>">
+% if ( @records ) { 
+ Delete all records and 
+% } 
 
-<% if ( @records ) { %> Delete all records and <% } %>
 Slave from nameserver IP 
-<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$svcnum%>">
+<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%$svcnum%>">
 <INPUT TYPE="hidden" NAME="reczone" VALUE="@"> 
 <INPUT TYPE="hidden" NAME="recaf" VALUE="IN">
 <INPUT TYPE="hidden" NAME="rectype" VALUE="_mstr">
 <INPUT TYPE="text" NAME="recdata"> <INPUT TYPE="submit" VALUE="Slave domain" onClick="return slave_areyousure()">
 </FORM>
-<BR><BR><%= joblisting({'svcnum'=>$svcnum}, 1) %>
+<BR><BR><% joblisting({'svcnum'=>$svcnum}, 1) %>
 </BODY></HTML>
diff --git a/httemplate/view/svc_external.cgi b/httemplate/view/svc_external.cgi
index 7816d88dc..06302bd8f 100644
--- a/httemplate/view/svc_external.cgi
+++ b/httemplate/view/svc_external.cgi
@@ -1,30 +1,31 @@
-<%
-
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $svcnum = $1;
-my $svc_external = qsearchs( 'svc_external', { 'svcnum' => $svcnum } )
-  or die "svc_external: Unknown svcnum $svcnum";
-
-my $conf = new FS::Conf;
-
-#false laziness w/all svc_*.cgi
-my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } );
-my $pkgnum = $cust_svc->getfield('pkgnum');
-my($cust_pkg, $custnum);
-if ($pkgnum) {
-  $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
-  $custnum = $cust_pkg->custnum;
-} else {
-  $cust_pkg = '';
-  $custnum = '';
-}
-#eofalse
-
-
-%>
-
-<%= include("/elements/header.html",'External Service View', menubar(
+%
+%
+%my($query) = $cgi->keywords;
+%$query =~ /^(\d+)$/;
+%my $svcnum = $1;
+%my $svc_external = qsearchs( 'svc_external', { 'svcnum' => $svcnum } )
+%  or die "svc_external: Unknown svcnum $svcnum";
+%
+%my $conf = new FS::Conf;
+%
+%#false laziness w/all svc_*.cgi
+%my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } );
+%my $pkgnum = $cust_svc->getfield('pkgnum');
+%my($cust_pkg, $custnum);
+%if ($pkgnum) {
+%  $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
+%  $custnum = $cust_pkg->custnum;
+%} else {
+%  $cust_pkg = '';
+%  $custnum = '';
+%}
+%#eofalse
+%
+%
+%
+
+
+<% include("/elements/header.html",'External Service View', menubar(
   ( ( $custnum )
     ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )                                                                       
@@ -34,20 +35,21 @@ if ($pkgnum) {
   "Main menu" => $p,
 )) %>
 
-<A HREF="<%=$p%>edit/svc_external.cgi?<%=$svcnum%>">Edit this information</A><BR>
-<%= ntable("#cccccc") %><TR><TD><%= ntable("#cccccc",2) %>
+<A HREF="<%$p%>edit/svc_external.cgi?<%$svcnum%>">Edit this information</A><BR>
+<% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
 
 <TR><TD ALIGN="right">Service number</TD>
-  <TD BGCOLOR="#ffffff"><%= $svcnum %></TD></TR>
-<TR><TD ALIGN="right"><%= FS::Msgcat::_gettext('svc_external-id') || 'External&nbsp;ID' %></TD>
-  <TD BGCOLOR="#ffffff"><%= $conf->config('svc_external-display_type') eq 'artera_turbo' ? sprintf('%010d', $svc_external->id) : $svc_external->id %></TD></TR>
-<TR><TD ALIGN="right"><%= FS::Msgcat::_gettext('svc_external-title') || 'Title' %></TD>
-  <TD BGCOLOR="#ffffff"><%= $svc_external->title %></TD></TR>
+  <TD BGCOLOR="#ffffff"><% $svcnum %></TD></TR>
+<TR><TD ALIGN="right"><% FS::Msgcat::_gettext('svc_external-id') || 'External&nbsp;ID' %></TD>
+  <TD BGCOLOR="#ffffff"><% $conf->config('svc_external-display_type') eq 'artera_turbo' ? sprintf('%010d', $svc_external->id) : $svc_external->id %></TD></TR>
+<TR><TD ALIGN="right"><% FS::Msgcat::_gettext('svc_external-title') || 'Title' %></TD>
+  <TD BGCOLOR="#ffffff"><% $svc_external->title %></TD></TR>
+% foreach (sort { $a cmp $b } $svc_external->virtual_fields) { 
+
+  <% $svc_external->pvf($_)->widget('HTML', 'view', $svc_external->getfield($_)) %>
+% } 
 
-<% foreach (sort { $a cmp $b } $svc_external->virtual_fields) { %>
-  <%= $svc_external->pvf($_)->widget('HTML', 'view', $svc_external->getfield($_)) %>
-<% } %>
 
 </TABLE></TD></TR></TABLE>
-<BR><%= joblisting({'svcnum'=>$svcnum}, 1) %>
+<BR><% joblisting({'svcnum'=>$svcnum}, 1) %>
 </BODY></HTML>
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index 52360bcc2..fcc0bc96f 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -1,84 +1,85 @@
 <!-- mason kludge -->
-<%
+%
+%
+%my $conf = new FS::Conf;
+%
+%my($query) = $cgi->keywords;
+%$query =~ /^(\d+)$/;
+%my $svcnum = $1;
+%my $svc_forward = qsearchs('svc_forward',{'svcnum'=>$svcnum});
+%die "Unknown svcnum" unless $svc_forward;
+%
+%my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+%my $pkgnum = $cust_svc->getfield('pkgnum');
+%my($cust_pkg, $custnum);
+%if ($pkgnum) {
+%  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+%  $custnum=$cust_pkg->getfield('custnum');
+%} else {
+%  $cust_pkg = '';
+%  $custnum = '';
+%}
+%
+%my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
+%  or die "Unkonwn svcpart";
+%
+%print header('Mail Forward View', menubar(
+%  ( ( $pkgnum || $custnum )
+%    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+%      )
+%    : ( "Cancel this (unaudited) mail forward" =>
+%          "${p}misc/cancel-unaudited.cgi?$svcnum" )
+%  ),
+%  "Main menu" => $p,
+%));
+%
+%my($srcsvc,$dstsvc,$dst) = (
+%  $svc_forward->srcsvc,
+%  $svc_forward->dstsvc,
+%  $svc_forward->dst,
+%);
+%my $src = $svc_forward->dbdef_table->column('src') ? $svc_forward->src : '';
+%
+%my $svc = $part_svc->svc;
+%
+%my $source;
+%if ($srcsvc) {
+%  my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc})
+%    or die "Corrupted database: no svc_acct.svcnum matching srcsvc $srcsvc";
+%  $source = $svc_acct->email;
+%} else {
+%  $source = $src;
+%}
+%
+%my $destination;
+%if ($dstsvc) {
+%  my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$dstsvc})
+%    or die "Corrupted database: no svc_acct.svcnum matching dstsvc $dstsvc";
+%  $destination = $svc_acct->email;
+%} else {
+%  $destination = $dst;
+%}
+%
+%print qq!<A HREF="${p}edit/svc_forward.cgi?$svcnum">Edit this information</A>!.
+%      ntable("#cccccc",2).
+%      '<TR><TD ALIGN="right">Service number</TD>'.
+%        qq!<TD BGCOLOR="#ffffff">$svcnum</TD></TR>!.
+%      '<TR><TD ALIGN="right">Service</TD>'.
+%        qq!<TD BGCOLOR="#ffffff">$svc</TD></TR>!.
+%      qq!<TR><TD ALIGN="right">Email to</TD>!.
+%        qq!<TD BGCOLOR="#ffffff">$source</TD></TR>!.
+%      qq!<TR><TD ALIGN="right">Forwards to </TD>!.
+%        qq!<TD BGCOLOR="#ffffff">$destination</TD></TR>!;
+%
+%foreach (sort { $a cmp $b } $svc_forward->virtual_fields) {
+%  print $svc_forward->pvf($_)->widget('HTML', 'view', $svc_forward->getfield($_)),
+%      "\n";
+%}
+%
+%print qq!  </TABLE>!.
+%      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
+%      '</BODY></HTML>'
+%;
+%
+%
 
-my $conf = new FS::Conf;
-
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $svcnum = $1;
-my $svc_forward = qsearchs('svc_forward',{'svcnum'=>$svcnum});
-die "Unknown svcnum" unless $svc_forward;
-
-my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-my $pkgnum = $cust_svc->getfield('pkgnum');
-my($cust_pkg, $custnum);
-if ($pkgnum) {
-  $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-  $custnum=$cust_pkg->getfield('custnum');
-} else {
-  $cust_pkg = '';
-  $custnum = '';
-}
-
-my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
-  or die "Unkonwn svcpart";
-
-print header('Mail Forward View', menubar(
-  ( ( $pkgnum || $custnum )
-    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-      )
-    : ( "Cancel this (unaudited) mail forward" =>
-          "${p}misc/cancel-unaudited.cgi?$svcnum" )
-  ),
-  "Main menu" => $p,
-));
-
-my($srcsvc,$dstsvc,$dst) = (
-  $svc_forward->srcsvc,
-  $svc_forward->dstsvc,
-  $svc_forward->dst,
-);
-my $src = $svc_forward->dbdef_table->column('src') ? $svc_forward->src : '';
-
-my $svc = $part_svc->svc;
-
-my $source;
-if ($srcsvc) {
-  my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc})
-    or die "Corrupted database: no svc_acct.svcnum matching srcsvc $srcsvc";
-  $source = $svc_acct->email;
-} else {
-  $source = $src;
-}
-
-my $destination;
-if ($dstsvc) {
-  my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$dstsvc})
-    or die "Corrupted database: no svc_acct.svcnum matching dstsvc $dstsvc";
-  $destination = $svc_acct->email;
-} else {
-  $destination = $dst;
-}
-
-print qq!<A HREF="${p}edit/svc_forward.cgi?$svcnum">Edit this information</A>!.
-      ntable("#cccccc",2).
-      '<TR><TD ALIGN="right">Service number</TD>'.
-        qq!<TD BGCOLOR="#ffffff">$svcnum</TD></TR>!.
-      '<TR><TD ALIGN="right">Service</TD>'.
-        qq!<TD BGCOLOR="#ffffff">$svc</TD></TR>!.
-      qq!<TR><TD ALIGN="right">Email to</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$source</TD></TR>!.
-      qq!<TR><TD ALIGN="right">Forwards to </TD>!.
-        qq!<TD BGCOLOR="#ffffff">$destination</TD></TR>!;
-
-foreach (sort { $a cmp $b } $svc_forward->virtual_fields) {
-  print $svc_forward->pvf($_)->widget('HTML', 'view', $svc_forward->getfield($_)),
-      "\n";
-}
-
-print qq!  </TABLE>!.
-      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
-      '</BODY></HTML>'
-;
-
-%>
diff --git a/httemplate/view/svc_phone.cgi b/httemplate/view/svc_phone.cgi
index 8de7cc8e7..732f3cd79 100644
--- a/httemplate/view/svc_phone.cgi
+++ b/httemplate/view/svc_phone.cgi
@@ -1,4 +1,4 @@
-<%= include('elements/svc_Common.html',
+<% include('elements/svc_Common.html',
               'table'  => 'svc_phone',
               'fields' => [qw( countrycode phonenum )], #pin
               'labels' => {
diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index 6c8cd6a0b..f2be5c717 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -1,73 +1,74 @@
 <!-- mason kludge -->
-<%
+%
+%
+%my($query) = $cgi->keywords;
+%$query =~ /^(\d+)$/;
+%my $svcnum = $1;
+%my $svc_www = qsearchs( 'svc_www', { 'svcnum' => $svcnum } )
+%  or die "svc_www: Unknown svcnum $svcnum";
+%
+%#false laziness w/all svc_*.cgi
+%my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } );
+%my $pkgnum = $cust_svc->getfield('pkgnum');
+%my($cust_pkg, $custnum);
+%if ($pkgnum) {
+%  $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
+%  $custnum = $cust_pkg->custnum;
+%} else {
+%  $cust_pkg = '';
+%  $custnum = '';
+%}
+%#eofalse
+%
+%my $usersvc = $svc_www->usersvc;
+%my $svc_acct = '';
+%my $email = '';
+%if ( $usersvc ) {
+%  $svc_acct = qsearchs('svc_acct', { 'svcnum' => $usersvc } )
+%    or die "svc_www: Unknown usersvc $usersvc";
+%  $email = $svc_acct->email;
+%}
+%
+%my $domain_record = qsearchs('domain_record', { 'recnum' => $svc_www->recnum } )
+%  or die "svc_www: Unknown recnum ". $svc_www->recnum;
+%
+%my $www = $domain_record->zone;
+%
+%print header('Website View', menubar(
+%  ( ( $custnum )
+%    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+%      )                                                                       
+%    : ( "Cancel this (unaudited) website" =>
+%          "${p}misc/cancel-unaudited.cgi?$svcnum" )
+%  ),
+%  "Main menu" => $p,
+%)).
+%      qq!<A HREF="${p}edit/svc_www.cgi?$svcnum">Edit this information</A><BR>!.
+%      ntable("#cccccc"). '<TR><TD>'. ntable("#cccccc",2).
+%      qq!<TR><TD ALIGN="right">Service number</TD>!.
+%        qq!<TD BGCOLOR="#ffffff">$svcnum</TD></TR>!.
+%      qq!<TR><TD ALIGN="right">Website name</TD>!.
+%        qq!<TD BGCOLOR="#ffffff"><A HREF="http://$www">$www<A></TD></TR>!.
+%      qq!<TR><TD ALIGN="right">Account</TD>!.
+%        qq!<TD BGCOLOR="#ffffff">!;
+%
+%if ( $usersvc ) {
+%  print qq!<A HREF="${p}view/svc_acct.cgi?$usersvc">$email</A>!;
+%} else {
+%  print '</i>(none)</i>';
+%}
+%
+%print '</TD></TR>';
+%
+%foreach (sort { $a cmp $b } $svc_www->virtual_fields) {
+%  print $svc_www->pvf($_)->widget('HTML', 'view', $svc_www->getfield($_)),
+%      "\n";
+%}
+%
+%
+%print '</TABLE></TD></TR></TABLE>'.
+%      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
+%      '</BODY></HTML>'
+%;
+%
 
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $svcnum = $1;
-my $svc_www = qsearchs( 'svc_www', { 'svcnum' => $svcnum } )
-  or die "svc_www: Unknown svcnum $svcnum";
-
-#false laziness w/all svc_*.cgi
-my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } );
-my $pkgnum = $cust_svc->getfield('pkgnum');
-my($cust_pkg, $custnum);
-if ($pkgnum) {
-  $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
-  $custnum = $cust_pkg->custnum;
-} else {
-  $cust_pkg = '';
-  $custnum = '';
-}
-#eofalse
-
-my $usersvc = $svc_www->usersvc;
-my $svc_acct = '';
-my $email = '';
-if ( $usersvc ) {
-  $svc_acct = qsearchs('svc_acct', { 'svcnum' => $usersvc } )
-    or die "svc_www: Unknown usersvc $usersvc";
-  $email = $svc_acct->email;
-}
-
-my $domain_record = qsearchs('domain_record', { 'recnum' => $svc_www->recnum } )
-  or die "svc_www: Unknown recnum ". $svc_www->recnum;
-
-my $www = $domain_record->zone;
-
-print header('Website View', menubar(
-  ( ( $custnum )
-    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-      )                                                                       
-    : ( "Cancel this (unaudited) website" =>
-          "${p}misc/cancel-unaudited.cgi?$svcnum" )
-  ),
-  "Main menu" => $p,
-)).
-      qq!<A HREF="${p}edit/svc_www.cgi?$svcnum">Edit this information</A><BR>!.
-      ntable("#cccccc"). '<TR><TD>'. ntable("#cccccc",2).
-      qq!<TR><TD ALIGN="right">Service number</TD>!.
-        qq!<TD BGCOLOR="#ffffff">$svcnum</TD></TR>!.
-      qq!<TR><TD ALIGN="right">Website name</TD>!.
-        qq!<TD BGCOLOR="#ffffff"><A HREF="http://$www">$www<A></TD></TR>!.
-      qq!<TR><TD ALIGN="right">Account</TD>!.
-        qq!<TD BGCOLOR="#ffffff">!;
-
-if ( $usersvc ) {
-  print qq!<A HREF="${p}view/svc_acct.cgi?$usersvc">$email</A>!;
-} else {
-  print '</i>(none)</i>';
-}
-
-print '</TD></TR>';
-
-foreach (sort { $a cmp $b } $svc_www->virtual_fields) {
-  print $svc_www->pvf($_)->widget('HTML', 'view', $svc_www->getfield($_)),
-      "\n";
-}
-
-
-print '</TABLE></TD></TR></TABLE>'.
-      '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
-      '</BODY></HTML>'
-;
-%>