X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_pbx.pm;h=ad3e477ef33b92b7b58b6a5983d1b1c6bd0274e2;hb=92cbc41959f36cb9e3d281b2dfb6a5ad587f5584;hp=7c228f8b553e7c613b38b0d47f6c2fe4ba8055be;hpb=6027eeaf77eb9f7e55a60ed551d41fe804433e2e;p=freeside.git

diff --git a/FS/FS/svc_pbx.pm b/FS/FS/svc_pbx.pm
index 7c228f8b5..ad3e477ef 100644
--- a/FS/FS/svc_pbx.pm
+++ b/FS/FS/svc_pbx.pm
@@ -1,5 +1,5 @@
 package FS::svc_pbx;
-use base qw( FS::svc_External_Common );
+use base qw( FS::o2m_Common FS::svc_External_Common );
 
 use strict;
 use Tie::IxHash;
@@ -9,6 +9,7 @@ use FS::Conf;
 use FS::cust_svc;
 use FS::svc_phone;
 use FS::svc_acct;
+use FS::pbx_extension;
 
 =head1 NAME
 
@@ -62,6 +63,11 @@ Maximum number of extensions
 
 Maximum number of simultaneous users
 
+=item ip_addr
+
+The IP address of this PBX, if that's relevant. This must be a valid IP 
+address (or blank), but it's not checked for block assignment or uniqueness.
+
 =back
 
 =head1 METHODS
@@ -85,9 +91,11 @@ sub table_info {
   tie my %fields, 'Tie::IxHash',
     'svcnum' => 'PBX',
     'id'     => 'PBX/Tenant ID',
+    'uuid'   => 'External UUID',
     'title'  => 'Name',
     'max_extensions' => 'Maximum number of User Extensions',
     'max_simultaneous' => 'Maximum number of simultaneous users',
+    'ip_addr' => 'IP address',
   ;
 
   {
@@ -237,9 +245,10 @@ sub check {
   my $x = $self->setfixed;
   return $x unless ref($x);
   my $part_svc = $x;
-
-
-  $self->SUPER::check;
+ 
+  return
+     $self->ut_ipn('ip_addr')
+  || $self->SUPER::check;
 }
 
 sub _check_duplicate {
@@ -378,6 +387,11 @@ sub get_cdrs {
   qsearch ( $psearch->{query} )
 }
 
+sub pbx_extension {
+  my $self = shift;
+  qsearch('pbx_extension', { svcnum=>$self->svcnum });
+}
+
 =back
 
 =head1 BUGS