This commit is contained in:
Laurent Destailleur 2018-06-23 15:10:44 +02:00
parent 0170906524
commit 00165871bd
4 changed files with 10 additions and 10 deletions

View File

@ -1458,11 +1458,11 @@ abstract class CommonObject
if ($trigkey)
{
// call trigger with updated object values
if (empty($this->fields) && method_exists($this, 'fetch'))
if (empty($this->fields) && method_exists($this, 'fetch'))
{
$result = $this->fetch($id);
}
else
}
else
{
$result = $this->fetchCommon($id);
}
@ -6140,6 +6140,7 @@ abstract class CommonObject
$labeltoshow = $langs->trans($label);
$out .= '<td class="titlefield';
if (GETPOST('action','none') == 'create') $out.='create';
if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
$out .= '">';
if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);

View File

@ -536,7 +536,7 @@ if ($resql)
if (! empty($arrayfields['d.date_debut']['checked']))
{
print '<td class="liste_titre" align="center">';
print '<input class="flat" type="text" size="1" maxlength="2" name="month_start" value="'.$month_start.'">';
print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="month_start" value="'.$month_start.'">';
$formother->select_year($year_start,'year_start',1, $min_year, $max_year);
print '</td>';
}
@ -544,7 +544,7 @@ if ($resql)
if (! empty($arrayfields['d.date_fin']['checked']))
{
print '<td class="liste_titre" align="center">';
print '<input class="flat" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
$formother->select_year($year_end,'year_end',1, $min_year, $max_year);
print '</td>';
}

View File

@ -36,7 +36,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
// Colors
$colorbackhmenu1='80,90,120'; // topmenu
$colorbackhmenu1='60,70,100'; // topmenu
$colorbackvmenu1='248,248,248'; // vmenu
$colortopbordertitle1='200,200,200'; // top border of title
$colorbacktitle1='220,220,223'; // title of tables,list

View File

@ -872,11 +872,10 @@ div.fiche>form>div.div-table-responsive {
flex: 1 1 150px;
}
.thumbstat, .thumbstat150 {
/* flex-grow: 1; */
/* flex-shrink: 1; */
flex-grow: 1;
flex-shrink: 1;
/* flex-basis: 140px; */
display: inline;
width: 100%;
min-width: 150px;
justify-content: flex-start;
align-self: flex-start;
}