[freeside-commits] branch master updated. df996b7205c7d1de9e45c60b71f6ca3b7d373b81

[Mitch Jackson]

The branch, master has been updated
       via  df996b7205c7d1de9e45c60b71f6ca3b7d373b81 (commit)
       via  e1a356104a146205a4d83acdf2aac968788c3745 (commit)
      from  480234fab6273818e06c68dc240ae4a494fecb30 (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 df996b7205c7d1de9e45c60b71f6ca3b7d373b81
Author: Mitch Jackson <mitch at freeside.biz>
Date:   Mon Feb 19 23:08:27 2018 -0600

    remove index for removed column cdr.cdrbatch

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index edecb7f38..245fb68f8 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -5677,7 +5677,7 @@ sub tables_hashref {
                    ['accountcode'], ['uniqueid'], ['carrierid'], ['cdrid'],
                    [ 'sessionnum' ], [ 'subscriber' ],
                    [ 'freesidestatus' ], [ 'freesiderewritestatus' ],
-                   [ 'cdrbatch' ], [ 'cdrbatchnum' ],
+                   [ 'cdrbatchnum' ],
                    [ 'src_ip_addr' ], [ 'dst_ip_addr' ], [ 'dst_term' ],
                    [ 'detailnum' ],
                  ],

commit e1a356104a146205a4d83acdf2aac968788c3745
Author: Mitch Jackson <mitch at freeside.biz>
Date:   Mon Feb 19 23:07:11 2018 -0600

    RT# 79549 Requre a Rate Plan to use voip_cdr Price Plan

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 1fb3bec84..587a8c530 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -363,8 +363,8 @@ tie my %accountcode_tollfree_field, 'Tie::IxHash',
   'validate' => sub {
     # Validation function for FS::part_pkg::check_options()
     my $options = shift;
-    return "Please select a rate plan for price plan VoIP/telco CDR rating (standard)"
-      unless $options->{ratenum};
+    return "Please choose a Rate Plan for use with selected Rating Method"
+      if $options->{rating_method} eq 'prefix' &&  !$options->{ratenum};
     return;
   },
 );

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

Summary of changes:
 FS/FS/Schema.pm            | 2 +-
 FS/FS/part_pkg/voip_cdr.pm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)