diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 71b7b42fdcd..2c5e41ce75a 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -166,7 +166,7 @@ class Form $ret.=''; $ret.=''; $ret.=''; - if (empty($notabletag)) $ret.=''; + if (empty($notabletag)) $ret.='
'; if (empty($notabletag)) $ret.='
'; if (preg_match('/^(string|email)/',$typeofdata)) { @@ -189,7 +189,7 @@ class Form $morealt=' style="width: '.$cols.'"'; $cols=''; } - $ret.=''; + $ret.=''; } else if ($typeofdata == 'day' || $typeofdata == 'datepicker') { @@ -4170,12 +4170,12 @@ class Form { print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency)); } - elseif ($filter=="fk_facture_source IS NULL OR (fk_facture_source IS NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%'))") + elseif ($filter=="fk_facture_source IS NULL OR (fk_facture_source IS NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%'))") { // Replace trans key with CompanyHasDownPaymentOrCommercialDiscount print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency)); } - else + else { print $langs->trans("CompanyHasCreditNote",price($amount,0,$langs,0,0,-1,$conf->currency)); } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 7f294d78e4e..8586a77b687 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -3479,6 +3479,7 @@ td.gtaskname { background: url() right top no-repeat; cursor: pointer; margin-right: 3px; + margin-top: 3px; } .editkey_datepicker { @@ -3486,6 +3487,7 @@ td.gtaskname { margin-right: 3px; cursor: pointer; margin-right: 3px; + margin-top: 3px; } .editval_textarea.active:hover, .editval_ckeditor.active:hover, .editval_string.active:hover, .editval_email.active:hover, .editval_numeric.active:hover, .editval_select.active:hover, .editval_autocomplete.active:hover, .editval_datepicker.active:hover { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 5a56d027b15..fe947935ec5 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -3549,12 +3549,14 @@ td.gtaskname { background: url() right top no-repeat; cursor: pointer; margin-right: 3px; + margin-top: 3px; } .editkey_datepicker { background: url() right center no-repeat; cursor: pointer; margin-right: 3px; + margin-top: 3px; } .editval_textarea.active:hover, .editval_ckeditor.active:hover, .editval_string.active:hover, .editval_email.active:hover, .editval_numeric.active:hover, .editval_select.active:hover, .editval_autocomplete.active:hover, .editval_datepicker.active:hover {