diff options
| author | levinse <levinse> | 2011-05-09 20:07:31 +0000 |
|---|---|---|
| committer | levinse <levinse> | 2011-05-09 20:07:31 +0000 |
| commit | 7e9e7b187565d8168500d48e775d0e94b5374d35 (patch) | |
| tree | 3659e11afd4c2a4e6a40f9da29985774e0599e42 | |
| parent | 5ac0692bfeabd57bf930702f6d5f4b55da7be5a1 (diff) | |
fix UI bugs in accountcode billing implementation, RT12181
| -rw-r--r-- | FS/FS/cust_bill.pm | 6 | ||||
| -rw-r--r-- | httemplate/edit/cust_main/billing.html | 26 |
2 files changed, 17 insertions, 15 deletions
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm index 3f94796c6..1f6af40b4 100644 --- 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 884d77078..532bfc721 100644 --- 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> |