forked from Wavyzz/dolibarr
Conflicts: htdocs/accountancy/admin/productaccount.php htdocs/compta/facture/card.php htdocs/contrat/class/contrat.class.php htdocs/core/actions_addupdatedelete.inc.php htdocs/product/class/product.class.php htdocs/product/price.php htdocs/projet/tasks/time.php