SF.net SVN: ledger-smb:[3751] branches/1.3/LedgerSMB/AA.pm

[..hidden..]

Revision: 3751
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3751&view=rev
Author:   einhverfr
Date:     2011-09-26 22:22:46 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
More outstanding report fixes

Modified Paths:
--------------
    branches/1.3/LedgerSMB/AA.pm

Modified: branches/1.3/LedgerSMB/AA.pm
===================================================================
--- branches/1.3/LedgerSMB/AA.pm	2011-09-26 21:56:05 UTC (rev 3750)
+++ branches/1.3/LedgerSMB/AA.pm	2011-09-26 22:22:46 UTC (rev 3751)
@@ -897,9 +897,7 @@
                           AS paid,
 		          vce.name, vc.meta_number,
 		          a.entity_id, 
-		          d.description AS department, 
-		          as_array(p.projectnumber) as ac_projects,
-                          as_array(ip.projectnumber) as inv_projects
+		          d.description AS department
 		     FROM $table a
 		     JOIN entity_credit_account vc ON (a.entity_credit_account = vc.id)
 		     JOIN acc_trans acs ON (acs.trans_id = a.id)
@@ -909,9 +907,6 @@
 		LEFT JOIN exchangerate ex ON (ex.curr = a.curr
 		          AND ex.transdate = a.transdate)
 		LEFT JOIN department d ON (a.department_id = d.id)
-                LEFT JOIN invoice i ON (i.trans_id = a.id)
-                LEFT JOIN project ip ON (i.project_id = ip.id)
-                LEFT JOIN project p ON acs.project_id = p.id 
 		$acc_trans_join
 		    WHERE c.link = '$form->{ARAP}' AND 
 		          (|.$dbh->quote($form->{transdateto}) . qq| IS NULL OR 
@@ -938,7 +933,6 @@
 		          ex.$buysell AS exchangerate, 
 		          d.description AS department, 
 		          as_array(p.projectnumber) as ac_projects,
-                          as_array(ip.projectnumber) as inv_projects,
 		          a.ponumber $acc_trans_fields
 		     FROM $table a
 		     JOIN entity_credit_account vc ON (a.entity_credit_account = vc.id)
@@ -949,11 +943,9 @@
 		LEFT JOIN exchangerate ex ON (ex.curr = a.curr
 		          AND ex.transdate = a.transdate)
 		LEFT JOIN department d ON (a.department_id = d.id)
-                LEFT JOIN invoice i ON (i.trans_id = a.id)
-                LEFT JOIN project ip ON (i.project_id = ip.id)
                 LEFT JOIN project p ON acs.project_id = p.id 
 		$acc_trans_join
-		    WHERE c.link = '$form->{ARAP}' AND 
+		    WHERE c.link = '$ARAP' AND 
 		          (|.$dbh->quote($form->{transdateto}) . qq| IS NULL OR 
 		           |.$dbh->quote($form->{transdateto}) . qq| >= acs.transdate)
 			AND a.approved IS TRUE AND acs.approved IS TRUE

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.