forked from Wavyzz/dolibarr
Conflicts: htdocs/core/lib/functions2.lib.php htdocs/langs/en_US/errors.lang htdocs/product/class/product.class.php
Conflicts: htdocs/core/lib/functions2.lib.php htdocs/langs/en_US/errors.lang htdocs/product/class/product.class.php