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

htdocs/accountancy/class/bookkeeping.class.php

@@ -202,9 +202,6 @@ public function create(User $user, $notrigger = false)
 		if (isset($this->sens)) {
 			$this->sens = trim($this->sens);
 		}
-		if (isset($this->fk_user_author)) {
-			$this->fk_user_author = trim($this->fk_user_author);
-		}
 		if (isset($this->import_key)) {
 			$this->import_key = trim($this->import_key);
 		}
@@ -522,9 +519,6 @@ public function createStd(User $user, $notrigger = false, $mode = '')
 		if (isset($this->sens)) {
 			$this->sens = trim($this->sens);
 		}
-		if (isset($this->fk_user_author)) {
-			$this->fk_user_author = trim($this->fk_user_author);
-		}
 		if (isset($this->import_key)) {
 			$this->import_key = trim($this->import_key);
 		}
@@ -1139,9 +1133,6 @@ public function update(User $user, $notrigger = false, $mode = '')
 		if (isset($this->sens)) {
 			$this->sens = trim($this->sens);
 		}
-		if (isset($this->fk_user_author)) {
-			$this->fk_user_author = trim($this->fk_user_author);
-		}
 		if (isset($this->import_key)) {
 			$this->import_key = trim($this->import_key);
 		}

htdocs/admin/multicurrency.php

@@ -91,7 +91,10 @@
 		{
 			if ($currency->fetch($fk_multicurrency) > 0)
 			{
-				$currency->updateRate($rate);
+				$result=$currency->updateRate($rate);
+				if ($result<0) {
+					setEventMessages(null, $currency->errors, 'errors');
+				}
 			}
 		}
 	}

htdocs/core/class/commonobject.class.php

@@ -6227,6 +6227,7 @@ public function showOutputField($val, $key, $value, $moreparam = '', $keysuffix
 			$value='';
 			if (is_array($value_arr) && count($value_arr)>0)
 			{
+				$toprint=array();
 				foreach ($value_arr as $keyval=>$valueval) {
 					$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
 				}

htdocs/core/class/cstate.class.php

@@ -247,25 +247,20 @@ public function update($user = null, $notrigger = 0)
 	    //    }
         //}
 
-        // Commit or rollback
-        if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
+	    // Commit or rollback
+	    if ($error) {
+		    foreach ($this->errors as $errmsg) {
+			    dol_syslog(get_class($this) . "::update " . $errmsg, LOG_ERR);
+			    $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+		    }
+		    $this->db->rollback();
+		    return -1 * $error;
+	    } else {
+		    $this->db->commit();
+		    return 1;
+	    }
     }
 
-
  	/**
  	 *  Delete object in database
 	 *

htdocs/core/db/mysqli.class.php

@@ -684,6 +684,7 @@ public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_key
         // ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
         $sql = "CREATE TABLE ".$table."(";
         $i=0;
+	    $sqlfields=array();
         foreach($fields as $field_name => $field_desc)
         {
         	$sqlfields[$i] = $field_name." ";

htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php

@@ -582,7 +582,7 @@ public function write_file($object, $outputlangs, $srctemplatepath)
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$substitutionarray);
 				$reshook=$hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
 
 				// Open and load template

htdocs/expedition/class/expedition.class.php

@@ -1147,9 +1147,10 @@ public function update($user = null, $notrigger = 0)
 	 * 	Delete shipment.
 	 * 	Warning, do not delete a shipment if a delivery is linked to (with table llx_element_element)
 	 *
+	 *  @param  int  $notrigger Disable triggers
 	 * 	@return	int		>0 if OK, 0 if deletion done but failed to delete files, <0 if KO
 	 */
-	public function delete()
+	public function delete($notrigger = 0)
 	{
 		global $conf, $langs, $user;