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

Fix look and feel v14

Browse Source
This commit is contained in:
Laurent Destailleur 2021-10-05 13:34:25 +02:00
parent b11dbf069e
commit 123c047e29
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/fourn/facture/list.php
View File

@ -418,7 +418,7 @@ $sql .= " typent.code as typent_code,";
$sql .= " state.code_departement as state_code, state.nom as state_name,"; $sql .= " state.code_departement as state_code, state.nom as state_name,";
$sql .= " country.code as country_code,"; $sql .= " country.code as country_code,";
$sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,"; $sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
$sql .= " u.login"; $sql .= ' u.login, u.lastname, u.firstname, u.email as user_email, u.statut as user_statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender';
if ($search_categ_sup && $search_categ_sup != '-1') { if ($search_categ_sup && $search_categ_sup != '-1') {
$sql .= ", cs.fk_categorie, cs.fk_soc"; $sql .= ", cs.fk_categorie, cs.fk_soc";
} }
@ -634,7 +634,7 @@ if (!$search_all) {
$sql .= " state.code_departement, state.nom,"; $sql .= " state.code_departement, state.nom,";
$sql .= ' country.code,'; $sql .= ' country.code,';
$sql .= " p.rowid, p.ref, p.title,"; $sql .= " p.rowid, p.ref, p.title,";
$sql .= " u.login"; $sql .= " u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender";
if ($search_categ_sup && $search_categ_sup != '-1') { if ($search_categ_sup && $search_categ_sup != '-1') {
$sql .= ", cs.fk_categorie, cs.fk_soc"; $sql .= ", cs.fk_categorie, cs.fk_soc";
} }
@ -1585,13 +1585,26 @@ if ($resql) {
$totalarray['val']['f.total_ttc'] += $obj->total_ttc; $totalarray['val']['f.total_ttc'] += $obj->total_ttc;
} }
$userstatic->id = $obj->fk_user_author;
$userstatic->login = $obj->login;
$userstatic->lastname = $obj->lastname;
$userstatic->firstname = $obj->firstname;
$userstatic->email = $obj->user_email;
$userstatic->statut = $obj->user_statut;
$userstatic->entity = $obj->entity;
$userstatic->photo = $obj->photo;
$userstatic->office_phone = $obj->office_phone;
$userstatic->office_fax = $obj->office_fax;
$userstatic->user_mobile = $obj->user_mobile;
$userstatic->job = $obj->job;
$userstatic->gender = $obj->gender;
// Author // Author
if (!empty($arrayfields['u.login']['checked'])) { if (!empty($arrayfields['u.login']['checked'])) {
$userstatic->id = $obj->fk_user_author;
$userstatic->login = $obj->login; print '<td class="tdoverflowmax200">';
print '<td align="center">';
if ($userstatic->id) { if ($userstatic->id) {
print $userstatic->getLoginUrl(1); print $userstatic->getLoginUrl(-1);
} else { } else {
print '&nbsp;'; print '&nbsp;';
} }

2
htdocs/user/class/user.class.php
View File

@ -2618,7 +2618,7 @@ class User extends CommonObject
/** /**
* Return clickable link of login (eventualy with picto) * Return clickable link of login (eventualy with picto)
* *
* @param int $withpictoimg Include picto into link * @param int $withpictoimg Include picto into link (1=picto, -1=photo)
* @param string $option On what the link point to ('leave', 'accountancy', 'nolink', ) * @param string $option On what the link point to ('leave', 'accountancy', 'nolink', )
* @param integer $notooltip 1=Disable tooltip on picto and name * @param integer $notooltip 1=Disable tooltip on picto and name
* @param string $morecss Add more css on link * @param string $morecss Add more css on link