X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=3d0983e67854eb9c3556a5ccd3ee563eff96e6f9;hb=213d2aee192d0aa9ccf5d2caa6bdb09611686901;hp=74484e322f1caf7fffc3bdd90f3d8ba195e32fad;hpb=fe6ddc9940cf3a55b4c37f360a31b90e92e4157d;p=freeside.git

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 74484e322..3d0983e67 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -48,7 +48,7 @@
 %       'hashref'   => { 'custnum' => $cust_main->custnum, },
 %       'extra_sql' => 'AND ( cancel IS NULL OR cancel = 0 )
 %                       AND freq = '. dbh->quote($freq),
-%       'order_by'  => 'ORDER BY pkgnum', # to ensure old pkgs come before change_to_pkg
+%       'order_by'  => 'ORDER BY COALESCE(start_date,0), pkgnum', # to ensure old pkgs come before change_to_pkg
 %     }) or next;
 % 
 %     my $freq_pretty = $cust_pkg[0]->part_pkg->freq_pretty;
@@ -385,9 +385,9 @@
    </TR>
 % }
 
-% if ( $conf->exists('voip-cust_email_csv_cdr') ) { 
+% if ( my $attach = $conf->config('voip-cdr_email_attach') ) { 
   <TR>
-    <TD ALIGN="right"><% mt('Email CDRs as CSV') |h %></TD>
+    <TD ALIGN="right"><% mt('Email CDRs as '.uc($attach)) |h %></TD>
     <TD BGCOLOR="#ffffff"><% $cust_main->email_csv_cdr ? $yes : $no %></TD>
   </TR>
 % }