From 67f231f1e6bd19b41d7604afbf389d867ccef556 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 11 Sep 2011 01:02:13 +0000 Subject: [PATCH] Fix: pgsql compatibility --- htdocs/install/mysql/migration/3.0.0-3.1.0.sql | 5 ++++- htdocs/societe/class/societe.class.php | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql index 1de2e5617aa..931a1e1c12f 100755 --- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql +++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql @@ -484,4 +484,7 @@ ALTER TABLE llx_don ADD phone varchar(24) after email; ALTER TABLE llx_user ADD civilite varchar(6) after entity; ALTER TABLE llx_element_element MODIFY sourcetype varchar(32) NOT NULL; -ALTER TABLE llx_element_element MODIFY targettype varchar(32) NOT NULL; \ No newline at end of file +ALTER TABLE llx_element_element MODIFY targettype varchar(32) NOT NULL; + +ALTER TABLE llx_societe_prices MODIFY tms timestamp NULL; +-- ALTER TABLE llx_societe_prices ALTER COLUMN tms DROP NOT NULL; diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index b766c82ac11..d778ad4b619 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1347,15 +1347,17 @@ class Societe extends CommonObject { if ($this->id) { + $now=dol_now(); + $sql = "UPDATE ".MAIN_DB_PREFIX."societe "; $sql .= " SET price_level = '".$price_level."'"; - $sql .= " WHERE rowid = " . $this->id .";"; + $sql .= " WHERE rowid = " . $this->id; $this->db->query($sql); $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_prices "; $sql .= " ( datec, fk_soc, price_level, fk_user_author )"; - $sql .= " VALUES (".$this->db->idate(mktime()).",".$this->id.",'".$price_level."',".$user->id.")"; + $sql .= " VALUES ('".$this->db->idate($now)."',".$this->id.",'".$price_level."',".$user->id.")"; if (! $this->db->query($sql) ) {