diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index 0137e63406f..89f495a97bc 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -1211,6 +1211,8 @@ if (empty($action) || $action == 'view') { print ''.($mt >= 0 ? price($mt) : '').""; print ''.($mt < 0 ? price(-$mt) : '').""; print ""; + + $i++; } } @@ -1336,6 +1338,8 @@ if (empty($action) || $action == 'view') { print ''.($mt >= 0 ? price($mt) : '').""; print ""; + + $i++; } } } else { // Waiting account @@ -1373,11 +1377,18 @@ if (empty($action) || $action == 'view') { print ''.($mt < 0 ? price(-$mt) : '').""; print ''.($mt >= 0 ? price($mt) : '').""; print ""; + + $i++; } } } } + if (!$i) { + $colspan = 8; + print ''.$langs->trans("NoRecordFound").''; + } + print ""; print ''; diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php index ffffc21a9f9..514edeb4528 100644 --- a/htdocs/accountancy/journal/expensereportsjournal.php +++ b/htdocs/accountancy/journal/expensereportsjournal.php @@ -615,6 +615,8 @@ if (empty($action) || $action == 'view') { print ''.($mt >= 0 ? price($mt) : '').""; print ''.($mt < 0 ? price(-$mt) : '').""; print ""; + + $i++; } } @@ -649,6 +651,8 @@ if (empty($action) || $action == 'view') { print ''.($mt < 0 ? price(-$mt) : '').""; print ''.($mt >= 0 ? price($mt) : '').""; print ""; + + $i++; } // VAT @@ -685,11 +689,18 @@ if (empty($action) || $action == 'view') { print ''.($mt >= 0 ? price($mt) : '').""; print ''.($mt < 0 ? price(-$mt) : '').""; print ""; + + $i++; } } } } + if (!$i) { + $colspan = 7; + print ''.$langs->trans("NoRecordFound").''; + } + print ""; print ''; diff --git a/htdocs/index.php b/htdocs/index.php index dd1e36d04f8..8fe8ffa377e 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -537,7 +537,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { $openedDashBoard .= '
'."\n"; foreach ($boards as $board) { - $openedDashBoard .= '
'; + $openedDashBoard .= '
'; if (!empty($board->labelShort)) { $infoName = ''.$board->labelShort.''; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 6c88f652ea8..5bfc8729301 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1317,7 +1317,7 @@ select.flat.selectlimit { } /* using a tdoverflowxxx make the min-width not working */ .tdnooverflowimp { - text-overflow: none; + text-overflow: unset; } .tdoverflow { max-width: 0; diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php index db352d4802d..94a26d7257a 100644 --- a/htdocs/theme/eldy/info-box.inc.php +++ b/htdocs/theme/eldy/info-box.inc.php @@ -135,7 +135,8 @@ if (!defined('ISLOADEDBYSTEELSHEET')) { } a.info-box-text.info-box-text-a { - display: table-cell; + /* display: table-cell; */ + display: contents; } a.info-box-text-a i.fa.fa-exclamation-triangle { font-size: 0.9em; diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php index 4755225ea4a..8800ce66eba 100644 --- a/htdocs/theme/md/info-box.inc.php +++ b/htdocs/theme/md/info-box.inc.php @@ -136,7 +136,8 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) { } a.info-box-text.info-box-text-a { - display: table-cell; + /* display: table-cell; */ + display: contents; } a.info-box-text-a i.fa.fa-exclamation-triangle { font-size: 0.9em; @@ -197,7 +198,7 @@ a.info-box-text-a i.fa.fa-exclamation-triangle { overflow: hidden; float: left; /* height: 90px; */ - width: 90px; + width: 86px; text-align: center; font-size: 45px; line-height: 90px; @@ -334,7 +335,7 @@ a.info-box-text-a i.fa.fa-exclamation-triangle { width: calc(100% - 20px); } .info-box-text{ - font-size: 0.92em; + font-size: 0.90em; } .info-box-text:first-letter{text-transform: uppercase} a.info-box-text{ text-decoration: none;} diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index c5bd85742dd..86ef00e879f 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1553,7 +1553,7 @@ select.flat.selectlimit { } /* using a tdoverflowxxx make the min-width not working */ .tdnooverflowimp { - text-overflow: none; + text-overflow: unset; } .tdoverflow { max-width: 0; @@ -3431,7 +3431,9 @@ a.vsmenu.addbookmarkpicto { } div.blockvmenufirst { padding-top: 10px; + border-top: 1px solid #e0e0e0; + } div.blockvmenusearch, div.blockvmenubookmarks {