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

ChangeLog

htdocs/admin/ldap_groups.php

htdocs/categories/fiche.php

htdocs/compta/prelevement/class/bonprelevement.class.php

htdocs/compta/sociales/charges.php

htdocs/fourn/fiche.php

htdocs/product/class/product.class.php

htdocs/product/composition/fiche.php

htdocs/user/group/ldap.php

htdocs/webservices/server_category.php