diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 8808849b7ca..80d7ba16dff 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -50,7 +50,7 @@ if ($action == 'setvalue' && $user->admin)
 	if (! $res > 0) $error++;
 	$res=dolibarr_set_const($db, "MAILING_EMAIL_ERRORSTO",$mailerror,'chaine',0,'',$conf->entity);
 	if (! $res > 0) $error++;
-	$res=dolibarr_set_const($db, "MAIN_SOCIETE_UNSUBSCRIBE",$checkread,'chaine',0,'',$conf->entity);
+	$res=dolibarr_set_const($db, "MAILING_EMAIL_UNSUBSCRIBE",$checkread,'chaine',0,'',$conf->entity);
 	if (! $res > 0) $error++;
 	
  	if (! $error)
@@ -107,7 +107,7 @@ print '</td></tr>';
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("ActivateCheckRead").'</td><td>';
-if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE==1)
+if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE==1)
 {
 	print '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&value=0">';
 	print img_picto($langs->trans("Enabled"),'switch_on');
diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
index bf74bf0ad08..bcea8ad2a22 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -58,7 +58,7 @@ $substitutionarray=array(
 		'__SIGNATURE__' => 'Signature',
 		'__PERSONALIZED__' => 'Personalized'
 );
-if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)
+if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE)
 {
 	$substitutionarray=array_merge(
 			$substitutionarray,
@@ -83,7 +83,7 @@ $substitutionarrayfortest=array(
 		'__SIGNATURE__' => 'TESTSignature',
 		'__PERSONALIZED__' => 'TESTPersonalized'
 );
-if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)
+if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE)
 {
     $substitutionarrayfortest=array_merge(
     		$substitutionarrayfortest,
@@ -1046,7 +1046,7 @@ else
 			print '<br><i>'.$langs->trans("CommonSubstitutions").':<br>';
 			print '__ID__ = '.$langs->trans("IdRecord").'<br>';
 			print '__EMAIL__ = '.$langs->trans("EMail").'<br>';
-            if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)
+            if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE)
             {
     			print '__CHECK_READ__ = '.$langs->trans("CheckRead").'<br>';
 	    		print '__UNSUSCRIBE__ = '.$langs->trans("MailUnsubcribe").'<br>';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 493b89581ad..971ab45376b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2915,7 +2915,7 @@ class Form
     		}
     		else
     		{
-    			$this->error = '<font class="error">'.$langs->trans("ErrorNoVATRateDefinedForSellerCountry",$code_pays).'</font>';
+    			$this->error = '<font class="error">'.$langs->trans("ErrorNoVATRateDefinedForSellerCountry",$country_code).'</font>';
     			return -1;
     		}
     	}
diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php
index de1a1c79ee2..edd5be4401a 100644
--- a/htdocs/core/modules/fichinter/modules_fichinter.php
+++ b/htdocs/core/modules/fichinter/modules_fichinter.php
@@ -156,7 +156,7 @@ abstract class ModeleNumRefFicheinter
  */
 function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
 {
-	global $conf,$langs;
+	global $conf,$langs,$user;
 	$langs->load("ficheinter");
 
 	$error=0;
diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index 9a62c42947d..3fc64061d0b 100755
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -398,7 +398,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$pdf->Output($file,'F');
 
 				// Actions on extra fields (by external module or standard code)
-				if (! is_object($hookmanager))
+				if (!is_object($hookmanager))
 				{
 					include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php');
 					$hookmanager=new HookManager($this->db);
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 68af1d9aee3..483d2034553 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -736,7 +736,6 @@ class Project extends CommonObject
         $this->id = 0;
         $this->ref = 'SPECIMEN';
         $this->specimen = 1;
-        $socid = rand(1, $num_socs);
         $this->socid = 1;
         $this->date_c = $now;
         $this->date_m = $now;
diff --git a/htdocs/public/emailing/mailing-read.php b/htdocs/public/emailing/mailing-read.php
index b9fb643f626..884509eebde 100644
--- a/htdocs/public/emailing/mailing-read.php
+++ b/htdocs/public/emailing/mailing-read.php
@@ -32,7 +32,7 @@ require("../../main.inc.php");
 
 $id=GETPOST('tag');
 
-if (empty($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)) accessforbidden('Option not enabled');
+if (empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE)) accessforbidden('Option not enabled');
 
 
 /*
diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php
index c3614023fae..57a4a6fa2f7 100644
--- a/htdocs/public/emailing/mailing-unsubscribe.php
+++ b/htdocs/public/emailing/mailing-unsubscribe.php
@@ -39,7 +39,7 @@ $langs->load("mails");
 $id=GETPOST('tag');
 $unsuscrib=GETPOST('unsuscrib');
 
-if (empty($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)) accessforbidden('Option not enabled');
+if (empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE)) accessforbidden('Option not enabled');
 
 
 /*