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

This commit is contained in:
Laurent Destailleur 2022-07-10 18:40:31 +02:00
commit b77c23979a

View File

@ -846,6 +846,21 @@ class Reception extends CommonObject
}
}
// Check batch is set
$product = new Product($this->db);
$product->fetch($fk_product);
if (!empty($conf->productbatch->enabled)) {
$langs->load("errors");
if (!empty($product->status_batch) && empty($batch)) {
$this->error = $langs->trans('ErrorProductNeedBatchNumber', $product->ref);
return -1;
} elseif (empty($product->status_batch) && !empty($batch)) {
$this->error = $langs->trans('ErrorProductDoesNotNeedBatchNumber', $product->ref);
return -1;
}
}
unset($product);
// extrafields
$line->array_options = $supplierorderline->array_options;
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) {