[freeside-commits] branch FREESIDE_3_BRANCH updated. dfd453ff15d864eb9c280b1cad79946ecc49034f

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  dfd453ff15d864eb9c280b1cad79946ecc49034f (commit)
      from  02ac576281eb3f74e5b75490517512de3ce5889c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dfd453ff15d864eb9c280b1cad79946ecc49034f
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Jan 24 16:59:52 2014 -0800

    reverse usage_nozero default, #25394, from #19917

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 1a99bd7..89dd68c 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -279,7 +279,7 @@ tie my %accountcode_tollfree_field, 'Tie::IxHash',
                        },
     #eofalse
 
-    'usage_nozero' => { 'name' => 'Omit details for included / no-charge calls.',
+    'usage_showzero' => { 'name' => 'Show details for included / no-charge calls.',
                         'type' => 'checkbox',
                       },
 
@@ -352,7 +352,7 @@ tie my %accountcode_tollfree_field, 'Tie::IxHash',
                        output_format 
                        selfservice_format selfservice_inbound_format
                        usage_mandate usage_section summarize_usage 
-                       usage_nozero bill_every_call bill_inactive_svcs
+                       usage_showzero bill_every_call bill_inactive_svcs
                        count_available_phones suspend_bill 
                      )
                   ],
@@ -416,7 +416,7 @@ sub calc_usage {
                                  : 'default'
                              );
 
-  my $usage_nozero      = $self->option('usage_nozero', 1);
+  my $usage_showzero    = $self->option('usage_showzero', 1);
 
   my $formatter = FS::detail_format->new($output_format, buffer => $details);
 
@@ -508,7 +508,8 @@ sub calc_usage {
         $error = $cdr->set_status('done');
       }
       die $error if $error;
-      $formatter->append($cdr) unless $usage_nozero && $cdr->rated_price == 0;
+      $formatter->append($cdr)
+        unless $cdr->rated_price == 0 and not $usage_showzero;
 
       $cdr_search->adjust(1) if $cdr->freesidestatus eq 'rated';
     } #$cdr

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/part_pkg/voip_cdr.pm |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)