From 4fb5af74426d473ce3c65af824f606a9b6594cf1 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 3 Jul 2015 10:58:55 +0200
Subject: [PATCH] Fix: reset the current entity

---
 htdocs/core/modules/DolibarrModules.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 045bb1ddbcf..cc2680d187c 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1412,7 +1412,6 @@ abstract class DolibarrModules
     	global $conf;
 
     	$error=0;
-    	$entity=$conf->entity;
 
     	if (is_array($this->module_parts) && ! empty($this->module_parts))
     	{
@@ -1420,6 +1419,7 @@ abstract class DolibarrModules
     		{
     			if (is_array($value) && count($value) == 0) continue;	// Discard empty arrays
 
+    			$entity=$conf->entity; // Reset the current entity
     			$newvalue = $value;
 
     			// Serialize array parameters