X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Faccess_right.pm;h=57f67ded3715ea79f8573265f911ff47fefdea7d;hb=31e1d1d72a371b856f4ee3e50252bf596bb8a2d1;hp=7a4c4dad91d68599ceed33d401048458511c7926;hpb=ed98fabaf7bc3f2127ca33e465632312bd8815fc;p=freeside.git

diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm
index 7a4c4dad9..57f67ded3 100644
--- a/FS/FS/access_right.pm
+++ b/FS/FS/access_right.pm
@@ -251,10 +251,9 @@ sub _upgrade_data { # class method
     'List customers' => 'List contacts',
     'Backdate payment' => 'Backdate credit',
     'Generate quotation' => 'Disable quotation',
-    'Void credit' => 'Void credit',
-    'Unvoid credit' => 'Unvoid credit',
-    'Add on-the-fly void credit reason' => 'Add on-the-fly void credit reason',
+    'Add on-the-fly void credit reason' => 'Add on-the-fly void reason',
     '_ALL' => 'Employee preference telephony integration',
+    'Edit customer package dates' => 'Change package start date', #4.x
   );
 
 #  foreach my $old_acl ( keys %onetime ) {
@@ -297,6 +296,7 @@ sub _upgrade_data { # class method
 
     # grant to everyone
     for my $group (@all_groups) {
+      next if $group->access_right('Download report data');
       my $access_right = FS::access_right->new( {
           'righttype'   => 'FS::access_group',
           'rightobjnum' => $group->groupnum,