mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-06 01:28:19 +01:00
Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/facture.php htdocs/compta/facture/impayees.php htdocs/compta/index.php htdocs/core/boxes/box_produits_alerte_stock.php htdocs/core/class/html.form.class.php htdocs/core/modules/syslog/mod_syslog_file.php htdocs/fourn/facture/impayees.php htdocs/holiday/class/holiday.class.php htdocs/holiday/fiche.php