forked from Wavyzz/dolibarr
Conflicts: htdocs/imports/import.php htdocs/includes/odtphp/odf.php htdocs/product/stock/product.php htdocs/projet/list.php
Conflicts: htdocs/imports/import.php htdocs/includes/odtphp/odf.php htdocs/product/stock/product.php htdocs/projet/list.php