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

Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0

Browse Source
This commit is contained in:
florian HENRY 2018-03-29 09:36:05 +02:00
commit cc7deb0add
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6114,7 +6114,7 @@ abstract class CommonObject
* *
* @return array * @return array
*/ */
protected function set_save_query() protected function setSaveQuery()
{ {
global $conf; global $conf;
@ -6213,7 +6213,7 @@ abstract class CommonObject
* *
* @return string * @return string
*/ */
protected function get_field_list() protected function getFieldList()
{ {
$keys = array_keys($this->fields); $keys = array_keys($this->fields);
return implode(',', $keys); return implode(',', $keys);
@ -6248,7 +6248,7 @@ abstract class CommonObject
$now=dol_now(); $now=dol_now();
$fieldvalues = $this->set_save_query(); $fieldvalues = $this->setSaveQuery();
if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation']=$this->db->idate($now); if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation']=$this->db->idate($now);
if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat']=$user->id; if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat']=$user->id;
unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert. unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
@ -6340,7 +6340,7 @@ abstract class CommonObject
{ {
if (empty($id) && empty($ref)) return false; if (empty($id) && empty($ref)) return false;
$sql = 'SELECT '.$this->get_field_list(); $sql = 'SELECT '.$this->getFieldList();
$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element; $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
if(!empty($id)) $sql.= ' WHERE rowid = '.$id; if(!empty($id)) $sql.= ' WHERE rowid = '.$id;
@ -6383,7 +6383,7 @@ abstract class CommonObject
$now=dol_now(); $now=dol_now();
$fieldvalues = $this->set_save_query(); $fieldvalues = $this->setSaveQuery();
if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification']=$this->db->idate($now); if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification']=$this->db->idate($now);
if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif']=$user->id; if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif']=$user->id;
unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into update. unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.