X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=6d139747a592887f54137046a4de160a585597eb;hb=5da68ff1a7c638e30cbafbc9b0749f1e82b333df;hp=2ff3ca8834983ef3270e117aee868f08c4c77370;hpb=71d389e6554fd9994ac9c18bc59fd43449b8cca1;p=freeside.git
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 2ff3ca883..6d139747a 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -9,17 +9,33 @@ function areyousure(href, message) {
}
-% if ( !$cust_bill->closed && $curuser->access_right('Void invoices') ) {
+% if ( !$cust_bill->closed ) { # otherwise allow no changes
+% my $can_delete = $conf->exists('deleteinvoices')
+% && $curuser->access_right('Delete invoices');
+% my $can_void = $curuser->access_right('Void invoices');
+% if ( $can_void ) {
<& /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 ) {
+ |
+% }
+% if ( $can_delete ) {
+ \
+ <% emt('Delete this invoice') |h %>
+% }
+% if ( $can_void or $can_delete ) {
+
+% }
% }
% 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')
% )
@@ -28,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 %>
@@ -167,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',