diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 23f063e9a50..e9d434651b2 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -165,6 +165,7 @@ PaymentBoothLocation = Booth location payment
DeleteConferenceOrBoothAttendee=Remove attendee
RegistrationAndPaymentWereAlreadyRecorder=A registration and a payment were already recorded for the email %s
EmailAttendee=Attendee email
+EmailCompany=Company email
EmailCompanyForInvoice=Company email (for invoice, if different of attendee email)
ErrorSeveralCompaniesWithEmailContactUs=Several companies with this email has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
ErrorSeveralCompaniesWithNameContactUs=Several companies with this name has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index 161f56dc6f8..af49d142f51 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -652,21 +652,23 @@ print '
';
print $langs->trans("EvntOrgWelcomeMessage", $project->title . ' '. $conference->label);
print ' ';
$maxattendees = 0;
-if ($conference->id) {
+if ($conference->id > 0) {
+ /* date of project is not date of event so commented
print $langs->trans("Date").': ';
print dol_print_date($conference->datep);
if ($conference->date_end) {
print ' - ';
print dol_print_date($conference->datef);
- }
+ }*/
} else {
+ /* date of project is not date of event so commented
print $langs->trans("Date").': ';
print dol_print_date($project->date_start);
if ($project->date_end) {
print ' - ';
print dol_print_date($project->date_end);
- }
- $maxattendees = $project->max_attendees;
+ }*/
+ $maxattendees = $project->max_attendees; // Max attendeed for the project/event
}
print '
';
@@ -729,7 +731,7 @@ if ((!empty($conference->id) && $conference->status == ConferenceOrBooth::STATUS
// Email company for invoice
if ($project->price_registration) {
- print '