Fix: Bad month return by function
Fix: Bad days returned by function
Fix bug 1588 : relative discount not working anymore
Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6
Missing reprogramming task into GUI for cron module.
Without this, a new task is never executed (because without datenextrun defined)
Fix bug 1588 : relative discount not working anymore
Merge branch '3.6' of github.com:atm-maxime/dolibarr into 3.6
Fix: ErrorBadValueForParamNotAString error message in price customer
multiprice
Update doc
Merge pull request #1939 from atm-maxime/3.6

Fix bug 1588 : relative discount
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
Update logs
Fix: label of input method not translated.
Merge pull request #1940 from aternatik/fix-cron

Missing reprogramming task into GUI for cron module.
Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	htdocs/core/lib/date.lib.php
Fix: Pb in management of "or" ("|") for permission check.
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
Fix: box of customer and propsects were not correctly disabled.
Fix: box of customer and propsects were not correctly disabled.
Merge remote-tracking branch 'Upstream/3.6' into 3.6_light_fr_FR