lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: pgsql compatibility

Browse Source
This commit is contained in:
eldy 2011-09-11 03:05:29 +02:00
parent feb4fa7c72
commit ae913053cb
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/install/mysql/migration/3.0.0-3.1.0.sql
View File

@ -487,3 +487,6 @@ 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 sourcetype varchar(32) NOT NULL;
ALTER TABLE llx_element_element MODIFY targettype varchar(32) NOT NULL; 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;

2
htdocs/install/mysql/tables/llx_societe_prices.sql
View File

@ -21,7 +21,7 @@ create table llx_societe_prices
( (
rowid integer AUTO_INCREMENT PRIMARY KEY, rowid integer AUTO_INCREMENT PRIMARY KEY,
fk_soc integer DEFAULT 0, fk_soc integer DEFAULT 0,
tms timestamp NOT NULL, tms timestamp,
datec datetime, datec datetime,
fk_user_author integer, fk_user_author integer,
price_level tinyint DEFAULT 1 price_level tinyint DEFAULT 1

6
htdocs/societe/class/societe.class.php
View File

@ -1329,15 +1329,17 @@ class Societe extends CommonObject
{ {
if ($this->id) if ($this->id)
{ {
$now=dol_now();
$sql = "UPDATE ".MAIN_DB_PREFIX."societe "; $sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
$sql .= " SET price_level = '".$price_level."'"; $sql .= " SET price_level = '".$price_level."'";
$sql .= " WHERE rowid = " . $this->id .";"; $sql .= " WHERE rowid = " . $this->id;
$this->db->query($sql); $this->db->query($sql);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_prices "; $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_prices ";
$sql .= " ( datec, fk_soc, price_level, fk_user_author )"; $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) ) if (! $this->db->query($sql) )
{ {