From 24f8d52f90be8e99b10734f49d451e1e70afdfbc Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 20 Oct 2013 20:59:30 -0700
Subject: normalize contact phone formatting

---
 httemplate/view/cust_main/contacts_new.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/view')

diff --git a/httemplate/view/cust_main/contacts_new.html b/httemplate/view/cust_main/contacts_new.html
index 63a050c04..a851d99ed 100644
--- a/httemplate/view/cust_main/contacts_new.html
+++ b/httemplate/view/cust_main/contacts_new.html
@@ -22,7 +22,7 @@
 %                   })
 %           or next;
           <TD ALIGN="right">&nbsp;&nbsp;&nbsp;<% $phone_type->typename %> phone</TD>
-          <TD BGCOLOR="#FFFFFF"><% $contact_phone->phonenum |h %></TD>
+          <TD BGCOLOR="#FFFFFF"><% $contact_phone->phonenum_pretty |h %></TD>
 %       }
 
       </TR>
-- 
cgit v1.2.1


From adc62b5c44f6e6fddda75aff0d594d7a7d95a403 Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Thu, 24 Oct 2013 00:00:14 -0700
Subject: fix CCH geocode lookup and display with 3.x-style locations, #25547

---
 httemplate/view/cust_main/billing.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'httemplate/view')

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index e286305f4..e0dd7b904 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -221,7 +221,10 @@
 % if ( $conf->exists('enable_taxproducts') ) {
 <TR>
   <TD ALIGN="right"><% mt('Tax location') |h %></TD>
-  <TD BGCOLOR="#ffffff"><% $cust_main->geocode('cch') %></TD>
+% my $tax_location = $conf->exists('tax-ship_address')
+%                    ? $cust_main->ship_location
+%                    : $cust_main->bill_location;
+  <TD BGCOLOR="#ffffff"><% $tax_location->geocode('cch') %></TD>
 </TR>
 % }
 <TR>
-- 
cgit v1.2.1


From ca00186e5e6b7eee73140546cde55758f81ed4de Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 24 Oct 2013 20:12:50 -0700
Subject: spacing

---
 httemplate/view/svc_external.cgi | 1 +
 1 file changed, 1 insertion(+)

(limited to 'httemplate/view')

diff --git a/httemplate/view/svc_external.cgi b/httemplate/view/svc_external.cgi
index 077dc77b7..833e86247 100644
--- a/httemplate/view/svc_external.cgi
+++ b/httemplate/view/svc_external.cgi
@@ -23,6 +23,7 @@
 
 
 </TABLE></TD></TR></TABLE>
+<BR>
 
 <& /elements/table-tickets.html, object => $cust_svc &>
 
-- 
cgit v1.2.1