summaryrefslogtreecommitdiff
path: root/httemplate/view
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2012-09-03 15:39:51 -0700
committerMark Wells <mark@freeside.biz>2012-09-03 15:39:51 -0700
commit56e92333570e8b1bb6afb7374e9624b76946c749 (patch)
tree1954b96acff19de33b647a38dd8713ada15639a3 /httemplate/view
parentc148cc62734df77fe60671abf2dd28446c101819 (diff)
display service address when it's the same as billing, #18949 / #940
Diffstat (limited to 'httemplate/view')
-rw-r--r--httemplate/view/cust_main/contacts.html11
1 files changed, 8 insertions, 3 deletions
diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 9c6069182..d65af669a 100644
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -1,13 +1,18 @@
% my %addr_label = ('bill' => 'Billing address', 'ship' => 'Service address');
%# Locations (possibly break this out)
-% my @which = ('bill');
-% push @which, 'ship' if $cust_main->has_ship_address;
+% my @which = ('bill', 'ship');
% while (@which) {
% my $this = shift @which;
% my $method = $this.'_location';
% my $location = $cust_main->$method;
-<FONT CLASS="fsinnerbox-title"><% mt( $addr_label{$this} ) |h %></FONT>
+<FONT CLASS="fsinnerbox-title"><% mt( $addr_label{$this} ) |h %>
+% if ( $this eq 'ship' and
+% $cust_main->bill_locationnum == $cust_main->ship_locationnum )
+% {
+ (<% mt('same as billing') %>)
+% }
+</FONT>
<TABLE CLASS="fsinnerbox">
% if ( $this eq 'bill' ) {