From 5c907df092dd581c25c749653ca2715efb35d52a Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Wed, 13 Dec 2023 14:52:40 +0100 Subject: [PATCH 1/2] clean altairis comments --- htdocs/core/class/html.formticket.class.php | 2 +- htdocs/ticket/class/ticket.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php index fe0f6c71e1f..7c4c1b06f08 100644 --- a/htdocs/core/class/html.formticket.class.php +++ b/htdocs/core/class/html.formticket.class.php @@ -546,7 +546,7 @@ class FormTicket // Customer or supplier if ($this->withcompany) { - // altairis: force company and contact id for external user + // force company and contact id for external user if (empty($user->socid)) { // Company print ''.$langs->trans("ThirdParty").''; diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php index 198d8f7ce3c..d632bf16640 100644 --- a/htdocs/ticket/class/ticket.class.php +++ b/htdocs/ticket/class/ticket.class.php @@ -2799,7 +2799,7 @@ class Ticket extends CommonObject $message .= '

'; foreach ($external_contacts as $key => $info_sendto) { - // altairis: avoid duplicate emails to external contacts + // avoid duplicate emails to external contacts if ($info_sendto['id'] == $user->contact_id) { continue; } From cb15d8c7beb0db960202c0207fe164e65e59349c Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Wed, 13 Dec 2023 14:55:54 +0100 Subject: [PATCH 2/2] add constant TICKETS_NO_COMPANY_ON_FORM --- htdocs/core/class/html.formticket.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php index 7c4c1b06f08..c8191ddbc44 100644 --- a/htdocs/core/class/html.formticket.class.php +++ b/htdocs/core/class/html.formticket.class.php @@ -135,7 +135,7 @@ class FormTicket $this->action = 'add'; - $this->withcompany = isModEnabled("societe"); + $this->withcompany = !getDolGlobalInt("TICKETS_NO_COMPANY_ON_FORM") && isModEnabled("societe"); $this->withfromsocid = 0; $this->withfromcontactid = 0; $this->withreadid=0;