[freeside-commits] freeside/httemplate/view/cust_main contacts.html, 1.10.2.3, 1.10.2.4

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main
In directory wavetail:/tmp/cvs-serv17086

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	contacts.html 
Log Message:
fix the case where the customer doesn't actually have a ship address

Index: contacts.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/contacts.html,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -u -d -r1.10.2.3 -r1.10.2.4
--- contacts.html	17 Dec 2007 01:00:07 -0000	1.10.2.3
+++ contacts.html	17 Dec 2007 01:17:06 -0000	1.10.2.4
@@ -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 #'
 %       : ' ';