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

htdocs/bom/class/bom.class.php

@@ -1051,7 +1051,7 @@ class BOMLine extends CommonObjectLine
 		'qty' => array('type'=>'double(24,8)', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'position'=>100, 'notnull'=>1, 'isameasure'=>'1',),
 		'qty_frozen' => array('type'=>'smallint', 'label'=>'QuantityFrozen', 'enabled'=>1, 'visible'=>1, 'default'=>0, 'position'=>105, 'css'=>'maxwidth50imp', 'help'=>'QuantityConsumedInvariable'),
 	    'disable_stock_change' => array('type'=>'smallint', 'label'=>'DisableStockChange', 'enabled'=>1, 'visible'=>1, 'default'=>0, 'position'=>108, 'css'=>'maxwidth50imp', 'help'=>'DisableStockChangeHelp'),
-	    //'efficiency' => array('type'=>'double(8,4)', 'label'=>'ManufacturingEfficiency', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'position'=>110, 'notnull'=>1, 'css'=>'maxwidth50imp', 'help'=>'ValueOfEfficiencyConsumedMeans'),
+	    //'efficiency' => array('type'=>'double(24,8)', 'label'=>'ManufacturingEfficiency', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'position'=>110, 'notnull'=>1, 'css'=>'maxwidth50imp', 'help'=>'ValueOfEfficiencyConsumedMeans'),
 		'position' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>1, 'visible'=>0, 'default'=>0, 'position'=>200, 'notnull'=>1,),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
 	);

htdocs/bom/tpl/objectline_view.tpl.php

@@ -72,6 +72,7 @@ $coldisplay++;
 $tmpproduct = new Product($object->db);
 $tmpproduct->fetch($line->fk_product);
 print $tmpproduct->getNomUrl(1);
+print ' - '.$tmpproduct->label;
 print '</td>';
 print '<td class="linecolqty nowrap right">';
 $coldisplay++;

htdocs/core/class/html.form.class.php

@@ -228,6 +228,7 @@ class Form
 				elseif (preg_match('/^select;/', $typeofdata))
 				{
 					$arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));
+                    $arraylist = array();
 					foreach ($arraydata as $val)
 					{
 						$tmp = explode(':', $val);
@@ -265,6 +266,7 @@ class Form
 				elseif (preg_match('/^select;/', $typeofdata))
 				{
 					$arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));
+                    $arraylist = array();
 					foreach ($arraydata as $val)
 					{
 						$tmp = explode(':', $val);

htdocs/core/class/notify.class.php

@@ -341,6 +341,7 @@ class Notify
 		$object_type = '';
 		$link = '';
 		$num = 0;
+        $error = 0;
 
 		$oldref=(empty($object->oldref)?$object->ref:$object->oldref);
 		$newref=(empty($object->newref)?$object->ref:$object->newref);

htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php

@@ -1805,21 +1805,33 @@ class TCPDF_STATIC {
 		return $ret;
 	}
 
-	/**
+    /**
-	 * Wrapper to use fopen only with local files
+     * Wrapper to use fopen only with local files
-	 * @param filename (string) Name of the file to open
+     * @param  string $filename The full path to the file to open
-	 * @param $mode (string) 
+     * @param  string $mode     Acceses type for the file ('r', 'r+', 'w', 'w+', 'a', 'a+', 'x', 'x+', 'c', 'c+' or 'e')
-	 * @return Returns a file pointer resource on success, or FALSE on error.  
+     * @return resource         Returns a file pointer resource on success, or FALSE on error.
-	 * @public static
+     * @public static
-	 */
+     */
-	public static function fopenLocal($filename, $mode) {
+    public static function fopenLocal($filename, $mode)
-		if (strpos($filename, '://') === false) {
+    {
-			$filename = 'file://'.$filename;
+        if (strpos($filename, '//') === 0)
-		} elseif (stream_is_local($filename) !== true) {
+        {
-			return false;
+            // Share folder on a (windows) server
-		}
+            // e.g.: "//[MyServerName]/[MySharedFolder]/"
-		return fopen($filename, $mode);
+            //
-	}
+            // nothing to change
+        }
+        elseif (strpos($filename, '://') === false)
+        {
+            $filename = 'file://'.$filename;
+        }
+        elseif (stream_is_local($filename) !== true)
+        {
+            return false;
+        }
+
+        return fopen($filename, $mode);
+    }
 
 	/**
 	 * Check if the URL exist.

htdocs/install/mysql/migration/10.0.0-11.0.0.sql

@@ -78,7 +78,7 @@ ALTER TABLE llx_rights_def ADD COLUMN family_position INTEGER NOT NULL DEFAULT 0
 
 UPDATE llx_rights_def SET subperms = 'write' WHERE perms = 'fiscalyear' AND module = 'accounting' AND subperms IS NULL;
 
-ALTER TABLE llx_bom_bom ADD COLUMN duration double(8,4) DEFAULT NULL;
+ALTER TABLE llx_bom_bom ADD COLUMN duration double(24,8) DEFAULT NULL;
 ALTER TABLE llx_bom_bom ADD COLUMN fk_warehouse integer;
 ALTER TABLE llx_bom_bomline ADD COLUMN position integer NOT NULL DEFAULT 0;
 ALTER TABLE llx_bom_bomline ADD COLUMN qty_frozen smallint DEFAULT 0;

htdocs/install/mysql/tables/llx_bom_bom.sql

@@ -26,8 +26,8 @@ CREATE TABLE llx_bom_bom(
 	note_private text, 
 	fk_warehouse integer,
 	qty double(24,8),
-	efficiency double(8,4) DEFAULT 1,
+	efficiency double(24,8) DEFAULT 1,
-	duration double(8,4) DEFAULT NULL,
+	duration double(24,8) DEFAULT NULL,
 	date_creation datetime NOT NULL,
 	date_valid datetime,
 	tms timestamp, 

htdocs/install/mysql/tables/llx_bom_bomline.sql

@@ -24,7 +24,7 @@ CREATE TABLE llx_bom_bomline(
 	qty double(24,8) NOT NULL, 
     qty_frozen smallint DEFAULT 0,
     disable_stock_change smallint DEFAULT 0, 
-	efficiency double(8,4) NOT NULL DEFAULT 1,
+	efficiency double(24,8) NOT NULL DEFAULT 1,
 	position integer NOT NULL DEFAULT 0
 	-- END MODULEBUILDER FIELDS
 ) ENGINE=innodb;