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

Merge remote-tracking branch 'origin/3.5' into develop

Browse Source 
Conflicts:
	htdocs/core/class/html.formfile.class.php
This commit is contained in:
Laurent Destailleur
2014-06-06 12:00:21 +02:00
parent 9254f06847 905f700136
commit 171227e43a
9 changed files with 72 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/user/home.php
View File

@@ -148,26 +148,30 @@ if ($resql)
$companystatic->canvas=$obj->canvas;
print $companystatic->getNomUrl(1);
}
else if (! empty($conf->multicompany->enabled))
{
if ($obj->admin && ! $obj->entity)
{
print $langs->trans("AllEntities");
}
else
{
$mc->getInfo($obj->entity);
print $mc->label;
}
}
else if ($obj->ldap_sid)
{
print $langs->trans("DomainUser");
}
else
{
print $langs->trans("InternalUser");
}
if ($obj->ldap_sid)
{
print ' ('.$langs->trans("DomainUser").')';
}
// TODO This should be done with a hook
if (is_object($mc))
{
if (! empty($conf->multicompany->enabled))
{
if ($obj->admin && ! $obj->entity)
{
print ' ('.$langs->trans("AllEntities").')';
}
else
{
$mc->getInfo($obj->entity);
print ' ('.$mc->label.')';
}
}
}
print '</td>';
print '<td align="right">'.dol_print_date($db->jdate($obj->datec),'dayhour').'</td>';
print '<td align="right">';