forked from Wavyzz/dolibarr
Conflicts: htdocs/accountancy/customer/lines.php htdocs/accountancy/index.php htdocs/accountancy/supplier/lines.php htdocs/compta/facture/card.php htdocs/core/tpl/extrafields_view.tpl.php htdocs/langs/en_US/errors.lang