diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 747c50c9640..5790811fc2e 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1944,6 +1944,7 @@ class ActionComm extends CommonObject
$duration = ($datestart && $dateend) ? ($dateend - $datestart) : 0;
$event['summary'] = $obj->label.($obj->socname ? " (".$obj->socname.")" : "");
+
$event['desc'] = $obj->note;
$event['startdate'] = $datestart;
$event['enddate'] = $dateend; // Not required with type 'journal'
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index ff26d192301..bb8649106b9 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -215,6 +215,7 @@ class ConferenceOrBooth extends ActionComm
$this->socid=$this->fk_soc;
$this->datef=$this->datep2;
$this->note_private=$this->note;
+ $this->fk_user_author=$this->fk_user_author;
}
/**
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 0028f544f9f..19eb0801c6a 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -225,7 +225,11 @@ if (empty($reshook) && $action == 'add') {
}
if (!GETPOST("lastname")) {
$error++;
- $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Name"))."
\n";
+ $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Lastname"))."
\n";
+ }
+ if (!GETPOST("firstname")) {
+ $error++;
+ $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."
\n";
}
if (!GETPOST("societe")) {
$error++;
@@ -297,7 +301,6 @@ if (empty($reshook) && $action == 'add') {
$contact->state_id = (int) GETPOST("state_id", 'int');
$contact->email = $email;
$contact->statut = 1; //Default status to Actif
-
$resultcreatecontact = $contact->create($user);
if ($resultcreatecontact<0) {
$error++;
@@ -362,6 +365,8 @@ if (empty($reshook) && $action == 'add') {
$conforbooth->datep2 = $dateend;
$conforbooth->datec = dol_now();
$conforbooth->tms = dol_now();
+ $conforbooth->firstname = $contact->firstname;
+ $conforbooth->lastname = $contact->lastname;
$resultconforbooth = $conforbooth->create($user);
if ($resultconforbooth<=0) {
$error++;
@@ -488,10 +493,14 @@ jQuery(document).ready(function () {
print '
| '; print ' | lastname).'" autofocus="autofocus"> | '; print '||
| '; +print ' | firstname).'" autofocus="autofocus"> | '; +print '||
| '.$langs->trans("Email").'* | |||