[freeside-commits] freeside/FS/FS Conf.pm, 1.180.2.55, 1.180.2.56 svc_acct.pm, 1.217.2.33, 1.217.2.34

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv26145

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	Conf.pm svc_acct.pm 
Log Message:
1.7 has no per_agent config

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.180.2.55
retrieving revision 1.180.2.56
diff -u -d -r1.180.2.55 -r1.180.2.56
--- Conf.pm	14 Dec 2009 07:36:58 -0000	1.180.2.55
+++ Conf.pm	14 Dec 2009 07:48:46 -0000	1.180.2.56
@@ -2247,7 +2247,6 @@
     'section'     => '',
     'description' => 'RADIUS group (or comma-separated groups) to assign to svc_acct which has exceeded its bandwidth or time limit.',
     'type'        => 'text',
-    'per_agent'   => 1,
   },
 
   {

Index: svc_acct.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_acct.pm,v
retrieving revision 1.217.2.33
retrieving revision 1.217.2.34
diff -u -d -r1.217.2.33 -r1.217.2.34
--- svc_acct.pm	14 Dec 2009 07:15:06 -0000	1.217.2.33
+++ svc_acct.pm	14 Dec 2009 07:48:46 -0000	1.217.2.34
@@ -1805,14 +1805,11 @@
 
   my $cust_pkg = $self->cust_svc->cust_pkg;
 
-  my $agent_overlimit =
-    $cust_pkg
-      ? $conf->config('overlimit_groups', $cust_pkg->cust_main->agentnum )
-      : '';
+  my $conf_overlimit = $conf->config('overlimit_groups');
 
   foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
 
-    my $groups = $agent_overlimit || $part_export->option('overlimit_groups');
+    my $groups = $conf_overlimit || $part_export->option('overlimit_groups');
     next unless $groups;
 
     my $gref = &{ $self->_fieldhandlers->{'usergroup'} }( $self, $groups );