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

This commit is contained in:
Laurent Destailleur 2021-08-03 17:09:09 +02:00
commit 5becf13f2b
2 changed files with 13 additions and 0 deletions

View File

@ -436,6 +436,14 @@ class FormTicket
print '<input type="checkbox" id="notify_tiers_at_create" name="notify_tiers_at_create"'.($this->withnotifytiersatcreate ? ' checked="checked"' : '').'>';
print '</td></tr>';
}
// User assigned
print '<tr><td>';
print $langs->trans("AssignedTo");
print '</td><td>';
print $form->select_dolusers(GETPOST('fk_user_assign', 'int'), 'fk_user_assign', 1);
print '</td>';
print '</tr>';
}
if (!empty($conf->projet->enabled) && !$this->ispublic) {

View File

@ -188,6 +188,11 @@ if (empty($reshook)) {
$object->email_from = $user->email;
$notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
$object->notify_tiers_at_create = empty($notifyTiers) ? 0 : 1;
$fk_user_assign = GETPOST("fk_user_assign", 'int');
if ($fk_user_assign > 0) {
$object->fk_user_assign = $fk_user_assign;
$object->fk_statut = $object::STATUS_ASSIGNED;
}
$object->fk_project = $projectid;