[freeside-commits] freeside/httemplate/misc qual.html, 1.6, 1.7 location.cgi, 1.3, 1.4

[Ivan,,,]

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

Modified Files:
	qual.html location.cgi 
Log Message:
qualification address handling changes, RT#7111

Index: location.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/location.cgi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -d -r1.3 -r1.4
--- location.cgi	28 Dec 2009 19:18:20 -0000	1.3
+++ location.cgi	20 Mar 2011 19:38:28 -0000	1.4
@@ -24,7 +24,8 @@
 
 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>

Index: qual.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/qual.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -d -r1.6 -r1.7
--- qual.html	13 Mar 2011 03:26:57 -0000	1.6
+++ qual.html	20 Mar 2011 19:38:28 -0000	1.7
@@ -48,6 +48,7 @@
              '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,
           )