diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 6af57716648..7a94e686173 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -169,9 +169,6 @@ if ($lastUpdate)
print '
'.$langs->trans("MonthOfLastMonthlyUpdate").': '.$yearLastUpdate.'-'.$monthLastUpdate.''."\n";
}
else print $langs->trans('None');
-
-
-
print "
\n";
$result = $holiday->updateBalance(); // Create users into table holiday if they don't exists. TODO Remove this whif we use field into table user.
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index e4b5070f097..1b0e779488a 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -60,7 +60,14 @@ $log_holiday = $cp->fetchLog('ORDER BY cpl.rowid DESC', " AND date_action BETWEE
print load_fiche_titre($langs->trans('LogCP'), '
', 'title_hrm.png');
print ''.$langs->trans('LastUpdateCP').': '."\n";
-if ($cp->getConfCP('lastUpdate')) print ''.dol_print_date($db->jdate($cp->getConfCP('lastUpdate')),'dayhour','tzuser').'';
+$lastUpdate = $cp->getConfCP('lastUpdate');
+if ($lastUpdate)
+{
+ $monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
+ $yearLastUpdate = $lastUpdate[0].$lastUpdate[1].$lastUpdate[2].$lastUpdate[3];
+ print ''.dol_print_date($db->jdate($cp->getConfCP('lastUpdate')),'dayhour','tzuser').'';
+ print '
'.$langs->trans("MonthOfLastMonthlyUpdate").': '.$yearLastUpdate.'-'.$monthLastUpdate.''."\n";
+}
else print $langs->trans('None');
print "
\n";
@@ -108,8 +115,8 @@ foreach($cp->logs as $logs_CP)
if ($log_holiday == '2')
{
- print '';
- print '| '.$langs->trans('None').' | ';
+ print '
';
+ print '| '.$langs->trans('NoRecordFound').' | ';
print '
';
}
diff --git a/htdocs/theme/md/img/info.png b/htdocs/theme/md/img/info.png
index bb6095bd00a..a5af4a11e3c 100644
Binary files a/htdocs/theme/md/img/info.png and b/htdocs/theme/md/img/info.png differ
diff --git a/htdocs/theme/md/img/title_accountancy.png b/htdocs/theme/md/img/title_accountancy.png
index f83b7635712..1159e6b8d43 100644
Binary files a/htdocs/theme/md/img/title_accountancy.png and b/htdocs/theme/md/img/title_accountancy.png differ
diff --git a/htdocs/theme/md/img/title_products.png b/htdocs/theme/md/img/title_products.png
index 142d71505c8..79c42a93647 100644
Binary files a/htdocs/theme/md/img/title_products.png and b/htdocs/theme/md/img/title_products.png differ
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 9d12de74a6d..17695a2adc4 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -752,7 +752,7 @@ td.showDragHandle {
margin-left: 0;
}
div.login_block {
- border-right: none ! important;
+ /* border-right: none ! important; */
top: inherit !important;
}
.side-nav {
@@ -777,6 +777,7 @@ div.login_block {
#id-left {
z-index: 201;
background: #FFF;
+ border-right: 1px solid rgba(0,0,0,0.3);
global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
top: 50px ! important;
@@ -2670,7 +2671,7 @@ div.tabBar .noborder {
}
span.boxstatstext {
- opacity: 0.9;
+ /* opacity: 0.9; Disabled. This make text on top of left menu in smartphone size */
line-height: 18px;
}
span.boxstatsindicator {