Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0

Browse Source
This commit is contained in:
Laurent Destailleur
2024-03-01 19:02:16 +01:00
parent 0140f5057d ce4dc610ed
commit aaae1aad67
4 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -619,6 +619,19 @@ abstract class CommonObject
public $user_modification_id;
/**
* @var int ID
* @deprecated Use $user_creation_id
*/
public $fk_user_creat;
/**
* @var int ID
* @deprecated Use $user_modification_id
*/
public $fk_user_modif;
public $next_prev_filter;
/**
@@ -9058,9 +9071,9 @@ abstract class CommonObject
/**
* Function to prepare a part of the query for insert by returning an array with all properties of object.
* Function to return the array of data key-value from the ->fields and all the ->properties of an object.
*
* Note $this->${field} are set by the page that make the createCommon() or the updateCommon().
* Note: $this->${field} are set by the page that make the createCommon() or the updateCommon().
* $this->${field} should be a clean and string value (so date are formated for SQL insert).
*
* @return array Array with all values of each properties to update
@@ -9263,6 +9276,11 @@ abstract class CommonObject
}
if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) {
$fieldvalues['fk_user_creat'] = $user->id;
$this->fk_user_creat = $user->id;
}
if (array_key_exists('user_modification_id', $fieldvalues) && !($fieldvalues['user_modification_id'] > 0)) {
$fieldvalues['user_modification_id'] = $user->id;
$this->user_modification_id = $user->id;
}
unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
if (array_key_exists('ref', $fieldvalues)) {