Trips & expenses move into hrm area
Merge branch 'upstream/develop'
Merge branch 'upstream/develop'
Présentation
Merge branch 'upstream/develop'
Merge branch 'upstream/develop'
Merge branch 'upstream/develop'
Extrafield select form table do not display selected value on edit mode
Fix: [ bug #1307 ] Quotes get removed from several inputs
Fix: [ bug #1318 ] Problem with enter key when adding an existing
product to a customer invoice
Fix: [ bug #1318 ] Problem with enter key when adding an existing
product to a customer invoice.
Fix: Install of odt templates for project and tasks failed.
Merge pull request #1521 from FHenry/3.5

Extrafield select form table do not display selected value on edit mode
Fix: missing 'ifone' into param
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
Fix: Can't add user
Prepare 3.5.2
Fix: Missing return
Prepare 3.5.2
Fix: [ bug #1319 ] Erreur d'affichage des remises dans les propales

Conflicts:
	htdocs/comm/propal.php