Merge modif

htdocs/product/liste.php

@@ -36,7 +36,7 @@ if (! empty($conf->categorie->enabled))
 
 $langs->load("products");
 $langs->load("stocks");
-$langs->load("suppliers");
+$langs->load("suppliers");
 
 $action = GETPOST('action');
 $sref=GETPOST("sref");

htdocs/societe/class/companybankaccount.class.php

@@ -196,15 +196,15 @@ class CompanyBankAccount extends Account
     {
     	global $langs;
     	
-    	if ($this->code_banque || $this->code_guichet || $this->number || $this->cle_rib)
-    	{
-    		$rib = $this->code_banque." ".$this->code_guichet." ".$this->number;
-    		$rib.=($this->cle_rib?" (".$this->cle_rib.")":"");
-    	}
-    	else
-    	{
-    		$rib=$langs->trans("NoRIB");
-    	}
+    	if ($this->code_banque || $this->code_guichet || $this->number || $this->cle_rib)
+    	{
+    		$rib = $this->code_banque." ".$this->code_guichet." ".$this->number;
+    		$rib.=($this->cle_rib?" (".$this->cle_rib.")":"");
+    	}
+    	else
+    	{
+    		$rib=$langs->trans("NoRIB");
+    	}
 
     	return $rib;
     }