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

FixDosFiles

Browse Source
This commit is contained in:
Maxime Kohlhaas 2014-10-27 11:16:18 +01:00
parent a5739c248e
commit fda32f6638
3 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/contact/card.php
View File

@ -243,12 +243,12 @@ if (empty($reshook))
{ {
if ($backtopage) if ($backtopage)
{ {
header("Location: ".$backtopage); header("Location: ".$backtopage);
exit; exit;
} }
else else
{ {
header("Location: ".DOL_URL_ROOT.'/contact/list.php'); header("Location: ".DOL_URL_ROOT.'/contact/list.php');
exit; exit;
} }
} }

36
htdocs/core/lib/company.lib.php
View File

@ -110,24 +110,24 @@ function societe_prepare_head($object)
if (! empty($conf->notification->enabled)) if (! empty($conf->notification->enabled))
{ {
$nbNote = 0; $nbNote = 0;
$sql = "SELECT COUNT(n.rowid) as nb"; $sql = "SELECT COUNT(n.rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n"; $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n";
$sql.= " WHERE fk_soc = ".$object->id; $sql.= " WHERE fk_soc = ".$object->id;
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$nbNote=$obj->nb; $nbNote=$obj->nb;
$i++; $i++;
} }
} }
else { else {
dol_print_error($db); dol_print_error($db);
} }
$head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.$object->id;
$head[$h][1] = $langs->trans("Notifications"); $head[$h][1] = $langs->trans("Notifications");

50
htdocs/projet/tasks/time.php
View File

@ -292,37 +292,37 @@ if ($id > 0 || ! empty($ref))
// Label // Label
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>'; print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
// Date start // Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("DateStart").'</td><td colspan="3">';
print dol_print_date($object->date_start,'dayhour'); print dol_print_date($object->date_start,'dayhour');
print '</td></tr>'; print '</td></tr>';
// Date end // Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("DateEnd").'</td><td colspan="3">';
print dol_print_date($object->date_end,'dayhour'); print dol_print_date($object->date_end,'dayhour');
print '</td></tr>'; print '</td></tr>';
// Planned workload // Planned workload
print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td colspan="3">';
print convertSecondToTime($object->planned_workload,'allhourmin'); print convertSecondToTime($object->planned_workload,'allhourmin');
print '</td></tr>'; print '</td></tr>';
// Progress declared // Progress declared
print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
print $object->progress.' %'; print $object->progress.' %';
print '</td></tr>'; print '</td></tr>';
// Progress calculated // Progress calculated
print '<tr><td>'.$langs->trans("ProgressCalculated").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("ProgressCalculated").'</td><td colspan="3">';
if ($object->planned_workload) 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).' %'; if ($tmparray['total_duration'] > 0) print round($tmparray['total_duration']/$object->planned_workload*100, 2).' %';
else print '0 %'; else print '0 %';
} }
else print ''; else print '';
print '</td></tr>'; print '</td></tr>';
// Project // Project
if (empty($withproject)) if (empty($withproject))
{ {