diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index 1ba775268a1e012d718b9276e89c9f8975f1945a..db83554c7ae7fc18bbb7d13c74f3124d70694ac0 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -243,12 +243,12 @@ if (empty($reshook)) { if ($backtopage) { - header("Location: ".$backtopage); + header("Location: ".$backtopage); exit; } else { - header("Location: ".DOL_URL_ROOT.'/contact/list.php'); + header("Location: ".DOL_URL_ROOT.'/contact/list.php'); exit; } } diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index c5ba612b60f9435ff68dccd5ee85b553db34a8e5..3dcfaff48ee4c0faec795664de9931063d795932 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -110,24 +110,24 @@ function societe_prepare_head($object) if (! empty($conf->notification->enabled)) { $nbNote = 0; - $sql = "SELECT COUNT(n.rowid) as nb"; - $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n"; - $sql.= " WHERE fk_soc = ".$object->id; - $resql=$db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - $i = 0; - while ($i < $num) - { - $obj = $db->fetch_object($resql); - $nbNote=$obj->nb; - $i++; - } - } - else { - dol_print_error($db); - } + $sql = "SELECT COUNT(n.rowid) as nb"; + $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n"; + $sql.= " WHERE fk_soc = ".$object->id; + $resql=$db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; + while ($i < $num) + { + $obj = $db->fetch_object($resql); + $nbNote=$obj->nb; + $i++; + } + } + else { + dol_print_error($db); + } $head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.$object->id; $head[$h][1] = $langs->trans("Notifications"); diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 13b1e48f4778b22f2262ec1edc27494ea8375342..676b17a5951e4ffa69b0baaade6eb40bfcf0703e 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -292,37 +292,37 @@ if ($id > 0 || ! empty($ref)) // Label print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>'; - // Date start - print '<tr><td>'.$langs->trans("DateStart").'</td><td colspan="3">'; - print dol_print_date($object->date_start,'dayhour'); - print '</td></tr>'; - - // Date end - print '<tr><td>'.$langs->trans("DateEnd").'</td><td colspan="3">'; - print dol_print_date($object->date_end,'dayhour'); - print '</td></tr>'; - - // Planned workload - print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td colspan="3">'; - print convertSecondToTime($object->planned_workload,'allhourmin'); - print '</td></tr>'; - - // Progress declared - print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">'; - print $object->progress.' %'; - print '</td></tr>'; - - // Progress calculated + // Date start + print '<tr><td>'.$langs->trans("DateStart").'</td><td colspan="3">'; + print dol_print_date($object->date_start,'dayhour'); + print '</td></tr>'; + + // Date end + print '<tr><td>'.$langs->trans("DateEnd").'</td><td colspan="3">'; + print dol_print_date($object->date_end,'dayhour'); + print '</td></tr>'; + + // Planned workload + print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td colspan="3">'; + print convertSecondToTime($object->planned_workload,'allhourmin'); + print '</td></tr>'; + + // Progress declared + print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">'; + print $object->progress.' %'; + print '</td></tr>'; + + // Progress calculated print '<tr><td>'.$langs->trans("ProgressCalculated").'</td><td colspan="3">'; if ($object->planned_workload) { - $tmparray=$object->getSummaryOfTimeSpent(); + $tmparray=$object->getSummaryOfTimeSpent(); if ($tmparray['total_duration'] > 0) print round($tmparray['total_duration']/$object->planned_workload*100, 2).' %'; else print '0 %'; } - else print ''; - print '</td></tr>'; - + else print ''; + print '</td></tr>'; + // Project if (empty($withproject)) {