package import w/bulk phone number ranges, RT#39127

[freeside.git] / FS / FS / cust_svc.pm

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index c5099fc..376ef02 100644 (file)
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -121,7 +121,7 @@ sub insert {
   my $error = $self->SUPER::insert;
 
   #check if this releases a hold (see FS::pkg_svc provision_hold)
-  $error ||= $self->_provision_hold;
+  $error ||= $self->_check_provision_hold;
 
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
@@ -460,7 +460,7 @@ sub replace {
   } # if this is a location change
 
   #check if this releases a hold (see FS::pkg_svc provision_hold)
-  $error ||= $new->_provision_hold;
+  $error ||= $new->_check_provision_hold;
 
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
@@ -1205,9 +1205,10 @@ sub smart_search_param {
   my @or = 
       map { my $table = $_;
             my $search_sql = "FS::$table"->search_sql($string);
+            my $addl_from = "FS::$table"->search_sql_addl_from();
 
             "SELECT $table.svcnum AS svcnum, '$table' AS svcdb ".
-            "FROM $table WHERE $search_sql";
+            "FROM $table $addl_from WHERE $search_sql";
           }
       FS::part_svc->svc_tables;
 
@@ -1246,7 +1247,7 @@ sub smart_search_param {
 # then removes hold from pkg
 # returns $error or '' on success,
 # does not indicate if pkg status was changed
-sub _provision_hold {
+sub _check_provision_hold {
   my $self = shift;
 
   # check status of cust_pkg