forked from Wavyzz/dolibarr
Conflicts: ChangeLog htdocs/commande/class/commande.class.php htdocs/filefunc.inc.php htdocs/theme/eldy/style.css.php
Conflicts: ChangeLog htdocs/commande/class/commande.class.php htdocs/filefunc.inc.php htdocs/theme/eldy/style.css.php