Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
parent
beac067e55
commit
4cbc1e012d
2 changed files with 2 additions and 0 deletions
|
|
@ -556,6 +556,7 @@ if (empty($reshook)) {
|
|||
$object->fk_project = GETPOSTINT('projectid');
|
||||
$object->model_pdf = GETPOST('model');
|
||||
$object->author = $user->id; // deprecated
|
||||
$object->user_author_id = $user->id;
|
||||
$object->note_private = GETPOST('note_private', 'restricthtml');
|
||||
$object->note_public = GETPOST('note_public', 'restricthtml');
|
||||
$object->fk_incoterms = GETPOSTINT('incoterm_id');
|
||||
|
|
|
|||
|
|
@ -197,6 +197,7 @@ class Propal extends CommonObject
|
|||
|
||||
/**
|
||||
* @var User user identified by user_author_id
|
||||
* @deprecated Set only $user_author_id
|
||||
*/
|
||||
public $author;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue