forked from Wavyzz/dolibarr
# Conflicts: # htdocs/accountancy/admin/export.php # htdocs/accountancy/class/accountancyexport.class.php # htdocs/accountancy/journal/expensereportsjournal.php
# Conflicts: # htdocs/accountancy/admin/export.php # htdocs/accountancy/class/accountancyexport.class.php # htdocs/accountancy/journal/expensereportsjournal.php