Merge branch 'master' of git.freeside.biz:/home/git/freeside

1 files changed, 2 insertions, 19 deletions

diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index f1bcf4d52..2ff3ca883 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -9,30 +9,13 @@ function areyousure(href, message) {
 }
 </SCRIPT>
 
-% 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 ) {
+% if ( !$cust_bill->closed && $curuser->access_right('Void invoices') ) {
     <& /elements/popup_link.html,
       'label'       => emt('Void this invoice'),
       'actionlabel' => emt('Void this invoice'),
       'action'      => $p.'misc/void-cust_bill.html?invnum='.$invnum,
     &>
-%   }
-%   if ( $can_void and $can_delete ) {
-  &nbsp;|&nbsp;
-%   }
-%   if ( $can_delete ) {
-    <A href="" onclick="areyousure(\
-      '<%$p%>misc/delete-cust_bill.html?<% $invnum %>',\
-      <% mt('Are you sure you want to delete this invoice?') |js_string %>)"\
-    TITLE = "<% mt('Delete this invoice from the database completely') |h %>">\
-    <% emt('Delete this invoice') |h %></A>
-%   }
-%   if ( $can_void or $can_delete ) {
-  <BR><BR>
-%   }
+    <BR><BR>
 % }
 
 % if ( $cust_bill->owed > 0