[freeside-commits] freeside/httemplate/browse part_event.html, 1.2, 1.3 part_pkg.cgi, 1.55, 1.56

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/browse
In directory wavetail.420.am:/tmp/cvs-serv17396/httemplate/browse

Modified Files:
	part_event.html part_pkg.cgi 
Log Message:
Add "View customers of all agents" access rights, RT#7010

Index: part_event.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/browse/part_event.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- part_event.html	22 Nov 2008 07:10:11 -0000	1.2
+++ part_event.html	17 Jun 2010 02:08:52 -0000	1.3
@@ -159,6 +159,7 @@
 my $count_query = 'SELECT COUNT(*) FROM part_event WHERE '.
                   $FS::CurrentUser::CurrentUser->agentnums_sql(
                     'null_right' => 'Edit global billing events',
+                    'viewall_right' => 'None',
                   );
 
 my $join_conditions  = FS::part_event_condition->join_conditions_sql;

Index: part_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/browse/part_pkg.cgi,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -w -d -r1.55 -r1.56
--- part_pkg.cgi	22 Oct 2009 12:50:05 -0000	1.55
+++ part_pkg.cgi	17 Jun 2010 02:08:52 -0000	1.56
@@ -84,11 +84,11 @@
                   join( 'AND ', @where)
                 : '';
 
-my $agentnums = join(',', $curuser->agentnums);
+my $agentnums_sql = $curuser->agentnums_sql( 'table'=>'cust_main' );
 my $count_cust_pkg = "
   SELECT COUNT(*) FROM cust_pkg LEFT JOIN cust_main USING ( custnum )
     WHERE cust_pkg.pkgpart = part_pkg.pkgpart
-      AND cust_main.agentnum IN ($agentnums)
+      AND $agentnums_sql
 ";
 
 $select = "