From b18f2f4fdae503279e51cee0192796dcc0a1603c Mon Sep 17 00:00:00 2001 From: ThomasNgr-OpenDSI Date: Thu, 2 Oct 2025 16:11:53 +0200 Subject: [PATCH 1/5] FIX : thirdparty was never notified. Passing of contact ID information was not coherent. (#35590) --- .../triggers/interface_50_modTicket_TicketEmail.class.php | 4 ++-- htdocs/ticket/card.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php index 8c4cad6b598..3e4871db9d4 100644 --- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php +++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php @@ -211,7 +211,7 @@ class InterfaceTicketEmail extends DolibarrTriggers // if contact selected send to email's contact else send to email's thirdparty - $contactid = empty($object->context['contactid']) ? 0 : $object->context['contactid']; + $contactid = empty($object->context['contact_id']) ? 0 : $object->context['contact_id']; $res = 0; if (!empty($contactid)) { @@ -271,7 +271,7 @@ class InterfaceTicketEmail extends DolibarrTriggers $linked_contacts[]['email'] = $object->thirdparty->email; } - $contactid = empty($object->context['contactid']) ? 0 : $object->context['contactid']; + $contactid = empty($object->context['contact_id']) ? 0 : $object->context['contact_id']; $res = 0; if ($contactid > 0) { diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index cd1d68d7326..8c991e49b49 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -265,7 +265,7 @@ if (empty($reshook)) { $object->origin_email = null; $notifyTiers = GETPOST("notify_tiers_at_create", 'alpha'); $object->notify_tiers_at_create = empty($notifyTiers) ? 0 : 1; - $object->context['contact_id'] = GETPOSTINT('contact_id'); + $object->context['contact_id'] = GETPOSTINT('contactid'); $id = $object->create($user); } else { $id = $object->update($user); @@ -455,7 +455,7 @@ if (empty($reshook)) { if ($action == "confirm_public_close" && GETPOST('confirm', 'alpha') == 'yes' && $permissiontoadd) { $object->fetch(GETPOSTINT('id'), '', GETPOST('track_id', 'alpha')); if ($_SESSION['email_customer'] == $object->origin_email || $_SESSION['email_customer'] == $object->thirdparty->email) { - $object->context['contact_id'] = GETPOSTINT('contact_id'); + $object->context['contact_id'] = GETPOSTINT('contactid'); $object->close($user); From 4f75fb7f8abaf9cc922386162434a0599abe14bc Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Fri, 3 Oct 2025 11:38:46 +0200 Subject: [PATCH 2/5] FIX : bad name for target import table (#35615) Co-authored-by: Christophe Battarel --- htdocs/core/modules/modCategorie.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php index 25cb26cb1ad..44ebaf7a6a0 100644 --- a/htdocs/core/modules/modCategorie.class.php +++ b/htdocs/core/modules/modCategorie.class.php @@ -549,7 +549,7 @@ class modCategorie extends DolibarrModules $this->import_label[$r] = "CatMembersLinks"; // Translation key $this->import_icon[$r] = $this->picto; $this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon - $this->import_tables_array[$r] = array('cm' => MAIN_DB_PREFIX.'categorie_contact'); + $this->import_tables_array[$r] = array('cm' => MAIN_DB_PREFIX.'categorie_member'); $this->import_fields_array[$r] = array('cm.fk_categorie' => "Category*", 'cm.fk_member' => "Member*"); $this->import_regex_array[$r] = array('cm.fk_categorie' => 'rowid@'.MAIN_DB_PREFIX.'categorie:type=3'); From 5031572102c43a838b79d39aa678111bd32bb98d Mon Sep 17 00:00:00 2001 From: John BOTELLA <68917336+thersane-john@users.noreply.github.com> Date: Fri, 3 Oct 2025 11:44:53 +0200 Subject: [PATCH 3/5] Fix trigger (#35610) --- htdocs/expedition/class/expedition.class.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 271f04e56a7..024fbe79847 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -810,7 +810,15 @@ class Expedition extends CommonObject } // Change status of order to "shipment in process" - $ret = $this->setStatut(Commande::STATUS_SHIPMENTONPROCESS, $this->origin_id, $this->origin); + $triggerKey = 'SHIPPING_'; // Because when the trigger is fired the object is a shipping and not the real target object, so I add a prefix like SHIPPING_ to avoid confusion + if ($this->origin == 'commande') { + $triggerKey.= 'ORDER_SHIPMENTONPROCESS'; + } else { + $triggerKey.= strtoupper($this->origin).'_SHIPMENTONPROCESS'; + } + + // TODO : load the origin object to trigger the right setStatus according to origin object + $ret = $this->setStatut(Commande::STATUS_SHIPMENTONPROCESS, $this->origin_id, $this->origin, $triggerKey); if (!$ret) { $error++; } From 79d223cca440255a3bb846ba710c560ee10c613e Mon Sep 17 00:00:00 2001 From: HENRY Florian Date: Fri, 3 Oct 2025 12:56:59 +0200 Subject: [PATCH 4/5] fix: Do not display sign status buttonis signed status is not displayed in header (#35619) --- htdocs/contrat/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 19225c3b08f..1d16c384196 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -2323,7 +2323,7 @@ if ($action == 'create') { } // Sign - if ($object->status > Contrat::STATUS_DRAFT) { + if (getDolGlobalString('CONTRACT_SHOW_SIGNATURE_STATUS_WITH_SERVICE_STATUS') && $object->status > Contrat::STATUS_DRAFT) { if ($object->signed_status != Contrat::$SIGNED_STATUSES['STATUS_SIGNED_ALL']) { print '
' . $langs->trans("ContractSign") . '
'; } else { From 5d3e2078a6c30667821fd6a12502d1b42ced1c93 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Fri, 3 Oct 2025 12:57:54 +0200 Subject: [PATCH 5/5] Disable not used github workflow --- .github/workflows/{gh-travis.yml => gh-travis.yml.disabled} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{gh-travis.yml => gh-travis.yml.disabled} (100%) diff --git a/.github/workflows/gh-travis.yml b/.github/workflows/gh-travis.yml.disabled similarity index 100% rename from .github/workflows/gh-travis.yml rename to .github/workflows/gh-travis.yml.disabled