From 41f561eb60f8a69d1ce3685e04cfd1e1a8efefad Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 12 Mar 2010 21:29:16 +0000
Subject: finishing e911/svc_phone location, RT#7047

---
 httemplate/view/svc_phone.cgi | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'httemplate/view')

diff --git a/httemplate/view/svc_phone.cgi b/httemplate/view/svc_phone.cgi
index ebde42228..75591c747 100644
--- a/httemplate/view/svc_phone.cgi
+++ b/httemplate/view/svc_phone.cgi
@@ -29,18 +29,16 @@ my $html_foot = sub {
   # 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>',
-                              'double_space'    => ' &nbsp; ',
-                              'escape_function' => \&encode_entities,
-                              'countrydefault'  => $countrydefault,
-                            ).
+        $svc_phone->location_label( 'join_string'     => '<BR>',
+                                    'double_space'    => ' &nbsp; ',
+                                    'escape_function' => \&encode_entities,
+                                    'countrydefault'  => $countrydefault,
+                                  ).
       '</TD></TR>'.
     '</TABLE></TD></TR></TABLE>'.
     '<BR>'
-- 
cgit v1.2.1