[freeside-commits] branch master updated. 56e92333570e8b1bb6afb7374e9624b76946c749

[Mark Wells]

The branch, master has been updated
       via  56e92333570e8b1bb6afb7374e9624b76946c749 (commit)
      from  c148cc62734df77fe60671abf2dd28446c101819 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 56e92333570e8b1bb6afb7374e9624b76946c749
Author: Mark Wells <mark at freeside.biz>
Date:   Mon Sep 3 15:39:51 2012 -0700

    display service address when it's the same as billing, #18949 / #940

diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 9c60691..d65af66 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' ) {

-----------------------------------------------------------------------

Summary of changes:
 httemplate/view/cust_main/contacts.html |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)