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

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

diff --git a/FS/FS/svc_phone.pm b/FS/FS/svc_phone.pm
index 326c0be..cf9d9b4 100644 (file)
--- a/FS/FS/svc_phone.pm
+++ b/FS/FS/svc_phone.pm
@@ -201,9 +201,10 @@ sub table_info {
                        },
         'circuit_svcnum'   => { label             => 'Circuit',
                                 type              => 'select',
-                                select_table      => 'svc_domain',
+                                select_table      => 'svc_circuit',
                                 select_key        => 'svcnum',
-                                select_label      => 'circuit_label',
+                                select_label      => 'label',
+                                select_allow_empty=> 1,
                                 disable_inventory => 1,
                               },
 
@@ -275,6 +276,8 @@ sub table { 'svc_phone'; }
 
 sub table_dupcheck_fields { ( 'countrycode', 'phonenum' ); }
 
+sub device_table { 'phone_device'; }
+
 =item search_sql STRING
 
 Class method which returns an SQL fragment to search for the given string.