Merge pull request #2159 from fappels/3.7

Fix: check warehouse on product batch
This commit is contained in:
Laurent Destailleur 2014-12-18 10:00:29 +01:00
commit f4e8e74449

View File

@ -90,6 +90,8 @@ $hookmanager->initHooks(array('expeditioncard','globalcard'));
*/ */
$warehousecanbeselectedlater=1; $warehousecanbeselectedlater=1;
if (($action == 'create') || ($action == 'add'))
{
if (! empty($conf->productbatch->enabled)) if (! empty($conf->productbatch->enabled))
{ {
if (! (GETPOST('entrepot_id','int') > 0)) if (! (GETPOST('entrepot_id','int') > 0))
@ -100,7 +102,7 @@ if (! empty($conf->productbatch->enabled))
exit; exit;
} }
} }
}
$parameters=array(); $parameters=array();
$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks