From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 22 Nov 2010 17:01:09 +0000 (+0100)
Subject: retrieve_accounts: 'current_date' richtig in Queries einbauen
X-Git-Tag: release-2.6.2beta1~83
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=61763f2f039dc9e9c43b778fb51277d85c3e557c;p=kivitendo-erp.git

retrieve_accounts: 'current_date' richtig in Queries einbauen
---

diff --git a/SL/IC.pm b/SL/IC.pm
index 35718f602..f1840d8cb 100644
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -1467,8 +1467,8 @@ sub follow_account_chain {
 
   $form->{ACCOUNT_CHAIN_BY_ID} ||= {
     map { $_->{id} => $_ }
-      selectall_hashref_query($form, $dbh, <<SQL, $transdate) };
-    SELECT c.id, c.new_chart_id, date(?) >= c.valid_from AS is_valid, cnew.accno
+      selectall_hashref_query($form, $dbh, <<SQL) };
+    SELECT c.id, c.new_chart_id, ${transdate} >= c.valid_from AS is_valid, cnew.accno
     FROM chart c
     LEFT JOIN chart cnew ON c.new_chart_id = cnew.id
     WHERE NOT c.new_chart_id IS NULL AND (c.new_chart_id > 0)
@@ -1518,7 +1518,7 @@ sub retrieve_accounts {
   if ($transdate eq "") {
     $transdate = "current_date";
   } else {
-    $transdate = $dbh->quote($transdate);
+    $transdate = 'date(' . $dbh->quote($transdate) . ')';
   }
   #/transdate
   my $inc_exp = $form->{"vc"} eq "customer" ? "income_accno_id" : "expense_accno_id";
@@ -1551,7 +1551,7 @@ SQL
     WHERE t.id IN
       (SELECT tk.tax_id
        FROM taxkeys tk
-       WHERE tk.chart_id = ? AND startdate <= ?
+       WHERE tk.chart_id = ? AND startdate <= ${transdate}
        ORDER BY startdate DESC LIMIT 1)
 SQL
 
@@ -1569,7 +1569,7 @@ SQL
 
     $form->{"${_}_accno_$index"} = $accounts{"${_}_accno"} for qw(inventory income expense);
 
-    $sth_tax->execute($accounts{$inc_exp}, quote_db_date($transdate));
+    $sth_tax->execute($accounts{$inc_exp});
     $ref = $sth_tax->fetchrow_hashref or next;
 
     $form->{"taxaccounts_$index"} = $ref->{"accno"};