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

[..hidden..]

Revision: 5783
          http://sourceforge.net/p/ledger-smb/code/5783
Author:   einhverfr
Date:     2013-05-14 04:36:49 +0000 (Tue, 14 May 2013)
Log Message:
-----------
Merging reconciliation fix from trunk

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/sql/modules/Reconciliation.sql
    branches/1.3/tools/pre-release-tests.sh

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-05-14 04:15:26 UTC (rev 5782)
+++ branches/1.3/Changelog	2013-05-14 04:36:49 UTC (rev 5783)
@@ -15,6 +15,7 @@
 * Added fx boxes for GL transactions (Chris T, required to fix 802)
 * Fixed odd UI issues with voiding GL transactions (Chris T, 803)
 * Fixed department dropdown not showing values (Chris T, 805)
+* Fixed error causing Reconciliation.sql not to be loaded/reloaded (Chris T)
 
 
 Nick P is Nick Prater

Modified: branches/1.3/sql/modules/Reconciliation.sql
===================================================================
--- branches/1.3/sql/modules/Reconciliation.sql	2013-05-14 04:15:26 UTC (rev 5782)
+++ branches/1.3/sql/modules/Reconciliation.sql	2013-05-14 04:36:49 UTC (rev 5783)
@@ -336,7 +336,7 @@
                                 AND our_balance = t_amount
                         	AND their_balance = 0
                                 AND post_date = in_date
-				in_scn NOT LIKE t_prefix || '%';
+				AND in_scn NOT LIKE t_prefix || '%';
 		ELSE -- more than one match
 			SELECT min(id) INTO lid FROM cr_report_line
 			WHERE report_id = in_report_id AND our_balance = t_amount

Modified: branches/1.3/tools/pre-release-tests.sh
===================================================================
--- branches/1.3/tools/pre-release-tests.sh	2013-05-14 04:15:26 UTC (rev 5782)
+++ branches/1.3/tools/pre-release-tests.sh	2013-05-14 04:36:49 UTC (rev 5783)
@@ -4,4 +4,6 @@
 
 rm -f /tmp/ledgersmb/dblog*
 
+PGUSER=postgres PGPASSWORD=test dropdb -U postgres lsmb13installtest
+
 PGUSER=postgres PGPASSWORD=test LSMB_TEST_DB=1 LSMB_NEW_DB=lsmb13installtest make test

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