From a848019d54be2f3c3546b8d0f6860a4c9d9c01ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 6 May 2024 22:57:54 +0200 Subject: [PATCH 1/3] set extrafield type as optional (#29615) this extrafield type feature is incomplete --- htdocs/core/class/extrafields.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 99c468ce31d..c06ddaaea55 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -2565,7 +2565,7 @@ class ExtraFields } /** - * Return array with all possible types and label of extrafields + * Return array with all possible types and labels of extrafields * * @return string[] */ @@ -2579,6 +2579,9 @@ class ExtraFields $type2label[$key] = $langs->transnoentitiesnoconv($val); } + if (!getDolGlobalString('MAIN_USE_EXTRAFIELDS_ICON')) { + unset($type2label['icon']); + } if (!getDolGlobalString('MAIN_USE_GEOPHP')) { unset($type2label['point']); unset($type2label['multipts']); From 6842e28b5e5f993301c58f49b29f3f893b22aa7b Mon Sep 17 00:00:00 2001 From: Sami Filali <139965072+samifilali@users.noreply.github.com> Date: Mon, 6 May 2024 23:01:17 +0200 Subject: [PATCH 2/3] update (#29613) Co-authored-by: Laurent Destailleur --- htdocs/core/tpl/extrafields_list_print_fields.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php index 3729c2c1f4a..5b433b732a6 100644 --- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php +++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php @@ -34,7 +34,7 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield } $value = $datenotinstring; } else { - $value = (!empty($obj->$tmpkey) ? $obj->$tmpkey : ''); + $value = (isset($obj->$tmpkey) ? $obj->$tmpkey : ''); } // If field is a computed field, we make computation to get value if ($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]) { From e7d83acccdf720396bf313da1f09d553b8f5ebb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 6 May 2024 23:02:11 +0200 Subject: [PATCH 3/3] Update dynamic_translation_keys.lst (#29612) * Update dynamic_translation_keys.lst * Update ignore_translation_keys.lst * Update dynamic_translation_keys.lst * Update ignore_translation_keys.lst * Update admin.lang --- dev/translation/dynamic_translation_keys.lst | 3 +++ dev/translation/ignore_translation_keys.lst | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dev/translation/dynamic_translation_keys.lst b/dev/translation/dynamic_translation_keys.lst index 70460bacb3d..d5f8f42e97f 100644 --- a/dev/translation/dynamic_translation_keys.lst +++ b/dev/translation/dynamic_translation_keys.lst @@ -2409,6 +2409,8 @@ ResetSms ResourceNotAssignedToTheTask ResourcePageIndex ResourceTypeCode +ResourceTypeID +ResourceTypeLabel ResponsibleOfRecruitement Rest RestOfEurope @@ -3172,6 +3174,7 @@ descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE +descWORKFLOW_SUM_INVOICES_AMOUNT_CLASSIFY_BILLED_ORDER descWORKFLOW_TICKET_CLOSE_INTERVENTION descWORKFLOW_TICKET_CREATE_INTERVENTION descWORKFLOW_TICKET_LINK_CONTRACT diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst index c8797ba190b..6b4e677bc6d 100644 --- a/dev/translation/ignore_translation_keys.lst +++ b/dev/translation/ignore_translation_keys.lst @@ -46,6 +46,7 @@ InstallChoiceRecommanded IsInPackage MailNoChangePossible MailSentBy +MaxNbOfLinesForBoxes ModuleBuilderDesc2 ModulesMarketPlaceDesc MoveField @@ -68,7 +69,9 @@ ThirdPartyCustomersWithIdProf12 TicketPublicInfoCreateTicket TitreRequestCP UseAsciiDocFormat +UsePassword ViewPageInNewTab +WEBSITE_PAGE_EXAMPLE YourTicketSuccessfullySaved # # ██████╗ █████╗ ██████╗ ████████╗██████╗