default service location is cust_main ship_ address when present! RT#4499

2 files changed, 10 insertions, 8 deletions

diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index 1c0891b66..da16dfe1c 100644
--- a/httemplate/elements/tr-select-cust_location.html
+++ b/httemplate/elements/tr-select-cust_location.html
@@ -171,7 +171,7 @@ if ( $locationnum && $locationnum != -1 ) {
   if ( $locationnum == -1 ) {
     $cust_location->$_( $cgi->param($_) ) foreach @location_fields;
   } else {
-    $cust_location->$_( $cust_main->get($prefix.$_) foreach @location_fields;
+    $cust_location->$_( $cust_main->get($prefix.$_) ) foreach @location_fields;
   }
 }
 
diff --git a/httemplate/view/cust_main/packages/location.html b/httemplate/view/cust_main/packages/location.html
index 6664629ab..b51616d0c 100644
--- a/httemplate/view/cust_main/packages/location.html
+++ b/httemplate/view/cust_main/packages/location.html
@@ -4,17 +4,17 @@
   <I><FONT SIZE=-1>(default service address)</FONT><BR>
 % }
 
-  <% $loc->address1 |h %><BR>
+  <% $loc->get($prefix.'address1') |h %><BR>
 
-% if ( $loc->address2 !~ /^\s*$/ ) {
-    <% $loc->address2 |h %><BR>
+% if ( $loc->get($prefix.'address2') !~ /^\s*$/ ) {
+    <% $loc->get($prefix.'address2') |h %><BR>
 % }
 
-  <% $loc->city |h %><% $loc->county ? ' ('.$loc->county.' county)' : '' |h %>,
-  <% $loc->state |h %> &nbsp; <% $loc->zip |h %><BR>
+  <% $loc->get($prefix.'city') |h %><% $loc->get($prefix.'county') ? ' ('.$loc->get($prefix.'county').' county)' : '' |h %>,
+  <% $loc->get($prefix.'state') |h %> &nbsp; <% $loc->get($prefix.'zip') |h %><BR>
 
-% if ( $loc->country ne $countrydefault ) {
-  <% code2country( $loc->country ) %>
+% if ( $loc->get($prefix.'country') ne $countrydefault ) {
+  <% code2country( $loc->get($prefix.'country') ) %>
 % }
 
   </I>
@@ -44,6 +44,8 @@ my $statedefault   = $conf->config('statedefault')
                      || ($countrydefault eq 'US' ? 'CA' : '');
 
 my $loc = $cust_pkg->cust_location_or_main;
+my $prefix =
+  ( $loc->table eq 'cust_main' && length($loc->ship_last) ) ? 'ship_' : ''; #doh
 
 sub pkg_change_location_link {
   my $cust_pkg = shift;