SF.net SVN: ledger-smb:[5584] branches/1.3

[..hidden..]

Revision: 5584
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5584&view=rev
Author:   einhverfr
Date:     2013-01-16 06:43:32 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
Fixing 1.3-specific bug in vendor taxable sales reports

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/RP.pm

Property Changed:
----------------
    branches/1.3/Changelog

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-01-16 06:42:05 UTC (rev 5583)
+++ branches/1.3/Changelog	2013-01-16 06:43:32 UTC (rev 5584)
@@ -12,6 +12,7 @@
 * Added version number to message at top of menu (Chris T, 3600009)
 * Added wrapper div around pricegroup field in contact screen to allow cssp,
 Chris T.
+* Fixed inverted tax numbers in vendor taxable sales report (Chris T, 3600002)
 
 Changelog for 1.3.28
 * Added db list to setup.pl when no db is entered and credentials allow login


Property changes on: branches/1.3/Changelog
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515,5519,5524,5529,5548,5563,5565,5578-5579,5581
   + /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515,5519,5524,5529,5548,5563,5565,5578-5579,5581,5583

Modified: branches/1.3/LedgerSMB/RP.pm
===================================================================
--- branches/1.3/LedgerSMB/RP.pm	2013-01-16 06:42:05 UTC (rev 5583)
+++ branches/1.3/LedgerSMB/RP.pm	2013-01-16 06:43:32 UTC (rev 5584)
@@ -1987,9 +1987,11 @@
 
    SELECT gl.transdate, gl.id, gl.invnumber, e.name, e.id as entity_id, 
           eca.id as credit_id, eca.meta_number, gl.netamount, 
-          sum(CASE WHEN a.id IS NOT NULL then ac.amount ELSE 0 END) as tax, 
-          gl.invoice, gl.netamount 
-          + sum(CASE WHEN a.id IS NOT NULL then ac.amount ELSE 0 END) as total
+          sum(CASE WHEN a.id IS NOT NULL then ac.amount ELSE 0 END) *
+          CASE WHEN $account_class = 1 THEN -1 ELSE 1 END as tax, 
+          gl.invoice, (gl.netamount 
+          + sum(CASE WHEN a.id IS NOT NULL then ac.amount ELSE 0 END)) 
+          * CASE WHEN $account_class = 1 THEN -1 ELSE 1 END as total
      FROM (select id, transdate, amount, netamount, entity_credit_account,
                   invnumber, invoice
              from ar where ? = 2
@@ -2009,7 +2011,8 @@
           AND (gl.transdate >= ? or ? is null)
           AND (gl.transdate <= ? or ? is null)
  GROUP BY gl.transdate, gl.id, gl.invnumber, e.name, e.id, eca.id,
-           eca.meta_number, gl.amount, gl.netamount, gl.invoice
+           eca.meta_number, gl.amount, gl.netamount, gl.invoice, 
+           eca.entity_class
    HAVING (sum(CASE WHEN a.id is not null then ac.amount else 0 end) 
            <> 0 AND ? IS NOT NULL) 
           OR (? IS NULL and sum(CASE WHEN a.id is not null then ac.amount

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