From: jeff <jeff>
Date: Tue, 29 Jan 2008 03:56:36 +0000 (+0000)
Subject: 1394 regression fixup
X-Git-Tag: TRIXBOX_2_6~91
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=14c6d236b6d48be695e64f104133d630b1bdb4c8

1394 regression fixup
---

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 9d4ca1c00..121d491d0 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1586,7 +1586,7 @@ sub search_sql {
 
   if ( $params->{'agentnum'} =~ /^(\d+)$/ and $1 ) {
     push @where,
-      "agentnum = $1";
+      "cust_main.agentnum = $1";
   }
 
   ##
@@ -1738,12 +1738,12 @@ sub search_sql {
       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) : '';