forked from Wavyzz/dolibarr
Conflicts: htdocs/accountancy/class/bookkeeping.class.php htdocs/core/modules/import/import_csv.modules.php htdocs/core/modules/import/import_xlsx.modules.php
Conflicts: htdocs/accountancy/class/bookkeeping.class.php htdocs/core/modules/import/import_csv.modules.php htdocs/core/modules/import/import_xlsx.modules.php