X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FOE.pm;h=c5e36654dc57fe0c37243e4475a674694ee1f56c;hb=5e49b259ece6c5e4aa80e9c775a894972a139547;hp=5dc3128f51074df67b5d4d29094dc79b4075d75a;hpb=2e5a8be3ab917a1ae8c748f0840491f05770d397;p=kivitendo-erp.git

diff --git a/SL/OE.pm b/SL/OE.pm
index 5dc3128f5..c5e36654d 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -872,9 +872,9 @@ sub retrieve {
       $accno_id =
         ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};
       $query = qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber
-	         FROM tax t LEFT JOIN chart c ON (c.id=t.chart_id)
-	         WHERE t.taxkey in (SELECT taxkey_id from chart where accno = '$accno_id')
-	         ORDER BY accno|;
+	      FROM tax t LEFT JOIN chart c on (c.id=t.chart_id)
+	      WHERE t.id in (SELECT tk.tax_id from taxkeys tk where tk.chart_id = (SELECT id from chart WHERE accno='$accno_id') AND startdate<=$transdate ORDER BY startdate desc LIMIT 1)
+	      ORDER BY c.accno|;
       $stw = $dbh->prepare($query);
       $stw->execute || $form->dberror($query);
       $ref->{taxaccounts} = "";