Skip to content
Snippets Groups Projects
Commit 6c769cfa authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix: postgresql compatibility

Qual: Removed deprecated code
parent 49e79a2c
No related branches found
No related tags found
No related merge requests found
......@@ -67,9 +67,6 @@ abstract class DolibarrModules
$this->db->begin();
// Insert line in module table
if (! $err) $err+=$this->_dbactive();
// Insert activation module constant
if (! $err) $err+=$this->_active();
......@@ -161,9 +158,6 @@ abstract class DolibarrModules
$this->db->begin();
// Remove line in activation module (entry in table llx_dolibarr_modules)
if (! $err) $err+=$this->_dbunactive();
// Remove activation module line (constant MAIN_MODULE_MYMODULE in llx_const)
if (! $err) $err+=$this->_unactive();
......@@ -346,69 +340,6 @@ abstract class DolibarrModules
}
}
/**
* Insert line in dolibarr_modules table.
* Storage is made for information only, table is not required for Dolibarr usage
*
* @return int Nb of errors (0 if OK)
*/
function _dbactive()
{
global $conf;
$err = 0;
$sql = "DELETE FROM ".MAIN_DB_PREFIX."dolibarr_modules";
$sql.= " WHERE numero = ".$this->numero;
$sql.= " AND entity = ".$conf->entity;
dol_syslog(get_class($this)."::_dbactive sql=".$sql, LOG_DEBUG);
$this->db->query($sql);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."dolibarr_modules (";
$sql.= "numero";
$sql.= ", entity";
$sql.= ", active";
$sql.= ", active_date";
$sql.= ", active_version";
$sql.= ")";
$sql.= " VALUES (";
$sql.= $this->numero;
$sql.= ", ".$conf->entity;
$sql.= ", 1";
$sql.= ", '".$this->db->idate(dol_now())."'";
$sql.= ", '".$this->version."'";
$sql.= ")";
dol_syslog(get_class($this)."::_dbactive sql=".$sql, LOG_DEBUG);
$this->db->query($sql);
return $err;
}
/**
* Remove line in dolibarr_modules table
* Storage is made for information only, table is not required for Dolibarr usage
*
* @return int Nb of errors (0 if OK)
*/
function _dbunactive()
{
global $conf;
$err = 0;
$sql = "DELETE FROM ".MAIN_DB_PREFIX."dolibarr_modules";
$sql.= " WHERE numero = ".$this->numero;
$sql.= " AND entity IN (0, ".$conf->entity.")";
dol_syslog(get_class($this)."::_dbunactive sql=".$sql, LOG_DEBUG);
$this->db->query($sql);
return $err;
}
/**
* Insert constant to activate module
......
This diff is collapsed.
INSERT INTO llx_holiday_config (rowid ,name ,value) VALUES (NULL , 'userGroup', NULL);
INSERT INTO llx_holiday_config (rowid ,name ,value) VALUES (NULL , 'lastUpdate', NULL);
INSERT INTO llx_holiday_config (rowid ,name ,value) VALUES (NULL , 'nbUser', NULL);
INSERT INTO llx_holiday_config (rowid ,name ,value) VALUES (NULL , 'delayForRequest', '31');
INSERT INTO llx_holiday_config (rowid ,name ,value) VALUES (NULL , 'AlertValidatorDelay', '0');
INSERT INTO llx_holiday_config (rowid ,name ,value) VALUES (NULL , 'AlertValidatorSolde', '0');
INSERT INTO llx_holiday_config (rowid ,name ,value) VALUES (NULL , 'nbHolidayDeducted', '1');
INSERT INTO llx_holiday_config (rowid ,name ,value) VALUES (NULL , 'nbHolidayEveryMonth', '2.08334');
INSERT INTO llx_holiday_config (name ,value) VALUES ('userGroup', NULL);
INSERT INTO llx_holiday_config (name ,value) VALUES ('lastUpdate', NULL);
INSERT INTO llx_holiday_config (name ,value) VALUES ('nbUser', NULL);
INSERT INTO llx_holiday_config (name ,value) VALUES ('delayForRequest', '31');
INSERT INTO llx_holiday_config (name ,value) VALUES ('AlertValidatorDelay', '0');
INSERT INTO llx_holiday_config (name ,value) VALUES ('AlertValidatorSolde', '0');
INSERT INTO llx_holiday_config (name ,value) VALUES ('nbHolidayDeducted', '1');
INSERT INTO llx_holiday_config (name ,value) VALUES ('nbHolidayEveryMonth', '2.08334');
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment