X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Faccess_right.pm;h=0da718c64ba93ed2c8ec1f162e5c6ad8e94f34ce;hb=5da68ff1a7c638e30cbafbc9b0749f1e82b333df;hp=e5a5781a9485642d9ff8530b504f73ecea7cb7fa;hpb=7dd8215a91ca6ca4a9988a0108647ada7f2a11d8;p=freeside.git

diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm
index e5a5781a9..0da718c64 100644
--- a/FS/FS/access_right.pm
+++ b/FS/FS/access_right.pm
@@ -250,6 +250,9 @@ sub _upgrade_data { # class method
     'List prospects' => 'List contacts',
     'List customers' => 'List contacts',
     'Backdate payment' => 'Backdate credit',
+    'Generate quotation' => 'Disable quotation',
+    'Add on-the-fly void credit reason' => 'Add on-the-fly void reason',
+    '_ALL' => 'Employee preference telephony integration',
   );
 
 #  foreach my $old_acl ( keys %onetime ) {
@@ -270,7 +273,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',
@@ -292,6 +295,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,