lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX Disable ticket status change if ticket close

Browse Source 
FIX Use ref into label of ticket message
This commit is contained in:
Laurent Destailleur 2020-02-07 11:52:55 +01:00
parent ff4ce2e505
commit 53e1b80742
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/class/html.formticket.class.php
View File

@ -919,7 +919,7 @@ class FormTicket
print '<tr class="email_line"><td class="titlefieldcreate">'.$langs->trans('Subject').'</td>'; print '<tr class="email_line"><td class="titlefieldcreate">'.$langs->trans('Subject').'</td>';
$label_title = empty($conf->global->MAIN_APPLICATION_TITLE) ? $mysoc->name : $conf->global->MAIN_APPLICATION_TITLE; $label_title = empty($conf->global->MAIN_APPLICATION_TITLE) ? $mysoc->name : $conf->global->MAIN_APPLICATION_TITLE;
print '<td colspan="2"><input type="text" class="text" size="80" name="subject" value="['.$label_title.' - ticket #'.$this->track_id.'] '.$langs->trans('TicketNewMessage').'" />'; print '<td colspan="2"><input type="text" class="text" size="80" name="subject" value="['.$label_title.' - '.$langs->trans("Ticket").' #'.$this->ref.'] '.$langs->trans('TicketNewMessage').'" />';
print '</td></tr>'; print '</td></tr>';
// Destinataires // Destinataires
@ -935,13 +935,13 @@ class FormTicket
if (is_array($contacts) && count($contacts) > 0) { if (is_array($contacts) && count($contacts) > 0) {
foreach ($contacts as $key => $info_sendto) { foreach ($contacts as $key => $info_sendto) {
if ($info_sendto['email'] != '') { if ($info_sendto['email'] != '') {
$sendto[] = dol_escape_htmltag(trim($info_sendto['firstname']." ".$info_sendto['lastname'])." <".$info_sendto['email'].">")." <small>(".dol_escape_htmltag($info_sendto['libelle']).")</small>"; $sendto[] = dol_escape_htmltag(trim($info_sendto['firstname']." ".$info_sendto['lastname'])." <".$info_sendto['email'].">").' <small class="opacitymedium">('.dol_escape_htmltag($info_sendto['libelle']).")</small>";
} }
} }
} }
if ($ticketstat->origin_email && !in_array($this->dao->origin_email, $sendto)) { if ($ticketstat->origin_email && !in_array($this->dao->origin_email, $sendto)) {
$sendto[] = dol_escape_htmltag($ticketstat->origin_email)." <small>(".$langs->trans("TicketEmailOriginIssuer").")</small>"; $sendto[] = dol_escape_htmltag($ticketstat->origin_email).' <small class="opacitymedium">('.$langs->trans("TicketEmailOriginIssuer").")</small>";
} }
if ($ticketstat->fk_soc > 0) { if ($ticketstat->fk_soc > 0) {
@ -949,12 +949,12 @@ class FormTicket
$ticketstat->fetch_thirdparty(); $ticketstat->fetch_thirdparty();
if (is_array($ticketstat->thirdparty->email) && !in_array($ticketstat->thirdparty->email, $sendto)) { if (is_array($ticketstat->thirdparty->email) && !in_array($ticketstat->thirdparty->email, $sendto)) {
$sendto[] = $ticketstat->thirdparty->email.' <small>('.$langs->trans('Customer').')</small>'; $sendto[] = $ticketstat->thirdparty->email.' <small class="opacitymedium">('.$langs->trans('Customer').')</small>';
} }
} }
if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS) { if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS) {
$sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO.' <small>(generic email)</small>'; $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO.' <small class="opacitymedium">(generic email)</small>';
} }
// Print recipient list // Print recipient list

9
htdocs/ticket/card.php
View File

@ -854,15 +854,15 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
// Creation date // Creation date
print '<tr><td>'.$langs->trans("DateCreation").'</td><td>'; print '<tr><td>'.$langs->trans("DateCreation").'</td><td>';
print dol_print_date($object->datec, 'dayhour'); print dol_print_date($object->datec, 'dayhour');
print ' - '.$langs->trans("TimeElapsedSince").': '.'<i>'.convertSecondToTime(roundUpToNextMultiple($now - $object->datec, 60)).'</i>'; print '<span class="opacitymedium"> - '.$langs->trans("TimeElapsedSince").': '.'<i>'.convertSecondToTime(roundUpToNextMultiple($now - $object->datec, 60)).'</i></span>';
print '</td></tr>'; print '</td></tr>';
// Read date // Read date
print '<tr><td>'.$langs->trans("TicketReadOn").'</td><td>'; print '<tr><td>'.$langs->trans("TicketReadOn").'</td><td>';
if (!empty($object->date_read)) { if (!empty($object->date_read)) {
print dol_print_date($object->date_read, 'dayhour'); print dol_print_date($object->date_read, 'dayhour');
print ' - '.$langs->trans("TicketTimeToRead").': <i>'.convertSecondToTime(roundUpToNextMultiple($object->date_read - $object->datec, 60)).'</i>'; print '<span class="opacitymedium"> - '.$langs->trans("TicketTimeToRead").': <i>'.convertSecondToTime(roundUpToNextMultiple($object->date_read - $object->datec, 60)).'</i>';
print ' - '.$langs->trans("TimeElapsedSince").': '.'<i>'.convertSecondToTime(roundUpToNextMultiple($now - $object->date_read, 60)).'</i>'; print ' - '.$langs->trans("TimeElapsedSince").': '.'<i>'.convertSecondToTime(roundUpToNextMultiple($now - $object->date_read, 60)).'</i></span>';
} }
print '</td></tr>'; print '</td></tr>';
@ -1034,7 +1034,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
// Display navbar with links to change ticket status // Display navbar with links to change ticket status
print '<!-- navbar with status -->'; print '<!-- navbar with status -->';
if (!$user->socid && $user->rights->ticket->write && $object->fk_status < 8 && GETPOST('set') !== 'properties') { if (!$user->socid && $user->rights->ticket->write && $object->fk_statut < 8 && GETPOST('set') !== 'properties') {
$actionobject->viewStatusActions($object); $actionobject->viewStatusActions($object);
} }
@ -1289,6 +1289,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
$formticket->action = $action; $formticket->action = $action;
$formticket->track_id = $object->track_id; $formticket->track_id = $object->track_id;
$formticket->ref = $object->ref;
$formticket->id = $object->id; $formticket->id = $object->id;
$formticket->withfile = 2; $formticket->withfile = 2;