X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=c6fd5744ae10c2ce3f719768ff18f5d53b425551;hb=67ca0f93194b1d0c8f0a3d090c6c1f604670837d;hp=f966a2d6f946787dc7ccdcb70af3d2741d142e4f;hpb=ee2b1ef305f1723d7ad39a44e195c7e15f8af810;p=kivitendo-erp.git

diff --git a/SL/Form.pm b/SL/Form.pm
index f966a2d6f..c6fd5744a 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2812,7 +2812,14 @@ sub create_links {
          FROM acc_trans a
          LEFT JOIN chart c ON (c.id = a.chart_id)
          LEFT JOIN project p ON (p.id = a.project_id)
-         LEFT JOIN tax t ON (t.id= a.tax_id)
+         LEFT JOIN tax t ON (t.id= (SELECT tk.tax_id FROM taxkeys tk
+                                    WHERE (tk.taxkey_id=a.taxkey) AND
+                                      ((CASE WHEN a.chart_id IN (SELECT chart_id FROM taxkeys WHERE taxkey_id = a.taxkey)
+                                        THEN tk.chart_id = a.chart_id
+                                        ELSE 1 = 1
+                                        END)
+                                       OR (c.link='%tax%')) AND
+                                      (startdate <= a.transdate) ORDER BY startdate DESC LIMIT 1))
          WHERE a.trans_id = ?
          AND a.fx_transaction = '0'
          ORDER BY a.acc_trans_id, a.transdate|;