diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 5e6d199db0a..f78e004f571 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -338,14 +338,13 @@ if ($result) {
if ($search_accountancy_subledger > 0) {
$param .= '&search_accountancy_subledger='.urlencode($search_accountancy_subledger);
}
-
if ($optioncss != '') {
- $param .= '&optioncss='.urlencode($optioncss);
+ $param .= '&optioncss='.urlencode($optioncss);
}
$url = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create';
if (!empty($socid)) {
- $url .= '&socid='.$socid;
+ $url .= '&socid='.urlencode($socid);
}
$newcardbutton = dolGetButtonTitle($langs->trans('MenuNewVariousPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->banque->modifier);
@@ -423,7 +422,7 @@ if ($result) {
// Payment type
if ($arrayfields['type']['checked']) {
- print '
';
+ print ' | ';
$form->select_types_paiements($typeid, 'typeid', '', 0, 1, 1, 16, 1, 'maxwidth100');
print ' | ';
}
@@ -498,7 +497,7 @@ if ($result) {
print_liste_field_titre($arrayfields['ref']['label'], $_SERVER["PHP_SELF"], 'v.rowid', '', $param, '', $sortfield, $sortorder);
}
if ($arrayfields['label']['checked']) {
- print_liste_field_titre($arrayfields['label']['label'], $_SERVER["PHP_SELF"], 'v.label', '', $param, '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre($arrayfields['label']['label'], $_SERVER["PHP_SELF"], 'v.label', '', $param, '', $sortfield, $sortorder);
}
if ($arrayfields['datep']['checked']) {
print_liste_field_titre($arrayfields['datep']['label'], $_SERVER["PHP_SELF"], 'v.datep,v.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
@@ -507,7 +506,7 @@ if ($result) {
print_liste_field_titre($arrayfields['datev']['label'], $_SERVER["PHP_SELF"], 'v.datev,v.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
}
if ($arrayfields['type']['checked']) {
- print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], 'type', '', $param, '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], 'type', '', $param, '', $sortfield, $sortorder, 'center ');
}
if ($arrayfields['project']['checked']) {
print_liste_field_titre($arrayfields['project']['label'], $_SERVER["PHP_SELF"], 'fk_project', '', $param, '', $sortfield, $sortorder);
@@ -590,7 +589,7 @@ if ($result) {
// Type
if ($arrayfields['type']['checked']) {
- print '';
+ print ' | ';
if ($obj->payment_code) {
print $langs->trans("PaymentTypeShort".$obj->payment_code);
print ' ';
diff --git a/htdocs/salaries/stats/index.php b/htdocs/salaries/stats/index.php
index 1fe914d38c2..1a7f2de6d39 100644
--- a/htdocs/salaries/stats/index.php
+++ b/htdocs/salaries/stats/index.php
@@ -238,16 +238,16 @@ foreach ($data as $val) {
print ' | ';
print '| '.$oldyear.' | ';
print '0 | ';
- print '0 | ';
- print '0 | ';
+ print '0 | ';
+ print '0 | ';
print '
';
}
print '';
print '| '.$year.' | ';
print ''.$val['nb'].' | ';
- print ''.price(price2num($val['total'], 'MT'), 1).' | ';
- print ''.price(price2num($val['avg'], 'MT'), 1).' | ';
+ print ''.price(price2num($val['total'], 'MT'), 1).' | ';
+ print ''.price(price2num($val['avg'], 'MT'), 1).' | ';
print '
';
$oldyear = $year;
}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8152e56e945..06e05a542ee 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -369,7 +369,7 @@ select.vmenusearchselectcombo {
background-color: unset;
}
-textarea:focus, button:focus {
+textarea:focus {
/* v6 box-shadow: 0 0 4px #8091BF; */
border: 1px solid #aaa !important;
}
@@ -738,6 +738,9 @@ div.floatright
.largenumber {
font-size: 1.4em;
}
+button:focus {
+ outline: none;
+}
th .button {
-webkit-box-shadow: none !important;