Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
c033b00ef3
@ -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))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user