Skip to content
Permalink
Browse files

Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0

  • Loading branch information...
eldy committed Feb 27, 2019
2 parents da826c4 + fb2b7a6 commit 8bdf1cd1b66440240670d4d471732698474295ef
@@ -20,9 +20,10 @@
{
$align=$extrafields->getAlignFlag($key, $extrafieldsobjectkey);
print '<td';
if ($align) print ' align="'.$align.'"';
print '>';
$tmpkey='options_'.$key;
if ($align) print ' align="'.$align.'"';
print ' data-key="'.$key.'"';
print '>';
$tmpkey='options_'.$key;
if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('date', 'datetime', 'timestamp')) && !is_numeric($obj->$tmpkey))
{
$datenotinstring = $obj->$tmpkey;
@@ -22,7 +22,7 @@
$sortonfield = "ef.".$key;
if (! empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) $sortonfield='';
if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') print '<th class="liste_titre thseparator"></th>';
else print getTitleFieldOfList($langs->trans($extralabels[$key]), 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'"':''), $sortfield, $sortorder)."\n";
else print getTitleFieldOfList($langs->trans($extralabels[$key]), 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'" data-titlekey="'.$key.'"':'data-titlekey="'.$key.'"'), $sortfield, $sortorder)."\n";
}
}
}
@@ -625,7 +625,7 @@
$userAccess = $projectstatic->restrictedProjectArea($user); // why this ?
if ($userAccess >= 0)
{
print '<tr class="oddeven">';
print '<tr data-rowid="'.$object->id.'" class="oddeven">';
// Ref
if (! empty($arrayfields['t.ref']['checked']))

0 comments on commit 8bdf1cd

Please sign in to comment.
You can’t perform that action at this time.