Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

Conflicts: htdocs/holiday/define_holiday.php
2019-01-08 01:46:03 +01:00 · 2019-01-08 01:46:03 +01:00 · 8e3df45cbf
commit 8e3df45cbf
parent 3d578cab28 66b2a82be6
1 changed files with 1 additions and 1 deletions
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@ -357,7 +357,7 @@ else
        print '<td>';
        if ($canedit) print '<input type="text"'.($canedit?'':' disabled="disabled"').' class="maxwidthonsmartphone" value="" name="note_holiday['.$users['rowid'].']" size="30"/>';
        print '</td>';
-        
+
        // Button modify
        print '<td>';
        if (! empty($user->rights->holiday->define_holiday))	// Allowed to set the balance of any user