Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

Conflicts:
	htdocs/core/class/utils.class.php

htdocs/core/class/utils.class.php

@@ -291,18 +291,20 @@ class Utils
 				$ok=0;
 				dol_syslog("Run command ".$fullcommandcrypted);
 				$handlein = popen($fullcommandclear, 'r');
-				$i=0;
+				if ($handlein) {
-				while (!feof($handlein))
+					$i=0;
-				{
+					while (!feof($handlein))
-					$i++;   // output line number
+					{
-					$read = fgets($handlein);
+						$i++;   // output line number
-					// Exclude warning line we don't want
+						$read = fgets($handlein);
-					if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
+						// Exclude warning line we don't want
-					fwrite($handle,$read);
+						if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
-					if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
+						fwrite($handle,$read);
-					elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+						if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
+						elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+					}
+					pclose($handlein);
 				}
-				pclose($handlein);
 
 				if ($compression == 'none') fclose($handle);
 				if ($compression == 'gz')   gzclose($handle);

htdocs/fourn/class/fournisseur.commande.class.php

@@ -1228,7 +1228,7 @@ class CommandeFournisseur extends CommonOrder
                         false,
 	                    $this->lines[$i]->date_start,
                         $this->lines[$i]->date_end,
-                        0,
+                        $this->lines[$i]->array_options,
                         $this->lines[$i]->fk_unit
 	                );
 	                if ($result < 0)
@@ -1338,6 +1338,10 @@ class CommandeFournisseur extends CommonOrder
 
 		$this->db->begin();
 
+        // get extrafields so they will be clone
+        foreach($this->lines as $line)
+            $line->fetch_optionals($line->rowid);
+
 		// Load source object
 		$objFrom = clone $this;
 

htdocs/product/class/product.class.php

@@ -897,7 +897,7 @@ class Product extends CommonObject
 			$sql.= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell)."'";
 			$sql.= ", accountancy_code_sell_intra= '" . $this->db->escape($this->accountancy_code_sell_intra)."'";
 			$sql.= ", accountancy_code_sell_export= '" . $this->db->escape($this->accountancy_code_sell_export)."'";
-			$sql.= ", desiredstock = " . ((isset($this->desiredstock) && $this->desiredstock != '') ? $this->desiredstock : "null");
+			$sql.= ", desiredstock = " . ((isset($this->desiredstock) && is_numeric($this->desiredstock)) ? $this->desiredstock : "null");
 			$sql.= ", cost_price = " . ($this->cost_price != '' ? $this->db->escape($this->cost_price) : 'null');
 	        $sql.= ", fk_unit= " . (!$this->fk_unit ? 'NULL' : $this->fk_unit);
 	        $sql.= ", price_autogen = " . (!$this->price_autogen ? 0 : 1);