diff --git a/htdocs/includes/menus/barre_left/eldy.lib.php b/htdocs/includes/menus/barre_left/eldy.lib.php index a7e96f879a4..df2e56221bd 100644 --- a/htdocs/includes/menus/barre_left/eldy.lib.php +++ b/htdocs/includes/menus/barre_left/eldy.lib.php @@ -693,42 +693,6 @@ function print_left_eldy_menu($db,$menu_array) } - /* - * Menu AGENDA - */ - if ($mainmenu == 'agenda') - { - // Actions - if ($conf->agenda->enabled) - { - $langs->load("agenda"); - - // Actions - $newmenu->add(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); - $newmenu->add(DOL_URL_ROOT."/comm/action/fiche.php?mainmenu=agenda&leftmenu=agenda&action=create", $langs->trans("NewAction"), 1, ($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)); - // Calendar - $newmenu->add(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Calendar"), 1, $user->rights->agenda->myactions->read); - $newmenu->add(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); - $newmenu->add(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read); - if ($user->rights->agenda->allactions->read) - { - $newmenu->add(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); - $newmenu->add(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); - } - // List - $newmenu->add(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read); - $newmenu->add(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); - $newmenu->add(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read); - if ($user->rights->agenda->allactions->read) - { - $newmenu->add(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); - $newmenu->add(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); - } - // Reports - $newmenu->add(DOL_URL_ROOT."/comm/action/rapport/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->allactions->read); - } - } - /* * Menu PROJETS */ diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php index 5b27eb7cda2..88c05f5306c 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/includes/modules/DolibarrModules.class.php @@ -906,7 +906,8 @@ class DolibarrModules $resql=$this->db->query($sql); if (! $resql) { - if ($this->db->errno() != "DB_ERROR_RECORD_ALREADY_EXISTS") { + if ($this->db->errno() != "DB_ERROR_RECORD_ALREADY_EXISTS") + { $this->error=$this->db->lasterror(); dol_syslog("DolibarrModules::insert_permissions error ".$this->error, LOG_ERR); $err++; diff --git a/htdocs/includes/modules/modAgenda.class.php b/htdocs/includes/modules/modAgenda.class.php index 5dc3586627d..9905c005cbf 100644 --- a/htdocs/includes/modules/modAgenda.class.php +++ b/htdocs/includes/modules/modAgenda.class.php @@ -156,7 +156,7 @@ class modAgenda extends DolibarrModules 'type'=>'top', 'titre'=>'Agenda', 'mainmenu'=>'agenda', - 'leftmenu'=>'0', + 'leftmenu'=>'1', // Use 1 if you also want to add left menu entries using this descriptor. 'url'=>'/comm/action/index.php', 'langs'=>'agenda', 'position'=>100, @@ -166,6 +166,192 @@ class modAgenda extends DolibarrModules 'user'=>0); $r++; + $this->menu[$r]=array('fk_menu'=>'r=0', + 'type'=>'left', + 'titre'=>'Actions', + 'mainmenu'=>'agenda', + 'url'=>'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda', + 'langs'=>'agenda', + 'position'=>100, + 'perms'=>'$user->rights->agenda->myactions->read', + 'enabled'=>'$conf->agenda->enabled', + 'target'=>'', + 'user'=>0); + $r++; + $this->menu[$r]=array('fk_menu'=>'r=1', + 'type'=>'left', + 'titre'=>'NewAction', + 'mainmenu'=>'agenda', + 'url'=>'/comm/action/fiche.php?mainmenu=agenda&leftmenu=agenda&action=create', + 'langs'=>'agenda', + 'position'=>101, + 'perms'=>'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)', + 'enabled'=>'$conf->agenda->enabled', + 'target'=>'', + 'user'=>0); + $r++; + // Calendar + $this->menu[$r]=array('fk_menu'=>'r=1', + 'type'=>'left', + 'titre'=>'Calendar', + 'mainmenu'=>'agenda', + 'url'=>'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda', + 'langs'=>'agenda', + 'position'=>102, + 'perms'=>'$user->rights->agenda->myactions->read', + 'enabled'=>'$conf->agenda->enabled', + 'target'=>'', + 'user'=>0); + $r++; + $this->menu[$r]=array('fk_menu'=>'r=3', + 'type'=>'left', + 'titre'=>'MenuToDoMyActions', + 'mainmenu'=>'agenda', + 'url'=>'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine', + 'langs'=>'agenda', + 'position'=>103, + 'perms'=>'$user->rights->agenda->myactions->read', + 'enabled'=>'$conf->agenda->enabled', + 'target'=>'', + 'user'=>0); + $r++; + $this->menu[$r]=array('fk_menu'=>'r=3', + 'type'=>'left', + 'titre'=>'MenuDoneMyActions', + 'mainmenu'=>'agenda', + 'url'=>'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine', + 'langs'=>'agenda', + 'position'=>104, + 'perms'=>'$user->rights->agenda->myactions->read', + 'enabled'=>'$conf->agenda->enabled', + 'target'=>'', + 'user'=>0); + $r++; + $this->menu[$r]=array('fk_menu'=>'r=3', + 'type'=>'left', + 'titre'=>'MenuToDoActions', + 'mainmenu'=>'agenda', + 'url'=>'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo', + 'langs'=>'agenda', + 'position'=>105, + 'perms'=>'$user->rights->agenda->allactions->read', + 'enabled'=>'$user->rights->agenda->allactions->read', + 'target'=>'', + 'user'=>0); + $r++; + $this->menu[$r]=array('fk_menu'=>'r=3', + 'type'=>'left', + 'titre'=>'MenuDoneActions', + 'mainmenu'=>'agenda', + 'url'=>'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done', + 'langs'=>'agenda', + 'position'=>106, + 'perms'=>'$user->rights->agenda->allactions->read', + 'enabled'=>'$user->rights->agenda->allactions->read', + 'target'=>'', + 'user'=>0); + $r++; + // List + $this->menu[$r]=array('fk_menu'=>'r=1', + 'type'=>'left', + 'titre'=>'List', + 'mainmenu'=>'agenda', + 'url'=>'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda', + 'langs'=>'agenda', + 'position'=>112, + 'perms'=>'$user->rights->agenda->myactions->read', + 'enabled'=>'$conf->agenda->enabled', + 'target'=>'', + 'user'=>0); + $r++; + $this->menu[$r]=array('fk_menu'=>'r=8', + 'type'=>'left', + 'titre'=>'MenuToDoMyActions', + 'mainmenu'=>'agenda', + 'url'=>'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine', + 'langs'=>'agenda', + 'position'=>113, + 'perms'=>'$user->rights->agenda->myactions->read', + 'enabled'=>'$conf->agenda->enabled', + 'target'=>'', + 'user'=>0); + $r++; + $this->menu[$r]=array('fk_menu'=>'r=8', + 'type'=>'left', + 'titre'=>'MenuDoneMyActions', + 'mainmenu'=>'agenda', + 'url'=>'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine', + 'langs'=>'agenda', + 'position'=>114, + 'perms'=>'$user->rights->agenda->myactions->read', + 'enabled'=>'$conf->agenda->enabled', + 'target'=>'', + 'user'=>0); + $r++; + $this->menu[$r]=array('fk_menu'=>'r=8', + 'type'=>'left', + 'titre'=>'MenuToDoActions', + 'mainmenu'=>'agenda', + 'url'=>'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo', + 'langs'=>'agenda', + 'position'=>115, + 'perms'=>'$user->rights->agenda->allactions->read', + 'enabled'=>'$user->rights->agenda->allactions->read', + 'target'=>'', + 'user'=>0); + $r++; + $this->menu[$r]=array('fk_menu'=>'r=8', + 'type'=>'left', + 'titre'=>'MenuDoneActions', + 'mainmenu'=>'agenda', + 'url'=>'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done', + 'langs'=>'agenda', + 'position'=>116, + 'perms'=>'$user->rights->agenda->allactions->read', + 'enabled'=>'$user->rights->agenda->allactions->read', + 'target'=>'', + 'user'=>0); + $r++; + // Reports + $this->menu[$r]=array('fk_menu'=>'r=1', + 'type'=>'left', + 'titre'=>'Reportings', + 'mainmenu'=>'agenda', + 'url'=>'/comm/action/rapport/index.php?mainmenu=agenda&leftmenu=agenda', + 'langs'=>'agenda', + 'position'=>120, + 'perms'=>'$user->rights->agenda->allactions->read', + 'enabled'=>'$conf->agenda->enabled', + 'target'=>'', + 'user'=>0); + $r++; +/*$newmenu->add(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); + $newmenu->add(DOL_URL_ROOT."/comm/action/fiche.php?mainmenu=agenda&leftmenu=agenda&action=create", $langs->trans("NewAction"), 1, ($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)); + // Calendar + $newmenu->add(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Calendar"), 1, $user->rights->agenda->myactions->read); + $newmenu->add(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); + $newmenu->add(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read); + if ($user->rights->agenda->allactions->read) + { + $newmenu->add(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); + $newmenu->add(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); + } + + // List + $newmenu->add(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read); + $newmenu->add(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); + $newmenu->add(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read); + if ($user->rights->agenda->allactions->read) + { + $newmenu->add(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); + $newmenu->add(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); + } + + // Reports + $newmenu->add(DOL_URL_ROOT."/comm/action/rapport/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->allactions->read); + */ + + // Exports //-------- $r=0; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index bb8c07c729a..fee9f3ab22e 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -737,109 +737,6 @@ if (! function_exists("llxHeader")) } -/** - * \brief Show an HTML header + a BODY + The top menu bar - * \param head Lines in the HEAD - * \param title Title of web page - * \param target Target to use in menu links - * \param disablejs Do not output links to js (Ex: qd fonction utilisee par sous formulaire Ajax) - * \param disablehead Do not output head section - * \param arrayofjs Array of js files to add in header - * \param arrayofcss Array of css files to add in header - */ -function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='') -{ - global $user, $conf, $langs, $db, $dolibarr_main_authentication; - - if (! $conf->top_menu) $conf->top_menu ='eldy_backoffice.php'; - if (! $conf->left_menu) $conf->left_menu='eldy_backoffice.php'; - - print '
'; - - /* - * Top menu - */ - print "\n".''."\n"; - print '\n\n"; -} - - /** * \brief Show HTML header * \param head Optionnal head lines @@ -881,7 +778,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs else print "