Fix option STOCK_SUPPORTS_SERVICES (stock not visible when it should)

This commit is contained in:
Laurent Destailleur 2017-06-13 11:45:21 +02:00
parent 5def2d2600
commit e4c7f584e3

View File

@ -628,9 +628,9 @@ else
$product_static->status = $objp->tosell;
$product_static->entity = $objp->entity;
if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) // To optimize call of load_stock
if ((! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) || ! empty($conf->global->STOCK_DISABLE_OPTIM_LOAD)) // To optimize call of load_stock
{
if ($objp->fk_product_type != 1) // Not a service
if ($objp->fk_product_type != 1 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) // Not a service
{
$product_static->load_stock('nobatch'); // Load stock_reel + stock_warehouse. This also call load_virtual_stock()
}