Configuration right no longer gives access to things controlled by their own ACLs (advertising source & package edit

2 files changed, 6 insertions, 12 deletions

diff --git a/httemplate/browse/part_referral.html b/httemplate/browse/part_referral.html
index 21ee8736b..9cc32c459 100755
--- a/httemplate/browse/part_referral.html
+++ b/httemplate/browse/part_referral.html
@@ -126,8 +126,7 @@ Where a customer heard about your service. Tracked for informational purposes.
 <%init>
 
 die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Configuration')
-      || $FS::CurrentUser::CurrentUser->access_right('Edit advertising sources')
+  unless $FS::CurrentUser::CurrentUser->access_right('Edit advertising sources')
       || $FS::CurrentUser::CurrentUser->access_right('Edit global advertising sources');
 
 my $today = timelocal(0, 0, 0, (localtime(time))[3..5] );
diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 292302ad9..f9b021390 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -251,8 +251,7 @@ tie my %config_agent, 'Tie::IxHash',
 tie my %config_billing, 'Tie::IxHash',
   'View/Edit payment gateways'         => [ $fsurl.'browse/payment_gateway.html', 'Credit card and electronic check processors' ];
 $config_billing{'View/Edit billing events'} = [ $fsurl.'browse/part_event.html', 'Billing actions for customers, invoices and packages' ]
-    if $curuser->access_right('Configuration')
-    || $curuser->access_right('Edit billing events')
+    if $curuser->access_right('Edit billing events')
     || $curuser->access_right('Edit global billing events');
 if ( $curuser->access_right('Configuration') ) {
   $config_billing{'View/Edit invoice events'}         = [ $fsurl.'browse/part_bill_event.cgi', 'Deprecated, old-style actions for overdue invoices' ];
@@ -273,8 +272,7 @@ tie my %config_broadband, 'Tie::IxHash',
 
 tie my %config_misc, 'Tie::IxHash';
 $config_misc{'View/Edit advertising sources'} = [ $fsurl.'browse/part_referral.html', 'Where a customer heard about your service.  Tracked for informational purposes' ]
-  if $curuser->access_right('Configuration')
-  || $curuser->access_right('Edit advertising sources')
+  if $curuser->access_right('Edit advertising sources')
   || $curuser->access_right('Edit global advertising sources');
 if ( $curuser->access_right('Configuration') ) {
   $config_misc{'View/Edit virtual fields'} = [ $fsurl.'browse/part_virtual_field.cgi', 'Locally defined fields', ];
@@ -294,8 +292,7 @@ if ( $curuser->access_right('Configuration' ) ) {
   );
 }
 $config_menu{'Billing'} = [ \%config_billing, ''    ]
-  if $curuser->access_right('Configuration')
-  || $curuser->access_right('Edit billing events')
+  if $curuser->access_right('Edit billing events')
   || $curuser->access_right('Edit global billing events');
 if ( $curuser->access_right('Configuration') ) {
   $config_menu{'Dialup'}  = [ \%config_dialup, ''    ];
@@ -303,8 +300,7 @@ if ( $curuser->access_right('Configuration') ) {
                             [ \%config_broadband, ''    ];
 }
 $config_menu{'Miscellaneous'} = [ \%config_misc, ''    ]
-  if $curuser->access_right('Configuration')
-  || $curuser->access_right('Edit advertising sources')
+  if $curuser->access_right('Edit advertising sources')
   || $curuser->access_right('Edit global advertising sources');
 
 tie my %menu, 'Tie::IxHash',
@@ -325,8 +321,7 @@ $menu{'Reports'} = [ \%report_menu, 'Lists, reporting and graphing' ]
 $menu{'Tools'} = [ \%tools_menu, 'Tools' ]
   if keys %tools_menu;
 $menu{'Configuration'} = [ \%config_menu, 'Configuraiton and setup' ]
-  if $curuser->access_right('Configuration')
-  || $curuser->access_right('Edit advertising sources')
+  if $curuser->access_right('Edit advertising sources')
   || $curuser->access_right('Edit global advertising sources');
 
 use vars qw($gmenunum);