freeside/FS/FS h_Common.pm,1.2,1.3 Record.pm,1.94,1.95

[ivan]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory pouncequick:/tmp/cvs-serv14575/FS/FS

Modified Files:
	h_Common.pm Record.pm 
Log Message:
add agent selection to payment and credit reports, add link to agent browse, closes: Bug#1105

Index: Record.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Record.pm,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- Record.pm	3 Mar 2005 08:15:37 -0000	1.94
+++ Record.pm	4 Mar 2005 12:34:55 -0000	1.95
@@ -180,7 +180,7 @@
   }
 }
 
-=item qsearch TABLE, HASHREF, SELECT, EXTRA_SQL, CACHE_OBJ, AS
+=item qsearch TABLE, HASHREF, SELECT, EXTRA_SQL, CACHE_OBJ, ADDL_FROM
 
 Searches the database for all records matching (at least) the key/value pairs
 in HASHREF.  Returns all the records found as `FS::TABLE' objects if that
@@ -199,7 +199,7 @@
 =cut
 
 sub qsearch {
-  my($stable, $record, $select, $extra_sql, $cache, $as ) = @_;
+  my($stable, $record, $select, $extra_sql, $cache, $addl_from ) = @_;
   #$stable =~ /^([\w\_]+)$/ or die "Illegal table: $table";
   #for jsearch
   $stable =~ /^([\w\s\(\)\.\,\=]+)$/ or die "Illegal table: $stable";
@@ -223,7 +223,7 @@
   }
 
   my $statement = "SELECT $select FROM $stable";
-  $statement .= " AS $as" if $as;
+  $statement .= " $addl_from" if $addl_from;
   if ( @real_fields or @virtual_fields ) {
     $statement .= ' WHERE '. join(' AND ',
       ( map {
@@ -428,7 +428,7 @@
   );
 }
 
-=item qsearchs TABLE, HASHREF
+=item qsearchs TABLE, HASHREF, SELECT, EXTRA_SQL, CACHE_OBJ, ADDL_FROM
 
 Same as qsearch, except that if more than one record matches, it B<carp>s but
 returns the first.  If this happens, you either made a logic error in asking

Index: h_Common.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/h_Common.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- h_Common.pm	3 Mar 2005 10:25:21 -0000	1.2
+++ h_Common.pm	4 Mar 2005 12:34:55 -0000	1.3
@@ -64,7 +64,7 @@
 
      '',
 
-     'maintable',
+     'AS maintable',
   );
 
 }