Conflicts: htdocs/expensereport/class/expensereport.class.php htdocs/product/stock/replenishorders.php