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

Fix some warning during install

Browse Source
This commit is contained in:
Laurent Destailleur 2018-02-24 11:58:09 +01:00
parent 812911bd44
commit 435e4823a5
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/commonobject.class.php
View File

@ -4428,7 +4428,7 @@ abstract class CommonObject
}
else
{
dol_syslog("Warning: fetch_optionals was called with param $optionsArray defined when you should pass null now", LOG_WARNING);
dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING);
}
$table_element = $this->table_element;
@ -4463,7 +4463,7 @@ abstract class CommonObject
if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key))
{
// we can add this attribute to object
if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date','datetime')))
if (! empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date','datetime')))
{
//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
$this->array_options["options_".$key]=$this->db->jdate($value);

2
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
View File

@ -321,6 +321,8 @@ CREATE TABLE IF NOT EXISTS llx_expensereport_ik (
active integer DEFAULT 1
)ENGINE=innodb;
ALTER TABLE llx_expensereport_ik ADD COLUMN ikoffset double DEFAULT 0 NOT NULL;
CREATE TABLE IF NOT EXISTS llx_c_exp_tax_cat (
rowid integer AUTO_INCREMENT PRIMARY KEY,
label varchar(48) NOT NULL,

2
htdocs/install/step1.php
View File

@ -491,7 +491,7 @@ if (! $error && $db->connected && $action == "set")
'thirdparties' => 'thirdparty',
'usergroups' => 'usergroups',
'users' => 'user',
'usergroups' => 'usergroups',
'usergroups' => 'usergroups',
);
foreach($docs as $cursordir => $cursorfile)
{