[freeside-commits] freeside/FS/FS cust_pkg.pm,1.87,1.88

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv18180

Modified Files:
	cust_pkg.pm 
Log Message:
1394 regression fixup

Index: cust_pkg.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pkg.pm,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- cust_pkg.pm	29 Jan 2008 03:34:11 -0000	1.87
+++ cust_pkg.pm	29 Jan 2008 03:56:36 -0000	1.88
@@ -1586,7 +1586,7 @@
 
   if ( $params->{'agentnum'} =~ /^(\d+)$/ and $1 ) {
     push @where,
-      "agentnum = $1";
+      "cust_main.agentnum = $1";
   }
 
   ##
@@ -1738,12 +1738,12 @@
       qsearchs('access_user', { username => $params->{CurrentUser} });
 
     if ($access_user) {
-      push @where, $access_user->agentnums_sql;
+      push @where, $access_user->agentnums_sql('table'=>'cust_main');
     }else{
       push @where, "1=0";
     }
   }else{
-    push @where, $FS::CurrentUser::CurrentUser->agentnums_sql;
+    push @where, $FS::CurrentUser::CurrentUser->agentnums_sql('table'=>'cust_main');
   }
 
   my $extra_sql = scalar(@where) ? ' WHERE '. join(' AND ', @where) : '';