lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/holiday/define_holiday.php
This commit is contained in:
Laurent Destailleur 2019-01-08 01:46:03 +01:00
commit 8e3df45cbf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/holiday/define_holiday.php
View File

@ -357,7 +357,7 @@ else
print '<td>'; print '<td>';
if ($canedit) print '<input type="text"'.($canedit?'':' disabled="disabled"').' class="maxwidthonsmartphone" value="" name="note_holiday['.$users['rowid'].']" size="30"/>'; if ($canedit) print '<input type="text"'.($canedit?'':' disabled="disabled"').' class="maxwidthonsmartphone" value="" name="note_holiday['.$users['rowid'].']" size="30"/>';
print '</td>'; print '</td>';
// Button modify // Button modify
print '<td>'; print '<td>';
if (! empty($user->rights->holiday->define_holiday)) // Allowed to set the balance of any user if (! empty($user->rights->holiday->define_holiday)) // Allowed to set the balance of any user