Merge remote-tracking branch 'origin/3.7' into develop

2015-01-16 10:44:41 +01:00
parent 1930d0677e f03ffaf5a3
commit c54355b63a
24 changed files with 247 additions and 214 deletions
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4633,6 +4633,7 @@ function dol_eval($s,$returnvalue=0)
 	global $leftmenu;
 	global $rights;
 	global $object;
+    global $soc;

 	//print $s."<br>\n";
 	if ($returnvalue) return @eval('return '.$s.';');