Skip to content

Commit

Permalink
Fix: Hide title of event when agenda module disabled.
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Jun 30, 2014
1 parent 198a8d4 commit 57b5466
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Expand Up @@ -3,6 +3,7 @@ English Dolibarr ChangeLog
--------------------------------------------------------------

***** ChangeLog for 3.5.4 compared to 3.5.3 *****
Fix: Hide title of event when agenda module disabled.
Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to sender.
Fix: Question about warehouse must not be done when module stock is disabled.
Fix: Option STOCK_SUPPORTS_SERVICES was not correctly implemented
Expand Down
13 changes: 8 additions & 5 deletions htdocs/contact/fiche.php
Expand Up @@ -749,7 +749,7 @@
$doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
print $doleditor->Create(1);
print '</td></tr>';

// Note Private
print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td><td colspan="3">';
$doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
Expand Down Expand Up @@ -971,7 +971,7 @@
print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td><td colspan="3">';
print nl2br($object->note_public);
print '</td></tr>';

// Note Private
print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td><td colspan="3">';
print nl2br($object->note_private);
Expand Down Expand Up @@ -1068,11 +1068,14 @@
print "</div><br>";
}

print load_fiche_titre($langs->trans("TasksHistoryForThisContact"),'','');
if (! empty($conf->agenda->enabled))
{
print load_fiche_titre($langs->trans("TasksHistoryForThisContact"),'','');

print show_actions_todo($conf,$langs,$db,$objsoc,$object);
print show_actions_todo($conf,$langs,$db,$objsoc,$object);

print show_actions_done($conf,$langs,$db,$objsoc,$object);
print show_actions_done($conf,$langs,$db,$objsoc,$object);
}
}
}

Expand Down

0 comments on commit 57b5466

Please sign in to comment.