X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history%2Finvoice.html;fp=httemplate%2Fview%2Fcust_main%2Fpayment_history%2Finvoice.html;h=acb1d6956368da6bd35804bbc25b8bc665c512f8;hb=359004f4f4091e9789cb6e23a97c8eb89256d0b2;hp=96a9f5456f5a124d91d12811804650dc7786305b;hpb=430b2c784d2ee9ea5be00b821d2dbd27279ef132;p=freeside.git

diff --git a/httemplate/view/cust_main/payment_history/invoice.html b/httemplate/view/cust_main/payment_history/invoice.html
index 96a9f5456..acb1d6956 100644
--- a/httemplate/view/cust_main/payment_history/invoice.html
+++ b/httemplate/view/cust_main/payment_history/invoice.html
@@ -3,10 +3,6 @@
 
 my( $cust_bill, %opt ) = @_;
 
-my $conf = new FS::Conf;
-
-my $curuser = $FS::CurrentUser::CurrentUser;
-
 my $invoice = emt("Invoice #[_1] (Balance [_2])",$cust_bill->display_invnum,$cust_bill->owed);
 
 my $under = '';
@@ -22,12 +18,12 @@ if ( $cust_bill->owed > 0 ) {
 
 my $invnum = $cust_bill->invnum;
 
-my $link = $curuser->access_right('View invoices')
+my $link = $opt{'View invoices'}
              ? qq!<A HREF="${p}view/cust_bill.cgi?$invnum">!
              : '';
 
 my $void = '';
-if ( $cust_bill->closed !~ /^Y/i && $curuser->access_right('Void invoices') ) {
+if ( $cust_bill->closed !~ /^Y/i && $opt{'Void invoices'} ) {
   $void =
     ' ('. include('/elements/popup_link.html',
                     'label'     => emt('void'),
@@ -44,15 +40,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->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>';