Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0

Conflicts: htdocs/accountancy/class/bookkeeping.class.php
2022-05-20 23:28:01 +02:00
parent 0fa6329947 b184a1512f
commit ee6131612a
6 changed files with 27 additions and 17 deletions
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1347,7 +1347,6 @@ class Fichinter extends CommonObject
 				$line->fetch_optionals();

 				$this->lines[$i] = $line;
-
 				$i++;
 			}
 			$this->db->free($resql);