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

This commit is contained in:
Laurent Destailleur 2019-09-03 17:34:58 +02:00
commit bd3971f0bd

View File

@ -223,7 +223,7 @@ class Productbatch extends CommonObject
$sql.= " batch=".(isset($this->batch)?"'".$this->db->escape($this->batch)."'":"null").",";
$sql.= " qty=".(isset($this->qty)?$this->qty:"null").",";
$sql.= " import_key=".(isset($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null")."";
$sql.= " WHERE rowid=".$this->id." AND tms='".$this->db->idate($this->tms)."'";
$sql.= " WHERE rowid=".$this->id;
$this->db->begin();