From d186aed96cfcff171a936b7b1d8b424e82e3d108 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 27 Jun 2017 18:23:27 +0200 Subject: [PATCH] Fix: date must be stored into a date field (error with pgsql). import_key is reserved for "import" process. --- htdocs/accountancy/class/bookkeeping.class.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php index 843e15a5dd7..51ef317e917 100644 --- a/htdocs/accountancy/class/bookkeeping.class.php +++ b/htdocs/accountancy/class/bookkeeping.class.php @@ -270,7 +270,7 @@ class BookKeeping extends CommonObject $sql .= ", montant"; $sql .= ", sens"; $sql .= ", fk_user_author"; - $sql .= ", import_key"; + $sql .= ", date_creation"; $sql .= ", code_journal"; $sql .= ", journal_label"; $sql .= ", piece_num"; @@ -430,6 +430,11 @@ class BookKeeping extends CommonObject if (empty($this->debit)) $this->debit = 0; if (empty($this->credit)) $this->credit = 0; + $now = dol_now(); + if (empty($this->date_create)) { + $this->date_create = $now; + } + // Check parameters // Put here code to add control on parameters values @@ -451,7 +456,7 @@ class BookKeeping extends CommonObject $sql .= 'montant,'; $sql .= 'sens,'; $sql .= 'fk_user_author,'; - $sql .= 'import_key,'; + $sql .= 'date_creation,'; $sql .= 'code_journal,'; $sql .= 'journal_label,'; $sql .= 'piece_num,'; @@ -473,7 +478,7 @@ class BookKeeping extends CommonObject $sql .= ' ' . (! isset($this->montant) ? 'NULL' : $this->montant ). ','; $sql .= ' ' . (! isset($this->sens) ? 'NULL' : "'" . $this->db->escape($this->sens) . "'") . ','; $sql .= ' ' . $user->id . ','; - $sql .= ' ' . (! isset($this->import_key) ? 'NULL' : "'" . $this->db->escape($this->import_key) . "'") . ','; + $sql .= ' ' . "'" . $this->db->idate($this->date_create) . "',"; $sql .= ' ' . (empty($this->code_journal) ? 'NULL' : "'" . $this->db->escape($this->code_journal) . "'") . ','; $sql .= ' ' . (empty($this->journal_label) ? 'NULL' : "'" . $this->db->escape($this->journal_label) . "'") . ','; $sql .= ' ' . (empty($this->piece_num) ? 'NULL' : $this->db->escape($this->piece_num)).',';