SF.net SVN: ledger-smb:[2996] trunk/sql/modules/1099_reports.sql

[..hidden..]

Revision: 2996
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=2996&view=rev
Author:   einhverfr
Date:     2010-04-30 22:26:25 +0000 (Fri, 30 Apr 2010)

Log Message:
-----------
Correcting errors in 1099 reporting functions

Modified Paths:
--------------
    trunk/sql/modules/1099_reports.sql

Modified: trunk/sql/modules/1099_reports.sql
===================================================================
--- trunk/sql/modules/1099_reports.sql	2010-04-30 22:14:15 UTC (rev 2995)
+++ trunk/sql/modules/1099_reports.sql	2010-04-30 22:26:25 UTC (rev 2996)
@@ -20,24 +20,24 @@
                      sum(CASE WHEN relation = 'invoice' THEN ac.amount 
                               ELSE 0 END), 
                      sum(ac.amount)
-		FROM (select id, entity_credit_account FROM ar 
+		FROM (select id, transdate, entity_credit_account FROM ar 
                        UNION 
-                      select id, entity_credit_account from ap
+                      select id, transdate, entity_credit_account from ap
                      ) gl
-                JOIN (select 'acc_trans' as relation, amount as amount, 
+                JOIN (select trans_id, 'acc_trans' as relation, amount as amount, 
                              atf.reportable
                         FROM  acc_trans
                         JOIN ac_tax_form atf 
-                          ON (acc_trans.entry_id = ac_tax_form.entry_id 
-                             AND ac_tax_form.reportable)
+                          ON (acc_trans.entry_id = atf.entry_id 
+                             AND atf.reportable)
                        UNION
-                      select 'invoice' as relation, sellprice * qty as amount, 
+                      select trans_id, 'invoice' as relation, sellprice * qty as amount, 
                              reportable
                         FROM invoice 
                         JOIN invoice_tax_form 
                           ON (invoice.id = invoice_tax_form.invoice_id 
                              AND invoice_tax_form.reportable)
-                     ) ac
+                     ) ac ON (ac.trans_id = gl.id)
 		JOIN entity_credit_account 
                   ON (gl.entity_credit_account = entity_credit_account.id) 
 		JOIN entity ON (entity.id = entity_credit_account.entity_id) 


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