From 25b48e1acbf6ad7ebd3e85b479ee6cd3a8ccd098 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 20 Mar 2011 19:38:28 +0000
Subject: qualification address handling changes, RT#7111

---
 httemplate/misc/location.cgi | 3 ++-
 httemplate/misc/qual.html    | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'httemplate/misc')

diff --git a/httemplate/misc/location.cgi b/httemplate/misc/location.cgi
index 82ad636c4..188c5c3df 100644
--- a/httemplate/misc/location.cgi
+++ b/httemplate/misc/location.cgi
@@ -24,7 +24,8 @@ my $cust_location = qsearchs({
 
 my %hash = ();
 %hash = map { $_ => $cust_location->$_() }
-            qw( address1 address2 city county state zip country )
+            qw( address1 address2 city county state zip country
+                location_kind location_type location_number )
   if $cust_location;
 
 </%init>
diff --git a/httemplate/misc/qual.html b/httemplate/misc/qual.html
index ed6ba2d6c..78d85edca 100644
--- a/httemplate/misc/qual.html
+++ b/httemplate/misc/qual.html
@@ -45,10 +45,11 @@
 %>
 
 <% include('/elements/tr-select-cust_location.html',
-             'cgi'         => $cgi,
-             $table        => $cust_main_or_prospect_main,
-             'alt_format'  => $conf->exists('qual-alt_address_format'),
-             'no_bold'     => 1,
+             'cgi'           => $cgi,
+             $table          => $cust_main_or_prospect_main,
+             'alt_format'    => $conf->exists('qual-alt_address_format'),
+             'disable_empty' => $conf->exists('qual-alt_address_format'),
+             'no_bold'       => 1,
              #required for ikano.. config? 'is_optional' => 1,
           )
 %>
-- 
cgit v1.2.1