Merge remote-tracking branch 'origin/15.0' into 15.0

This commit is contained in:
Christian Humpel 2022-08-15 16:26:30 +02:00
commit 10bd0b4cc5

View File

@ -515,7 +515,8 @@ class BOM extends CommonObject
* @param string $import_key Import Key * @param string $import_key Import Key
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
public function addLine($fk_product, $qty, $qty_frozen = 0, $disable_stock_change = 0, $efficiency = 1.0, $position = -1, $fk_bom_child = null, $import_key = null){ public function addLine($fk_product, $qty, $qty_frozen = 0, $disable_stock_change = 0, $efficiency = 1.0, $position = -1, $fk_bom_child = null, $import_key = null)
{
global $mysoc, $conf, $langs, $user; global $mysoc, $conf, $langs, $user;
@ -589,12 +590,10 @@ class BOM extends CommonObject
$this->db->rollback(); $this->db->rollback();
return -2; return -2;
} }
} else { } else {
dol_syslog(get_class($this)."::addLine status of BOM must be Draft to allow use of ->addLine()", LOG_ERR); dol_syslog(get_class($this)."::addLine status of BOM must be Draft to allow use of ->addLine()", LOG_ERR);
return -3; return -3;
} }
} }
/** /**