[freeside-commits] freeside/httemplate/search part_pkg.html, 1.1.2.2, 1.1.2.3

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	part_pkg.html 
Log Message:
last fix for employee commisssion report, RT#6991

Index: part_pkg.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/part_pkg.html,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -w -d -r1.1.2.2 -r1.1.2.3
--- part_pkg.html	30 Mar 2010 12:13:27 -0000	1.1.2.2
+++ part_pkg.html	5 Apr 2010 01:23:54 -0000	1.1.2.3
@@ -169,10 +169,11 @@
   push @fields, sub {
     my $part_pkg = shift;
     my $sql = "SELECT SUM(amount) FROM cust_credit
-                   INNER JOIN cust_event USING ( eventnum )
+                   LEFT JOIN cust_event USING ( eventnum )
                    LEFT  JOIN part_event USING ( eventpart )
                    LEFT  JOIN cust_pkg ON ( cust_event.tablenum = cust_pkg.pkgnum )
-                 WHERE action IN ( 'pkg_employee_credit',
+                 WHERE eventnum IS NOT NULL
+                   AND action IN ( 'pkg_employee_credit',
                                    'pkg_employee_credit_pkg'
                                  )
                    AND cust_credit._date >= $beginning
@@ -187,7 +188,8 @@
       my $access_user = qsearchs('access_user', { 'username' => $part_pkg->get('username') })
         or die "unknown usernum";
 
-      push @arg, $access_user->user_custnum or return 0;
+      return 0 unless $access_user->user_custnum;
+      push @arg, $access_user->user_custnum;
 
     } elsif (0) { #agent commission reports
       push @arg, 'XXXagent_custnum'; #$agent->agent_custnum