From edd4565921d0da4f177244b15725e3464cea6874 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 27 Oct 2025 12:09:49 +0100 Subject: [PATCH 1/7] FIX wrong check of hook return --- htdocs/takepos/index.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php index c18da67daca..373948c64fa 100644 --- a/htdocs/takepos/index.php +++ b/htdocs/takepos/index.php @@ -1358,13 +1358,13 @@ if ($reshook == 0) { //add buttons $menus[$r++] = $butmenu; } } - } elseif ($reshook == 1) { - $r = 0; //replace buttons - if (is_array($hookmanager->resArray) ) { - foreach ($hookmanager->resArray as $resArray) { - foreach ($resArray as $butmenu) { - $menus[$r++] = $butmenu; - } + } +} elseif ($reshook == 1) { + $r = 0; //replace buttons + if (is_array($hookmanager->resArray) ) { + foreach ($hookmanager->resArray as $resArray) { + foreach ($resArray as $butmenu) { + $menus[$r++] = $butmenu; } } } From 2555b14f9cde73b3808e09173aecd04a2b43a49c Mon Sep 17 00:00:00 2001 From: tnegre Date: Thu, 3 Apr 2025 12:52:23 +0200 Subject: [PATCH 2/7] Fix listincsv on tab societe/price.php --- htdocs/societe/price.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php index 6ecf351c1ad..679052a3bc3 100644 --- a/htdocs/societe/price.php +++ b/htdocs/societe/price.php @@ -556,7 +556,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print ''; print '
'; - print ''; + print '
'; print ''; print ''; From dc7932700bfc5b24025fbe4eb76d0e99316e34db Mon Sep 17 00:00:00 2001 From: atm-GregM <85485123+atm-GregM@users.noreply.github.com> Date: Tue, 4 Nov 2025 12:25:57 +0100 Subject: [PATCH 3/7] Fix TICKET_ENABLE_PUBLIC_INTERFACE (#36073) --- .../triggers/interface_50_modTicket_TicketEmail.class.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php index 55e2bf42c8b..95600161561 100644 --- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php +++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php @@ -379,9 +379,11 @@ class InterfaceTicketEmail extends DolibarrTriggers $message = dol_nl2br($message); } $message_customer .= '

'.$langs->trans('Message').' :

'.$message.'


'; - $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/view.php' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id; - $message_customer .= '

'.$langs->trans($see_ticket).' : '.$url_public_ticket.'

'; - $message_customer .= '

'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'

'; + if (getDolGlobalInt('TICKET_ENABLE_PUBLIC_INTERFACE')){ + $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/view.php' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id; + $message_customer .= '

'.$langs->trans($see_ticket).' : '.$url_public_ticket.'

'; + $message_customer .= '

'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'

'; + } $from = (empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? '' : $conf->global->MAIN_INFO_SOCIETE_NOM.' ').'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>'; From a16f3bdf31409da9f00a9ad4b68531221ff57476 Mon Sep 17 00:00:00 2001 From: Florian Mortgat <50440633+atm-florianm@users.noreply.github.com> Date: Tue, 4 Nov 2025 13:06:58 +0100 Subject: [PATCH 4/7] FIX 16.0: extrafield of type link to category causes SQL error in selectForFormsList() (#36074) * FIX 16.0 (up to 19.0): extrafield of type link to category causes SQL error in selectForFormsList * Apply suggestion from @atm-florianm --- htdocs/core/class/html.form.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 59ad9db8377..beb884f39bc 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -7821,6 +7821,8 @@ class Form if ($tmpfieldstoshow) { $fieldstoshow = $tmpfieldstoshow; } + } else if ($objecttmp->element === 'category') { + $fieldstoshow = 't.label'; } else { // For backward compatibility $objecttmp->fields['ref'] = array('type'=>'varchar(30)', 'label'=>'Ref', 'showoncombobox'=>1); From 689b992afbf5f608c28a6abf784cd81c91a53dd4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 5 Nov 2025 22:40:50 +0100 Subject: [PATCH 5/7] Split tasks --- .github/workflows/pr-18.yaml | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr-18.yaml b/.github/workflows/pr-18.yaml index f13993e8a20..393e35013c0 100644 --- a/.github/workflows/pr-18.yaml +++ b/.github/workflows/pr-18.yaml @@ -39,13 +39,26 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Assign reviewer + - name: Assign Tag + env: + GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }} + url: ${{ github.event.pull_request.html_url }} + run: | + echo "env.url=${{env.url}}" + gh pr edit "${{env.url}}" --add-label "Issue for v18 maintenance Team" + + - name: Assign reviewer 1 + env: + GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }} + url: ${{ github.event.pull_request.html_url }} + run: | + echo "env.url=${{env.url}}" + gh pr edit "${{env.url}}" --add-reviewer lvessiller-opendsi + + - name: Assign reviewer 2 env: GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }} url: ${{ github.event.pull_request.html_url }} run: | echo "env.url=${{env.url}}" gh pr edit "${{env.url}}" --add-reviewer rycks - gh pr edit "${{env.url}}" --add-reviewer lvessiller-opendsi - #gh pr edit "${{env.url}}" --add-reviewer eldy - gh pr edit "${{env.url}}" --add-label "Issue for v18 maintenance Team" From 5fa475a07401bb97e11746615622e636e858b573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 7 Nov 2025 18:43:26 +0100 Subject: [PATCH 6/7] fix directory was always overwritten (#36148) --- htdocs/eventorganization/conferenceorbooth_document.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php index 742585ffb16..737b64606b2 100644 --- a/htdocs/eventorganization/conferenceorbooth_document.php +++ b/htdocs/eventorganization/conferenceorbooth_document.php @@ -84,6 +84,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen // Load object include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +$upload_dir = $conf->eventorganization->multidir_output[isset($object->entity) ? $object->entity : 1]; if ($id > 0 || !empty($ref)) { $upload_dir = $conf->eventorganization->multidir_output[$object->entity ? $object->entity : $conf->entity]."/conferenceorbooth/".get_exdir(0, 0, 0, 1, $object); } @@ -93,7 +94,6 @@ $permissiontoadd = $user->rights->eventorganization->write; // Used by the inclu $permissiontodelete = $user->rights->eventorganization->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT); $permissionnote = $user->rights->eventorganization->write; // Used by the include of actions_setnotes.inc.php $permissiondellink = $user->rights->eventorganization->write; // Used by the include of actions_dellink.inc.php -$upload_dir = $conf->eventorganization->multidir_output[isset($object->entity) ? $object->entity : 1]; // Security check if ($user->socid > 0) { From ea289728621b34fa2064f831d63f4822827a4757 Mon Sep 17 00:00:00 2001 From: Ryad ABANI <91743099+RyAbn@users.noreply.github.com> Date: Wed, 12 Nov 2025 15:44:40 +0100 Subject: [PATCH 7/7] FIX: dol_escape_htmltag in extrafields_view (#36136) Co-authored-by: Ryad ABANI --- htdocs/core/tpl/extrafields_view.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php index dfe2c7c6f3c..b5cbe7c519a 100644 --- a/htdocs/core/tpl/extrafields_view.tpl.php +++ b/htdocs/core/tpl/extrafields_view.tpl.php @@ -259,7 +259,7 @@ if (empty($reshook) && !empty($object->table_element) && isset($extrafields->att } else { //var_dump($tmpkeyextra.'-'.$value.'-'.$object->table_element); print $extrafields->showOutputField($tmpkeyextra, $value, '', $object->table_element); - print ''; // it's needed when to get parent value when extra-field list depend on parent extra-field list + print ''; // it's needed when to get parent value when extra-field list depend on parent extra-field list } print '';
'.$langs->trans("Ref").'