From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 12 May 2009 12:14:42 +0000 (+0000)
Subject: Überreste aus altem Query sorgen für ungültige SQL-Abfrage. Fix für Bug 966.
X-Git-Tag: release-2.6.0rc1~84
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=6d70c6a247b5046219d135f29d1cf0066b53ee9b;p=kivitendo-erp.git

Überreste aus altem Query sorgen für ungültige SQL-Abfrage. Fix für Bug 966.
---

diff --git a/SL/GL.pm b/SL/GL.pm
index bdd4bcdda..db9d9aec9 100644
--- a/SL/GL.pm
+++ b/SL/GL.pm
@@ -346,8 +346,7 @@ sub all_transactions {
     qq|SELECT
         ac.acc_trans_id, g.id, 'gl' AS type, $false AS invoice, g.reference, ac.taxkey, c.link,
         g.description, ac.transdate, ac.source, ac.trans_id,
-        ac.amount, c.accno, g.notes, t.chart_id,
-        CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee
+        ac.amount, c.accno, g.notes, t.chart_id
         $project_columns
         $columns_for_sorting{gl}
       FROM gl g, acc_trans ac $project_join, chart c
@@ -360,8 +359,7 @@ sub all_transactions {
 
       SELECT ac.acc_trans_id, a.id, 'ar' AS type, a.invoice, a.invnumber, ac.taxkey, c.link,
         ct.name, ac.transdate, ac.source, ac.trans_id,
-        ac.amount, c.accno, a.notes, t.chart_id,
-        CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee
+        ac.amount, c.accno, a.notes, t.chart_id
         $project_columns
         $columns_for_sorting{arap}
       FROM ar a, acc_trans ac $project_join, customer ct, chart c
@@ -375,8 +373,7 @@ sub all_transactions {
 
       SELECT ac.acc_trans_id, a.id, 'ap' AS type, a.invoice, a.invnumber, ac.taxkey, c.link,
         ct.name, ac.transdate, ac.source, ac.trans_id,
-        ac.amount, c.accno, a.notes, t.chart_id,
-        CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee
+        ac.amount, c.accno, a.notes, t.chart_id
         $project_columns
         $columns_for_sorting{arap}
       FROM ap a, acc_trans ac $project_join, vendor ct, chart c