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

This commit is contained in:
Laurent Destailleur 2022-06-02 19:30:17 +02:00
commit c1637d9807

View File

@ -958,8 +958,8 @@ class BOM extends CommonObject
$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_bom = '.((int) $this->id))); $result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_bom = '.((int) $this->id)));
if (is_numeric($result)) { if (is_numeric($result)) {
$this->error = $this->error; $this->error = $objectline->error;
$this->errors = $this->errors; $this->errors = $objectline->errors;
return $result; return $result;
} else { } else {
$this->lines = $result; $this->lines = $result;