X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=64ec591a2b64b4dd57c6381081e0e574ad70e813;hb=b7cf1606a66cca95e3540f803ffa66d223f23a40;hp=b2a0efdef3c564bbca4aa35aa338abac553f0d93;hpb=f3c4966ed1f6ec3db7accd6dcdd3a5a3821d72a7;p=freeside.git
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index b2a0efdef..64ec591a2 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -23,6 +23,14 @@
<% $balance %> |
+% if ( $conf->exists('cust_main-select-prorate_day') ) {
+
+ <% mt('Prorate day of month') |h %> |
+ <% $cust_main->prorate_day %>
+ |
+
+% }
+
% if ( $conf->exists('cust_main-select-billday')
% && ($cust_main->payby eq 'CARD' || $cust_main->payby eq 'CHEK') ) {
@@ -213,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') %> |
% }
@@ -239,21 +250,37 @@
<% mt('Email address(es)') |h %> |
<% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || $no %>
+% if ( $cust_main->message_noemail ) {
+
+ <% emt('(do not send notices)') %>
+% }
|
% }
<% 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)
+% }
|
@@ -292,6 +319,13 @@
% }
+% if ( $cust_main->currency ) {
+
+ <% mt('Invoicing currency') |h %> |
+ <% $cust_main->currency. ': '. code2currency($cust_main->currency) %> |
+
+% }
+
% if ( $cust_main->locale ) {
% my %locale_info = FS::Locales->locale_info($cust_main->locale);