[freeside-commits] branch FREESIDE_3_BRANCH updated. aaf4f151acefc0008ebd772ac2613ae127198334

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  aaf4f151acefc0008ebd772ac2613ae127198334 (commit)
      from  54c39d9642a894e90d9fac36a3fc414f07ef364c (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 aaf4f151acefc0008ebd772ac2613ae127198334
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Feb 21 13:13:45 2015 -0800

    add bill_only_pkg_dates options: Only bill CDRs with a date during the package billing period, RT#31909

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index cd3ce7e..c1dd522 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -285,6 +285,9 @@ tie my %accountcode_tollfree_field, 'Tie::IxHash',
     'bill_inactive_svcs' => { 'name' => 'Bill for all phone numbers that were active during the billing period',
                               'type' => 'checkbox',
                             },
+    'bill_only_pkg_dates' => { 'name' => 'Only bill CDRs with a date during the package billing period',
+                               'type' => 'checkbox',
+                             },
 
     'count_available_phones' => { 'name' => 'Consider for tax purposes the number of lines to be svc_phones that may be provisioned rather than those that actually are.',
                            'type' => 'checkbox',
@@ -348,6 +351,7 @@ tie my %accountcode_tollfree_field, 'Tie::IxHash',
                        selfservice_format selfservice_inbound_format
                        usage_mandate usage_section summarize_usage 
                        usage_showzero bill_every_call bill_inactive_svcs
+                       bill_only_pkg_dates
                        count_available_phones suspend_bill 
                      )
                   ],
@@ -456,11 +460,14 @@ sub calc_usage {
         'calltypenum'    => $self->option('use_calltypenum', 1),
         'status'         => '',
         'for_update'     => 1,
-      );  # $last_bill, $$sdate )
+    );
+    if ( $self->option('bill_only_pkg_dates') ) {
+      $options{'begin'} = $last_bill;
+      $options{'end'}   = $$sdate;
+    }
     if ( $svc_field eq 'svcnum' ) {
       $options{'by_svcnum'} = 1;
-    }
-    elsif ($svc_table eq 'svc_pbx' and $svc_field eq 'ip') {
+    } elsif ($svc_table eq 'svc_pbx' and $svc_field eq 'ip') {
       $options{'by_ip_addr'} = $by_ip_addr;
     }
 

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

Summary of changes:
 FS/FS/part_pkg/voip_cdr.pm |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)