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

ChangeLog

htdocs/commande/class/commande.class.php

htdocs/compta/facture.php

htdocs/fourn/facture/fiche.php

htdocs/langs/en_US/resource.lang

htdocs/langs/fr_FR/resource.lang

htdocs/product/fiche.php

htdocs/product/price.php

htdocs/resource/class/actions_resource.class.php

htdocs/resource/class/resource.class.php

htdocs/resource/element_resource.php

htdocs/societe/price.php

htdocs/theme/amarok/style.css.php

htdocs/theme/auguria/style.css.php

htdocs/theme/bureau2crea/style.css.php

htdocs/theme/cameleo/style.css.php

htdocs/theme/eldy/style.css.php