Laurent Destailleur 0a1c6e7194 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ...

Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php

2018-08-12 20:08:20 +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 8.0

2018-08-12 20:08:20 +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