From: ivan <ivan>
Date: Mon, 17 Dec 2007 01:17:06 +0000 (+0000)
Subject: fix the case where the customer doesn't actually have a ship address
X-Git-Tag: freeside_1_7_3rc1~198
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=dd859a6dd5620030855765f9d7871fa0111d7d22;p=freeside.git

fix the case where the customer doesn't actually have a ship address
---

diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 52754d4cb..0fe2c1ffa 100644
--- 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&nbsp;#'
 %       : '&nbsp;';