[freeside-commits] freeside/FS/FS/cust_main Search.pm, 1.8.2.3, 1.8.2.4
Mark Wells
mark at wavetail.420.am
Tue Jan 31 13:32:11 PST 2012
Update of /home/cvs/cvsroot/freeside/FS/FS/cust_main
In directory wavetail.420.am:/tmp/cvs-serv27132/FS/FS/cust_main
Modified Files:
Tag: FREESIDE_2_3_BRANCH
Search.pm
Log Message:
fix advanced cust reports under mysql, #16214
Index: Search.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main/Search.pm,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -w -d -r1.8.2.3 -r1.8.2.4
--- Search.pm 26 Jan 2012 05:14:49 -0000 1.8.2.3
+++ Search.pm 31 Jan 2012 21:32:09 -0000 1.8.2.4
@@ -64,7 +64,8 @@
my %options = @_;
#here is the agent virtualization
- my $agentnums_sql = $FS::CurrentUser::CurrentUser->agentnums_sql;
+ my $agentnums_sql =
+ $FS::CurrentUser::CurrentUser->agentnums_sql(table => 'cust_main');
my @cust_main = ();
@@ -730,7 +731,8 @@
$orderby ||= 'ORDER BY custnum';
# here is the agent virtualization
- 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) : '';
@@ -753,7 +755,7 @@
push @select, "array_to_string(array(select pkg from cust_pkg left join part_pkg using ( pkgpart ) where cust_main.custnum = cust_pkg.custnum $pkgwhere),'|') as magic";
}elsif ($dbh->{Driver}->{Name} =~ /^mysql/i) {
- push @select, "GROUP_CONCAT(pkg SEPARATOR '|') as magic";
+ push @select, "GROUP_CONCAT(part_pkg.pkg SEPARATOR '|') as magic";
$addl_from .= " LEFT JOIN part_pkg using ( pkgpart )";
}else{
warn "warning: unknown database type ". $dbh->{Driver}->{Name}.
@@ -795,6 +797,7 @@
my $sql_query = {
'table' => 'cust_main',
'select' => $select,
+ 'addl_from' => $addl_from,
'hashref' => {},
'extra_sql' => $extra_sql,
'order_by' => $orderby,
More information about the freeside-commits
mailing list