projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix translation escaping
[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
5b61e74
..
252ca10
100644
(file)
--- 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 )
% {
% if ( $this eq 'ship' and
% $cust_main->bill_locationnum == $cust_main->ship_locationnum )
% {
- (<% mt('same as billing') %>)
+ (<%
e
mt('same as billing') %>)
% }
</FONT>
% }
</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' ) {
<TABLE CLASS="fsinnerbox">
% if ( $this eq 'bill' ) {
@@
-86,8
+93,12
@@
% }
<TR>
% }
<TR>
+% if ( $location->city ) {
<TD ALIGN="right"><% mt('City') |h %></TD>
<TD BGCOLOR="#ffffff"><% $location->city |h %></TD>
<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>
% if ( $location->county ) {
<TD ALIGN="right"><% mt('County') |h %></TD>
<TD BGCOLOR="#ffffff"><% $location->county |h %></TD>
@@
-95,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 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>
</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 ) {
</TR>
% if ( $location->latitude && $location->longitude ) {