X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history%2Fvoided_invoice.html;h=f9ff3079aaee7553dd64d3bddd93f88c13bfe7cc;hb=359004f4f4091e9789cb6e23a97c8eb89256d0b2;hp=15393cbf5f6c5f5d1d596d18e764e67a46dc0657;hpb=430b2c784d2ee9ea5be00b821d2dbd27279ef132;p=freeside.git

diff --git a/httemplate/view/cust_main/payment_history/voided_invoice.html b/httemplate/view/cust_main/payment_history/voided_invoice.html
index 15393cbf5..f9ff3079a 100644
--- a/httemplate/view/cust_main/payment_history/voided_invoice.html
+++ b/httemplate/view/cust_main/payment_history/voided_invoice.html
@@ -11,17 +11,13 @@ my( $cust_bill_void, %opt ) = @_;
 
 my $date_format = $opt{'date_format'} || '%m/%d/%Y';
 
-my $conf = new FS::Conf;
-
-my $curuser = $FS::CurrentUser::CurrentUser;
-
 my $invoice = emt("Invoice #[_1] (Balance [_2])",$cust_bill_void->display_invnum, $cust_bill_void->charged);
 
 my $under = '';
 
 my $invnum = $cust_bill_void->invnum;
 
-my $link = $curuser->access_right('View invoices')
+my $link = $opt{'View invoices'}
              ? qq!<A HREF="${p}view/cust_bill_void.html?$invnum">!
              : '';
 
@@ -31,7 +27,7 @@ $unvoid = areyousure_link("${p}misc/unvoid-cust_bill_void.html?invnum=". $cust_b
                             emt('Unvoid this invoice'),
                             emt('unvoid')
                          )
-  if $cust_bill_void->closed !~ /^Y/ && $curuser->access_right('Unvoid invoices');
+  if $cust_bill_void->closed !~ /^Y/ && $opt{'Unvoid invoices'};
 
 my $delete = '';
 $delete = areyousure_link("${p}misc/delete-cust_bill.html?$invnum",
@@ -39,15 +35,13 @@ $delete = areyousure_link("${p}misc/delete-cust_bill.html?$invnum",
                             emt('Delete this invoice from the database completely'),
                             emt('delete')
                         )
-    if ( $opt{'deleteinvoices'} && $curuser->access_right('Delete invoices') );
+    if $opt{'deleteinvoices'} && $opt{'Delete invoices'};
 
 my $events = '';
-#1.9
 if ( $cust_bill_void->num_cust_event
-     && (    $curuser->access_right('Billing event reports')
-          || $curuser->access_right('View customer billing events')
-        )
-   ) {
+     && ($opt{'Billing event reports'} || $opt{'View customer billing events'})
+   )
+{
   $under .=
     qq!<BR><A HREF="${p}search/cust_event.html?invnum=$invnum">( !.
       emt('View invoice events').' )</A>';