From 67ada4bc9c67e0fe72894400065d848b597eb4ef Mon Sep 17 00:00:00 2001 From: HYWZ Date: Tue, 14 Feb 2023 10:46:13 +0300 Subject: [PATCH 1/3] add on common doc generator user attributs Add attributs : * myuser_birth * myuser_dateemployment * myuser_dateemploymentend * myuser_gender --- htdocs/core/class/commondocgenerator.class.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 33d5e5a97c6..1cd9eb9f05b 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -145,7 +145,11 @@ abstract class CommonDocGenerator 'myuser_email'=>$user->email, 'myuser_logo'=>$logotouse, 'myuser_job'=>$user->job, - 'myuser_web'=>'' // url not exist in $user object + 'myuser_web'=>'' // url not exist in $user object, + 'myuser_birth'=>dol_print_date($user->birth, 'day', 'tzuser'), + 'myuser_dateemployment'=>dol_print_date($user->dateemployment, 'day', 'tzuser'), + 'myuser_dateemploymentend'=>dol_print_date($user->dateemploymentend, 'day', 'tzuser'), + 'myuser_gender'=>$user->gender, ); // Retrieve extrafields if (is_array($user->array_options) && count($user->array_options)) { From 8deecaff98e5b3a1372cb86c590434de59fc4ddd Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Tue, 14 Feb 2023 07:48:26 +0000 Subject: [PATCH 2/3] Fixing style errors. --- htdocs/core/class/commondocgenerator.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 1cd9eb9f05b..86ac881ec13 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -147,9 +147,9 @@ abstract class CommonDocGenerator 'myuser_job'=>$user->job, 'myuser_web'=>'' // url not exist in $user object, 'myuser_birth'=>dol_print_date($user->birth, 'day', 'tzuser'), - 'myuser_dateemployment'=>dol_print_date($user->dateemployment, 'day', 'tzuser'), - 'myuser_dateemploymentend'=>dol_print_date($user->dateemploymentend, 'day', 'tzuser'), - 'myuser_gender'=>$user->gender, + 'myuser_dateemployment'=>dol_print_date($user->dateemployment, 'day', 'tzuser'), + 'myuser_dateemploymentend'=>dol_print_date($user->dateemploymentend, 'day', 'tzuser'), + 'myuser_gender'=>$user->gender, ); // Retrieve extrafields if (is_array($user->array_options) && count($user->array_options)) { From 8df636c4f60352a185013d62af6d7f6930d36b66 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 16 Feb 2023 21:39:06 +0100 Subject: [PATCH 3/3] Update commondocgenerator.class.php --- htdocs/core/class/commondocgenerator.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 86ac881ec13..98cb306fdd9 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -146,7 +146,7 @@ abstract class CommonDocGenerator 'myuser_logo'=>$logotouse, 'myuser_job'=>$user->job, 'myuser_web'=>'' // url not exist in $user object, - 'myuser_birth'=>dol_print_date($user->birth, 'day', 'tzuser'), + 'myuser_birth'=>dol_print_date($user->birth, 'day', 'gmt'), 'myuser_dateemployment'=>dol_print_date($user->dateemployment, 'day', 'tzuser'), 'myuser_dateemploymentend'=>dol_print_date($user->dateemploymentend, 'day', 'tzuser'), 'myuser_gender'=>$user->gender,