summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authoreinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2008-11-22 22:59:56 +0000
committereinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2008-11-22 22:59:56 +0000
commit44e66497c837e9218e9460873623495d1cf31bca (patch)
tree4ce80373c183c76a09af40ede28bd4d827283127 /sql
parent4119461903f06f70dde3a184af1244d7543dd7d0 (diff)
Correcting bad join which caused payable batches not to show up in batch details
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2416 4979c152-3d1c-0410-bac9-87ea11338e46
Diffstat (limited to 'sql')
-rw-r--r--sql/modules/Voucher.sql8
-rw-r--r--sql/modules/test/Voucher.sql3
2 files changed, 9 insertions, 2 deletions
diff --git a/sql/modules/Voucher.sql b/sql/modules/Voucher.sql
index 6ae6a5e2..b6ac7be9 100644
--- a/sql/modules/Voucher.sql
+++ b/sql/modules/Voucher.sql
@@ -57,7 +57,9 @@ BEGIN
a.amount, a.transdate, 'Payable'
FROM voucher v
JOIN ap a ON (v.trans_id = a.id)
- JOIN entity e ON (a.entity_id = e.id)
+ JOIN entity_credit_account eca
+ ON (eca.id = a.entity_credit_account)
+ JOIN entity e ON (eca.entity_id = e.id)
WHERE v.batch_id = in_batch_id
AND v.batch_class = (select id from batch_class
WHERE class = 'ap')
@@ -67,7 +69,9 @@ BEGIN
a.amount, a.transdate, 'Receivable'
FROM voucher v
JOIN ar a ON (v.trans_id = a.id)
- JOIN entity e ON (a.entity_id = e.id)
+ JOIN entity_credit_account eca
+ ON (eca.id = a.entity_credit_account)
+ JOIN entity e ON (eca.entity_id = e.id)
WHERE v.batch_id = in_batch_id
AND v.batch_class = (select id from batch_class
WHERE class = 'ar')
diff --git a/sql/modules/test/Voucher.sql b/sql/modules/test/Voucher.sql
index d749bf09..467d3d38 100644
--- a/sql/modules/test/Voucher.sql
+++ b/sql/modules/test/Voucher.sql
@@ -26,6 +26,9 @@ values (-5, currval('batch_id_seq'), 3);
INSERT INTO voucher (trans_id, batch_id, batch_class)
values (-5, currval('batch_id_seq'), 3);
+INSERT INTO test_result(test_name, success)
+select 'Voucher Seach finds Payable Vouchers', count(*)=1
+from voucher_list( currval('batch_id_seq')::int);
INSERT INTO test_result (test_name, success)
SELECT 'partial payment support', count(*) > 1