Dolibarr / dolibarr

htdocs/core/boxes/box_lastlogin.php

Indentation +58 added lines, -58 removed lines

@@ -30,72 +30,72 @@ 
  */
 class box_lastlogin extends ModeleBoxes
 {
-    var $boxcode="lastlogin";
-    var $boximg="object_user";
-    var $boxlabel='BoxLoginInformation';
-    var $depends = array("user");
+	var $boxcode="lastlogin";
+	var $boximg="object_user";
+	var $boxlabel='BoxLoginInformation';
+	var $depends = array("user");
 
-    var $db;
-    var $param;
-    var $enabled = 1;
+	var $db;
+	var $param;
+	var $enabled = 1;
 
-    var $info_box_head = array();
-    var $info_box_contents = array();
+	var $info_box_head = array();
+	var $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    function __construct($db,$param)
-    {
-        global $conf;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	function __construct($db,$param)
+	{
+		global $conf;
 
-        $this->db=$db;
-    }
+		$this->db=$db;
+	}
 
-    /**
-     *  Charge les donnees en memoire pour affichage ulterieur
-     *
-     *  @param  int     $max        Maximum number of records to load
-     *  @return void
-     */
-    function loadBox($max=5)
-    {
-        global $conf, $user, $langs, $db;
+	/**
+	 *  Charge les donnees en memoire pour affichage ulterieur
+	 *
+	 *  @param  int     $max        Maximum number of records to load
+	 *  @return void
+	 */
+	function loadBox($max=5)
+	{
+		global $conf, $user, $langs, $db;
 
-        $textHead = $langs->trans("BoxLoginInformation");
-        $this->info_box_head = array(
-            'text' => $textHead,
-            'limit'=> dol_strlen($textHead),
-        );
+		$textHead = $langs->trans("BoxLoginInformation");
+		$this->info_box_head = array(
+			'text' => $textHead,
+			'limit'=> dol_strlen($textHead),
+		);
         
-        $line=0;
-        $this->info_box_contents[$line][0] = array(
-            'td' => '',
-            'text' => $langs->trans("User"),
-        );
-        $this->info_box_contents[$line][1] = array(
-            'td' => '',
-            'text' => $user->getNomUrl(-1),
-            'asis' => 1
-        );
+		$line=0;
+		$this->info_box_contents[$line][0] = array(
+			'td' => '',
+			'text' => $langs->trans("User"),
+		);
+		$this->info_box_contents[$line][1] = array(
+			'td' => '',
+			'text' => $user->getNomUrl(-1),
+			'asis' => 1
+		);
         
-        $line=1;
-        $this->info_box_contents[$line][0] = array(
-            'td' => '',
-            'text' => $langs->trans("PreviousConnexion"),
-        );
-        if ($user->datepreviouslogin) $tmp= dol_print_date($user->datepreviouslogin,"dayhour",'tzuser');
-        else $tmp= $langs->trans("Unknown");
-        $this->info_box_contents[$line][1] = array(
-            'td' => '',
-            'text' => $tmp,
-        );
+		$line=1;
+		$this->info_box_contents[$line][0] = array(
+			'td' => '',
+			'text' => $langs->trans("PreviousConnexion"),
+		);
+		if ($user->datepreviouslogin) $tmp= dol_print_date($user->datepreviouslogin,"dayhour",'tzuser');
+		else $tmp= $langs->trans("Unknown");
+		$this->info_box_contents[$line][1] = array(
+			'td' => '',
+			'text' => $tmp,
+		);
         
-    }
+	}
 
 
 	/**
@@ -106,8 +106,8 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	void
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
-    {
+	function showBox($head = null, $contents = null, $nooutput=0)
+	{
 		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }

Spacing +11 added lines, -11 removed lines

@@ -30,9 +30,9 @@ 
  */
 class box_lastlogin extends ModeleBoxes
 {
-    var $boxcode="lastlogin";
-    var $boximg="object_user";
-    var $boxlabel='BoxLoginInformation';
+    var $boxcode = "lastlogin";
+    var $boximg = "object_user";
+    var $boxlabel = 'BoxLoginInformation';
     var $depends = array("user");
 
     var $db;
@@ -49,11 +49,11 @@ 
      *  @param  DoliDB  $db         Database handler
      *  @param  string  $param      More parameters
      */
-    function __construct($db,$param)
+    function __construct($db, $param)
     {
         global $conf;
 
-        $this->db=$db;
+        $this->db = $db;
     }
 
     /**
@@ -62,7 +62,7 @@ 
      *  @param  int     $max        Maximum number of records to load
      *  @return void
      */
-    function loadBox($max=5)
+    function loadBox($max = 5)
     {
         global $conf, $user, $langs, $db;
 
@@ -72,7 +72,7 @@ 
             'limit'=> dol_strlen($textHead),
         );
         
-        $line=0;
+        $line = 0;
         $this->info_box_contents[$line][0] = array(
             'td' => '',
             'text' => $langs->trans("User"),
@@ -83,13 +83,13 @@ 
             'asis' => 1
         );
         
-        $line=1;
+        $line = 1;
         $this->info_box_contents[$line][0] = array(
             'td' => '',
             'text' => $langs->trans("PreviousConnexion"),
         );
-        if ($user->datepreviouslogin) $tmp= dol_print_date($user->datepreviouslogin,"dayhour",'tzuser');
-        else $tmp= $langs->trans("Unknown");
+        if ($user->datepreviouslogin) $tmp = dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
+        else $tmp = $langs->trans("Unknown");
         $this->info_box_contents[$line][1] = array(
             'td' => '',
             'text' => $tmp,
@@ -106,7 +106,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	void
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +5 added lines, -2 removed lines

@@ -88,8 +88,11 @@
             'td' => '',
             'text' => $langs->trans("PreviousConnexion"),
         );
-        if ($user->datepreviouslogin) $tmp= dol_print_date($user->datepreviouslogin,"dayhour",'tzuser');
-        else $tmp= $langs->trans("Unknown");
+        if ($user->datepreviouslogin) {
+        	$tmp= dol_print_date($user->datepreviouslogin,"dayhour",'tzuser');
+        } else {
+        	$tmp= $langs->trans("Unknown");
+        }
         $this->info_box_contents[$line][1] = array(
             'td' => '',
             'text' => $tmp,

htdocs/core/boxes/box_fournisseurs.php

Indentation +100 added lines, -100 removed lines

@@ -31,123 +31,123 @@ 
  */
 class box_fournisseurs extends ModeleBoxes
 {
-    var $boxcode="lastsuppliers";
-    var $boximg="object_company";
-    var $boxlabel="BoxLastSuppliers";
-    var $depends = array("fournisseur");
+	var $boxcode="lastsuppliers";
+	var $boximg="object_company";
+	var $boxlabel="BoxLastSuppliers";
+	var $depends = array("fournisseur");
 
 	var $db;
 	var $param;
 
-    var $info_box_head = array();
-    var $info_box_contents = array();
+	var $info_box_head = array();
+	var $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    function __construct($db,$param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	function __construct($db,$param)
+	{
+		global $user;
 
-        $this->db=$db;
+		$this->db=$db;
 
-        $this->hidden=! ($user->rights->societe->lire && empty($user->socid));
-    }
+		$this->hidden=! ($user->rights->societe->lire && empty($user->socid));
+	}
 
-    /**
+	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    function loadBox($max=5)
-    {
-        global $conf, $user, $langs, $db;
-        $langs->load("boxes");
+	 *  @return	void
+	 */
+	function loadBox($max=5)
+	{
+		global $conf, $user, $langs, $db;
+		$langs->load("boxes");
 
 		$this->max=$max;
 
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-        $thirdpartystatic=new Societe($db);
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		$thirdpartystatic=new Societe($db);
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 		$thirdpartytmp=new Fournisseur($db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedSuppliers",$max));
 
-        if ($user->rights->societe->lire)
-        {
-            $sql = "SELECT s.nom as name, s.rowid as socid, s.datec, s.tms, s.status,";
-            $sql.= " s.code_fournisseur,";
-            $sql.= " s.logo";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql.= " WHERE s.fournisseur = 1";
-            $sql.= " AND s.entity IN (".getEntity('societe').")";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            $sql.= " ORDER BY s.tms DESC ";
-            $sql.= $db->plimit($max, 0);
-
-            $result = $db->query($sql);
-            if ($result)
-            {
-                $num = $db->num_rows($result);
-
-                $line = 0;
-                while ($line < $num)
-                {
-                    $objp = $db->fetch_object($result);
-    				$datec=$db->jdate($objp->datec);
-    				$datem=$db->jdate($objp->tms);
+		if ($user->rights->societe->lire)
+		{
+			$sql = "SELECT s.nom as name, s.rowid as socid, s.datec, s.tms, s.status,";
+			$sql.= " s.code_fournisseur,";
+			$sql.= " s.logo";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql.= " WHERE s.fournisseur = 1";
+			$sql.= " AND s.entity IN (".getEntity('societe').")";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+			$sql.= " ORDER BY s.tms DESC ";
+			$sql.= $db->plimit($max, 0);
+
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$num = $db->num_rows($result);
+
+				$line = 0;
+				while ($line < $num)
+				{
+					$objp = $db->fetch_object($result);
+					$datec=$db->jdate($objp->datec);
+					$datem=$db->jdate($objp->tms);
 					$thirdpartytmp->id = $objp->socid;
-                    $thirdpartytmp->name = $objp->name;
-                    $thirdpartytmp->code_client = $objp->code_client;
-                    $thirdpartytmp->logo = $objp->logo;
-
-                   	$this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $thirdpartytmp->getNomUrl(1, '', 40),
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, "day"),
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" width="18"',
-                        'text' => $thirdpartystatic->LibStatut($objp->status,3),
-                    );
-
-                    $line++;
-                }
-
-                if ($num==0) $this->info_box_contents[$line][0] = array(
-                    'td' => 'align="center"',
-                    'text'=>$langs->trans("NoRecordedSuppliers"),
-                );
-
-                $db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'align="left" class="nohover opacitymedium"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-
-    }
+					$thirdpartytmp->name = $objp->name;
+					$thirdpartytmp->code_client = $objp->code_client;
+					$thirdpartytmp->logo = $objp->logo;
+
+				   	$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $thirdpartytmp->getNomUrl(1, '', 40),
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, "day"),
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'align="right" width="18"',
+						'text' => $thirdpartystatic->LibStatut($objp->status,3),
+					);
+
+					$line++;
+				}
+
+				if ($num==0) $this->info_box_contents[$line][0] = array(
+					'td' => 'align="center"',
+					'text'=>$langs->trans("NoRecordedSuppliers"),
+				);
+
+				$db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+
+	}
 
 	/**
 	 *	Method to show box
@@ -157,10 +157,10 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	function showBox($head = null, $contents = null, $nooutput=0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 
 }
 

Spacing +25 added lines, -25 removed lines

@@ -31,9 +31,9 @@ 
  */
 class box_fournisseurs extends ModeleBoxes
 {
-    var $boxcode="lastsuppliers";
-    var $boximg="object_company";
-    var $boxlabel="BoxLastSuppliers";
+    var $boxcode = "lastsuppliers";
+    var $boximg = "object_company";
+    var $boxlabel = "BoxLastSuppliers";
     var $depends = array("fournisseur");
 
 	var $db;
@@ -49,13 +49,13 @@ 
      *  @param  DoliDB  $db         Database handler
      *  @param  string  $param      More parameters
      */
-    function __construct($db,$param)
+    function __construct($db, $param)
     {
         global $user;
 
-        $this->db=$db;
+        $this->db = $db;
 
-        $this->hidden=! ($user->rights->societe->lire && empty($user->socid));
+        $this->hidden = !($user->rights->societe->lire && empty($user->socid));
     }
 
     /**
@@ -64,33 +64,33 @@ 
 	 *  @param	int		$max        Maximum number of records to load
      *  @return	void
      */
-    function loadBox($max=5)
+    function loadBox($max = 5)
     {
         global $conf, $user, $langs, $db;
         $langs->load("boxes");
 
-		$this->max=$max;
+		$this->max = $max;
 
         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-        $thirdpartystatic=new Societe($db);
+        $thirdpartystatic = new Societe($db);
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-		$thirdpartytmp=new Fournisseur($db);
+		$thirdpartytmp = new Fournisseur($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedSuppliers",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedSuppliers", $max));
 
         if ($user->rights->societe->lire)
         {
             $sql = "SELECT s.nom as name, s.rowid as socid, s.datec, s.tms, s.status,";
-            $sql.= " s.code_fournisseur,";
-            $sql.= " s.logo";
+            $sql .= " s.code_fournisseur,";
+            $sql .= " s.logo";
             $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql.= " WHERE s.fournisseur = 1";
-            $sql.= " AND s.entity IN (".getEntity('societe').")";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            $sql.= " ORDER BY s.tms DESC ";
-            $sql.= $db->plimit($max, 0);
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            $sql .= " WHERE s.fournisseur = 1";
+            $sql .= " AND s.entity IN (".getEntity('societe').")";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+            if ($user->societe_id) $sql .= " AND s.rowid = ".$user->societe_id;
+            $sql .= " ORDER BY s.tms DESC ";
+            $sql .= $db->plimit($max, 0);
 
             $result = $db->query($sql);
             if ($result)
@@ -101,8 +101,8 @@ 
                 while ($line < $num)
                 {
                     $objp = $db->fetch_object($result);
-    				$datec=$db->jdate($objp->datec);
-    				$datem=$db->jdate($objp->tms);
+    				$datec = $db->jdate($objp->datec);
+    				$datem = $db->jdate($objp->tms);
 					$thirdpartytmp->id = $objp->socid;
                     $thirdpartytmp->name = $objp->name;
                     $thirdpartytmp->code_client = $objp->code_client;
@@ -121,13 +121,13 @@ 
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $thirdpartystatic->LibStatut($objp->status,3),
+                        'text' => $thirdpartystatic->LibStatut($objp->status, 3),
                     );
 
                     $line++;
                 }
 
-                if ($num==0) $this->info_box_contents[$line][0] = array(
+                if ($num == 0) $this->info_box_contents[$line][0] = array(
                     'td' => 'align="center"',
                     'text'=>$langs->trans("NoRecordedSuppliers"),
                 );
@@ -157,7 +157,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }

Braces +12 added lines, -4 removed lines

@@ -84,11 +84,17 @@ 
             $sql.= " s.code_fournisseur,";
             $sql.= " s.logo";
             $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) {
+            	$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            }
             $sql.= " WHERE s.fournisseur = 1";
             $sql.= " AND s.entity IN (".getEntity('societe').")";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+            if (!$user->rights->societe->client->voir && !$user->societe_id) {
+            	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+            }
+            if ($user->societe_id) {
+            	$sql.= " AND s.rowid = ".$user->societe_id;
+            }
             $sql.= " ORDER BY s.tms DESC ";
             $sql.= $db->plimit($max, 0);
 
@@ -127,10 +133,12 @@ 
                     $line++;
                 }
 
-                if ($num==0) $this->info_box_contents[$line][0] = array(
+                if ($num==0) {
+                	$this->info_box_contents[$line][0] = array(
                     'td' => 'align="center"',
                     'text'=>$langs->trans("NoRecordedSuppliers"),
                 );
+                }
 
                 $db->free($result);
             } else {

htdocs/core/boxes/box_clients.php

Indentation +43 added lines, -43 removed lines

@@ -48,7 +48,7 @@ 
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	function __construct($db,$param='')
 	{
@@ -63,10 +63,10 @@ 
 	}
 
 	/**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
 	 */
 	function loadBox($max=5)
 	{
@@ -75,20 +75,20 @@ 
 
 		$this->max=$max;
 
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-        $thirdpartystatic=new Societe($db);
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		$thirdpartystatic=new Societe($db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedCustomers",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedCustomers",$max));
 
 		if ($user->rights->societe->lire)
 		{
 			$sql = "SELECT s.nom as name, s.rowid as socid";
-            $sql.= ", s.code_client";
-            $sql.= ", s.client";
-            $sql.= ", s.code_fournisseur";
-            $sql.= ", s.fournisseur";
-            $sql.= ", s.logo";
-            $sql.= ", s.datec, s.tms, s.status";
+			$sql.= ", s.code_client";
+			$sql.= ", s.client";
+			$sql.= ", s.code_fournisseur";
+			$sql.= ", s.fournisseur";
+			$sql.= ", s.logo";
+			$sql.= ", s.datec, s.tms, s.status";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql.= " WHERE s.client IN (1, 3)";
@@ -110,29 +110,29 @@ 
 					$objp = $db->fetch_object($result);
 					$datec=$db->jdate($objp->datec);
 					$datem=$db->jdate($objp->tms);
-                    $thirdpartystatic->id = $objp->socid;
-                    $thirdpartystatic->name = $objp->name;
-                    $thirdpartystatic->code_client = $objp->code_client;
-                    $thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
-                    $thirdpartystatic->client = $objp->client;
-                    $thirdpartystatic->fournisseur = $objp->fournisseur;
-                    $thirdpartystatic->logo = $objp->logo;
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $thirdpartystatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, "day")
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" width="18"',
-                        'text' => $thirdpartystatic->LibStatut($objp->status,3)
-                    );
+					$thirdpartystatic->id = $objp->socid;
+					$thirdpartystatic->name = $objp->name;
+					$thirdpartystatic->code_client = $objp->code_client;
+					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->client = $objp->client;
+					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->logo = $objp->logo;
+
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $thirdpartystatic->getNomUrl(1),
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, "day")
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'align="right" width="18"',
+						'text' => $thirdpartystatic->LibStatut($objp->status,3)
+					);
 
 					$line++;
 				}
@@ -143,14 +143,14 @@ 
 			}
 			else {
 				$this->info_box_contents[0][0] = array(	'td' => '',
-    	        										'maxlength'=>500,
-	            										'text' => ($db->error().' sql='.$sql));
+														'maxlength'=>500,
+														'text' => ($db->error().' sql='.$sql));
 			}
 		}
 		else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'align="left" class="nohover opacitymedium"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 
@@ -164,8 +164,8 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
-    {
+	function showBox($head = null, $contents = null, $nooutput=0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 

Spacing +30 added lines, -30 removed lines

@@ -32,9 +32,9 @@ 
  */
 class box_clients extends ModeleBoxes
 {
-	var $boxcode="lastcustomers";
-	var $boximg="object_company";
-	var $boxlabel="BoxLastCustomers";
+	var $boxcode = "lastcustomers";
+	var $boximg = "object_company";
+	var $boxlabel = "BoxLastCustomers";
 	var $depends = array("societe");
 
 	var $db;
@@ -50,16 +50,16 @@ 
 	 *  @param  DoliDB	$db      	Database handler
      *  @param	string	$param		More parameters
 	 */
-	function __construct($db,$param='')
+	function __construct($db, $param = '')
 	{
 		global $conf, $user;
 
 		$this->db = $db;
 
 		// disable box for such cases
-		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0;	// disabled by this option
+		if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled = 0; // disabled by this option
 
-		$this->hidden = ! ($user->rights->societe->lire && empty($user->socid));
+		$this->hidden = !($user->rights->societe->lire && empty($user->socid));
 	}
 
 	/**
@@ -68,35 +68,35 @@ 
      *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $user, $langs, $db, $conf;
 		$langs->load("boxes");
 
-		$this->max=$max;
+		$this->max = $max;
 
         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-        $thirdpartystatic=new Societe($db);
+        $thirdpartystatic = new Societe($db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedCustomers",$max));
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedCustomers", $max));
 
 		if ($user->rights->societe->lire)
 		{
 			$sql = "SELECT s.nom as name, s.rowid as socid";
-            $sql.= ", s.code_client";
-            $sql.= ", s.client";
-            $sql.= ", s.code_fournisseur";
-            $sql.= ", s.fournisseur";
-            $sql.= ", s.logo";
-            $sql.= ", s.datec, s.tms, s.status";
-			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= " WHERE s.client IN (1, 3)";
-			$sql.= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if ($user->societe_id) $sql.= " AND s.rowid = $user->societe_id";
-			$sql.= " ORDER BY s.tms DESC";
-			$sql.= $db->plimit($max, 0);
+            $sql .= ", s.code_client";
+            $sql .= ", s.client";
+            $sql .= ", s.code_fournisseur";
+            $sql .= ", s.fournisseur";
+            $sql .= ", s.logo";
+            $sql .= ", s.datec, s.tms, s.status";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE s.client IN (1, 3)";
+			$sql .= " AND s.entity IN (".getEntity('societe').")";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->societe_id) $sql .= " AND s.rowid = $user->societe_id";
+			$sql .= " ORDER BY s.tms DESC";
+			$sql .= $db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
 			$result = $db->query($sql);
@@ -108,8 +108,8 @@ 
 				while ($line < $num)
 				{
 					$objp = $db->fetch_object($result);
-					$datec=$db->jdate($objp->datec);
-					$datem=$db->jdate($objp->tms);
+					$datec = $db->jdate($objp->datec);
+					$datem = $db->jdate($objp->tms);
                     $thirdpartystatic->id = $objp->socid;
                     $thirdpartystatic->name = $objp->name;
                     $thirdpartystatic->code_client = $objp->code_client;
@@ -131,18 +131,18 @@ 
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $thirdpartystatic->LibStatut($objp->status,3)
+                        'text' => $thirdpartystatic->LibStatut($objp->status, 3)
                     );
 
 					$line++;
 				}
 
-				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
+				if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'align="center"', 'text'=>$langs->trans("NoRecordedCustomers"));
 
 				$db->free($result);
 			}
 			else {
-				$this->info_box_contents[0][0] = array(	'td' => '',
+				$this->info_box_contents[0][0] = array('td' => '',
     	        										'maxlength'=>500,
 	            										'text' => ($db->error().' sql='.$sql));
 			}
@@ -164,7 +164,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +18 added lines, -9 removed lines

@@ -57,7 +57,10 @@ 
 		$this->db = $db;
 
 		// disable box for such cases
-		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0;	// disabled by this option
+		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+			$this->enabled=0;
+		}
+		// disabled by this option
 
 		$this->hidden = ! ($user->rights->societe->lire && empty($user->socid));
 	}
@@ -90,11 +93,17 @@ 
             $sql.= ", s.logo";
             $sql.= ", s.datec, s.tms, s.status";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) {
+				$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			}
 			$sql.= " WHERE s.client IN (1, 3)";
 			$sql.= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if ($user->societe_id) $sql.= " AND s.rowid = $user->societe_id";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) {
+				$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			}
+			if ($user->societe_id) {
+				$sql.= " AND s.rowid = $user->societe_id";
+			}
 			$sql.= " ORDER BY s.tms DESC";
 			$sql.= $db->plimit($max, 0);
 
@@ -137,17 +146,17 @@ 
 					$line++;
 				}
 
-				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
+				if ($num==0) {
+					$this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
+				}
 
 				$db->free($result);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(	'td' => '',
     	        										'maxlength'=>500,
 	            										'text' => ($db->error().' sql='.$sql));
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'align="left" class="nohover opacitymedium"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")

htdocs/core/boxes/box_supplier_orders.php

Indentation +155 added lines, -155 removed lines

@@ -32,167 +32,167 @@
 class box_supplier_orders extends ModeleBoxes
 {
 
-    var $boxcode = "latestsupplierorders";
-    var $boximg = "object_order";
-    var $boxlabel="BoxLatestSupplierOrders";
-    var $depends = array("fournisseur");
-
-    var $db;
-    var $param;
-    var $info_box_head = array();
-    var $info_box_contents = array();
-
-
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    function __construct($db,$param)
-    {
-        global $user;
-
-        $this->db=$db;
-
-        $this->hidden=! ($user->rights->fournisseur->commande->lire);
-    }
-
-    /**
-     *  Load data into info_box_contents array to show array later.
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    function loadBox($max = 5)
-    {
-        global $conf, $user, $langs, $db;
-        $langs->load("boxes");
-
-        $this->max = $max;
-
-        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-        $supplierorderstatic=new CommandeFournisseur($db);
-        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-        $thirdpartytmp = new Fournisseur($db);
-
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."SupplierOrders", $max));
-
-        if ($user->rights->fournisseur->commande->lire)
-        {
-            $sql = "SELECT s.nom as name, s.rowid as socid,";
-            $sql.= " s.code_client, s.code_fournisseur,";
-            $sql.= " s.logo,";
-            $sql.= " c.ref, c.tms, c.rowid, c.date_commande,";
-            $sql.= " c.total_ht,";
-            $sql.= " c.tva as total_tva,";
-            $sql.= " c.total_ttc,";
-            $sql.= " c.fk_statut";
-            $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-            $sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql.= " WHERE c.fk_soc = s.rowid";
-            $sql.= " AND c.entity = ".$conf->entity;
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
-            else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
-            $sql.= $db->plimit($max, 0);
-
-            $result = $db->query($sql);
-            if ($result)
-            {
-                $num = $db->num_rows($result);
-
-                $line = 0;
-                while ($line < $num) {
-                    $objp = $db->fetch_object($result);
-                    $date=$db->jdate($objp->date_commande);
+	var $boxcode = "latestsupplierorders";
+	var $boximg = "object_order";
+	var $boxlabel="BoxLatestSupplierOrders";
+	var $depends = array("fournisseur");
+
+	var $db;
+	var $param;
+	var $info_box_head = array();
+	var $info_box_contents = array();
+
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	function __construct($db,$param)
+	{
+		global $user;
+
+		$this->db=$db;
+
+		$this->hidden=! ($user->rights->fournisseur->commande->lire);
+	}
+
+	/**
+	 *  Load data into info_box_contents array to show array later.
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	function loadBox($max = 5)
+	{
+		global $conf, $user, $langs, $db;
+		$langs->load("boxes");
+
+		$this->max = $max;
+
+		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+		$supplierorderstatic=new CommandeFournisseur($db);
+		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+		$thirdpartytmp = new Fournisseur($db);
+
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."SupplierOrders", $max));
+
+		if ($user->rights->fournisseur->commande->lire)
+		{
+			$sql = "SELECT s.nom as name, s.rowid as socid,";
+			$sql.= " s.code_client, s.code_fournisseur,";
+			$sql.= " s.logo,";
+			$sql.= " c.ref, c.tms, c.rowid, c.date_commande,";
+			$sql.= " c.total_ht,";
+			$sql.= " c.tva as total_tva,";
+			$sql.= " c.total_ttc,";
+			$sql.= " c.fk_statut";
+			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql.= " WHERE c.fk_soc = s.rowid";
+			$sql.= " AND c.entity = ".$conf->entity;
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
+			else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
+			$sql.= $db->plimit($max, 0);
+
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$num = $db->num_rows($result);
+
+				$line = 0;
+				while ($line < $num) {
+					$objp = $db->fetch_object($result);
+					$date=$db->jdate($objp->date_commande);
 					$datem=$db->jdate($objp->tms);
-                    $thirdpartytmp->id = $objp->socid;
-                    $thirdpartytmp->name = $objp->name;
-                    $thirdpartytmp->fournisseur = 1;
-                    $thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
-                    $thirdpartytmp->logo = $objp->logo;
-
-                    $urlo = DOL_URL_ROOT."/fourn/commande/card.php?id=".$objp->rowid;
-                    $urls = DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid;
-
-                    $tooltip = $langs->trans('SupplierOrder') . ': ' . $objp->ref;
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left" width="16"',
-                        'logo' => $this->boximg,
-                        'tooltip' => $tooltip,
-                        'url' => $urlo,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $objp->ref,
-                        'tooltip' => $tooltip,
-                        'url' => $urlo,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$thirdpartytmp->id = $objp->socid;
+					$thirdpartytmp->name = $objp->name;
+					$thirdpartytmp->fournisseur = 1;
+					$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartytmp->logo = $objp->logo;
+
+					$urlo = DOL_URL_ROOT."/fourn/commande/card.php?id=".$objp->rowid;
+					$urls = DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid;
+
+					$tooltip = $langs->trans('SupplierOrder') . ': ' . $objp->ref;
+					$this->info_box_contents[$line][] = array(
+						'td' => 'align="left" width="16"',
+						'logo' => $this->boximg,
+						'tooltip' => $tooltip,
+						'url' => $urlo,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $objp->ref,
+						'tooltip' => $tooltip,
+						'url' => $urlo,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($date,'day'),
+					);
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($date,'day'),
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" width="18"',
-                        'text' => $supplierorderstatic->LibStatut($objp->fk_statut,3),
-                    );
-
-                    $line++;
-                }
-
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="center"',
-                        'text' => $langs->trans("NoSupplierOrder"),
-                    );
-
-                $db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($db->error().' sql='.$sql),
-                );
-            }
-        }
-        else
-        {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'align="left" class="nohover opacitymedium"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
-
-    /**
-     * 	Method to show box
-     *
-     * 	@param	array	$head       Array with properties of box title
-     * 	@param  array	$contents   Array with properties of box lines
+						'td' => 'align="right" width="18"',
+						'text' => $supplierorderstatic->LibStatut($objp->fk_statut,3),
+					);
+
+					$line++;
+				}
+
+				if ($num == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'align="center"',
+						'text' => $langs->trans("NoSupplierOrder"),
+					);
+
+				$db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($db->error().' sql='.$sql),
+				);
+			}
+		}
+		else
+		{
+			$this->info_box_contents[0][0] = array(
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
+
+	/**
+	 * 	Method to show box
+	 *
+	 * 	@param	array	$head       Array with properties of box title
+	 * 	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	function showBox($head = null, $contents = null, $nooutput=0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 
 }
 

Spacing +29 added lines, -29 removed lines

@@ -34,7 +34,7 @@ 
 
     var $boxcode = "latestsupplierorders";
     var $boximg = "object_order";
-    var $boxlabel="BoxLatestSupplierOrders";
+    var $boxlabel = "BoxLatestSupplierOrders";
     var $depends = array("fournisseur");
 
     var $db;
@@ -49,13 +49,13 @@ 
      *  @param  DoliDB  $db         Database handler
      *  @param  string  $param      More parameters
      */
-    function __construct($db,$param)
+    function __construct($db, $param)
     {
         global $user;
 
-        $this->db=$db;
+        $this->db = $db;
 
-        $this->hidden=! ($user->rights->fournisseur->commande->lire);
+        $this->hidden = !($user->rights->fournisseur->commande->lire);
     }
 
     /**
@@ -72,32 +72,32 @@ 
         $this->max = $max;
 
         include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-        $supplierorderstatic=new CommandeFournisseur($db);
+        $supplierorderstatic = new CommandeFournisseur($db);
         include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
         $thirdpartytmp = new Fournisseur($db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."SupplierOrders", $max));
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."SupplierOrders", $max));
 
         if ($user->rights->fournisseur->commande->lire)
         {
             $sql = "SELECT s.nom as name, s.rowid as socid,";
-            $sql.= " s.code_client, s.code_fournisseur,";
-            $sql.= " s.logo,";
-            $sql.= " c.ref, c.tms, c.rowid, c.date_commande,";
-            $sql.= " c.total_ht,";
-            $sql.= " c.tva as total_tva,";
-            $sql.= " c.total_ttc,";
-            $sql.= " c.fk_statut";
-            $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-            $sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql.= " WHERE c.fk_soc = s.rowid";
-            $sql.= " AND c.entity = ".$conf->entity;
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
-            else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
-            $sql.= $db->plimit($max, 0);
+            $sql .= " s.code_client, s.code_fournisseur,";
+            $sql .= " s.logo,";
+            $sql .= " c.ref, c.tms, c.rowid, c.date_commande,";
+            $sql .= " c.total_ht,";
+            $sql .= " c.tva as total_tva,";
+            $sql .= " c.total_ttc,";
+            $sql .= " c.fk_statut";
+            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+            $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            $sql .= " WHERE c.fk_soc = s.rowid";
+            $sql .= " AND c.entity = ".$conf->entity;
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+            if ($user->societe_id) $sql .= " AND s.rowid = ".$user->societe_id;
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
+            else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
+            $sql .= $db->plimit($max, 0);
 
             $result = $db->query($sql);
             if ($result)
@@ -107,8 +107,8 @@ 
                 $line = 0;
                 while ($line < $num) {
                     $objp = $db->fetch_object($result);
-                    $date=$db->jdate($objp->date_commande);
-					$datem=$db->jdate($objp->tms);
+                    $date = $db->jdate($objp->date_commande);
+					$datem = $db->jdate($objp->tms);
                     $thirdpartytmp->id = $objp->socid;
                     $thirdpartytmp->name = $objp->name;
                     $thirdpartytmp->fournisseur = 1;
@@ -118,7 +118,7 @@ 
                     $urlo = DOL_URL_ROOT."/fourn/commande/card.php?id=".$objp->rowid;
                     $urls = DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid;
 
-                    $tooltip = $langs->trans('SupplierOrder') . ': ' . $objp->ref;
+                    $tooltip = $langs->trans('SupplierOrder').': '.$objp->ref;
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="left" width="16"',
                         'logo' => $this->boximg,
@@ -146,12 +146,12 @@ 
 
 					$this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
-                        'text' => dol_print_date($date,'day'),
+                        'text' => dol_print_date($date, 'day'),
                     );
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $supplierorderstatic->LibStatut($objp->fk_statut,3),
+                        'text' => $supplierorderstatic->LibStatut($objp->fk_statut, 3),
                     );
 
                     $line++;
@@ -189,7 +189,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }

Braces +18 added lines, -9 removed lines

@@ -90,13 +90,22 @@ 
             $sql.= " c.fk_statut";
             $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
             $sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) {
+            	$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            }
             $sql.= " WHERE c.fk_soc = s.rowid";
             $sql.= " AND c.entity = ".$conf->entity;
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
-            else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) {
+            	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+            }
+            if ($user->societe_id) {
+            	$sql.= " AND s.rowid = ".$user->societe_id;
+            }
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) {
+            	$sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
+            } else {
+            	$sql.= " ORDER BY c.tms DESC, c.ref DESC ";
+            }
             $sql.= $db->plimit($max, 0);
 
             $result = $db->query($sql);
@@ -157,11 +166,12 @@ 
                     $line++;
                 }
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
+                if ($num == 0) {
+                                    $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text' => $langs->trans("NoSupplierOrder"),
                     );
+                }
 
                 $db->free($result);
             } else {
@@ -171,8 +181,7 @@ 
                     'text' => ($db->error().' sql='.$sql),
                 );
             }
-        }
-        else
+        } else
         {
             $this->info_box_contents[0][0] = array(
                 'td' => 'align="left" class="nohover opacitymedium"',

htdocs/core/boxes/box_propales.php

Indentation +137 added lines, -137 removed lines

@@ -32,149 +32,149 @@ 
  */
 class box_propales extends ModeleBoxes
 {
-    var $boxcode="lastpropals";
-    var $boximg="object_propal";
-    var $boxlabel="BoxLastProposals";
-    var $depends = array("propal");	// conf->propal->enabled
+	var $boxcode="lastpropals";
+	var $boximg="object_propal";
+	var $boxlabel="BoxLastProposals";
+	var $depends = array("propal");	// conf->propal->enabled
 
-    var $db;
-    var $param;
+	var $db;
+	var $param;
 
-    var $info_box_head = array();
-    var $info_box_contents = array();
+	var $info_box_head = array();
+	var $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    function __construct($db,$param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	function __construct($db,$param)
+	{
+		global $user;
 
-        $this->db=$db;
+		$this->db=$db;
 
-        $this->hidden=! ($user->rights->propale->lire);
-    }
+		$this->hidden=! ($user->rights->propale->lire);
+	}
 
-    /**
+	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    function loadBox($max=5)
-    {
-    	global $user, $langs, $db, $conf;
-
-    	$this->max=$max;
-
-    	include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-    	$propalstatic=new Propal($db);
-        $societestatic = new Societe($db);
-
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."Propals",$max));
-
-    	if ($user->rights->propale->lire)
-    	{
-    		$sql = "SELECT s.nom as name, s.rowid as socid, s.code_client, s.logo,";
-    		$sql.= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.tms";
-    		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-    		$sql.= ", ".MAIN_DB_PREFIX."propal as p";
-    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    		$sql.= " WHERE p.fk_soc = s.rowid";
-    		$sql.= " AND p.entity = ".$conf->entity;
-    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-    		if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY p.datep DESC, p.ref DESC ";
-            else $sql.= " ORDER BY p.tms DESC, p.ref DESC ";
-    		$sql.= $db->plimit($max, 0);
-
-    		$result = $db->query($sql);
-    		if ($result)
-    		{
-    			$num = $db->num_rows($result);
-    			$now=dol_now();
-
-    			$line = 0;
-
-                while ($line < $num) {
-    				$objp = $db->fetch_object($result);
-    				$date=$db->jdate($objp->dp);
-    				$datec=$db->jdate($objp->datec);
-    				$datem=$db->jdate($objp->tms);
-    				$dateterm=$db->jdate($objp->fin_validite);
-    				$dateclose=$db->jdate($objp->date_cloture);
-                    $propalstatic->id = $objp->rowid;
-                    $propalstatic->ref = $objp->ref;
-                    $propalstatic->total_ht = $objp->total_ht;
-                    $propalstatic->total_tva = $objp->total_tva;
-                    $propalstatic->total_ttc = $objp->total_ttc;
-                    $societestatic->id = $objp->socid;
-                    $societestatic->name = $objp->name;
-                    $societestatic->code_client = $objp->code_client;
-                    $societestatic->logo = $objp->logo;
-
-    				$late = '';
-    				if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->propal->cloture->warning_delay)) {
-    					$late = img_warning($langs->trans("Late"));
-    				}
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $propalstatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax100"',
-                        'text' => $societestatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($date,'day'),
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" width="18"',
-                        'text' => $propalstatic->LibStatut($objp->fk_statut,3),
-                    );
-
-                    $line++;
-                }
-
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="center"',
-                        'text'=>$langs->trans("NoRecordedProposals"),
-                    );
-
-                $db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'align="left" class="nohover opacitymedium"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+	 *  @return	void
+	 */
+	function loadBox($max=5)
+	{
+		global $user, $langs, $db, $conf;
+
+		$this->max=$max;
+
+		include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		$propalstatic=new Propal($db);
+		$societestatic = new Societe($db);
+
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."Propals",$max));
+
+		if ($user->rights->propale->lire)
+		{
+			$sql = "SELECT s.nom as name, s.rowid as socid, s.code_client, s.logo,";
+			$sql.= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.tms";
+			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql.= ", ".MAIN_DB_PREFIX."propal as p";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql.= " WHERE p.fk_soc = s.rowid";
+			$sql.= " AND p.entity = ".$conf->entity;
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY p.datep DESC, p.ref DESC ";
+			else $sql.= " ORDER BY p.tms DESC, p.ref DESC ";
+			$sql.= $db->plimit($max, 0);
+
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$num = $db->num_rows($result);
+				$now=dol_now();
+
+				$line = 0;
+
+				while ($line < $num) {
+					$objp = $db->fetch_object($result);
+					$date=$db->jdate($objp->dp);
+					$datec=$db->jdate($objp->datec);
+					$datem=$db->jdate($objp->tms);
+					$dateterm=$db->jdate($objp->fin_validite);
+					$dateclose=$db->jdate($objp->date_cloture);
+					$propalstatic->id = $objp->rowid;
+					$propalstatic->ref = $objp->ref;
+					$propalstatic->total_ht = $objp->total_ht;
+					$propalstatic->total_tva = $objp->total_tva;
+					$propalstatic->total_ttc = $objp->total_ttc;
+					$societestatic->id = $objp->socid;
+					$societestatic->name = $objp->name;
+					$societestatic->code_client = $objp->code_client;
+					$societestatic->logo = $objp->logo;
+
+					$late = '';
+					if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->propal->cloture->warning_delay)) {
+						$late = img_warning($langs->trans("Late"));
+					}
+
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $propalstatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax100"',
+						'text' => $societestatic->getNomUrl(1),
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($date,'day'),
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'align="right" width="18"',
+						'text' => $propalstatic->LibStatut($objp->fk_statut,3),
+					);
+
+					$line++;
+				}
+
+				if ($num==0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'align="center"',
+						'text'=>$langs->trans("NoRecordedProposals"),
+					);
+
+				$db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -184,10 +184,10 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	function showBox($head = null, $contents = null, $nooutput=0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 
 }
 

Spacing +32 added lines, -32 removed lines

@@ -32,10 +32,10 @@ 
  */
 class box_propales extends ModeleBoxes
 {
-    var $boxcode="lastpropals";
-    var $boximg="object_propal";
-    var $boxlabel="BoxLastProposals";
-    var $depends = array("propal");	// conf->propal->enabled
+    var $boxcode = "lastpropals";
+    var $boximg = "object_propal";
+    var $boxlabel = "BoxLastProposals";
+    var $depends = array("propal"); // conf->propal->enabled
 
     var $db;
     var $param;
@@ -50,13 +50,13 @@ 
      *  @param  DoliDB  $db         Database handler
      *  @param  string  $param      More parameters
      */
-    function __construct($db,$param)
+    function __construct($db, $param)
     {
         global $user;
 
-        $this->db=$db;
+        $this->db = $db;
 
-        $this->hidden=! ($user->rights->propale->lire);
+        $this->hidden = !($user->rights->propale->lire);
     }
 
     /**
@@ -65,49 +65,49 @@ 
 	 *  @param	int		$max        Maximum number of records to load
      *  @return	void
      */
-    function loadBox($max=5)
+    function loadBox($max = 5)
     {
     	global $user, $langs, $db, $conf;
 
-    	$this->max=$max;
+    	$this->max = $max;
 
     	include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-    	$propalstatic=new Propal($db);
+    	$propalstatic = new Propal($db);
         $societestatic = new Societe($db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."Propals",$max));
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."Propals", $max));
 
     	if ($user->rights->propale->lire)
     	{
     		$sql = "SELECT s.nom as name, s.rowid as socid, s.code_client, s.logo,";
-    		$sql.= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.tms";
-    		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-    		$sql.= ", ".MAIN_DB_PREFIX."propal as p";
-    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    		$sql.= " WHERE p.fk_soc = s.rowid";
-    		$sql.= " AND p.entity = ".$conf->entity;
-    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-    		if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY p.datep DESC, p.ref DESC ";
-            else $sql.= " ORDER BY p.tms DESC, p.ref DESC ";
-    		$sql.= $db->plimit($max, 0);
+    		$sql .= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.tms";
+    		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+    		$sql .= ", ".MAIN_DB_PREFIX."propal as p";
+    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    		$sql .= " WHERE p.fk_soc = s.rowid";
+    		$sql .= " AND p.entity = ".$conf->entity;
+    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+    		if ($user->societe_id) $sql .= " AND s.rowid = ".$user->societe_id;
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY p.datep DESC, p.ref DESC ";
+            else $sql .= " ORDER BY p.tms DESC, p.ref DESC ";
+    		$sql .= $db->plimit($max, 0);
 
     		$result = $db->query($sql);
     		if ($result)
     		{
     			$num = $db->num_rows($result);
-    			$now=dol_now();
+    			$now = dol_now();
 
     			$line = 0;
 
                 while ($line < $num) {
     				$objp = $db->fetch_object($result);
-    				$date=$db->jdate($objp->dp);
-    				$datec=$db->jdate($objp->datec);
-    				$datem=$db->jdate($objp->tms);
-    				$dateterm=$db->jdate($objp->fin_validite);
-    				$dateclose=$db->jdate($objp->date_cloture);
+    				$date = $db->jdate($objp->dp);
+    				$datec = $db->jdate($objp->datec);
+    				$datem = $db->jdate($objp->tms);
+    				$dateterm = $db->jdate($objp->fin_validite);
+    				$dateclose = $db->jdate($objp->date_cloture);
                     $propalstatic->id = $objp->rowid;
                     $propalstatic->ref = $objp->ref;
                     $propalstatic->total_ht = $objp->total_ht;
@@ -143,18 +143,18 @@ 
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
-                        'text' => dol_print_date($date,'day'),
+                        'text' => dol_print_date($date, 'day'),
                     );
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $propalstatic->LibStatut($objp->fk_statut,3),
+                        'text' => $propalstatic->LibStatut($objp->fk_statut, 3),
                     );
 
                     $line++;
                 }
 
-                if ($num==0)
+                if ($num == 0)
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoRecordedProposals"),
@@ -184,7 +184,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }

Braces +17 added lines, -7 removed lines

@@ -84,13 +84,22 @@ 
     		$sql.= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.tms";
     		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
     		$sql.= ", ".MAIN_DB_PREFIX."propal as p";
-    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    		if (!$user->rights->societe->client->voir && !$user->societe_id) {
+    			$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    		}
     		$sql.= " WHERE p.fk_soc = s.rowid";
     		$sql.= " AND p.entity = ".$conf->entity;
-    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-    		if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY p.datep DESC, p.ref DESC ";
-            else $sql.= " ORDER BY p.tms DESC, p.ref DESC ";
+    		if (!$user->rights->societe->client->voir && !$user->societe_id) {
+    			$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+    		}
+    		if($user->societe_id) {
+    			$sql.= " AND s.rowid = ".$user->societe_id;
+    		}
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) {
+            	$sql.= " ORDER BY p.datep DESC, p.ref DESC ";
+            } else {
+            	$sql.= " ORDER BY p.tms DESC, p.ref DESC ";
+            }
     		$sql.= $db->plimit($max, 0);
 
     		$result = $db->query($sql);
@@ -154,11 +163,12 @@ 
                     $line++;
                 }
 
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
+                if ($num==0) {
+                                    $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoRecordedProposals"),
                     );
+                }
 
                 $db->free($result);
             } else {

htdocs/core/boxes/box_goodcustomers.php

Indentation +22 added lines, -22 removed lines

@@ -49,7 +49,7 @@ 
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	function __construct($db,$param='')
 	{
@@ -65,10 +65,10 @@ 
 	}
 
 	/**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
 	 */
 	function loadBox($max=5)
 	{
@@ -77,10 +77,10 @@ 
 
 		$this->max=$max;
 
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-        $thirdpartystatic=new Societe($db);
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		$thirdpartystatic=new Societe($db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleGoodCustomers",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleGoodCustomers",$max));
 
 		if ($user->rights->societe->lire)
 		{
@@ -116,24 +116,24 @@ 
 					$nbimpaye = $objp->nbfact - $objp->nbfactpaye;
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => '',
-					    'text' => $thirdpartystatic->getNomUrl(1),
-					    'asis' => 1,
+						'td' => '',
+						'text' => $thirdpartystatic->getNomUrl(1),
+						'asis' => 1,
 					);
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => 'class="right"',
-					    'text' => dol_print_date($datem, "day")
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, "day")
 					);
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => 'class="right"',
-					    'text' => $nbfact.( $nbimpaye != 0 ? ' ('.$nbimpaye.')':'')
+						'td' => 'class="right"',
+						'text' => $nbfact.( $nbimpaye != 0 ? ' ('.$nbimpaye.')':'')
 					);
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => 'align="right" width="18"',
-					    'text' => $thirdpartystatic->LibStatut($objp->status,3)
+						'td' => 'align="right" width="18"',
+						'text' => $thirdpartystatic->LibStatut($objp->status,3)
 					);
 
 					$line++;
@@ -145,13 +145,13 @@ 
 			}
 			else {
 				$this->info_box_contents[0][0] = array(	'td' => '',
-    	        										'maxlength'=>500,
-	            										'text' => ($db->error().' sql='.$sql));
+														'maxlength'=>500,
+														'text' => ($db->error().' sql='.$sql));
 			}
 		}
 		else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'align="left" class="nohover opacitymedium"',
+				'td' => 'align="left" class="nohover opacitymedium"',
 				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
@@ -166,8 +166,8 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
-    {
+	function showBox($head = null, $contents = null, $nooutput=0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }

Spacing +24 added lines, -24 removed lines

@@ -33,9 +33,9 @@ 
  */
 class box_goodcustomers extends ModeleBoxes
 {
-	var $boxcode="goodcustomers";
-	var $boximg="object_company";
-	var $boxlabel="BoxGoodCustomers";
+	var $boxcode = "goodcustomers";
+	var $boximg = "object_company";
+	var $boxlabel = "BoxGoodCustomers";
 	var $depends = array("societe");
 
 	var $db;
@@ -51,17 +51,17 @@ 
 	 *  @param  DoliDB	$db      	Database handler
      *  @param	string	$param		More parameters
 	 */
-	function __construct($db,$param='')
+	function __construct($db, $param = '')
 	{
 		global $conf, $user;
 
 		$this->db = $db;
 
 		// disable box for such cases
-		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0;	// disabled by this option
-		if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) $this->enabled=0; // not enabled by default. Very slow on large database
+		if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled = 0; // disabled by this option
+		if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) $this->enabled = 0; // not enabled by default. Very slow on large database
 
-		$this->hidden = ! ($user->rights->societe->lire);
+		$this->hidden = !($user->rights->societe->lire);
 	}
 
 	/**
@@ -70,29 +70,29 @@ 
      *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $user, $langs, $db, $conf;
 		$langs->load("boxes");
 
-		$this->max=$max;
+		$this->max = $max;
 
         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-        $thirdpartystatic=new Societe($db);
+        $thirdpartystatic = new Societe($db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleGoodCustomers",$max));
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleGoodCustomers", $max));
 
 		if ($user->rights->societe->lire)
 		{
 
 			$sql = "SELECT s.rowid, s.nom as name, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms as datem, s.status as status,";
-			$sql.= " count(*) as nbfact, sum(". $db->ifsql('f.paye=1','1','0').") as nbfactpaye";
-			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
-			$sql.= ' WHERE s.entity IN ('.getEntity('societe').')';
-			$sql.= ' AND s.rowid = f.fk_soc';
-			$sql.= " GROUP BY s.rowid, s.nom, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms, s.status";
-			$sql.= $db->order("nbfact","DESC");
-			$sql.= $db->plimit($max,0);
+			$sql .= " count(*) as nbfact, sum(".$db->ifsql('f.paye=1', '1', '0').") as nbfactpaye";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
+			$sql .= ' WHERE s.entity IN ('.getEntity('societe').')';
+			$sql .= ' AND s.rowid = f.fk_soc';
+			$sql .= " GROUP BY s.rowid, s.nom, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms, s.status";
+			$sql .= $db->order("nbfact", "DESC");
+			$sql .= $db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
 			$result = $db->query($sql);
@@ -104,7 +104,7 @@ 
 				while ($line < $num)
 				{
 					$objp = $db->fetch_object($result);
-					$datem=$db->jdate($objp->tms);
+					$datem = $db->jdate($objp->tms);
 					$thirdpartystatic->id = $objp->rowid;
 					$thirdpartystatic->name = $objp->name;
 					$thirdpartystatic->code_client = $objp->code_client;
@@ -128,23 +128,23 @@ 
 
 					$this->info_box_contents[$line][] = array(
 					    'td' => 'class="right"',
-					    'text' => $nbfact.( $nbimpaye != 0 ? ' ('.$nbimpaye.')':'')
+					    'text' => $nbfact.($nbimpaye != 0 ? ' ('.$nbimpaye.')' : '')
 					);
 
 					$this->info_box_contents[$line][] = array(
 					    'td' => 'align="right" width="18"',
-					    'text' => $thirdpartystatic->LibStatut($objp->status,3)
+					    'text' => $thirdpartystatic->LibStatut($objp->status, 3)
 					);
 
 					$line++;
 				}
 
-				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
+				if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'align="center"', 'text'=>$langs->trans("NoRecordedCustomers"));
 
 				$db->free($result);
 			}
 			else {
-				$this->info_box_contents[0][0] = array(	'td' => '',
+				$this->info_box_contents[0][0] = array('td' => '',
     	        										'maxlength'=>500,
 	            										'text' => ($db->error().' sql='.$sql));
 			}
@@ -166,7 +166,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +13 added lines, -7 removed lines

@@ -58,8 +58,14 @@ 
 		$this->db = $db;
 
 		// disable box for such cases
-		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0;	// disabled by this option
-		if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) $this->enabled=0; // not enabled by default. Very slow on large database
+		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+			$this->enabled=0;
+		}
+		// disabled by this option
+		if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) {
+			$this->enabled=0;
+		}
+		// not enabled by default. Very slow on large database
 
 		$this->hidden = ! ($user->rights->societe->lire);
 	}
@@ -139,17 +145,17 @@ 
 					$line++;
 				}
 
-				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
+				if ($num==0) {
+					$this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
+				}
 
 				$db->free($result);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(	'td' => '',
     	        										'maxlength'=>500,
 	            										'text' => ($db->error().' sql='.$sql));
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'align="left" class="nohover opacitymedium"',
 				'text' => $langs->trans("ReadPermissionNotAllowed")

htdocs/core/boxes/box_commandes.php

Indentation +153 added lines, -153 removed lines

@@ -32,159 +32,159 @@ 
  */
 class box_commandes extends ModeleBoxes
 {
-    var $boxcode="lastcustomerorders";
-    var $boximg="object_order";
-    var $boxlabel="BoxLastCustomerOrders";
-    var $depends = array("commande");
+	var $boxcode="lastcustomerorders";
+	var $boximg="object_order";
+	var $boxlabel="BoxLastCustomerOrders";
+	var $depends = array("commande");
 
 	var $db;
 	var $param;
 
-    var $info_box_head = array();
-    var $info_box_contents = array();
-
-
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    function __construct($db,$param)
-    {
-        global $user;
-
-        $this->db=$db;
-
-        $this->hidden=! ($user->rights->commande->lire);
-    }
-
-    /**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    function loadBox($max=5)
-    {
-        global $user, $langs, $db, $conf;
-
-        $this->max = $max;
-
-        include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-
-        $commandestatic = new Commande($db);
-        $societestatic = new Societe($db);
-        $userstatic = new User($db);
-
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."CustomerOrders",$max));
-
-        if ($user->rights->commande->lire)
-        {
-            $sql = "SELECT s.nom as name";
-            $sql.= ", s.rowid as socid";
-            $sql.= ", s.code_client";
-            $sql.= ", s.logo";
-            $sql.= ", c.ref, c.tms";
-            $sql.= ", c.rowid";
-            $sql.= ", c.date_commande";
-            $sql.= ", c.ref_client";
-            $sql.= ", c.fk_statut";
-            $sql.= ", c.fk_user_valid";
-            $sql.= ", c.facture";
-            $sql.= ", c.total_ht";
-            $sql.= ", c.tva as total_tva";
-            $sql.= ", c.total_ttc";
-            $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-            $sql.= ", ".MAIN_DB_PREFIX."commande as c";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql.= " WHERE c.fk_soc = s.rowid";
-            $sql.= " AND c.entity = ".$conf->entity;
-            if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) $sql.=" AND c.fk_statut = 1";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
-            else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
-            $sql.= $db->plimit($max, 0);
-
-            $result = $db->query($sql);
-            if ($result) {
-                $num = $db->num_rows($result);
-
-                $line = 0;
-
-                while ($line < $num) {
-                    $objp = $db->fetch_object($result);
-                    $date=$db->jdate($objp->date_commande);
-                    $datem=$db->jdate($objp->tms);
-                    $commandestatic->id = $objp->rowid;
-                    $commandestatic->ref = $objp->ref;
-                    $commandestatic->ref_client = $objp->ref_client;
-                    $commandestatic->total_ht = $objp->total_ht;
-                    $commandestatic->total_tva = $objp->total_tva;
-                    $commandestatic->total_ttc = $objp->total_ttc;
-                    $societestatic->id = $objp->socid;
-                    $societestatic->name = $objp->name;
-                    $societestatic->code_client = $objp->code_client;
-                    $societestatic->logo = $objp->logo;
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $commandestatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax100"',
-                        'text' => $societestatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
-
-                    if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER)) {
-                        if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
-                        $this->info_box_contents[$line][] = array(
-                            'td' => 'class="right"',
-                            'text' => (($objp->fk_user_valid > 0)?$userstatic->getNomUrl(1):''),
-                            'asis' => 1,
-                        );
-                    }
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($date,'day'),
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" width="18"',
-                        'text' => $commandestatic->LibStatut($objp->fk_statut,$objp->facture,3),
-                    );
-
-                    $line++;
-                }
-
-                if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedOrders"));
-
-                $db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'align="left" class="nohover opacitymedium"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+	var $info_box_head = array();
+	var $info_box_contents = array();
+
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	function __construct($db,$param)
+	{
+		global $user;
+
+		$this->db=$db;
+
+		$this->hidden=! ($user->rights->commande->lire);
+	}
+
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	function loadBox($max=5)
+	{
+		global $user, $langs, $db, $conf;
+
+		$this->max = $max;
+
+		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+
+		$commandestatic = new Commande($db);
+		$societestatic = new Societe($db);
+		$userstatic = new User($db);
+
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."CustomerOrders",$max));
+
+		if ($user->rights->commande->lire)
+		{
+			$sql = "SELECT s.nom as name";
+			$sql.= ", s.rowid as socid";
+			$sql.= ", s.code_client";
+			$sql.= ", s.logo";
+			$sql.= ", c.ref, c.tms";
+			$sql.= ", c.rowid";
+			$sql.= ", c.date_commande";
+			$sql.= ", c.ref_client";
+			$sql.= ", c.fk_statut";
+			$sql.= ", c.fk_user_valid";
+			$sql.= ", c.facture";
+			$sql.= ", c.total_ht";
+			$sql.= ", c.tva as total_tva";
+			$sql.= ", c.total_ttc";
+			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql.= ", ".MAIN_DB_PREFIX."commande as c";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql.= " WHERE c.fk_soc = s.rowid";
+			$sql.= " AND c.entity = ".$conf->entity;
+			if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) $sql.=" AND c.fk_statut = 1";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
+			else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
+			$sql.= $db->plimit($max, 0);
+
+			$result = $db->query($sql);
+			if ($result) {
+				$num = $db->num_rows($result);
+
+				$line = 0;
+
+				while ($line < $num) {
+					$objp = $db->fetch_object($result);
+					$date=$db->jdate($objp->date_commande);
+					$datem=$db->jdate($objp->tms);
+					$commandestatic->id = $objp->rowid;
+					$commandestatic->ref = $objp->ref;
+					$commandestatic->ref_client = $objp->ref_client;
+					$commandestatic->total_ht = $objp->total_ht;
+					$commandestatic->total_tva = $objp->total_tva;
+					$commandestatic->total_ttc = $objp->total_ttc;
+					$societestatic->id = $objp->socid;
+					$societestatic->name = $objp->name;
+					$societestatic->code_client = $objp->code_client;
+					$societestatic->logo = $objp->logo;
+
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $commandestatic->getNomUrl(1),
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax100"',
+						'text' => $societestatic->getNomUrl(1),
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
+
+					if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER)) {
+						if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
+						$this->info_box_contents[$line][] = array(
+							'td' => 'class="right"',
+							'text' => (($objp->fk_user_valid > 0)?$userstatic->getNomUrl(1):''),
+							'asis' => 1,
+						);
+					}
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($date,'day'),
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'align="right" width="18"',
+						'text' => $commandestatic->LibStatut($objp->fk_statut,$objp->facture,3),
+					);
+
+					$line++;
+				}
+
+				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedOrders"));
+
+				$db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -194,10 +194,10 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	function showBox($head = null, $contents = null, $nooutput=0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 
 }
 

Spacing +40 added lines, -40 removed lines

@@ -32,9 +32,9 @@ 
  */
 class box_commandes extends ModeleBoxes
 {
-    var $boxcode="lastcustomerorders";
-    var $boximg="object_order";
-    var $boxlabel="BoxLastCustomerOrders";
+    var $boxcode = "lastcustomerorders";
+    var $boximg = "object_order";
+    var $boxlabel = "BoxLastCustomerOrders";
     var $depends = array("commande");
 
 	var $db;
@@ -50,13 +50,13 @@ 
      *  @param  DoliDB  $db         Database handler
      *  @param  string  $param      More parameters
      */
-    function __construct($db,$param)
+    function __construct($db, $param)
     {
         global $user;
 
-        $this->db=$db;
+        $this->db = $db;
 
-        $this->hidden=! ($user->rights->commande->lire);
+        $this->hidden = !($user->rights->commande->lire);
     }
 
     /**
@@ -65,7 +65,7 @@ 
      *  @param	int		$max        Maximum number of records to load
      *  @return	void
      */
-    function loadBox($max=5)
+    function loadBox($max = 5)
     {
         global $user, $langs, $db, $conf;
 
@@ -78,35 +78,35 @@ 
         $societestatic = new Societe($db);
         $userstatic = new User($db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."CustomerOrders",$max));
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."CustomerOrders", $max));
 
         if ($user->rights->commande->lire)
         {
             $sql = "SELECT s.nom as name";
-            $sql.= ", s.rowid as socid";
-            $sql.= ", s.code_client";
-            $sql.= ", s.logo";
-            $sql.= ", c.ref, c.tms";
-            $sql.= ", c.rowid";
-            $sql.= ", c.date_commande";
-            $sql.= ", c.ref_client";
-            $sql.= ", c.fk_statut";
-            $sql.= ", c.fk_user_valid";
-            $sql.= ", c.facture";
-            $sql.= ", c.total_ht";
-            $sql.= ", c.tva as total_tva";
-            $sql.= ", c.total_ttc";
-            $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-            $sql.= ", ".MAIN_DB_PREFIX."commande as c";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql.= " WHERE c.fk_soc = s.rowid";
-            $sql.= " AND c.entity = ".$conf->entity;
-            if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) $sql.=" AND c.fk_statut = 1";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
-            else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
-            $sql.= $db->plimit($max, 0);
+            $sql .= ", s.rowid as socid";
+            $sql .= ", s.code_client";
+            $sql .= ", s.logo";
+            $sql .= ", c.ref, c.tms";
+            $sql .= ", c.rowid";
+            $sql .= ", c.date_commande";
+            $sql .= ", c.ref_client";
+            $sql .= ", c.fk_statut";
+            $sql .= ", c.fk_user_valid";
+            $sql .= ", c.facture";
+            $sql .= ", c.total_ht";
+            $sql .= ", c.tva as total_tva";
+            $sql .= ", c.total_ttc";
+            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+            $sql .= ", ".MAIN_DB_PREFIX."commande as c";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            $sql .= " WHERE c.fk_soc = s.rowid";
+            $sql .= " AND c.entity = ".$conf->entity;
+            if (!empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) $sql .= " AND c.fk_statut = 1";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+            if ($user->societe_id) $sql .= " AND s.rowid = ".$user->societe_id;
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
+            else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
+            $sql .= $db->plimit($max, 0);
 
             $result = $db->query($sql);
             if ($result) {
@@ -116,8 +116,8 @@ 
 
                 while ($line < $num) {
                     $objp = $db->fetch_object($result);
-                    $date=$db->jdate($objp->date_commande);
-                    $datem=$db->jdate($objp->tms);
+                    $date = $db->jdate($objp->date_commande);
+                    $datem = $db->jdate($objp->tms);
                     $commandestatic->id = $objp->rowid;
                     $commandestatic->ref = $objp->ref;
                     $commandestatic->ref_client = $objp->ref_client;
@@ -146,29 +146,29 @@ 
                         'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
                     );
 
-                    if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER)) {
+                    if (!empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER)) {
                         if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
                         $this->info_box_contents[$line][] = array(
                             'td' => 'class="right"',
-                            'text' => (($objp->fk_user_valid > 0)?$userstatic->getNomUrl(1):''),
+                            'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
                             'asis' => 1,
                         );
                     }
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
-                        'text' => dol_print_date($date,'day'),
+                        'text' => dol_print_date($date, 'day'),
                     );
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $commandestatic->LibStatut($objp->fk_statut,$objp->facture,3),
+                        'text' => $commandestatic->LibStatut($objp->fk_statut, $objp->facture, 3),
                     );
 
                     $line++;
                 }
 
-                if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedOrders"));
+                if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'align="center"', 'text'=>$langs->trans("NoRecordedOrders"));
 
                 $db->free($result);
             } else {
@@ -194,7 +194,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }

Braces +23 added lines, -8 removed lines

@@ -98,14 +98,25 @@ 
             $sql.= ", c.total_ttc";
             $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
             $sql.= ", ".MAIN_DB_PREFIX."commande as c";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) {
+            	$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            }
             $sql.= " WHERE c.fk_soc = s.rowid";
             $sql.= " AND c.entity = ".$conf->entity;
-            if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) $sql.=" AND c.fk_statut = 1";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
-            else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
+            if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) {
+            	$sql.=" AND c.fk_statut = 1";
+            }
+            if (!$user->rights->societe->client->voir && !$user->societe_id) {
+            	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+            }
+            if ($user->societe_id) {
+            	$sql.= " AND s.rowid = ".$user->societe_id;
+            }
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) {
+            	$sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
+            } else {
+            	$sql.= " ORDER BY c.tms DESC, c.ref DESC ";
+            }
             $sql.= $db->plimit($max, 0);
 
             $result = $db->query($sql);
@@ -147,7 +158,9 @@ 
                     );
 
                     if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER)) {
-                        if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
+                        if ($objp->fk_user_valid > 0) {
+                        	$userstatic->fetch($objp->fk_user_valid);
+                        }
                         $this->info_box_contents[$line][] = array(
                             'td' => 'class="right"',
                             'text' => (($objp->fk_user_valid > 0)?$userstatic->getNomUrl(1):''),
@@ -168,7 +181,9 @@ 
                     $line++;
                 }
 
-                if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedOrders"));
+                if ($num==0) {
+                	$this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedOrders"));
+                }
 
                 $db->free($result);
             } else {

htdocs/core/boxes/box_task.php

Indentation +41 added lines, -41 removed lines

@@ -31,34 +31,34 @@ 
  */
 class box_task extends ModeleBoxes
 {
-    var $boxcode="projet";
-    var $boximg="object_projecttask";
-    var $boxlabel;
-    //var $depends = array("projet");
-    var $db;
-    var $param;
-    var $enabled = 0;		// Disabled because bugged.
-
-    var $info_box_head = array();
-    var $info_box_contents = array();
-
-
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    function __construct($db,$param='')
-    {
-        global $user, $langs;
-        $langs->load("boxes");
-        $langs->load("projects");
-        $this->boxlabel="Tasks";
-        $this->db = $db;
-
-        $this->hidden = ! ($user->rights->projet->lire);
-    }
+	var $boxcode="projet";
+	var $boximg="object_projecttask";
+	var $boxlabel;
+	//var $depends = array("projet");
+	var $db;
+	var $param;
+	var $enabled = 0;		// Disabled because bugged.
+
+	var $info_box_head = array();
+	var $info_box_contents = array();
+
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	function __construct($db,$param='')
+	{
+		global $user, $langs;
+		$langs->load("boxes");
+		$langs->load("projects");
+		$this->boxlabel="Tasks";
+		$this->db = $db;
+
+		$this->hidden = ! ($user->rights->projet->lire);
+	}
 
 	/**
 	 *  Load data for box to show them later
@@ -98,19 +98,19 @@ 
 			{
 				$num = $db->num_rows($result);
 				$i = 0;
-                while ($i < $num)
-                {
-                    $objp = $db->fetch_object($result);
-                    $this->info_box_contents[$i][] = array(
-                        'td' => '',
-                        'text' =>$langs->trans("Task")." ".$taskstatic->LibStatut($objp->fk_statut,0),
-                    );
-
-                    $this->info_box_contents[$i][] = array(
-                        'td' => 'class="right"',
-                        'text' => $objp->nb."&nbsp;".$langs->trans("Tasks"),
-                        'url' => DOL_URL_ROOT."/projet/tasks/list.php?leftmenu=projects&viewstatut=".$objp->fk_statut,
-                    );
+				while ($i < $num)
+				{
+					$objp = $db->fetch_object($result);
+					$this->info_box_contents[$i][] = array(
+						'td' => '',
+						'text' =>$langs->trans("Task")." ".$taskstatic->LibStatut($objp->fk_statut,0),
+					);
+
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="right"',
+						'text' => $objp->nb."&nbsp;".$langs->trans("Tasks"),
+						'url' => DOL_URL_ROOT."/projet/tasks/list.php?leftmenu=projects&viewstatut=".$objp->fk_statut,
+					);
 					$totalnb += $objp->nb;
 					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->plannedtot,'all',25200,5));
 					$totalplannedtot += $objp->plannedtot;

Spacing +23 added lines, -23 removed lines

@@ -31,13 +31,13 @@ 
  */
 class box_task extends ModeleBoxes
 {
-    var $boxcode="projet";
-    var $boximg="object_projecttask";
+    var $boxcode = "projet";
+    var $boximg = "object_projecttask";
     var $boxlabel;
     //var $depends = array("projet");
     var $db;
     var $param;
-    var $enabled = 0;		// Disabled because bugged.
+    var $enabled = 0; // Disabled because bugged.
 
     var $info_box_head = array();
     var $info_box_contents = array();
@@ -49,15 +49,15 @@ 
      *  @param  DoliDB  $db         Database handler
      *  @param  string  $param      More parameters
      */
-    function __construct($db,$param='')
+    function __construct($db, $param = '')
     {
         global $user, $langs;
         $langs->load("boxes");
         $langs->load("projects");
-        $this->boxlabel="Tasks";
+        $this->boxlabel = "Tasks";
         $this->db = $db;
 
-        $this->hidden = ! ($user->rights->projet->lire);
+        $this->hidden = !($user->rights->projet->lire);
     }
 
 	/**
@@ -66,17 +66,17 @@ 
 	 *  @param  int     $max        Maximum number of records to load
 	 *  @return void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $conf, $user, $langs, $db;
 
-		$this->max=$max;
+		$this->max = $max;
 
 		$totalMnt = 0;
 		$totalnb = 0;
-		$totalDuree=0;
+		$totalDuree = 0;
 		include_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php");
-		$taskstatic=new Task($db);
+		$taskstatic = new Task($db);
 
 
 		$textHead = $langs->trans("Tasks")." ".date("Y");
@@ -86,12 +86,12 @@ 
 		if ($user->rights->projet->lire) {
 			// FIXME fk_statut on a task is not be used. We use the percent. This means this box is useless.
 			$sql = "SELECT pt.fk_statut, count(DISTINCT pt.rowid) as nb, sum(ptt.task_duration) as durationtot, sum(pt.planned_workload) as plannedtot";
-			$sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt";
-			$sql.= " WHERE pt.datec BETWEEN '".$this->db->idate(dol_get_first_day(date("Y"), 1))."' AND '".$this->db->idate(dol_get_last_day(date("Y"), 12))."'";
-			$sql.= " AND pt.rowid = ptt.fk_task";
-			$sql.= " GROUP BY pt.fk_statut ";
-			$sql.= " ORDER BY pt.fk_statut DESC";
-			$sql.= $db->plimit($max, 0);
+			$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt";
+			$sql .= " WHERE pt.datec BETWEEN '".$this->db->idate(dol_get_first_day(date("Y"), 1))."' AND '".$this->db->idate(dol_get_last_day(date("Y"), 12))."'";
+			$sql .= " AND pt.rowid = ptt.fk_task";
+			$sql .= " GROUP BY pt.fk_statut ";
+			$sql .= " ORDER BY pt.fk_statut DESC";
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result)
@@ -103,7 +103,7 @@ 
                     $objp = $db->fetch_object($result);
                     $this->info_box_contents[$i][] = array(
                         'td' => '',
-                        'text' =>$langs->trans("Task")." ".$taskstatic->LibStatut($objp->fk_statut,0),
+                        'text' =>$langs->trans("Task")." ".$taskstatic->LibStatut($objp->fk_statut, 0),
                     );
 
                     $this->info_box_contents[$i][] = array(
@@ -112,12 +112,12 @@ 
                         'url' => DOL_URL_ROOT."/projet/tasks/list.php?leftmenu=projects&viewstatut=".$objp->fk_statut,
                     );
 					$totalnb += $objp->nb;
-					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->plannedtot,'all',25200,5));
+					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->plannedtot, 'all', 25200, 5));
 					$totalplannedtot += $objp->plannedtot;
-					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->durationtot,'all',25200,5));
+					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->durationtot, 'all', 25200, 5));
 					$totaldurationtot += $objp->durationtot;
 
-					$this->info_box_contents[$i][] = array('td' => 'align="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut,3));
+					$this->info_box_contents[$i][] = array('td' => 'align="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut, 3));
 
 					$i++;
 				}
@@ -129,8 +129,8 @@ 
 		// Add the sum à the bottom of the boxes
 		$this->info_box_contents[$i][] = array('tr' => 'class="liste_total"', 'td' => '', 'text' => $langs->trans("Total")." ".$textHead);
 		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')." ".$langs->trans("Tasks"));
-		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5));
-		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5));
+		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot, 'all', 25200, 5));
+		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot, 'all', 25200, 5));
 		$this->info_box_contents[$i][] = array('td' => '', 'text' => "");
 
 	}
@@ -143,7 +143,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-	function showBox($head = null, $contents = null, $nooutput=0)
+	function showBox($head = null, $contents = null, $nooutput = 0)
 	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +2 added lines, -1 removed lines

@@ -121,8 +121,9 @@
 
 					$i++;
 				}
+			} else {
+				dol_print_error($this->db);
 			}
-			else dol_print_error($this->db);
 		}
 
 

htdocs/core/boxes/box_contacts.php

Indentation +74 added lines, -74 removed lines

@@ -53,18 +53,18 @@ 
 	 */
 	function __construct($db,$param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db=$db;
+		$this->db=$db;
 
-	    $this->hidden=! ($user->rights->societe->lire);
+		$this->hidden=! ($user->rights->societe->lire);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	function loadBox($max=5)
 	{
@@ -80,7 +80,7 @@ 
 			$sql = "SELECT sp.rowid as id, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc, sp.statut as status";
 			$sql.= ", sp.address, sp.zip, sp.town, sp.phone, sp.phone_perso, sp.phone_mobile";
 			$sql.= ", s.nom as socname, s.name_alias";
-            $sql.= ", s.client, s.fournisseur, s.code_client, s.code_fournisseur";
+			$sql.= ", s.client, s.fournisseur, s.code_client, s.code_fournisseur";
 			$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
 			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -91,87 +91,87 @@ 
 			$sql.= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
-            if ($result) {
+			if ($result) {
 				$num = $db->num_rows($result);
 
 				$contactstatic=new Contact($db);
 				$societestatic=new Societe($db);
 
 				$line = 0;
-                while ($line < $num)
-                {
+				while ($line < $num)
+				{
 					$objp = $db->fetch_object($result);
 					$datec=$db->jdate($objp->datec);
 					$datem=$db->jdate($objp->tms);
 
-                    $contactstatic->id=$objp->id;
+					$contactstatic->id=$objp->id;
 					$contactstatic->lastname=$objp->lastname;
-                    $contactstatic->firstname=$objp->firstname;
-                    $contactstatic->civility_id=$objp->civility_id;
+					$contactstatic->firstname=$objp->firstname;
+					$contactstatic->civility_id=$objp->civility_id;
 					$contactstatic->statut=$objp->status;
-                    $contactstatic->phone_pro = $objp->phone;
-                    $contactstatic->phone_perso = $objp->phone_perso;
-                    $contactstatic->phone_mobile = $objp->phone_mobile;
-                    $contactstatic->address = $objp->address;
-                    $contactstatic->zip = $objp->zip;
-                    $contactstatic->town = $objp->town;
+					$contactstatic->phone_pro = $objp->phone;
+					$contactstatic->phone_perso = $objp->phone_perso;
+					$contactstatic->phone_mobile = $objp->phone_mobile;
+					$contactstatic->address = $objp->address;
+					$contactstatic->zip = $objp->zip;
+					$contactstatic->town = $objp->town;
 
 					$societestatic->id = $objp->fk_soc;
-                    $societestatic->name = $objp->socname;
-                    $societestatic->name_alias = $objp->name_alias;
-                    $societestatic->code_client = $objp->code_client;
-                    $societestatic->code_fournisseur = $objp->code_fournisseur;
-                    $societestatic->client = $objp->client;
-                    $societestatic->fournisseur = $objp->fournisseur;
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $contactstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => ($objp->fk_soc > 0 ? $societestatic->getNomUrl(1) : ''),
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, "day"),
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" class="nowrap" width="18"',
-                        'text' => $contactstatic->getLibStatut(3),
-                        'asis'=>1,
-                    );
-
-                    $line++;
-                }
-
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="center"',
-                        'text'=>$langs->trans("NoRecordedContacts"),
-                    );
-
-                $db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'align="left" class="nohover opacitymedium"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-
-    }
+					$societestatic->name = $objp->socname;
+					$societestatic->name_alias = $objp->name_alias;
+					$societestatic->code_client = $objp->code_client;
+					$societestatic->code_fournisseur = $objp->code_fournisseur;
+					$societestatic->client = $objp->client;
+					$societestatic->fournisseur = $objp->fournisseur;
+
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $contactstatic->getNomUrl(1),
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => ($objp->fk_soc > 0 ? $societestatic->getNomUrl(1) : ''),
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, "day"),
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'align="right" class="nowrap" width="18"',
+						'text' => $contactstatic->getLibStatut(3),
+						'asis'=>1,
+					);
+
+					$line++;
+				}
+
+				if ($num==0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'align="center"',
+						'text'=>$langs->trans("NoRecordedContacts"),
+					);
+
+				$db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+
+	}
 
 	/**
 	 *	Method to show box
@@ -181,8 +181,8 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
-    {
+	function showBox($head = null, $contents = null, $nooutput=0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 

Spacing +32 added lines, -32 removed lines

@@ -33,9 +33,9 @@ 
  */
 class box_contacts extends ModeleBoxes
 {
-	var $boxcode="lastcontacts";
-	var $boximg="object_contact";
-	var $boxlabel="BoxLastContacts";
+	var $boxcode = "lastcontacts";
+	var $boximg = "object_contact";
+	var $boxlabel = "BoxLastContacts";
 	var $depends = array("societe");
 
 	var $db;
@@ -51,13 +51,13 @@ 
 	 *  @param  DoliDB  $db         Database handler
 	 *  @param  string  $param      More parameters
 	 */
-	function __construct($db,$param)
+	function __construct($db, $param)
 	{
 	    global $user;
 
-	    $this->db=$db;
+	    $this->db = $db;
 
-	    $this->hidden=! ($user->rights->societe->lire);
+	    $this->hidden = !($user->rights->societe->lire);
 	}
 
 	/**
@@ -66,49 +66,49 @@ 
 	 *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $user, $langs, $db, $conf;
 		$langs->load("boxes");
 
-		$this->max=$max;
+		$this->max = $max;
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedContacts",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedContacts", $max));
 
 		if ($user->rights->societe->lire)
 		{
 			$sql = "SELECT sp.rowid as id, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc, sp.statut as status";
-			$sql.= ", sp.address, sp.zip, sp.town, sp.phone, sp.phone_perso, sp.phone_mobile";
-			$sql.= ", s.nom as socname, s.name_alias";
-            $sql.= ", s.client, s.fournisseur, s.code_client, s.code_fournisseur";
-			$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
-			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= " WHERE sp.entity IN (".getEntity('societe').")";
-			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND sp.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if ($user->societe_id) $sql.= " AND sp.fk_soc = ".$user->societe_id;
-			$sql.= " ORDER BY sp.tms DESC";
-			$sql.= $db->plimit($max, 0);
+			$sql .= ", sp.address, sp.zip, sp.town, sp.phone, sp.phone_perso, sp.phone_mobile";
+			$sql .= ", s.nom as socname, s.name_alias";
+            $sql .= ", s.client, s.fournisseur, s.code_client, s.code_fournisseur";
+			$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE sp.entity IN (".getEntity('societe').")";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND sp.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->societe_id) $sql .= " AND sp.fk_soc = ".$user->societe_id;
+			$sql .= " ORDER BY sp.tms DESC";
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
             if ($result) {
 				$num = $db->num_rows($result);
 
-				$contactstatic=new Contact($db);
-				$societestatic=new Societe($db);
+				$contactstatic = new Contact($db);
+				$societestatic = new Societe($db);
 
 				$line = 0;
                 while ($line < $num)
                 {
 					$objp = $db->fetch_object($result);
-					$datec=$db->jdate($objp->datec);
-					$datem=$db->jdate($objp->tms);
-
-                    $contactstatic->id=$objp->id;
-					$contactstatic->lastname=$objp->lastname;
-                    $contactstatic->firstname=$objp->firstname;
-                    $contactstatic->civility_id=$objp->civility_id;
-					$contactstatic->statut=$objp->status;
+					$datec = $db->jdate($objp->datec);
+					$datem = $db->jdate($objp->tms);
+
+                    $contactstatic->id = $objp->id;
+					$contactstatic->lastname = $objp->lastname;
+                    $contactstatic->firstname = $objp->firstname;
+                    $contactstatic->civility_id = $objp->civility_id;
+					$contactstatic->statut = $objp->status;
                     $contactstatic->phone_pro = $objp->phone;
                     $contactstatic->phone_perso = $objp->phone_perso;
                     $contactstatic->phone_mobile = $objp->phone_mobile;
@@ -150,7 +150,7 @@ 
                     $line++;
                 }
 
-                if ($num==0)
+                if ($num == 0)
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoRecordedContacts"),
@@ -181,7 +181,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +12 added lines, -5 removed lines

@@ -83,10 +83,16 @@ 
             $sql.= ", s.client, s.fournisseur, s.code_client, s.code_fournisseur";
 			$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
-			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (! $user->rights->societe->client->voir && ! $user->societe_id) {
+				$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			}
 			$sql.= " WHERE sp.entity IN (".getEntity('societe').")";
-			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND sp.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if ($user->societe_id) $sql.= " AND sp.fk_soc = ".$user->societe_id;
+			if (! $user->rights->societe->client->voir && ! $user->societe_id) {
+				$sql.= " AND sp.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			}
+			if ($user->societe_id) {
+				$sql.= " AND sp.fk_soc = ".$user->societe_id;
+			}
 			$sql.= " ORDER BY sp.tms DESC";
 			$sql.= $db->plimit($max, 0);
 
@@ -150,11 +156,12 @@ 
                     $line++;
                 }
 
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
+                if ($num==0) {
+                                    $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoRecordedContacts"),
                     );
+                }
 
                 $db->free($result);
             } else {