X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Faccess_right.pm;h=14a60981e7370f1e300724cf4c18639863dfe085;hb=8424291d41e61bbac4a14444c962bd40fa41c0a1;hp=0be3b23f5e1cfb26d6cab4a6017effa44806647a;hpb=8c2c7b4dc761ce015972444fb9fb8df7e7a9a5a4;p=freeside.git

diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm
index 0be3b23f5..14a60981e 100644
--- a/FS/FS/access_right.pm
+++ b/FS/FS/access_right.pm
@@ -246,6 +246,12 @@ sub _upgrade_data { # class method
     'Edit package definition costs' => 'View package definition costs',
     'List prospects' => 'List contacts',
     '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 ) {
@@ -266,7 +272,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',
@@ -288,6 +294,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,