X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=6d139747a592887f54137046a4de160a585597eb;hb=5da68ff1a7c638e30cbafbc9b0749f1e82b333df;hp=f1bcf4d52b9ec56f46791ad8ea4fe9fd28083892;hpb=e18263db61c9695eb4c139f23c79730fd7659ad6;p=freeside.git

diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index f1bcf4d52..6d139747a 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -17,7 +17,7 @@ function areyousure(href, message) {
     <& /elements/popup_link.html,
       'label'       => emt('Void this invoice'),
       'actionlabel' => emt('Void this invoice'),
-      'action'      => $p.'misc/void-cust_bill.html?invnum='.$invnum,
+      'action'      => $p.'misc/void-cust_bill.cgi?invnum='.$invnum,
     &>
 %   }
 %   if ( $can_void and $can_delete ) {
@@ -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++ ? ' | ' : '' %>
           <A HREF="<% $p %>edit/cust_pay.cgi?payby=BILL;invnum=<% $invnum %>"><% mt('check') |h %></A>
 %     } 
 
-%     if ( $payby{'CASH'} && $curuser->access_right(['Post payment', 'Post cash payment']) ) { 
+%     if ( $curuser->access_right(['Post payment', 'Post cash payment']) ) { 
           <% $s++ ? ' | ' : '' %>
           <A HREF="<% $p %>edit/cust_pay.cgi?payby=CASH;invnum=<% $invnum %>"><% mt('cash') |h %></A>
 %     } 
 
-%     if ( $payby{'WEST'} && $curuser->access_right(['Post payment']) ) { 
-          <% $s++ ? ' | ' : '' %>
-          <A HREF="<% $p %>edit/cust_pay.cgi?payby=WEST;invnum=<% $invnum %>"><% mt('Western Union') |h %></A>
-%     } 
-
-%     if ( $payby{'MCRD'} && $curuser->access_right(['Post payment']) ) { 
-          <% $s++ ? ' | ' : '' %>
-          <A HREF="<% $p %>edit/cust_pay.cgi?payby=MCRD;invnum=<% $invnum %>"><% mt('manual credit card') |h %></A>
-%     } 
-
-%     if ( $payby{'MCHK'} && $curuser->access_right(['Post payment']) ) { 
-          <% $s++ ? ' | ' : '' %>
-          <A HREF="<% $p %>edit/cust_pay.cgi?payby=MCHK;invnum=<% $invnum %>"><% mt('manual electronic check') |h %></A>
-%     } 
+%#  %     if ( $payby{'WEST'} && $curuser->access_right(['Post payment']) ) { 
+%#            <% $s++ ? ' | ' : '' %>
+%#            <A HREF="<% $p %>edit/cust_pay.cgi?payby=WEST;invnum=<% $invnum %>"><% mt('Western Union') |h %></A>
+%#  %     } 
+%#  
+%#  %     if ( $payby{'MCRD'} && $curuser->access_right(['Post payment']) ) { 
+%#            <% $s++ ? ' | ' : '' %>
+%#            <A HREF="<% $p %>edit/cust_pay.cgi?payby=MCRD;invnum=<% $invnum %>"><% mt('manual credit card') |h %></A>
+%#  %     } 
+%#  
+%#  %     if ( $payby{'MCHK'} && $curuser->access_right(['Post payment']) ) { 
+%#            <% $s++ ? ' | ' : '' %>
+%#            <A HREF="<% $p %>edit/cust_pay.cgi?payby=MCHK;invnum=<% $invnum %>"><% mt('manual electronic check') |h %></A>
+%#  %     } 
 
       <% mt('payment against this invoice') |h %><BR><BR>
 
@@ -184,11 +183,6 @@ my %opt = (
 
 $opt{'barcode_img'} = 1 if $conf->exists('invoice-barcode');
 
-my @payby =  grep /\w/, $conf->config('payby');
-@payby = (qw( CARD DCRD CHEK DCHK BILL CASH ))
-  unless @payby;
-my %payby = map { $_=>1 } @payby;
-
 my $cust_bill = qsearchs({
   'select'    => 'cust_bill.*',
   'table'     => 'cust_bill',