Conflicts: htdocs/core/boxes/box_services_contracts.php htdocs/expensereport/class/expensereport.class.php