diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 14682e84aeb..72fe1c6e756 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -30,9 +30,9 @@ require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); -$filtera = isset($_REQUEST["userasked"])?$_REQUEST["userasked"]:''; -$filtert = isset($_REQUEST["usertodo"])?$_REQUEST["usertodo"]:''; -$filterd = isset($_REQUEST["userdone"])?$_REQUEST["userdone"]:''; +$filtera = isset($_REQUEST["userasked"])?$_REQUEST["userasked"]:(isset($_REQUEST["filtera"])?$_REQUEST["filtera"]:''); +$filtert = isset($_REQUEST["usertodo"])?$_REQUEST["usertodo"]:(isset($_REQUEST["filtert"])?$_REQUEST["filtert"]:''); +$filterd = isset($_REQUEST["userdone"])?$_REQUEST["userdone"]:(isset($_REQUEST["filterd"])?$_REQUEST["filterd"]:''); $page = $_GET["page"]; $sortfield=$_GET["sortfield"]; @@ -65,6 +65,17 @@ $month=isset($_GET["month"])?$_GET["month"]:date("m"); /* * Actions */ +if (! empty($_POST["viewlist"])) +{ + $param=''; + foreach($_POST as $key => $val) + { + $param.='&'.$key.'='.urlencode($val); + } + //print $param; + header("Location: ".DOL_URL_ROOT.'/comm/action/listactions.php?'.$param); + exit; +} if ($_GET["action"] == 'builddoc') { $cat = new CommActionRapport($db, $_GET["month"], $_GET["year"]); @@ -112,7 +123,12 @@ $nav.=" ".dolibarr_print_date(dolibarr_mktime(0,0,0,$mon $nav.=" $year"; $nav.=" \n"; $nav.="".img_next($langs->trans("Next"))."\n"; -print_fiche_titre($langs->trans("Calendar"),$nav,''); + +$title=$langs->trans("DoneAndToDoActions"); +if ($status == 'done') $title=$langs->trans("DoneActions"); +if ($status == 'todo') $title=$langs->trans("ToDoActions"); + +print_fiche_titre($title,$nav,''); // Filters if ($canedit) @@ -129,7 +145,10 @@ if ($canedit) print $form->select_users($filtera,'userasked',1,'',!$canedit); print ''; print ''; - print ''; + print img_picto($langs->trans("ViewList"),'object_list').' '; + print '
'; + print '
'; + print img_picto($langs->trans("ViewCal"),'object_calendar').' '; print ''; print ''; diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 1b35feb3475..453cc48393c 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -33,9 +33,9 @@ require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); $langs->load("companies"); $langs->load("agenda"); -$filtera = isset($_REQUEST["userasked"])?$_REQUEST["userasked"]:''; -$filtert = isset($_REQUEST["usertodo"])?$_REQUEST["usertodo"]:''; -$filterd = isset($_REQUEST["userdone"])?$_REQUEST["userdone"]:''; +$filtera = isset($_REQUEST["userasked"])?$_REQUEST["userasked"]:(isset($_REQUEST["filtera"])?$_REQUEST["filtera"]:''); +$filtert = isset($_REQUEST["usertodo"])?$_REQUEST["usertodo"]:(isset($_REQUEST["filtert"])?$_REQUEST["filtert"]:''); +$filterd = isset($_REQUEST["userdone"])?$_REQUEST["userdone"]:(isset($_REQUEST["filterd"])?$_REQUEST["filterd"]:''); $socid = isset($_GET["socid"])?$_GET["socid"]:$_POST["socid"]; $sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"]; @@ -76,14 +76,30 @@ if (! $sortfield) } -llxHeader(); -$form=new Form($db); +/* +* Actions +*/ +if (! empty($_POST["viewcal"])) +{ + $param=''; + foreach($_POST as $key => $val) + { + $param.='&'.$key.'='.urlencode($val); + } + //print $param; + header("Location: ".DOL_URL_ROOT.'/comm/action/index.php?'.$param); + exit; +} + + /* - * Affichage liste des actions - * + * View */ +llxHeader(); +$form=new Form($db); + $sql = "SELECT s.nom as societe, s.rowid as socid, s.client,"; $sql.= " a.id, ".$db->pdate("a.datep")." as dp, ".$db->pdate("a.datep2")." as dp2,"; $sql.= " ".$db->pdate("a.datea")." as da, ".$db->pdate("a.datea2")." as da2,"; @@ -139,9 +155,11 @@ if ($resql) $societestatic=new Societe($db); $num = $db->num_rows($resql); - $title="DoneAndToDoActions"; - if ($status == 'done') $title="DoneActions"; - if ($status == 'todo') $title="ToDoActions"; + + $title=$langs->trans("DoneAndToDoActions"); + if ($status == 'done') $title=$langs->trans("DoneActions"); + if ($status == 'todo') $title=$langs->trans("ToDoActions"); + $param="&status=".$status; if ($socid) @@ -149,7 +167,7 @@ if ($resql) $societe = new Societe($db); $societe->fetch($socid); - print_barre_liste($langs->trans($title."For",$societe->nom), $page, $_SERVER["PHP_SELF"], $param,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans($title).' '.$langs->trans("For").' '.$societe->nom, $page, $_SERVER["PHP_SELF"], $param,$sortfield,$sortorder,'',$num); } else { @@ -172,7 +190,10 @@ if ($resql) print $form->select_users($filtera,'userasked',1,'',!$canedit); print ''; print ''; - print ''; + print img_picto($langs->trans("ViewList"),'object_list').' '; + print '
'; + print '
'; + print img_picto($langs->trans("ViewCal"),'object_calendar').' '; print ''; print ''; diff --git a/htdocs/comm/action/pre.inc.php b/htdocs/comm/action/pre.inc.php index 819c94b64f5..fbf7086a193 100644 --- a/htdocs/comm/action/pre.inc.php +++ b/htdocs/comm/action/pre.inc.php @@ -35,44 +35,35 @@ function llxHeader($head = "", $urlp = "") $menu = new Menu(); - - $langs->load("commercial"); - - - $langs->load("agenda"); - - // Calendar - $menu->add(DOL_URL_ROOT."/comm/action/index.php?leftmenu=agenda", $langs->trans("Calendar"), 0, $user->rights->agenda->myactions->read); - // Actions - $menu->add_submenu(DOL_URL_ROOT."/comm/action/indexactions.php?leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/fiche.php?leftmenu=agenda&action=create", $langs->trans("NewAction"), 1, $user->rights->agenda->myactions->read); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->myactions->read); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->myactions->read); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&time=today", $langs->trans("Today"), 2, $user->rights->agenda->myactions->read); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->myactions->read); - - // Events - $menu->add_submenu(DOL_URL_ROOT."/comm/action/listevents.php?leftmenu=agenda", $langs->trans("Events"), 0, $user->rights->agenda->events->read); - - - if ($conf->societe->enabled) { - $langs->load("companies"); - $menu->add(DOL_URL_ROOT."/comm/clients.php", $langs->trans("Customers")); - $menu->add_submenu(DOL_URL_ROOT."/comm/contact.php?type=c", $langs->trans("Contacts")); - } - - if ($conf->commercial->enabled) { - $langs->load("commercial"); - $menu->add(DOL_URL_ROOT."/comm/prospect/prospects.php", $langs->trans("Prospects")); - $menu->add_submenu(DOL_URL_ROOT."/comm/contact.php?type=p", $langs->trans("Contacts")); - } - - if ($conf->propal->enabled) { - $langs->load("propal"); - $menu->add(DOL_URL_ROOT."/comm/propal.php", $langs->trans("Prop")); - } + if ($conf->agenda->enabled) + { + $langs->load("agenda"); + + // Actions + $menu->add_submenu(DOL_URL_ROOT."/comm/action/indexactions.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/fiche.php?mainmenu=agenda&leftmenu=agenda&action=create", $langs->trans("NewAction"), 1, $user->rights->agenda->myactions->read); + // List + $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); + $menu->add_submenu(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) + { + $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); + } + // Calendar + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Calendar"), 1, $user->rights->agenda->allactions->read); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); + $menu->add_submenu(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) + { + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); + } + // Reports + $menu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->myactions->read); + } left_menu($menu->liste); } diff --git a/htdocs/comm/action/rapport/pre.inc.php b/htdocs/comm/action/rapport/pre.inc.php index 7c32abdb330..3ee4c023d8b 100644 --- a/htdocs/comm/action/rapport/pre.inc.php +++ b/htdocs/comm/action/rapport/pre.inc.php @@ -35,42 +35,35 @@ function llxHeader($head = "", $urlp = "") $menu = new Menu(); - $langs->load("commercial"); - $langs->load("agenda"); - - // Calendar - $menu->add(DOL_URL_ROOT."/comm/action/index.php?leftmenu=agenda", $langs->trans("Calendar"), 0, $user->rights->agenda->myactions->read); - // Actions - $menu->add_submenu(DOL_URL_ROOT."/comm/action/indexactions.php?leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/fiche.php?leftmenu=agenda&action=create", $langs->trans("NewAction"), 1, $user->rights->agenda->myactions->read); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->myactions->read); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->myactions->read); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&time=today", $langs->trans("Today"), 2, $user->rights->agenda->myactions->read); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->myactions->read); - - // Events - $menu->add_submenu(DOL_URL_ROOT."/comm/action/listevents.php?leftmenu=agenda", $langs->trans("Events"), 0, $user->rights->agenda->events->read); - - - if ($conf->societe->enabled) { - $langs->load("companies"); - $menu->add(DOL_URL_ROOT."/comm/clients.php", $langs->trans("Customers")); - $menu->add_submenu(DOL_URL_ROOT."/comm/contact.php?type=c", $langs->trans("Contacts")); - } - - if ($conf->commercial->enabled) { - $langs->load("commercial"); - $menu->add(DOL_URL_ROOT."/comm/prospect/prospects.php", $langs->trans("Prospects")); - $menu->add_submenu(DOL_URL_ROOT."/comm/contact.php?type=p", $langs->trans("Contacts")); - } - - if ($conf->propal->enabled) { - $langs->load("propal"); - $menu->add(DOL_URL_ROOT."/comm/propal.php", $langs->trans("Prop")); - } - + if ($conf->agenda->enabled) + { + $langs->load("agenda"); + + // Actions + $menu->add_submenu(DOL_URL_ROOT."/comm/action/indexactions.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/fiche.php?mainmenu=agenda&leftmenu=agenda&action=create", $langs->trans("NewAction"), 1, $user->rights->agenda->myactions->read); + // List + $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); + $menu->add_submenu(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) + { + $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); + } + // Calendar + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Calendar"), 1, $user->rights->agenda->allactions->read); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); + $menu->add_submenu(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) + { + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); + } + // Reports + $menu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->myactions->read); + } left_menu($menu->liste); } diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index 99cf4f80244..4d16d8da56c 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -348,188 +348,15 @@ if ($socid > 0) print "
"; - /* - * Listes des actions a faire - * - */ - print ''; - print ''; - print ''; - - $sql = "SELECT a.id, a.label, ".$db->pdate("a.datep")." as dp, c.code as acode, c.libelle, u.login, a.propalrowid, a.fk_user_author, fk_contact, u.rowid "; - $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u "; - $sql .= " WHERE a.fk_soc = ".$societe->id; - $sql .= " AND u.rowid = a.fk_user_author"; - $sql .= " AND c.id=a.fk_action AND a.percent < 100"; - $sql .= " ORDER BY a.datep DESC, a.id DESC"; - - $result=$db->query($sql); - if ($result) - { - $i = 0 ; - $num = $db->num_rows($result); - $var=true; - - while ($i < $num) - { - $var = !$var; - - $obj = $db->fetch_object($result); - print ""; - - print '\n"; - $oldyear = strftime("%Y",$obj->dp); - - print '\n"; - $oldmonth = strftime("%Y%b",$obj->dp); - - print '\n"; - print '\n"; - if (date("U",$obj->dp) < time()) - { - print ""; - } - else - { - print ''; - } - - // Status/Percent - print ''; - - if ($obj->propalrowid) - { - print ''; - } - else - { - $actionstatic->code=$obj->acode; - $actionstatic->libelle=$obj->libelle; - $actionstatic->id=$obj->id; - print ''; - } - print ''; - - // Contact pour cette action - if ($obj->fk_contact) { - $contact = new Contact($db); - $contact->fetch($obj->fk_contact); - print ''; - } else { - print ''; - } - - print ''; - - // Statut - print ''; - - print "\n"; - $i++; - } - - $db->free($result); - } else { - dolibarr_print_error($db); - } - print "
'.$langs->trans("ActionsToDo").' 
'.strftime("%Y",$obj->dp)."' .strftime("%b",$obj->dp)."'.strftime("%d",$obj->dp)."'.strftime("%H:%M",$obj->dp)."".img_warning("Late")."  '.img_object($langs->trans("ShowAction"),"task"); - $transcode=$langs->trans("Action".$obj->acode); - $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle); - print $libelle; - print ''.$actionstatic->getNomUrl(1,16).''.$obj->label.''.img_object($langs->trans("ShowContact"),"contact").' '.$contact->getFullName($langs).' '.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.''.$actionstatic->LibStatut($obj->percent,3).'

"; - - /* - * Listes des actions effectuées - */ - print ''; - print ''; - print ''; - - $sql = "SELECT a.id, a.label,"; - $sql.= " ".$db->pdate("a.datea")." as da,"; - $sql.= " a.propalrowid, a.fk_user_author, a.fk_contact, a.percent,"; - $sql.= " c.code as acode, c.libelle,"; - $sql.= " u.login, u.rowid "; - $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u "; - $sql .= " WHERE a.fk_soc = ".$societe->id; - $sql .= " AND u.rowid = a.fk_user_author"; - $sql .= " AND c.id=a.fk_action AND a.percent = 100"; - $sql .= " ORDER BY a.datea DESC, a.id DESC"; - - $result=$db->query($sql); - if ($result) - { - $i = 0 ; - $num = $db->num_rows($result); - $var=true; - - while ($i < $num) - { - $var = !$var; - - $obj = $db->fetch_object($result); - print ""; - - print '\n"; - $oldyear = strftime("%Y",$obj->da); - - print '\n"; - $oldmonth = strftime("%Y%b",$obj->da); - - print '\n"; - print '\n"; - - // Espace - print ''; - - // Action - print ''; - print ''; - - print ''; - - // Libellé - print ''; - - // Contact pour cette action - if ($obj->fk_contact) - { - $contact = new Contact($db); - $contact->fetch($obj->fk_contact); - print ''; - } - else - { - print ''; - } - - print ''; - - // Statut - print ''; - - print "\n"; - $i++; - } - $db->free($result); - } - else - { - dolibarr_print_error($db); - } - print "
'.$langs->trans("ActionsDone").'
'.strftime("%Y",$obj->da)."'.strftime("%b",$obj->da)."'.strftime("%d",$obj->da)."'.strftime("%H:%M",$obj->da)." '; - $actionstatic->code=$obj->acode; - $actionstatic->libelle=$obj->libelle; - $actionstatic->id=$obj->id; - print ''.$actionstatic->getNomUrl(1,16).''; - if ($conf->propal->enabled && $obj->propalrowid) - { - print ''.img_object($langs->trans("ShowPropal"),"propal"); - print $langs->trans("Propal"); - print ''; - } - else print ' '; - print ''.$obj->label.''.img_object($langs->trans("ShowContact"),"contact").' '.$contact->getFullName($langs).' '.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.''.$actionstatic->LibStatut($obj->percent,3).'
"; + /* + * Listes des actions a faire + */ + show_actions_todo($conf,$langs,$db,$societe); + + /* + * Listes des actions effectuees + */ + show_actions_done($conf,$langs,$db,$societe); } $db->close(); diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index f54e5c9d590..2609d0efea2 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -708,20 +708,28 @@ class MenuLeft { $langs->load("agenda"); // Actions - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/indexactions.php?leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/fiche.php?leftmenu=agenda&action=create", $langs->trans("NewAction"), 1, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=done&filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/indexactions.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/fiche.php?mainmenu=agenda&leftmenu=agenda&action=create", $langs->trans("NewAction"), 1, $user->rights->agenda->myactions->read); + // List + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read); + $newmenu->add_submenu(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_submenu(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_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); } - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->myactions->read); - // Calendar - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?leftmenu=agenda", $langs->trans("Calendar"), 0, $user->rights->agenda->allactions->read); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Calendar"), 1, $user->rights->agenda->allactions->read); + $newmenu->add_submenu(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_submenu(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_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); + } + // Reports + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->myactions->read); } } diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index 957f3e08e74..020eec83d96 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -671,7 +671,6 @@ class MenuLeft { /* * Menu AGENDA */ - /* if ($mainmenu == 'agenda') { // Actions @@ -680,20 +679,30 @@ class MenuLeft { $langs->load("agenda"); // Actions - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/indexactions.php?leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/fiche.php?leftmenu=agenda&action=create", $langs->trans("NewAction"), 1, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read); - //$newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); - //$newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=done&filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->myactions->read); - + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/indexactions.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/fiche.php?mainmenu=agenda&leftmenu=agenda&action=create", $langs->trans("NewAction"), 1, $user->rights->agenda->myactions->read); + // List + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read); + $newmenu->add_submenu(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_submenu(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_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); + } // Calendar - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?leftmenu=agenda", $langs->trans("Calendar"), 0, $user->rights->agenda->allactions->read); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Calendar"), 1, $user->rights->agenda->allactions->read); + $newmenu->add_submenu(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_submenu(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_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); + } + // Reports + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->myactions->read); } } - */ /* * Menu PROJETS diff --git a/htdocs/includes/menus/barre_top/rodolphe.php b/htdocs/includes/menus/barre_top/rodolphe.php index f52c998d526..93ed8ccb768 100644 --- a/htdocs/includes/menus/barre_top/rodolphe.php +++ b/htdocs/includes/menus/barre_top/rodolphe.php @@ -15,13 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ */ /** \file htdocs/includes/menus/barre_top/rodolphe.php \brief Gestionnaire par d�faut du menu du haut + \version $Id$ \remarks La construction d'un gestionnaire pour le menu du haut est simple: \remarks Toutes les entrees de menu e faire apparaitre dans la barre du haut @@ -56,7 +55,6 @@ class MenuTop { */ function showmenu() { - global $user,$conf,$langs,$dolibarr_main_db_name; if (! session_id()) { @@ -324,6 +322,7 @@ class MenuTop { $url.="&idmenu=".$tabMenu[$i]['rowid']; // Define idsel if (! empty($_GET["idmenu"]) && $tabMenu[$i]['rowid'] == $_GET["idmenu"]) $idsel='id="sel" '; + elseif (! empty($_GET["mainmenu"]) && $_GET["mainmenu"] == $tabMenu[$i]['mainmenu']) $idsel='id="sel" '; else $idsel=''; print 'atarget?" target=$this->atarget":"").'>'.$tabMenu[$i]['titre'].''; } diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index 8ea35f075d6..33016ff72cd 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -19,3 +19,5 @@ ActionsToDoBy=Actions affected to ActionsDoneBy=Actions done by AllMyActions=All my actions/tasks AllActions=Toutes les actions/tasks +ViewList=View list +ViewCal=View calendar diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang index fd82c07bb9a..d0c8f5eb6f0 100644 --- a/htdocs/langs/fr_FR/agenda.lang +++ b/htdocs/langs/fr_FR/agenda.lang @@ -18,4 +18,6 @@ ActionsAskedBy=Actions enregistr ActionsToDoBy=Actions affectées à ActionsDoneBy=Actions réalisées par AllMyActions=Toutes mes actions/taches -AllActions=Toutes les actions/taches \ No newline at end of file +AllActions=Toutes les actions/taches +ViewList=Voir liste +ViewCal=Voir calendrier \ No newline at end of file diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php index 389b0127a0e..e35a91fb7df 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/lib/company.lib.php @@ -236,14 +236,14 @@ function show_actions_todo($conf,$langs,$db,$objsoc) { require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); $actionstatic=new ActionComm($db); - $userstatic=new User($db); - $contactstatic = new Contact($db); + $userstatic=new User($db); + $contactstatic = new Contact($db); print_titre($langs->trans("ActionsOnCompany")); print ''; print ''; - print ''; + print ''; print ''; $sql = "SELECT a.id, a.label,"; @@ -373,7 +373,7 @@ function show_actions_done($conf,$langs,$db,$objsoc) print '
'.$langs->trans("ActionsToDoShort").' '.$langs->trans("ActionsToDoShort").' 
'; print ''; - print ''; + print ''; print ''; $sql = "SELECT a.id, a.label,"; diff --git a/htdocs/theme/auguria/img/object_list.png b/htdocs/theme/auguria/img/object_list.png new file mode 100644 index 00000000000..21e11a04fd7 Binary files /dev/null and b/htdocs/theme/auguria/img/object_list.png differ diff --git a/htdocs/theme/bluelagoon/img/object_list.png b/htdocs/theme/bluelagoon/img/object_list.png new file mode 100644 index 00000000000..21e11a04fd7 Binary files /dev/null and b/htdocs/theme/bluelagoon/img/object_list.png differ diff --git a/htdocs/theme/dev/img/object_list.png b/htdocs/theme/dev/img/object_list.png new file mode 100644 index 00000000000..21e11a04fd7 Binary files /dev/null and b/htdocs/theme/dev/img/object_list.png differ diff --git a/htdocs/theme/eldy/img/object_list.png b/htdocs/theme/eldy/img/object_list.png new file mode 100644 index 00000000000..21e11a04fd7 Binary files /dev/null and b/htdocs/theme/eldy/img/object_list.png differ diff --git a/htdocs/theme/freelug/img/object_list.png b/htdocs/theme/freelug/img/object_list.png new file mode 100644 index 00000000000..21e11a04fd7 Binary files /dev/null and b/htdocs/theme/freelug/img/object_list.png differ diff --git a/htdocs/theme/yellow/img/object_list.png b/htdocs/theme/yellow/img/object_list.png new file mode 100644 index 00000000000..21e11a04fd7 Binary files /dev/null and b/htdocs/theme/yellow/img/object_list.png differ
'.$langs->trans("ActionsDoneShort").''.$langs->trans("ActionsDoneShort").'