X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Faccess_right.pm;h=880d6f3d28fadd56346215c4039c4c128e0114de;hb=e86b3578afbb298529e773506217cfc10e0257c4;hp=d5ee9682a249124d595a4b80bdcddf67fc8cd0c8;hpb=d1ce3a8b4d22409ac13c746478a4598f23763506;p=freeside.git

diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm
index d5ee9682a..880d6f3d2 100644
--- a/FS/FS/access_right.pm
+++ b/FS/FS/access_right.pm
@@ -241,6 +241,19 @@ sub _upgrade_data { # class method
     'Bulk change customer packages' => 'Bulk move customer services',
     'Configuration' => 'Edit sales people',
     'Configuration' => 'Alarm global configuration',
+    'Edit global package definitions' => 'Edit package definition costs',
+    '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',
+    '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',
+    'Add on-the-fly credit reason' => 'Add on-the-fly refund reason',
+    'Resend invoices' => 'Print and mail invoices',
   );
 
 #  foreach my $old_acl ( keys %onetime ) {
@@ -261,7 +274,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',
@@ -283,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,