X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=78d51d07f3531554c483f27df01f781cc29f539a;hb=8706262a6d18ef5103fb5972ca6443b73e700e6a;hp=b863a734bcff80e1ebe474c2fb6cd28c6899124b;hpb=54a357b171aa44f9399b4c146acd2afd3b686075;p=freeside.git
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index b863a734b..78d51d07f 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') %> |
% }
@@ -257,15 +260,27 @@
<% mt('Invoice terms') |h %> |
- <% $cust_main->invoice_terms || emt('Default').' ('. ( $conf->config('invoice_default_terms') || emt('Payable upon receipt') ). ')' %>
+ <% $cust_main->invoice_terms
+ || emt('Default').' ('. ( $conf->config('invoice_default_terms', $cust_main->agentnum)
+ || emt('Payable upon receipt')
+ ).
+ ')'
+ %>
|
<% 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')
+ %>
+% if ( $cust_main->num_cust_main_credit_limit ) {
+ (incidents)
+% }
|