forked from Wavyzz/dolibarr
Conflicts: htdocs/bookmarks/bookmarks.lib.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/langs/en_US/other.lang
Conflicts: htdocs/bookmarks/bookmarks.lib.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/langs/en_US/other.lang