[freeside-commits] branch master updated. 5f10fda22d066f3e730db11b7c26938547014631

[Ivan]

The branch, master has been updated
       via  5f10fda22d066f3e730db11b7c26938547014631 (commit)
       via  0491e1283637a9a89cc953b2a47f24f4e8795006 (commit)
       via  fcbf34af990ebdec111e194de1fcbee941325a21 (commit)
      from  49deddfdc5f60c5cde01a5152e6bae858ed8e72a (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 5f10fda22d066f3e730db11b7c26938547014631
Merge: 0491e12 49deddf
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Feb 21 13:14:28 2015 -0800

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 0491e1283637a9a89cc953b2a47f24f4e8795006
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Feb 21 13:14:25 2015 -0800

    fix danging bracket

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index bb04d94..169f9fe 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2147,8 +2147,6 @@ and customer address. Include units.',
   },
 
   {
-
-  {
     'key'         => 'show_ship_company',
     'section'     => 'UI',
     'description' => 'Turns on display/collection of a "service company name" field for customers.',

commit fcbf34af990ebdec111e194de1fcbee941325a21
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 205335b..7363700 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -282,6 +282,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',
@@ -345,6 +348,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 
                      )
                   ],
@@ -453,11 +457,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(-)