X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Faccess_right.pm;h=0da718c64ba93ed2c8ec1f162e5c6ad8e94f34ce;hb=5da68ff1a7c638e30cbafbc9b0749f1e82b333df;hp=ee0c494ae335d047373c0d58a4ca08f150130270;hpb=5499e8e571862b071e1b072a017aba16636ea34b;p=freeside.git diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm index ee0c494ae..0da718c64 100644 --- a/FS/FS/access_right.pm +++ b/FS/FS/access_right.pm @@ -249,6 +249,10 @@ 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', + 'Add on-the-fly void credit reason' => 'Add on-the-fly void reason', + '_ALL' => 'Employee preference telephony integration', ); # foreach my $old_acl ( keys %onetime ) { @@ -269,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', @@ -291,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,