Laurent Destailleur 5c93fa1bfb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/journals_list.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/langs/fr_FR/other.lang		2018-06-26 01:25:03 +02:00
..
class	NEW Introduce permission "approve" for "leave request" like for "expense	2018-05-10 18:56:21 +02:00
img	Add table llx_holiday_types to store type of leave.	2014-08-06 03:01:17 +02:00
card.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-26 01:25:03 +02:00
common.inc.php	loadlangs	2018-05-26 21:11:25 +02:00
define_holiday.php	loadlangs	2018-05-26 21:11:25 +02:00
document.php	loadlangs	2018-05-26 21:11:25 +02:00
index.html	Fix: wrong path and add index.html	2015-07-13 10:07:38 +02:00
list.php	Fix css	2018-06-22 22:53:53 +02:00
month_report.php	loadlangs	2018-05-26 21:11:25 +02:00
view_log.php	loadlangs	2018-05-26 21:11:25 +02:00