From 241fd8db980ee65d2147fdcde621a92c597ab2a3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Jul 2016 15:22:04 +0200
Subject: [PATCH 1/2] Fix css

---
 htdocs/theme/md/img/info.png              | Bin 254 -> 399 bytes
 htdocs/theme/md/img/title_accountancy.png | Bin 218 -> 679 bytes
 htdocs/theme/md/img/title_products.png    | Bin 107 -> 410 bytes
 htdocs/theme/md/style.css.php             |   5 +++--
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/md/img/info.png b/htdocs/theme/md/img/info.png
index bb6095bd00a792c96a465b2f14ddacb5bd269a72..a5af4a11e3cdb566747ffa327cf99fe522f894e1 100644
GIT binary patch
delta 372
zcmV-)0gL|r0gnTaB!2>8OGiWi|A&vvzW@LL32;bRa{vGf6951U69E94oEQKA00(qQ
zO+^Rb2M!GsE^^OP$N&HVAW1|)R4C7tlD|sBP!z_0h6r7S#P02yK#IOVyNG=O!P>6H
zNk<XRbcfQd2>uy6#K~E7DSd>LO5NHAsOb|#j6-hXtz^(|`+x5F_|CcCIq(PUm_)g>
zr~xY`5|@Znl_4E$O%p<{WStR9OMD_uxZ!{b6%M)Olt_7old2N&$+0Yq);=#lLq2k+
zA$z$*jnoK0-e}`8(Cw5<hda|HgUq?7ryQ_>7B-JX>C(`JT+rmn0%}0vleYu?TBrE(
z4}xDj%?4iqUTtaA9<a<r6B5o!MO_l6V1dMhoGV`!X3X?-0e!}@$-~?yBBd>JBg}wj
zzGz5X>`r;S;_yJo0`Tb4XU&nkZ!g$oK#$#G!DFuTOV~aYhbDDWmP}>C|L_fXfl>4Z
SR59BC0000<MNUMnLSTZ7lBWv*

delta 226
zcmV<803H921O5S!B!9(8L_t(|0hQ5DjsZac#?iMEYu(&o1`&U5LL3E$5Mn7JjxuK%
z%@xoVHMN*@I@HGdZNKWOq<t<ow~EbWk~&VF!hfZswii8DH)}(U*vQ7+MORJ7)vxcD
zV?``iIk{DnZ4BspH~{3H*1V0_DrLZ2FqASD%z%}kk^E9quv<)xeq!~}LUr9JIhqKj
zK&G@wj&@2dfTO$K+nWX+_9|@`g}%Chi?d8kSK)4JtQniwc{uy>B6m>Me(+u<DKoRQ
cFxB#@KYw9JPSc<xiU0rr07*qoM6N<$f*8+f1ONa4

diff --git a/htdocs/theme/md/img/title_accountancy.png b/htdocs/theme/md/img/title_accountancy.png
index f83b7635712300abcf059f591e413105286f0bbc..1159e6b8d43f366a3a80cdf36748b528dc65c546 100644
GIT binary patch
delta 655
zcmV;A0&xA>0jC9!B!2>8OGiWi|A&vvzW@LL32;bRa{vGf6951U69E94oEQKA00(qQ
zO+^Rb2M!Gp8ZHb|H~;_wI7vi7R7l6=*2_zjQ5XjBpQbr^EA3)qb^*&oDI$uZL=qR>
zAcz(&gZ_Y^ZP6xzHZ9z?jJCCC7ez&_ipCOKR8R}8w6sx3^M8_`o;Dvt<><^1w5Vrw
zzH<)GdEWOt=Y2o^OB5~fm1FbosBv1I?@HYD=ub2?8WjY=<y>2fmt37Rks0N{vPHvP
zt=Vy%%0b$YanpqnQ7q|@E+=h>HP=XrjQd(xZg#usok$SOn-&B!MqIIJk)xGl39M3w
zE)BkV;)M~x3V(YXwAKk}*No?<rp#V91;K4cGUvCsZc31{CEr_Hu2m9g58W{r&pvTO
zghrdQ-*mRn5=u~J_NUoMkBc@N^gg?Z7ZODVjiJ&G&4zt5YaU~|3-i&O5j*TdlLKlM
zneZ)lY8Mg(Q-U%ZRokdRlU;V%Bw<uks3AY-w_b%}b$_<otJ8KX&6qT8z7V3wum@6x
zM5>izofgMb88DWeY7w8BGvT8_Z>01Zuw1<=4HEkDHDorly5N~<!JrPM`6$X>=*B$v
zTDw}2enUoc`zR>au0@46p6bu!Y+R4e8kI^~m7gIK+MJP;(w!lKHF1)o%(Kby)}}o6
z5_=qVFn<&3R;O&koVSMaQ#2#xz7`FRs`5%&kg&~eb?DXOQ(=YeZCu!b*|@+>c;uXl
zLfTQW_4e!3t~u76*5{!Idh>aAzml)A(^+3)Rks}0q%5CSnGN*@VxseZ*4I|3j7R0U
ph)R}R9d#*g+4uh1PsBfr9}G3F4iK3kn*aa+00>D%PDHLkV1hr)Ft`8!

delta 190
zcmV;v073t!1=<0SB!8hvL_t(|0qxLF3c@fDN8y)oEqF&2ui-JIw*J43;KBo`ROyrq
zTBoF&LSDD!<Ch_q8+U7-<{OM+C@P@|_dbv?{lQ%NEE0}fnRPHX4^%VtPnHs8D#GVh
z9;T%%Qxf#-9n7I&B1$+L=1u))3RXOn5>8(jJWK$V4W*CT`Zt(;#L!ZSjG>AIMkzP5
svy7oO9tO&YNocO)lUwNc@t4cJ0Cyjc+FLh!AOHXW07*qoM6N<$f;!7or~m)}

diff --git a/htdocs/theme/md/img/title_products.png b/htdocs/theme/md/img/title_products.png
index 142d71505c8c1a4855394adf3a392990224b3ecf..79c42a93647290818de98c961ff2b379efcd401a 100644
GIT binary patch
delta 382
zcmV-^0fGK&ngfs|e*$7lM??VshmXv^00009a7bBm000XU000XU0RWnu7ytkO2XskI
zMF-#q4h;?l_g4Yw0003iNkl<ZNXPA!y=nqM5XXP60dt=Ds?SykiA^ww?In$Q1D`@{
zEPN+1MM#_Y3b_PQCXm7=h-hPTw-$aSw}*Fgk$~WTU}1M>e}3%j&hElqyR8ZyT3~Nf
zqA+D9B8)~ep}Y)ND^Q(+IEMmvCTNc7kV$AA0BjR9*J0w-ggjNkuoho@E^LTnIvgYf
zol@K!rM6W&{|?H;Ic(meEZ_t14CuvZj*$#>#uMN&0{ZmRre<+Ni4rc>U-qcVBVBB4
zdOUEQ7IZ-mcz4yi<(~62AVo7&yG5FD=NmPBLfsg1Ig%g$lp4q6@Cg7#7R@(fImp4|
z9iKcFFl7KZG<cDMKFEjC5905DGSXVs@>;=<_P1xG+Ts^mqiJvF@gH*;{T;oEFdkR?
cKYX_}1FeIpO9f4V!vFvP07*qoM6N<$f(-PZH2?qr

delta 77
zcmbQmoIOFs-N@6$F{FYqnV~VzfJ;U~>O=#d#4`rg|C1S|GtvZ}#vNu^ywOZ58%A)s
ZF)}POa(2)VkqTr00#8>zmvv4FO#r3L7is_i

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 92234aeddf3..e32b53b70d4 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -746,7 +746,7 @@ td.showDragHandle {
 	margin-left: 0;
 }
 div.login_block {
-	border-right: none ! important; 
+	/* border-right: none ! important; */
 	top: inherit !important;
 }
 .side-nav {
@@ -771,6 +771,7 @@ div.login_block {
 #id-left {
 	z-index: 201;
 	background: #FFF;
+	border-right: 1px solid rgba(0,0,0,0.3);
 <?php if ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
 	top: 50px ! important;
 <?php } else { ?>
@@ -2664,7 +2665,7 @@ div.tabBar .noborder {
 <?php } ?>
 }
 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 {

From 258662e6163e03603442908924103ebd5319855a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Jul 2016 15:31:56 +0200
Subject: [PATCH 2/2] Fix: missing month of update in leave "view log" page.

---
 htdocs/holiday/define_holiday.php |  3 ---
 htdocs/holiday/view_log.php       | 13 ++++++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

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 '<br>'.$langs->trans("MonthOfLastMonthlyUpdate").': <strong>'.$yearLastUpdate.'-'.$monthLastUpdate.'</strong>'."\n";
 }
 else print $langs->trans('None');
-
-
-
 print "</div><br>\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'), '<div class="pagination"><ul><li class="pagination"><a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'">&lt;</a><li class="pagination"><a href="">'.$langs->trans("Year").' '.$year.'</a></li><li class="pagination"><a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'">&gt;</a></li></lu></div>', 'title_hrm.png');
 
 print '<div class="info">'.$langs->trans('LastUpdateCP').': '."\n";
-if ($cp->getConfCP('lastUpdate')) print '<strong>'.dol_print_date($db->jdate($cp->getConfCP('lastUpdate')),'dayhour','tzuser').'</strong>';
+$lastUpdate = $cp->getConfCP('lastUpdate');
+if ($lastUpdate)
+{
+    $monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
+    $yearLastUpdate = $lastUpdate[0].$lastUpdate[1].$lastUpdate[2].$lastUpdate[3];
+    print '<strong>'.dol_print_date($db->jdate($cp->getConfCP('lastUpdate')),'dayhour','tzuser').'</strong>';
+    print '<br>'.$langs->trans("MonthOfLastMonthlyUpdate").': <strong>'.$yearLastUpdate.'-'.$monthLastUpdate.'</strong>'."\n";
+}
 else print $langs->trans('None');
 print "</div><br>\n";
 
@@ -108,8 +115,8 @@ foreach($cp->logs as $logs_CP)
 
 if ($log_holiday == '2')
 {
-    print '<tr>';
-    print '<td colspan="8" '.$bc[false].'>'.$langs->trans('None').'</td>';
+    print '<tr '.$bc[false].'>';
+    print '<td colspan="8" class="opacitymedium">'.$langs->trans('NoRecordFound').'</td>';
     print '</tr>';
 }