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

[..hidden..]

Revision: 5598
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5598&view=rev
Author:   einhverfr
Date:     2013-01-17 09:30:53 +0000 (Thu, 17 Jan 2013)
Log Message:
-----------
Merging from trunk: Fixing credit limit not accounting for payments entered on single payment screen

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

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


Property changes on: branches/1.3
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5515,5519,5524,5526,5528-5529,5533,5544-5546,5548-5549,5554-5555,5563,5565,5569,5576,5579,5589-5590
   + /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5515,5519,5524,5526,5528-5529,5533,5544-5546,5548-5549,5554-5555,5563,5565,5569,5576,5579,5589-5590,5597

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-01-17 09:28:37 UTC (rev 5597)
+++ branches/1.3/Changelog	2013-01-17 09:30:53 UTC (rev 5598)
@@ -21,6 +21,7 @@
 * Fixed contact info addition workflow.  Now entering multiple contact records 
 is not a total pain(Chris T)
 * Fixed lines 2 and 3 not showing on address div for contacts (Chris T)
+* Fixed credit limit not accounting for some payments (Chris T, 3600679)
 
 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,5583,5587,5590,5593,5595
   + /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,5587,5590,5593,5595,5597

Modified: branches/1.3/LedgerSMB/AA.pm
===================================================================
--- branches/1.3/LedgerSMB/AA.pm	2013-01-17 09:28:37 UTC (rev 5597)
+++ branches/1.3/LedgerSMB/AA.pm	2013-01-17 09:30:53 UTC (rev 5598)
@@ -1352,8 +1352,12 @@
     $form->{creditremaining} = $form->{creditlimit};
     $query = qq|
                 SELECT sum(used) FROM (
-		SELECT SUM(amount - paid) as used
-		  FROM $arap
+		SELECT SUM(ac.amount) 
+                       * CASE WHEN '$arap' = 'ar' THEN -1 ELSE 1 END as used
+		  FROM $arap a
+                  JOIN acc_trans ac ON a.id = ac.trans_id
+                  JOIN account_link al ON al.account_id = ac.chart_id
+                                       AND al.description IN ('AR', 'AP')
 		 WHERE entity_credit_account = ?
                  UNION 
                 SELECT sum(o.amount * coalesce(e.$buysell, 1)) as used

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