forked from Wavyzz/dolibarr
Conflicts: htdocs/accountancy/class/bookkeeping.class.php htdocs/accountancy/journal/expensereportsjournal.php htdocs/core/class/html.formadmin.class.php htdocs/core/lib/functions.lib.php
Conflicts: htdocs/accountancy/class/bookkeeping.class.php htdocs/accountancy/journal/expensereportsjournal.php htdocs/core/class/html.formadmin.class.php htdocs/core/lib/functions.lib.php