projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SureTax, #31639, #33015, #34598
[freeside.git]
/
FS
/
FS
/
access_right.pm
diff --git
a/FS/FS/access_right.pm
b/FS/FS/access_right.pm
index
d5e3b8b
..
40475ec
100644
(file)
--- a/
FS/FS/access_right.pm
+++ b/
FS/FS/access_right.pm
@@
-251,6
+251,10
@@
sub _upgrade_data { # class method
'List customers' => 'List contacts',
'Backdate payment' => 'Backdate credit',
'Generate quotation' => 'Disable quotation',
'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 ) {
);
# foreach my $old_acl ( keys %onetime ) {
@@
-271,7
+275,7
@@
sub _upgrade_data { # class method
# grant $new_acl to all groups who have $old_acl
for my $group (@all_groups) {
# 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',
next if $group->access_right($new_acl);
my $access_right = FS::access_right->new( {
'righttype' => 'FS::access_group',
@@
-293,6
+297,7
@@
sub _upgrade_data { # class method
# grant to everyone
for my $group (@all_groups) {
# 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,
my $access_right = FS::access_right->new( {
'righttype' => 'FS::access_group',
'rightobjnum' => $group->groupnum,