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

Merge pull request #788 from atm-maxime/develop

Browse Source 
Fix : "Firstname" was used as var instead of "firstname"
This commit is contained in:
Laurent Destailleur 2013-03-30 05:21:38 -07:00
commit 656e61b77d
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,10 +267,17 @@ class Holiday extends CommonObject
$sql.= " cp.fk_user_refuse,"; $sql.= " cp.fk_user_refuse,";
$sql.= " cp.date_cancel,"; $sql.= " cp.date_cancel,";
$sql.= " cp.fk_user_cancel,"; $sql.= " cp.fk_user_cancel,";
$sql.= " cp.detail_refuse"; $sql.= " cp.detail_refuse,";
$sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp"; $sql.= " uu.lastname as user_lastname,";
$sql.= " WHERE cp.fk_user = '".$user_id."'"; $sql.= " uu.firstname as user_firstname,";
$sql.= " ua.lastname as validator_lastname,";
$sql.= " ua.firstname as validator_firstname";
$sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
$sql.= " WHERE cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
$sql.= " AND cp.fk_user = '".$user_id."'";
// Filtre de séléction // Filtre de séléction
if(!empty($filter)) { if(!empty($filter)) {
@ -320,6 +327,12 @@ class Holiday extends CommonObject
$tab_result[$i]['fk_user_cancel'] = $obj->fk_user_cancel; $tab_result[$i]['fk_user_cancel'] = $obj->fk_user_cancel;
$tab_result[$i]['detail_refuse'] = $obj->detail_refuse; $tab_result[$i]['detail_refuse'] = $obj->detail_refuse;
$tab_result[$i]['user_firstname'] = $obj->user_firstname;
$tab_result[$i]['user_lastname'] = $obj->user_lastname;
$tab_result[$i]['validator_firstname'] = $obj->validator_firstname;
$tab_result[$i]['validator_lastname'] = $obj->validator_lastname;
$i++; $i++;
} }

8
htdocs/user/fiche.php
View File

@ -1089,7 +1089,7 @@ else
// Firstname // Firstname
print '<tr><td valign="top">'.$langs->trans("Firstname").'</td>'; print '<tr><td valign="top">'.$langs->trans("Firstname").'</td>';
print '<td>'.$object->Firstname.'</td>'; print '<td>'.$object->firstname.'</td>';
print '</tr>'."\n"; print '</tr>'."\n";
// Position/Job // Position/Job
@ -1588,12 +1588,12 @@ else
print '<td>'; print '<td>';
if ($caneditfield && !$object->ldap_sid) if ($caneditfield && !$object->ldap_sid)
{ {
print '<input size="30" type="text" class="flat" name="Firstname" value="'.$object->Firstname.'">'; print '<input size="30" type="text" class="flat" name="firstname" value="'.$object->firstname.'">';
} }
else else
{ {
print '<input type="hidden" name="Firstname" value="'.$object->Firstname.'">'; print '<input type="hidden" name="firstname" value="'.$object->firstname.'">';
print $object->Firstname; print $object->firstname;
} }
print '</td></tr>'; print '</td></tr>';