diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 8a0d09ba107..0dac0ad1bea 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -36,9 +36,7 @@ require_once("../../actioncomm.class.php"); $langs->load("companies"); -/* - * Sécurité accés client - */ +// Sécurité accés client if ($user->societe_id > 0) { $action = ''; @@ -56,10 +54,11 @@ $offset = $limit * $page ; if (! $sortorder) $sortorder="DESC"; if (! $sortfield) $sortfield="a.datea"; +$status=isset($_GET["status"])?$_GET["status"]:$_POST["status"]; + llxHeader(); - /* * Affichage liste des actions * @@ -68,7 +67,6 @@ llxHeader(); $sql = "SELECT s.nom as societe, s.idp as socidp, s.client, a.id,".$db->pdate("a.datea")." as da, a.datea, c.code as acode, c.libelle, u.code, a.fk_contact, a.note, a.percent as percent"; $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."user as u"; $sql .= " WHERE a.fk_soc = s.idp AND c.id=a.fk_action AND a.fk_user_author = u.rowid"; - if ($_GET["type"]) { $sql .= " AND c.id = ".$_GET["type"]; @@ -81,108 +79,116 @@ if ($socid) { $sql .= " AND s.idp = $socid"; } -$sql .= " ORDER BY a.datea DESC"; +if ($status == 'done') { $sql.= " AND a.percent = 100"; } +if ($status == 'todo') { $sql.= " AND a.percent < 100"; } +$sql .= " ORDER BY $sortfield $sortorder"; $sql .= $db->plimit( $limit + 1, $offset); $resql=$db->query($sql); if ($resql) { - $num = $db->num_rows($resql); - if ($socid) + $num = $db->num_rows($resql); + $title="DoneAndToDoActions"; + if ($status == 'done') $title="DoneActions"; + if ($status == 'todo') $title="ToDoActions"; + + if ($socid) { - $societe = new Societe($db); - $societe->fetch($socid); - - print_barre_liste($langs->trans("DoneAndToDoTasksFor",$societe->nom), $page, "index.php",'',$sortfield,$sortorder,'',$num); + $societe = new Societe($db); + $societe->fetch($socid); + + print_barre_liste($langs->trans($title."For",$societe->nom), $page, "index.php",'',$sortfield,$sortorder,'',$num); } - else - { - print_barre_liste($langs->trans("DoneAndToDoTasks"), $page, "index.php",'',$sortfield,$sortorder,'',$num); - } - $i = 0; - print ""; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - $var=true; - while ($i < min($num,$limit)) + else { - $obj = $db->fetch_object($resql); - - $var=!$var; - - print ""; - - if ($oldyear == strftime("%Y",$obj->da) ) - { - print ''; - } - else - { - print "\n"; - $oldyear = strftime("%Y",$obj->da); - } - - if ($oldmonth == strftime("%Y%b",$obj->da) ) - { - print ''; - } - else - { - print "\n"; - $oldmonth = strftime("%Y%b",$obj->da); - } - - print "\n"; - print "\n"; - if ($obj->percent < 100) { - print ""; - } - else { - print ""; - } - print ''; - - // Société - print ''; + print_barre_liste($langs->trans($title), $page, "index.php",'',$sortfield,$sortorder,'',$num); + } + $i = 0; + print "
'.$langs->trans("Date").''.$langs->trans("Status").''.$langs->trans("Action").''.$langs->trans("Company").''.$langs->trans("Contact").''.$langs->trans("Comments").''.$langs->trans("Author").'
 " .strftime("%Y",$obj->da)." " .strftime("%b",$obj->da)."" .strftime("%d",$obj->da)."" .strftime("%H:%M",$obj->da)."".$obj->percent."%".$langs->trans("Done")."'.img_object($langs->trans("ShowTask"),"task").' '; - $transcode=$langs->trans("Action".$obj->acode); - $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle); - print $libelle; - print ''; - if ($obj->client == 1) $url=DOL_URL_ROOT.'/comm/fiche.php?socid='; - elseif ($obj->client == 2) $url=DOL_URL_ROOT.'/comm/prospect/fiche.php?id='; - else $url=DOL_URL_ROOT.'/soc.php?socid='; - print ' '.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->societe,32).'
"; + print ''; + print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"a.datea","&status=$status",'','colspan="4"',$sortfield); + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent","&status=$status","","",$sortfield); + print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"acode","&status=$status","","",$sortfield); + print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","&status=$status","","",$sortfield); + print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"a.fk_contact","&status=$status","","",$sortfield); + print ''; + print_liste_field_titre($langs->trans("Author"),$_SERVER["PHP_SELF"],"u.code","&status=$status","","",$sortfield); + print "\n"; + $var=true; + while ($i < min($num,$limit)) + { + $obj = $db->fetch_object($resql); - // Contact - print ''; + $var=!$var; - // Note - print ''; + print ""; - // Auteur - print ''; - - print "\n"; - $i++; - } + if ($oldyear == strftime("%Y",$obj->da) ) + { + print ''; + } + else + { + print "\n"; + $oldyear = strftime("%Y",$obj->da); + } + + if ($oldmonth == strftime("%Y%b",$obj->da) ) + { + print ''; + } + else + { + print "\n"; + $oldmonth = strftime("%Y%b",$obj->da); + } + + print "\n"; + print "\n"; + + if ($obj->percent < 100) { + print ""; + } + else { + print ""; + } + + print ''; + + // Sociét + print ''; + + // Contact + print ''; + + // Note + print ''; + + // Auteur + print ''; + + print "\n"; + $i++; + } print "
'.$langs->trans("Comments").'
'; - if ($obj->fk_contact) - { - $cont = new Contact($db); - $cont->fetch($obj->fk_contact); - print ''.img_object($langs->trans("ShowContact"),"contact").' '.dolibarr_trunc($cont->fullname,32).''; - } - else - { - print " "; - } - print ''.dolibarr_trunc($obj->note, 16).'
'.$obj->code.'
 " .strftime("%Y",$obj->da)." " .strftime("%b",$obj->da)."" .strftime("%d",$obj->da)."" .strftime("%H:%M",$obj->da)."".$obj->percent."%".$langs->trans("Done")."'.img_object($langs->trans("ShowTask"),"task").' '; + $transcode=$langs->trans("Action".$obj->acode); + $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle); + print dolibarr_trunc($libelle,16); + print ''; + if ($obj->client == 1) $url=DOL_URL_ROOT.'/comm/fiche.php?socid='; + elseif ($obj->client == 2) $url=DOL_URL_ROOT.'/comm/prospect/fiche.php?id='; + else $url=DOL_URL_ROOT.'/soc.php?socid='; + print ' '.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->societe,32).''; + if ($obj->fk_contact) + { + $cont = new Contact($db); + $cont->fetch($obj->fk_contact); + print ''.img_object($langs->trans("ShowContact"),"contact").' '.dolibarr_trunc($cont->fullname,32).''; + } + else + { + print " "; + } + print ''.dolibarr_trunc($obj->note, 16).''.$obj->code.'
"; $db->free($resql); @@ -195,5 +201,5 @@ else $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/action/pre.inc.php b/htdocs/comm/action/pre.inc.php index 81e2246dfe4..d0f10218e69 100644 --- a/htdocs/comm/action/pre.inc.php +++ b/htdocs/comm/action/pre.inc.php @@ -1,5 +1,6 @@ + * Copyright (C) 2005 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +21,7 @@ * */ -/*! +/** \file htdocs/comm/action/pre.inc.php \brief Fichier gestionnaire du menu de gauche de la zone actions \version $Revision$ @@ -29,43 +30,44 @@ require("../../main.inc.php"); -function llxHeader($head = "", $urlp = "") { - global $conf,$user,$langs; - - top_menu($head); - - $menu = new Menu(); - - - $menu->add(DOL_URL_ROOT."/comm/action/", $langs->trans("Actions")); - - $menu->add_submenu(DOL_URL_ROOT."/comm/action/?time=today", $langs->trans("Today")); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/", $langs->trans("Reporting")); - - 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("Propales")); - } - - if ($conf->projet->enabled) { - $langs->load("projects"); - $menu->add(DOL_URL_ROOT."/projet/index.php", $langs->trans("Projects")); - } - - left_menu($menu->liste); - +function llxHeader($head = "", $urlp = "") +{ + global $conf,$user,$langs; + + top_menu($head); + + $menu = new Menu(); + + + $menu->add(DOL_URL_ROOT."/comm/action/", $langs->trans("Actions")); + + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?time=today", $langs->trans("Today")); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?status=todo", $langs->trans("ToDoActions"), 1); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php", $langs->trans("Reporting")); + + 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("Propales")); + } + + if ($conf->projet->enabled) { + $langs->load("projects"); + $menu->add(DOL_URL_ROOT."/projet/index.php", $langs->trans("Projects")); + } + + left_menu($menu->liste); } ?> diff --git a/htdocs/comm/action/rapport/pre.inc.php b/htdocs/comm/action/rapport/pre.inc.php index b23fa916f9f..22ee5a31d9e 100644 --- a/htdocs/comm/action/rapport/pre.inc.php +++ b/htdocs/comm/action/rapport/pre.inc.php @@ -1,5 +1,6 @@ + * Copyright (C) 2005 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +21,8 @@ * */ -/*! \file htdocs/comm/action/rapport/pre.inc.php +/** + \file htdocs/comm/action/rapport/pre.inc.php \brief Fichier gestionnaire du menu de gauche de la zone rapport des actions \version $Revision$ */ @@ -28,43 +30,44 @@ require("../../../main.inc.php"); require("./rapport.pdf.php"); -function llxHeader($head = "", $urlp = "") { - global $conf,$user,$langs; - - top_menu($head); - - $menu = new Menu(); - - - $menu->add(DOL_URL_ROOT."/comm/action/", $langs->trans("Actions")); - - $menu->add_submenu(DOL_URL_ROOT."/comm/action/?time=today", $langs->trans("Today")); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/", $langs->trans("Reporting")); - - 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("Propales")); - } - - if ($conf->projet->enabled) { - $langs->load("projects"); - $menu->add(DOL_URL_ROOT."/projet/index.php", $langs->trans("Projects")); - } - - left_menu($menu->liste); - +function llxHeader($head = "", $urlp = "") +{ + global $conf,$user,$langs; + + top_menu($head); + + $menu = new Menu(); + + + $menu->add(DOL_URL_ROOT."/comm/action/", $langs->trans("Actions")); + + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?time=today", $langs->trans("Today")); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?status=todo", $langs->trans("ToDoActions"), 1); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php", $langs->trans("Reporting")); + + 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("Propales")); + } + + if ($conf->projet->enabled) { + $langs->load("projects"); + $menu->add(DOL_URL_ROOT."/projet/index.php", $langs->trans("Projects")); + } + + left_menu($menu->liste); } ?> diff --git a/htdocs/includes/menus/barre_left/eldy.php b/htdocs/includes/menus/barre_left/eldy.php index 1006839035c..2dfe266f1ab 100644 --- a/htdocs/includes/menus/barre_left/eldy.php +++ b/htdocs/includes/menus/barre_left/eldy.php @@ -130,7 +130,7 @@ class MenuLeft { if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/dict.php", $langs->trans("DictionnarySetup")); if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/const.php", $langs->trans("OtherSetup")); - $newmenu->add(DOL_URL_ROOT."/admin/system/index.php?leftmenu=system", $langs->trans("System")); + $newmenu->add(DOL_URL_ROOT."/admin/system/index.php?leftmenu=system", $langs->trans("SystemInfo")); if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/admin/system/dolibarr.php", $langs->trans("Dolibarr"),1); if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/admin/system/constall.php", $langs->trans("AllParameters"),2); if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/about.php", $langs->trans("About"),2); @@ -175,6 +175,7 @@ class MenuLeft { // Actions $newmenu->add(DOL_URL_ROOT."/comm/action/index.php?leftmenu=actions", $langs->trans("Actions"), 0); + if ($leftmenu=="actions") $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?status=todo", $langs->trans("ToDoActions"), 1); if ($leftmenu=="actions") $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?time=today", $langs->trans("Today"), 1); if ($leftmenu=="actions") $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php", $langs->trans("Reportings"), 1);