Laurent Destailleur 9980a5fbd0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	ChangeLog

2018-03-22 14:08:43 +01:00

..

class

NEW Variable __ONLINE_PAYMENT_URL__ available in email templates

2018-03-21 20:06:22 +01: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-03-20 20:07:24 +01:00

common.inc.php

Fix require_once instead of require.

2016-11-24 17:03:18 +01:00

define_holiday.php

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

2018-03-22 14:08:43 +01:00

document.php

NEW Search filters in lists are restored when using "back to list"

2017-10-03 16:00:52 +02:00

index.html

Fix: wrong path and add index.html

2015-07-13 10:07:38 +02:00

list.php

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

2018-03-22 14:08:43 +01:00

month_report.php

Css

2018-03-20 15:05:36 +01:00

view_log.php

FIX translation of holiday types

2018-03-19 14:09:44 +01:00