alxarafe / alixar

dolibarr/htdocs/core/boxes/box_contracts.php

Indentation +58 added lines, -58 removed lines

@@ -70,67 +70,67 @@ 
      */
     function loadBox($max=5)
     {
-    	global $user, $langs, $db, $conf;
+        global $user, $langs, $db, $conf;
 
-    	$this->max=$max;
+        $this->max=$max;
 
-    	include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
-    	$this->info_box_head = array('text' => $langs->trans("BoxTitleLastContracts",$max));
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastContracts",$max));
 
-    	if ($user->rights->contrat->lire)
-    	{
-        	$contractstatic=new Contrat($db);
-        	$thirdpartytmp=new Societe($db);
+        if ($user->rights->contrat->lire)
+        {
+            $contractstatic=new Contrat($db);
+            $thirdpartytmp=new Societe($db);
 
-    	    $sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
-    		$sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
-    		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat 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_contrat DESC, c.ref DESC ";
-    		else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
-    		$sql.= $db->plimit($max, 0);
+            $sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
+            $sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
+            $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat 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_contrat DESC, c.ref DESC ";
+            else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
+            $sql.= $db->plimit($max, 0);
 
-    		$resql = $db->query($sql);
-    		if ($resql)
-    		{
-    			$num = $db->num_rows($resql);
-    			$now=dol_now();
+            $resql = $db->query($sql);
+            if ($resql)
+            {
+                $num = $db->num_rows($resql);
+                $now=dol_now();
 
-    			$line = 0;
+                $line = 0;
 
-    			$langs->load("contracts");
+                $langs->load("contracts");
 
                 while ($line < $num)
                 {
-    				$objp = $db->fetch_object($resql);
-
-    				$datec=$db->jdate($objp->datec);
-    				$dateterm=$db->jdate($objp->fin_validite);
-    				$dateclose=$db->jdate($objp->date_cloture);
-    				$late = '';
-
-    				$contractstatic->statut=$objp->fk_statut;
-    				$contractstatic->id=$objp->rowid;
-    				$contractstatic->ref=$objp->ref;
-    				$result=$contractstatic->fetch_lines();
-
-    				$thirdpartytmp->name = $objp->name;
-    				$thirdpartytmp->id = $objp->socid;
-    				$thirdpartytmp->email = $objp->email;
-    				$thirdpartytmp->client = $objp->client;
-    				$thirdpartytmp->fournisseur = $objp->fournisseur;
-    				$thirdpartytmp->code_client = $objp->code_client;
-    				$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
-    				$thirdpartytmp->code_compta = $objp->code_compta;
-    				$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
-
-    				// fin_validite is no more on contract but on services
-    				// if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->contrat->cloture->warning_delay)) { $late = img_warning($langs->trans("Late")); }
+                    $objp = $db->fetch_object($resql);
+
+                    $datec=$db->jdate($objp->datec);
+                    $dateterm=$db->jdate($objp->fin_validite);
+                    $dateclose=$db->jdate($objp->date_cloture);
+                    $late = '';
+
+                    $contractstatic->statut=$objp->fk_statut;
+                    $contractstatic->id=$objp->rowid;
+                    $contractstatic->ref=$objp->ref;
+                    $result=$contractstatic->fetch_lines();
+
+                    $thirdpartytmp->name = $objp->name;
+                    $thirdpartytmp->id = $objp->socid;
+                    $thirdpartytmp->email = $objp->email;
+                    $thirdpartytmp->client = $objp->client;
+                    $thirdpartytmp->fournisseur = $objp->fournisseur;
+                    $thirdpartytmp->code_client = $objp->code_client;
+                    $thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
+                    $thirdpartytmp->code_compta = $objp->code_compta;
+                    $thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
+
+                    // fin_validite is no more on contract but on services
+                    // if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->contrat->cloture->warning_delay)) { $late = img_warning($langs->trans("Late")); }
 
                     $this->info_box_contents[$line][] = array(
                         'td' => '',
@@ -181,14 +181,14 @@ 
         }
     }
 
-	/**
-	 *	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
-	 */
+    /**
+     *	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);

Spacing +33 added lines, -33 removed lines

@@ -31,10 +31,10 @@ 
  */
 class box_contracts extends ModeleBoxes
 {
-    var $boxcode="lastcontracts";
-    var $boximg="object_contract";
-    var $boxlabel="BoxLastContracts";
-    var $depends = array("contrat");	// conf->contrat->enabled
+    var $boxcode = "lastcontracts";
+    var $boximg = "object_contract";
+    var $boxlabel = "BoxLastContracts";
+    var $depends = array("contrat"); // conf->contrat->enabled
 
     /**
      * @var DoliDB Database handler.
@@ -53,13 +53,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->contrat->lire);
+        $this->hidden = !($user->rights->contrat->lire);
     }
 
     /**
@@ -68,38 +68,38 @@ 
      *  @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.'/contrat/class/contrat.class.php';
 
-    	$this->info_box_head = array('text' => $langs->trans("BoxTitleLastContracts",$max));
+    	$this->info_box_head = array('text' => $langs->trans("BoxTitleLastContracts", $max));
 
     	if ($user->rights->contrat->lire)
     	{
-        	$contractstatic=new Contrat($db);
-        	$thirdpartytmp=new Societe($db);
+        	$contractstatic = new Contrat($db);
+        	$thirdpartytmp = new Societe($db);
 
     	    $sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
-    		$sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
-    		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat 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_contrat DESC, c.ref DESC ";
-    		else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
-    		$sql.= $db->plimit($max, 0);
+    		$sql .= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
+    		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat 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_contrat DESC, c.ref DESC ";
+    		else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
+    		$sql .= $db->plimit($max, 0);
 
     		$resql = $db->query($sql);
     		if ($resql)
     		{
     			$num = $db->num_rows($resql);
-    			$now=dol_now();
+    			$now = dol_now();
 
     			$line = 0;
 
@@ -109,15 +109,15 @@ 
                 {
     				$objp = $db->fetch_object($resql);
 
-    				$datec=$db->jdate($objp->datec);
-    				$dateterm=$db->jdate($objp->fin_validite);
-    				$dateclose=$db->jdate($objp->date_cloture);
+    				$datec = $db->jdate($objp->datec);
+    				$dateterm = $db->jdate($objp->fin_validite);
+    				$dateclose = $db->jdate($objp->date_cloture);
     				$late = '';
 
-    				$contractstatic->statut=$objp->fk_statut;
-    				$contractstatic->id=$objp->rowid;
-    				$contractstatic->ref=$objp->ref;
-    				$result=$contractstatic->fetch_lines();
+    				$contractstatic->statut = $objp->fk_statut;
+    				$contractstatic->id = $objp->rowid;
+    				$contractstatic->ref = $objp->ref;
+    				$result = $contractstatic->fetch_lines();
 
     				$thirdpartytmp->name = $objp->name;
     				$thirdpartytmp->id = $objp->socid;
@@ -147,7 +147,7 @@ 
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
-                        'text' => dol_print_date($datec,'day'),
+                        'text' => dol_print_date($datec, 'day'),
                     );
 
                     $this->info_box_contents[$line][] = array(
@@ -159,7 +159,7 @@ 
                     $line++;
                 }
 
-                if ($num==0)
+                if ($num == 0)
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center opacitymedium"',
                         'text'=>$langs->trans("NoRecordedContracts"),
@@ -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 +17 added lines, -7 removed lines

@@ -86,13 +86,22 @@ 
     	    $sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
     		$sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
     		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat 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_contrat 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_contrat DESC, c.ref DESC ";
+    		} else {
+    		    $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
+    		}
     		$sql.= $db->plimit($max, 0);
 
     		$resql = $db->query($sql);
@@ -159,11 +168,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 opacitymedium"',
                         'text'=>$langs->trans("NoRecordedContracts"),
                     );
+                }
 
                 $db->free($resql);
             } else {

dolibarr/htdocs/core/boxes/modules_boxes.php

Indentation +303 added lines, -303 removed lines

@@ -33,186 +33,186 @@ 
  */
 class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" boxes
 {
-	/**
-	 * @var DoliDB Database handler
-	 */
-	public $db;
-
-	/**
-	 * @var string Error message
-	 */
-	public $error = '';
-
-	/**
-	 * @var int Maximum lines
-	 */
-	public $max = 5;
-
-	/**
-	 * @var int Condition to have widget enabled
-	 */
-	public $enabled=1;
-
-	/**
-	 * @var int Condition to have widget visible (in most cases, permissions)
-	 */
-	public $hidden=0;
-
-	/**
-	 * @var int Box definition database ID
-	 */
-	public $rowid;
-
-	/**
-	 * @var int ID
-	 * @deprecated Same as box_id?
-	 */
-	public $id;
-
-	/**
-	 * @var int Position?
-	 */
-	public $position;
-
-	/**
-	 * @var string Display order
-	 */
-	public $box_order;
-
-	/**
-	 * @var int User ID
-	 */
-	public $fk_user;
-
-	/**
-	 * @var string Source file
-	 */
-	public $sourcefile;
-
-	/**
-	 * @var string Class name
-	 */
-	public $class;
-
-	/**
-	 * @var string ID
-	 */
-	public $box_id;
-
-	/**
-	 * @var string Alphanumeric ID
-	 */
-	public $boxcode;
-
-	/**
-	 * @var string Note
-	 */
-	public $note;
-
-	/**
-	 * Constructor
-	 *
-	 * @param   DoliDB  $db     Database handler
+    /**
+     * @var DoliDB Database handler
+     */
+    public $db;
+
+    /**
+     * @var string Error message
+     */
+    public $error = '';
+
+    /**
+     * @var int Maximum lines
+     */
+    public $max = 5;
+
+    /**
+     * @var int Condition to have widget enabled
+     */
+    public $enabled=1;
+
+    /**
+     * @var int Condition to have widget visible (in most cases, permissions)
+     */
+    public $hidden=0;
+
+    /**
+     * @var int Box definition database ID
+     */
+    public $rowid;
+
+    /**
+     * @var int ID
+     * @deprecated Same as box_id?
+     */
+    public $id;
+
+    /**
+     * @var int Position?
+     */
+    public $position;
+
+    /**
+     * @var string Display order
+     */
+    public $box_order;
+
+    /**
+     * @var int User ID
+     */
+    public $fk_user;
+
+    /**
+     * @var string Source file
+     */
+    public $sourcefile;
+
+    /**
+     * @var string Class name
+     */
+    public $class;
+
+    /**
+     * @var string ID
+     */
+    public $box_id;
+
+    /**
+     * @var string Alphanumeric ID
+     */
+    public $boxcode;
+
+    /**
+     * @var string Note
+     */
+    public $note;
+
+    /**
+     * Constructor
+     *
+     * @param   DoliDB  $db     Database handler
      * @param   string  $param  More parameters
-	 */
-	function __construct($db,$param='')
-	{
-		$this->db=$db;
-	}
-
-	/**
-	 * Return last error message
-	 *
-	 * @return  string  Error message
-	 */
-	function error()
-	{
-		return $this->error;
-	}
-
-
-	/**
-	 * Load a box line from its rowid
-	 *
-	 * @param   int $rowid  Row id to load
-	 *
-	 * @return  int         <0 if KO, >0 if OK
-	 */
-	function fetch($rowid)
-	{
-		global $conf;
-
-		// Recupere liste des boites d'un user si ce dernier a sa propre liste
-		$sql = "SELECT b.rowid, b.box_id, b.position, b.box_order, b.fk_user";
-		$sql.= " FROM ".MAIN_DB_PREFIX."boxes as b";
-		$sql.= " WHERE b.entity = ".$conf->entity;
-		$sql.= " AND b.rowid = ".$rowid;
-		dol_syslog(get_class($this)."::fetch rowid=".$rowid);
-
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-			if ($obj)
-			{
-				$this->rowid=$obj->rowid;
-				$this->box_id=$obj->box_id;
-				$this->position=$obj->position;
-				$this->box_order=$obj->box_order;
-				$this->fk_user=$obj->fk_user;
-				return 1;
-			}
-			else
-			{
-				return -1;
-			}
-		}
-		else
-		{
-			return -1;
-		}
-	}
-
-
-	/**
-	 * Standard method to get content of a box
-	 *
-	 * @param   array   $head       Array with properties of box title
-	 * @param   array   $contents   Array with properties of box lines
-	 *
-	 * @return  string
-	 */
-	function outputBox($head = null, $contents = null)
-	{
-		global $langs, $user, $conf;
-
-		// Trick to get result into a var from a function that makes print instead of return
-		// TODO Replace ob_start with param nooutput=1 into showBox
-		ob_start();
-		$result = $this->showBox($head, $contents);
-		$output = ob_get_contents();
-		ob_end_clean();
-
-		return $output;
-	}
-
-	/**
-	 * Standard method to show a box (usage by boxes not mandatory, a box can still use its own showBox function)
-	 *
-	 * @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)
-	{
-		global $langs, $user, $conf;
-
-		if (! empty($this->hidden)) return '\n<!-- Box ".get_class($this)." hidden -->\n';    // Nothing done if hidden (for example when user has no permission)
+     */
+    function __construct($db,$param='')
+    {
+        $this->db=$db;
+    }
+
+    /**
+     * Return last error message
+     *
+     * @return  string  Error message
+     */
+    function error()
+    {
+        return $this->error;
+    }
+
+
+    /**
+     * Load a box line from its rowid
+     *
+     * @param   int $rowid  Row id to load
+     *
+     * @return  int         <0 if KO, >0 if OK
+     */
+    function fetch($rowid)
+    {
+        global $conf;
+
+        // Recupere liste des boites d'un user si ce dernier a sa propre liste
+        $sql = "SELECT b.rowid, b.box_id, b.position, b.box_order, b.fk_user";
+        $sql.= " FROM ".MAIN_DB_PREFIX."boxes as b";
+        $sql.= " WHERE b.entity = ".$conf->entity;
+        $sql.= " AND b.rowid = ".$rowid;
+        dol_syslog(get_class($this)."::fetch rowid=".$rowid);
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            if ($obj)
+            {
+                $this->rowid=$obj->rowid;
+                $this->box_id=$obj->box_id;
+                $this->position=$obj->position;
+                $this->box_order=$obj->box_order;
+                $this->fk_user=$obj->fk_user;
+                return 1;
+            }
+            else
+            {
+                return -1;
+            }
+        }
+        else
+        {
+            return -1;
+        }
+    }
+
+
+    /**
+     * Standard method to get content of a box
+     *
+     * @param   array   $head       Array with properties of box title
+     * @param   array   $contents   Array with properties of box lines
+     *
+     * @return  string
+     */
+    function outputBox($head = null, $contents = null)
+    {
+        global $langs, $user, $conf;
+
+        // Trick to get result into a var from a function that makes print instead of return
+        // TODO Replace ob_start with param nooutput=1 into showBox
+        ob_start();
+        $result = $this->showBox($head, $contents);
+        $output = ob_get_contents();
+        ob_end_clean();
+
+        return $output;
+    }
+
+    /**
+     * Standard method to show a box (usage by boxes not mandatory, a box can still use its own showBox function)
+     *
+     * @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)
+    {
+        global $langs, $user, $conf;
+
+        if (! empty($this->hidden)) return '\n<!-- Box ".get_class($this)." hidden -->\n';    // Nothing done if hidden (for example when user has no permission)
 
         require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
 
-		$MAXLENGTHBOX=60;   // Mettre 0 pour pas de limite
+        $MAXLENGTHBOX=60;   // Mettre 0 pour pas de limite
 
         $cachetime = 900;   // 900 : 15mn
         $cachedir = DOL_DATA_ROOT.'/boxes/temp';
@@ -375,133 +375,133 @@ 
         else print $out;
 
         return '';
-	}
-
-
-	/**
-	 *  Return list of widget. Function used by admin page htdoc/admin/widget.
-	 *  List is sorted by widget filename so by priority to run.
-	 *
-	 *  @param	array	$forcedirwidget		null=All default directories. This parameter is used by modulebuilder module only.
-	 * 	@return	array						Array list of widget
-	 */
-	static function getWidgetsList($forcedirwidget=null)
-	{
-		global $conf, $langs, $db;
-
-		$files = array();
-		$fullpath = array();
-		$relpath = array();
-		$iscoreorexternal = array();
-		$modules = array();
-		$orders = array();
-		$i = 0;
-
-		$dirwidget=array_merge(array('/core/boxes/'));
-		if (is_array($forcedirwidget))
-		{
-			$dirwidget=$forcedirwidget;
-		}
-
-		foreach($dirwidget as $reldir)
-		{
-			$dir=dol_buildpath($reldir,0);
-			$newdir=dol_osencode($dir);
-
-			// Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php at each call)
-			if (! is_dir($newdir)) continue;
-
-			$handle=opendir($newdir);
-			if (is_resource($handle))
-			{
-				while (($file = readdir($handle))!==false)
-				{
-					if (is_readable($newdir.'/'.$file) && preg_match('/^(.+)\.php/',$file,$reg))
-					{
-						if (preg_match('/\.back$/',$file)) continue;
-
-						$part1=$reg[1];
-
-						$modName = ucfirst($reg[1]);
-						//print "file=$file"; print "modName=$modName"; exit;
-						if (in_array($modName,$modules))
-						{
-							$langs->load("errors");
-							print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateWidget",$modName,"").'</div>';
-						}
-						else
-						{
-							try {
-								include_once $newdir.'/'.$file;
-							}
-							catch(Exception $e)
-							{
-								print $e->getMessage();
-							}
-						}
-
-						$files[$i] = $file;
-						$fullpath[$i] = $dir.'/'.$file;
-						$relpath[$i] = preg_replace('/^\//','',$reldir).'/'.$file;
-						$iscoreorexternal[$i] = ($reldir == '/core/boxes/'?'internal':'external');
-						$modules[$i] = $modName;
-						$orders[$i] = $part1;   // Set sort criteria value
-
-						$i++;
-					}
-				}
-				closedir($handle);
-			}
-		}
-
-		asort($orders);
-
-		$widget = array();
-		$j = 0;
-
-		// Loop on each widget
-		foreach ($orders as $key => $value)
-		{
-			$modName = $modules[$key];
-			if (empty($modName)) continue;
-
-			if (! class_exists($modName))
-			{
-				print 'Error: A widget file was found but its class "'.$modName.'" was not found.'."<br>\n";
-				continue;
-			}
-
-			$objMod = new $modName($db);
-			if (is_object($objMod))
-			{
-				// Define disabledbyname and disabledbymodule
-				$disabledbyname=0;
-				$module='';
-
-				// Check if widget file is disabled by name
-				if (preg_match('/NORUN$/i',$files[$key])) $disabledbyname=1;
-
-				// We set info of modules
-				$widget[$j]['picto'] = $objMod->picto?img_object('',$objMod->picto):img_object('','generic');
-				$widget[$j]['file'] = $files[$key];
-				$widget[$j]['fullpath'] = $fullpath[$key];
-				$widget[$j]['relpath'] = $relpath[$key];
-				$widget[$j]['iscoreorexternal'] = $iscoreorexternal[$key];
-				//$widget[$j]['version'] = $objMod->getVersion();
-				$widget[$j]['status'] = img_picto($langs->trans("Active"),'tick');
-				if ($disabledbyname > 0 || $disabledbymodule > 1) $widget[$j]['status'] = '';
-
-				$text ='<b>'.$langs->trans("Description").':</b><br>';
-				$text.=$objMod->boxlabel.'<br>';
-				$text.='<br><b>'.$langs->trans("Status").':</b><br>';
-				if ($disabledbymodule == 2) $text.=$langs->trans("HooksDisabledAsModuleDisabled",$module).'<br>';
-
-				$widget[$j]['info'] = $text;
-			}
-			$j++;
-		}
-		return $widget;
-	}
+    }
+
+
+    /**
+     *  Return list of widget. Function used by admin page htdoc/admin/widget.
+     *  List is sorted by widget filename so by priority to run.
+     *
+     *  @param	array	$forcedirwidget		null=All default directories. This parameter is used by modulebuilder module only.
+     * 	@return	array						Array list of widget
+     */
+    static function getWidgetsList($forcedirwidget=null)
+    {
+        global $conf, $langs, $db;
+
+        $files = array();
+        $fullpath = array();
+        $relpath = array();
+        $iscoreorexternal = array();
+        $modules = array();
+        $orders = array();
+        $i = 0;
+
+        $dirwidget=array_merge(array('/core/boxes/'));
+        if (is_array($forcedirwidget))
+        {
+            $dirwidget=$forcedirwidget;
+        }
+
+        foreach($dirwidget as $reldir)
+        {
+            $dir=dol_buildpath($reldir,0);
+            $newdir=dol_osencode($dir);
+
+            // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php at each call)
+            if (! is_dir($newdir)) continue;
+
+            $handle=opendir($newdir);
+            if (is_resource($handle))
+            {
+                while (($file = readdir($handle))!==false)
+                {
+                    if (is_readable($newdir.'/'.$file) && preg_match('/^(.+)\.php/',$file,$reg))
+                    {
+                        if (preg_match('/\.back$/',$file)) continue;
+
+                        $part1=$reg[1];
+
+                        $modName = ucfirst($reg[1]);
+                        //print "file=$file"; print "modName=$modName"; exit;
+                        if (in_array($modName,$modules))
+                        {
+                            $langs->load("errors");
+                            print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateWidget",$modName,"").'</div>';
+                        }
+                        else
+                        {
+                            try {
+                                include_once $newdir.'/'.$file;
+                            }
+                            catch(Exception $e)
+                            {
+                                print $e->getMessage();
+                            }
+                        }
+
+                        $files[$i] = $file;
+                        $fullpath[$i] = $dir.'/'.$file;
+                        $relpath[$i] = preg_replace('/^\//','',$reldir).'/'.$file;
+                        $iscoreorexternal[$i] = ($reldir == '/core/boxes/'?'internal':'external');
+                        $modules[$i] = $modName;
+                        $orders[$i] = $part1;   // Set sort criteria value
+
+                        $i++;
+                    }
+                }
+                closedir($handle);
+            }
+        }
+
+        asort($orders);
+
+        $widget = array();
+        $j = 0;
+
+        // Loop on each widget
+        foreach ($orders as $key => $value)
+        {
+            $modName = $modules[$key];
+            if (empty($modName)) continue;
+
+            if (! class_exists($modName))
+            {
+                print 'Error: A widget file was found but its class "'.$modName.'" was not found.'."<br>\n";
+                continue;
+            }
+
+            $objMod = new $modName($db);
+            if (is_object($objMod))
+            {
+                // Define disabledbyname and disabledbymodule
+                $disabledbyname=0;
+                $module='';
+
+                // Check if widget file is disabled by name
+                if (preg_match('/NORUN$/i',$files[$key])) $disabledbyname=1;
+
+                // We set info of modules
+                $widget[$j]['picto'] = $objMod->picto?img_object('',$objMod->picto):img_object('','generic');
+                $widget[$j]['file'] = $files[$key];
+                $widget[$j]['fullpath'] = $fullpath[$key];
+                $widget[$j]['relpath'] = $relpath[$key];
+                $widget[$j]['iscoreorexternal'] = $iscoreorexternal[$key];
+                //$widget[$j]['version'] = $objMod->getVersion();
+                $widget[$j]['status'] = img_picto($langs->trans("Active"),'tick');
+                if ($disabledbyname > 0 || $disabledbymodule > 1) $widget[$j]['status'] = '';
+
+                $text ='<b>'.$langs->trans("Description").':</b><br>';
+                $text.=$objMod->boxlabel.'<br>';
+                $text.='<br><b>'.$langs->trans("Status").':</b><br>';
+                if ($disabledbymodule == 2) $text.=$langs->trans("HooksDisabledAsModuleDisabled",$module).'<br>';
+
+                $widget[$j]['info'] = $text;
+            }
+            $j++;
+        }
+        return $widget;
+    }
 }
 
 

Spacing +118 added lines, -118 removed lines

@@ -51,12 +51,12 @@ 
 	/**
 	 * @var int Condition to have widget enabled
 	 */
-	public $enabled=1;
+	public $enabled = 1;
 
 	/**
 	 * @var int Condition to have widget visible (in most cases, permissions)
 	 */
-	public $hidden=0;
+	public $hidden = 0;
 
 	/**
 	 * @var int Box definition database ID
@@ -115,9 +115,9 @@ 
 	 * @param   DoliDB  $db     Database handler
      * @param   string  $param  More parameters
 	 */
-	function __construct($db,$param='')
+	function __construct($db, $param = '')
 	{
-		$this->db=$db;
+		$this->db = $db;
 	}
 
 	/**
@@ -144,9 +144,9 @@ 
 
 		// Recupere liste des boites d'un user si ce dernier a sa propre liste
 		$sql = "SELECT b.rowid, b.box_id, b.position, b.box_order, b.fk_user";
-		$sql.= " FROM ".MAIN_DB_PREFIX."boxes as b";
-		$sql.= " WHERE b.entity = ".$conf->entity;
-		$sql.= " AND b.rowid = ".$rowid;
+		$sql .= " FROM ".MAIN_DB_PREFIX."boxes as b";
+		$sql .= " WHERE b.entity = ".$conf->entity;
+		$sql .= " AND b.rowid = ".$rowid;
 		dol_syslog(get_class($this)."::fetch rowid=".$rowid);
 
 		$resql = $this->db->query($sql);
@@ -155,11 +155,11 @@ 
 			$obj = $this->db->fetch_object($resql);
 			if ($obj)
 			{
-				$this->rowid=$obj->rowid;
-				$this->box_id=$obj->box_id;
-				$this->position=$obj->position;
-				$this->box_order=$obj->box_order;
-				$this->fk_user=$obj->fk_user;
+				$this->rowid = $obj->rowid;
+				$this->box_id = $obj->box_id;
+				$this->position = $obj->position;
+				$this->box_order = $obj->box_order;
+				$this->fk_user = $obj->fk_user;
 				return 1;
 			}
 			else
@@ -204,17 +204,17 @@ 
 	 * @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)
 	{
 		global $langs, $user, $conf;
 
-		if (! empty($this->hidden)) return '\n<!-- Box ".get_class($this)." hidden -->\n';    // Nothing done if hidden (for example when user has no permission)
+		if (!empty($this->hidden)) return '\n<!-- Box ".get_class($this)." hidden -->\n'; // Nothing done if hidden (for example when user has no permission)
 
-        require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$MAXLENGTHBOX=60;   // Mettre 0 pour pas de limite
+		$MAXLENGTHBOX = 60; // Mettre 0 pour pas de limite
 
-        $cachetime = 900;   // 900 : 15mn
+        $cachetime = 900; // 900 : 15mn
         $cachedir = DOL_DATA_ROOT.'/boxes/temp';
         $fileid = get_class($this).'id-'.$this->box_id.'-e'.$conf->entity.'-u'.$user->id.'-s'.$user->societe_id.'.cache';
         $filename = '/box-'.$fileid;
@@ -225,150 +225,150 @@ 
             dol_syslog(get_class($this).'::showBox');
 
             // Define nbcol and nblines of the box to show
-            $nbcol=0;
-            if (isset($contents[0])) $nbcol=count($contents[0]);
-            $nblines=count($contents);
+            $nbcol = 0;
+            if (isset($contents[0])) $nbcol = count($contents[0]);
+            $nblines = count($contents);
 
-            $out.= "\n<!-- Box ".get_class($this)." start -->\n";
+            $out .= "\n<!-- Box ".get_class($this)." start -->\n";
 
-            $out.= '<div class="box boxdraggable" id="boxto_'.$this->box_id.'">'."\n";
+            $out .= '<div class="box boxdraggable" id="boxto_'.$this->box_id.'">'."\n";
 
-            if (! empty($head['text']) || ! empty($head['sublink']) || ! empty($head['subpicto']) || $nblines)
+            if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']) || $nblines)
             {
-                $out.= '<table summary="boxtable'.$this->box_id.'" width="100%" class="noborder boxtable">'."\n";
+                $out .= '<table summary="boxtable'.$this->box_id.'" width="100%" class="noborder boxtable">'."\n";
             }
 
             // Show box title
-            if (! empty($head['text']) || ! empty($head['sublink']) || ! empty($head['subpicto']))
+            if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']))
             {
-                $out.= '<tr class="liste_titre box_titre">';
-                $out.= '<td';
-                if ($nbcol > 0) { $out.= ' colspan="'.$nbcol.'"'; }
-                $out.= '>';
+                $out .= '<tr class="liste_titre box_titre">';
+                $out .= '<td';
+                if ($nbcol > 0) { $out .= ' colspan="'.$nbcol.'"'; }
+                $out .= '>';
                 if ($conf->use_javascript_ajax)
                 {
-                    $out.= '<table summary="" class="nobordernopadding" width="100%"><tr><td class="tdoverflowmax150 maxwidth150onsmartphone">';
+                    $out .= '<table summary="" class="nobordernopadding" width="100%"><tr><td class="tdoverflowmax150 maxwidth150onsmartphone">';
                 }
-                if (! empty($head['text']))
+                if (!empty($head['text']))
                 {
-                    $s=dol_trunc($head['text'],isset($head['limit'])?$head['limit']:$MAXLENGTHBOX);
-                    $out.= $s;
+                    $s = dol_trunc($head['text'], isset($head['limit']) ? $head['limit'] : $MAXLENGTHBOX);
+                    $out .= $s;
                 }
-                $out.= '</td>';
+                $out .= '</td>';
 
-                if (! empty($conf->use_javascript_ajax))
+                if (!empty($conf->use_javascript_ajax))
                 {
-                    $sublink='';
-                    if (! empty($head['sublink']))  $sublink.= '<a href="'.$head['sublink'].'"'.(empty($head['target'])?'':' target="'.$head['target'].'"').'>';
-                    if (! empty($head['subpicto'])) $sublink.= img_picto($head['subtext'], $head['subpicto'], 'class="opacitymedium '.(empty($head['subclass'])?'':$head['subclass']).'" id="idsubimg'.$this->boxcode.'"');
-                    if (! empty($head['sublink']))  $sublink.= '</a>';
+                    $sublink = '';
+                    if (!empty($head['sublink']))  $sublink .= '<a href="'.$head['sublink'].'"'.(empty($head['target']) ? '' : ' target="'.$head['target'].'"').'>';
+                    if (!empty($head['subpicto'])) $sublink .= img_picto($head['subtext'], $head['subpicto'], 'class="opacitymedium '.(empty($head['subclass']) ? '' : $head['subclass']).'" id="idsubimg'.$this->boxcode.'"');
+                    if (!empty($head['sublink']))  $sublink .= '</a>';
 
-                    $out.= '<td class="nocellnopadd boxclose right nowraponall">';
-                    $out.=$sublink;
+                    $out .= '<td class="nocellnopadd boxclose right nowraponall">';
+                    $out .= $sublink;
                     // The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
-                    $out.= img_picto($langs->trans("MoveBox",$this->box_id),'grip_title','class="opacitymedium boxhandle hideonsmartphone cursormove"');
-                    $out.= img_picto($langs->trans("CloseBox",$this->box_id),'close_title','class="opacitymedium boxclose cursorpointer" rel="x:y" id="imgclose'.$this->box_id.'"');
-                    $label=$head['text'];
+                    $out .= img_picto($langs->trans("MoveBox", $this->box_id), 'grip_title', 'class="opacitymedium boxhandle hideonsmartphone cursormove"');
+                    $out .= img_picto($langs->trans("CloseBox", $this->box_id), 'close_title', 'class="opacitymedium boxclose cursorpointer" rel="x:y" id="imgclose'.$this->box_id.'"');
+                    $label = $head['text'];
                     //if (! empty($head['graph'])) $label.=' ('.$langs->trans("Graph").')';
-                    if (! empty($head['graph'])) $label.=' <span class="opacitymedium fa fa-bar-chart"></span>';
-                    $out.= '<input type="hidden" id="boxlabelentry'.$this->box_id.'" value="'.dol_escape_htmltag($label).'">';
-                    $out.= '</td></tr></table>';
+                    if (!empty($head['graph'])) $label .= ' <span class="opacitymedium fa fa-bar-chart"></span>';
+                    $out .= '<input type="hidden" id="boxlabelentry'.$this->box_id.'" value="'.dol_escape_htmltag($label).'">';
+                    $out .= '</td></tr></table>';
                 }
 
-                $out.= "</tr>\n";
+                $out .= "</tr>\n";
             }
 
             // Show box lines
             if ($nblines)
             {
                 // Loop on each record
-                for ($i=0, $n=$nblines; $i < $n; $i++)
+                for ($i = 0, $n = $nblines; $i < $n; $i++)
                 {
                     if (isset($contents[$i]))
                     {
                         // TR
-                        if (isset($contents[$i][0]['tr'])) $out.= '<tr '.$contents[$i][0]['tr'].'>';
-                        else $out.= '<tr class="oddeven">';
+                        if (isset($contents[$i][0]['tr'])) $out .= '<tr '.$contents[$i][0]['tr'].'>';
+                        else $out .= '<tr class="oddeven">';
 
                         // Loop on each TD
-                        $nbcolthisline=count($contents[$i]);
-                        for ($j=0; $j < $nbcolthisline; $j++) {
+                        $nbcolthisline = count($contents[$i]);
+                        for ($j = 0; $j < $nbcolthisline; $j++) {
                             // Define tdparam
-                            $tdparam='';
-                            if (isset($contents[$i][$j]['td'])) $tdparam.=' '.$contents[$i][$j]['td'];
-
-                            $text=isset($contents[$i][$j]['text'])?$contents[$i][$j]['text']:'';
-                            $textwithnotags=preg_replace('/<([^>]+)>/i','',$text);
-                            $text2=isset($contents[$i][$j]['text2'])?$contents[$i][$j]['text2']:'';
-                            $text2withnotags=preg_replace('/<([^>]+)>/i','',$text2);
-                            $textnoformat=isset($contents[$i][$j]['textnoformat'])?$contents[$i][$j]['textnoformat']:'';
+                            $tdparam = '';
+                            if (isset($contents[$i][$j]['td'])) $tdparam .= ' '.$contents[$i][$j]['td'];
+
+                            $text = isset($contents[$i][$j]['text']) ? $contents[$i][$j]['text'] : '';
+                            $textwithnotags = preg_replace('/<([^>]+)>/i', '', $text);
+                            $text2 = isset($contents[$i][$j]['text2']) ? $contents[$i][$j]['text2'] : '';
+                            $text2withnotags = preg_replace('/<([^>]+)>/i', '', $text2);
+                            $textnoformat = isset($contents[$i][$j]['textnoformat']) ? $contents[$i][$j]['textnoformat'] : '';
                             //$out.= "xxx $textwithnotags y";
-                            if (empty($contents[$i][$j]['tooltip'])) $contents[$i][$j]['tooltip']="";
-                            $tooltip=isset($contents[$i][$j]['tooltip'])?$contents[$i][$j]['tooltip']:'';
+                            if (empty($contents[$i][$j]['tooltip'])) $contents[$i][$j]['tooltip'] = "";
+                            $tooltip = isset($contents[$i][$j]['tooltip']) ? $contents[$i][$j]['tooltip'] : '';
 
-                            $out.= '<td'.$tdparam.'>'."\n";
+                            $out .= '<td'.$tdparam.'>'."\n";
 
                             // Url
-                            if (! empty($contents[$i][$j]['url']) && empty($contents[$i][$j]['logo']))
+                            if (!empty($contents[$i][$j]['url']) && empty($contents[$i][$j]['logo']))
                             {
-                                $out.= '<a href="'.$contents[$i][$j]['url'].'"';
+                                $out .= '<a href="'.$contents[$i][$j]['url'].'"';
                                 if (!empty($tooltip)) {
                                     $out .= ' title="'.dol_escape_htmltag($langs->trans("Show").' '.$tooltip, 1).'" class="classfortooltip"';
                                 }
                                 //$out.= ' alt="'.$textwithnotags.'"';      // Pas de alt sur un "<a href>"
-                                $out.= isset($contents[$i][$j]['target'])?' target="'.$contents[$i][$j]['target'].'"':'';
-                                $out.= '>';
+                                $out .= isset($contents[$i][$j]['target']) ? ' target="'.$contents[$i][$j]['target'].'"' : '';
+                                $out .= '>';
                             }
 
                             // Logo
-                            if (! empty($contents[$i][$j]['logo']))
+                            if (!empty($contents[$i][$j]['logo']))
                             {
-                                $logo=preg_replace("/^object_/i","",$contents[$i][$j]['logo']);
-                                $out.= '<a href="'.$contents[$i][$j]['url'].'">';
-                                $out.= img_object($langs->trans("Show").' '.$tooltip, $logo, 'class="classfortooltip"');
+                                $logo = preg_replace("/^object_/i", "", $contents[$i][$j]['logo']);
+                                $out .= '<a href="'.$contents[$i][$j]['url'].'">';
+                                $out .= img_object($langs->trans("Show").' '.$tooltip, $logo, 'class="classfortooltip"');
                             }
 
-                            $maxlength=$MAXLENGTHBOX;
-                            if (! empty($contents[$i][$j]['maxlength'])) $maxlength=$contents[$i][$j]['maxlength'];
+                            $maxlength = $MAXLENGTHBOX;
+                            if (!empty($contents[$i][$j]['maxlength'])) $maxlength = $contents[$i][$j]['maxlength'];
 
-                            if ($maxlength) $textwithnotags=dol_trunc($textwithnotags,$maxlength);
-                            if (preg_match('/^<img/i',$text) || preg_match('/^<div/i',$text) || ! empty($contents[$i][$j]['asis'])) $out.= $text;   // show text with no html cleaning
-                            else $out.= $textwithnotags;                // show text with html cleaning
+                            if ($maxlength) $textwithnotags = dol_trunc($textwithnotags, $maxlength);
+                            if (preg_match('/^<img/i', $text) || preg_match('/^<div/i', $text) || !empty($contents[$i][$j]['asis'])) $out .= $text; // show text with no html cleaning
+                            else $out .= $textwithnotags; // show text with html cleaning
 
                             // End Url
-                            if (! empty($contents[$i][$j]['url'])) $out.= '</a>';
+                            if (!empty($contents[$i][$j]['url'])) $out .= '</a>';
 
-                            if (preg_match('/^<img/i',$text2) || preg_match('/^<div/i',$text2) || ! empty($contents[$i][$j]['asis2'])) $out.= $text2; // show text with no html cleaning
-                            else $out.= $text2withnotags;               // show text with html cleaning
+                            if (preg_match('/^<img/i', $text2) || preg_match('/^<div/i', $text2) || !empty($contents[$i][$j]['asis2'])) $out .= $text2; // show text with no html cleaning
+                            else $out .= $text2withnotags; // show text with html cleaning
 
-                            if (! empty($textnoformat)) $out.= "\n".$textnoformat."\n";
+                            if (!empty($textnoformat)) $out .= "\n".$textnoformat."\n";
 
-                            $out.= "</td>\n";
+                            $out .= "</td>\n";
                         }
 
-                        $out.= "</tr>\n";
+                        $out .= "</tr>\n";
                     }
                 }
             }
 
-            if (! empty($head['text']) || ! empty($head['sublink']) || ! empty($head['subpicto']) || $nblines)
+            if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']) || $nblines)
             {
-                $out.= "</table>\n";
+                $out .= "</table>\n";
             }
 
             // If invisible box with no contents
-            if (empty($head['text']) && empty($head['sublink']) && empty($head['subpicto']) && ! $nblines) $out.= "<br>\n";
+            if (empty($head['text']) && empty($head['sublink']) && empty($head['subpicto']) && !$nblines) $out .= "<br>\n";
 
-            $out.= "</div>\n";
+            $out .= "</div>\n";
 
-            $out.= "<!-- Box ".get_class($this)." end -->\n\n";
-            if (! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+            $out .= "<!-- Box ".get_class($this)." end -->\n\n";
+            if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
                 dol_filecache($cachedir, $filename, $out);
             }
         } else {
             dol_syslog(get_class($this).'::showBoxCached');
             $out = "<!-- Box ".get_class($this)." from cache -->";
-            $out.= dol_readcachefile($cachedir, $filename);
+            $out .= dol_readcachefile($cachedir, $filename);
         }
 
         if ($nooutput) return $out;
@@ -385,7 +385,7 @@ 
 	 *  @param	array	$forcedirwidget		null=All default directories. This parameter is used by modulebuilder module only.
 	 * 	@return	array						Array list of widget
 	 */
-	static function getWidgetsList($forcedirwidget=null)
+	static function getWidgetsList($forcedirwidget = null)
 	{
 		global $conf, $langs, $db;
 
@@ -397,44 +397,44 @@ 
 		$orders = array();
 		$i = 0;
 
-		$dirwidget=array_merge(array('/core/boxes/'));
+		$dirwidget = array_merge(array('/core/boxes/'));
 		if (is_array($forcedirwidget))
 		{
-			$dirwidget=$forcedirwidget;
+			$dirwidget = $forcedirwidget;
 		}
 
-		foreach($dirwidget as $reldir)
+		foreach ($dirwidget as $reldir)
 		{
-			$dir=dol_buildpath($reldir,0);
-			$newdir=dol_osencode($dir);
+			$dir = dol_buildpath($reldir, 0);
+			$newdir = dol_osencode($dir);
 
 			// Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php at each call)
-			if (! is_dir($newdir)) continue;
+			if (!is_dir($newdir)) continue;
 
-			$handle=opendir($newdir);
+			$handle = opendir($newdir);
 			if (is_resource($handle))
 			{
-				while (($file = readdir($handle))!==false)
+				while (($file = readdir($handle)) !== false)
 				{
-					if (is_readable($newdir.'/'.$file) && preg_match('/^(.+)\.php/',$file,$reg))
+					if (is_readable($newdir.'/'.$file) && preg_match('/^(.+)\.php/', $file, $reg))
 					{
-						if (preg_match('/\.back$/',$file)) continue;
+						if (preg_match('/\.back$/', $file)) continue;
 
-						$part1=$reg[1];
+						$part1 = $reg[1];
 
 						$modName = ucfirst($reg[1]);
 						//print "file=$file"; print "modName=$modName"; exit;
-						if (in_array($modName,$modules))
+						if (in_array($modName, $modules))
 						{
 							$langs->load("errors");
-							print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateWidget",$modName,"").'</div>';
+							print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateWidget", $modName, "").'</div>';
 						}
 						else
 						{
 							try {
 								include_once $newdir.'/'.$file;
 							}
-							catch(Exception $e)
+							catch (Exception $e)
 							{
 								print $e->getMessage();
 							}
@@ -442,10 +442,10 @@ 
 
 						$files[$i] = $file;
 						$fullpath[$i] = $dir.'/'.$file;
-						$relpath[$i] = preg_replace('/^\//','',$reldir).'/'.$file;
-						$iscoreorexternal[$i] = ($reldir == '/core/boxes/'?'internal':'external');
+						$relpath[$i] = preg_replace('/^\//', '', $reldir).'/'.$file;
+						$iscoreorexternal[$i] = ($reldir == '/core/boxes/' ? 'internal' : 'external');
 						$modules[$i] = $modName;
-						$orders[$i] = $part1;   // Set sort criteria value
+						$orders[$i] = $part1; // Set sort criteria value
 
 						$i++;
 					}
@@ -465,7 +465,7 @@ 
 			$modName = $modules[$key];
 			if (empty($modName)) continue;
 
-			if (! class_exists($modName))
+			if (!class_exists($modName))
 			{
 				print 'Error: A widget file was found but its class "'.$modName.'" was not found.'."<br>\n";
 				continue;
@@ -475,26 +475,26 @@ 
 			if (is_object($objMod))
 			{
 				// Define disabledbyname and disabledbymodule
-				$disabledbyname=0;
-				$module='';
+				$disabledbyname = 0;
+				$module = '';
 
 				// Check if widget file is disabled by name
-				if (preg_match('/NORUN$/i',$files[$key])) $disabledbyname=1;
+				if (preg_match('/NORUN$/i', $files[$key])) $disabledbyname = 1;
 
 				// We set info of modules
-				$widget[$j]['picto'] = $objMod->picto?img_object('',$objMod->picto):img_object('','generic');
+				$widget[$j]['picto'] = $objMod->picto ?img_object('', $objMod->picto) : img_object('', 'generic');
 				$widget[$j]['file'] = $files[$key];
 				$widget[$j]['fullpath'] = $fullpath[$key];
 				$widget[$j]['relpath'] = $relpath[$key];
 				$widget[$j]['iscoreorexternal'] = $iscoreorexternal[$key];
 				//$widget[$j]['version'] = $objMod->getVersion();
-				$widget[$j]['status'] = img_picto($langs->trans("Active"),'tick');
+				$widget[$j]['status'] = img_picto($langs->trans("Active"), 'tick');
 				if ($disabledbyname > 0 || $disabledbymodule > 1) $widget[$j]['status'] = '';
 
-				$text ='<b>'.$langs->trans("Description").':</b><br>';
-				$text.=$objMod->boxlabel.'<br>';
-				$text.='<br><b>'.$langs->trans("Status").':</b><br>';
-				if ($disabledbymodule == 2) $text.=$langs->trans("HooksDisabledAsModuleDisabled",$module).'<br>';
+				$text = '<b>'.$langs->trans("Description").':</b><br>';
+				$text .= $objMod->boxlabel.'<br>';
+				$text .= '<br><b>'.$langs->trans("Status").':</b><br>';
+				if ($disabledbymodule == 2) $text .= $langs->trans("HooksDisabledAsModuleDisabled", $module).'<br>';
 
 				$widget[$j]['info'] = $text;
 			}

Braces +88 added lines, -35 removed lines

@@ -161,13 +161,11 @@ 
 				$this->box_order=$obj->box_order;
 				$this->fk_user=$obj->fk_user;
 				return 1;
-			}
-			else
+			} else
 			{
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -208,7 +206,10 @@ 
 	{
 		global $langs, $user, $conf;
 
-		if (! empty($this->hidden)) return '\n<!-- Box ".get_class($this)." hidden -->\n';    // Nothing done if hidden (for example when user has no permission)
+		if (! empty($this->hidden)) {
+		    return '\n<!-- Box ".get_class($this)." hidden -->\n';
+		}
+		// Nothing done if hidden (for example when user has no permission)
 
         require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
 
@@ -226,7 +227,9 @@ 
 
             // Define nbcol and nblines of the box to show
             $nbcol=0;
-            if (isset($contents[0])) $nbcol=count($contents[0]);
+            if (isset($contents[0])) {
+                $nbcol=count($contents[0]);
+            }
             $nblines=count($contents);
 
             $out.= "\n<!-- Box ".get_class($this)." start -->\n";
@@ -259,9 +262,15 @@ 
                 if (! empty($conf->use_javascript_ajax))
                 {
                     $sublink='';
-                    if (! empty($head['sublink']))  $sublink.= '<a href="'.$head['sublink'].'"'.(empty($head['target'])?'':' target="'.$head['target'].'"').'>';
-                    if (! empty($head['subpicto'])) $sublink.= img_picto($head['subtext'], $head['subpicto'], 'class="opacitymedium '.(empty($head['subclass'])?'':$head['subclass']).'" id="idsubimg'.$this->boxcode.'"');
-                    if (! empty($head['sublink']))  $sublink.= '</a>';
+                    if (! empty($head['sublink'])) {
+                        $sublink.= '<a href="'.$head['sublink'].'"'.(empty($head['target'])?'':' target="'.$head['target'].'"').'>';
+                    }
+                    if (! empty($head['subpicto'])) {
+                        $sublink.= img_picto($head['subtext'], $head['subpicto'], 'class="opacitymedium '.(empty($head['subclass'])?'':$head['subclass']).'" id="idsubimg'.$this->boxcode.'"');
+                    }
+                    if (! empty($head['sublink'])) {
+                        $sublink.= '</a>';
+                    }
 
                     $out.= '<td class="nocellnopadd boxclose right nowraponall">';
                     $out.=$sublink;
@@ -270,7 +279,9 @@ 
                     $out.= img_picto($langs->trans("CloseBox",$this->box_id),'close_title','class="opacitymedium boxclose cursorpointer" rel="x:y" id="imgclose'.$this->box_id.'"');
                     $label=$head['text'];
                     //if (! empty($head['graph'])) $label.=' ('.$langs->trans("Graph").')';
-                    if (! empty($head['graph'])) $label.=' <span class="opacitymedium fa fa-bar-chart"></span>';
+                    if (! empty($head['graph'])) {
+                        $label.=' <span class="opacitymedium fa fa-bar-chart"></span>';
+                    }
                     $out.= '<input type="hidden" id="boxlabelentry'.$this->box_id.'" value="'.dol_escape_htmltag($label).'">';
                     $out.= '</td></tr></table>';
                 }
@@ -287,15 +298,20 @@ 
                     if (isset($contents[$i]))
                     {
                         // TR
-                        if (isset($contents[$i][0]['tr'])) $out.= '<tr '.$contents[$i][0]['tr'].'>';
-                        else $out.= '<tr class="oddeven">';
+                        if (isset($contents[$i][0]['tr'])) {
+                            $out.= '<tr '.$contents[$i][0]['tr'].'>';
+                        } else {
+                            $out.= '<tr class="oddeven">';
+                        }
 
                         // Loop on each TD
                         $nbcolthisline=count($contents[$i]);
                         for ($j=0; $j < $nbcolthisline; $j++) {
                             // Define tdparam
                             $tdparam='';
-                            if (isset($contents[$i][$j]['td'])) $tdparam.=' '.$contents[$i][$j]['td'];
+                            if (isset($contents[$i][$j]['td'])) {
+                                $tdparam.=' '.$contents[$i][$j]['td'];
+                            }
 
                             $text=isset($contents[$i][$j]['text'])?$contents[$i][$j]['text']:'';
                             $textwithnotags=preg_replace('/<([^>]+)>/i','',$text);
@@ -303,7 +319,9 @@ 
                             $text2withnotags=preg_replace('/<([^>]+)>/i','',$text2);
                             $textnoformat=isset($contents[$i][$j]['textnoformat'])?$contents[$i][$j]['textnoformat']:'';
                             //$out.= "xxx $textwithnotags y";
-                            if (empty($contents[$i][$j]['tooltip'])) $contents[$i][$j]['tooltip']="";
+                            if (empty($contents[$i][$j]['tooltip'])) {
+                                $contents[$i][$j]['tooltip']="";
+                            }
                             $tooltip=isset($contents[$i][$j]['tooltip'])?$contents[$i][$j]['tooltip']:'';
 
                             $out.= '<td'.$tdparam.'>'."\n";
@@ -329,19 +347,39 @@ 
                             }
 
                             $maxlength=$MAXLENGTHBOX;
-                            if (! empty($contents[$i][$j]['maxlength'])) $maxlength=$contents[$i][$j]['maxlength'];
+                            if (! empty($contents[$i][$j]['maxlength'])) {
+                                $maxlength=$contents[$i][$j]['maxlength'];
+                            }
 
-                            if ($maxlength) $textwithnotags=dol_trunc($textwithnotags,$maxlength);
-                            if (preg_match('/^<img/i',$text) || preg_match('/^<div/i',$text) || ! empty($contents[$i][$j]['asis'])) $out.= $text;   // show text with no html cleaning
-                            else $out.= $textwithnotags;                // show text with html cleaning
+                            if ($maxlength) {
+                                $textwithnotags=dol_trunc($textwithnotags,$maxlength);
+                            }
+                            if (preg_match('/^<img/i',$text) || preg_match('/^<div/i',$text) || ! empty($contents[$i][$j]['asis'])) {
+                                $out.= $text;
+                            }
+                            // show text with no html cleaning
+                            else {
+                                $out.= $textwithnotags;
+                            }
+                            // show text with html cleaning
 
                             // End Url
-                            if (! empty($contents[$i][$j]['url'])) $out.= '</a>';
+                            if (! empty($contents[$i][$j]['url'])) {
+                                $out.= '</a>';
+                            }
 
-                            if (preg_match('/^<img/i',$text2) || preg_match('/^<div/i',$text2) || ! empty($contents[$i][$j]['asis2'])) $out.= $text2; // show text with no html cleaning
-                            else $out.= $text2withnotags;               // show text with html cleaning
+                            if (preg_match('/^<img/i',$text2) || preg_match('/^<div/i',$text2) || ! empty($contents[$i][$j]['asis2'])) {
+                                $out.= $text2;
+                            }
+                            // show text with no html cleaning
+                            else {
+                                $out.= $text2withnotags;
+                            }
+                            // show text with html cleaning
 
-                            if (! empty($textnoformat)) $out.= "\n".$textnoformat."\n";
+                            if (! empty($textnoformat)) {
+                                $out.= "\n".$textnoformat."\n";
+                            }
 
                             $out.= "</td>\n";
                         }
@@ -357,7 +395,9 @@ 
             }
 
             // If invisible box with no contents
-            if (empty($head['text']) && empty($head['sublink']) && empty($head['subpicto']) && ! $nblines) $out.= "<br>\n";
+            if (empty($head['text']) && empty($head['sublink']) && empty($head['subpicto']) && ! $nblines) {
+                $out.= "<br>\n";
+            }
 
             $out.= "</div>\n";
 
@@ -371,8 +411,11 @@ 
             $out.= dol_readcachefile($cachedir, $filename);
         }
 
-        if ($nooutput) return $out;
-        else print $out;
+        if ($nooutput) {
+            return $out;
+        } else {
+            print $out;
+        }
 
         return '';
 	}
@@ -409,7 +452,9 @@ 
 			$newdir=dol_osencode($dir);
 
 			// Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php at each call)
-			if (! is_dir($newdir)) continue;
+			if (! is_dir($newdir)) {
+			    continue;
+			}
 
 			$handle=opendir($newdir);
 			if (is_resource($handle))
@@ -418,7 +463,9 @@ 
 				{
 					if (is_readable($newdir.'/'.$file) && preg_match('/^(.+)\.php/',$file,$reg))
 					{
-						if (preg_match('/\.back$/',$file)) continue;
+						if (preg_match('/\.back$/',$file)) {
+						    continue;
+						}
 
 						$part1=$reg[1];
 
@@ -428,13 +475,11 @@ 
 						{
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateWidget",$modName,"").'</div>';
-						}
-						else
+						} else
 						{
 							try {
 								include_once $newdir.'/'.$file;
-							}
-							catch(Exception $e)
+							} catch(Exception $e)
 							{
 								print $e->getMessage();
 							}
@@ -463,7 +508,9 @@ 
 		foreach ($orders as $key => $value)
 		{
 			$modName = $modules[$key];
-			if (empty($modName)) continue;
+			if (empty($modName)) {
+			    continue;
+			}
 
 			if (! class_exists($modName))
 			{
@@ -479,7 +526,9 @@ 
 				$module='';
 
 				// Check if widget file is disabled by name
-				if (preg_match('/NORUN$/i',$files[$key])) $disabledbyname=1;
+				if (preg_match('/NORUN$/i',$files[$key])) {
+				    $disabledbyname=1;
+				}
 
 				// We set info of modules
 				$widget[$j]['picto'] = $objMod->picto?img_object('',$objMod->picto):img_object('','generic');
@@ -489,12 +538,16 @@ 
 				$widget[$j]['iscoreorexternal'] = $iscoreorexternal[$key];
 				//$widget[$j]['version'] = $objMod->getVersion();
 				$widget[$j]['status'] = img_picto($langs->trans("Active"),'tick');
-				if ($disabledbyname > 0 || $disabledbymodule > 1) $widget[$j]['status'] = '';
+				if ($disabledbyname > 0 || $disabledbymodule > 1) {
+				    $widget[$j]['status'] = '';
+				}
 
 				$text ='<b>'.$langs->trans("Description").':</b><br>';
 				$text.=$objMod->boxlabel.'<br>';
 				$text.='<br><b>'.$langs->trans("Status").':</b><br>';
-				if ($disabledbymodule == 2) $text.=$langs->trans("HooksDisabledAsModuleDisabled",$module).'<br>';
+				if ($disabledbymodule == 2) {
+				    $text.=$langs->trans("HooksDisabledAsModuleDisabled",$module).'<br>';
+				}
 
 				$widget[$j]['info'] = $text;
 			}

dolibarr/htdocs/core/boxes/box_ficheinter.php

Indentation +132 added lines, -132 removed lines

@@ -31,144 +31,144 @@
  */
 class box_ficheinter extends ModeleBoxes
 {
-	var $boxcode="ficheinter";
-	var $boximg="object_intervention";
-	var $boxlabel="BoxFicheInter";
-	var $depends = array("ficheinter");	// conf->contrat->enabled
+    var $boxcode="ficheinter";
+    var $boximg="object_intervention";
+    var $boxlabel="BoxFicheInter";
+    var $depends = array("ficheinter");	// conf->contrat->enabled
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $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->ficheinter->lire);
-	}
-
-	/**
-	 *  Load data for box to show them later
-	 *
-	 *  @param	int		$max        Maximum number of records to load
-	 *  @return	void
-	*/
-	function loadBox($max=10)
-	{
-		global $user, $langs, $db, $conf;
-
-		$this->max=$max;
-
-		include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-		$ficheinterstatic=new Fichinter($db);
-
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastFicheInter",$max));
-
-		if (! empty($user->rights->ficheinter->lire))
-		{
-			$sql = "SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut,";
-			$sql.= " f.datec,";
-			$sql.= " f.date_valid as datev,";
-			$sql.= " f.tms as datem,";
-			$sql.= " s.nom as name, s.rowid as socid, s.client";
-			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (! $user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= ", ".MAIN_DB_PREFIX."fichinter as f";
-			$sql.= " WHERE f.fk_soc = s.rowid ";
-			$sql.= " AND f.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;
-			$sql.= " ORDER BY f.tms DESC";
-			$sql.= $db->plimit($max, 0);
-
-			dol_syslog(get_class($this).'::loadBox', LOG_DEBUG);
-			$resql = $db->query($sql);
-			if ($resql)
-			{
-				$num = $db->num_rows($resql);
-				$now=dol_now();
-
-				$i = 0;
-
-				while ($i < $num)
-				{
-					$objp = $db->fetch_object($resql);
-					$datec=$db->jdate($objp->datec);
-
-					$ficheinterstatic->statut=$objp->fk_statut;
-					$ficheinterstatic->id=$objp->rowid;
-					$ficheinterstatic->ref=$objp->ref;
-
-					$this->info_box_contents[$i][] = array('td' => '',
-					'text' => $ficheinterstatic->getNomUrl(1),
-					'asis' => 1
-					);
-
-					$this->info_box_contents[$i][] = array('td' => 'align="left" width="16"',
-					'logo' => 'company',
-					'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
-
-					$this->info_box_contents[$i][] = array('td' => '',
-					'text' => dol_trunc($objp->name,40),
-					'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
-
-					$this->info_box_contents[$i][] = array('td' => 'class="right"',
-					'text' => dol_print_date($datec,'day'));
-
-					$this->info_box_contents[$i][] = array('td' => 'align="right" class="nowrap"',
-					'text' => $ficheinterstatic->getLibStatut(6),
-					'asis'=>1
-					);
-
-					$i++;
-				}
-
-				if ($num==0) $this->info_box_contents[$i][] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedInterventions"));
-
-				$db->free($resql);
-			}
-			else
-			{
-				$this->info_box_contents[0][] = array(  'td' => '',
-				'maxlength'=>500,
-				'text' => ($db->error().' sql='.$sql));
-			}
-		}
-		else
-		{
-			$this->info_box_contents[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
-	 */
+    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->ficheinter->lire);
+    }
+
+    /**
+     *  Load data for box to show them later
+     *
+     *  @param	int		$max        Maximum number of records to load
+     *  @return	void
+     */
+    function loadBox($max=10)
+    {
+        global $user, $langs, $db, $conf;
+
+        $this->max=$max;
+
+        include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+        $ficheinterstatic=new Fichinter($db);
+
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastFicheInter",$max));
+
+        if (! empty($user->rights->ficheinter->lire))
+        {
+            $sql = "SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut,";
+            $sql.= " f.datec,";
+            $sql.= " f.date_valid as datev,";
+            $sql.= " f.tms as datem,";
+            $sql.= " s.nom as name, s.rowid as socid, s.client";
+            $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+            if (! $user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            $sql.= ", ".MAIN_DB_PREFIX."fichinter as f";
+            $sql.= " WHERE f.fk_soc = s.rowid ";
+            $sql.= " AND f.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;
+            $sql.= " ORDER BY f.tms DESC";
+            $sql.= $db->plimit($max, 0);
+
+            dol_syslog(get_class($this).'::loadBox', LOG_DEBUG);
+            $resql = $db->query($sql);
+            if ($resql)
+            {
+                $num = $db->num_rows($resql);
+                $now=dol_now();
+
+                $i = 0;
+
+                while ($i < $num)
+                {
+                    $objp = $db->fetch_object($resql);
+                    $datec=$db->jdate($objp->datec);
+
+                    $ficheinterstatic->statut=$objp->fk_statut;
+                    $ficheinterstatic->id=$objp->rowid;
+                    $ficheinterstatic->ref=$objp->ref;
+
+                    $this->info_box_contents[$i][] = array('td' => '',
+                    'text' => $ficheinterstatic->getNomUrl(1),
+                    'asis' => 1
+                    );
+
+                    $this->info_box_contents[$i][] = array('td' => 'align="left" width="16"',
+                    'logo' => 'company',
+                    'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
+
+                    $this->info_box_contents[$i][] = array('td' => '',
+                    'text' => dol_trunc($objp->name,40),
+                    'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
+
+                    $this->info_box_contents[$i][] = array('td' => 'class="right"',
+                    'text' => dol_print_date($datec,'day'));
+
+                    $this->info_box_contents[$i][] = array('td' => 'align="right" class="nowrap"',
+                    'text' => $ficheinterstatic->getLibStatut(6),
+                    'asis'=>1
+                    );
+
+                    $i++;
+                }
+
+                if ($num==0) $this->info_box_contents[$i][] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedInterventions"));
+
+                $db->free($resql);
+            }
+            else
+            {
+                $this->info_box_contents[0][] = array(  'td' => '',
+                'maxlength'=>500,
+                'text' => ($db->error().' sql='.$sql));
+            }
+        }
+        else
+        {
+            $this->info_box_contents[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);
-	}
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+    }
 }
 

Spacing +35 added lines, -35 removed lines

@@ -31,10 +31,10 @@ 
  */
 class box_ficheinter extends ModeleBoxes
 {
-	var $boxcode="ficheinter";
-	var $boximg="object_intervention";
-	var $boxlabel="BoxFicheInter";
-	var $depends = array("ficheinter");	// conf->contrat->enabled
+	var $boxcode = "ficheinter";
+	var $boximg = "object_intervention";
+	var $boxlabel = "BoxFicheInter";
+	var $depends = array("ficheinter"); // conf->contrat->enabled
 
 	/**
      * @var DoliDB Database handler.
@@ -53,13 +53,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->ficheinter->lire);
+	    $this->hidden = !($user->rights->ficheinter->lire);
 	}
 
 	/**
@@ -68,51 +68,51 @@ 
 	 *  @param	int		$max        Maximum number of records to load
 	 *  @return	void
 	*/
-	function loadBox($max=10)
+	function loadBox($max = 10)
 	{
 		global $user, $langs, $db, $conf;
 
-		$this->max=$max;
+		$this->max = $max;
 
 		include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-		$ficheinterstatic=new Fichinter($db);
+		$ficheinterstatic = new Fichinter($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastFicheInter",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastFicheInter", $max));
 
-		if (! empty($user->rights->ficheinter->lire))
+		if (!empty($user->rights->ficheinter->lire))
 		{
 			$sql = "SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut,";
-			$sql.= " f.datec,";
-			$sql.= " f.date_valid as datev,";
-			$sql.= " f.tms as datem,";
-			$sql.= " s.nom as name, s.rowid as socid, s.client";
-			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (! $user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= ", ".MAIN_DB_PREFIX."fichinter as f";
-			$sql.= " WHERE f.fk_soc = s.rowid ";
-			$sql.= " AND f.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;
-			$sql.= " ORDER BY f.tms DESC";
-			$sql.= $db->plimit($max, 0);
+			$sql .= " f.datec,";
+			$sql .= " f.date_valid as datev,";
+			$sql .= " f.tms as datem,";
+			$sql .= " s.nom as name, s.rowid as socid, s.client";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			if (!$user->rights->societe->client->voir) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".MAIN_DB_PREFIX."fichinter as f";
+			$sql .= " WHERE f.fk_soc = s.rowid ";
+			$sql .= " AND f.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;
+			$sql .= " ORDER BY f.tms DESC";
+			$sql .= $db->plimit($max, 0);
 
 			dol_syslog(get_class($this).'::loadBox', LOG_DEBUG);
 			$resql = $db->query($sql);
 			if ($resql)
 			{
 				$num = $db->num_rows($resql);
-				$now=dol_now();
+				$now = dol_now();
 
 				$i = 0;
 
 				while ($i < $num)
 				{
 					$objp = $db->fetch_object($resql);
-					$datec=$db->jdate($objp->datec);
+					$datec = $db->jdate($objp->datec);
 
-					$ficheinterstatic->statut=$objp->fk_statut;
-					$ficheinterstatic->id=$objp->rowid;
-					$ficheinterstatic->ref=$objp->ref;
+					$ficheinterstatic->statut = $objp->fk_statut;
+					$ficheinterstatic->id = $objp->rowid;
+					$ficheinterstatic->ref = $objp->ref;
 
 					$this->info_box_contents[$i][] = array('td' => '',
 					'text' => $ficheinterstatic->getNomUrl(1),
@@ -124,11 +124,11 @@ 
 					'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][] = array('td' => '',
-					'text' => dol_trunc($objp->name,40),
+					'text' => dol_trunc($objp->name, 40),
 					'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][] = array('td' => 'class="right"',
-					'text' => dol_print_date($datec,'day'));
+					'text' => dol_print_date($datec, 'day'));
 
 					$this->info_box_contents[$i][] = array('td' => 'align="right" class="nowrap"',
 					'text' => $ficheinterstatic->getLibStatut(6),
@@ -138,13 +138,13 @@ 
 					$i++;
 				}
 
-				if ($num==0) $this->info_box_contents[$i][] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedInterventions"));
+				if ($num == 0) $this->info_box_contents[$i][] = array('td' => 'align="center"', 'text'=>$langs->trans("NoRecordedInterventions"));
 
 				$db->free($resql);
 			}
 			else
 			{
-				$this->info_box_contents[0][] = array(  'td' => '',
+				$this->info_box_contents[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 +14 added lines, -8 removed lines

@@ -87,12 +87,18 @@ 
 			$sql.= " f.tms as datem,";
 			$sql.= " s.nom as name, s.rowid as socid, s.client";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (! $user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (! $user->rights->societe->client->voir) {
+			    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			}
 			$sql.= ", ".MAIN_DB_PREFIX."fichinter as f";
 			$sql.= " WHERE f.fk_soc = s.rowid ";
 			$sql.= " AND f.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 (! $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 f.tms DESC";
 			$sql.= $db->plimit($max, 0);
 
@@ -138,18 +144,18 @@ 
 					$i++;
 				}
 
-				if ($num==0) $this->info_box_contents[$i][] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedInterventions"));
+				if ($num==0) {
+				    $this->info_box_contents[$i][] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedInterventions"));
+				}
 
 				$db->free($resql);
-			}
-			else
+			} else
 			{
 				$this->info_box_contents[0][] = array(  'td' => '',
 				'maxlength'=>500,
 				'text' => ($db->error().' sql='.$sql));
 			}
-		}
-		else
+		} else
 		{
 			$this->info_box_contents[0][] = array(
 			    'td' => 'align="left" class="nohover opacitymedium"',

dolibarr/htdocs/core/boxes/box_activity.php

Indentation +263 added lines, -263 removed lines

@@ -102,89 +102,89 @@ 
         // list the summary of the propals
         if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
         {
-        	include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-        	$propalstatic=new Propal($db);
-
-        	$cachedir = DOL_DATA_ROOT.'/propale/temp';
-        	$filename = '/boxactivity-propal'.$fileid;
-        	$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
-        	$data = array();
-        	if ($refresh)
-        	{
-        		$sql = "SELECT p.fk_statut, SUM(p.total) as Mnttot, COUNT(*) as nb";
-        		$sql.= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
-        		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        		$sql.= ")";
-        		$sql.= " WHERE p.entity IN (".getEntity('propal').")";
-        		$sql.= " AND p.fk_soc = s.rowid";
-        		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.= " AND p.datep >= '".$db->idate($tmpdate)."'";
-        		$sql.= " AND p.date_cloture IS NULL"; // just unclosed
-        		$sql.= " GROUP BY p.fk_statut";
-        		$sql.= " ORDER BY p.fk_statut DESC";
-
-        		$result = $db->query($sql);
-        		if ($result)
-        		{
-        			$num = $db->num_rows($result);
-
-        			$j=0;
-        			while ($j < $num) {
-        				$data[$j]=$db->fetch_object($result);
-        				$j++;
-        			}
-        			if (! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-        				dol_filecache($cachedir, $filename, $data);
-        			}
-        			$db->free($result);
-        		} else {
-        			dol_print_error($db);
-        		}
-        	}
-        	else
-        	{
-        		$data = dol_readcachefile($cachedir, $filename);
-        	}
-
-        	if (! empty($data))
-        	{
-        		$j=0;
-        		while ($j < count($data))
-        		{
-        			$this->info_box_contents[$line][0] = array(
-        			'td' => 'align="left" width="16"',
-        			'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut,
-        			'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
-        			'logo' => 'object_propal'
-        			);
-
-        			$this->info_box_contents[$line][1] = array(
-        			'td' => '',
-        			'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
-        			);
-
-        			$this->info_box_contents[$line][2] = array(
-        			'td' => 'class="right"',
-        			'text' => $data[$j]->nb,
-        			'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
-        			'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut,
-        			);
-        			$totalnb += $data[$j]->nb;
-
-        			$this->info_box_contents[$line][3] = array(
-        			'td' => 'class="right"',
-        			'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
-        			);
-        			$this->info_box_contents[$line][4] = array(
-        			'td' => 'align="right" width="18"',
-        			'text' => $propalstatic->LibStatut($data[$j]->fk_statut,3),
-        			);
-
-        			$line++;
-        			$j++;
-        		}
-        	}
+            include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+            $propalstatic=new Propal($db);
+
+            $cachedir = DOL_DATA_ROOT.'/propale/temp';
+            $filename = '/boxactivity-propal'.$fileid;
+            $refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+            $data = array();
+            if ($refresh)
+            {
+                $sql = "SELECT p.fk_statut, SUM(p.total) as Mnttot, COUNT(*) as nb";
+                $sql.= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
+                if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+                $sql.= ")";
+                $sql.= " WHERE p.entity IN (".getEntity('propal').")";
+                $sql.= " AND p.fk_soc = s.rowid";
+                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.= " AND p.datep >= '".$db->idate($tmpdate)."'";
+                $sql.= " AND p.date_cloture IS NULL"; // just unclosed
+                $sql.= " GROUP BY p.fk_statut";
+                $sql.= " ORDER BY p.fk_statut DESC";
+
+                $result = $db->query($sql);
+                if ($result)
+                {
+                    $num = $db->num_rows($result);
+
+                    $j=0;
+                    while ($j < $num) {
+                        $data[$j]=$db->fetch_object($result);
+                        $j++;
+                    }
+                    if (! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+                        dol_filecache($cachedir, $filename, $data);
+                    }
+                    $db->free($result);
+                } else {
+                    dol_print_error($db);
+                }
+            }
+            else
+            {
+                $data = dol_readcachefile($cachedir, $filename);
+            }
+
+            if (! empty($data))
+            {
+                $j=0;
+                while ($j < count($data))
+                {
+                    $this->info_box_contents[$line][0] = array(
+                    'td' => 'align="left" width="16"',
+                    'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut,
+                    'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
+                    'logo' => 'object_propal'
+                    );
+
+                    $this->info_box_contents[$line][1] = array(
+                    'td' => '',
+                    'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
+                    );
+
+                    $this->info_box_contents[$line][2] = array(
+                    'td' => 'class="right"',
+                    'text' => $data[$j]->nb,
+                    'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
+                    'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut,
+                    );
+                    $totalnb += $data[$j]->nb;
+
+                    $this->info_box_contents[$line][3] = array(
+                    'td' => 'class="right"',
+                    'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
+                    );
+                    $this->info_box_contents[$line][4] = array(
+                    'td' => 'align="right" width="18"',
+                    'text' => $propalstatic->LibStatut($data[$j]->fk_statut,3),
+                    );
+
+                    $line++;
+                    $j++;
+                }
+            }
         }
 
         // list the summary of the orders
@@ -274,191 +274,191 @@ 
         // list the summary of the bills
         if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
         {
-        	include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-        	$facturestatic=new Facture($db);
-
-        	// part 1
-        	$cachedir = DOL_DATA_ROOT.'/facture/temp';
-        	$filename = '/boxactivity-invoice'.$fileid;
-
-        	$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
-        	$data = array();
-        	if ($refresh)
-        	{
-        		$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
-        		$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-        		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        		$sql.= ")";
-        		$sql.= " WHERE f.entity IN (".getEntity('invoice').')';
-        		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.= " AND f.fk_soc = s.rowid";
-        		$sql.= " AND f.datef >= '".$db->idate($tmpdate)."' AND f.paye=1";
-        		$sql.= " GROUP BY f.fk_statut";
-        		$sql.= " ORDER BY f.fk_statut DESC";
-
-        		$result = $db->query($sql);
-        		if ($result) {
-        			$num = $db->num_rows($result);
-        			$j=0;
-        			while ($j < $num) {
-        				$data[$j]=$db->fetch_object($result);
-        				$j++;
-        			}
-        			if (! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-        				dol_filecache($cachedir, $filename, $data);
-        			}
-        			$db->free($result);
-        		} else {
-        			dol_print_error($db);
-        		}
-        	} else {
-        		$data = dol_readcachefile($cachedir, $filename);
-        	}
-
-        	if (! empty($data)) {
-        		$j=0;
-        		while ($j < count($data)) {
-        			$billurl="search_status=2&amp;paye=1&amp;year=".$data[$j]->annee;
-        			$this->info_box_contents[$line][0] = array(
-        			'td' => 'align="left" width="16"',
-        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1,$data[$j]->fk_statut,0),
-        			'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-        			'logo' => 'bill',
-        			);
-
-        			$this->info_box_contents[$line][1] = array(
-        			'td' => '',
-        			'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1,$data[$j]->fk_statut,0)." ".$data[$j]->annee,
-        			);
-
-        			$this->info_box_contents[$line][2] = array(
-        			'td' => 'class="right"',
-        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1,$data[$j]->fk_statut,0),
-        			'text' => $data[$j]->nb,
-        			'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-        			);
-
-        			$this->info_box_contents[$line][3] = array(
-        			'td' => 'class="right"',
-        			'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency)
-        			);
-
-        			// We add only for the current year
-       				$totalnb += $data[$j]->nb;
-
-        			$this->info_box_contents[$line][4] = array(
-        			'td' => 'align="right" width="18"',
-        			'text' => $facturestatic->LibStatut(1,$data[$j]->fk_statut,3),
-        			);
-        			$line++;
-        			$j++;
-        		}
-        		if (count($data)==0)
-        			$this->info_box_contents[$line][0] = array(
-        			'td' => 'align="center"',
-        			'text'=>$langs->trans("NoRecordedInvoices"),
-        			);
-        	}
-
-        	// part 2
-        	$cachedir = DOL_DATA_ROOT.'/facture/temp';
-        	$filename = '/boxactivity-invoice2'.$fileid;
-
-        	$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
-
-        	$data = array();
-        	if ($refresh) {
-        		$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
-        		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-        		$sql.= " WHERE f.entity IN (".getEntity('invoice').')';
-        		$sql.= " AND f.fk_soc = s.rowid";
-        		$sql.= " AND f.datef >= '".$db->idate($tmpdate)."' AND f.paye=0";
-        		$sql.= " GROUP BY f.fk_statut";
-        		$sql.= " ORDER BY f.fk_statut DESC";
-
-        		$result = $db->query($sql);
-        		if ($result) {
-        			$num = $db->num_rows($result);
-        			$j=0;
-        			while ($j < $num) {
-        				$data[$j]=$db->fetch_object($result);
-        				$j++;
-        			}
-        			if (! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-        				dol_filecache($cachedir, $filename, $data);
-        			}
-        			$db->free($result);
-        		} else {
-        			dol_print_error($db);
-        		}
-        	} else {
-        		$data = dol_readcachefile($cachedir, $filename);
-        	}
-
-        	if (! empty($data)) {
-        		$alreadypaid=-1;
-
-        		$j=0;
-        		while ($j < count($data)) {
-        			$billurl="search_status=".$data[$j]->fk_statut."&amp;paye=0";
-        			$this->info_box_contents[$line][0] = array(
-        			'td' => 'align="left" width="16"',
-        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
-        			'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-        			'logo' => 'bill',
-        			);
-
-        			$this->info_box_contents[$line][1] = array(
-        			'td' => '',
-        			'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
-        			);
-
-        			$this->info_box_contents[$line][2] = array(
-        			'td' => 'class="right"',
-        			'text' => $data[$j]->nb,
-        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
-        			'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-        			);
-        			$totalnb += $data[$j]->nb;
-        			$this->info_box_contents[$line][3] = array(
-        			'td' => 'class="right"',
-        			'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
-        			);
-        			$this->info_box_contents[$line][4] = array(
-        			'td' => 'align="right" width="18"',
-        			'text' => $facturestatic->LibStatut(0,$data[$j]->fk_statut,3, $alreadypaid),
-        			);
-        			$line++;
-        			$j++;
-        		}
-        		if ($num==0)
-        			$this->info_box_contents[$line][0] = array(
-        			'td' => 'align="center"',
-        			'text'=>$langs->trans("NoRecordedInvoices"),
-        			);
-        	}
+            include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+            $facturestatic=new Facture($db);
+
+            // part 1
+            $cachedir = DOL_DATA_ROOT.'/facture/temp';
+            $filename = '/boxactivity-invoice'.$fileid;
+
+            $refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+            $data = array();
+            if ($refresh)
+            {
+                $sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
+                $sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+                if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+                $sql.= ")";
+                $sql.= " WHERE f.entity IN (".getEntity('invoice').')';
+                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.= " AND f.fk_soc = s.rowid";
+                $sql.= " AND f.datef >= '".$db->idate($tmpdate)."' AND f.paye=1";
+                $sql.= " GROUP BY f.fk_statut";
+                $sql.= " ORDER BY f.fk_statut DESC";
+
+                $result = $db->query($sql);
+                if ($result) {
+                    $num = $db->num_rows($result);
+                    $j=0;
+                    while ($j < $num) {
+                        $data[$j]=$db->fetch_object($result);
+                        $j++;
+                    }
+                    if (! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+                        dol_filecache($cachedir, $filename, $data);
+                    }
+                    $db->free($result);
+                } else {
+                    dol_print_error($db);
+                }
+            } else {
+                $data = dol_readcachefile($cachedir, $filename);
+            }
+
+            if (! empty($data)) {
+                $j=0;
+                while ($j < count($data)) {
+                    $billurl="search_status=2&amp;paye=1&amp;year=".$data[$j]->annee;
+                    $this->info_box_contents[$line][0] = array(
+                    'td' => 'align="left" width="16"',
+                    'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1,$data[$j]->fk_statut,0),
+                    'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+                    'logo' => 'bill',
+                    );
+
+                    $this->info_box_contents[$line][1] = array(
+                    'td' => '',
+                    'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1,$data[$j]->fk_statut,0)." ".$data[$j]->annee,
+                    );
+
+                    $this->info_box_contents[$line][2] = array(
+                    'td' => 'class="right"',
+                    'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1,$data[$j]->fk_statut,0),
+                    'text' => $data[$j]->nb,
+                    'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+                    );
+
+                    $this->info_box_contents[$line][3] = array(
+                    'td' => 'class="right"',
+                    'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency)
+                    );
+
+                    // We add only for the current year
+                        $totalnb += $data[$j]->nb;
+
+                    $this->info_box_contents[$line][4] = array(
+                    'td' => 'align="right" width="18"',
+                    'text' => $facturestatic->LibStatut(1,$data[$j]->fk_statut,3),
+                    );
+                    $line++;
+                    $j++;
+                }
+                if (count($data)==0)
+                    $this->info_box_contents[$line][0] = array(
+                    'td' => 'align="center"',
+                    'text'=>$langs->trans("NoRecordedInvoices"),
+                    );
+            }
+
+            // part 2
+            $cachedir = DOL_DATA_ROOT.'/facture/temp';
+            $filename = '/boxactivity-invoice2'.$fileid;
+
+            $refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+
+            $data = array();
+            if ($refresh) {
+                $sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+                $sql.= " WHERE f.entity IN (".getEntity('invoice').')';
+                $sql.= " AND f.fk_soc = s.rowid";
+                $sql.= " AND f.datef >= '".$db->idate($tmpdate)."' AND f.paye=0";
+                $sql.= " GROUP BY f.fk_statut";
+                $sql.= " ORDER BY f.fk_statut DESC";
+
+                $result = $db->query($sql);
+                if ($result) {
+                    $num = $db->num_rows($result);
+                    $j=0;
+                    while ($j < $num) {
+                        $data[$j]=$db->fetch_object($result);
+                        $j++;
+                    }
+                    if (! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+                        dol_filecache($cachedir, $filename, $data);
+                    }
+                    $db->free($result);
+                } else {
+                    dol_print_error($db);
+                }
+            } else {
+                $data = dol_readcachefile($cachedir, $filename);
+            }
+
+            if (! empty($data)) {
+                $alreadypaid=-1;
+
+                $j=0;
+                while ($j < count($data)) {
+                    $billurl="search_status=".$data[$j]->fk_statut."&amp;paye=0";
+                    $this->info_box_contents[$line][0] = array(
+                    'td' => 'align="left" width="16"',
+                    'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
+                    'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+                    'logo' => 'bill',
+                    );
+
+                    $this->info_box_contents[$line][1] = array(
+                    'td' => '',
+                    'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
+                    );
+
+                    $this->info_box_contents[$line][2] = array(
+                    'td' => 'class="right"',
+                    'text' => $data[$j]->nb,
+                    'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
+                    'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+                    );
+                    $totalnb += $data[$j]->nb;
+                    $this->info_box_contents[$line][3] = array(
+                    'td' => 'class="right"',
+                    'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
+                    );
+                    $this->info_box_contents[$line][4] = array(
+                    'td' => 'align="right" width="18"',
+                    'text' => $facturestatic->LibStatut(0,$data[$j]->fk_statut,3, $alreadypaid),
+                    );
+                    $line++;
+                    $j++;
+                }
+                if ($num==0)
+                    $this->info_box_contents[$line][0] = array(
+                    'td' => 'align="center"',
+                    'text'=>$langs->trans("NoRecordedInvoices"),
+                    );
+            }
         }
 
-		// Add the sum in the bottom of the boxes
-		$this->info_box_contents[$line][0] = array('tr' => 'class="liste_total_wrap"');
-		$this->info_box_contents[$line][1] = array('td' => 'align="left" class="liste_total" ', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
-		$this->info_box_contents[$line][2] = array('td' => 'align="right" class="liste_total" ', 'text' => $totalnb);
-		$this->info_box_contents[$line][3] = array('td' => 'align="right" class="liste_total" ', 'text' => '');
-		$this->info_box_contents[$line][4] = array('td' => 'align="right" class="liste_total" ', 'text' => "");
+        // Add the sum in the bottom of the boxes
+        $this->info_box_contents[$line][0] = array('tr' => 'class="liste_total_wrap"');
+        $this->info_box_contents[$line][1] = array('td' => 'align="left" class="liste_total" ', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
+        $this->info_box_contents[$line][2] = array('td' => 'align="right" class="liste_total" ', 'text' => $totalnb);
+        $this->info_box_contents[$line][3] = array('td' => 'align="right" class="liste_total" ', 'text' => '');
+        $this->info_box_contents[$line][4] = array('td' => 'align="right" class="liste_total" ', 'text' => "");
     }
 
 
-	/**
-	 *	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
-	 */
+    /**
+     *	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);
-	}
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+    }
 }

Spacing +103 added lines, -103 removed lines

@@ -30,9 +30,9 @@ 
  */
 class box_activity extends ModeleBoxes
 {
-    var $boxcode="activity";
-    var $boximg="object_bill";
-    var $boxlabel='BoxGlobalActivity';
+    var $boxcode = "activity";
+    var $boximg = "object_bill";
+    var $boxlabel = 'BoxGlobalActivity';
     var $depends = array("facture");
 
     /**
@@ -53,18 +53,18 @@ 
      *  @param  DoliDB  $db         Database handler
      *  @param  string  $param      More parameters
      */
-    function __construct($db,$param)
+    function __construct($db, $param)
     {
         global $conf, $user;
 
-        $this->db=$db;
+        $this->db = $db;
 
         // FIXME: Pb into some status
-        $this->enabled=($conf->global->MAIN_FEATURES_LEVEL);    // Not enabled by default due to bugs (see previous comments)
+        $this->enabled = ($conf->global->MAIN_FEATURES_LEVEL); // Not enabled by default due to bugs (see previous comments)
 
-        $this->hidden= ! ((! empty($conf->facture->enabled) && $user->rights->facture->lire)
-            || (! empty($conf->commande->enabled) && $user->rights->commande->lire)
-            || (! empty($conf->propal->enabled) && $user->rights->propale->lire)
+        $this->hidden = !((!empty($conf->facture->enabled) && $user->rights->facture->lire)
+            || (!empty($conf->commande->enabled) && $user->rights->commande->lire)
+            || (!empty($conf->propal->enabled) && $user->rights->propale->lire)
             );
     }
 
@@ -74,7 +74,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;
 
@@ -84,11 +84,11 @@ 
         $totalnb = 0;
         $line = 0;
         $cachetime = 3600;
-        $fileid = '-e'.$conf->entity.'-u'.$user->id.'-s'.$user->societe_id.'-r'.($user->rights->societe->client->voir?'1':'0').'.cache';
+        $fileid = '-e'.$conf->entity.'-u'.$user->id.'-s'.$user->societe_id.'-r'.($user->rights->societe->client->voir ? '1' : '0').'.cache';
         $now = dol_now();
-        $nbofperiod=3;
+        $nbofperiod = 3;
 
-        if (! empty($conf->global->MAIN_BOX_ACTIVITY_DURATION)) $nbofperiod=$conf->global->MAIN_BOX_ACTIVITY_DURATION;
+        if (!empty($conf->global->MAIN_BOX_ACTIVITY_DURATION)) $nbofperiod = $conf->global->MAIN_BOX_ACTIVITY_DURATION;
         $textHead = $langs->trans("Activity").' - '.$langs->trans("LastXMonthRolling", $nbofperiod);
         $this->info_box_head = array(
             'text' => $textHead,
@@ -96,14 +96,14 @@ 
         );
 
         // compute the year limit to show
-        $tmpdate= dol_time_plus_duree(dol_now(), -1*$nbofperiod, "m");
+        $tmpdate = dol_time_plus_duree(dol_now(), -1 * $nbofperiod, "m");
 
 
         // list the summary of the propals
-        if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
+        if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
         {
         	include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-        	$propalstatic=new Propal($db);
+        	$propalstatic = new Propal($db);
 
         	$cachedir = DOL_DATA_ROOT.'/propale/temp';
         	$filename = '/boxactivity-propal'.$fileid;
@@ -112,29 +112,29 @@ 
         	if ($refresh)
         	{
         		$sql = "SELECT p.fk_statut, SUM(p.total) as Mnttot, COUNT(*) as nb";
-        		$sql.= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
-        		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        		$sql.= ")";
-        		$sql.= " WHERE p.entity IN (".getEntity('propal').")";
-        		$sql.= " AND p.fk_soc = s.rowid";
-        		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.= " AND p.datep >= '".$db->idate($tmpdate)."'";
-        		$sql.= " AND p.date_cloture IS NULL"; // just unclosed
-        		$sql.= " GROUP BY p.fk_statut";
-        		$sql.= " ORDER BY p.fk_statut DESC";
+        		$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
+        		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        		$sql .= ")";
+        		$sql .= " WHERE p.entity IN (".getEntity('propal').")";
+        		$sql .= " AND p.fk_soc = s.rowid";
+        		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 .= " AND p.datep >= '".$db->idate($tmpdate)."'";
+        		$sql .= " AND p.date_cloture IS NULL"; // just unclosed
+        		$sql .= " GROUP BY p.fk_statut";
+        		$sql .= " ORDER BY p.fk_statut DESC";
 
         		$result = $db->query($sql);
         		if ($result)
         		{
         			$num = $db->num_rows($result);
 
-        			$j=0;
+        			$j = 0;
         			while ($j < $num) {
-        				$data[$j]=$db->fetch_object($result);
+        				$data[$j] = $db->fetch_object($result);
         				$j++;
         			}
-        			if (! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+        			if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
         				dol_filecache($cachedir, $filename, $data);
         			}
         			$db->free($result);
@@ -147,38 +147,38 @@ 
         		$data = dol_readcachefile($cachedir, $filename);
         	}
 
-        	if (! empty($data))
+        	if (!empty($data))
         	{
-        		$j=0;
+        		$j = 0;
         		while ($j < count($data))
         		{
         			$this->info_box_contents[$line][0] = array(
         			'td' => 'align="left" width="16"',
         			'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut,
-        			'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
+        			'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
         			'logo' => 'object_propal'
         			);
 
         			$this->info_box_contents[$line][1] = array(
         			'td' => '',
-        			'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
+        			'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
         			);
 
         			$this->info_box_contents[$line][2] = array(
         			'td' => 'class="right"',
         			'text' => $data[$j]->nb,
-        			'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut,0),
+        			'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
         			'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut,
         			);
         			$totalnb += $data[$j]->nb;
 
         			$this->info_box_contents[$line][3] = array(
         			'td' => 'class="right"',
-        			'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
+        			'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
         			);
         			$this->info_box_contents[$line][4] = array(
         			'td' => 'align="right" width="18"',
-        			'text' => $propalstatic->LibStatut($data[$j]->fk_statut,3),
+        			'text' => $propalstatic->LibStatut($data[$j]->fk_statut, 3),
         			);
 
         			$line++;
@@ -188,9 +188,9 @@ 
         }
 
         // list the summary of the orders
-        if (! empty($conf->commande->enabled) && $user->rights->commande->lire) {
+        if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
             include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-            $commandestatic=new Commande($db);
+            $commandestatic = new Commande($db);
 
             $langs->load("orders");
 
@@ -202,26 +202,26 @@ 
             if ($refresh) {
 
                 $sql = "SELECT c.fk_statut, sum(c.total_ttc) as Mnttot, count(*) as nb";
-                $sql.= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
-                if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-                $sql.= ")";
-                $sql.= " WHERE c.entity = ".$conf->entity;
-                $sql.= " AND c.fk_soc = s.rowid";
-                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.= " AND c.date_commande >= '".$db->idate($tmpdate)."'";
-                $sql.= " GROUP BY c.fk_statut";
-                $sql.= " ORDER BY c.fk_statut DESC";
+                $sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
+                if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+                $sql .= ")";
+                $sql .= " WHERE c.entity = ".$conf->entity;
+                $sql .= " AND c.fk_soc = s.rowid";
+                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 .= " AND c.date_commande >= '".$db->idate($tmpdate)."'";
+                $sql .= " GROUP BY c.fk_statut";
+                $sql .= " ORDER BY c.fk_statut DESC";
 
                 $result = $db->query($sql);
                 if ($result) {
                     $num = $db->num_rows($result);
-                    $j=0;
+                    $j = 0;
                     while ($j < $num) {
-                        $data[$j]=$db->fetch_object($result);
+                        $data[$j] = $db->fetch_object($result);
                         $j++;
                     }
-                    if (! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+                    if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
                         dol_filecache($cachedir, $filename, $data);
                     }
                     $db->free($result);
@@ -232,36 +232,36 @@ 
                 $data = dol_readcachefile($cachedir, $filename);
             }
 
-            if (! empty($data)) {
-                $j=0;
+            if (!empty($data)) {
+                $j = 0;
                 while ($j < count($data)) {
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="left" width="16"',
                         'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;viewstatut=".$data[$j]->fk_statut,
-                        'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut,0,0),
+                        'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
                         'logo' => 'object_order',
                     );
 
                     $this->info_box_contents[$line][1] = array(
                         'td' => '',
-                        'text' =>$langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut,0,0),
+                        'text' =>$langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
                     );
 
                     $this->info_box_contents[$line][2] = array(
                         'td' => 'class="right"',
                         'text' => $data[$j]->nb,
-                        'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut,0,0),
+                        'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
                         'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;viewstatut=".$data[$j]->fk_statut,
                     );
                     $totalnb += $data[$j]->nb;
 
                     $this->info_box_contents[$line][3] = array(
                         'td' => 'class="right"',
-                        'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
+                        'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
                     );
                     $this->info_box_contents[$line][4] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $commandestatic->LibStatut($data[$j]->fk_statut,0,3),
+                        'text' => $commandestatic->LibStatut($data[$j]->fk_statut, 0, 3),
                     );
 
                     $line++;
@@ -272,10 +272,10 @@ 
 
 
         // list the summary of the bills
-        if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
+        if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
         {
         	include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-        	$facturestatic=new Facture($db);
+        	$facturestatic = new Facture($db);
 
         	// part 1
         	$cachedir = DOL_DATA_ROOT.'/facture/temp';
@@ -286,26 +286,26 @@ 
         	if ($refresh)
         	{
         		$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
-        		$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-        		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        		$sql.= ")";
-        		$sql.= " WHERE f.entity IN (".getEntity('invoice').')';
-        		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.= " AND f.fk_soc = s.rowid";
-        		$sql.= " AND f.datef >= '".$db->idate($tmpdate)."' AND f.paye=1";
-        		$sql.= " GROUP BY f.fk_statut";
-        		$sql.= " ORDER BY f.fk_statut DESC";
+        		$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+        		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        		$sql .= ")";
+        		$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
+        		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 .= " AND f.fk_soc = s.rowid";
+        		$sql .= " AND f.datef >= '".$db->idate($tmpdate)."' AND f.paye=1";
+        		$sql .= " GROUP BY f.fk_statut";
+        		$sql .= " ORDER BY f.fk_statut DESC";
 
         		$result = $db->query($sql);
         		if ($result) {
         			$num = $db->num_rows($result);
-        			$j=0;
+        			$j = 0;
         			while ($j < $num) {
-        				$data[$j]=$db->fetch_object($result);
+        				$data[$j] = $db->fetch_object($result);
         				$j++;
         			}
-        			if (! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+        			if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
         				dol_filecache($cachedir, $filename, $data);
         			}
         			$db->free($result);
@@ -316,32 +316,32 @@ 
         		$data = dol_readcachefile($cachedir, $filename);
         	}
 
-        	if (! empty($data)) {
-        		$j=0;
+        	if (!empty($data)) {
+        		$j = 0;
         		while ($j < count($data)) {
-        			$billurl="search_status=2&amp;paye=1&amp;year=".$data[$j]->annee;
+        			$billurl = "search_status=2&amp;paye=1&amp;year=".$data[$j]->annee;
         			$this->info_box_contents[$line][0] = array(
         			'td' => 'align="left" width="16"',
-        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1,$data[$j]->fk_statut,0),
+        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
         			'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
         			'logo' => 'bill',
         			);
 
         			$this->info_box_contents[$line][1] = array(
         			'td' => '',
-        			'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1,$data[$j]->fk_statut,0)." ".$data[$j]->annee,
+        			'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0)." ".$data[$j]->annee,
         			);
 
         			$this->info_box_contents[$line][2] = array(
         			'td' => 'class="right"',
-        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1,$data[$j]->fk_statut,0),
+        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
         			'text' => $data[$j]->nb,
         			'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
         			);
 
         			$this->info_box_contents[$line][3] = array(
         			'td' => 'class="right"',
-        			'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency)
+        			'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency)
         			);
 
         			// We add only for the current year
@@ -349,12 +349,12 @@ 
 
         			$this->info_box_contents[$line][4] = array(
         			'td' => 'align="right" width="18"',
-        			'text' => $facturestatic->LibStatut(1,$data[$j]->fk_statut,3),
+        			'text' => $facturestatic->LibStatut(1, $data[$j]->fk_statut, 3),
         			);
         			$line++;
         			$j++;
         		}
-        		if (count($data)==0)
+        		if (count($data) == 0)
         			$this->info_box_contents[$line][0] = array(
         			'td' => 'align="center"',
         			'text'=>$langs->trans("NoRecordedInvoices"),
@@ -370,22 +370,22 @@ 
         	$data = array();
         	if ($refresh) {
         		$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
-        		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-        		$sql.= " WHERE f.entity IN (".getEntity('invoice').')';
-        		$sql.= " AND f.fk_soc = s.rowid";
-        		$sql.= " AND f.datef >= '".$db->idate($tmpdate)."' AND f.paye=0";
-        		$sql.= " GROUP BY f.fk_statut";
-        		$sql.= " ORDER BY f.fk_statut DESC";
+        		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+        		$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
+        		$sql .= " AND f.fk_soc = s.rowid";
+        		$sql .= " AND f.datef >= '".$db->idate($tmpdate)."' AND f.paye=0";
+        		$sql .= " GROUP BY f.fk_statut";
+        		$sql .= " ORDER BY f.fk_statut DESC";
 
         		$result = $db->query($sql);
         		if ($result) {
         			$num = $db->num_rows($result);
-        			$j=0;
+        			$j = 0;
         			while ($j < $num) {
-        				$data[$j]=$db->fetch_object($result);
+        				$data[$j] = $db->fetch_object($result);
         				$j++;
         			}
-        			if (! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+        			if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
         				dol_filecache($cachedir, $filename, $data);
         			}
         			$db->free($result);
@@ -396,43 +396,43 @@ 
         		$data = dol_readcachefile($cachedir, $filename);
         	}
 
-        	if (! empty($data)) {
-        		$alreadypaid=-1;
+        	if (!empty($data)) {
+        		$alreadypaid = -1;
 
-        		$j=0;
+        		$j = 0;
         		while ($j < count($data)) {
-        			$billurl="search_status=".$data[$j]->fk_statut."&amp;paye=0";
+        			$billurl = "search_status=".$data[$j]->fk_statut."&amp;paye=0";
         			$this->info_box_contents[$line][0] = array(
         			'td' => 'align="left" width="16"',
-        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
+        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
         			'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
         			'logo' => 'bill',
         			);
 
         			$this->info_box_contents[$line][1] = array(
         			'td' => '',
-        			'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
+        			'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
         			);
 
         			$this->info_box_contents[$line][2] = array(
         			'td' => 'class="right"',
         			'text' => $data[$j]->nb,
-        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
+        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
         			'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
         			);
         			$totalnb += $data[$j]->nb;
         			$this->info_box_contents[$line][3] = array(
         			'td' => 'class="right"',
-        			'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
+        			'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
         			);
         			$this->info_box_contents[$line][4] = array(
         			'td' => 'align="right" width="18"',
-        			'text' => $facturestatic->LibStatut(0,$data[$j]->fk_statut,3, $alreadypaid),
+        			'text' => $facturestatic->LibStatut(0, $data[$j]->fk_statut, 3, $alreadypaid),
         			);
         			$line++;
         			$j++;
         		}
-        		if ($num==0)
+        		if ($num == 0)
         			$this->info_box_contents[$line][0] = array(
         			'td' => 'align="center"',
         			'text'=>$langs->trans("NoRecordedInvoices"),
@@ -457,7 +457,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 +37 added lines, -16 removed lines

@@ -88,7 +88,9 @@ 
         $now = dol_now();
         $nbofperiod=3;
 
-        if (! empty($conf->global->MAIN_BOX_ACTIVITY_DURATION)) $nbofperiod=$conf->global->MAIN_BOX_ACTIVITY_DURATION;
+        if (! empty($conf->global->MAIN_BOX_ACTIVITY_DURATION)) {
+            $nbofperiod=$conf->global->MAIN_BOX_ACTIVITY_DURATION;
+        }
         $textHead = $langs->trans("Activity").' - '.$langs->trans("LastXMonthRolling", $nbofperiod);
         $this->info_box_head = array(
             'text' => $textHead,
@@ -113,12 +115,18 @@ 
         	{
         		$sql = "SELECT p.fk_statut, SUM(p.total) as Mnttot, COUNT(*) as nb";
         		$sql.= " FROM (".MAIN_DB_PREFIX."societe as s, ".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.= ")";
         		$sql.= " WHERE p.entity IN (".getEntity('propal').")";
         		$sql.= " AND p.fk_soc = s.rowid";
-        		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.= " AND p.datep >= '".$db->idate($tmpdate)."'";
         		$sql.= " AND p.date_cloture IS NULL"; // just unclosed
         		$sql.= " GROUP BY p.fk_statut";
@@ -141,8 +149,7 @@ 
         		} else {
         			dol_print_error($db);
         		}
-        	}
-        	else
+        	} else
         	{
         		$data = dol_readcachefile($cachedir, $filename);
         	}
@@ -203,12 +210,18 @@ 
 
                 $sql = "SELECT c.fk_statut, sum(c.total_ttc) as Mnttot, count(*) as nb";
                 $sql.= " FROM (".MAIN_DB_PREFIX."societe as s, ".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.= ")";
                 $sql.= " WHERE c.entity = ".$conf->entity;
                 $sql.= " AND c.fk_soc = s.rowid";
-                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.= " AND c.date_commande >= '".$db->idate($tmpdate)."'";
                 $sql.= " GROUP BY c.fk_statut";
                 $sql.= " ORDER BY c.fk_statut DESC";
@@ -287,11 +300,17 @@ 
         	{
         		$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
         		$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-        		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.= ")";
         		$sql.= " WHERE f.entity IN (".getEntity('invoice').')';
-        		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.= " AND f.fk_soc = s.rowid";
         		$sql.= " AND f.datef >= '".$db->idate($tmpdate)."' AND f.paye=1";
         		$sql.= " GROUP BY f.fk_statut";
@@ -354,11 +373,12 @@ 
         			$line++;
         			$j++;
         		}
-        		if (count($data)==0)
-        			$this->info_box_contents[$line][0] = array(
+        		if (count($data)==0) {
+        		        			$this->info_box_contents[$line][0] = array(
         			'td' => 'align="center"',
         			'text'=>$langs->trans("NoRecordedInvoices"),
         			);
+        		}
         	}
 
         	// part 2
@@ -432,11 +452,12 @@ 
         			$line++;
         			$j++;
         		}
-        		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("NoRecordedInvoices"),
         			);
+        		}
         	}
         }
 

dolibarr/htdocs/core/boxes/box_produits.php

Indentation +120 added lines, -120 removed lines

@@ -33,108 +33,108 @@ 
  */
 class box_produits extends ModeleBoxes
 {
-	var $boxcode="lastproducts";
-	var $boximg="object_product";
-	var $boxlabel="BoxLastProducts";
-	var $depends = array("produit");
+    var $boxcode="lastproducts";
+    var $boximg="object_product";
+    var $boxlabel="BoxLastProducts";
+    var $depends = array("produit");
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	var $param;
+    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 $conf, $user;
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db         Database handler
+     *  @param  string  $param      More parameters
+     */
+    function __construct($db,$param)
+    {
+        global $conf, $user;
 
-	    $this->db=$db;
+        $this->db=$db;
 
-	    $listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
-	    $tmpentry=array('enabled'=>(! empty($conf->product->enabled) || ! empty($conf->service->enabled)), 'perms'=>(! empty($user->rights->produit->lire) || ! empty($user->rights->service->lire)), 'module'=>'product|service');
-	    $showmode=isVisibleToUserType(($user->societe_id > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
-	    $this->hidden=($showmode != 1);
-	}
+        $listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
+        $tmpentry=array('enabled'=>(! empty($conf->product->enabled) || ! empty($conf->service->enabled)), 'perms'=>(! empty($user->rights->produit->lire) || ! empty($user->rights->service->lire)), 'module'=>'product|service');
+        $showmode=isVisibleToUserType(($user->societe_id > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
+        $this->hidden=($showmode != 1);
+    }
 
-	/**
-	 *  Load data into info_box_contents array to show array later.
-	 *
-	 *  @param	int		$max        Maximum number of records to load
+    /**
+     *  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, $hookmanager;
-
-		$this->max=$max;
-
-		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-		$productstatic=new Product($db);
-
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastProducts",$max));
-
-		if ($user->rights->produit->lire || $user->rights->service->lire)
-		{
-			$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.fk_price_expression, p.entity";
-			$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
-			$sql.= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
-			if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
-			if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
-			// Add where from hooks
-			if (is_object($hookmanager))
-			{
-			    $parameters=array('boxproductlist'=>1);
-			    $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-			    $sql.=$hookmanager->resPrint;
-			}
-			$sql.= $db->order('p.datec', '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);
-					$datem=$db->jdate($objp->tms);
-
-					// Multilangs
-					if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
-					{
-						$sqld = "SELECT label";
-						$sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
-						$sqld.= " WHERE fk_product=".$objp->rowid;
-						$sqld.= " AND lang='". $langs->getDefaultLang() ."'";
-						$sqld.= " LIMIT 1";
-
-						$resultd = $db->query($sqld);
-						if ($resultd)
-						{
-							$objtp = $db->fetch_object($resultd);
-							if (isset($objtp->label) && $objtp->label != '')
-								$objp->label = $objtp->label;
-						}
-					}
+     */
+    function loadBox($max=5)
+    {
+        global $user, $langs, $db, $conf, $hookmanager;
+
+        $this->max=$max;
+
+        include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+        $productstatic=new Product($db);
+
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastProducts",$max));
+
+        if ($user->rights->produit->lire || $user->rights->service->lire)
+        {
+            $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.fk_price_expression, p.entity";
+            $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
+            $sql.= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
+            if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
+            if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
+            // Add where from hooks
+            if (is_object($hookmanager))
+            {
+                $parameters=array('boxproductlist'=>1);
+                $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+                $sql.=$hookmanager->resPrint;
+            }
+            $sql.= $db->order('p.datec', '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);
+                    $datem=$db->jdate($objp->tms);
+
+                    // Multilangs
+                    if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+                    {
+                        $sqld = "SELECT label";
+                        $sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
+                        $sqld.= " WHERE fk_product=".$objp->rowid;
+                        $sqld.= " AND lang='". $langs->getDefaultLang() ."'";
+                        $sqld.= " LIMIT 1";
+
+                        $resultd = $db->query($sqld);
+                        if ($resultd)
+                        {
+                            $objtp = $db->fetch_object($resultd);
+                            if (isset($objtp->label) && $objtp->label != '')
+                                $objp->label = $objtp->label;
+                        }
+                    }
                     $productstatic->id = $objp->rowid;
                     $productstatic->ref = $objp->ref;
                     $productstatic->type = $objp->fk_product_type;
                     $productstatic->label = $objp->label;
-					$productstatic->entity = $objp->entity;
+                    $productstatic->entity = $objp->entity;
 
-					$this->info_box_contents[$line][] = array(
+                    $this->info_box_contents[$line][] = array(
                         'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
                         'text' => $productstatic->getNomUrl(1),
                         'asis' => 1,
@@ -148,50 +148,50 @@ 
                     if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
                         $price_base_type=$langs->trans($objp->price_base_type);
                         $price=($objp->price_base_type == 'HT')?price($objp->price):$price=price($objp->price_ttc);
-	                }
-	                else //Parse the dynamic price
-	               	{
-						$productstatic->fetch($objp->rowid, '', '', 1);
-	                    $priceparser = new PriceParser($this->db);
-	                    $price_result = $priceparser->parseProduct($productstatic);
-	                    if ($price_result >= 0) {
-							if ($objp->price_base_type == 'HT')
-							{
-								$price_base_type=$langs->trans("HT");
-							}
-							else
-							{
-								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
-								$price_base_type=$langs->trans("TTC");
-							}
-							$price=price($price_result);
-	                    }
-	               	}
-					$this->info_box_contents[$line][] = array(
+                    }
+                    else //Parse the dynamic price
+                        {
+                        $productstatic->fetch($objp->rowid, '', '', 1);
+                        $priceparser = new PriceParser($this->db);
+                        $price_result = $priceparser->parseProduct($productstatic);
+                        if ($price_result >= 0) {
+                            if ($objp->price_base_type == 'HT')
+                            {
+                                $price_base_type=$langs->trans("HT");
+                            }
+                            else
+                            {
+                                $price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
+                                $price_base_type=$langs->trans("TTC");
+                            }
+                            $price=price($price_result);
+                        }
+                        }
+                    $this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
                         'text' => $price,
                     );
 
-					$this->info_box_contents[$line][] = array(
+                    $this->info_box_contents[$line][] = array(
                         'td' => 'class="nowrap"',
                         'text' => $price_base_type,
                     );
 
-					$this->info_box_contents[$line][] = array(
+                    $this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
                         'text' => dol_print_date($datem,'day'),
                     );
 
-					$this->info_box_contents[$line][] = array(
+                    $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
                         'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell,3,0).'<span>',
-					    'asis' => 1
+                        'asis' => 1
                     );
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
                         'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy,3,1).'</span>',
-					    'asis' => 1
+                        'asis' => 1
                     );
 
                     $line++;
@@ -218,17 +218,17 @@ 
         }
     }
 
-	/**
-	 *	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
-	 */
+    /**
+     *	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);
-	}
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+    }
 }
 

Spacing +38 added lines, -38 removed lines

@@ -33,9 +33,9 @@ 
  */
 class box_produits extends ModeleBoxes
 {
-	var $boxcode="lastproducts";
-	var $boximg="object_product";
-	var $boxlabel="BoxLastProducts";
+	var $boxcode = "lastproducts";
+	var $boximg = "object_product";
+	var $boxlabel = "BoxLastProducts";
 	var $depends = array("produit");
 
 	/**
@@ -55,16 +55,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;
+	    $this->db = $db;
 
-	    $listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
-	    $tmpentry=array('enabled'=>(! empty($conf->product->enabled) || ! empty($conf->service->enabled)), 'perms'=>(! empty($user->rights->produit->lire) || ! empty($user->rights->service->lire)), 'module'=>'product|service');
-	    $showmode=isVisibleToUserType(($user->societe_id > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
-	    $this->hidden=($showmode != 1);
+	    $listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+	    $tmpentry = array('enabled'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'perms'=>(!empty($user->rights->produit->lire) || !empty($user->rights->service->lire)), 'module'=>'product|service');
+	    $showmode = isVisibleToUserType(($user->societe_id > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
+	    $this->hidden = ($showmode != 1);
 	}
 
 	/**
@@ -73,33 +73,33 @@ 
 	 *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $user, $langs, $db, $conf, $hookmanager;
 
-		$this->max=$max;
+		$this->max = $max;
 
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-		$productstatic=new Product($db);
+		$productstatic = new Product($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastProducts",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastProducts", $max));
 
 		if ($user->rights->produit->lire || $user->rights->service->lire)
 		{
 			$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.fk_price_expression, p.entity";
-			$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
-			$sql.= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
-			if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
-			if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
+			$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+			$sql .= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
+			if (empty($user->rights->produit->lire)) $sql .= ' AND p.fk_product_type != 0';
+			if (empty($user->rights->service->lire)) $sql .= ' AND p.fk_product_type != 1';
 			// Add where from hooks
 			if (is_object($hookmanager))
 			{
-			    $parameters=array('boxproductlist'=>1);
-			    $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-			    $sql.=$hookmanager->resPrint;
+			    $parameters = array('boxproductlist'=>1);
+			    $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+			    $sql .= $hookmanager->resPrint;
 			}
-			$sql.= $db->order('p.datec', 'DESC');
-			$sql.= $db->plimit($max, 0);
+			$sql .= $db->order('p.datec', 'DESC');
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result)
@@ -109,16 +109,16 @@ 
 				while ($line < $num)
 				{
 					$objp = $db->fetch_object($result);
-					$datem=$db->jdate($objp->tms);
+					$datem = $db->jdate($objp->tms);
 
 					// Multilangs
-					if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+					if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
 					{
 						$sqld = "SELECT label";
-						$sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
-						$sqld.= " WHERE fk_product=".$objp->rowid;
-						$sqld.= " AND lang='". $langs->getDefaultLang() ."'";
-						$sqld.= " LIMIT 1";
+						$sqld .= " FROM ".MAIN_DB_PREFIX."product_lang";
+						$sqld .= " WHERE fk_product=".$objp->rowid;
+						$sqld .= " AND lang='".$langs->getDefaultLang()."'";
+						$sqld .= " LIMIT 1";
 
 						$resultd = $db->query($sqld);
 						if ($resultd)
@@ -146,8 +146,8 @@ 
                     );
 
                     if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
-                        $price_base_type=$langs->trans($objp->price_base_type);
-                        $price=($objp->price_base_type == 'HT')?price($objp->price):$price=price($objp->price_ttc);
+                        $price_base_type = $langs->trans($objp->price_base_type);
+                        $price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
 	                }
 	                else //Parse the dynamic price
 	               	{
@@ -157,14 +157,14 @@ 
 	                    if ($price_result >= 0) {
 							if ($objp->price_base_type == 'HT')
 							{
-								$price_base_type=$langs->trans("HT");
+								$price_base_type = $langs->trans("HT");
 							}
 							else
 							{
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
-								$price_base_type=$langs->trans("TTC");
+								$price_base_type = $langs->trans("TTC");
 							}
-							$price=price($price_result);
+							$price = price($price_result);
 	                    }
 	               	}
 					$this->info_box_contents[$line][] = array(
@@ -179,24 +179,24 @@ 
 
 					$this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
-                        'text' => dol_print_date($datem,'day'),
+                        'text' => dol_print_date($datem, 'day'),
                     );
 
 					$this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell,3,0).'<span>',
+                        'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
 					    'asis' => 1
                     );
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy,3,1).'</span>',
+                        'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 1).'</span>',
 					    'asis' => 1
                     );
 
                     $line++;
                 }
-                if ($num==0)
+                if ($num == 0)
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoRecordedProducts"),
@@ -226,7 +226,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, -11 removed lines

@@ -89,8 +89,12 @@ 
 			$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.fk_price_expression, p.entity";
 			$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 			$sql.= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
-			if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
-			if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
+			if (empty($user->rights->produit->lire)) {
+			    $sql.=' AND p.fk_product_type != 0';
+			}
+			if (empty($user->rights->service->lire)) {
+			    $sql.=' AND p.fk_product_type != 1';
+			}
 			// Add where from hooks
 			if (is_object($hookmanager))
 			{
@@ -112,9 +116,11 @@ 
 					$datem=$db->jdate($objp->tms);
 
 					// Multilangs
-					if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+					if (! empty($conf->global->MAIN_MULTILANGS)) {
+					    // si l'option est active
 					{
 						$sqld = "SELECT label";
+					}
 						$sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
 						$sqld.= " WHERE fk_product=".$objp->rowid;
 						$sqld.= " AND lang='". $langs->getDefaultLang() ."'";
@@ -124,8 +130,9 @@ 
 						if ($resultd)
 						{
 							$objtp = $db->fetch_object($resultd);
-							if (isset($objtp->label) && $objtp->label != '')
-								$objp->label = $objtp->label;
+							if (isset($objtp->label) && $objtp->label != '') {
+															$objp->label = $objtp->label;
+							}
 						}
 					}
                     $productstatic->id = $objp->rowid;
@@ -148,8 +155,7 @@ 
                     if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
                         $price_base_type=$langs->trans($objp->price_base_type);
                         $price=($objp->price_base_type == 'HT')?price($objp->price):$price=price($objp->price_ttc);
-	                }
-	                else //Parse the dynamic price
+	                } else //Parse the dynamic price
 	               	{
 						$productstatic->fetch($objp->rowid, '', '', 1);
 	                    $priceparser = new PriceParser($this->db);
@@ -158,8 +164,7 @@ 
 							if ($objp->price_base_type == 'HT')
 							{
 								$price_base_type=$langs->trans("HT");
-							}
-							else
+							} else
 							{
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
 								$price_base_type=$langs->trans("TTC");
@@ -196,11 +201,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("NoRecordedProducts"),
                     );
+                }
 
                 $db->free($result);
             } else {

dolibarr/htdocs/core/boxes/box_graph_product_distribution.php

Indentation +371 added lines, -371 removed lines

@@ -29,392 +29,392 @@
  */
 class box_graph_product_distribution extends ModeleBoxes
 {
-	var $boxcode="productdistribution";
-	var $boximg="object_product";
-	var $boxlabel="BoxProductDistribution";
-	var $depends = array("product|service","facture|propal|commande");
+    var $boxcode="productdistribution";
+    var $boximg="object_product";
+    var $boxlabel="BoxProductDistribution";
+    var $depends = array("product|service","facture|propal|commande");
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $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, $conf;
-
-		$this->db=$db;
-
-		$this->hidden = ! (
-		    (! empty($conf->facture->enabled) && ! empty($user->rights->facture->lire))
-		 || (! empty($conf->commande->enabled) && ! empty($user->rights->commande->lire))
-		 || (! empty($conf->propal->enabled) && ! empty($user->rights->propale->lire))
-		);
-	}
-
-	/**
-	 *  Load data into info_box_contents array to show array later.
-	 *
-	 *  @param	int		$max        Maximum number of records to load
+    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, $conf;
+
+        $this->db=$db;
+
+        $this->hidden = ! (
+            (! empty($conf->facture->enabled) && ! empty($user->rights->facture->lire))
+         || (! empty($conf->commande->enabled) && ! empty($user->rights->commande->lire))
+         || (! empty($conf->propal->enabled) && ! empty($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 $conf, $user, $langs, $db;
-
-		$this->max=$max;
-
-		$refreshaction='refresh_'.$this->boxcode;
-
-		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-		include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-
-		$param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
-		$param_showinvoicenb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showinvoicenb';
-		$param_showpropalnb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showpropalnb';
-		$param_showordernb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showordernb';
-		$autosetarray=preg_split("/[,;:]+/",GETPOST('DOL_AUTOSET_COOKIE'));
-		if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode,$autosetarray))
-		{
-			$year=GETPOST($param_year,'int');
-			$showinvoicenb=GETPOST($param_showinvoicenb,'alpha');
-			$showpropalnb=GETPOST($param_showpropalnb,'alpha');
-			$showordernb=GETPOST($param_showordernb,'alpha');
-		}
-		else
-		{
-			$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
-			$year=$tmparray['year'];
-			$showinvoicenb=$tmparray['showinvoicenb'];
-			$showpropalnb=$tmparray['showpropalnb'];
-			$showordernb=$tmparray['showordernb'];
-		}
-		if (empty($showinvoicenb) && empty($showpropalnb) && empty($showordernb)) { $showpropalnb=1; $showinvoicenb=1; $showordernb=1; }
-		if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) $showinvoicenb=0;
-		if (empty($conf->propal->enabled) || empty($user->rights->propale->lire)) $showpropalnb=0;
-		if (empty($conf->commande->enabled) || empty($user->rights->commande->lire)) $showordernb=0;
-
-		$nowarray=dol_getdate(dol_now(),true);
-		if (empty($year)) $year=$nowarray['year'];
-
-		$nbofgraph=0;
-		if ($showinvoicenb) $nbofgraph++;
-		if ($showpropalnb)  $nbofgraph++;
-		if ($showordernb)   $nbofgraph++;
-
-		$text = $langs->trans("BoxProductDistribution",$max).' - '.$langs->trans("Year").': '.$year;
-		$this->info_box_head = array(
-				'text' => $text,
-				'limit'=> dol_strlen($text),
-				'graph'=> 1,
-				'sublink'=>'',
-				'subtext'=>$langs->trans("Filter"),
-				'subpicto'=>'filter.png',
-				'subclass'=>'linkobject boxfilter',
-				'target'=>'none'	// Set '' to get target="_blank"
-		);
-
-
-		$paramtitle=$langs->transnoentitiesnoconv("Products").'/'.$langs->transnoentitiesnoconv("Services");
-		if (empty($conf->produit->enabled)) $paramtitle=$langs->transnoentitiesnoconv("Services");
-		if (empty($conf->service->enabled)) $paramtitle=$langs->transnoentitiesnoconv("Products");
-
-		$socid=empty($user->societe_id)?0:$user->societe_id;
-		$userid=0;	// No filter on user creation
-
-		$WIDTH=($nbofgraph >= 2 || ! empty($conf->dol_optimize_smallscreen))?'160':'320';
-		$HEIGHT='192';
-
-		if (! empty($conf->facture->enabled) && ! empty($user->rights->facture->lire))
-		{
-			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($showinvoicenb)
-			{
+     */
+    function loadBox($max=5)
+    {
+        global $conf, $user, $langs, $db;
+
+        $this->max=$max;
+
+        $refreshaction='refresh_'.$this->boxcode;
+
+        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+
+        $param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+        $param_showinvoicenb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showinvoicenb';
+        $param_showpropalnb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showpropalnb';
+        $param_showordernb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showordernb';
+        $autosetarray=preg_split("/[,;:]+/",GETPOST('DOL_AUTOSET_COOKIE'));
+        if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode,$autosetarray))
+        {
+            $year=GETPOST($param_year,'int');
+            $showinvoicenb=GETPOST($param_showinvoicenb,'alpha');
+            $showpropalnb=GETPOST($param_showpropalnb,'alpha');
+            $showordernb=GETPOST($param_showordernb,'alpha');
+        }
+        else
+        {
+            $tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
+            $year=$tmparray['year'];
+            $showinvoicenb=$tmparray['showinvoicenb'];
+            $showpropalnb=$tmparray['showpropalnb'];
+            $showordernb=$tmparray['showordernb'];
+        }
+        if (empty($showinvoicenb) && empty($showpropalnb) && empty($showordernb)) { $showpropalnb=1; $showinvoicenb=1; $showordernb=1; }
+        if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) $showinvoicenb=0;
+        if (empty($conf->propal->enabled) || empty($user->rights->propale->lire)) $showpropalnb=0;
+        if (empty($conf->commande->enabled) || empty($user->rights->commande->lire)) $showordernb=0;
+
+        $nowarray=dol_getdate(dol_now(),true);
+        if (empty($year)) $year=$nowarray['year'];
+
+        $nbofgraph=0;
+        if ($showinvoicenb) $nbofgraph++;
+        if ($showpropalnb)  $nbofgraph++;
+        if ($showordernb)   $nbofgraph++;
+
+        $text = $langs->trans("BoxProductDistribution",$max).' - '.$langs->trans("Year").': '.$year;
+        $this->info_box_head = array(
+                'text' => $text,
+                'limit'=> dol_strlen($text),
+                'graph'=> 1,
+                'sublink'=>'',
+                'subtext'=>$langs->trans("Filter"),
+                'subpicto'=>'filter.png',
+                'subclass'=>'linkobject boxfilter',
+                'target'=>'none'	// Set '' to get target="_blank"
+        );
+
+
+        $paramtitle=$langs->transnoentitiesnoconv("Products").'/'.$langs->transnoentitiesnoconv("Services");
+        if (empty($conf->produit->enabled)) $paramtitle=$langs->transnoentitiesnoconv("Services");
+        if (empty($conf->service->enabled)) $paramtitle=$langs->transnoentitiesnoconv("Products");
+
+        $socid=empty($user->societe_id)?0:$user->societe_id;
+        $userid=0;	// No filter on user creation
+
+        $WIDTH=($nbofgraph >= 2 || ! empty($conf->dol_optimize_smallscreen))?'160':'320';
+        $HEIGHT='192';
+
+        if (! empty($conf->facture->enabled) && ! empty($user->rights->facture->lire))
+        {
+            // Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
+            if ($showinvoicenb)
+            {
                 $langs->load("bills");
-				include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
-
-				$showpointvalue = 1; $nocolor = 0;
-				$mode='customer';
-				$stats_invoice = new FactureStats($this->db, $socid, $mode, ($userid>0?$userid:0));
-				$data1 = $stats_invoice->getAllByProductEntry($year,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
-				if (empty($data1))
-				{
-					$showpointvalue=0;
-					$nocolor=1;
-					$data1=array(array(0=>$langs->trans("None"),1=>1));
-				}
-				$filenamenb = $dir."/prodserforinvoice-".$year.".png";
-				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=productstats&file=prodserforinvoice-'.$year.'.png';
-
-				$px1 = new DolGraph();
-				$mesg = $px1->isGraphKo();
-				if (! $mesg)
-				{
-					$i=0;$tot=count($data1);$legend=array();
-					while ($i <= $tot)
-					{
-						$data1[$i][0]=dol_trunc($data1[$i][0],5);	// Required to avoid error "Could not draw pie with labels contained inside canvas"
-						$legend[]=$data1[$i][0];
-						$i++;
-					}
-
-					$px1->SetData($data1);
-					unset($data1);
-
-					if ($nocolor) $px1->SetDataColor(array(array(220,220,220)));
-					$px1->SetPrecisionY(0);
-					$px1->SetLegend($legend);
-					$px1->setShowLegend(0);
-					$px1->setShowPointValue($showpointvalue);
-					$px1->setShowPercent(0);
-					$px1->SetMaxValue($px1->GetCeilMaxValue());
-					$px1->SetWidth($WIDTH);
-					$px1->SetHeight($HEIGHT);
-					//$px1->SetYLabel($langs->trans("NumberOfBills"));
-					$px1->SetShading(3);
-					$px1->SetHorizTickIncrement(1);
-					$px1->SetPrecisionY(0);
-					$px1->SetCssPrefix("cssboxes");
-					//$px1->mode='depth';
-					$px1->SetType(array('pie'));
-					$px1->SetTitle($langs->trans("BoxProductDistributionFor",$paramtitle,$langs->transnoentitiesnoconv("Invoices")));
-					$px1->combine = 0.05;
-
-					$px1->draw($filenamenb,$fileurlnb);
-				}
-			}
-		}
-
-		if (! empty($conf->propal->enabled) && ! empty($user->rights->propale->lire))
-		{
-			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($showpropalnb)
-			{
+                include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
+
+                $showpointvalue = 1; $nocolor = 0;
+                $mode='customer';
+                $stats_invoice = new FactureStats($this->db, $socid, $mode, ($userid>0?$userid:0));
+                $data1 = $stats_invoice->getAllByProductEntry($year,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
+                if (empty($data1))
+                {
+                    $showpointvalue=0;
+                    $nocolor=1;
+                    $data1=array(array(0=>$langs->trans("None"),1=>1));
+                }
+                $filenamenb = $dir."/prodserforinvoice-".$year.".png";
+                $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=productstats&amp;file=prodserforinvoice-'.$year.'.png';
+
+                $px1 = new DolGraph();
+                $mesg = $px1->isGraphKo();
+                if (! $mesg)
+                {
+                    $i=0;$tot=count($data1);$legend=array();
+                    while ($i <= $tot)
+                    {
+                        $data1[$i][0]=dol_trunc($data1[$i][0],5);	// Required to avoid error "Could not draw pie with labels contained inside canvas"
+                        $legend[]=$data1[$i][0];
+                        $i++;
+                    }
+
+                    $px1->SetData($data1);
+                    unset($data1);
+
+                    if ($nocolor) $px1->SetDataColor(array(array(220,220,220)));
+                    $px1->SetPrecisionY(0);
+                    $px1->SetLegend($legend);
+                    $px1->setShowLegend(0);
+                    $px1->setShowPointValue($showpointvalue);
+                    $px1->setShowPercent(0);
+                    $px1->SetMaxValue($px1->GetCeilMaxValue());
+                    $px1->SetWidth($WIDTH);
+                    $px1->SetHeight($HEIGHT);
+                    //$px1->SetYLabel($langs->trans("NumberOfBills"));
+                    $px1->SetShading(3);
+                    $px1->SetHorizTickIncrement(1);
+                    $px1->SetPrecisionY(0);
+                    $px1->SetCssPrefix("cssboxes");
+                    //$px1->mode='depth';
+                    $px1->SetType(array('pie'));
+                    $px1->SetTitle($langs->trans("BoxProductDistributionFor",$paramtitle,$langs->transnoentitiesnoconv("Invoices")));
+                    $px1->combine = 0.05;
+
+                    $px1->draw($filenamenb,$fileurlnb);
+                }
+            }
+        }
+
+        if (! empty($conf->propal->enabled) && ! empty($user->rights->propale->lire))
+        {
+            // Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
+            if ($showpropalnb)
+            {
                 $langs->load("propal");
-				include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php';
-
-				$showpointvalue = 1; $nocolor = 0;
-				$stats_proposal = new PropaleStats($this->db, $socid, ($userid>0?$userid:0));
-				$data2 = $stats_proposal->getAllByProductEntry($year,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
-				if (empty($data2))
-				{
-					$showpointvalue = 0;
-					$nocolor = 1;
-					$data2=array(array(0=>$langs->trans("None"),1=>1));
-				}
-
-				$filenamenb = $dir."/prodserforpropal-".$year.".png";
-				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=proposalstats&amp;file=prodserforpropal-'.$year.'.png';
-
-				$px2 = new DolGraph();
-				$mesg = $px2->isGraphKo();
-				if (! $mesg)
-				{
-					$i=0;$tot=count($data2);$legend=array();
-					while ($i <= $tot)
-					{
-						$data2[$i][0]=dol_trunc($data2[$i][0],5);	// Required to avoid error "Could not draw pie with labels contained inside canvas"
-						$legend[]=$data2[$i][0];
-						$i++;
-					}
-
-					$px2->SetData($data2);
-					unset($data2);
-
-					if ($nocolor) $px2->SetDataColor(array(array(220,220,220)));
-					$px2->SetPrecisionY(0);
-					$px2->SetLegend($legend);
-					$px2->setShowLegend(0);
-					$px2->setShowPointValue($showpointvalue);
-					$px2->setShowPercent(0);
-					$px2->SetMaxValue($px2->GetCeilMaxValue());
-					$px2->SetWidth($WIDTH);
-					$px2->SetHeight($HEIGHT);
-					//$px2->SetYLabel($langs->trans("AmountOfBillsHT"));
-					$px2->SetShading(3);
-					$px2->SetHorizTickIncrement(1);
-					$px2->SetPrecisionY(0);
-					$px2->SetCssPrefix("cssboxes");
-					//$px2->mode='depth';
-					$px2->SetType(array('pie'));
-					$px2->SetTitle($langs->trans("BoxProductDistributionFor",$paramtitle,$langs->transnoentitiesnoconv("Proposals")));
-					$px2->combine = 0.05;
-
-					$px2->draw($filenamenb,$fileurlnb);
-				}
-			}
-		}
-
-		if (! empty($conf->commande->enabled) && ! empty($user->rights->commande->lire))
-		{
-			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($showordernb)
-			{
-			    $langs->load("orders");
-				include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
-
-				$showpointvalue = 1; $nocolor = 0;
-				$mode='customer';
-				$stats_order = new CommandeStats($this->db, $socid, $mode, ($userid>0?$userid:0));
-				$data3 = $stats_order->getAllByProductEntry($year,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
-				if (empty($data3))
-				{
-					$showpointvalue = 0;
-					$nocolor = 1;
-					$data3=array(array(0=>$langs->trans("None"),1=>1));
-				}
-
-				$filenamenb = $dir."/prodserfororder-".$year.".png";
-				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=prodserfororder-'.$year.'.png';
-
-				$px3 = new DolGraph();
-				$mesg = $px3->isGraphKo();
-				if (! $mesg)
-				{
-					$i=0;$tot=count($data3);$legend=array();
-					while ($i <= $tot)
-					{
-						$data3[$i][0]=dol_trunc($data3[$i][0],5);	// Required to avoid error "Could not draw pie with labels contained inside canvas"
-						$legend[]=$data3[$i][0];
-						$i++;
-					}
-
-					$px3->SetData($data3);
-					unset($data3);
-
-					if ($nocolor) $px3->SetDataColor(array(array(220,220,220)));
-					$px3->SetPrecisionY(0);
-					$px3->SetLegend($legend);
-					$px3->setShowLegend(0);
-					$px3->setShowPointValue($showpointvalue);
-					$px3->setShowPercent(0);
-					$px3->SetMaxValue($px3->GetCeilMaxValue());
-					$px3->SetWidth($WIDTH);
-					$px3->SetHeight($HEIGHT);
-					//$px3->SetYLabel($langs->trans("AmountOfBillsHT"));
-					$px3->SetShading(3);
-					$px3->SetHorizTickIncrement(1);
-					$px3->SetPrecisionY(0);
-					$px3->SetCssPrefix("cssboxes");
-					//$px3->mode='depth';
-					$px3->SetType(array('pie'));
-					$px3->SetTitle($langs->trans("BoxProductDistributionFor",$paramtitle,$langs->transnoentitiesnoconv("Orders")));
-					$px3->combine = 0.05;
-
-					$px3->draw($filenamenb,$fileurlnb);
-				}
-			}
-		}
-
-		if (empty($nbofgraph))
-		{
-		    $langs->load("errors");
-		    $mesg=$langs->trans("ReadPermissionNotAllowed");
-		}
-		if (empty($conf->use_javascript_ajax))
-		{
-			$langs->load("errors");
-			$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
-		}
-
-		if (! $mesg)
-		{
-			$stringtoshow='';
-			$stringtoshow.='<script type="text/javascript" language="javascript">
+                include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php';
+
+                $showpointvalue = 1; $nocolor = 0;
+                $stats_proposal = new PropaleStats($this->db, $socid, ($userid>0?$userid:0));
+                $data2 = $stats_proposal->getAllByProductEntry($year,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
+                if (empty($data2))
+                {
+                    $showpointvalue = 0;
+                    $nocolor = 1;
+                    $data2=array(array(0=>$langs->trans("None"),1=>1));
+                }
+
+                $filenamenb = $dir."/prodserforpropal-".$year.".png";
+                $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=proposalstats&amp;file=prodserforpropal-'.$year.'.png';
+
+                $px2 = new DolGraph();
+                $mesg = $px2->isGraphKo();
+                if (! $mesg)
+                {
+                    $i=0;$tot=count($data2);$legend=array();
+                    while ($i <= $tot)
+                    {
+                        $data2[$i][0]=dol_trunc($data2[$i][0],5);	// Required to avoid error "Could not draw pie with labels contained inside canvas"
+                        $legend[]=$data2[$i][0];
+                        $i++;
+                    }
+
+                    $px2->SetData($data2);
+                    unset($data2);
+
+                    if ($nocolor) $px2->SetDataColor(array(array(220,220,220)));
+                    $px2->SetPrecisionY(0);
+                    $px2->SetLegend($legend);
+                    $px2->setShowLegend(0);
+                    $px2->setShowPointValue($showpointvalue);
+                    $px2->setShowPercent(0);
+                    $px2->SetMaxValue($px2->GetCeilMaxValue());
+                    $px2->SetWidth($WIDTH);
+                    $px2->SetHeight($HEIGHT);
+                    //$px2->SetYLabel($langs->trans("AmountOfBillsHT"));
+                    $px2->SetShading(3);
+                    $px2->SetHorizTickIncrement(1);
+                    $px2->SetPrecisionY(0);
+                    $px2->SetCssPrefix("cssboxes");
+                    //$px2->mode='depth';
+                    $px2->SetType(array('pie'));
+                    $px2->SetTitle($langs->trans("BoxProductDistributionFor",$paramtitle,$langs->transnoentitiesnoconv("Proposals")));
+                    $px2->combine = 0.05;
+
+                    $px2->draw($filenamenb,$fileurlnb);
+                }
+            }
+        }
+
+        if (! empty($conf->commande->enabled) && ! empty($user->rights->commande->lire))
+        {
+            // Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
+            if ($showordernb)
+            {
+                $langs->load("orders");
+                include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
+
+                $showpointvalue = 1; $nocolor = 0;
+                $mode='customer';
+                $stats_order = new CommandeStats($this->db, $socid, $mode, ($userid>0?$userid:0));
+                $data3 = $stats_order->getAllByProductEntry($year,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
+                if (empty($data3))
+                {
+                    $showpointvalue = 0;
+                    $nocolor = 1;
+                    $data3=array(array(0=>$langs->trans("None"),1=>1));
+                }
+
+                $filenamenb = $dir."/prodserfororder-".$year.".png";
+                $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=prodserfororder-'.$year.'.png';
+
+                $px3 = new DolGraph();
+                $mesg = $px3->isGraphKo();
+                if (! $mesg)
+                {
+                    $i=0;$tot=count($data3);$legend=array();
+                    while ($i <= $tot)
+                    {
+                        $data3[$i][0]=dol_trunc($data3[$i][0],5);	// Required to avoid error "Could not draw pie with labels contained inside canvas"
+                        $legend[]=$data3[$i][0];
+                        $i++;
+                    }
+
+                    $px3->SetData($data3);
+                    unset($data3);
+
+                    if ($nocolor) $px3->SetDataColor(array(array(220,220,220)));
+                    $px3->SetPrecisionY(0);
+                    $px3->SetLegend($legend);
+                    $px3->setShowLegend(0);
+                    $px3->setShowPointValue($showpointvalue);
+                    $px3->setShowPercent(0);
+                    $px3->SetMaxValue($px3->GetCeilMaxValue());
+                    $px3->SetWidth($WIDTH);
+                    $px3->SetHeight($HEIGHT);
+                    //$px3->SetYLabel($langs->trans("AmountOfBillsHT"));
+                    $px3->SetShading(3);
+                    $px3->SetHorizTickIncrement(1);
+                    $px3->SetPrecisionY(0);
+                    $px3->SetCssPrefix("cssboxes");
+                    //$px3->mode='depth';
+                    $px3->SetType(array('pie'));
+                    $px3->SetTitle($langs->trans("BoxProductDistributionFor",$paramtitle,$langs->transnoentitiesnoconv("Orders")));
+                    $px3->combine = 0.05;
+
+                    $px3->draw($filenamenb,$fileurlnb);
+                }
+            }
+        }
+
+        if (empty($nbofgraph))
+        {
+            $langs->load("errors");
+            $mesg=$langs->trans("ReadPermissionNotAllowed");
+        }
+        if (empty($conf->use_javascript_ajax))
+        {
+            $langs->load("errors");
+            $mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+        }
+
+        if (! $mesg)
+        {
+            $stringtoshow='';
+            $stringtoshow.='<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function() {
 					jQuery("#idsubimg'.$this->boxcode.'").click(function() {
 						jQuery("#idfilter'.$this->boxcode.'").toggle();
 					});
 				});
 			</script>';
-			$stringtoshow.='<div class="center hideobject" id="idfilter'.$this->boxcode.'">';	// hideobject is to start hidden
-			$stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-			$stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
-			$stringtoshow.='<input type="hidden" name="page_y" value="">';
-			$stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,showinvoicenb,showpropalnb,showordernb">';
-			if (! empty($conf->facture->enabled) || ! empty($user->rights->facture->lire))
-			{
-				$stringtoshow.='<input type="checkbox" name="'.$param_showinvoicenb.'"'.($showinvoicenb?' checked':'').'> '.$langs->trans("ForCustomersInvoices");
-				$stringtoshow.=' &nbsp; ';
-			}
-			if (! empty($conf->propal->enabled) || ! empty($user->rights->propale->lire))
-			{
-				$stringtoshow.='<input type="checkbox" name="'.$param_showpropalnb.'"'.($showpropalnb?' checked':'').'> '.$langs->trans("ForProposals");
-				$stringtoshow.='&nbsp;';
-			}
-			if (! empty($conf->commande->enabled) || ! empty($user->rights->commande->lire))
-			{
-				$stringtoshow.='<input type="checkbox" name="'.$param_showordernb.'"'.($showordernb?' checked':'').'> '.$langs->trans("ForCustomersOrders");
-			}
-			$stringtoshow.='<br>';
-			$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$year.'">';
-			$stringtoshow.='<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto('','refresh.png','','',1).'">';
-			$stringtoshow.='</form>';
-			$stringtoshow.='</div>';
-
-			if ($nbofgraph == 1)
-			{
-				if ($showinvoicenb) $stringtoshow.=$px1->show();
-				else if ($showpropalnb) $stringtoshow.=$px2->show();
-				else $stringtoshow.=$px3->show();
-			}
-			if ($nbofgraph == 2)
-			{
-				$stringtoshow.='<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
-				if ($showinvoicenb) $stringtoshow.=$px1->show();
-				else if ($showpropalnb) $stringtoshow.=$px2->show();
-				$stringtoshow.='</div><div class="fichehalfright">';
-				if ($showordernb) $stringtoshow.=$px3->show();
-				else if ($showpropalnb) $stringtoshow.=$px2->show();
-				$stringtoshow.='</div></div></div>';
-			}
-			if ($nbofgraph == 3)
-			{
-				$stringtoshow.='<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
-				$stringtoshow.=$px1->show();
-				$stringtoshow.='</div><div class="fichehalfright">';
-				$stringtoshow.=$px2->show();
-				$stringtoshow.='</div></div></div>';
-				$stringtoshow.='<div class="fichecenter"><div class="containercenter">';
-				$stringtoshow.=$px3->show();
-				$stringtoshow.='</div></div>';
-			}
-			$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
-		}
-		else
-		{
-			$this->info_box_contents[0][0] = array(
-			    'td' => 'align="left" class="nohover opacitymedium"',
-				'maxlength'=>500,
-				'text' => $mesg
-			);
-		}
-	}
-
-	/**
-	 *	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
-	 */
+            $stringtoshow.='<div class="center hideobject" id="idfilter'.$this->boxcode.'">';	// hideobject is to start hidden
+            $stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+            $stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
+            $stringtoshow.='<input type="hidden" name="page_y" value="">';
+            $stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,showinvoicenb,showpropalnb,showordernb">';
+            if (! empty($conf->facture->enabled) || ! empty($user->rights->facture->lire))
+            {
+                $stringtoshow.='<input type="checkbox" name="'.$param_showinvoicenb.'"'.($showinvoicenb?' checked':'').'> '.$langs->trans("ForCustomersInvoices");
+                $stringtoshow.=' &nbsp; ';
+            }
+            if (! empty($conf->propal->enabled) || ! empty($user->rights->propale->lire))
+            {
+                $stringtoshow.='<input type="checkbox" name="'.$param_showpropalnb.'"'.($showpropalnb?' checked':'').'> '.$langs->trans("ForProposals");
+                $stringtoshow.='&nbsp;';
+            }
+            if (! empty($conf->commande->enabled) || ! empty($user->rights->commande->lire))
+            {
+                $stringtoshow.='<input type="checkbox" name="'.$param_showordernb.'"'.($showordernb?' checked':'').'> '.$langs->trans("ForCustomersOrders");
+            }
+            $stringtoshow.='<br>';
+            $stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$year.'">';
+            $stringtoshow.='<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto('','refresh.png','','',1).'">';
+            $stringtoshow.='</form>';
+            $stringtoshow.='</div>';
+
+            if ($nbofgraph == 1)
+            {
+                if ($showinvoicenb) $stringtoshow.=$px1->show();
+                else if ($showpropalnb) $stringtoshow.=$px2->show();
+                else $stringtoshow.=$px3->show();
+            }
+            if ($nbofgraph == 2)
+            {
+                $stringtoshow.='<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
+                if ($showinvoicenb) $stringtoshow.=$px1->show();
+                else if ($showpropalnb) $stringtoshow.=$px2->show();
+                $stringtoshow.='</div><div class="fichehalfright">';
+                if ($showordernb) $stringtoshow.=$px3->show();
+                else if ($showpropalnb) $stringtoshow.=$px2->show();
+                $stringtoshow.='</div></div></div>';
+            }
+            if ($nbofgraph == 3)
+            {
+                $stringtoshow.='<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
+                $stringtoshow.=$px1->show();
+                $stringtoshow.='</div><div class="fichehalfright">';
+                $stringtoshow.=$px2->show();
+                $stringtoshow.='</div></div></div>';
+                $stringtoshow.='<div class="fichecenter"><div class="containercenter">';
+                $stringtoshow.=$px3->show();
+                $stringtoshow.='</div></div>';
+            }
+            $this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
+        }
+        else
+        {
+            $this->info_box_contents[0][0] = array(
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'maxlength'=>500,
+                'text' => $mesg
+            );
+        }
+    }
+
+    /**
+     *	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);
-	}
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+    }
 }
 

Spacing +123 added lines, -123 removed lines

@@ -29,10 +29,10 @@ 
  */
 class box_graph_product_distribution extends ModeleBoxes
 {
-	var $boxcode="productdistribution";
-	var $boximg="object_product";
-	var $boxlabel="BoxProductDistribution";
-	var $depends = array("product|service","facture|propal|commande");
+	var $boxcode = "productdistribution";
+	var $boximg = "object_product";
+	var $boxlabel = "BoxProductDistribution";
+	var $depends = array("product|service", "facture|propal|commande");
 
 	/**
      * @var DoliDB Database handler.
@@ -51,16 +51,16 @@ 
 	 * 	@param	DoliDB	$db			Database handler
 	 *  @param	string	$param		More parameters
 	 */
-	function __construct($db,$param)
+	function __construct($db, $param)
 	{
 		global $user, $conf;
 
-		$this->db=$db;
+		$this->db = $db;
 
-		$this->hidden = ! (
-		    (! empty($conf->facture->enabled) && ! empty($user->rights->facture->lire))
-		 || (! empty($conf->commande->enabled) && ! empty($user->rights->commande->lire))
-		 || (! empty($conf->propal->enabled) && ! empty($user->rights->propale->lire))
+		$this->hidden = !(
+		    (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire))
+		 || (!empty($conf->commande->enabled) && !empty($user->rights->commande->lire))
+		 || (!empty($conf->propal->enabled) && !empty($user->rights->propale->lire))
 		);
 	}
 
@@ -70,52 +70,52 @@ 
 	 *  @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;
 
-		$refreshaction='refresh_'.$this->boxcode;
+		$refreshaction = 'refresh_'.$this->boxcode;
 
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
-		$param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
-		$param_showinvoicenb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showinvoicenb';
-		$param_showpropalnb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showpropalnb';
-		$param_showordernb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showordernb';
-		$autosetarray=preg_split("/[,;:]+/",GETPOST('DOL_AUTOSET_COOKIE'));
-		if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode,$autosetarray))
+		$param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+		$param_showinvoicenb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showinvoicenb';
+		$param_showpropalnb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showpropalnb';
+		$param_showordernb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showordernb';
+		$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
+		if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray))
 		{
-			$year=GETPOST($param_year,'int');
-			$showinvoicenb=GETPOST($param_showinvoicenb,'alpha');
-			$showpropalnb=GETPOST($param_showpropalnb,'alpha');
-			$showordernb=GETPOST($param_showordernb,'alpha');
+			$year = GETPOST($param_year, 'int');
+			$showinvoicenb = GETPOST($param_showinvoicenb, 'alpha');
+			$showpropalnb = GETPOST($param_showpropalnb, 'alpha');
+			$showordernb = GETPOST($param_showordernb, 'alpha');
 		}
 		else
 		{
-			$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
-			$year=$tmparray['year'];
-			$showinvoicenb=$tmparray['showinvoicenb'];
-			$showpropalnb=$tmparray['showpropalnb'];
-			$showordernb=$tmparray['showordernb'];
+			$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
+			$year = $tmparray['year'];
+			$showinvoicenb = $tmparray['showinvoicenb'];
+			$showpropalnb = $tmparray['showpropalnb'];
+			$showordernb = $tmparray['showordernb'];
 		}
-		if (empty($showinvoicenb) && empty($showpropalnb) && empty($showordernb)) { $showpropalnb=1; $showinvoicenb=1; $showordernb=1; }
-		if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) $showinvoicenb=0;
-		if (empty($conf->propal->enabled) || empty($user->rights->propale->lire)) $showpropalnb=0;
-		if (empty($conf->commande->enabled) || empty($user->rights->commande->lire)) $showordernb=0;
+		if (empty($showinvoicenb) && empty($showpropalnb) && empty($showordernb)) { $showpropalnb = 1; $showinvoicenb = 1; $showordernb = 1; }
+		if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) $showinvoicenb = 0;
+		if (empty($conf->propal->enabled) || empty($user->rights->propale->lire)) $showpropalnb = 0;
+		if (empty($conf->commande->enabled) || empty($user->rights->commande->lire)) $showordernb = 0;
 
-		$nowarray=dol_getdate(dol_now(),true);
-		if (empty($year)) $year=$nowarray['year'];
+		$nowarray = dol_getdate(dol_now(), true);
+		if (empty($year)) $year = $nowarray['year'];
 
-		$nbofgraph=0;
+		$nbofgraph = 0;
 		if ($showinvoicenb) $nbofgraph++;
 		if ($showpropalnb)  $nbofgraph++;
 		if ($showordernb)   $nbofgraph++;
 
-		$text = $langs->trans("BoxProductDistribution",$max).' - '.$langs->trans("Year").': '.$year;
+		$text = $langs->trans("BoxProductDistribution", $max).' - '.$langs->trans("Year").': '.$year;
 		$this->info_box_head = array(
 				'text' => $text,
 				'limit'=> dol_strlen($text),
@@ -128,17 +128,17 @@ 
 		);
 
 
-		$paramtitle=$langs->transnoentitiesnoconv("Products").'/'.$langs->transnoentitiesnoconv("Services");
-		if (empty($conf->produit->enabled)) $paramtitle=$langs->transnoentitiesnoconv("Services");
-		if (empty($conf->service->enabled)) $paramtitle=$langs->transnoentitiesnoconv("Products");
+		$paramtitle = $langs->transnoentitiesnoconv("Products").'/'.$langs->transnoentitiesnoconv("Services");
+		if (empty($conf->produit->enabled)) $paramtitle = $langs->transnoentitiesnoconv("Services");
+		if (empty($conf->service->enabled)) $paramtitle = $langs->transnoentitiesnoconv("Products");
 
-		$socid=empty($user->societe_id)?0:$user->societe_id;
-		$userid=0;	// No filter on user creation
+		$socid = empty($user->societe_id) ? 0 : $user->societe_id;
+		$userid = 0; // No filter on user creation
 
-		$WIDTH=($nbofgraph >= 2 || ! empty($conf->dol_optimize_smallscreen))?'160':'320';
-		$HEIGHT='192';
+		$WIDTH = ($nbofgraph >= 2 || !empty($conf->dol_optimize_smallscreen)) ? '160' : '320';
+		$HEIGHT = '192';
 
-		if (! empty($conf->facture->enabled) && ! empty($user->rights->facture->lire))
+		if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire))
 		{
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showinvoicenb)
@@ -147,34 +147,34 @@ 
 				include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
 
 				$showpointvalue = 1; $nocolor = 0;
-				$mode='customer';
-				$stats_invoice = new FactureStats($this->db, $socid, $mode, ($userid>0?$userid:0));
-				$data1 = $stats_invoice->getAllByProductEntry($year,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
+				$mode = 'customer';
+				$stats_invoice = new FactureStats($this->db, $socid, $mode, ($userid > 0 ? $userid : 0));
+				$data1 = $stats_invoice->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)));
 				if (empty($data1))
 				{
-					$showpointvalue=0;
-					$nocolor=1;
-					$data1=array(array(0=>$langs->trans("None"),1=>1));
+					$showpointvalue = 0;
+					$nocolor = 1;
+					$data1 = array(array(0=>$langs->trans("None"), 1=>1));
 				}
 				$filenamenb = $dir."/prodserforinvoice-".$year.".png";
 				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=productstats&file=prodserforinvoice-'.$year.'.png';
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
-				if (! $mesg)
+				if (!$mesg)
 				{
-					$i=0;$tot=count($data1);$legend=array();
+					$i = 0; $tot = count($data1); $legend = array();
 					while ($i <= $tot)
 					{
-						$data1[$i][0]=dol_trunc($data1[$i][0],5);	// Required to avoid error "Could not draw pie with labels contained inside canvas"
-						$legend[]=$data1[$i][0];
+						$data1[$i][0] = dol_trunc($data1[$i][0], 5); // Required to avoid error "Could not draw pie with labels contained inside canvas"
+						$legend[] = $data1[$i][0];
 						$i++;
 					}
 
 					$px1->SetData($data1);
 					unset($data1);
 
-					if ($nocolor) $px1->SetDataColor(array(array(220,220,220)));
+					if ($nocolor) $px1->SetDataColor(array(array(220, 220, 220)));
 					$px1->SetPrecisionY(0);
 					$px1->SetLegend($legend);
 					$px1->setShowLegend(0);
@@ -190,15 +190,15 @@ 
 					$px1->SetCssPrefix("cssboxes");
 					//$px1->mode='depth';
 					$px1->SetType(array('pie'));
-					$px1->SetTitle($langs->trans("BoxProductDistributionFor",$paramtitle,$langs->transnoentitiesnoconv("Invoices")));
+					$px1->SetTitle($langs->trans("BoxProductDistributionFor", $paramtitle, $langs->transnoentitiesnoconv("Invoices")));
 					$px1->combine = 0.05;
 
-					$px1->draw($filenamenb,$fileurlnb);
+					$px1->draw($filenamenb, $fileurlnb);
 				}
 			}
 		}
 
-		if (! empty($conf->propal->enabled) && ! empty($user->rights->propale->lire))
+		if (!empty($conf->propal->enabled) && !empty($user->rights->propale->lire))
 		{
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showpropalnb)
@@ -207,13 +207,13 @@ 
 				include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php';
 
 				$showpointvalue = 1; $nocolor = 0;
-				$stats_proposal = new PropaleStats($this->db, $socid, ($userid>0?$userid:0));
-				$data2 = $stats_proposal->getAllByProductEntry($year,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
+				$stats_proposal = new PropaleStats($this->db, $socid, ($userid > 0 ? $userid : 0));
+				$data2 = $stats_proposal->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)));
 				if (empty($data2))
 				{
 					$showpointvalue = 0;
 					$nocolor = 1;
-					$data2=array(array(0=>$langs->trans("None"),1=>1));
+					$data2 = array(array(0=>$langs->trans("None"), 1=>1));
 				}
 
 				$filenamenb = $dir."/prodserforpropal-".$year.".png";
@@ -221,20 +221,20 @@ 
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
-				if (! $mesg)
+				if (!$mesg)
 				{
-					$i=0;$tot=count($data2);$legend=array();
+					$i = 0; $tot = count($data2); $legend = array();
 					while ($i <= $tot)
 					{
-						$data2[$i][0]=dol_trunc($data2[$i][0],5);	// Required to avoid error "Could not draw pie with labels contained inside canvas"
-						$legend[]=$data2[$i][0];
+						$data2[$i][0] = dol_trunc($data2[$i][0], 5); // Required to avoid error "Could not draw pie with labels contained inside canvas"
+						$legend[] = $data2[$i][0];
 						$i++;
 					}
 
 					$px2->SetData($data2);
 					unset($data2);
 
-					if ($nocolor) $px2->SetDataColor(array(array(220,220,220)));
+					if ($nocolor) $px2->SetDataColor(array(array(220, 220, 220)));
 					$px2->SetPrecisionY(0);
 					$px2->SetLegend($legend);
 					$px2->setShowLegend(0);
@@ -250,15 +250,15 @@ 
 					$px2->SetCssPrefix("cssboxes");
 					//$px2->mode='depth';
 					$px2->SetType(array('pie'));
-					$px2->SetTitle($langs->trans("BoxProductDistributionFor",$paramtitle,$langs->transnoentitiesnoconv("Proposals")));
+					$px2->SetTitle($langs->trans("BoxProductDistributionFor", $paramtitle, $langs->transnoentitiesnoconv("Proposals")));
 					$px2->combine = 0.05;
 
-					$px2->draw($filenamenb,$fileurlnb);
+					$px2->draw($filenamenb, $fileurlnb);
 				}
 			}
 		}
 
-		if (! empty($conf->commande->enabled) && ! empty($user->rights->commande->lire))
+		if (!empty($conf->commande->enabled) && !empty($user->rights->commande->lire))
 		{
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showordernb)
@@ -267,14 +267,14 @@ 
 				include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
 
 				$showpointvalue = 1; $nocolor = 0;
-				$mode='customer';
-				$stats_order = new CommandeStats($this->db, $socid, $mode, ($userid>0?$userid:0));
-				$data3 = $stats_order->getAllByProductEntry($year,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
+				$mode = 'customer';
+				$stats_order = new CommandeStats($this->db, $socid, $mode, ($userid > 0 ? $userid : 0));
+				$data3 = $stats_order->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)));
 				if (empty($data3))
 				{
 					$showpointvalue = 0;
 					$nocolor = 1;
-					$data3=array(array(0=>$langs->trans("None"),1=>1));
+					$data3 = array(array(0=>$langs->trans("None"), 1=>1));
 				}
 
 				$filenamenb = $dir."/prodserfororder-".$year.".png";
@@ -282,20 +282,20 @@ 
 
 				$px3 = new DolGraph();
 				$mesg = $px3->isGraphKo();
-				if (! $mesg)
+				if (!$mesg)
 				{
-					$i=0;$tot=count($data3);$legend=array();
+					$i = 0; $tot = count($data3); $legend = array();
 					while ($i <= $tot)
 					{
-						$data3[$i][0]=dol_trunc($data3[$i][0],5);	// Required to avoid error "Could not draw pie with labels contained inside canvas"
-						$legend[]=$data3[$i][0];
+						$data3[$i][0] = dol_trunc($data3[$i][0], 5); // Required to avoid error "Could not draw pie with labels contained inside canvas"
+						$legend[] = $data3[$i][0];
 						$i++;
 					}
 
 					$px3->SetData($data3);
 					unset($data3);
 
-					if ($nocolor) $px3->SetDataColor(array(array(220,220,220)));
+					if ($nocolor) $px3->SetDataColor(array(array(220, 220, 220)));
 					$px3->SetPrecisionY(0);
 					$px3->SetLegend($legend);
 					$px3->setShowLegend(0);
@@ -311,10 +311,10 @@ 
 					$px3->SetCssPrefix("cssboxes");
 					//$px3->mode='depth';
 					$px3->SetType(array('pie'));
-					$px3->SetTitle($langs->trans("BoxProductDistributionFor",$paramtitle,$langs->transnoentitiesnoconv("Orders")));
+					$px3->SetTitle($langs->trans("BoxProductDistributionFor", $paramtitle, $langs->transnoentitiesnoconv("Orders")));
 					$px3->combine = 0.05;
 
-					$px3->draw($filenamenb,$fileurlnb);
+					$px3->draw($filenamenb, $fileurlnb);
 				}
 			}
 		}
@@ -322,77 +322,77 @@ 
 		if (empty($nbofgraph))
 		{
 		    $langs->load("errors");
-		    $mesg=$langs->trans("ReadPermissionNotAllowed");
+		    $mesg = $langs->trans("ReadPermissionNotAllowed");
 		}
 		if (empty($conf->use_javascript_ajax))
 		{
 			$langs->load("errors");
-			$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+			$mesg = $langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
 		}
 
-		if (! $mesg)
+		if (!$mesg)
 		{
-			$stringtoshow='';
-			$stringtoshow.='<script type="text/javascript" language="javascript">
+			$stringtoshow = '';
+			$stringtoshow .= '<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function() {
 					jQuery("#idsubimg'.$this->boxcode.'").click(function() {
 						jQuery("#idfilter'.$this->boxcode.'").toggle();
 					});
 				});
 			</script>';
-			$stringtoshow.='<div class="center hideobject" id="idfilter'.$this->boxcode.'">';	// hideobject is to start hidden
-			$stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-			$stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
-			$stringtoshow.='<input type="hidden" name="page_y" value="">';
-			$stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,showinvoicenb,showpropalnb,showordernb">';
-			if (! empty($conf->facture->enabled) || ! empty($user->rights->facture->lire))
+			$stringtoshow .= '<div class="center hideobject" id="idfilter'.$this->boxcode.'">'; // hideobject is to start hidden
+			$stringtoshow .= '<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+			$stringtoshow .= '<input type="hidden" name="action" value="'.$refreshaction.'">';
+			$stringtoshow .= '<input type="hidden" name="page_y" value="">';
+			$stringtoshow .= '<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,showinvoicenb,showpropalnb,showordernb">';
+			if (!empty($conf->facture->enabled) || !empty($user->rights->facture->lire))
 			{
-				$stringtoshow.='<input type="checkbox" name="'.$param_showinvoicenb.'"'.($showinvoicenb?' checked':'').'> '.$langs->trans("ForCustomersInvoices");
-				$stringtoshow.=' &nbsp; ';
+				$stringtoshow .= '<input type="checkbox" name="'.$param_showinvoicenb.'"'.($showinvoicenb ? ' checked' : '').'> '.$langs->trans("ForCustomersInvoices");
+				$stringtoshow .= ' &nbsp; ';
 			}
-			if (! empty($conf->propal->enabled) || ! empty($user->rights->propale->lire))
+			if (!empty($conf->propal->enabled) || !empty($user->rights->propale->lire))
 			{
-				$stringtoshow.='<input type="checkbox" name="'.$param_showpropalnb.'"'.($showpropalnb?' checked':'').'> '.$langs->trans("ForProposals");
-				$stringtoshow.='&nbsp;';
+				$stringtoshow .= '<input type="checkbox" name="'.$param_showpropalnb.'"'.($showpropalnb ? ' checked' : '').'> '.$langs->trans("ForProposals");
+				$stringtoshow .= '&nbsp;';
 			}
-			if (! empty($conf->commande->enabled) || ! empty($user->rights->commande->lire))
+			if (!empty($conf->commande->enabled) || !empty($user->rights->commande->lire))
 			{
-				$stringtoshow.='<input type="checkbox" name="'.$param_showordernb.'"'.($showordernb?' checked':'').'> '.$langs->trans("ForCustomersOrders");
+				$stringtoshow .= '<input type="checkbox" name="'.$param_showordernb.'"'.($showordernb ? ' checked' : '').'> '.$langs->trans("ForCustomersOrders");
 			}
-			$stringtoshow.='<br>';
-			$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$year.'">';
-			$stringtoshow.='<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto('','refresh.png','','',1).'">';
-			$stringtoshow.='</form>';
-			$stringtoshow.='</div>';
+			$stringtoshow .= '<br>';
+			$stringtoshow .= $langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$year.'">';
+			$stringtoshow .= '<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto('', 'refresh.png', '', '', 1).'">';
+			$stringtoshow .= '</form>';
+			$stringtoshow .= '</div>';
 
 			if ($nbofgraph == 1)
 			{
-				if ($showinvoicenb) $stringtoshow.=$px1->show();
-				else if ($showpropalnb) $stringtoshow.=$px2->show();
-				else $stringtoshow.=$px3->show();
+				if ($showinvoicenb) $stringtoshow .= $px1->show();
+				else if ($showpropalnb) $stringtoshow .= $px2->show();
+				else $stringtoshow .= $px3->show();
 			}
 			if ($nbofgraph == 2)
 			{
-				$stringtoshow.='<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
-				if ($showinvoicenb) $stringtoshow.=$px1->show();
-				else if ($showpropalnb) $stringtoshow.=$px2->show();
-				$stringtoshow.='</div><div class="fichehalfright">';
-				if ($showordernb) $stringtoshow.=$px3->show();
-				else if ($showpropalnb) $stringtoshow.=$px2->show();
-				$stringtoshow.='</div></div></div>';
+				$stringtoshow .= '<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
+				if ($showinvoicenb) $stringtoshow .= $px1->show();
+				else if ($showpropalnb) $stringtoshow .= $px2->show();
+				$stringtoshow .= '</div><div class="fichehalfright">';
+				if ($showordernb) $stringtoshow .= $px3->show();
+				else if ($showpropalnb) $stringtoshow .= $px2->show();
+				$stringtoshow .= '</div></div></div>';
 			}
 			if ($nbofgraph == 3)
 			{
-				$stringtoshow.='<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
-				$stringtoshow.=$px1->show();
-				$stringtoshow.='</div><div class="fichehalfright">';
-				$stringtoshow.=$px2->show();
-				$stringtoshow.='</div></div></div>';
-				$stringtoshow.='<div class="fichecenter"><div class="containercenter">';
-				$stringtoshow.=$px3->show();
-				$stringtoshow.='</div></div>';
+				$stringtoshow .= '<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
+				$stringtoshow .= $px1->show();
+				$stringtoshow .= '</div><div class="fichehalfright">';
+				$stringtoshow .= $px2->show();
+				$stringtoshow .= '</div></div></div>';
+				$stringtoshow .= '<div class="fichecenter"><div class="containercenter">';
+				$stringtoshow .= $px3->show();
+				$stringtoshow .= '</div></div>';
 			}
-			$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
+			$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"', 'textnoformat'=>$stringtoshow);
 		}
 		else
 		{
@@ -412,7 +412,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 +55 added lines, -23 removed lines

@@ -93,8 +93,7 @@ 
 			$showinvoicenb=GETPOST($param_showinvoicenb,'alpha');
 			$showpropalnb=GETPOST($param_showpropalnb,'alpha');
 			$showordernb=GETPOST($param_showordernb,'alpha');
-		}
-		else
+		} else
 		{
 			$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
 			$year=$tmparray['year'];
@@ -103,17 +102,31 @@ 
 			$showordernb=$tmparray['showordernb'];
 		}
 		if (empty($showinvoicenb) && empty($showpropalnb) && empty($showordernb)) { $showpropalnb=1; $showinvoicenb=1; $showordernb=1; }
-		if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) $showinvoicenb=0;
-		if (empty($conf->propal->enabled) || empty($user->rights->propale->lire)) $showpropalnb=0;
-		if (empty($conf->commande->enabled) || empty($user->rights->commande->lire)) $showordernb=0;
+		if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) {
+		    $showinvoicenb=0;
+		}
+		if (empty($conf->propal->enabled) || empty($user->rights->propale->lire)) {
+		    $showpropalnb=0;
+		}
+		if (empty($conf->commande->enabled) || empty($user->rights->commande->lire)) {
+		    $showordernb=0;
+		}
 
 		$nowarray=dol_getdate(dol_now(),true);
-		if (empty($year)) $year=$nowarray['year'];
+		if (empty($year)) {
+		    $year=$nowarray['year'];
+		}
 
 		$nbofgraph=0;
-		if ($showinvoicenb) $nbofgraph++;
-		if ($showpropalnb)  $nbofgraph++;
-		if ($showordernb)   $nbofgraph++;
+		if ($showinvoicenb) {
+		    $nbofgraph++;
+		}
+		if ($showpropalnb) {
+		    $nbofgraph++;
+		}
+		if ($showordernb) {
+		    $nbofgraph++;
+		}
 
 		$text = $langs->trans("BoxProductDistribution",$max).' - '.$langs->trans("Year").': '.$year;
 		$this->info_box_head = array(
@@ -129,8 +142,12 @@ 
 
 
 		$paramtitle=$langs->transnoentitiesnoconv("Products").'/'.$langs->transnoentitiesnoconv("Services");
-		if (empty($conf->produit->enabled)) $paramtitle=$langs->transnoentitiesnoconv("Services");
-		if (empty($conf->service->enabled)) $paramtitle=$langs->transnoentitiesnoconv("Products");
+		if (empty($conf->produit->enabled)) {
+		    $paramtitle=$langs->transnoentitiesnoconv("Services");
+		}
+		if (empty($conf->service->enabled)) {
+		    $paramtitle=$langs->transnoentitiesnoconv("Products");
+		}
 
 		$socid=empty($user->societe_id)?0:$user->societe_id;
 		$userid=0;	// No filter on user creation
@@ -174,7 +191,9 @@ 
 					$px1->SetData($data1);
 					unset($data1);
 
-					if ($nocolor) $px1->SetDataColor(array(array(220,220,220)));
+					if ($nocolor) {
+					    $px1->SetDataColor(array(array(220,220,220)));
+					}
 					$px1->SetPrecisionY(0);
 					$px1->SetLegend($legend);
 					$px1->setShowLegend(0);
@@ -234,7 +253,9 @@ 
 					$px2->SetData($data2);
 					unset($data2);
 
-					if ($nocolor) $px2->SetDataColor(array(array(220,220,220)));
+					if ($nocolor) {
+					    $px2->SetDataColor(array(array(220,220,220)));
+					}
 					$px2->SetPrecisionY(0);
 					$px2->SetLegend($legend);
 					$px2->setShowLegend(0);
@@ -295,7 +316,9 @@ 
 					$px3->SetData($data3);
 					unset($data3);
 
-					if ($nocolor) $px3->SetDataColor(array(array(220,220,220)));
+					if ($nocolor) {
+					    $px3->SetDataColor(array(array(220,220,220)));
+					}
 					$px3->SetPrecisionY(0);
 					$px3->SetLegend($legend);
 					$px3->setShowLegend(0);
@@ -367,18 +390,28 @@ 
 
 			if ($nbofgraph == 1)
 			{
-				if ($showinvoicenb) $stringtoshow.=$px1->show();
-				else if ($showpropalnb) $stringtoshow.=$px2->show();
-				else $stringtoshow.=$px3->show();
+				if ($showinvoicenb) {
+				    $stringtoshow.=$px1->show();
+				} else if ($showpropalnb) {
+				    $stringtoshow.=$px2->show();
+				} else {
+				    $stringtoshow.=$px3->show();
+				}
 			}
 			if ($nbofgraph == 2)
 			{
 				$stringtoshow.='<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
-				if ($showinvoicenb) $stringtoshow.=$px1->show();
-				else if ($showpropalnb) $stringtoshow.=$px2->show();
+				if ($showinvoicenb) {
+				    $stringtoshow.=$px1->show();
+				} else if ($showpropalnb) {
+				    $stringtoshow.=$px2->show();
+				}
 				$stringtoshow.='</div><div class="fichehalfright">';
-				if ($showordernb) $stringtoshow.=$px3->show();
-				else if ($showpropalnb) $stringtoshow.=$px2->show();
+				if ($showordernb) {
+				    $stringtoshow.=$px3->show();
+				} else if ($showpropalnb) {
+				    $stringtoshow.=$px2->show();
+				}
 				$stringtoshow.='</div></div></div>';
 			}
 			if ($nbofgraph == 3)
@@ -393,8 +426,7 @@ 
 				$stringtoshow.='</div></div>';
 			}
 			$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
-		}
-		else
+		} else
 		{
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'align="left" class="nohover opacitymedium"',

dolibarr/htdocs/core/boxes/box_supplier_orders.php

Indentation +9 added lines, -9 removed lines

@@ -111,12 +111,12 @@ 
                 while ($line < $num) {
                     $objp = $db->fetch_object($result);
                     $date=$db->jdate($objp->date_commande);
-					$datem=$db->jdate($objp->tms);
+                    $datem=$db->jdate($objp->tms);
 
-					$supplierorderstatic->id = $objp->rowid;
-					$supplierorderstatic->ref = $objp->ref;
+                    $supplierorderstatic->id = $objp->rowid;
+                    $supplierorderstatic->ref = $objp->ref;
 
-					$thirdpartytmp->id = $objp->socid;
+                    $thirdpartytmp->id = $objp->socid;
                     $thirdpartytmp->name = $objp->name;
                     $thirdpartytmp->fournisseur = 1;
                     $thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
@@ -125,7 +125,7 @@ 
                     $this->info_box_contents[$line][] = array(
                         'td' => '',
                         'text' => $supplierorderstatic->getNomUrl(1),
-                    	'asis' => 1
+                        'asis' => 1
                     );
 
                     $this->info_box_contents[$line][] = array(
@@ -139,7 +139,7 @@ 
                         'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
                     );
 
-					$this->info_box_contents[$line][] = array(
+                    $this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
                         'text' => dol_print_date($date,'day'),
                     );
@@ -181,9 +181,9 @@ 
      *
      * 	@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
-	 */
+     *  @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);

Spacing +28 added lines, -28 removed lines

@@ -33,7 +33,7 @@ 
 
     var $boxcode = "latestsupplierorders";
     var $boximg = "object_order";
-    var $boxlabel="BoxLatestSupplierOrders";
+    var $boxlabel = "BoxLatestSupplierOrders";
     var $depends = array("fournisseur");
 
     /**
@@ -52,13 +52,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);
     }
 
     /**
@@ -75,32 +75,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.rowid, c.ref, c.tms, 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.rowid, c.ref, c.tms, 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)
@@ -110,8 +110,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);
 
 					$supplierorderstatic->id = $objp->rowid;
 					$supplierorderstatic->ref = $objp->ref;
@@ -141,12 +141,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++;
@@ -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 +18 added lines, -9 removed lines

@@ -93,13 +93,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);
@@ -152,11 +161,12 @@ 
                     $line++;
                 }
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][] = array(
+                if ($num == 0) {
+                                    $this->info_box_contents[$line][] = array(
                         'td' => 'align="center"',
                         'text' => $langs->trans("NoSupplierOrder"),
                     );
+                }
 
                 $db->free($result);
             } else {
@@ -166,8 +176,7 @@ 
                     'text' => ($db->error().' sql='.$sql),
                 );
             }
-        }
-        else
+        } else
         {
             $this->info_box_contents[0][] = array(
                 'td' => 'align="left" class="nohover opacitymedium"',

dolibarr/htdocs/core/boxes/box_fournisseurs.php

Indentation +21 added lines, -21 removed lines

@@ -36,12 +36,12 @@ 
     var $boxlabel="BoxLastSuppliers";
     var $depends = array("fournisseur");
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
     
-	var $param;
+    var $param;
 
     var $info_box_head = array();
     var $info_box_contents = array();
@@ -63,9 +63,9 @@ 
     }
 
     /**
-	 *  Load data into info_box_contents array to show array later.
-	 *
-	 *  @param	int		$max        Maximum number of records to load
+     *  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)
@@ -73,14 +73,14 @@ 
         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);
-		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-		$thirdpartytmp=new Fournisseur($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));
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedSuppliers",$max));
 
         if ($user->rights->societe->lire)
         {
@@ -105,14 +105,14 @@ 
                 while ($line < $num)
                 {
                     $objp = $db->fetch_object($result);
-    				$datec=$db->jdate($objp->datec);
-    				$datem=$db->jdate($objp->tms);
-					$thirdpartytmp->id = $objp->socid;
+                    $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(
+                        $this->info_box_contents[$line][] = array(
                         'td' => '',
                         'text' => $thirdpartytmp->getNomUrl(1, '', 40),
                         'asis' => 1,
@@ -152,14 +152,14 @@ 
         }
     }
 
-	/**
-	 *	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
-	 */
+    /**
+     *	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);

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");
 
 	/**
@@ -53,13 +53,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));
     }
 
     /**
@@ -68,33 +68,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)
@@ -105,8 +105,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;
@@ -125,13 +125,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"),
                 );
@@ -160,7 +160,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

@@ -88,11 +88,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);
 
@@ -131,10 +137,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 {

dolibarr/htdocs/core/boxes/box_produits_alerte_stock.php

Indentation +140 added lines, -140 removed lines

@@ -35,111 +35,111 @@ 
  */
 class box_produits_alerte_stock extends ModeleBoxes
 {
-	var $boxcode="productsalertstock";
-	var $boximg="object_product";
-	var $boxlabel="BoxProductsAlertStock";
-	var $depends = array("produit");
+    var $boxcode="productsalertstock";
+    var $boximg="object_product";
+    var $boxlabel="BoxProductsAlertStock";
+    var $depends = array("produit");
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $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 $conf,$user;
-
-	    $this->db = $db;
-
-	    $listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
-	    $tmpentry=array('enabled'=>((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && ! empty($conf->stock->enabled)), 'perms'=>($user->rights->stock->lire), 'module'=>'product|service|stock');
-	    $showmode=isVisibleToUserType(($user->societe_id > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
-	    $this->hidden=($showmode != 1);
-	}
-
-	/**
-	 *  Load data into info_box_contents array to show array later.
-	 *
-	 *  @param	int		$max        Maximum number of records to load
+    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 $conf,$user;
+
+        $this->db = $db;
+
+        $listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
+        $tmpentry=array('enabled'=>((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && ! empty($conf->stock->enabled)), 'perms'=>($user->rights->stock->lire), 'module'=>'product|service|stock');
+        $showmode=isVisibleToUserType(($user->societe_id > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
+        $this->hidden=($showmode != 1);
+    }
+
+    /**
+     *  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, $hookmanager;
-
-		$this->max=$max;
-
-		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-		$productstatic=new Product($db);
-
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleProductsAlertStock",$max));
-
-		if (($user->rights->produit->lire || $user->rights->service->lire) && $user->rights->stock->lire)
-		{
-			$sql = "SELECT p.rowid, p.label, p.price, p.ref, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity,";
-			$sql.= " SUM(".$db->ifsql("s.reel IS NULL","0","s.reel").") as total_stock";
-			$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as s on p.rowid = s.fk_product";
-			$sql.= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
-			$sql.= " AND p.tosell = 1 AND p.seuil_stock_alerte > 0";
-			if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
-			if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
-			// Add where from hooks
-    		if (is_object($hookmanager))
-    		{
-			    $parameters=array('boxproductalertstocklist'=>1);
-    		    $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-    		    $sql.=$hookmanager->resPrint;
-    		}
-		    $sql.= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity";
-			$sql.= " HAVING SUM(".$db->ifsql("s.reel IS NULL","0","s.reel").") < p.seuil_stock_alerte";
-			$sql.= $db->order('p.seuil_stock_alerte', 'DESC');
-			$sql.= $db->plimit($max, 0);
-
-			$result = $db->query($sql);
-			if ($result)
-			{
-				$langs->load("stocks");
-				$num = $db->num_rows($result);
-				$line = 0;
+     */
+    function loadBox($max=5)
+    {
+        global $user, $langs, $db, $conf, $hookmanager;
+
+        $this->max=$max;
+
+        include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+        $productstatic=new Product($db);
+
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleProductsAlertStock",$max));
+
+        if (($user->rights->produit->lire || $user->rights->service->lire) && $user->rights->stock->lire)
+        {
+            $sql = "SELECT p.rowid, p.label, p.price, p.ref, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity,";
+            $sql.= " SUM(".$db->ifsql("s.reel IS NULL","0","s.reel").") as total_stock";
+            $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as s on p.rowid = s.fk_product";
+            $sql.= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
+            $sql.= " AND p.tosell = 1 AND p.seuil_stock_alerte > 0";
+            if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
+            if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
+            // Add where from hooks
+            if (is_object($hookmanager))
+            {
+                $parameters=array('boxproductalertstocklist'=>1);
+                $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+                $sql.=$hookmanager->resPrint;
+            }
+            $sql.= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity";
+            $sql.= " HAVING SUM(".$db->ifsql("s.reel IS NULL","0","s.reel").") < p.seuil_stock_alerte";
+            $sql.= $db->order('p.seuil_stock_alerte', 'DESC');
+            $sql.= $db->plimit($max, 0);
+
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $langs->load("stocks");
+                $num = $db->num_rows($result);
+                $line = 0;
                 while ($line < $num) {
-					$objp = $db->fetch_object($result);
-					$datem=$db->jdate($objp->tms);
-
-					// Multilangs
-					if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
-					{
-						$sqld = "SELECT label";
-						$sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
-						$sqld.= " WHERE fk_product=".$objp->rowid;
-						$sqld.= " AND lang='". $langs->getDefaultLang() ."'";
-						$sqld.= " LIMIT 1";
-
-						$resultd = $db->query($sqld);
-						if ($resultd)
-						{
-							$objtp = $db->fetch_object($resultd);
-							if (isset($objtp->label) && $objtp->label != '')
-								$objp->label = $objtp->label;
-						}
-					}
+                    $objp = $db->fetch_object($result);
+                    $datem=$db->jdate($objp->tms);
+
+                    // Multilangs
+                    if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+                    {
+                        $sqld = "SELECT label";
+                        $sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
+                        $sqld.= " WHERE fk_product=".$objp->rowid;
+                        $sqld.= " AND lang='". $langs->getDefaultLang() ."'";
+                        $sqld.= " LIMIT 1";
+
+                        $resultd = $db->query($sqld);
+                        if ($resultd)
+                        {
+                            $objtp = $db->fetch_object($resultd);
+                            if (isset($objtp->label) && $objtp->label != '')
+                                $objp->label = $objtp->label;
+                        }
+                    }
                     $productstatic->id = $objp->rowid;
                     $productstatic->ref = $objp->ref;
                     $productstatic->type = $objp->fk_product_type;
                     $productstatic->label = $objp->label;
-					$productstatic->entity = $objp->entity;
+                    $productstatic->entity = $objp->entity;
 
                     $this->info_box_contents[$line][] = array(
                         'td' => '',
@@ -156,25 +156,25 @@ 
                     {
                         $price_base_type=$langs->trans($objp->price_base_type);
                         $price=($objp->price_base_type == 'HT')?price($objp->price):$price=price($objp->price_ttc);
-	                }
-	                else //Parse the dynamic price
-	               	{
-						$productstatic->fetch($objp->rowid, '', '', 1);
-	                    $priceparser = new PriceParser($this->db);
-	                    $price_result = $priceparser->parseProduct($productstatic);
-	                    if ($price_result >= 0) {
-							if ($objp->price_base_type == 'HT')
-							{
-								$price_base_type=$langs->trans("HT");
-							}
-							else
-							{
-								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
-								$price_base_type=$langs->trans("TTC");
-							}
-							$price=price($price_result);
-	                    }
-	               	}
+                    }
+                    else //Parse the dynamic price
+                        {
+                        $productstatic->fetch($objp->rowid, '', '', 1);
+                        $priceparser = new PriceParser($this->db);
+                        $price_result = $priceparser->parseProduct($productstatic);
+                        if ($price_result >= 0) {
+                            if ($objp->price_base_type == 'HT')
+                            {
+                                $price_base_type=$langs->trans("HT");
+                            }
+                            else
+                            {
+                                $price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
+                                $price_base_type=$langs->trans("TTC");
+                            }
+                            $price=price($price_result);
+                        }
+                        }
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
@@ -186,16 +186,16 @@ 
                         'text' => $price_base_type,
                     );
 
-					$this->info_box_contents[$line][] = array(
-					    'td' => 'align="center"',
+                    $this->info_box_contents[$line][] = array(
+                        'td' => 'align="center"',
                     'text' => $objp->total_stock . ' / '.$objp->seuil_stock_alerte,
-					'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)));
+                    'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)));
 
-					$this->info_box_contents[$line][] = array(
-					    'td' => 'align="right" width="18"',
+                    $this->info_box_contents[$line][] = array(
+                        'td' => 'align="right" width="18"',
                         'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell,3,0).'<span>',
-					    'asis' => 1
-					);
+                        'asis' => 1
+                    );
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
@@ -211,36 +211,36 @@ 
                         'text'=>$langs->trans("NoTooLowStockProducts"),
                     );
 
-				$db->free($result);
-			}
-			else
-			{
-				$this->info_box_contents[0][0] = array(
+                $db->free($result);
+            }
+            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")
             );
-		}
-	}
-
-	/**
-	 *	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
-	 */
+        }
+    }
+
+    /**
+     *	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);
-	}
+    }
 }
 

Spacing +43 added lines, -43 removed lines

@@ -35,9 +35,9 @@ 
  */
 class box_produits_alerte_stock extends ModeleBoxes
 {
-	var $boxcode="productsalertstock";
-	var $boximg="object_product";
-	var $boxlabel="BoxProductsAlertStock";
+	var $boxcode = "productsalertstock";
+	var $boximg = "object_product";
+	var $boxlabel = "BoxProductsAlertStock";
 	var $depends = array("produit");
 
 	/**
@@ -57,16 +57,16 @@ 
 	 *  @param  DoliDB	$db      	Database handler
 	 *  @param	string	$param		More parameters
 	 */
-	function __construct($db,$param='')
+	function __construct($db, $param = '')
 	{
-	    global $conf,$user;
+	    global $conf, $user;
 
 	    $this->db = $db;
 
-	    $listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
-	    $tmpentry=array('enabled'=>((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && ! empty($conf->stock->enabled)), 'perms'=>($user->rights->stock->lire), 'module'=>'product|service|stock');
-	    $showmode=isVisibleToUserType(($user->societe_id > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
-	    $this->hidden=($showmode != 1);
+	    $listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+	    $tmpentry = array('enabled'=>((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && !empty($conf->stock->enabled)), 'perms'=>($user->rights->stock->lire), 'module'=>'product|service|stock');
+	    $showmode = isVisibleToUserType(($user->societe_id > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
+	    $this->hidden = ($showmode != 1);
 	}
 
 	/**
@@ -75,38 +75,38 @@ 
 	 *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $user, $langs, $db, $conf, $hookmanager;
 
-		$this->max=$max;
+		$this->max = $max;
 
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-		$productstatic=new Product($db);
+		$productstatic = new Product($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleProductsAlertStock",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleProductsAlertStock", $max));
 
 		if (($user->rights->produit->lire || $user->rights->service->lire) && $user->rights->stock->lire)
 		{
 			$sql = "SELECT p.rowid, p.label, p.price, p.ref, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity,";
-			$sql.= " SUM(".$db->ifsql("s.reel IS NULL","0","s.reel").") as total_stock";
-			$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as s on p.rowid = s.fk_product";
-			$sql.= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
-			$sql.= " AND p.tosell = 1 AND p.seuil_stock_alerte > 0";
-			if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
-			if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
+			$sql .= " SUM(".$db->ifsql("s.reel IS NULL", "0", "s.reel").") as total_stock";
+			$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as s on p.rowid = s.fk_product";
+			$sql .= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
+			$sql .= " AND p.tosell = 1 AND p.seuil_stock_alerte > 0";
+			if (empty($user->rights->produit->lire)) $sql .= ' AND p.fk_product_type != 0';
+			if (empty($user->rights->service->lire)) $sql .= ' AND p.fk_product_type != 1';
 			// Add where from hooks
     		if (is_object($hookmanager))
     		{
-			    $parameters=array('boxproductalertstocklist'=>1);
-    		    $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-    		    $sql.=$hookmanager->resPrint;
+			    $parameters = array('boxproductalertstocklist'=>1);
+    		    $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+    		    $sql .= $hookmanager->resPrint;
     		}
-		    $sql.= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity";
-			$sql.= " HAVING SUM(".$db->ifsql("s.reel IS NULL","0","s.reel").") < p.seuil_stock_alerte";
-			$sql.= $db->order('p.seuil_stock_alerte', 'DESC');
-			$sql.= $db->plimit($max, 0);
+		    $sql .= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity";
+			$sql .= " HAVING SUM(".$db->ifsql("s.reel IS NULL", "0", "s.reel").") < p.seuil_stock_alerte";
+			$sql .= $db->order('p.seuil_stock_alerte', 'DESC');
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result)
@@ -116,16 +116,16 @@ 
 				$line = 0;
                 while ($line < $num) {
 					$objp = $db->fetch_object($result);
-					$datem=$db->jdate($objp->tms);
+					$datem = $db->jdate($objp->tms);
 
 					// Multilangs
-					if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+					if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
 					{
 						$sqld = "SELECT label";
-						$sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
-						$sqld.= " WHERE fk_product=".$objp->rowid;
-						$sqld.= " AND lang='". $langs->getDefaultLang() ."'";
-						$sqld.= " LIMIT 1";
+						$sqld .= " FROM ".MAIN_DB_PREFIX."product_lang";
+						$sqld .= " WHERE fk_product=".$objp->rowid;
+						$sqld .= " AND lang='".$langs->getDefaultLang()."'";
+						$sqld .= " LIMIT 1";
 
 						$resultd = $db->query($sqld);
 						if ($resultd)
@@ -154,8 +154,8 @@ 
 
                     if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression))
                     {
-                        $price_base_type=$langs->trans($objp->price_base_type);
-                        $price=($objp->price_base_type == 'HT')?price($objp->price):$price=price($objp->price_ttc);
+                        $price_base_type = $langs->trans($objp->price_base_type);
+                        $price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
 	                }
 	                else //Parse the dynamic price
 	               	{
@@ -165,14 +165,14 @@ 
 	                    if ($price_result >= 0) {
 							if ($objp->price_base_type == 'HT')
 							{
-								$price_base_type=$langs->trans("HT");
+								$price_base_type = $langs->trans("HT");
 							}
 							else
 							{
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
-								$price_base_type=$langs->trans("TTC");
+								$price_base_type = $langs->trans("TTC");
 							}
-							$price=price($price_result);
+							$price = price($price_result);
 	                    }
 	               	}
 
@@ -188,24 +188,24 @@ 
 
 					$this->info_box_contents[$line][] = array(
 					    'td' => 'align="center"',
-                    'text' => $objp->total_stock . ' / '.$objp->seuil_stock_alerte,
+                    'text' => $objp->total_stock.' / '.$objp->seuil_stock_alerte,
 					'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)));
 
 					$this->info_box_contents[$line][] = array(
 					    'td' => 'align="right" width="18"',
-                        'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell,3,0).'<span>',
+                        'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
 					    'asis' => 1
 					);
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy,3,0).'<span>',
+                        'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 0).'<span>',
                         'asis' => 1
                     );
 
                     $line++;
                 }
-                if ($num==0)
+                if ($num == 0)
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoTooLowStockProducts"),
@@ -238,7 +238,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 +19 added lines, -15 removed lines

@@ -94,8 +94,12 @@ 
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as s on p.rowid = s.fk_product";
 			$sql.= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
 			$sql.= " AND p.tosell = 1 AND p.seuil_stock_alerte > 0";
-			if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
-			if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
+			if (empty($user->rights->produit->lire)) {
+			    $sql.=' AND p.fk_product_type != 0';
+			}
+			if (empty($user->rights->service->lire)) {
+			    $sql.=' AND p.fk_product_type != 1';
+			}
 			// Add where from hooks
     		if (is_object($hookmanager))
     		{
@@ -119,9 +123,11 @@ 
 					$datem=$db->jdate($objp->tms);
 
 					// Multilangs
-					if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+					if (! empty($conf->global->MAIN_MULTILANGS)) {
+					    // si l'option est active
 					{
 						$sqld = "SELECT label";
+					}
 						$sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
 						$sqld.= " WHERE fk_product=".$objp->rowid;
 						$sqld.= " AND lang='". $langs->getDefaultLang() ."'";
@@ -131,8 +137,9 @@ 
 						if ($resultd)
 						{
 							$objtp = $db->fetch_object($resultd);
-							if (isset($objtp->label) && $objtp->label != '')
-								$objp->label = $objtp->label;
+							if (isset($objtp->label) && $objtp->label != '') {
+															$objp->label = $objtp->label;
+							}
 						}
 					}
                     $productstatic->id = $objp->rowid;
@@ -156,8 +163,7 @@ 
                     {
                         $price_base_type=$langs->trans($objp->price_base_type);
                         $price=($objp->price_base_type == 'HT')?price($objp->price):$price=price($objp->price_ttc);
-	                }
-	                else //Parse the dynamic price
+	                } else //Parse the dynamic price
 	               	{
 						$productstatic->fetch($objp->rowid, '', '', 1);
 	                    $priceparser = new PriceParser($this->db);
@@ -166,8 +172,7 @@ 
 							if ($objp->price_base_type == 'HT')
 							{
 								$price_base_type=$langs->trans("HT");
-							}
-							else
+							} else
 							{
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
 								$price_base_type=$langs->trans("TTC");
@@ -205,15 +210,15 @@ 
 
                     $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("NoTooLowStockProducts"),
                     );
+                }
 
 				$db->free($result);
-			}
-			else
+			} else
 			{
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
@@ -221,8 +226,7 @@ 
                     'text' => ($db->error().' sql='.$sql),
                 );
 			}
-		}
-		else {
+		} else {
             $this->info_box_contents[0][0] = array(
                 'td' => 'align="left" class="nohover opacitymedium"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")