Merge branch 'mmiprestasync-stock-keep-empty' into 16.0-mmi

htdocs/expedition/class/expedition.class.php

@@ -784,8 +784,12 @@ 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.
-				$sql = "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)";
-				$resql = $this->db->query($sql);
+				// Added by MMI Mathieu Moulin iProspective
+				// DO NOT DELETE STOCK !!
+				if (empty($conf->global->STOCK_KEEP_EMPTY_IN_DB)) {
+					$sql = "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)";
+					$resql = $this->db->query($sql);
+				}
 				// We do not test error, it can fails if there is child in batch details
 			} else {
 				$this->db->rollback();

htdocs/install/mysql/migration/repair.sql

@@ -157,8 +157,8 @@ CREATE TABLE tmp_llx_product_batch2 AS select pb.rowid, pb.fk_product_stock, pb.
 DELETE FROM llx_product_batch WHERE rowid IN (select rowid FROM tmp_llx_product_batch2);
 INSERT INTO llx_product_batch(fk_product_stock, eatby, sellby, batch, qty) SELECT fk_product_stock, eatby, sellby, batch, qty FROM tmp_llx_product_batch;
 
-DELETE FROM llx_product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM llx_product_batch as pb);
-DELETE FROM llx_product_batch WHERE qty = 0;
+-- NO! DELETE FROM llx_product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM llx_product_batch as pb);
+-- NO! DELETE FROM llx_product_batch WHERE qty = 0;
 
 
 -- Stock calculation on product