From 4cbc1e012d126f3cb158fcb32a26594bc17a5b09 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 5 Jul 2025 10:51:22 +0200 Subject: [PATCH] Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop --- htdocs/comm/propal/card.php | 1 + htdocs/comm/propal/class/propal.class.php | 1 + 2 files changed, 2 insertions(+) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 5d0353245d7..5ec0925e52c 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -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'); diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 32e44dc58f0..4d69cbf17ae 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -197,6 +197,7 @@ class Propal extends CommonObject /** * @var User user identified by user_author_id + * @deprecated Set only $user_author_id */ public $author;