Fix duplicate defined
This commit is contained in:
parent
24fdec736b
commit
4fe73e1fc3
@ -34,9 +34,7 @@ if (!defined('NOIPCHECK')) {
|
||||
if (!defined('NOBROWSERNOTIF')) {
|
||||
define('NOBROWSERNOTIF', '1');
|
||||
}
|
||||
if (!defined('NOIPCHECK')) {
|
||||
define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
|
||||
}
|
||||
|
||||
|
||||
// For MultiCompany module.
|
||||
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
|
||||
@ -553,8 +551,8 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
|
||||
|
||||
// Add link between invoice and the attendee registration
|
||||
/*if (!$error) {
|
||||
$facture->add_object_linked($confattendee->element, $confattendee->id);
|
||||
}*/
|
||||
$facture->add_object_linked($confattendee->element, $confattendee->id);
|
||||
}*/
|
||||
}
|
||||
|
||||
if (!$error) {
|
||||
@ -726,6 +724,9 @@ if ($project->date_start_event || $project->date_end_event) {
|
||||
if ($project->location) {
|
||||
print '<span class="fa fa-map-marked-alt pictofixedwidth opacitymedium"></span>'.dol_escape_htmltag($project->location).'<br>';
|
||||
}
|
||||
if ($project->note_public) {
|
||||
print '<br><span class="opacitymedium">'.dol_escape_htmltag($project->note_public).'</span><br>';
|
||||
}
|
||||
|
||||
print '</div>';
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user