summaryrefslogtreecommitdiff
path: root/httemplate/view
diff options
context:
space:
mode:
authorivan <ivan>2007-12-17 01:17:05 +0000
committerivan <ivan>2007-12-17 01:17:05 +0000
commitfa5600a9223ef7c3f78c0639869d43da9200f694 (patch)
tree53e2ecb3800fe559928596b93849554da2d9671d /httemplate/view
parentf144c3a14169d99fd93f265da690d9ce38dbae68 (diff)
fix the case where the customer doesn't actually have a ship address
Diffstat (limited to 'httemplate/view')
-rw-r--r--httemplate/view/cust_main/contacts.html5
1 files changed, 1 insertions, 4 deletions
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;';