Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge pull request #2027 from Devensys/Develop-FixGRHconge1

Browse Source 
FIX bug in GRH module
This commit is contained in:
Laurent Destailleur
2014-11-22 15:59:12 +01:00
parent f845cde3f1 a9a8e9a73c
commit 3d968aa432
2 changed files with 2 additions and 2 deletions
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.'">';
}
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');
print ' &nbsp; <span>'.$langs->trans('SoldeCPUser', round($nb_holiday,2)).'</span>';
print '</td>';

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

@@ -1045,7 +1045,8 @@ class Holiday extends CommonObject
$result = $this->db->query($sql);
if($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 {
return '0';
}