forked from Wavyzz/dolibarr
into develop Conflicts: htdocs/commande/fiche.php htdocs/core/class/commonobject.class.php htdocs/product/fiche.php
into develop Conflicts: htdocs/commande/fiche.php htdocs/core/class/commonobject.class.php htdocs/product/fiche.php