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

Dolibarr · Dec 23, 2019 · 36e6036 · 36e6036
2 parents cdb730c + 76d2314
commit 36e6036
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
@@ -1984,6 +1984,12 @@ function setClosed()
 
 		$error=0;
 
+		// Protection. This avoid to move stock later when we should not
+                if ($this->statut == self::STATUS_CLOSED)
+                {
+                        return 0;
+                }
+
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut='.self::STATUS_CLOSED;

diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -285,7 +285,7 @@ CREATE TABLE llx_website_account(
     date_last_login     datetime,
     date_previous_login datetime,
 	date_creation       datetime NOT NULL, 
-	tms                 timestamp NOT NULL, 
+	tms                 timestamp, 
 	fk_user_creat       integer NOT NULL, 
 	fk_user_modif       integer, 
 	import_key          varchar(14),