Move isInEEC from common to thirdparty class.

htdocs/core/class/commonobject.class.php

@@ -3576,19 +3576,6 @@ abstract class CommonObject
 	}
 
 
-	/**
-	 *  Return if a country is inside the EEC (European Economic Community)
-	 *  @deprecated	Use function isInEEC function instead
-	 *
-	 *  @return     boolean		true = country inside EEC, false = country outside EEC
-	 */
-	function isInEEC()
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-		return isInEEC($this);
-	}
-
-
 	// --------------------
 	// TODO: All functions here must be redesigned and moved as they are not business functions but output functions
 	// --------------------

htdocs/core/lib/company.lib.php

@@ -635,17 +635,15 @@ function getFormeJuridiqueLabel($code)
     }
 }
 
+
 /**
- *  Return if a country of an object is inside the EEC (European Economic Community)
+ *  Return list of countries that are inside the EEC (European Economic Community)
  *  TODO Add a field into country dictionary.
  *
- *  @param      Object      $object    Object
+ *  @return     array					Array of countries code in EEC
- *  @return     boolean		           true = country inside EEC, false = country outside EEC
  */
-function isInEEC($object)
+function getCountriesInEEC()
 {
-	if (empty($object->country_code)) return false;
-
 	// List of all country codes that are in europe for european vat rules
 	// List found on http://ec.europa.eu/taxation_customs/common/faq/faq_1179_en.htm#9
 	$country_code_in_EEC=array(
@@ -683,6 +681,22 @@ function isInEEC($object)
 		'UK',	// United Kingdom
 		//'CH',	// Switzerland - No. Swizerland in not in EEC
 	);
+
+	return $country_code_in_EEC;
+}
+
+/**
+ *  Return if a country of an object is inside the EEC (European Economic Community)
+ *
+ *  @param      Object      $object    Object
+ *  @return     boolean		           true = country inside EEC, false = country outside EEC
+ */
+function isInEEC($object)
+{
+	if (empty($object->country_code)) return false;
+
+	$country_code_in_EEC = getCountriesInEEC();
+
     //print "dd".$this->country_code;
     return in_array($object->country_code, $country_code_in_EEC);
 }

htdocs/societe/class/societe.class.php

@@ -3145,6 +3145,17 @@ class Societe extends CommonObject
 		return $isacompany;
 	}
 
+	/**
+	 *  Return if a company is inside the EEC (European Economic Community)
+	 *
+	 *  @return     boolean		true = country inside EEC, false = country outside EEC
+	 */
+	function isInEEC()
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+		return isInEEC($this);
+	}
+
 	/**
 	 *  Charge la liste des categories fournisseurs
 	 *