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

[..hidden..]

Revision: 5611
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5611&view=rev
Author:   einhverfr
Date:     2013-01-20 06:59:00 +0000 (Sun, 20 Jan 2013)
Log Message:
-----------
merging from trunk: Fix for the credit limit fix, per freelock on irc

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,5597,5602-5603,5608
   + /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,5602-5603,5608,5610

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-01-20 06:56:56 UTC (rev 5610)
+++ branches/1.3/Changelog	2013-01-20 06:59:00 UTC (rev 5611)
@@ -22,7 +22,7 @@
 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)
-* Payments tables in invoice/transaction screens can be references in CSS
+* Payments tables in invoice/transaction screens can be referenced in CSS
 (Chris T)
 
 Changelog for 1.3.28


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,5597,5608
   + /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,5608,5610

Modified: branches/1.3/LedgerSMB/AA.pm
===================================================================
--- branches/1.3/LedgerSMB/AA.pm	2013-01-20 06:56:56 UTC (rev 5610)
+++ branches/1.3/LedgerSMB/AA.pm	2013-01-20 06:59:00 UTC (rev 5611)
@@ -1358,7 +1358,7 @@
 		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 and approved
+                  JOIN acc_trans ac ON a.id = ac.trans_id and ac.approved
                   JOIN account_link al ON al.account_id = ac.chart_id
                                        AND al.description IN ('AR', 'AP')
 		 WHERE entity_credit_account = ?

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