diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 99a07c17248..b56f1fc307a 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -142,6 +142,9 @@ print '
| '.$langs->trans("SessionName").' | | '.$langs->trans("SessionId").' | '.session_id().' |
'."\n";
print '| '.$langs->trans("CurrentSessionTimeOut").' | '.ini_get('session.gc_maxlifetime').' '.$langs->trans("seconds");
print ' | ';
+print ''."\n";
+print ''."\n";
+print ''."\n";
print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
print " |
\n";
print '| '.$langs->trans("CurrentTheme").' | '.$conf->theme.' |
'."\n";
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 4e8b87eb591..773ef31dff0 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -252,19 +252,19 @@ if ($action == 'add')
}
}
$object->fk_project = isset($_POST["projectid"])?$_POST["projectid"]:0;
-
+
$taskid = GETPOST('taskid','int');
if(!empty($taskid)){
-
+
$taskProject = new Task($db);
if($taskProject->fetch($taskid)>0){
$object->fk_project = $taskProject->fk_project;
}
-
+
$object->fk_element = $taskid;
$object->elementtype = 'task';
}
-
+
$object->datep = $datep;
$object->datef = $datef;
$object->percentage = $percentage;
@@ -888,17 +888,17 @@ if ($action == 'create')
{
// Projet associe
$langs->load("projects");
-
+
$projectid = GETPOST('projectid', 'int');
print '| '.$langs->trans("Project").' | ';
$numproject=$formproject->select_projects((! empty($societe->id)?$societe->id:-1), $projectid, 'projectid', 0, 0, 1, 1);
-
+
print ' '.$langs->trans("AddProject").'';
$urloption='?action=create';
$url = dol_buildpath('comm/action/card.php',2).$urloption;
-
+
// update task list
print "\n".''."\n";
-
+
print ' |
';
-
+
print '| '.$langs->trans("Task").' | ';
-
+
$projectsListId=false;
if(!empty($projectid)){ $projectsListId=$projectid; }
$tid=GETPOST("projecttaskid")?GETPOST("projecttaskid"):'';
@@ -1230,7 +1230,7 @@ if ($id > 0)
$listofuserid=json_decode($_SESSION['assignedtouser'], true);
}
}
- $listofcontactid=$object->socpeopleassigned; // Contact assigned (not used yet)
+ $listofcontactid=$object->socpeopleassigned; // Contact assigned
$listofotherid=$object->otherassigned; // Other undefined email (not used yet)
print ' |
| '.$langs->trans("ActionAssignedTo").' | ';
@@ -1309,14 +1309,14 @@ if ($id > 0)
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
print ' |
';
print '| '.$langs->trans("LinkedObject").' | ';
-
+
if ($object->elementtype == 'task' && ! empty($conf->projet->enabled))
{
print '';
-
+
$urloption='?action=create'; // we use create not edit for more flexibility
$url = DOL_URL_ROOT.'/comm/action/card.php'.$urloption;
-
+
// update task list
print "\n".''."\n";
-
+
$formproject->selectTasks((! empty($societe->id)?$societe->id:-1), $object->fk_element, 'fk_element', 24, 0, 0, 1, 0, 0, 'maxwidth500',$object->fk_project);
print '';
-
+
print ' | ';
}
else
@@ -1343,7 +1343,7 @@ if ($id > 0)
print '';
print '';
}
-
+
print '
';
}