fix UI bugs in accountcode billing implementation, RT12181

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 3f94796..1f6af40 100644 (file)
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2832,8 +2832,10 @@ sub print_generic {
     if ($conf->exists('voip-cust_accountcode_cdr') && $cust_main->accountcode_cdr) {
       my ($accountcode_section, $accountcode_lines) =
         $self->_items_accountcode_cdr($escape_function_nonbsp,$format);
-      push @{$late_sections}, $accountcode_section;
-      push @detail_items, @$accountcode_lines;
+      if ( scalar(@$accountcode_lines) ) {
+          push @{$late_sections}, $accountcode_section;
+          push @detail_items, @$accountcode_lines;
+      }
     }
   }else{
     push @sections, { 'description' => '', 'subtotal' => '' };

diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index 884d770..532bfc7 100644 (file)
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -461,19 +461,6 @@
       </TD>
     </TR>
 
-% if ( $conf->exists('voip-cust_accountcode_cdr') ) { 
-       <TR>
-        <TD COLSPAN="2">
-            <INPUT TYPE="checkbox" 
-                   NAME="accountcode_cdr" 
-                   VALUE="Y" 
-                   <% $cust_main->accountcode_cdr eq "Y" ? 'CHECKED' : '' %>
-            > Breakdown CDRs by accountcode</TD>
-       </TR>
-% } else { 
-       <INPUT TYPE="hidden" NAME="accountcode_cdr" VALUE="<% $cust_main->accountcode_cdr %>">
-% }
-
     <TR>
       <TD ALIGN="right" WIDTH="200">Credit limit </TD>
       <TD WIDTH="408">
@@ -511,6 +498,19 @@ function toggle(obj) {
       <INPUT TYPE="hidden" NAME="email_csv_cdr" VALUE="<% $cust_main->email_csv_cdr %>">
 % }
 
+% if ( $conf->exists('voip-cust_accountcode_cdr') ) { 
+       <TR>
+        <TD COLSPAN="2">
+            <INPUT TYPE="checkbox" 
+                   NAME="accountcode_cdr" 
+                   VALUE="Y" 
+                   <% $cust_main->accountcode_cdr eq "Y" ? 'CHECKED' : '' %>
+            > Breakdown CDRs by accountcode</TD>
+       </TR>
+% } else { 
+       <INPUT TYPE="hidden" NAME="accountcode_cdr" VALUE="<% $cust_main->accountcode_cdr %>">
+% }
+
 % if ( $show_term || $cust_main->cdr_termination_percentage ) {
       <TR>
        <TD ALIGN="right">CDR termination settlement</TD>