X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=cf0c3190a66e61b4c51a4d57378d923c265139c4;hb=f2afb8b625100d863650fbafdd1e850d0129d534;hp=f1bcf4d52b9ec56f46791ad8ea4fe9fd28083892;hpb=e18263db61c9695eb4c139f23c79730fd7659ad6;p=freeside.git
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index f1bcf4d52..cf0c3190a 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -36,7 +36,6 @@ function areyousure(href, message) {
% }
% if ( $cust_bill->owed > 0
-% && scalar( grep $payby{$_}, qw(BILL CASH WEST MCRD MCHK) )
% && $curuser->access_right(['Post payment', 'Post check payment', 'Post cash payment'])
% && ! $conf->exists('pkg-balances')
% )
@@ -45,30 +44,30 @@ function areyousure(href, message) {
<% mt('Post') |h %>
-% if ( $payby{'BILL'} && $curuser->access_right(['Post payment', 'Post check payment']) ) {
+% if ( $curuser->access_right(['Post payment', 'Post check payment']) ) {
<% $s++ ? ' | ' : '' %>
<% mt('check') |h %>
% }
-% if ( $payby{'CASH'} && $curuser->access_right(['Post payment', 'Post cash payment']) ) {
+% if ( $curuser->access_right(['Post payment', 'Post cash payment']) ) {
<% $s++ ? ' | ' : '' %>
<% mt('cash') |h %>
% }
-% if ( $payby{'WEST'} && $curuser->access_right(['Post payment']) ) {
- <% $s++ ? ' | ' : '' %>
- <% mt('Western Union') |h %>
-% }
-
-% if ( $payby{'MCRD'} && $curuser->access_right(['Post payment']) ) {
- <% $s++ ? ' | ' : '' %>
- <% mt('manual credit card') |h %>
-% }
-
-% if ( $payby{'MCHK'} && $curuser->access_right(['Post payment']) ) {
- <% $s++ ? ' | ' : '' %>
- <% mt('manual electronic check') |h %>
-% }
+%# % if ( $payby{'WEST'} && $curuser->access_right(['Post payment']) ) {
+%# <% $s++ ? ' | ' : '' %>
+%# <% mt('Western Union') |h %>
+%# % }
+%#
+%# % if ( $payby{'MCRD'} && $curuser->access_right(['Post payment']) ) {
+%# <% $s++ ? ' | ' : '' %>
+%# <% mt('manual credit card') |h %>
+%# % }
+%#
+%# % if ( $payby{'MCHK'} && $curuser->access_right(['Post payment']) ) {
+%# <% $s++ ? ' | ' : '' %>
+%# <% mt('manual electronic check') |h %>
+%# % }
<% mt('payment against this invoice') |h %>
@@ -111,21 +110,25 @@ function areyousure(href, message) {
% }
-% if ( $conf->exists('invoice_latex') ) {
+% my $br = 0;
+% if ( $conf->exists('invoice_latex') ) {
<% mt('View typeset invoice PDF') |h %>
-
+
+% $br++;
% }
-% my $br = 0;
-% if ( $cust_bill->num_cust_event ) { $br++;
-( <% mt('View invoice events') |h %> )
+% if ( $cust_bill->num_cust_event ) {
+<% $br ? '|' : '' %>
+<% mt('View invoice events') |h %>
+% $br++;
% }
% my @modes = grep {! $_->disabled}
% $cust_bill->cust_main->agent->invoice_modes;
-% if ( @modes ) {
-( <% mt('View as:') %>
+% if ( @modes || $include_statement_template ) {
+<% $br ? '|' : '' %>
+<% mt('View as:') %>