Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-20 11:54:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0

Browse Source
This commit is contained in:
Laurent Destailleur
2026-02-16 20:44:36 +01:00
parent a8e0508343 e43438cc7b
commit 2a41e1f714
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/commonobject.class.php
View File

@@ -4445,7 +4445,11 @@ abstract class CommonObject
}
}
$this->context = array_merge($this->context, array('newstatus' => $status));
if ($trigkey) {
$this->oldcopy = dol_clone($this);
// Call trigger
$result = $this->call_trigger($trigkey, $user);
if ($result < 0) {

4
htdocs/ticket/card.php
View File

@@ -578,7 +578,7 @@ if (empty($reshook)) {
if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
// prevent browser refresh from reopening ticket several times
if ($object->status == Ticket::STATUS_CLOSED || $object->status == Ticket::STATUS_CANCELED) {
$res = $object->setStatut(Ticket::STATUS_ASSIGNED);
$res = $object->setStatut(Ticket::STATUS_ASSIGNED, null, '', 'TICKET_MODIFY');
if ($res) {
// Log action in ticket logs table
//$log_action = $langs->trans('TicketLogReopen');
@@ -636,7 +636,7 @@ if (empty($reshook)) {
if ($object->fetch(GETPOST('id', 'int'), GETPOST('track_id', 'alpha')) >= 0) {
$new_status = GETPOST('new_status', 'int');
$old_status = $object->status;
$res = $object->setStatut($new_status);
$res = $object->setStatut($new_status, null, '', 'TICKET_MODIFY');
if ($res) {
// Log action in ticket logs table
$log_action = $langs->trans('TicketLogStatusChanged', $langs->transnoentities($object->statuts_short[$old_status]), $langs->transnoentities($object->statuts_short[$new_status]));

2
htdocs/ticket/class/ticket.class.php
View File

@@ -2823,7 +2823,7 @@ class Ticket extends CommonObject
if (($object->status < self::STATUS_IN_PROGRESS && !$user->socid && !$private) ||
($object->status > self::STATUS_IN_PROGRESS && $public_area)
) {
$object->setStatut(3);
$object->setStatut(3, null, '', 'TICKET_MODIFY');
}
return 1;
} else {

2
htdocs/ticket/list.php
View File

@@ -286,7 +286,7 @@ if (empty($reshook)) {
$result = $objecttmp->fetch($toselectid);
if ($result > 0) {
if ($objecttmp->status == Ticket::STATUS_CLOSED || $objecttmp->status == Ticket::STATUS_CANCELED) {
$result = $objecttmp->setStatut(Ticket::STATUS_ASSIGNED);
$result = $objecttmp->setStatut(Ticket::STATUS_ASSIGNED, null, '', 'TICKET_MODIFY');
if ($result < 0) {
setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
$error++;