diff --git a/htdocs/admin/societe.php b/htdocs/admin/societe.php
index d8db16d4810..f761ff03b72 100644
--- a/htdocs/admin/societe.php
+++ b/htdocs/admin/societe.php
@@ -88,9 +88,9 @@ if ($action == 'COMPANY_USE_SEARCH_TO_SELECT')
 if ($action == 'setModuleOptions')
 {
 	$post_size=count($_POST);
-	
+
 	$db->begin();
-	
+
 	for($i=0;$i < $post_size;$i++)
     {
     	if (array_key_exists('param'.$i,$_POST))
@@ -118,7 +118,7 @@ if ($action == 'set')
 {
 	$label = GETPOST("label");
 	$scandir = GETPOST("scandir");
-	
+
 	$type='company';
 	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
 	$sql.= " VALUES ('".$db->escape($value)."','".$type."',".$conf->entity.", ";
@@ -150,7 +150,7 @@ if ($action == 'setdoc')
 {
 	$label = GETPOST("label");
 	$scandir = GETPOST("scandir");
-	
+
 	$db->begin();
 
 	if (dolibarr_set_const($db, "COMPANY_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
@@ -189,7 +189,7 @@ if ($action == 'setdoc')
 if ($action == 'setprofid')
 {
 	$status = GETPOST("status");
-	
+
 	$idprof="SOCIETE_IDPROF".$value."_UNIQUE";
 	if (dolibarr_set_const($db, $idprof,$status,'chaine',0,'',$conf->entity) > 0)
 	{
@@ -518,7 +518,8 @@ $profid[3][1]=$langs->transcountry('ProfId4' ,$mysoc->pays_code);
 $var = true;
 $i=0;
 
-while ($i < sizeof($profid))
+$nbofloop=count($profid);
+while ($i < $nbofloop)
 {
 	$var = !$var;
 
diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php
index c94dc2cd8cc..d02ebf630d6 100644
--- a/htdocs/compta/tva/quadri.php
+++ b/htdocs/compta/tva/quadri.php
@@ -114,10 +114,11 @@ function tva_coll($db,$y,$q)
 /**
  * Gets VAT to pay for the given month of the given year
  * The function gets the VAT in split results, as the VAT declaration asks
- * to report the amounts for different VAT rates as different lines.
- * @param		object		Database handler object
- * @param		y			Year
- * @param		q			Year quarter (1-4)
+ * to report the amounts for different VAT rates as different lines
+ *
+ * @param		DoliDB	$db			Database handler object
+ * @param		int		$y			Year
+ * @param		int		$q			Year quarter (1-4)
  */
 function tva_paye($db, $y,$q)
 {
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index ad9f1cb5666..225eeca5f29 100755
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -16,7 +16,7 @@
  */
 
 /**
- *	\file       htdocs/product/canvas/service/product.service.class.php
+ *	\file       htdocs/product/canvas/service/actions_card_service.class.php
  *	\ingroup    service
  *	\brief      Fichier de la classe des services par defaut
  */
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index dd149caf89a..fcb39a66b56 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * 		\files		htdocs/societe/class/companybankaccount.class.php
+ * 		\file		htdocs/societe/class/companybankaccount.class.php
  *		\ingroup    societe
  *		\brief      File of class to manage bank accounts description of third parties
  */
@@ -26,159 +26,159 @@ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php");
 
 
 /**
- * 	\brief	Class to manage bank accounts description of third parties
+ * 		\brief	Class to manage bank accounts description of third parties
  */
 class CompanyBankAccount extends Account
 {
-	var $rowid;
-	var $socid;
+    var $rowid;
+    var $socid;
 
-	var $bank;
-	var $courant;
-	var $clos;
-	var $code_banque;
-	var $code_guichet;
-	var $number;
-	var $cle_rib;
-	var $bic;
-	var $iban;
-	var $iban_prefix;		// deprecated
-	var $proprio;
-	var $adresse_proprio;
+    var $bank;
+    var $courant;
+    var $clos;
+    var $code_banque;
+    var $code_guichet;
+    var $number;
+    var $cle_rib;
+    var $bic;
+    var $iban;
+    var $iban_prefix;		// deprecated
+    var $proprio;
+    var $adresse_proprio;
 
-	/**
-	 * 	Constructor
-	 */
-	function CompanyBankAccount($DB)
-	{
-		$this->db = $DB;
+    /**
+     * 	Constructor
+     */
+    function CompanyBankAccount($DB)
+    {
+        $this->db = $DB;
 
-		$this->socid = 0;
-		$this->clos = 0;
-		$this->solde = 0;
-		$this->error_number = 0;
-		return 1;
-	}
+        $this->socid = 0;
+        $this->clos = 0;
+        $this->solde = 0;
+        $this->error_number = 0;
+        return 1;
+    }
 
 
-	/**
-	 * Create bank information record
-	 *
-	 */
-	function create()
-	{
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, datec) values ($this->socid, ".$this->db->idate(mktime()).")";
+    /**
+     * Create bank information record
+     *
+     */
+    function create()
+    {
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, datec) values ($this->socid, ".$this->db->idate(mktime()).")";
         $resql=$this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->affected_rows($resql))
-			{
-				return 1;
-			}
-		}
-		else
-		{
-			print $this->db->error();
-			return 0;
-		}
-	}
+        if ($resql)
+        {
+            if ($this->db->affected_rows($resql))
+            {
+                return 1;
+            }
+        }
+        else
+        {
+            print $this->db->error();
+            return 0;
+        }
+    }
 
-	/**
-	 *
-	 *
-	 */
-	function update($user='')
-	{
+    /**
+     *
+     *
+     */
+    function update($user='')
+    {
 
-		$sql = "SELECT fk_soc FROM ".MAIN_DB_PREFIX."societe_rib";
-		$sql .= " WHERE fk_soc = ".$this->socid;
+        $sql = "SELECT fk_soc FROM ".MAIN_DB_PREFIX."societe_rib";
+        $sql .= " WHERE fk_soc = ".$this->socid;
 
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result) == 0)
-			{
-				$this->create();
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return 0;
-		}
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            if ($this->db->num_rows($result) == 0)
+            {
+                $this->create();
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return 0;
+        }
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET ";
-		$sql .= " bank = '" .$this->db->escape($this->bank)."'";
-		$sql .= ",code_banque='".$this->code_banque."'";
-		$sql .= ",code_guichet='".$this->code_guichet."'";
-		$sql .= ",number='".$this->number."'";
-		$sql .= ",cle_rib='".$this->cle_rib."'";
-		$sql .= ",bic='".$this->bic."'";
-		$sql .= ",iban_prefix = '".$this->iban_prefix."'";
-		$sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
-		$sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
-		$sql .= ",adresse_proprio = '".$this->db->escape($this->adresse_proprio)."'";
-		$sql .= " WHERE fk_soc = ".$this->socid;
+        $sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET ";
+        $sql .= " bank = '" .$this->db->escape($this->bank)."'";
+        $sql .= ",code_banque='".$this->code_banque."'";
+        $sql .= ",code_guichet='".$this->code_guichet."'";
+        $sql .= ",number='".$this->number."'";
+        $sql .= ",cle_rib='".$this->cle_rib."'";
+        $sql .= ",bic='".$this->bic."'";
+        $sql .= ",iban_prefix = '".$this->iban_prefix."'";
+        $sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
+        $sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
+        $sql .= ",adresse_proprio = '".$this->db->escape($this->adresse_proprio)."'";
+        $sql .= " WHERE fk_soc = ".$this->socid;
 
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			return 1;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return 0;
-		}
-	}
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            return 1;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return 0;
+        }
+    }
 
-	/**
-	 * 	Load record from database
-	 *	@param		id			Id of record
-	 * 	@param		socid		Id of company
-	 */
-	function fetch($id,$socid=0)
-	{
-		if (empty($id) && empty($socid)) return -1;
+    /**
+     * 	Load record from database
+     *	@param		id			Id of record
+     * 	@param		socid		Id of company
+     */
+    function fetch($id,$socid=0)
+    {
+        if (empty($id) && empty($socid)) return -1;
 
-		$sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio, adresse_proprio";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id)    $sql.= " WHERE rowid = ".$id;
-		if ($socid) $sql.= " WHERE fk_soc  = ".$socid;
+        $sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio, adresse_proprio";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
+        if ($id)    $sql.= " WHERE rowid = ".$id;
+        if ($socid) $sql.= " WHERE fk_soc  = ".$socid;
 
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
-				$obj = $this->db->fetch_object($resql);
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            if ($this->db->num_rows($resql))
+            {
+                $obj = $this->db->fetch_object($resql);
 
-				$this->id			   = $obj->rowid;
+                $this->id			   = $obj->rowid;
                 $this->socid           = $obj->fk_soc;
-				$this->bank            = $obj->bank;
-				$this->courant         = $obj->courant;
-				$this->clos            = $obj->clos;
-				$this->code_banque     = $obj->code_banque;
-				$this->code_guichet    = $obj->code_guichet;
-				$this->number          = $obj->number;
-				$this->cle_rib         = $obj->cle_rib;
-				$this->bic             = $obj->bic;
-				$this->iban		       = $obj->iban;
-				$this->iban_prefix     = $obj->iban;	// deprecated
-				$this->domiciliation   = $obj->domiciliation;
-				$this->proprio         = $obj->proprio;
-				$this->adresse_proprio = $obj->adresse_proprio;
-			}
-			$this->db->free($resql);
+                $this->bank            = $obj->bank;
+                $this->courant         = $obj->courant;
+                $this->clos            = $obj->clos;
+                $this->code_banque     = $obj->code_banque;
+                $this->code_guichet    = $obj->code_guichet;
+                $this->number          = $obj->number;
+                $this->cle_rib         = $obj->cle_rib;
+                $this->bic             = $obj->bic;
+                $this->iban		       = $obj->iban;
+                $this->iban_prefix     = $obj->iban;	// deprecated
+                $this->domiciliation   = $obj->domiciliation;
+                $this->proprio         = $obj->proprio;
+                $this->adresse_proprio = $obj->adresse_proprio;
+            }
+            $this->db->free($resql);
 
-			return 1;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
+            return 1;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
 
 }
 
diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php
index 4145de0a326..fc8f9494057 100644
--- a/htdocs/theme/phones/smartphone/theme/default/default.css.php
+++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php
@@ -127,8 +127,8 @@ input.ui-input-text, textarea.ui-input-text {
 /* ============================================================================== */
 
 div.fiche {
-	margin-<?php print $left; ?>: <?php print empty($conf->browser->phone)?'10':'2'; ?>px;
-	margin-<?php print $right; ?>: <?php print empty($conf->browser->phone)?'6':''; ?>px;
+	margin-<?php print $left; ?>: <?php print (empty($conf->browser->phone)?'10':'2'); ?>px;
+	margin-<?php print $right; ?>: <?php print (empty($conf->browser->phone)?'6':''); ?>px;
 }
 
 div.fichecenter {