X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_phone.pm;h=49453915005e62032156aab254c72d318ef87c9f;hb=dafdfc24616b04a5ff594da31e2cdd03f58634b6;hp=deb12c29a3d704a9020c2298a42a4f1c449fe801;hpb=80fa5a2f42e60bede178ff1118e7c7532fced9a5;p=freeside.git

diff --git a/FS/FS/svc_phone.pm b/FS/FS/svc_phone.pm
index deb12c29a..494539150 100644
--- a/FS/FS/svc_phone.pm
+++ b/FS/FS/svc_phone.pm
@@ -79,14 +79,6 @@ Voicemail PIN
 
 Optional svcnum from svc_pbx
 
-=item route
-
-Route id/number
-
-=item gwlist
-
-OpenSIPS dr_rules gwlist - OpenSIPS dynamic routing
-
 =item forwarddst
 
 Forwarding destination
@@ -179,10 +171,6 @@ sub table_info {
                            disable_inventory => 1,
                            disable_select    => 1,
                          },
-	'route' => {	label => 'Route',
-			%dis2, 
-		    },
-	'gwlist' => { label => 'OpenSIPS gwlist', %dis2 },
 	'forwarddst' => {	label => 'Forward Destination', 
 				%dis2,
 			},
@@ -482,8 +470,6 @@ sub check {
     || $self->ut_foreign_keyn('pbxsvc', 'svc_pbx',    'svcnum' )
     || $self->ut_foreign_keyn('domsvc', 'svc_domain', 'svcnum' )
     || $self->ut_foreign_keyn('locationnum', 'cust_location', 'locationnum')
-    || $self->ut_textn('route')
-    || $self->ut_textn('gwlist')
     || $self->ut_numbern('forwarddst')
     || $self->ut_textn('email')
     || $self->ut_numbern('lrn')
@@ -720,8 +706,8 @@ sub get_cdrs {
 
   my @orwhere =  map " $_ = '$number'        ", @fields;
   push @orwhere, map " $_ = '$prefix$number' ", @fields
-    if length($prefix);
-  if ( $prefix =~ /^\+(\d+)$/ ) {
+    if defined($prefix) && length($prefix);
+  if ( $prefix && $prefix =~ /^\+(\d+)$/ ) {
     push @orwhere, map " $_ = '$1$number' ", @fields
   }
 
@@ -741,7 +727,8 @@ sub get_cdrs {
       'table'      => 'cdr',
       'hashref'    => \%hash,
       'extra_sql'  => $extra_sql,
-      'order_by'   => "ORDER BY startdate $for_update",
+      'order_by'   => $options{'billsec_sum'} ? '' : "ORDER BY startdate $for_update",
+      'select'     => $options{'billsec_sum'} ? 'sum(billsec) as billsec_sum' : '*',
     } );
 
   @cdrs;