This commit was manufactured by cvs2svn to create tag 'freeside_2_1_1'.

[freeside.git] / httemplate / view / cust_main / contacts.html

diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 20770e4..e88c02e 100644 (file)
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -29,10 +29,7 @@
 % if ( $cust_main->get("${pre}address2") ) { 
 %   my $address2_label =
 %     ( $conf->exists('cust_main-require_address2')
-%       #  && (    ( !$which && !$cust_main->has_ship_address )
-%       #       || (  $which &&  $cust_main->has_ship_address )
-%       #     )
-%       && ! ( $which xor $cust_main->has_ship_address )
+%       && ! ( $pre xor $cust_main->has_ship_address )
 %     )
 %       ? 'Unit #'
 %       : ' ';