RT#29406: Per customer option to display service address of package on invoice

[freeside.git] / httemplate / view / cust_main / contacts.html

diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 739cd58..a5bafea 100644 (file)
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -13,6 +13,13 @@
  (<% mt('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' ) {
@@ -62,6 +69,14 @@
 
 
 % if ( $location ) { # 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>