summaryrefslogtreecommitdiff
path: root/httemplate/view/cust_main/billing.html
diff options
context:
space:
mode:
Diffstat (limited to 'httemplate/view/cust_main/billing.html')
-rw-r--r--httemplate/view/cust_main/billing.html5
1 files changed, 4 insertions, 1 deletions
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>