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

Fixed a bug when showing users to define holidays

Browse Source
This commit is contained in:
Marcos García 2013-04-29 17:24:02 +02:00
parent 52b9a3ad91
commit b9429fc98e
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/holiday/admin/holiday.php
View File

@ -329,7 +329,9 @@ print $cp->getConfCP('nbUser')."<br>\n";
$var=!$var; $var=!$var;
print $langs->trans('LastUpdateCP').': '."\n"; print $langs->trans('LastUpdateCP').': '."\n";
print dol_print_date($db->jdate($cp->getConfCP('lastUpdate')),'dayhour','tzuser')."<br>\n"; if ($cp->getConfCP('lastUpdate')) print dol_print_date($db->jdate($cp->getConfCP('lastUpdate')),'dayhour','tzuser');
else print $langs->trans('None');
print "<br>\n";
print '<br>'; print '<br>';

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

@ -1151,7 +1151,7 @@ class Holiday extends CommonObject
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
$tab_result[$i]['rowid'] = $obj->rowid; $tab_result[$i]['rowid'] = $obj->rowid;
$tab_result[$i]['name'] = $obj->name; $tab_result[$i]['name'] = $obj->lastname;
$tab_result[$i]['firstname'] = $obj->firstname; $tab_result[$i]['firstname'] = $obj->firstname;
$i++; $i++;
@ -1191,7 +1191,7 @@ class Holiday extends CommonObject
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
$tab_result[$i]['rowid'] = $obj->fk_user; $tab_result[$i]['rowid'] = $obj->fk_user;
$tab_result[$i]['name'] = $obj->name; $tab_result[$i]['name'] = $obj->lastname;
$tab_result[$i]['firstname'] = $obj->firstname; $tab_result[$i]['firstname'] = $obj->firstname;
$i++; $i++;

2
htdocs/holiday/define_holiday.php
View File

@ -159,7 +159,7 @@ foreach($listUsers as $users)
print '<td>'.$users['rowid'].'</td>'; print '<td>'.$users['rowid'].'</td>';
print '<td>'; print '<td>';
$userstatic->id=$users['rowid']; $userstatic->id=$users['rowid'];
$userstatic->lastname=$users['lastname']; $userstatic->lastname=$users['name'];
$userstatic->firstname=$users['firstname']; $userstatic->firstname=$users['firstname'];
print $userstatic->getNomUrl(1); print $userstatic->getNomUrl(1);
print '</td>'; print '</td>';