X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Faccess_right.pm;h=87b052f5a134d518716400da40118aa21cf59d71;hb=3d88896c03e09483714c84a06106233081800f70;hp=18d2695f47e98af8040b66cad75726f3bbe4d706;hpb=4e619bb76046bc35f0d7d29ae743b629f2a34030;p=freeside.git

diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm
index 18d2695f4..87b052f5a 100644
--- a/FS/FS/access_right.pm
+++ b/FS/FS/access_right.pm
@@ -5,6 +5,7 @@ use vars qw( @ISA );
 use Tie::IxHash;
 use FS::Record qw( qsearch qsearchs );
 use FS::upgrade_journal;
+use FS::access_group;
 
 @ISA = qw(FS::Record);
 
@@ -187,7 +188,8 @@ sub _upgrade_data { # class method
 
   my @all_groups = qsearch('access_group', {});
 
-  tie my %onetime, 'Tie::IxHash',
+  #tie my %onetime, 'Tie::IxHash',
+  my @onetime = (
     'List customers'                      => 'List all customers',
     'List all customers'                  => 'Advanced customer search',
     'List packages'                       => 'Summarize packages',
@@ -201,6 +203,7 @@ sub _upgrade_data { # class method
     'Post credit'                         => 'Credit line items',
     #'View customer tax exemptions'        => 'Edit customer tax exemptions',
     'Edit customer'                       => 'Edit customer tax exemptions',
+    'Edit package definitions'            => 'Bulk edit package definitions',
 
     'List services'    => [ 'Services: Accounts',
                             'Services: Domains',
@@ -223,17 +226,39 @@ sub _upgrade_data { # class method
     'Services: Hardware' => 'Services: Hardware: Advanced search',
     'Services: Phone numbers' => 'Services: Phone numbers: Advanced search',
 
+    'Services: Accounts' => 'Services: Alarm services',
+
     'List rating data' => [ 'Usage: RADIUS sessions',
                             'Usage: Call Detail Records (CDRs)',
                             'Usage: Unrateable CDRs',
                           ],
-  ;
+    'Provision customer service' => [ 'Edit password' ],
+    'Financial reports' => [ 'Employees: Commission Report',
+                             'Employees: Audit Report',
+                           ],
+    'Change customer package' => 'Detach customer package',
+    'Services: Accounts' => 'Services: Cable Subscribers',
+    'Bulk change customer packages' => 'Bulk move customer services',
+    'Configuration' => 'Edit sales people',
+    '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',
+  );
+
+#  foreach my $old_acl ( keys %onetime ) {
+#
+#    my @new_acl = ref($onetime{$old_acl})
+#                    ? @{ $onetime{$old_acl} }
+#                    :  ( $onetime{$old_acl} );
 
-  foreach my $old_acl ( keys %onetime ) {
+  while ( @onetime ) {
 
-    my @new_acl = ref($onetime{$old_acl})
-                    ? @{ $onetime{$old_acl} }
-                    :  ( $onetime{$old_acl} );
+    my( $old_acl, $new_acl ) = splice(@onetime, 0, 2);
+    my @new_acl = ref($new_acl) ? @$new_acl : ( $new_acl );
 
     foreach my $new_acl ( @new_acl ) {