diff options
| author | Rob Van Dam <rvandam00@gmail.com> | 2013-11-07 15:27:24 -0700 |
|---|---|---|
| committer | Rob Van Dam <rvandam00@gmail.com> | 2013-11-07 15:27:24 -0700 |
| commit | df1ebf662a9fc3f89503036e0dbf6833c1b95f9e (patch) | |
| tree | f62eafd9d77427277e6aaa4353fb3bf8567926fd /httemplate/view | |
| parent | 45cd27b19e8ad50f835915746fb89e486cbb69c0 (diff) | |
| parent | a180208786cccb72ab017e39fff0cb128aa6ba01 (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
FS/FS/cust_pkg.pm
Diffstat (limited to 'httemplate/view')
| -rw-r--r-- | httemplate/view/cust_main/billing.html | 5 | ||||
| -rw-r--r-- | httemplate/view/cust_main/contacts_new.html | 2 | ||||
| -rw-r--r-- | httemplate/view/svc_external.cgi | 1 |
3 files changed, 6 insertions, 2 deletions
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> 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"> <% $phone_type->typename %> phone</TD> - <TD BGCOLOR="#FFFFFF"><% $contact_phone->phonenum |h %></TD> + <TD BGCOLOR="#FFFFFF"><% $contact_phone->phonenum_pretty |h %></TD> % } </TR> 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 &> |