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

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 20770e45b..e88c02ea5 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;';