beginning of prospect/CRM/contact work

1 files changed, 5 insertions, 1 deletions

diff --git a/httemplate/view/cust_main/packages/location.html b/httemplate/view/cust_main/packages/location.html
index 9f348e5d3..41155cbae 100644
--- a/httemplate/view/cust_main/packages/location.html
+++ b/httemplate/view/cust_main/packages/location.html
@@ -4,12 +4,16 @@
   <I><FONT SIZE=-1>(default service address)</FONT><BR>
 % }
 
-  <% $loc->location_label( 'join_string' => '<BR>',
+  <% $loc->location_label( 'join_string'     => '<BR>',
+                           'double_space'    => ' &nbsp; ',
                            'escape_function' => \&encode_entities,
+                           'countrydefault'  => $countrydefault,
                          )
   %>
 
+% unless ( $cust_pkg->locationnum ) {
   </I>
+% }
 
 % if ( ! $cust_pkg->get('cancel')
 %      && $FS::CurrentUser::CurrentUser->access_right('Change customer package')