Conflicts: ChangeLog build/makepack-dolibarr.pl htdocs/compta/facture.php htdocs/product/document.php