From f08c91fcc6c7c603b05c1ff6b7b4a17270d4635d Mon Sep 17 00:00:00 2001 From: bahfir abbes Date: Wed, 9 Sep 2020 09:14:02 +0100 Subject: [PATCH 1/5] fix: replace values of __YEAR__, __MONTH__ and __DAY__ in member docs --- htdocs/core/modules/member/doc/pdf_standard.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php index 0051862d52e..bcab63940c0 100644 --- a/htdocs/core/modules/member/doc/pdf_standard.class.php +++ b/htdocs/core/modules/member/doc/pdf_standard.class.php @@ -267,9 +267,9 @@ class pdf_standard extends CommonStickerGenerator '__EMAIL__'=>$object->email, '__BIRTH__'=>dol_print_date($object->birth, 'day'), '__TYPE__'=>$object->type, - '__YEAR__'=>$year, - '__MONTH__'=>$month, - '__DAY__'=>$day, + '__YEAR__'=>date('Y', dol_now()), + '__MONTH__'=>date('m', dol_now()), + '__DAY__'=>date('d', dol_now()), '__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT, '__SERVER__'=>"http://".$_SERVER["SERVER_NAME"]."/" ); From 229aa14a9731b5543b767f807e9b8d6ae296a85a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 9 Sep 2020 14:43:24 +0200 Subject: [PATCH 2/5] Update pdf_standard.class.php --- htdocs/core/modules/member/doc/pdf_standard.class.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php index bcab63940c0..590bd72f5c5 100644 --- a/htdocs/core/modules/member/doc/pdf_standard.class.php +++ b/htdocs/core/modules/member/doc/pdf_standard.class.php @@ -251,6 +251,10 @@ class pdf_standard extends CommonStickerGenerator { if ($object->country == '-') $object->country = ''; + $year = date('Y', dol_now()) + $month = date('m', dol_now()) + $day = date('d', dol_now()) + // List of values to scan for a replacement $substitutionarray = array( '__ID__' => $object->id, @@ -267,9 +271,9 @@ class pdf_standard extends CommonStickerGenerator '__EMAIL__'=>$object->email, '__BIRTH__'=>dol_print_date($object->birth, 'day'), '__TYPE__'=>$object->type, - '__YEAR__'=>date('Y', dol_now()), - '__MONTH__'=>date('m', dol_now()), - '__DAY__'=>date('d', dol_now()), + '__YEAR__'=>$year, + '__MONTH__'=>$month, + '__DAY__'=>$day, '__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT, '__SERVER__'=>"http://".$_SERVER["SERVER_NAME"]."/" ); From 4b783d203e58a52a4f3a8c6fa3a172fc3aa93767 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 9 Sep 2020 14:44:09 +0200 Subject: [PATCH 3/5] Update pdf_standard.class.php --- htdocs/core/modules/member/doc/pdf_standard.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php index 590bd72f5c5..d6d60d7b149 100644 --- a/htdocs/core/modules/member/doc/pdf_standard.class.php +++ b/htdocs/core/modules/member/doc/pdf_standard.class.php @@ -271,7 +271,7 @@ class pdf_standard extends CommonStickerGenerator '__EMAIL__'=>$object->email, '__BIRTH__'=>dol_print_date($object->birth, 'day'), '__TYPE__'=>$object->type, - '__YEAR__'=>$year, + '__YEAR__'=>$year, '__MONTH__'=>$month, '__DAY__'=>$day, '__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT, From 221c54c16f4d8133358e03fafb8894abe7f276f7 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Wed, 9 Sep 2020 12:46:25 +0000 Subject: [PATCH 4/5] Fixing style errors. --- htdocs/core/modules/member/doc/pdf_standard.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php index d6d60d7b149..37a9a924548 100644 --- a/htdocs/core/modules/member/doc/pdf_standard.class.php +++ b/htdocs/core/modules/member/doc/pdf_standard.class.php @@ -254,7 +254,7 @@ class pdf_standard extends CommonStickerGenerator $year = date('Y', dol_now()) $month = date('m', dol_now()) $day = date('d', dol_now()) - + // List of values to scan for a replacement $substitutionarray = array( '__ID__' => $object->id, From b99192bdb28e6a6f91ccf9e6a854db52785c02a7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 9 Sep 2020 14:46:42 +0200 Subject: [PATCH 5/5] Update pdf_standard.class.php --- htdocs/core/modules/member/doc/pdf_standard.class.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php index 37a9a924548..23e25c92590 100644 --- a/htdocs/core/modules/member/doc/pdf_standard.class.php +++ b/htdocs/core/modules/member/doc/pdf_standard.class.php @@ -251,10 +251,11 @@ class pdf_standard extends CommonStickerGenerator { if ($object->country == '-') $object->country = ''; - $year = date('Y', dol_now()) - $month = date('m', dol_now()) - $day = date('d', dol_now()) - + $now = dol_now(); + $year = dol_print_date($now, '%Y'); + $month = dol_print_date($now, '%m'); + $day = dol_print_date($now, '%d'); + // List of values to scan for a replacement $substitutionarray = array( '__ID__' => $object->id,