X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=cf22ff7017493906dbd7e2a4f68e84a83deb4132;hb=229b88e45a160307551f38afff07b00c64941d94;hp=95ae985b9ff21c62e50afbd286e9ad61cc660572;hpb=e141dcae4712d6fc9d5207ad42f864605788309f;p=freeside.git

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 95ae985b9..cf22ff701 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -8,7 +8,7 @@
 %#  (<A HREF="<% $p %>misc/bill.cgi?<% $cust_main->custnum %>"><% mt('Bill now') |h %></A>)
   (<& /elements/bill.html,
                 custnum   => $cust_main->custnum,
-                label     => mt('Bill now'),
+                label     => emt('Bill now'),
                 url       => $p.'view/cust_main.cgi?'.$cust_main->custnum,
    &>)
 % } 
@@ -84,26 +84,38 @@
 </TR>
 % } elsif ( $cust_main->payby eq 'CHEK' || $cust_main->payby eq 'DCHK') {
 %     my( $account, $aba ) = split('@', $cust_main->paymask );
+%  my $branch = '';
+%  ($branch,$aba) = split('\.',$aba) if $conf->exists('cust_main-require-bank-branch');
 
 
 % my $autodemand = $cust_main->payby eq 'CHEK' ? 'automatic' : 'on-demand';
     <% mt("Electronic check ([_1])",$autodemand) |h %>
   </TD>
 </TR>
+
+% unless ( $conf->exists('echeck-no_routing') ) {
+  <TR>
+    <TD ALIGN="right"><% mt('ABA/Routing code') |h %></TD>
+    <TD BGCOLOR="#ffffff"><% $aba %></TD>
+  </TR>
+% }
+
+% if ( $conf->exists('cust_main-require-bank-branch') ) {
 <TR>
-  <TD ALIGN="right"><% mt('ABA/Routing code') |h %></TD>
-  <TD BGCOLOR="#ffffff"><% $aba %></TD>
-</TR>
+  <TD ALIGN="right"><% mt('Branch number') |h %></TD>
+  <TD BGCOLOR="#ffffff"><% $branch %></TD>
 <TR>
+% }
+
   <TD ALIGN="right"><% mt('Account number') |h %></TD>
   <TD BGCOLOR="#ffffff"><% $account %></TD>
 </TR>
 <TR>
-  <TD ALIGN="right"<% mt('>Account type') |h %></TD>
+  <TD ALIGN="right"><% mt('Account type') |h %></TD>
   <TD BGCOLOR="#ffffff"><% $cust_main->paytype %></TD>
 </TR>
 <TR>
-  <TD ALIGN="right"<% mt('>Bank name') |h %></TD>
+  <TD ALIGN="right"><% mt('Bank name') |h %></TD>
   <TD BGCOLOR="#ffffff"><% $cust_main->payname %></TD>
 </TR>
 % if ( $conf->exists('show_bankstate') ) {
@@ -170,12 +182,12 @@
 </TR>
 % } 
 
-% my $yes = mt('yes');
-% my $no = mt('no');
+% my $yes = emt('yes');
+% my $no = emt('no');
 
 % my @exempt_groups = grep /\S/, $conf->config('tax-cust_exempt-groups');
 <TR>
-  <TD ALIGN="right"><% mt('Tax exempt') |h %><% @exempt_groups ? ' ('.mt('all taxes').')' : '' %></TD>
+  <TD ALIGN="right"><% mt('Tax exempt') |h %><% @exempt_groups ? ' ('.emt('all taxes').')' : '' %></TD>
   <TD BGCOLOR="#ffffff"><% $cust_main->tax ? $yes : $no %></TD>
 </TR>
 % foreach my $exempt_group ( @exempt_groups ) {
@@ -203,16 +215,18 @@
     <% ( grep { $_ eq 'FAX' } @invoicing_list ) ? $yes : $no %>
   </TD>
 </TR>
+% unless ( $conf->exists('cust-email-high-visibility')) {
 <TR>
   <TD ALIGN="right"><% mt('Email invoices') |h %></TD>
   <TD BGCOLOR="#ffffff">
     <% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || $no %>
   </TD>
 </TR>
+% }
 <TR>
   <TD ALIGN="right"><% mt('Invoice terms') |h %></TD>
   <TD BGCOLOR="#ffffff">
-    <% $cust_main->invoice_terms || mt('Default').' ('. ( $conf->config('invoice_default_terms') || mt('Payable upon receipt') ). ')' %>
+    <% $cust_main->invoice_terms || emt('Default').' ('. ( $conf->config('invoice_default_terms') || emt('Payable upon receipt') ). ')' %>
   </TD>
 </TR>
 <TR>
@@ -220,7 +234,7 @@
   <TD BGCOLOR="#ffffff">
     <% length($cust_main->credit_limit) ? 
         $money_char.sprintf("%.2f", $cust_main->credit_limit) :
-        'Unlimited' %>
+        emt('Unlimited') %>
   </TD>
 </TR>
 
@@ -233,7 +247,7 @@
 
 % if ( $conf->exists('voip-cust_cdr_squelch') ) { 
   <TR>
-    <TD ALIGN="right"><% mt('Print CDRs') |h %></TD>
+    <TD ALIGN="right"><% mt($conf->exists('voip-cdr_email') ? 'Print CDRs' : 'Show CDRs') |h %></TD>
     <TD BGCOLOR="#ffffff"><% $cust_main->squelch_cdr ? $no : $yes %></TD>
   </TR>
 % }