SF.net SVN: ledger-smb:[4837] trunk

[..hidden..]

Revision: 4837
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4837&view=rev
Author:   einhverfr
Date:     2012-06-05 03:54:35 +0000 (Tue, 05 Jun 2012)
Log Message:
-----------
AR/AP transaction reports mostly working, in advance of port to new reporting framework

Modified Paths:
--------------
    trunk/LedgerSMB/AA.pm
    trunk/bin/aa.pl

Modified: trunk/LedgerSMB/AA.pm
===================================================================
--- trunk/LedgerSMB/AA.pm	2012-06-05 03:18:24 UTC (rev 4836)
+++ trunk/LedgerSMB/AA.pm	2012-06-05 03:54:35 UTC (rev 4837)
@@ -897,10 +897,10 @@
     if ( !$form->{summary} and !$form->{outstanding} ) {
         $acc_trans_flds = qq|
 			, c.accno, ac.source,
-			p.projectnumber, ac.memo AS description,
+			ac.memo AS description,
 			ac.amount AS linetotal,
 			i.description AS linedescription|;
-        $group_by_fields = qq|, c.accno, ac.source, p.projectnumber, ac.memo,
+        $group_by_fields = qq|, c.accno, ac.source, ac.memo,
                               ac.amount, i.description |;
 
         $acc_trans_join = qq| 
@@ -929,7 +929,6 @@
                           AS paid,
 		          vce.name, vc.meta_number,
 		          a.entity_credit_account, 
-		          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)
@@ -938,7 +937,6 @@
                                      AND charttype = 'A')
 		LEFT JOIN exchangerate ex ON (ex.curr = a.curr
 		          AND ex.transdate = a.transdate)
-		LEFT JOIN department d ON (a.department_id = d.id)
 		$acc_trans_join
 		    WHERE c.link = '$form->{ARAP}' AND 
 		          (|.$dbh->quote($form->{transdateto}) . qq| IS NULL OR 
@@ -964,8 +962,6 @@
 		          vce.name, vc.meta_number,
 		          a.entity_credit_account, a.till, 
 		          ex.$buysell AS exchangerate, 
-		          d.description AS department, 
-		          as_array(p.projectnumber) as ac_projects,
 		          a.ponumber $acc_trans_flds
 		     FROM $table a
 		     JOIN entity_credit_account vc ON (a.entity_credit_account = vc.id)
@@ -975,8 +971,6 @@
                                       AND charttype='A')
 		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 project p ON acs.project_id = p.id 
 		$acc_trans_join
 		    WHERE c.link = '$ARAP' AND 
 		          (|.$dbh->quote($form->{transdateto}) . qq| IS NULL OR 
@@ -1000,9 +994,7 @@
 		          vce.name, vc.meta_number,
 		          vc.entity_id, a.till, me.name AS manager, a.curr,
 		          ex.$buysell AS exchangerate, 
-		          d.description AS department, 
-		          a.ponumber, as_array(p.projectnumber) as ac_projects,
-                          as_array(ip.projectnumber) as inv_projects
+		          a.ponumber
                           $acc_trans_flds
 		     FROM $table a
 		     JOIN entity_credit_account vc ON (a.entity_credit_account = vc.id)
@@ -1027,10 +1019,7 @@
 		     JOIN entity vce ON (vc.entity_id = vce.id)
 		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 ac.project_id = p.id |;
+                LEFT JOIN invoice i ON (i.trans_id = a.id) |;
         $group_by = qq| 
                 GROUP BY  a.id, a.invnumber, a.ordnumber, a.transdate,
                           a.duedate, a.netamount, a.amount,
@@ -1038,8 +1027,7 @@
                           a.shipvia, a.shippingpoint, ee.name , 
                           vce.name, vc.meta_number, a.amount, pd.due,
                           vc.entity_id, a.till, me.name, a.curr,
-                          ex.$buysell, a.ponumber,
-                          d.description $group_by_fields|;
+                          ex.$buysell, a.ponumber $group_by_fields|;
     }
 
     my %ordinal = (

Modified: trunk/bin/aa.pl
===================================================================
--- trunk/bin/aa.pl	2012-06-05 03:18:24 UTC (rev 4836)
+++ trunk/bin/aa.pl	2012-06-05 03:54:35 UTC (rev 4837)
@@ -2181,9 +2181,6 @@
             #push @projects, @{$ref->{inv_projects}};
             $ref->{projectnumber} = join '<br />', @projects;
             $ref->{projectnumber} =~ s/(<br \/>)+/<br \/>/;
-        } elsif ($form->{l_projectnumber} eq 'Y') { $form->error($locale->text('Invalid Project Data:'). 
-                              ref($ref->{ac_projects}) . $ref->{ac_projects} .  ref($ref->{inv_projects}) . $ref->{inv_projects}
-                             )
         }
         if ( $form->{l_subtotal} eq 'Y' ) {
             if ( $sameitem ne $ref->{ $form->{sort} } ) {

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