forked from Wavyzz/dolibarr
Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/class/hookmanager.class.php htdocs/langs/fr_FR/holiday.lang
Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/class/hookmanager.class.php htdocs/langs/fr_FR/holiday.lang