Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
1e94ffa4d2
@ -5377,7 +5377,9 @@ class Product extends CommonObject
|
|||||||
$filterStatus = '0,'.$filterStatus;
|
$filterStatus = '0,'.$filterStatus;
|
||||||
}
|
}
|
||||||
$result = $this->load_stats_reception(0, $filterStatus, 1);
|
$result = $this->load_stats_reception(0, $filterStatus, 1);
|
||||||
if ($result < 0) dol_print_error($this->db, $this->error);
|
if ($result < 0) {
|
||||||
|
dol_print_error($this->db, $this->error);
|
||||||
|
}
|
||||||
$stock_reception_fournisseur = $this->stats_reception['qty'];
|
$stock_reception_fournisseur = $this->stats_reception['qty'];
|
||||||
}
|
}
|
||||||
if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && !empty($conf->reception->enabled)) {
|
if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && !empty($conf->reception->enabled)) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user