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

Fix : more than 1000 holidays

Browse Source 
Si il y a plus de 1000 jours de congés, le délimiteur des millier fais
bugger les calcule ...
This commit is contained in:
Andrelec1 2014-11-17 14:55:22 +01:00 committed by Laurent Destailleur
parent e8b2206629
commit 667f1bf497
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/holiday/card.php
View File

@ -761,7 +761,6 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
print '<input type="hidden" name="userid" value="'.$userid.'">'; print '<input type="hidden" name="userid" value="'.$userid.'">';
} }
else print $form->select_users(GETPOST('userid')?GETPOST('userid'):$user->id,'userid',0,'',0); else print $form->select_users(GETPOST('userid')?GETPOST('userid'):$user->id,'userid',0,'',0);
//var_dump($cp->getConfCP('nbHolidayDeducted'));
$nb_holiday = $cp->getCPforUser($user->id) / $cp->getConfCP('nbHolidayDeducted'); $nb_holiday = $cp->getCPforUser($user->id) / $cp->getConfCP('nbHolidayDeducted');
print ' &nbsp; <span>'.$langs->trans('SoldeCPUser', round($nb_holiday,2)).'</span>'; print ' &nbsp; <span>'.$langs->trans('SoldeCPUser', round($nb_holiday,2)).'</span>';
print '</td>'; print '</td>';

3
htdocs/holiday/class/holiday.class.php
View File

@ -1045,7 +1045,8 @@ class Holiday extends CommonObject
$result = $this->db->query($sql); $result = $this->db->query($sql);
if($result) { if($result) {
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
return number_format($obj->nb_holiday,2); //return number_format($obj->nb_holiday,2);
return $obj->nb_holiday;
} else { } else {
return '0'; return '0';
} }