X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fcontacts.html;h=252ca10b36ccc1294713c8278a3dba5346c5fcfd;hb=62b18c75989a1b00a25079f8f110992aaad81bba;hp=dbc491af038e31f220c1743f26295c6e62fc0b76;hpb=cdc349ac42247cd97cd475918b75a8e8e71ec0c2;p=freeside.git

diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index dbc491af0..252ca10b3 100644
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -10,9 +10,16 @@
 %   if ( $this eq 'ship' and 
 %       $cust_main->bill_locationnum == $cust_main->ship_locationnum )
 %   {
- (<% mt('same as billing') %>)
+ (<% emt('same as billing') %>)
 %   }
 </FONT>
+%   if (
+%     ($this eq 'ship')
+%     && $cust_main->invoice_ship_address 
+%     && !$conf->exists('invoice-ship_address') #it's always on, so hide per-cust config
+%    ) {
+<SPAN STYLE="padding-left: .25em;">(<% emt('included on invoices') %>)</SPAN>
+%   }
 <TABLE CLASS="fsinnerbox">
 
 % if ( $this eq 'bill' ) {
@@ -60,6 +67,14 @@
 %   }
 % }
 % # now the actual address
+
+% if ( $location->locationname ) {
+    <TR>
+      <TD ALIGN="right"><% mt('Location ID') |h %></TD>
+      <TD COLSPAN=7 BGCOLOR="#ffffff"><% $location->locationname |h %></TD>
+    </TR>
+% }
+
 <TR>
   <TD ALIGN="right"><% mt('Address') |h %></TD>
   <TD COLSPAN=7 BGCOLOR="#ffffff"><% $location->address1 |h %></TD>
@@ -78,8 +93,12 @@
 % } 
 
 <TR>
+% if ( $location->city ) {
   <TD ALIGN="right"><% mt('City') |h %></TD>
   <TD BGCOLOR="#ffffff"><% $location->city |h %></TD>
+% } else {
+  <TD COLSPAN="2"></TD>
+% }
 % if ( $location->county ) {
     <TD ALIGN="right"><% mt('County') |h %></TD>
     <TD BGCOLOR="#ffffff"><% $location->county |h %></TD>
@@ -87,11 +106,11 @@
   <TD ALIGN="right"><% mt('State') |h %></TD>
   <TD BGCOLOR="#ffffff"><% state_label( $location->state, $location->country ) |h %></TD>
   <TD ALIGN="right"><% mt('Zip') |h %></TD>
-  <TD BGCOLOR="#ffffff"><% $location->zip %></TD>
+  <TD BGCOLOR="#ffffff"><% $location->zip |h %></TD>
 </TR>
 <TR>
   <TD ALIGN="right"><% mt('Country') |h %></TD>
-  <TD BGCOLOR="#ffffff"><% code2country( $location->country ) %></TD>
+  <TD BGCOLOR="#ffffff"><% $location->country_full |h %></TD>
 </TR>
 
 % if ( $location->latitude && $location->longitude ) {