default credit limit, RT#27267

[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 e286305..382fdac 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>
-  <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>
@@ -263,9 +266,13 @@
 <TR>
   <TD ALIGN="right"><% mt('Credit limit') |h %></TD>
   <TD BGCOLOR="#ffffff">
-    <% 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')
+    %>
   </TD>
 </TR>