forked from Wavyzz/dolibarr
Conflicts: htdocs/accountancy/class/bookkeeping.class.php htdocs/core/class/CMailFile.class.php htdocs/core/lib/functions.lib.php htdocs/ticket/class/ticket.class.php
Conflicts: htdocs/accountancy/class/bookkeeping.class.php htdocs/core/class/CMailFile.class.php htdocs/core/lib/functions.lib.php htdocs/ticket/class/ticket.class.php