2
0
forked from Wavyzz/dolibarr

Fix bad name of trigger

This commit is contained in:
Laurent Destailleur
2019-10-01 11:28:10 +02:00
parent 6ebd060315
commit c7da05e4a1
4 changed files with 6 additions and 6 deletions

View File

@@ -147,7 +147,7 @@ class FormTicket
$extrafields = new ExtraFields($this->db); $extrafields = new ExtraFields($this->db);
$extralabels = $extrafields->fetch_name_optionals_label($ticketstat->table_element); $extralabels = $extrafields->fetch_name_optionals_label($ticketstat->table_element);
print "\n<!-- Begin form TICKETSUP -->\n"; print "\n<!-- Begin form TICKET -->\n";
if ($withdolfichehead) dol_fiche_head(null, 'card', '', 0, ''); if ($withdolfichehead) dol_fiche_head(null, 'card', '', 0, '');
@@ -837,7 +837,7 @@ class FormTicket
$outputlangs->load('other'); $outputlangs->load('other');
} }
print "\n<!-- Begin message_form TICKETSUP -->\n"; print "\n<!-- Begin message_form TICKET -->\n";
$send_email = GETPOST('send_email', 'int') ? GETPOST('send_email', 'int') : 0; $send_email = GETPOST('send_email', 'int') ? GETPOST('send_email', 'int') : 0;

View File

@@ -1368,12 +1368,12 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
{ {
$width=80; $cssclass='photoref'; $width=80; $cssclass='photoref';
$showimage=$object->is_photo_available($conf->ticket->multidir_output[$entity].'/'.$object->ref); $showimage=$object->is_photo_available($conf->ticket->multidir_output[$entity].'/'.$object->ref);
$maxvisiblephotos=(isset($conf->global->TICKETSUP_MAX_VISIBLE_PHOTO)?$conf->global->TICKETSUP_MAX_VISIBLE_PHOTO:2); $maxvisiblephotos=(isset($conf->global->TICKET_MAX_VISIBLE_PHOTO)?$conf->global->TICKET_MAX_VISIBLE_PHOTO:2);
if ($conf->browser->layout == 'phone') $maxvisiblephotos=1; if ($conf->browser->layout == 'phone') $maxvisiblephotos=1;
if ($showimage) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>'; if ($showimage) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';
else else
{ {
if (!empty($conf->global->TICKETSUP_NODISPLAYIFNOPHOTO)) { if (!empty($conf->global->TICKET_NODISPLAYIFNOPHOTO)) {
$nophoto=''; $nophoto='';
$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"></div>'; $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"></div>';
} }

View File

@@ -97,7 +97,7 @@ $url_page_current = DOL_URL_ROOT.'/ticket/card.php';
//if ($user->societe_id > 0) $socid = $user->societe_id; //if ($user->societe_id > 0) $socid = $user->societe_id;
$result = restrictedArea($user, 'ticket', $object->id); $result = restrictedArea($user, 'ticket', $object->id);
$triggermodname = 'TICKETSUP_MODIFY'; $triggermodname = 'TICKET_MODIFY';
$permissiontoadd = $user->rights->ticket->write; $permissiontoadd = $user->rights->ticket->write;
$actionobject = new ActionsTicket($db); $actionobject = new ActionsTicket($db);

View File

@@ -2672,7 +2672,7 @@ class Ticket extends CommonObject
global $conf, $langs; global $conf, $langs;
if ($conf->global->TICKET_DISABLE_ALL_MAILS) { if ($conf->global->TICKET_DISABLE_ALL_MAILS) {
dol_syslog(get_class($this) . '::sendTicketMessageByEmail: Emails are disable into ticket setup by option TICKETSUP_DISABLE_ALL_MAILS', LOG_WARNING); dol_syslog(get_class($this) . '::sendTicketMessageByEmail: Emails are disable into ticket setup by option TICKET_DISABLE_ALL_MAILS', LOG_WARNING);
return ''; return '';
} }