Merge branch '19.0-mmi' of gogs.iprospective.fr:iProspective/Dolibarr into 19.0-mmi

htdocs/custom/mmicrm

@@ -1 +1 @@
-Subproject commit 97790e7826399e8d3a2471288d139e42478a0e37
+Subproject commit f11f6a57ebfa5832d04baa83e55901f8d6d473bb

htdocs/custom/mmifilters

@@ -1 +1 @@
-Subproject commit bacdb7217f3d8d48dd6f91b90ddd1976d465544e
+Subproject commit bc53152e64a61b7ac76d52887223dd3ff6fc9596

htdocs/custom/mmistats

@@ -1 +1 @@
-Subproject commit 6f786dc8af250cd3d611d68d86210cc9bb368817
+Subproject commit b4ed9eaff43a8c8a36496909b4c8d9d1509518b5

htdocs/expedition/class/expedition.class.php

@@ -2350,7 +2350,7 @@ class Expedition extends CommonObject
 
 				// If some stock lines are now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine
 				// having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot.
-				if (empty($conf->global->STOCK_KEEP_EMPTY_IN_DB)) { // MMI Hack to keep stocks visibles !
+				if (! getDolGlobalInt('STOCK_KEEP_EMPTY_IN_DB')) { // MMI Hack to keep stocks visibles !
 					$sqldelete = "DELETE FROM ".MAIN_DB_PREFIX."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".MAIN_DB_PREFIX."product_batch as pb)";
 					$resqldelete = $this->db->query($sqldelete);
 					// We do not test error, it can fails if there is child in batch details

htdocs/product/stock/class/mouvementstock.class.php

@@ -613,7 +613,7 @@ class MouvementStock extends CommonObject
 				}
 			}
 
-			if (empty($donotcleanemptylines) && empty($conf->global->STOCK_KEEP_EMPTY_IN_DB)) {
+			if (empty($donotcleanemptylines) && ! getDolGlobalInt('STOCK_KEEP_EMPTY_IN_DB')) {
 				// If stock is now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine
 				// having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot.
 				// Added by MMI Mathieu Moulin iProspective