This seems a regression to Note field in 3.3 instead of public and private Note introduced in 3.4 (and confirmed in the class -> Note / / deprecated)
ajout appel du hook sur fiche entrepôt
Merge branch '3.5' of github.com:ATM-Consulting/dolibarr into 3.5

Conflicts:
	htdocs/contact/fiche.php
add hook "doActions" on supplierprice form
Fix: [ bug #1351 ] VIES verification link broken
Fix: [ bug #1352 ] Removing a shipping does not remove the delivery.
Clean corrupted data for categories

Conflicts:
	htdocs/install/mysql/migration/repair.sql
Fix: [ bug #1354 ] Tasks disapear in same sub-task

Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/projet/class/project.class.php
Fix: Option MAIN_INVERT_SENDER_RECIPIENT broken with typhon template.
Fix: doxygen
[ bug #1341 ] Lastname not added by file or direct input in mass
e-mailing
same
Fix phpunit to be compatible with new version of phpunit
Fix: [ bug #1357 ] Invoice creator state not printed in generated invoice documents
Fix: Can disable features with PHPEXCEL (no DLSF compatible).
Fix: Can disable features with CKEDITOR.
Fix: Can disable features with PHPEXCEL (no DLSF compatible).
Fix: Can disable features with CKEDITOR.
Corrected little bug when no state_id was defined
Fix: Pb of records not correctly cleaned when module marge is
uninstalled (conflict between 'margin' and 'margins').
Merge branch '3.5' of github.com:FHenry/dolibarr into FHenry-3.5

Conflicts:
	ChangeLog
Merge branch 'FHenry-3.5' into 3.5