Skip to content

New/doliboard/ticket link #709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
atm-lucasmantegari merged 2 commits into from
Mar 16, 2026
Merged

New/doliboard/ticket link #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d2e5c1
NEW : Add complete_substitutions_array in ticket.class.php
ATM-NicolasV Mar 13, 2026
60d3b4d
NEW : Add complete_substitutions_array in ticket.class.php
ATM-NicolasV Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ChangeLogAtm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- NEW : Add complete_substitutions_array in ticket.class.php - *2026-02-20*
- FIX : DA027856 - Edition des extrafields "always editable" sur les projets avec une tache ouverte en bas de page.

Check failure on line 2 in ChangeLogAtm.md

View workflow job for this annotation

GitHub Actions / pre-commit / pre-commit 

projets ==> projects

Check failure on line 2 in ChangeLogAtm.md

View workflow job for this annotation

GitHub Actions / pre-commit / pre-commit 

projets ==> projects
- FIX : DA027490 - BACKPORT 37132 - Date sur les temps passés sur les projets était erronée.

Check failure on line 3 in ChangeLogAtm.md

View workflow job for this annotation

GitHub Actions / pre-commit / pre-commit 

projets ==> projects

Check failure on line 3 in ChangeLogAtm.md

View workflow job for this annotation

GitHub Actions / pre-commit / pre-commit 

projets ==> projects
- FIX : DA027053 - Update tms on delete propalLine if propalLine is a product with a price of 0 or if product is not include.
- FIX : DA026698 - Backport from v23 - Recherche insensible aux diacritiques (accents)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/hrm/class/evaluation.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
}

if (!$user->hasRight('hrm', 'evaluation', 'readall')) {
$this->fields['fk_user']['type'] .= ' AND (t.rowid:IN:'.$this->db->sanitize(implode(",", $user->getAllChildIds(1))) .')';
$this->fields['fk_user']['type'] .= ':t.rowid:IN:('.$this->db->sanitize(implode(",", $user->getAllChildIds(1))) . ')';

Check failure on line 228 in htdocs/hrm/class/evaluation.class.php

View workflow job for this annotation

GitHub Actions / pre-commit / pre-commit 

Line indented incorrectly; expected at least 3 tabs, found 0
}

$this->date_eval = dol_now();
Expand Down
36 changes: 18 additions & 18 deletions htdocs/theme/eldy/global.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7421,28 +7421,28 @@
}
/* ------------ */
/* Prevents the table cell from stretching indefinitely */
.fichehalfleft table.tableforfield td:last-child {
max-width: 0 !important;
width: 100% !important;
}
//.fichehalfleft table.tableforfield td:last-child {
// max-width: 0 !important;
// width: 100% !important;
//}

/* Switches the container to flex layout to force tags to wrap */
ul.select2-choices-dolibarr {
display: flex !important;
flex-wrap: wrap !important;
gap: 4px !important;
padding: 2px !important;
}
//ul.select2-choices-dolibarr {
// display: flex !important;
// flex-wrap: wrap !important;
// gap: 4px !important;
// padding: 2px !important;
//}

/* Breaks very long tag text so it wraps to the next line */
li.select2-search-choice-dolibarr {
float: none !important; /* Overrides the default float behavior of the Eldy theme */
display: block !important;
white-space: normal !important;
word-wrap: break-word !important;
max-width: 100% !important;
margin: 0 !important;
}
//li.select2-search-choice-dolibarr {
// float: none !important; /* Overrides the default float behavior of the Eldy theme */
// display: block !important;
// white-space: normal !important;
// word-wrap: break-word !important;
// max-width: 100% !important;
// margin: 0 !important;
//}
/* ------------ */
span.select2-dropdown--below {
margin-top: -1px;
Expand Down
35 changes: 24 additions & 11 deletions htdocs/ticket/class/ticket.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2851,8 +2851,9 @@ public function newMessage($user, &$action, $private = 1, $public_area = 0)

$message_intro = $langs->trans('TicketNotificationEmailBody', "#".$object->id);
$message_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE');

$message = getDolGlobalString('TICKET_MESSAGE_MAIL_INTRO', $langs->trans('TicketMessageMailIntroText'));
/**SPECIFIQUE ATM **/
$message = $this->applyMailSubstitutions(getDolGlobalString('TICKET_MESSAGE_MAIL_INTRO', $langs->trans('TicketMessageMailIntroText')), $langs, $object);
/**SPECIFIQUE ATM **/
$message .= '<br><br>';
$messagePost = GETPOST('message', 'restricthtml');
if (!dol_textishtml($messagePost)) {
Expand Down Expand Up @@ -2933,9 +2934,10 @@ public function newMessage($user, &$action, $private = 1, $public_area = 0)
$appli = getDolGlobalString('MAIN_APPLICATION_TITLE', $mysoc->name);

$subject = GETPOST('subject') ? GETPOST('subject') : '['.$appli.' - '.$langs->trans("Ticket").' #'.$object->track_id.'] '.$langs->trans('TicketNewMessage');

$message_intro = GETPOST('mail_intro') ? GETPOST('mail_intro', 'restricthtml') : getDolGlobalString('TICKET_MESSAGE_MAIL_INTRO');
$message_signature = GETPOST('mail_signature') ? GETPOST('mail_signature', 'restricthtml') : getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE');
/**SPECIFIQUE ATM **/
$message_intro = $this->applyMailSubstitutions(GETPOST('mail_intro') ? GETPOST('mail_intro', 'restricthtml') : getDolGlobalString('TICKET_MESSAGE_MAIL_INTRO'), $langs, $object);
$message_signature = $this->applyMailSubstitutions(GETPOST('mail_signature') ? GETPOST('mail_signature', 'restricthtml') : getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE'), $langs, $object);
/**SPECIFIQUE ATM **/
if (!dol_textishtml($message_intro)) {
$message_intro = dol_nl2br($message_intro);
}
Expand Down Expand Up @@ -2971,12 +2973,6 @@ public function newMessage($user, &$action, $private = 1, $public_area = 0)
// If public interface is not enable, use link to internal page into mail
$url_public_ticket = (getDolGlobalInt('TICKET_ENABLE_PUBLIC_INTERFACE') ?
(getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') !== '' ? getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') . '/view.php' : dol_buildpath('/public/ticket/view.php', 2)) : dol_buildpath('/ticket/card.php', 2)).'?track_id='.urlencode($object->track_id);
/**DEBUT SPECIFIQUE ATM **/
if (!getDolGlobalString('TICKET_REMOVE_TRACK_URL')) {
$message .= '<br>' . $langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : <a href="' . $url_public_ticket . '">' . $object->track_id . '</a><br>';
var_dump($message);exit();
}
/**FIN SPECIFIQUE ATM **/

// Build final message
$message = $message_intro.'<br><br>'.$message;
Expand Down Expand Up @@ -3044,6 +3040,23 @@ public function newMessage($user, &$action, $private = 1, $public_area = 0)
}
}

/**SPECIFIQUE ATM **/
/**
* Apply standard substitutions used by ticket email content.
*
* @param string $content Content before substitutions
* @param Translate $langs Translation handler
* @param CommonObject|null $object Object used for substitutions
* @return string
*/
protected function applyMailSubstitutions($content, $langs, $object = null)
{
$substitutionarray = getCommonSubstitutionArray($langs, 0, array(), $object);
complete_substitutions_array($substitutionarray, $langs, $object);

return make_substitutions($content, $substitutionarray);
}
/**SPECIFIQUE ATM **/

/**
* Send ticket by email to linked contacts
Expand Down
Loading