From cbebaf93b5864f5314ccee0ebc0a235d2d58b662 Mon Sep 17 00:00:00 2001 From: Philip Reetz Date: Wed, 6 Jun 2007 07:58:32 +0000 Subject: [PATCH] Mehrere Fehler in der Kontenuebersicht behoben --- SL/CA.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/SL/CA.pm b/SL/CA.pm index 3df961307..089bcdc19 100644 --- a/SL/CA.pm +++ b/SL/CA.pm @@ -266,8 +266,9 @@ sub all_transactions { $dpt_join . qq|WHERE | . $where . $dpt_where . $project . qq| AND ac.chart_id = ? | . + qq| AND ac.trans_id = a.id | . - qq|UNION | . + qq|UNION ALL | . qq|SELECT a.id, a.invnumber, c.name, ac.transdate, | . qq| a.invoice, ac.amount, 'ar' as module | . @@ -276,9 +277,10 @@ sub all_transactions { qq|WHERE | . $where . $dpt_where . $project . qq| AND ac.chart_id = ? | . qq| AND NOT a.storno | . + qq| AND ac.trans_id = a.id | . qq| AND a.customer_id = c.id | . - qq|UNION | . + qq|UNION ALL | . qq|SELECT a.id, a.invnumber, v.name, ac.transdate, | . qq| a.invoice, ac.amount, 'ap' as module | . @@ -286,6 +288,7 @@ sub all_transactions { $dpt_join . qq|WHERE | . $where . $dpt_where . $project . qq| AND ac.chart_id = ? | . + qq| AND ac.trans_id = a.id | . qq| AND NOT a.storno | . qq| AND a.vendor_id = v.id |; -- 2.20.1