[freeside-commits] freeside/httemplate/view svc_phone.cgi, 1.17, 1.18

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/view
In directory wavetail.420.am:/tmp/cvs-serv17695/httemplate/view

Modified Files:
	svc_phone.cgi 
Log Message:
finishing e911/svc_phone location, RT#7047

Index: svc_phone.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_phone.cgi,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -d -r1.17 -r1.18
--- svc_phone.cgi	12 Mar 2010 03:36:36 -0000	1.17
+++ svc_phone.cgi	12 Mar 2010 21:29:04 -0000	1.18
@@ -29,14 +29,12 @@
   # E911 Info
   ###
 
-  my $loc = $svc_phone->cust_location_or_main;
-
   my $e911 = 
     'E911 Information'.
     &ntable("#cccccc"). '<TR><TD>'. ntable("#cccccc",2).
       '<TR><TD>Location</TD>'.
       '<TD BGCOLOR="#FFFFFF">'.
-        $loc->location_label( 'join_string'     => '<BR>',
+        $svc_phone->location_label( 'join_string'     => '<BR>',
                               'double_space'    => ' &nbsp; ',
                               'escape_function' => \&encode_entities,
                               'countrydefault'  => $countrydefault,