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

This commit is contained in:
Laurent Destailleur 2020-02-14 19:04:19 +01:00
commit c033b00ef3

View File

@ -133,7 +133,15 @@ class PriceParser
public function parseExpression($product, $expression, $values)
{
global $user;
global $hookmanager;
$action = 'PARSEEXPRESSION';
if ($result = $hookmanager->executeHooks('doDynamiPrice', array(
'expression' =>$expression,
'product' => $product,
'values' => $values
), $this, $action)) {
return $result;
}
//Check if empty
$expression = trim($expression);
if (empty($expression))