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

This commit is contained in:
Laurent Destailleur 2020-10-07 17:41:55 +02:00
commit 1a39e963a5
2 changed files with 24 additions and 0 deletions

View File

@ -170,8 +170,12 @@ if (empty($reshook)) {
$object->message = GETPOST("message", 'restricthtml');
$object->type_code = GETPOST("type_code", 'alpha');
$object->type_label = $langs->trans($langs->getLabelFromKey($db, $object->type_code, 'c_ticket_type', 'code', 'label'));
$object->category_code = GETPOST("category_code", 'alpha');
$object->category_label = $langs->trans($langs->getLabelFromKey($db, $object->category_code, 'c_ticket_category', 'code', 'label'));
$object->severity_code = GETPOST("severity_code", 'alpha');
$object->severity_label = $langs->trans($langs->getLabelFromKey($db, $object->severity_code, 'c_ticket_severity', 'code', 'label'));
$object->email_from = $user->email;
$notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
$object->notify_tiers_at_create = empty($notifyTiers) ? 0 : 1;

View File

@ -142,6 +142,26 @@ class Ticket extends CommonObject
*/
public $severity_code;
/**
* Type label
*/
public $type_label;
/**
* Category label
*/
public $category_label;
/**
* Severity label
*/
public $severity_label;
/**
* Email from user
*/
public $email_from;
/**
* @var int Création date
*/