Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur
2019-12-23 14:01:44 +01:00
parent e963fa4b07 36e6036e9e
commit eb32e98127
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/expedition/class/expedition.class.php
View File

@@ -1993,6 +1993,12 @@ class Expedition extends CommonObject
$error=0; $error=0;
// Protection. This avoid to move stock later when we should not
if ($this->statut == self::STATUS_CLOSED)
{
return 0;
}
$this->db->begin(); $this->db->begin();
$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut='.self::STATUS_CLOSED; $sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut='.self::STATUS_CLOSED;

2
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
View File

@@ -285,7 +285,7 @@ CREATE TABLE llx_website_account(
date_last_login datetime, date_last_login datetime,
date_previous_login datetime, date_previous_login datetime,
date_creation datetime NOT NULL, date_creation datetime NOT NULL,
tms timestamp NOT NULL, tms timestamp,
fk_user_creat integer NOT NULL, fk_user_creat integer NOT NULL,
fk_user_modif integer, fk_user_modif integer,
import_key varchar(14), import_key varchar(14),