Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

Conflicts: htdocs/accountancy/class/accountancyexport.class.php
2025-12-06 01:28:19 +01:00 · 2020-01-23 12:09:01 +01:00
parent 646ccc1354 be344518c4
commit 7ad827f212
3 changed files with 33 additions and 3 deletions
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4605,7 +4605,6 @@ function price2num($amount, $rounding = '', $alreadysqlnb = 0)
 	return $amount;
 }

-
 /**
 * Output a dimension with best unit
 *