|
|
@@ -1691,6 +1691,7 @@ if ($id > 0) {
|
|
|
$object->usermod = $tmpuser;
|
|
|
}
|
|
|
|
|
|
+ $isACEVENTObj = $object->code == 'AC_EVENT';
|
|
|
|
|
|
/*
|
|
|
* Show tabs
|
|
|
@@ -1955,7 +1956,7 @@ if ($id > 0) {
|
|
|
|
|
|
print '<table class="border tableforfield centpercent">';
|
|
|
|
|
|
- if (isModEnabled("societe")) {
|
|
|
+ if (isModEnabled("societe") && !$isACEVENTObj) {
|
|
|
// Related company
|
|
|
print '<tr><td class="titlefieldcreate">' . $langs->trans("ActionOnCompany") . '</td>';
|
|
|
print '<td>';
|
|
|
@@ -2038,12 +2039,14 @@ if ($id > 0) {
|
|
|
}
|
|
|
|
|
|
// Description
|
|
|
- print '<tr><td class="tdtop">' . $langs->trans("Description") . '</td><td>';
|
|
|
- // Editeur wysiwyg
|
|
|
- require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
|
|
|
- $doleditor = new DolEditor('note', $object->note_private, '', 120, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_4, '90%');
|
|
|
- $doleditor->Create();
|
|
|
- print '</td></tr>';
|
|
|
+ if (!$isACEVENTObj) {
|
|
|
+ print '<tr><td class="tdtop">' . $langs->trans("Description") . '</td><td>';
|
|
|
+ // Editeur wysiwyg
|
|
|
+ require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
|
|
|
+ $doleditor = new DolEditor('note', $object->note_private, '', 120, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_4, '90%');
|
|
|
+ $doleditor->Create();
|
|
|
+ print '</td></tr>';
|
|
|
+ }
|
|
|
|
|
|
// Other attributes
|
|
|
$parameters = array();
|
|
|
@@ -2290,8 +2293,6 @@ if ($id > 0) {
|
|
|
}
|
|
|
print '</td></tr>';
|
|
|
|
|
|
- $isACEVENTObj = $object->code == 'AC_EVENT';
|
|
|
-
|
|
|
// Location
|
|
|
if (empty($conf->global->AGENDA_DISABLE_LOCATION) && !$isACEVENTObj) {
|
|
|
print '<tr><td>' . $langs->trans("Location") . '</td><td>' . $object->location . '</td></tr>';
|