X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2Faccess_right.pm;h=59defb72ab15031297c4126673c36a125e211707;hb=4924d635301e5c365d55b0c008f12e9cff40350f;hp=9ec7ab95c3fa3fb929e132d4011c007c26d317f1;hpb=0d991a8c986099180aaf2843a928e9396ff232db;p=freeside.git

diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm
index 9ec7ab95c..59defb72a 100644
--- a/FS/FS/access_right.pm
+++ b/FS/FS/access_right.pm
@@ -243,7 +243,18 @@ sub _upgrade_data { # class method
     'Configuration' => 'Alarm global configuration',
     'Services: Accounts' => 'Services: Conferencing',
     'Services: Accounts' => 'Services: Video',
+    'Edit global package definitions' => 'Edit package definition costs',
     'Add on-the-fly credit reason' => 'Add on-the-fly refund reason',
+    'Configuration' => 'Edit global fee definitions',
+    'Edit package definition costs' => 'View package definition costs',
+    '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',
+    'Edit customer package dates' => 'Change package start date', #4.x
+    'Resend invoices' => 'Print and mail invoices',
   );
 
 #  foreach my $old_acl ( keys %onetime ) {
@@ -264,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',
@@ -286,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,