diff --git a/htdocs/timesheet/AttendanceEventAdmin.php b/htdocs/timesheet/AttendanceEventAdmin.php
index ead5310..5d8482b 100644
--- a/htdocs/timesheet/AttendanceEventAdmin.php
+++ b/htdocs/timesheet/AttendanceEventAdmin.php
@@ -54,6 +54,10 @@
$id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
$action = GETPOST('action', 'alpha');
+$view = GETPOST('view', 'alpha');
+if ($view != ''){
+ $action = $view;
+}
$backtopage = GETPOST('backtopage');
$cancel = GETPOST('cancel');
$confirm = GETPOST('confirm');
@@ -458,7 +462,7 @@ function init_myfunc()
print '';
print ''."\n";
$i = 0;
- // $basedurl = dirname($PHP_SELF).'/attendanceeventCard.php?action=view&id=';
+ // $basedurl = dirname($PHP_SELF).'/attendanceeventCard.php?view=card&id=';
while($i < $num && $i<$limit)
{
$obj = $db->fetch_object($resql);
diff --git a/htdocs/timesheet/Timesheet.php b/htdocs/timesheet/Timesheet.php
index 6eb7f0e..96d9ddc 100644
--- a/htdocs/timesheet/Timesheet.php
+++ b/htdocs/timesheet/Timesheet.php
@@ -28,6 +28,12 @@
require_once 'core/lib/timesheet.lib.php';
require_once 'class/TimesheetUserTasks.class.php';
$action = GETPOST('action', 'alpha');
+$view = GETPOST('view', 'alpha');
+
+if ($view != ''){
+ $action = $view;
+}
+
$datestart = GETPOST('dateStart', 'int');
//should return the XMLDoc
$ajax = GETPOST('ajax', 'int');
@@ -37,10 +43,11 @@
//$toDate = GETPOST('toDate');
$toDate = GETPOST('toDate', 'alpha')?:'';
-$toDateday = (!empty($toDate) && $action == 'goToDate')?GETPOST('toDateday', 'int') :0;// to not look for the date if action not goTodate
+$toDateday = (!empty($toDate) && $action == 'goToDate')?GETPOST('toDateday', 'int') :0;// to not look for the date if action not goToDate
$toDatemonth = (!empty($toDate) && $action == 'goToDate')?GETPOST('toDatemonth', 'int'):0;
$toDateyear = (!empty($toDate) && $action == 'goToDate')?GETPOST('toDateyear', 'int'):0;
+
$token = GETPOST('token', 'alpha');
$whitelistmode = GETPOST('wlm', 'int');
if ($whitelistmode == '') {
@@ -76,15 +83,16 @@
}
}
$confirm = GETPOST('confirm', 'alpha');
-$dateStart = intval(GETPOST('startDate', 'int'));
+$dateStart = intval(GETPOST('dateStart', 'int'));
if ($dateStart == 0){
if ($toDateday == 0 && $datestart == 0 && isset($_SESSION["dateStart"])) {
$dateStart = $_SESSION["dateStart"];
} else{
- $dateStart = parseDate($toDateday, $toDatemonth, $toDateyear, $datestart);
- if ($dateStart == 0)$dateStart = getStartDate(time(), 0);
+ $dateStart = parseDate($toDateday, $toDatemonth, $toDateyear);
+
}
}
+if ($dateStart == 0)$dateStart = getStartDate(time(), 0);
$_SESSION["dateStart"] = $dateStart ;
// Load traductions files requiredby by page
diff --git a/htdocs/timesheet/TimesheetFavouriteAdmin.php b/htdocs/timesheet/TimesheetFavouriteAdmin.php
index 9cade79..5a3ed66 100644
--- a/htdocs/timesheet/TimesheetFavouriteAdmin.php
+++ b/htdocs/timesheet/TimesheetFavouriteAdmin.php
@@ -84,6 +84,10 @@
$ls_date_end_year = GETPOST('ls_date_end_year', 'int');
}
$page = GETPOST('page', 'int');
+$view = GETPOST('view', 'alpha');
+if ($view != ''){
+ $action = $view;
+}
if ($page <= 0){
$page = 0;
}
@@ -171,7 +175,7 @@
}
case 'delete':
if (isset($_GET['urlfile'])) $action = 'deletefile';
- case 'view':
+ case 'card':
case 'viewinfo':
case 'viewdoc':
case 'edit':
@@ -203,7 +207,8 @@
if ($ajax == 1) {
- echo json_encode(array('id'=> $result));
+ ob_flush();
+ echo @json_encode(array('id'=> $result));
ob_end_flush();
exit();
} else{
@@ -296,7 +301,7 @@ function init_myfunc()
if ($ret == 'html') print '
';
//to have the object to be deleted in the background\
}
- case 'view':
+ case 'card':
// tabs
if ($edit == 0 && $new == 0) {
//show tabs
@@ -317,7 +322,7 @@ function init_myfunc()
} else {
// show the nav bar
$basedurltab = explode("?", $PHP_SELF);
- $basedurl = $basedurltab[0].'?action=list';
+ $basedurl = $basedurltab[0].'?view=list';
$linkback = ''
.$langs->trans("BackToList").'';
if (!isset($object->ref))//save ref if any
@@ -694,7 +699,7 @@ function init_myfunc()
print ''."\n";
$i = 0;
$basedurltab = explode("?", $PHP_SELF);
- $basedurl = $basedurltab[0].'?action=view&id=';
+ $basedurl = $basedurltab[0].'?view=card&id=';
while($i < $num && $i<$limit)
{
$obj = $db->fetch_object($resql);
@@ -738,11 +743,11 @@ function reloadpage($backtopage = "", $id = "", $ref = "")
if (!empty($backtopage)) {
header("Location: ".$backtopage);
} elseif (!empty($ref)) {
- header("Location: ".$_SERVER["PHP_SELF"].'?action=view&ref='.$id);
+ header("Location: ".$_SERVER["PHP_SELF"].'?view=card&ref='.$id);
} elseif ($id>0) {
- header("Location: ".$_SERVER["PHP_SELF"].'?action=view&id='.$id);
+ header("Location: ".$_SERVER["PHP_SELF"].'?view=card&id='.$id);
} else{
- header("Location: ".$_SERVER["PHP_SELF"].'?action=list');
+ header("Location: ".$_SERVER["PHP_SELF"].'?view=list');
}
ob_end_flush();
exit();
@@ -760,7 +765,7 @@ function timesheetFavourite_prepare_head($object)
global $langs, $conf, $user;
$h = 0;
$head = array();
- $head[$h][0] = $_SERVER["PHP_SELF"].'?action=view&id='.$object->id;
+ $head[$h][0] = $_SERVER["PHP_SELF"].'?view=card&id='.$object->id;
$head[$h][1] = $langs->trans("Card");
$head[$h][2] = 'card';
$h++;
@@ -771,11 +776,11 @@ function timesheetFavourite_prepare_head($object)
complete_head_from_modules($conf, $langs, $object, $head, $h, 'timesheet');
complete_head_from_modules($conf, $langs, $object, $head, $h, 'timesheet', 'remove');
/*
- $head[$h][0] = $_SERVER["PHP_SELF"].'?action=viewdoc&id='.$object->id;
+ $head[$h][0] = $_SERVER["PHP_SELF"].'?view=carddoc&id='.$object->id;
$head[$h][1] = $langs->trans("Documents");
$head[$h][2] = 'documents';
$h++;
- $head[$h][0] = $_SERVER["PHP_SELF"].'?action=viewinfo&id='.$object->id;
+ $head[$h][0] = $_SERVER["PHP_SELF"].'?view=cardinfo&id='.$object->id;
$head[$h][1] = $langs->trans("Info");
$head[$h][2] = 'info';
$h++;
diff --git a/htdocs/timesheet/TimesheetOtherApproval.php b/htdocs/timesheet/TimesheetOtherApproval.php
index 36f4708..d5f8921 100644
--- a/htdocs/timesheet/TimesheetOtherApproval.php
+++ b/htdocs/timesheet/TimesheetOtherApproval.php
@@ -47,6 +47,10 @@
// end find the role
// get other param
$action = GETPOST('action', 'alpha');
+$view = GETPOST('view', 'alpha');
+if ($view != ''){
+ $action = $view;
+}
$offset = GETPOST('offset', 'int');
if (!is_numeric($offset))$offset = 0;
$optioncss = GETPOST('optioncss', 'alpha');
@@ -204,20 +208,20 @@ function getHTMLNavigation($role, $optioncss, $selectList,$token, $current = 0)
$form = new Form($db);
$Nav = '
'."\n\t".''."\n\t\t".''."\n\t\t\t";
if ($current!=0) {
- $Nav .= 'trans("Previous").' '."\n\t\t";
}
$Nav .= " | \n\t\t\n\t\t\t";
- $Nav .= ''."\n\t\t | \n\t\t\n\t\t\t";
if ($currenttrans("Next").' >>';
diff --git a/htdocs/timesheet/TimesheetProjectInvoice.php b/htdocs/timesheet/TimesheetProjectInvoice.php
index 2fb0423..b9113ca 100644
--- a/htdocs/timesheet/TimesheetProjectInvoice.php
+++ b/htdocs/timesheet/TimesheetProjectInvoice.php
@@ -30,6 +30,7 @@
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+$PHP_SELF = $_SERVER['PHP_SELF'];
//get param
$staticProject = new Project($db);
$projectId = GETPOST('projectid', 'int');
@@ -45,12 +46,16 @@
//init handling object
$form = new Form($db);
$dateStart = strtotime(GETPOST('dateStart', 'alpha'));
-$dateStartday = GETPOST('dateStartday', 'int');// to not look for the date if action not goTodate
+$dateStartday = GETPOST('dateStartday', 'int');// to not look for the date if action not goToDate
$dateStartmonth = GETPOST('dateStartmonth', 'int');
$dateStartyear = GETPOST('dateStartyear', 'int');
+
+
$dateStart = parseDate($dateStartday, $dateStartmonth, $dateStartyear, $dateStart);
+
+
$dateEnd = strtotime(GETPOST('dateEnd', 'alpha'));
-$dateEndday = GETPOST('dateEndday', 'int');// to not look for the date if action not goTodate
+$dateEndday = GETPOST('dateEndday', 'int');// to not look for the date if action not goToDate
$dateEndmonth = GETPOST('dateEndmonth', 'int');
$dateEndyear = GETPOST('dateEndyear', 'int');
$dateEnd = parseDate($dateEndday, $dateEndmonth, $dateEndyear, $dateEnd);
@@ -70,7 +75,7 @@
$langs->load('timesheet@timesheet');
//steps
switch($step) {
- case 2:{
+ case 2:
$fields = ($mode == 'user')?'fk_user':(($mode == 'taskUser')?'fk_user, fk_task':'fk_task');
$sql = 'SELECT '.$fields.', SUM(tt.task_duration) as duration, ';
if ($db->type!='pgsql') {
@@ -170,7 +175,7 @@
}
$Form .= ' |
';
$Form .= '\n";
- break;}
+ break;
case 3: // review choice and list of item + quantity(editable)
require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -306,8 +311,9 @@
if ($result>0)$propallines[$lineCount] = $result;
}
}
-
+ echo "step 3
";
if ($id > 0 && is_array($resArray)) {
+ echo "step 3.1
";
$db->commit();
$invoicecard = str_replace(
array("require '../../main.inc.php';","close();"),
@@ -623,7 +629,7 @@
$project->fetch($projectId);
$headProject = project_prepare_head($project);
dol_fiche_head($headProject, 'invoice', $langs->trans("Project"), 0, 'project');
-
+$ref = GETPOST('ref', 'alpha');
// Load object
if ($projectId > 0 || !empty($ref))
{
@@ -634,7 +640,7 @@
$id = $project->id;
}
}
-$ref = GETPOST('ref', 'alpha');
+
$linkback = ''.$langs->trans("BackToList").'';
$morehtmlref = '';
@@ -698,7 +704,7 @@ function htmlPrintServiceChoice($user, $task, $class, $duration, $tasktimelist,
$objtemp = new Task($db);
$objtemp->fetch($task);
$taskLabel = $objtemp->label ;
- $taskHTML .= str_replace('classfortooltip', 'classfortooltip colTasks',
+ $taskHTML = str_replace('classfortooltip', 'classfortooltip colTasks',
$objtemp->getNomUrl(0, "withproject", "task", getConf('TIMESHEET_HIDE_REF')));
}
diff --git a/htdocs/timesheet/TimesheetReportProject.php b/htdocs/timesheet/TimesheetReportProject.php
index 7734c1b..6373eae 100644
--- a/htdocs/timesheet/TimesheetReportProject.php
+++ b/htdocs/timesheet/TimesheetReportProject.php
@@ -29,6 +29,10 @@
//$objmodelexport = new ModeleExports($db);
$id = GETPOST('id', 'int');
$action = GETPOST('action', 'alpha');
+$view = GETPOST('view', 'alpha');
+if ($view != ''){
+ $action = $view;
+}
//$dateStart = GETPOST('dateStart', 'alpha');
$exportfriendly = GETPOST('exportfriendly', 'alpha');
$optioncss = GETPOST('optioncss', 'alpha');
@@ -71,12 +75,12 @@
//find the right week
$dateStart = strtotime(GETPOST('dateStart', 'alpha'));
-$dateStartday = GETPOST('dateStartday', 'int');// to not look for the date if action not goTodate
+$dateStartday = GETPOST('dateStartday', 'int');// to not look for the date if action not goToDate
$dateStartmonth = GETPOST('dateStartmonth', 'int');
$dateStartyear = GETPOST('dateStartyear', 'int');
$dateStart = parseDate($dateStartday, $dateStartmonth, $dateStartyear, $dateStart);
$dateEnd = strtotime(GETPOST('dateEnd', 'alpha'));
-$dateEndday = GETPOST('dateEndday', 'int');// to not look for the date if action not goTodate
+$dateEndday = GETPOST('dateEndday', 'int');// to not look for the date if action not goToDate
$dateEndmonth = GETPOST('dateEndmonth', 'int');
$dateEndyear = GETPOST('dateEndyear', 'int');
$hidetab = GETPOST('hidetab', 'int');
diff --git a/htdocs/timesheet/TimesheetReportUser.php b/htdocs/timesheet/TimesheetReportUser.php
index 55500bd..8ef0cf7 100644
--- a/htdocs/timesheet/TimesheetReportUser.php
+++ b/htdocs/timesheet/TimesheetReportUser.php
@@ -29,6 +29,10 @@
$userid = is_object($user)?$user->id:$user;
$id = GETPOST('id', 'int');
$action = GETPOST('action', 'alpha');
+$view = GETPOST('view', 'alpha');
+if ($view != ''){
+ $action = $view;
+}
$userIdSelected = GETPOST('userSelected', 'int');
$exportFriendly = GETPOST('exportFriendly', 'alpha');
if (empty($userIdSelected))$userIdSelected = $userid;
@@ -51,7 +55,7 @@
//find the right week
//$toDate = GETPOST('toDate', 'alpha');
-//$toDateday = (!empty($toDate) && $action == 'goToDate')? GETPOST('toDateday', 'int'):0;// to not look for the date if action not goTodate
+//$toDateday = (!empty($toDate) && $action == 'goToDate')? GETPOST('toDateday', 'int'):0;// to not look for the date if action not goToDate
//$toDatemonth = GETPOST('toDatemonth', 'int');
//$toDateyear = GETPOST('toDateyear', 'int');
$mode = GETPOST('mode', 'alpha');
@@ -75,12 +79,12 @@
//$firstDay = ($month)?strtotime('01-'.$month.'-'. $year):strtotime('first day of previous month');
//$lastDay = ($month)?strtotime('last day of this month', $firstDay):strtotime('last day of previous month');
$dateStart = strtotime(GETPOST('dateStart', 'alpha'));
-$dateStartday = GETPOST('dateStartday', 'int');// to not look for the date if action not goTodate
+$dateStartday = GETPOST('dateStartday', 'int');// to not look for the date if action not goToDate
$dateStartmonth = GETPOST('dateStartmonth', 'int');
$dateStartyear = GETPOST('dateStartyear', 'int');
$dateStart = parseDate($dateStartday, $dateStartmonth, $dateStartyear, $dateStart);
$dateEnd = strtotime(GETPOST('dateEnd', 'alpha'));
-$dateEndday = GETPOST('dateEndday', 'int');// to not look for the date if action not goTodate
+$dateEndday = GETPOST('dateEndday', 'int');// to not look for the date if action not goToDate
$dateEndmonth = GETPOST('dateEndmonth', 'int');
$reporttab = GETPOST('reporttab', 'alpha');
$dateEndyear = GETPOST('dateEndyear', 'int');
diff --git a/htdocs/timesheet/TimesheetTeamApproval.php b/htdocs/timesheet/TimesheetTeamApproval.php
index e778551..bee9b39 100644
--- a/htdocs/timesheet/TimesheetTeamApproval.php
+++ b/htdocs/timesheet/TimesheetTeamApproval.php
@@ -36,6 +36,10 @@
//$userId = GETPOST('userid');
$userId = is_object($user)?$user->id:$user;
$action = GETPOST('action', 'alpha');
+$view = GETPOST('view', 'alpha');
+if ($view != ''){
+ $action = $view;
+}
//should return the XMLDoc
$ajax = GETPOST('ajax', 'int');
$xml = GETPOST('xml', 'int');
@@ -366,18 +370,18 @@ function getHTMLNavigation($optioncss, $selectList, $token, $current = 0)
$form = new Form($db);
$Nav = '
'."\n\t".''."\n\t\t".''."\n\t\t\t";
if ($current!=0) {
- $Nav .= 'trans("Previous").' '."\n\t\t";
}
$Nav .= " | \n\t\t\n\t\t\t";
- $Nav .= ''."\n\t\t | \n\t\t\n\t\t\t";
if ($currenttrans("Next").' >>';
}
diff --git a/htdocs/timesheet/TimesheetUserTasksAdmin.php b/htdocs/timesheet/TimesheetUserTasksAdmin.php
index a9ef2e2..9628d3c 100644
--- a/htdocs/timesheet/TimesheetUserTasksAdmin.php
+++ b/htdocs/timesheet/TimesheetUserTasksAdmin.php
@@ -56,6 +56,10 @@
$id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
$action = GETPOST('action', 'alpha');
+$view = GETPOST('view', 'alpha');
+if ($view != ''){
+ $action = $view;
+}
$backtopage = GETPOST('backtopage', 'alpha');
$cancel = GETPOST('cancel', 'alpha');
$confirm = GETPOST('confirm', 'alpha');
@@ -182,7 +186,7 @@
case 'delete':
if (isset($_GET['urlfile'])) $action = 'deletefile';
//fallthrough
- case 'view':
+ case 'card':
case 'viewinfo':
case 'viewdoc':
case 'edit':
@@ -301,7 +305,7 @@ function init_myfunc()
if ($ret == 'html') print ' ';
//to have the object to be deleted in the background\
}
- case 'view':
+ case 'card':
{
// tabs
if ($edit == 0 && $new == 0) { //show tabs
@@ -321,7 +325,7 @@ function init_myfunc()
print '';
} else {// show the nav bar
$basedurltab = explode("?", $PHP_SELF);
- $basedurl = $basedurltab[0].'?action=list';
+ $basedurl = $basedurltab[0].'?view=list';
$linkback = ''
.$langs->trans("BackToList").'';
if (!isset($object->ref))//save ref if any
@@ -548,14 +552,14 @@ function init_myfunc()
dol_syslog($sql, LOG_DEBUG);
$resql = $db->query($sql);
if ($resql) {
- if (!empty($ls_userId)) $param .= '&ls_userId='.urlencode($ls_userId);
- if (!empty($ls_date_start_month)) $param .= '&ls_date_start_month='.urlencode($ls_date_start_month);
- if (!empty($ls_date_start_year)) $param .= '&ls_date_start_year='.urlencode($ls_date_start_year);
- if (!empty($ls_status)) $param .= '&ls_status='.urlencode($ls_status);
- if (!empty($ls_target)) $param .= '&ls_target='.urlencode($ls_target);
- if (!empty($ls_project_tasktime_list)) $param .= '&ls_project_tasktime_list='.urlencode($ls_project_tasktime_list);
- if (!empty($ls_user_approval)) $param .= '&ls_user_approval='.urlencode($ls_user_approval);
- if ($filter && $filter != -1) $param .= '&filtre='.urlencode($filter);
+ if (!empty($ls_userId))$param .= '&ls_userId='.urlencode($ls_userId);
+ if (!empty($ls_date_start_month))$param .= '&ls_date_start_month='.urlencode($ls_date_start_month);
+ if (!empty($ls_date_start_year))$param .= '&ls_date_start_year='.urlencode($ls_date_start_year);
+ if (!empty($ls_status))$param .= '&ls_status='.urlencode($ls_status);
+ if (!empty($ls_target))$param .= '&ls_target='.urlencode($ls_target);
+ if (!empty($ls_project_tasktime_list))$param .= '&ls_project_tasktime_list='.urlencode($ls_project_tasktime_list);
+ if (!empty($ls_user_approval))$param .= '&ls_user_approval='.urlencode($ls_user_approval);
+ if ($filter && $filter != -1)$param .= '&filtre='.urlencode($filter);
$num = $db->num_rows($resql);
//print_barre_liste function defined in /core/lib/function.lib.php, possible to add a picto
print_barre_liste($langs->trans("Timesheetuser"), $page, $PHP_SELF, $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
@@ -619,7 +623,7 @@ function init_myfunc()
print ' |
'."\n";
$i = 0;
$basedurltab = explode("?", $PHP_SELF);
- $basedurl = $basedurltab[0].'?action=view&id=';
+ $basedurl = $basedurltab[0].'?view=card&id=';
while($i < $num && $i<$limit)
{
$obj = $db->fetch_object($resql);
@@ -659,11 +663,11 @@ function reloadpage($backtopage, $id)
global $token;
if (!empty($backtopage)) {
header("Location: ".$backtopage);
- // header("Location: ".$_SERVER["PHP_SELF"].'?action=view&ref='.$ref);
+ // header("Location: ".$_SERVER["PHP_SELF"].'?view=card&ref='.$ref);
} elseif ($id>0) {
- header("Location: ".$_SERVER["PHP_SELF"].'?action=view&id='.$id);
+ header("Location: ".$_SERVER["PHP_SELF"].'?view=card&id='.$id);
} else{
- header("Location: ".$_SERVER["PHP_SELF"].'?action=list');
+ header("Location: ".$_SERVER["PHP_SELF"].'?view=list');
}
ob_end_flush();
exit();
@@ -681,7 +685,7 @@ function Timesheetuser_prepare_head($object)
global $langs, $conf, $user, $token;
$h = 0;
$head = array();
- $head[$h][0] = $_SERVER["PHP_SELF"].'?action=view&id='.$object->id;
+ $head[$h][0] = $_SERVER["PHP_SELF"].'?view=card&id='.$object->id;
$head[$h][1] = $langs->trans("Card");
$head[$h][2] = 'card';
$h++;
@@ -691,11 +695,11 @@ function Timesheetuser_prepare_head($object)
// $this->tabs = array('entity:-tabname); to remove a tab
complete_head_from_modules($conf, $langs, $object, $head, $h, 'timesheet');
complete_head_from_modules($conf, $langs, $object, $head, $h, 'timesheet', 'remove');
- $head[$h][0] = $_SERVER["PHP_SELF"].'?action=viewdoc&id='.$object->id;
+ $head[$h][0] = $_SERVER["PHP_SELF"].'?view=carddoc&id='.$object->id;
$head[$h][1] = $langs->trans("Documents");
$head[$h][2] = 'documents';
$h++;
- $head[$h][0] = $_SERVER["PHP_SELF"].'?action=viewinfo&id='.$object->id;
+ $head[$h][0] = $_SERVER["PHP_SELF"].'?view=cardinfo&id='.$object->id;
$head[$h][1] = $langs->trans("Info");
$head[$h][2] = 'info';
$h++;
diff --git a/htdocs/timesheet/class/AttendanceEvent.class.php b/htdocs/timesheet/class/AttendanceEvent.class.php
index 825a3f6..c583c01 100644
--- a/htdocs/timesheet/class/AttendanceEvent.class.php
+++ b/htdocs/timesheet/class/AttendanceEvent.class.php
@@ -307,10 +307,10 @@ public function getNomUrl($withpicto = 0, $id = 0, $ref = '' )
} else $linkclose = ($morecss?' class = "'.$morecss.'"':'');
if ($id) {
$lien = '';
+ .'id='.$id.'&view=card"'.$linkclose.'>';
} elseif (!empty($ref)) {
$lien = '';
+ .'?ref='.$ref.'&view=card"'.$linkclose.'>';
} else{
$lien = "";
}
diff --git a/htdocs/timesheet/class/TimesheetFavourite.class.php b/htdocs/timesheet/class/TimesheetFavourite.class.php
index 410e482..8f3d170 100644
--- a/htdocs/timesheet/class/TimesheetFavourite.class.php
+++ b/htdocs/timesheet/class/TimesheetFavourite.class.php
@@ -332,10 +332,10 @@ public function getNomUrl($htmlcontent, $id = 0, $ref = '', $withpicto = 0)
}
if ($id) {
$lien = '';
+ .'/timesheet/timesheetFavouriteAdmin.php?id='.$id.'&view=card">';
} elseif (!empty($ref)) {
$lien = '';
+ .'/timesheet/timesheetFavouriteAdmin.php?ref='.$ref.'&view=card"&token='.$token.'>';
} else{
$lien = "";
}
diff --git a/htdocs/timesheet/class/TimesheetUserTasks.class.php b/htdocs/timesheet/class/TimesheetUserTasks.class.php
index a56775a..9a0cd07 100644
--- a/htdocs/timesheet/class/TimesheetUserTasks.class.php
+++ b/htdocs/timesheet/class/TimesheetUserTasks.class.php
@@ -849,7 +849,7 @@ public function getHTMLFormHeader($ajax = false)
$html = ''."\n\t\t\n\t\t\n\t\t\t";
- $Nav .= ' |