X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Faccess_right.pm;h=40475ec004b0d8dec802527d62dcb9c85acb19ec;hb=a008b601383d5693a197f4bf57ed5ba7887f3065;hp=d5e3b8b51a105ce284599997c638b89615a78ccc;hpb=85c78d955fbc2fd6c3991156b387d37c185b9f64;p=freeside.git

diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm
index d5e3b8b51..40475ec00 100644
--- a/FS/FS/access_right.pm
+++ b/FS/FS/access_right.pm
@@ -251,6 +251,10 @@ 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',
+    '_ALL' => 'Employee preference telephony integration',
   );
 
 #  foreach my $old_acl ( keys %onetime ) {
@@ -271,7 +275,7 @@ sub _upgrade_data { # class method
 
       # grant $new_acl to all groups who have $old_acl
       for my $group (@all_groups) {
-        next unless $group->access_right($old_acl);
+        next unless $old_acl eq '_ALL' || $group->access_right($old_acl);
         next if     $group->access_right($new_acl);
         my $access_right = FS::access_right->new( {
             'righttype'   => 'FS::access_group',
@@ -293,6 +297,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,