lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix duplicate view of agenda/events for projects

Browse Source
This commit is contained in:
Laurent Destailleur 2017-01-02 12:34:23 +01:00
parent 40fa816b99
commit 477b9c8338
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/projet/class/project.class.php
View File

@ -1498,7 +1498,7 @@ class Project extends CommonObject
{ {
$sql="UPDATE ".MAIN_DB_PREFIX.$tableName; $sql="UPDATE ".MAIN_DB_PREFIX.$tableName;
if ($TableName=="actioncomm") if ($tableName == "actioncomm")
{ {
$sql.= " SET fk_project=".$this->id; $sql.= " SET fk_project=".$this->id;
$sql.= " WHERE id=".$elementSelectId; $sql.= " WHERE id=".$elementSelectId;

2
htdocs/projet/element.php
View File

@ -382,6 +382,7 @@ $listofreferent=array(
'buttonnew'=>'AddTimeSpent', 'buttonnew'=>'AddTimeSpent',
'testnew'=>$user->rights->projet->creer, 'testnew'=>$user->rights->projet->creer,
'test'=>($conf->projet->enabled && $user->rights->projet->lire && empty($conf->global->PROJECT_HIDE_TASKS))), 'test'=>($conf->projet->enabled && $user->rights->projet->lire && empty($conf->global->PROJECT_HIDE_TASKS))),
/* No need for this, available on dedicated tab "Agenda/Events"
'agenda'=>array( 'agenda'=>array(
'name'=>"Agenda", 'name'=>"Agenda",
'title'=>"ListActionsAssociatedProject", 'title'=>"ListActionsAssociatedProject",
@ -394,6 +395,7 @@ $listofreferent=array(
'buttonnew'=>'AddEvent', 'buttonnew'=>'AddEvent',
'testnew'=>$user->rights->agenda->myactions->create, 'testnew'=>$user->rights->agenda->myactions->create,
'test'=>$conf->agenda->enabled && $user->rights->agenda->myactions->read), 'test'=>$conf->agenda->enabled && $user->rights->agenda->myactions->read),
*/
); );
$parameters=array('listofreferent'=>$listofreferent); $parameters=array('listofreferent'=>$listofreferent);