From 67501ae6d2b92fc9a233f66d3a4d9b2cfd1ba3dc Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Wed, 23 Oct 2013 23:59:43 -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 b863a734b..10cb1de88 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