X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=382fdacf5749eb6449c553ecb6aa8c7bc05ab5a6;hb=bcdf7aa475b84adf5efc0bc775e84975f7e830a5;hp=e286305f4a8a770810df4ac080dc83f13ed90898;hpb=3d0a1bb06b895c5be6e3f0517d355442a6b1e125;p=freeside.git diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html index e286305f4..382fdacf5 100644 --- a/httemplate/view/cust_main/billing.html +++ b/httemplate/view/cust_main/billing.html @@ -221,7 +221,10 @@ % if ( $conf->exists('enable_taxproducts') ) { <% mt('Tax location') |h %> - <% $cust_main->geocode('cch') %> +% my $tax_location = $conf->exists('tax-ship_address') +% ? $cust_main->ship_location +% : $cust_main->bill_location; + <% $tax_location->geocode('cch') %> % } @@ -263,9 +266,13 @@ <% mt('Credit limit') |h %> - <% length($cust_main->credit_limit) ? - $money_char.sprintf("%.2f", $cust_main->credit_limit) : - emt('Unlimited') %> +% my $default_credit_limit = $conf->config('default_credit_limit'); + <% length($cust_main->credit_limit) + ? $money_char. sprintf("%.2f", $cust_main->credit_limit) + : $default_credit_limit + ? "Default ($money_char". sprintf("%.2f", $default_credit_limit). ")" + : emt('Unlimited') + %>