projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix CCH geocode lookup and display with 3.x-style locations, #25547
[freeside.git]
/
httemplate
/
view
/
cust_main
/
billing.html
diff --git
a/httemplate/view/cust_main/billing.html
b/httemplate/view/cust_main/billing.html
index
b863a73
..
e0dd7b9
100644
(file)
--- 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>
% 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>
</TR>
% }
<TR>
@@
-304,6
+307,13
@@
</TR>
% }
</TR>
% }
+% if ( $cust_main->currency ) {
+ <TR>
+ <TD ALIGN="right"><% mt('Invoicing currency') |h %></TD>
+ <TD BGCOLOR="#ffffff"><% $cust_main->currency. ': '. code2currency($cust_main->currency) %></TD>
+ </TR>
+% }
+
% if ( $cust_main->locale ) {
% my %locale_info = FS::Locales->locale_info($cust_main->locale);
<TR>
% if ( $cust_main->locale ) {
% my %locale_info = FS::Locales->locale_info($cust_main->locale);
<TR>