alxarafe / alixar

dolibarr/htdocs/core/modules/facture/modules_facture.php

Indentation +96 added lines, -96 removed lines

@@ -37,32 +37,32 @@ 
  */
 abstract class ModelePDFFactures extends CommonDocGenerator
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return list of active generation modules
-	 *
+    /**
+     *  Return list of active generation modules
+     *
      *  @param	DoliDB	$db     			Database handler
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
-	 */
-	static function liste_modeles($db,$maxfilenamelength=0)
-	{
+     */
+    static function liste_modeles($db,$maxfilenamelength=0)
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		$type='invoice';
-		$liste=array();
+        $type='invoice';
+        $liste=array();
 
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+        $liste=getListOfModels($db,$type,$maxfilenamelength);
 
-		return $liste;
-	}
+        return $liste;
+    }
 }
 
 /**
@@ -70,83 +70,83 @@ 
  */
 abstract class ModeleNumRefFactures
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-	/**
-	 * Return if a module can be used or not
-	 *
-	 * @return	boolean     true if module can be used
-	 */
-	function isEnabled()
-	{
-		return true;
-	}
-
-	/**
-	 * Renvoi la description par defaut du modele de numerotation
-	 *
-	 * @return    string      Texte descripif
-	 */
-	function info()
-	{
-		global $langs;
-		$langs->load("bills");
-		return $langs->trans("NoDescription");
-	}
-
-	/**
-	 * Renvoi un exemple de numerotation
-	 *
-	 * @return	string      Example
-	 */
-	function getExample()
-	{
-		global $langs;
-		$langs->load("bills");
-		return $langs->trans("NoExample");
-	}
-
-	/**
-	 * Test si les numeros deja en vigueur dans la base ne provoquent pas
-	 * de conflits qui empecheraient cette numerotation de fonctionner.
-	 *
-	 * @return	boolean     false si conflit, true si ok
-	 */
-	function canBeActivated()
-	{
-		return true;
-	}
-
-	/**
-	 * Renvoi prochaine valeur attribuee
-	 *
-	 * @param	Societe		$objsoc		Objet societe
-	 * @param   Facture		$facture	Objet facture
-	 * @return  string      			Value
-	 */
-	function getNextValue($objsoc,$facture)
-	{
-		global $langs;
-		return $langs->trans("NotAvailable");
-	}
-
-	/**
-	 * Renvoi version du modele de numerotation
-	 *
-	 * @return    string      Valeur
-	 */
-	function getVersion()
-	{
-		global $langs;
-		$langs->load("admin");
-
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
-		return $langs->trans("NotAvailable");
-	}
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    /**
+     * Return if a module can be used or not
+     *
+     * @return	boolean     true if module can be used
+     */
+    function isEnabled()
+    {
+        return true;
+    }
+
+    /**
+     * Renvoi la description par defaut du modele de numerotation
+     *
+     * @return    string      Texte descripif
+     */
+    function info()
+    {
+        global $langs;
+        $langs->load("bills");
+        return $langs->trans("NoDescription");
+    }
+
+    /**
+     * Renvoi un exemple de numerotation
+     *
+     * @return	string      Example
+     */
+    function getExample()
+    {
+        global $langs;
+        $langs->load("bills");
+        return $langs->trans("NoExample");
+    }
+
+    /**
+     * Test si les numeros deja en vigueur dans la base ne provoquent pas
+     * de conflits qui empecheraient cette numerotation de fonctionner.
+     *
+     * @return	boolean     false si conflit, true si ok
+     */
+    function canBeActivated()
+    {
+        return true;
+    }
+
+    /**
+     * Renvoi prochaine valeur attribuee
+     *
+     * @param	Societe		$objsoc		Objet societe
+     * @param   Facture		$facture	Objet facture
+     * @return  string      			Value
+     */
+    function getNextValue($objsoc,$facture)
+    {
+        global $langs;
+        return $langs->trans("NotAvailable");
+    }
+
+    /**
+     * Renvoi version du modele de numerotation
+     *
+     * @return    string      Valeur
+     */
+    function getVersion()
+    {
+        global $langs;
+        $langs->load("admin");
+
+        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
+        if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
+        if ($this->version == 'dolibarr') return DOL_VERSION;
+        if ($this->version) return $this->version;
+        return $langs->trans("NotAvailable");
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';   // Requis car utilise dans les classes qui heritent
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Requis car utilise dans les classes qui heritent
 
 
 /**
@@ -40,7 +40,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 	/**
@@ -50,16 +50,16 @@ 
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
 	 */
-	static function liste_modeles($db,$maxfilenamelength=0)
+	static function liste_modeles($db, $maxfilenamelength = 0)
 	{
         // phpcs:enable
 		global $conf;
 
-		$type='invoice';
-		$liste=array();
+		$type = 'invoice';
+		$liste = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		$liste = getListOfModels($db, $type, $maxfilenamelength);
 
 		return $liste;
 	}
@@ -73,7 +73,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * Return if a module can be used or not
@@ -127,7 +127,7 @@ 
 	 * @param   Facture		$facture	Objet facture
 	 * @return  string      			Value
 	 */
-	function getNextValue($objsoc,$facture)
+	function getNextValue($objsoc, $facture)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");

Braces +12 added lines, -4 removed lines

@@ -142,10 +142,18 @@
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+		    return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+		    return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+		    return DOL_VERSION;
+		}
+		if ($this->version) {
+		    return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }

dolibarr/htdocs/core/modules/facture/mod_facture_terre.php

Indentation +189 added lines, -189 removed lines

@@ -29,176 +29,176 @@ 
  */
 class mod_facture_terre extends ModeleNumRefFactures
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
-
-	public $prefixinvoice='FA';
-
-	public $prefixcreditnote='AV';
-
-	public $prefixdeposit='AC';
-
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-
-	/**
-	 * Constructor
-	 */
-	function __construct()
-	{
-		if (! empty($conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX))
-		{
-			$this->prefixinvoice = $conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX;
-		}
-	}
-
-	/**
-	 *  Renvoi la description du modele de numerotation
-	 *
-	 *  @return     string      Texte descripif
-	 */
-	function info()
-	{
-		global $langs;
-		$langs->load("bills");
-		return $langs->trans('TerreNumRefModelDesc1',$this->prefixinvoice,$this->prefixcreditnote,$this->prefixdeposit);
-	}
-
-	/**
-	 *  Renvoi un exemple de numerotation
-	 *
-	 *  @return     string      Example
-	 */
-	function getExample()
-	{
-		return $this->prefixinvoice."0501-0001";
-	}
-
-	/**
-	 *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
-	 *  de conflits qui empechera cette numerotation de fonctionner.
-	 *
-	 *  @return     boolean     false si conflit, true si ok
-	 */
-	function canBeActivated()
-	{
-		global $langs,$conf,$db;
-
-		$langs->load("bills");
-
-		// Check invoice num
-		$fayymm=''; $max='';
-
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefixinvoice)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$row = $db->fetch_row($resql);
-			if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
-		}
-		if ($fayymm && ! preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i',$fayymm))
-		{
-			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
-			return false;
-		}
-
-		// Check credit note num
-		$fayymm='';
-
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefixcreditnote)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$row = $db->fetch_row($resql);
-			if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
-		}
-		if ($fayymm && ! preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i',$fayymm))
-		{
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
-			return false;
-		}
-
-		// Check deposit num
-		$fayymm='';
-
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefixdeposit)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$row = $db->fetch_row($resql);
-			if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
-		}
-		if ($fayymm && ! preg_match('/'.$this->prefixdeposit.'[0-9][0-9][0-9][0-9]/i',$fayymm))
-		{
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Return next value not used or last value used
-	 *
-	 * @param	Societe		$objsoc		Object third party
-	 * @param   Facture		$invoice	Object invoice
+    public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+
+    public $prefixinvoice='FA';
+
+    public $prefixcreditnote='AV';
+
+    public $prefixdeposit='AC';
+
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+        if (! empty($conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX))
+        {
+            $this->prefixinvoice = $conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX;
+        }
+    }
+
+    /**
+     *  Renvoi la description du modele de numerotation
+     *
+     *  @return     string      Texte descripif
+     */
+    function info()
+    {
+        global $langs;
+        $langs->load("bills");
+        return $langs->trans('TerreNumRefModelDesc1',$this->prefixinvoice,$this->prefixcreditnote,$this->prefixdeposit);
+    }
+
+    /**
+     *  Renvoi un exemple de numerotation
+     *
+     *  @return     string      Example
+     */
+    function getExample()
+    {
+        return $this->prefixinvoice."0501-0001";
+    }
+
+    /**
+     *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
+     *  de conflits qui empechera cette numerotation de fonctionner.
+     *
+     *  @return     boolean     false si conflit, true si ok
+     */
+    function canBeActivated()
+    {
+        global $langs,$conf,$db;
+
+        $langs->load("bills");
+
+        // Check invoice num
+        $fayymm=''; $max='';
+
+        $posindice=8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
+        $sql.= " FROM ".MAIN_DB_PREFIX."facture";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefixinvoice)."____-%'";
+        $sql.= " AND entity = ".$conf->entity;
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $row = $db->fetch_row($resql);
+            if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
+        }
+        if ($fayymm && ! preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i',$fayymm))
+        {
+            $langs->load("errors");
+            $this->error=$langs->trans('ErrorNumRefModel',$max);
+            return false;
+        }
+
+        // Check credit note num
+        $fayymm='';
+
+        $posindice=8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
+        $sql.= " FROM ".MAIN_DB_PREFIX."facture";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefixcreditnote)."____-%'";
+        $sql.= " AND entity = ".$conf->entity;
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $row = $db->fetch_row($resql);
+            if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
+        }
+        if ($fayymm && ! preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i',$fayymm))
+        {
+            $this->error=$langs->trans('ErrorNumRefModel',$max);
+            return false;
+        }
+
+        // Check deposit num
+        $fayymm='';
+
+        $posindice=8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
+        $sql.= " FROM ".MAIN_DB_PREFIX."facture";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefixdeposit)."____-%'";
+        $sql.= " AND entity = ".$conf->entity;
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $row = $db->fetch_row($resql);
+            if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
+        }
+        if ($fayymm && ! preg_match('/'.$this->prefixdeposit.'[0-9][0-9][0-9][0-9]/i',$fayymm))
+        {
+            $this->error=$langs->trans('ErrorNumRefModel',$max);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Return next value not used or last value used
+     *
+     * @param	Societe		$objsoc		Object third party
+     * @param   Facture		$invoice	Object invoice
      * @param   string		$mode       'next' for next value or 'last' for last value
-	 * @return  string       			Value
-	 */
-	function getNextValue($objsoc, $invoice, $mode='next')
-	{
-		global $db;
-
-		if ($invoice->type == 2) $prefix=$this->prefixcreditnote;
-		else if ($invoice->type == 3) $prefix=$this->prefixdeposit;
-		else $prefix=$this->prefixinvoice;
-
-		// D'abord on recupere la valeur max
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql.= " WHERE ref LIKE '".$prefix."____-%'";
-		$sql.= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
-
-		$resql=$db->query($sql);
-		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
-		if ($resql)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
-		{
-			return -1;
-		}
-
-		if ($mode == 'last')
-		{
-    		if ($max >= (pow(10, 4) - 1)) $num=$max;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s",$max);
+     * @return  string       			Value
+     */
+    function getNextValue($objsoc, $invoice, $mode='next')
+    {
+        global $db;
+
+        if ($invoice->type == 2) $prefix=$this->prefixcreditnote;
+        else if ($invoice->type == 3) $prefix=$this->prefixdeposit;
+        else $prefix=$this->prefixinvoice;
+
+        // D'abord on recupere la valeur max
+        $posindice=8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
+        $sql.= " FROM ".MAIN_DB_PREFIX."facture";
+        $sql.= " WHERE ref LIKE '".$prefix."____-%'";
+        $sql.= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
+
+        $resql=$db->query($sql);
+        dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
+        if ($resql)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj) $max = intval($obj->max);
+            else $max=0;
+        }
+        else
+        {
+            return -1;
+        }
+
+        if ($mode == 'last')
+        {
+            if ($max >= (pow(10, 4) - 1)) $num=$max;	// If counter > 9999, we do not format on 4 chars, we take number as it is
+            else $num = sprintf("%04s",$max);
 
             $ref='';
             $sql = "SELECT ref as ref";
@@ -216,32 +216,32 @@ 
             else dol_print_error($db);
 
             return $ref;
-		}
-		else if ($mode == 'next')
-		{
-			$date=$invoice->date;	// This is invoice date (not creation date)
-    		$yymm = strftime("%y%m",$date);
-
-    		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s",$max+1);
-
-    		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
-    		return $prefix.$yymm."-".$num;
-		}
-		else dol_print_error('','Bad parameter for getNextValue');
-	}
-
-	/**
-	 * Return next free value
-	 *
+        }
+        else if ($mode == 'next')
+        {
+            $date=$invoice->date;	// This is invoice date (not creation date)
+            $yymm = strftime("%y%m",$date);
+
+            if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
+            else $num = sprintf("%04s",$max+1);
+
+            dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
+            return $prefix.$yymm."-".$num;
+        }
+        else dol_print_error('','Bad parameter for getNextValue');
+    }
+
+    /**
+     * Return next free value
+     *
      * @param	Societe		$objsoc     	Object third party
      * @param	string		$objforref		Object for number to search
      * @param   string		$mode       	'next' for next value or 'last' for last value
      * @return  string      				Next free value
-	 */
-	function getNumRef($objsoc,$objforref,$mode='next')
-	{
-		return $this->getNextValue($objsoc,$objforref,$mode);
-	}
+     */
+    function getNumRef($objsoc,$objforref,$mode='next')
+    {
+        return $this->getNextValue($objsoc,$objforref,$mode);
+    }
 }
 

Spacing +64 added lines, -64 removed lines

@@ -22,7 +22,7 @@ 
  *	\ingroup    facture
  *	\brief      File containing class for numbering module Terre
  */
-require_once DOL_DOCUMENT_ROOT .'/core/modules/facture/modules_facture.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 
 /**	    \class      mod_facture_terre
  *		\brief      Classe du modele de numerotation de reference de facture Terre
@@ -33,18 +33,18 @@ 
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	public $prefixinvoice='FA';
+	public $prefixinvoice = 'FA';
 
-	public $prefixcreditnote='AV';
+	public $prefixcreditnote = 'AV';
 
-	public $prefixdeposit='AC';
+	public $prefixdeposit = 'AC';
 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
 	/**
@@ -52,7 +52,7 @@ 
 	 */
 	function __construct()
 	{
-		if (! empty($conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX))
+		if (!empty($conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX))
 		{
 			$this->prefixinvoice = $conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX;
 		}
@@ -67,7 +67,7 @@ 
 	{
 		global $langs;
 		$langs->load("bills");
-		return $langs->trans('TerreNumRefModelDesc1',$this->prefixinvoice,$this->prefixcreditnote,$this->prefixdeposit);
+		return $langs->trans('TerreNumRefModelDesc1', $this->prefixinvoice, $this->prefixcreditnote, $this->prefixdeposit);
 	}
 
 	/**
@@ -88,71 +88,71 @@ 
 	 */
 	function canBeActivated()
 	{
-		global $langs,$conf,$db;
+		global $langs, $conf, $db;
 
 		$langs->load("bills");
 
 		// Check invoice num
-		$fayymm=''; $max='';
+		$fayymm = ''; $max = '';
 
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefixinvoice)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$posindice = 8;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefixinvoice)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$row = $db->fetch_row($resql);
-			if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $fayymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
-		if ($fayymm && ! preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i',$fayymm))
+		if ($fayymm && !preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i', $fayymm))
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
 
 		// Check credit note num
-		$fayymm='';
+		$fayymm = '';
 
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefixcreditnote)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$posindice = 8;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefixcreditnote)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$row = $db->fetch_row($resql);
-			if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $fayymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
-		if ($fayymm && ! preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i',$fayymm))
+		if ($fayymm && !preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i', $fayymm))
 		{
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
 
 		// Check deposit num
-		$fayymm='';
+		$fayymm = '';
 
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefixdeposit)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$posindice = 8;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefixdeposit)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$row = $db->fetch_row($resql);
-			if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $fayymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
-		if ($fayymm && ! preg_match('/'.$this->prefixdeposit.'[0-9][0-9][0-9][0-9]/i',$fayymm))
+		if ($fayymm && !preg_match('/'.$this->prefixdeposit.'[0-9][0-9][0-9][0-9]/i', $fayymm))
 		{
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
 
@@ -167,28 +167,28 @@ 
      * @param   string		$mode       'next' for next value or 'last' for last value
 	 * @return  string       			Value
 	 */
-	function getNextValue($objsoc, $invoice, $mode='next')
+	function getNextValue($objsoc, $invoice, $mode = 'next')
 	{
 		global $db;
 
-		if ($invoice->type == 2) $prefix=$this->prefixcreditnote;
-		else if ($invoice->type == 3) $prefix=$this->prefixdeposit;
-		else $prefix=$this->prefixinvoice;
+		if ($invoice->type == 2) $prefix = $this->prefixcreditnote;
+		else if ($invoice->type == 3) $prefix = $this->prefixdeposit;
+		else $prefix = $this->prefixinvoice;
 
 		// D'abord on recupere la valeur max
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql.= " WHERE ref LIKE '".$prefix."____-%'";
-		$sql.= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
+		$posindice = 8;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
+		$sql .= " WHERE ref LIKE '".$prefix."____-%'";
+		$sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
-			else $max=0;
+			else $max = 0;
 		}
 		else
 		{
@@ -197,17 +197,17 @@ 
 
 		if ($mode == 'last')
 		{
-    		if ($max >= (pow(10, 4) - 1)) $num=$max;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s",$max);
+    		if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
+    		else $num = sprintf("%04s", $max);
 
-            $ref='';
+            $ref = '';
             $sql = "SELECT ref as ref";
-            $sql.= " FROM ".MAIN_DB_PREFIX."facture";
-            $sql.= " WHERE ref LIKE '".$prefix."____-".$num."'";
-            $sql.= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
+            $sql .= " FROM ".MAIN_DB_PREFIX."facture";
+            $sql .= " WHERE ref LIKE '".$prefix."____-".$num."'";
+            $sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
 
             dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
-            $resql=$db->query($sql);
+            $resql = $db->query($sql);
             if ($resql)
             {
                 $obj = $db->fetch_object($resql);
@@ -219,16 +219,16 @@ 
 		}
 		else if ($mode == 'next')
 		{
-			$date=$invoice->date;	// This is invoice date (not creation date)
-    		$yymm = strftime("%y%m",$date);
+			$date = $invoice->date; // This is invoice date (not creation date)
+    		$yymm = strftime("%y%m", $date);
 
-    		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s",$max+1);
+    		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+    		else $num = sprintf("%04s", $max + 1);
 
     		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
     		return $prefix.$yymm."-".$num;
 		}
-		else dol_print_error('','Bad parameter for getNextValue');
+		else dol_print_error('', 'Bad parameter for getNextValue');
 	}
 
 	/**
@@ -239,9 +239,9 @@ 
      * @param   string		$mode       	'next' for next value or 'last' for last value
      * @return  string      				Next free value
 	 */
-	function getNumRef($objsoc,$objforref,$mode='next')
+	function getNumRef($objsoc, $objforref, $mode = 'next')
 	{
-		return $this->getNextValue($objsoc,$objforref,$mode);
+		return $this->getNextValue($objsoc, $objforref, $mode);
 	}
 }
 

Braces +35 added lines, -16 removed lines

@@ -171,9 +171,13 @@ 
 	{
 		global $db;
 
-		if ($invoice->type == 2) $prefix=$this->prefixcreditnote;
-		else if ($invoice->type == 3) $prefix=$this->prefixdeposit;
-		else $prefix=$this->prefixinvoice;
+		if ($invoice->type == 2) {
+		    $prefix=$this->prefixcreditnote;
+		} else if ($invoice->type == 3) {
+		    $prefix=$this->prefixdeposit;
+		} else {
+		    $prefix=$this->prefixinvoice;
+		}
 
 		// D'abord on recupere la valeur max
 		$posindice=8;
@@ -187,18 +191,25 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
+			if ($obj) {
+			    $max = intval($obj->max);
+			} else {
+			    $max=0;
+			}
+		} else
 		{
 			return -1;
 		}
 
 		if ($mode == 'last')
 		{
-    		if ($max >= (pow(10, 4) - 1)) $num=$max;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s",$max);
+    		if ($max >= (pow(10, 4) - 1)) {
+    		    $num=$max;
+    		}
+    		// If counter > 9999, we do not format on 4 chars, we take number as it is
+    		else {
+    		    $num = sprintf("%04s",$max);
+    		}
 
             $ref='';
             $sql = "SELECT ref as ref";
@@ -211,24 +222,32 @@ 
             if ($resql)
             {
                 $obj = $db->fetch_object($resql);
-                if ($obj) $ref = $obj->ref;
+                if ($obj) {
+                    $ref = $obj->ref;
+                }
+            } else {
+                dol_print_error($db);
             }
-            else dol_print_error($db);
 
             return $ref;
-		}
-		else if ($mode == 'next')
+		} else if ($mode == 'next')
 		{
 			$date=$invoice->date;	// This is invoice date (not creation date)
     		$yymm = strftime("%y%m",$date);
 
-    		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s",$max+1);
+    		if ($max >= (pow(10, 4) - 1)) {
+    		    $num=$max+1;
+    		}
+    		// If counter > 9999, we do not format on 4 chars, we take number as it is
+    		else {
+    		    $num = sprintf("%04s",$max+1);
+    		}
 
     		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
     		return $prefix.$yymm."-".$num;
+		} else {
+		    dol_print_error('','Bad parameter for getNextValue');
 		}
-		else dol_print_error('','Bad parameter for getNextValue');
 	}
 
 	/**

dolibarr/htdocs/core/modules/modDav.class.php

Indentation +173 added lines, -173 removed lines

@@ -31,121 +31,121 @@ 
  */
 class modDav extends DolibarrModules
 {
-	/**
-	 * Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 * @param DoliDB $db Database handler
-	 */
-	public function __construct($db)
-	{
+    /**
+     * Constructor. Define names, constants, directories, boxes, permissions
+     *
+     * @param DoliDB $db Database handler
+     */
+    public function __construct($db)
+    {
         global $langs,$conf;
 
         $this->db = $db;
 
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 50310;
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'dav';
-
-		// Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
-		// It is used to group modules by family in module setup page
-		$this->family = "interface";
-		// Module position in the family on 2 digits ('01', '10', '20', ...)
-		$this->module_position = '75';
-		// Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
-		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
-
-		// Module label (no space allowed), used if translation string 'ModuledavName' not found (MyModue is name of module).
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuledavDesc' not found (MyModue is name of module).
-		$this->description = "davDescription";
-		// Used only if file README.md and README-LL.md not found.
-		$this->descriptionlong = "davDescription";
-
-		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = 'dolibarr';
-		// Key used in llx_const table to save module status enabled/disabled (where DAV is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Name of image file used for this module.
-		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='generic';
-
-		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-		// for default path (eg: /dav/core/xxxxx) (0=disable, 1=enable)
-		// for specific path of parts (eg: /dav/core/modules/barcode)
-		// for specific css file (eg: /dav/css/dav.css.php)
-		$this->module_parts = array();
-
-		// Data directories to create when module is enabled.
-		// Example: this->dirs = array("/dav/temp","/dav/subdir");
-		$this->dirs = array("/dav/temp","/dav/public","/dav/private");
-
-		// Config pages. Put here list of php page, stored into dav/admin directory, to use to setup module.
-		$this->config_page_url = array("dav.php");
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->langfiles = array("admin");
-		$this->phpmin = array(5,6);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(7,0);	// Minimum version of Dolibarr required by module
-		$this->warnings_activation = array();                     // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-		$this->warnings_activation_ext = array();                 // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-		//$this->automatic_activation = array('FR'=>'davWasAutomaticallyActivatedBecauseOfYourCountryChoice');
-		//$this->always_enabled = true;								// If true, can't be disabled
-
-		// Constants
-		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-		// Example: $this->const=array(0=>array('DAV_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-		//                             1=>array('DAV_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-		// );
-		$this->const = array(
-			//1=>array('DAV_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
-		);
-
-
-		if (! isset($conf->dav) || ! isset($conf->dav->enabled))
-		{
-			$conf->dav=new stdClass();
-			$conf->dav->enabled=0;
-		}
-
-
-		// Array to add new pages in new tabs
+        // Id for module (must be unique).
+        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+        $this->numero = 50310;
+        // Key text used to identify module (for permissions, menus, etc...)
+        $this->rights_class = 'dav';
+
+        // Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
+        // It is used to group modules by family in module setup page
+        $this->family = "interface";
+        // Module position in the family on 2 digits ('01', '10', '20', ...)
+        $this->module_position = '75';
+        // Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+        //$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
+
+        // Module label (no space allowed), used if translation string 'ModuledavName' not found (MyModue is name of module).
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        // Module description, used if translation string 'ModuledavDesc' not found (MyModue is name of module).
+        $this->description = "davDescription";
+        // Used only if file README.md and README-LL.md not found.
+        $this->descriptionlong = "davDescription";
+
+        // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+        $this->version = 'dolibarr';
+        // Key used in llx_const table to save module status enabled/disabled (where DAV is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // Name of image file used for this module.
+        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+        $this->picto='generic';
+
+        // Defined all module parts (triggers, login, substitutions, menus, css, etc...)
+        // for default path (eg: /dav/core/xxxxx) (0=disable, 1=enable)
+        // for specific path of parts (eg: /dav/core/modules/barcode)
+        // for specific css file (eg: /dav/css/dav.css.php)
+        $this->module_parts = array();
+
+        // Data directories to create when module is enabled.
+        // Example: this->dirs = array("/dav/temp","/dav/subdir");
+        $this->dirs = array("/dav/temp","/dav/public","/dav/private");
+
+        // Config pages. Put here list of php page, stored into dav/admin directory, to use to setup module.
+        $this->config_page_url = array("dav.php");
+
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of module ids to disable if this one is disabled
+        $this->conflictwith = array();	// List of module class names as string this module is in conflict with
+        $this->langfiles = array("admin");
+        $this->phpmin = array(5,6);					// Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(7,0);	// Minimum version of Dolibarr required by module
+        $this->warnings_activation = array();                     // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+        $this->warnings_activation_ext = array();                 // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+        //$this->automatic_activation = array('FR'=>'davWasAutomaticallyActivatedBecauseOfYourCountryChoice');
+        //$this->always_enabled = true;								// If true, can't be disabled
+
+        // Constants
+        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+        // Example: $this->const=array(0=>array('DAV_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+        //                             1=>array('DAV_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+        // );
+        $this->const = array(
+            //1=>array('DAV_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
+        );
+
+
+        if (! isset($conf->dav) || ! isset($conf->dav->enabled))
+        {
+            $conf->dav=new stdClass();
+            $conf->dav->enabled=0;
+        }
+
+
+        // Array to add new pages in new tabs
         $this->tabs = array();
-		// Example:
-		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@dav:$user->rights->dav->read:/dav/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+        // Example:
+        // $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@dav:$user->rights->dav->read:/dav/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
         // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@dav:$user->rights->othermodule->read:/dav/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
         // $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
         //
         // Where objecttype can be
-		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-		// 'contact'          to add a tab in contact view
-		// 'contract'         to add a tab in contract view
-		// 'group'            to add a tab in group view
-		// 'intervention'     to add a tab in intervention view
-		// 'invoice'          to add a tab in customer invoice view
-		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
-		// 'opensurveypoll'	  to add a tab in opensurvey poll view
-		// 'order'            to add a tab in customer order view
-		// 'order_supplier'   to add a tab in supplier order view
-		// 'payment'		  to add a tab in payment view
-		// 'payment_supplier' to add a tab in supplier payment view
-		// 'product'          to add a tab in product view
-		// 'propal'           to add a tab in propal view
-		// 'project'          to add a tab in project view
-		// 'stock'            to add a tab in stock view
-		// 'thirdparty'       to add a tab in third party view
-		// 'user'             to add a tab in user view
+        // 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+        // 'contact'          to add a tab in contact view
+        // 'contract'         to add a tab in contract view
+        // 'group'            to add a tab in group view
+        // 'intervention'     to add a tab in intervention view
+        // 'invoice'          to add a tab in customer invoice view
+        // 'invoice_supplier' to add a tab in supplier invoice view
+        // 'member'           to add a tab in fundation member view
+        // 'opensurveypoll'	  to add a tab in opensurvey poll view
+        // 'order'            to add a tab in customer order view
+        // 'order_supplier'   to add a tab in supplier order view
+        // 'payment'		  to add a tab in payment view
+        // 'payment_supplier' to add a tab in supplier payment view
+        // 'product'          to add a tab in product view
+        // 'propal'           to add a tab in propal view
+        // 'project'          to add a tab in project view
+        // 'stock'            to add a tab in stock view
+        // 'thirdparty'       to add a tab in third party view
+        // 'user'             to add a tab in user view
 
 
         // Dictionaries
-		$this->dictionaries=array();
+        $this->dictionaries=array();
         /* Example:
         $this->dictionaries=array(
             'langs'=>'mylangfile@dav',
@@ -163,28 +163,28 @@ 
 
 
         // Boxes/Widgets
-		// Add here list of php file(s) stored in dav/core/boxes that contains class to show a widget.
+        // Add here list of php file(s) stored in dav/core/boxes that contains class to show a widget.
         $this->boxes = array(
-        	//0=>array('file'=>'davwidget1.php@dav','note'=>'Widget provided by dav','enabledbydefaulton'=>'Home'),
-        	//1=>array('file'=>'davwidget2.php@dav','note'=>'Widget provided by dav'),
-        	//2=>array('file'=>'davwidget3.php@dav','note'=>'Widget provided by dav')
+            //0=>array('file'=>'davwidget1.php@dav','note'=>'Widget provided by dav','enabledbydefaulton'=>'Home'),
+            //1=>array('file'=>'davwidget2.php@dav','note'=>'Widget provided by dav'),
+            //2=>array('file'=>'davwidget3.php@dav','note'=>'Widget provided by dav')
         );
 
 
-		// Cronjobs (List of cron jobs entries to add when module is enabled)
-		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
-		//$this->cronjobs = array(
-			//0=>array('label'=>'MyJob label', 'jobtype'=>'method', 'class'=>'/dav/class/myobject.class.php', 'objectname'=>'MyObject', 'method'=>'doScheduledJob', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>true)
-		//);
-		// Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>true),
-		//                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>true)
-		// );
+        // Cronjobs (List of cron jobs entries to add when module is enabled)
+        // unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
+        //$this->cronjobs = array(
+            //0=>array('label'=>'MyJob label', 'jobtype'=>'method', 'class'=>'/dav/class/myobject.class.php', 'objectname'=>'MyObject', 'method'=>'doScheduledJob', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>true)
+        //);
+        // Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>true),
+        //                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>true)
+        // );
 
 
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
+        // Permissions
+        $this->rights = array();		// Permission array used by this module
 
-		/*
+        /*
 		$r=0;
 		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
 		$this->rights[$r][1] = 'Read myobject of dav';	// Permission label
@@ -207,14 +207,14 @@ 
 		$this->rights[$r][5] = '';				    // In php code, permission will be checked by test if ($user->rights->dav->level1->level2)
 		*/
 
-		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
+        // Main menu entries
+        $this->menu = array();			// List of menus to add
+        $r=0;
 
-		// Add here entries to declare new menus
+        // Add here entries to declare new menus
 
-		/* BEGIN MODULEBUILDER TOPMENU */
-		/*$this->menu[$r++]=array('fk_menu'=>'',			                // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+        /* BEGIN MODULEBUILDER TOPMENU */
+        /*$this->menu[$r++]=array('fk_menu'=>'',			                // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 								'type'=>'top',			                // This is a Top menu entry
 								'titre'=>'dav',
 								'mainmenu'=>'dav',
@@ -227,9 +227,9 @@ 
 								'target'=>'',
 								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
 		*/
-		/* END MODULEBUILDER TOPMENU */
+        /* END MODULEBUILDER TOPMENU */
 
-		/* BEGIN MODULEBUILDER LEFTMENU MYOBJECT
+        /* BEGIN MODULEBUILDER LEFTMENU MYOBJECT
 		$this->menu[$r++]=array(	'fk_menu'=>'fk_mainmenu=dav',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 								'type'=>'left',			                // This is a Left menu entry
 								'titre'=>'List MyObject',
@@ -257,11 +257,11 @@ 
 		END MODULEBUILDER LEFTMENU MYOBJECT */
 
 
-		// Exports
-		$r=1;
+        // Exports
+        $r=1;
 
-		/* BEGIN MODULEBUILDER EXPORT MYOBJECT */
-		/*
+        /* BEGIN MODULEBUILDER EXPORT MYOBJECT */
+        /*
 		$langs->load("dav@dav");
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='MyObjectLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
@@ -276,48 +276,48 @@ 
 		$this->export_sql_end[$r] .=' WHERE 1 = 1';
 		$this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('myobject').')';
 		$r++; */
-		/* END MODULEBUILDER EXPORT MYOBJECT */
-	}
-
-	/**
-	 *	Function called when module is enabled.
-	 *	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *	It also creates data directories
-	 *
+        /* END MODULEBUILDER EXPORT MYOBJECT */
+    }
+
+    /**
+     *	Function called when module is enabled.
+     *	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *	It also creates data directories
+     *
+     *	@param      string	$options    Options when enabling module ('', 'noboxes')
+     *	@return     int             	1 if OK, 0 if KO
+     */
+    public function init($options='')
+    {
+        //$this->_load_tables('/dav/sql/');
+
+        // Create extrafields
+        include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+        $extrafields = new ExtraFields($this->db);
+
+        //$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
+        //$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
+        //$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
+        //$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1 '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
+        //$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
+
+        $sql = array();
+
+        return $this->_init($sql, $options);
+    }
+
+    /**
+     *	Function called when module is disabled.
+     *	Remove from database constants, boxes and permissions from Dolibarr database.
+     *	Data directories are not deleted
+     *
      *	@param      string	$options    Options when enabling module ('', 'noboxes')
-	 *	@return     int             	1 if OK, 0 if KO
-	 */
-	public function init($options='')
-	{
-		//$this->_load_tables('/dav/sql/');
-
-		// Create extrafields
-		include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-		$extrafields = new ExtraFields($this->db);
-
-		//$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
-		//$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
-		//$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
-		//$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1 '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
-		//$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
-
-		$sql = array();
-
-		return $this->_init($sql, $options);
-	}
-
-	/**
-	 *	Function called when module is disabled.
-	 *	Remove from database constants, boxes and permissions from Dolibarr database.
-	 *	Data directories are not deleted
-	 *
-	 *	@param      string	$options    Options when enabling module ('', 'noboxes')
-	 *	@return     int             	1 if OK, 0 if KO
-	 */
-	public function remove($options = '')
-	{
-		$sql = array();
-
-		return $this->_remove($sql, $options);
-	}
+     *	@return     int             	1 if OK, 0 if KO
+     */
+    public function remove($options = '')
+    {
+        $sql = array();
+
+        return $this->_remove($sql, $options);
+    }
 }

Spacing +22 added lines, -22 removed lines

@@ -23,7 +23,7 @@ 
  *  \ingroup    dav
  *  \brief      Description and activation file for module dav
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -38,7 +38,7 @@ 
 	 */
 	public function __construct($db)
 	{
-        global $langs,$conf;
+        global $langs, $conf;
 
         $this->db = $db;
 
@@ -57,7 +57,7 @@ 
 		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
 
 		// Module label (no space allowed), used if translation string 'ModuledavName' not found (MyModue is name of module).
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		// Module description, used if translation string 'ModuledavDesc' not found (MyModue is name of module).
 		$this->description = "davDescription";
 		// Used only if file README.md and README-LL.md not found.
@@ -70,7 +70,7 @@ 
 		// Name of image file used for this module.
 		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
 		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='generic';
+		$this->picto = 'generic';
 
 		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
 		// for default path (eg: /dav/core/xxxxx) (0=disable, 1=enable)
@@ -80,21 +80,21 @@ 
 
 		// Data directories to create when module is enabled.
 		// Example: this->dirs = array("/dav/temp","/dav/subdir");
-		$this->dirs = array("/dav/temp","/dav/public","/dav/private");
+		$this->dirs = array("/dav/temp", "/dav/public", "/dav/private");
 
 		// Config pages. Put here list of php page, stored into dav/admin directory, to use to setup module.
 		$this->config_page_url = array("dav.php");
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->langfiles = array("admin");
-		$this->phpmin = array(5,6);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(7,0);	// Minimum version of Dolibarr required by module
-		$this->warnings_activation = array();                     // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-		$this->warnings_activation_ext = array();                 // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(7, 0); // Minimum version of Dolibarr required by module
+		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
 		//$this->automatic_activation = array('FR'=>'davWasAutomaticallyActivatedBecauseOfYourCountryChoice');
 		//$this->always_enabled = true;								// If true, can't be disabled
 
@@ -108,10 +108,10 @@ 
 		);
 
 
-		if (! isset($conf->dav) || ! isset($conf->dav->enabled))
+		if (!isset($conf->dav) || !isset($conf->dav->enabled))
 		{
-			$conf->dav=new stdClass();
-			$conf->dav->enabled=0;
+			$conf->dav = new stdClass();
+			$conf->dav->enabled = 0;
 		}
 
 
@@ -145,7 +145,7 @@ 
 
 
         // Dictionaries
-		$this->dictionaries=array();
+		$this->dictionaries = array();
         /* Example:
         $this->dictionaries=array(
             'langs'=>'mylangfile@dav',
@@ -182,7 +182,7 @@ 
 
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
+		$this->rights = array(); // Permission array used by this module
 
 		/*
 		$r=0;
@@ -208,8 +208,8 @@ 
 		*/
 
 		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
+		$this->menu = array(); // List of menus to add
+		$r = 0;
 
 		// Add here entries to declare new menus
 
@@ -258,7 +258,7 @@ 
 
 
 		// Exports
-		$r=1;
+		$r = 1;
 
 		/* BEGIN MODULEBUILDER EXPORT MYOBJECT */
 		/*
@@ -287,7 +287,7 @@ 
      *	@param      string	$options    Options when enabling module ('', 'noboxes')
 	 *	@return     int             	1 if OK, 0 if KO
 	 */
-	public function init($options='')
+	public function init($options = '')
 	{
 		//$this->_load_tables('/dav/sql/');
 

dolibarr/htdocs/core/modules/modFacture.class.php

Indentation +320 added lines, -320 removed lines

@@ -35,70 +35,70 @@ 
 class modFacture extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $user;
-
-		$this->db = $db;
-		$this->numero = 30;
-
-		$this->family = "financial";
-		$this->module_position = '10';
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i', '', get_class($this));
-		$this->description = "Gestion des factures";
-
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto = 'bill';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array("/facture/temp");
-
-		// Dependencies
-		$this->depends = array('always'=>"modSociete");
-		$this->requiredby = array("modComptabilite", "modAccounting");
-		$this->conflictwith = array();
-		$this->langfiles = array("bills", "companies", "compta", "products");
-		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='text')
-		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='text')
-
-		// Config pages
-		$this->config_page_url = array("facture.php");
-
-		// Constants
-		$this->const = array();
-		$r = 0;
-
-		$this->const[$r][0] = "FACTURE_ADDON";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "mod_facture_terre";
-		$this->const[$r][3] = 'Name of numbering numerotation rules of invoice';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "FACTURE_ADDON_PDF";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "crabe";
-		$this->const[$r][3] = 'Name of PDF model of invoice';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "FACTURE_ADDON_PDF_ODT_PATH";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/invoices";
-		$this->const[$r][3] = "";
-		$this->const[$r][4] = 0;
-		$r++;
-
-		/*$this->const[$r][0] = "FACTURE_DRAFT_WATERMARK";
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $user;
+
+        $this->db = $db;
+        $this->numero = 30;
+
+        $this->family = "financial";
+        $this->module_position = '10';
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i', '', get_class($this));
+        $this->description = "Gestion des factures";
+
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto = 'bill';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array("/facture/temp");
+
+        // Dependencies
+        $this->depends = array('always'=>"modSociete");
+        $this->requiredby = array("modComptabilite", "modAccounting");
+        $this->conflictwith = array();
+        $this->langfiles = array("bills", "companies", "compta", "products");
+        $this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='text')
+        $this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='text')
+
+        // Config pages
+        $this->config_page_url = array("facture.php");
+
+        // Constants
+        $this->const = array();
+        $r = 0;
+
+        $this->const[$r][0] = "FACTURE_ADDON";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "mod_facture_terre";
+        $this->const[$r][3] = 'Name of numbering numerotation rules of invoice';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "FACTURE_ADDON_PDF";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "crabe";
+        $this->const[$r][3] = 'Name of PDF model of invoice';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "FACTURE_ADDON_PDF_ODT_PATH";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/invoices";
+        $this->const[$r][3] = "";
+        $this->const[$r][4] = 0;
+        $r++;
+
+        /*$this->const[$r][0] = "FACTURE_DRAFT_WATERMARK";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "__(Draft)__";
 		$this->const[$r][3] = 'Watermark to show on draft invoices';
@@ -106,264 +106,264 @@ 
 		$r++;*/
 
 
-		// Boxes
-		//$this->boxes = array(0=>array(1=>'box_factures_imp.php'),1=>array(1=>'box_factures.php'));
-		$this->boxes = array(
-				0=>array('file'=>'box_factures_imp.php', 'enabledbydefaulton'=>'Home'),
-				1=>array('file'=>'box_factures.php', 'enabledbydefaulton'=>'Home'),
-				2=>array('file'=>'box_graph_invoices_permonth.php', 'enabledbydefaulton'=>'Home')
-		);
-
-		// Cronjobs
-		$arraydate=dol_getdate(dol_now());
-		$datestart=dol_mktime(23, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
-		$this->cronjobs = array(
-			0=>array('label'=>'RecurringInvoices', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture-rec.class.php', 'objectname'=>'FactureRec', 'method'=>'createRecurringInvoices', 'parameters'=>'', 'comment'=>'Generate recurring invoices', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>1, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
-		);
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'facture';
-		$r = 0;
-
-		$r++;
-		$this->rights[$r][0] = 11;
-		$this->rights[$r][1] = 'Read invoices';
-		$this->rights[$r][2] = 'a';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'lire';
-
-		$r++;
-		$this->rights[$r][0] = 12;
-		$this->rights[$r][1] = 'Create and update invoices';
-		$this->rights[$r][2] = 'a';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'creer';
-
-		// There is a particular permission for unvalidate because this may be not forbidden by some laws
-		$r++;
-		$this->rights[$r][0] = 13;
-		$this->rights[$r][1] = 'Devalidate invoices';
-		$this->rights[$r][2] = 'a';
-		$this->rights[$r][3] = 0;
+        // Boxes
+        //$this->boxes = array(0=>array(1=>'box_factures_imp.php'),1=>array(1=>'box_factures.php'));
+        $this->boxes = array(
+                0=>array('file'=>'box_factures_imp.php', 'enabledbydefaulton'=>'Home'),
+                1=>array('file'=>'box_factures.php', 'enabledbydefaulton'=>'Home'),
+                2=>array('file'=>'box_graph_invoices_permonth.php', 'enabledbydefaulton'=>'Home')
+        );
+
+        // Cronjobs
+        $arraydate=dol_getdate(dol_now());
+        $datestart=dol_mktime(23, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
+        $this->cronjobs = array(
+            0=>array('label'=>'RecurringInvoices', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture-rec.class.php', 'objectname'=>'FactureRec', 'method'=>'createRecurringInvoices', 'parameters'=>'', 'comment'=>'Generate recurring invoices', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>1, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
+        );
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'facture';
+        $r = 0;
+
+        $r++;
+        $this->rights[$r][0] = 11;
+        $this->rights[$r][1] = 'Read invoices';
+        $this->rights[$r][2] = 'a';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'lire';
+
+        $r++;
+        $this->rights[$r][0] = 12;
+        $this->rights[$r][1] = 'Create and update invoices';
+        $this->rights[$r][2] = 'a';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'creer';
+
+        // There is a particular permission for unvalidate because this may be not forbidden by some laws
+        $r++;
+        $this->rights[$r][0] = 13;
+        $this->rights[$r][1] = 'Devalidate invoices';
+        $this->rights[$r][2] = 'a';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'invoice_advance';
+        $this->rights[$r][5] = 'unvalidate';
+
+        $r++;
+        $this->rights[$r][0] = 14;
+        $this->rights[$r][1] = 'Validate invoices';
+        $this->rights[$r][2] = 'a';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'invoice_advance';
+        $this->rights[$r][5] = 'validate';
+
+        $r++;
+        $this->rights[$r][0] = 15;
+        $this->rights[$r][1] = 'Send invoices by email';
+        $this->rights[$r][2] = 'a';
+        $this->rights[$r][3] = 0;
         $this->rights[$r][4] = 'invoice_advance';
-		$this->rights[$r][5] = 'unvalidate';
-
-		$r++;
-		$this->rights[$r][0] = 14;
-		$this->rights[$r][1] = 'Validate invoices';
-		$this->rights[$r][2] = 'a';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'invoice_advance';
-		$this->rights[$r][5] = 'validate';
-
-		$r++;
-		$this->rights[$r][0] = 15;
-		$this->rights[$r][1] = 'Send invoices by email';
-		$this->rights[$r][2] = 'a';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'invoice_advance';
         $this->rights[$r][5] = 'send';
 
-		$r++;
-		$this->rights[$r][0] = 16;
-		$this->rights[$r][1] = 'Issue payments on invoices';
-		$this->rights[$r][2] = 'a';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'paiement';
-
-		$r++;
-		$this->rights[$r][0] = 19;
-		$this->rights[$r][1] = 'Delete invoices';
-		$this->rights[$r][2] = 'a';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'supprimer';
-
-		$r++;
-		$this->rights[$r][0] = 1321;
-		$this->rights[$r][1] = 'Export customer invoices, attributes and payments';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'facture';
-		$this->rights[$r][5] = 'export';
-
-		$r++;
-		$this->rights[$r][0] = 1322;
-		$this->rights[$r][1] = 'Re-open a fully paid invoice';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'invoice_advance';
-		$this->rights[$r][5] = 'reopen';
-
-
-		// Menus
-		//-------
-		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
-
-
-		// Exports
-		//--------
-		$r = 1;
-
-		$this->export_code[$r] = $this->rights_class.'_'.$r;
-		$this->export_label[$r] = 'CustomersInvoicesAndInvoiceLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
-		$this->export_icon[$r] = 'invoice';
-		$this->export_permission[$r] = array(array("facture", "facture", "export", "other"));
-		$this->export_fields_array[$r] = array(
-			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 's.phone'=>'Phone',
-			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.code_compta'=>'CustomerAccountancyCode',
-			's.code_compta_fournisseur'=>'SupplierAccountancyCode', 's.tva_intra'=>'VATIntra',
-			'f.rowid'=>"InvoiceId", 'f.ref'=>"InvoiceRef", 'f.ref_client'=>'RefCustomer',
-			'f.type'=>"Type", 'f.datec'=>"InvoiceDateCreation", 'f.datef'=>"DateInvoice", 'f.date_lim_reglement'=>"DateDue", 'f.total'=>"TotalHT",
-			'f.total_ttc'=>"TotalTTC", 'f.tva'=>"TotalVAT", 'none.rest'=>'Rest', 'f.paye'=>"InvoicePaid", 'f.fk_statut'=>'InvoiceStatus',
-			'f.note_private'=>"NotePrivate", 'f.note_public'=>"NotePublic", 'f.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin',
-			'f.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin', 'pj.ref'=>'ProjectRef', 'fd.rowid'=>'LineId', 'fd.description'=>"LineDescription",
-			'fd.subprice'=>"LineUnitPrice", 'fd.tva_tx'=>"LineVATRate", 'fd.qty'=>"LineQty", 'fd.total_ht'=>"LineTotalHT", 'fd.total_tva'=>"LineTotalVAT",
-			'fd.total_ttc'=>"LineTotalTTC", 'fd.date_start'=>"DateStart", 'fd.date_end'=>"DateEnd", 'fd.special_code'=>'SpecialCode',
-			'fd.product_type'=>"TypeOfLineServiceOrProduct", 'fd.fk_product'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel',
-			'p.accountancy_code_sell'=>'ProductAccountancySellCode'
-		);
-		$this->export_TypeFields_array[$r] = array(
-			's.rowid'=>'Numeric', 's.nom'=>'Text', 's.code_client'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text',
-			's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text',
-			'f.rowid'=>'Numeric', 'f.ref'=>"Text", 'f.ref_client'=>'Text', 'f.type'=>"Numeric", 'f.datec'=>"Date", 'f.datef'=>"Date", 'f.date_lim_reglement'=>"Date",
-			'f.total'=>"Numeric", 'f.total_ttc'=>"Numeric", 'f.tva'=>"Numeric", 'none.rest'=>"NumericCompute", 'f.paye'=>"Boolean", 'f.fk_statut'=>'Numeric',
-			'f.note_private'=>"Text", 'f.note_public'=>"Text", 'f.fk_user_author'=>'Numeric', 'uc.login'=>'Text', 'f.fk_user_valid'=>'Numeric', 'uv.login'=>'Text',
-			'pj.ref'=>'Text', 'fd.rowid'=>'Numeric', 'fd.label'=>'Text', 'fd.description'=>"Text", 'fd.subprice'=>"Numeric", 'fd.tva_tx'=>"Numeric",
-			'fd.qty'=>"Numeric", 'fd.total_ht'=>"Numeric", 'fd.total_tva'=>"Numeric", 'fd.total_ttc'=>"Numeric", 'fd.date_start'=>"Date", 'fd.date_end'=>"Date",
-			'fd.special_code'=>'Numeric', 'fd.product_type'=>"Numeric", 'fd.fk_product'=>'List:product:label', 'p.ref'=>'Text', 'p.label'=>'Text',
-			'p.accountancy_code_sell'=>'Text'
-		);
-		$this->export_entities_array[$r] = array(
-			's.rowid'=>"company", 's.nom'=>'company', 's.code_client'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 's.phone'=>'company',
-			's.siren'=>'company', 's.siret'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.code_compta'=>'company', 's.code_compta_fournisseur'=>'company',
-			's.tva_intra'=>'company', 'pj.ref'=>'project', 'fd.rowid'=>'invoice_line', 'fd.label'=>"invoice_line", 'fd.description'=>"invoice_line",
-			'fd.subprice'=>"invoice_line", 'fd.total_ht'=>"invoice_line", 'fd.total_tva'=>"invoice_line", 'fd.total_ttc'=>"invoice_line", 'fd.tva_tx'=>"invoice_line",
-			'fd.qty'=>"invoice_line", 'fd.date_start'=>"invoice_line", 'fd.date_end'=>"invoice_line", 'fd.special_code'=>'invoice_line',
-			'fd.product_type'=>'invoice_line', 'fd.fk_product'=>'product', 'p.ref'=>'product', 'p.label'=>'product', 'p.accountancy_code_sell'=>'product',
-			'f.fk_user_author'=>'user', 'uc.login'=>'user', 'f.fk_user_valid'=>'user', 'uv.login'=>'user'
-		);
-		$this->export_special_array[$r] = array('none.rest'=>'getRemainToPay');
-		$this->export_dependencies_array[$r] = array('invoice_line'=>'fd.rowid', 'product'=>'fd.rowid', 'none.rest'=>array('f.rowid', 'f.total_ttc')); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		$keyforselect = 'facture'; $keyforelement = 'invoice'; $keyforaliasextra = 'extra';
-		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect = 'facturedet'; $keyforelement = 'invoice_line'; $keyforaliasextra = 'extra2';
-		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra3';
-		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
-		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c on s.fk_pays = c.rowid,';
-		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'facture as f';
-		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON f.fk_projet = pj.rowid';
-		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON f.fk_user_author = uc.rowid';
-		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON f.fk_user_valid = uv.rowid';
-		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_extrafields as extra ON f.rowid = extra.fk_object';
-		$this->export_sql_end[$r] .= ' , '.MAIN_DB_PREFIX.'facturedet as fd';
-		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet_extrafields as extra2 on fd.rowid = extra2.fk_object';
-		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
-		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
-		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('invoice').')';
-		if (isset($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
-		$r++;
-
-		$this->export_code[$r] = $this->rights_class.'_'.$r;
-		$this->export_label[$r] = 'CustomersInvoicesAndPayments'; // Translation key (used only if key ExportDataset_xxx_z not found)
-		$this->export_icon[$r] = 'invoice';
-		$this->export_permission[$r] = array(array("facture", "facture", "export"));
-		$this->export_fields_array[$r] = array(
-			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 's.phone'=>'Phone',
-			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.code_compta'=>'CustomerAccountancyCode',
-			's.code_compta_fournisseur'=>'SupplierAccountancyCode', 's.tva_intra'=>'VATIntra',
-			'f.rowid'=>"InvoiceId", 'f.ref'=>"InvoiceRef",  'f.ref_client'=>'RefCustomer',
-			'f.type'=>"Type", 'f.datec'=>"InvoiceDateCreation", 'f.datef'=>"DateInvoice", 'f.date_lim_reglement'=>"DateDue", 'f.total'=>"TotalHT",
-			'f.total_ttc'=>"TotalTTC", 'f.tva'=>"TotalVAT", 'none.rest'=>'Rest', 'f.paye'=>"InvoicePaid", 'f.fk_statut'=>'InvoiceStatus',
-			'f.note_private'=>"NotePrivate", 'f.note_public'=>"NotePublic", 'f.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin',
-			'f.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin', 'pj.ref'=>'ProjectRef', 'p.rowid'=>'PaymentId', 'p.ref'=>'PaymentRef',
-			'p.amount'=>'AmountPayment', 'pf.amount'=>'AmountPaymentDistributedOnInvoice', 'p.datep'=>'DatePayment', 'p.num_paiement'=>'PaymentNumber',
-			'pt.code'=>'CodePaymentMode', 'pt.libelle'=>'LabelPaymentMode', 'p.note'=>'PaymentNote', 'p.fk_bank'=>'IdTransaction', 'ba.ref'=>'AccountRef'
-		);
-		$this->export_TypeFields_array[$r] = array(
-			's.rowid'=>'Numeric', 's.nom'=>'Text', 's.code_client'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text',
-			's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text',
-			'f.rowid'=>"Numeric", 'f.ref'=>"Text", 'f.ref_client'=>'Text', 'f.type'=>"Numeric", 'f.datec'=>"Date", 'f.datef'=>"Date", 'f.date_lim_reglement'=>"Date",
-			'f.total'=>"Numeric", 'f.total_ttc'=>"Numeric", 'f.tva'=>"Numeric", 'none.rest'=>'NumericCompute', 'f.paye'=>"Boolean", 'f.fk_statut'=>'Status',
-			'f.note_private'=>"Text", 'f.note_public'=>"Text", 'f.fk_user_author'=>'Numeric', 'uc.login'=>'Text', 'f.fk_user_valid'=>'Numeric', 'uv.login'=>'Text',
-			'pj.ref'=>'Text', 'p.amount'=>'Numeric', 'pf.amount'=>'Numeric', 'p.rowid'=>'Numeric', 'p.ref'=>'Text', 'p.datep'=>'Date', 'p.num_paiement'=>'Numeric',
-			'p.fk_bank'=>'Numeric', 'p.note'=>'Text', 'pt.code'=>'Text', 'pt.libelle'=>'text', 'ba.ref'=>'Text'
-		);
-		$this->export_entities_array[$r] = array(
-			's.rowid'=>"company", 's.nom'=>'company', 's.code_client'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 's.phone'=>'company',
-			's.siren'=>'company', 's.siret'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.code_compta'=>'company', 's.code_compta_fournisseur'=>'company',
-			's.tva_intra'=>'company', 'pj.ref'=>'project', 'p.rowid'=>'payment', 'p.ref'=>'payment', 'p.amount'=>'payment', 'pf.amount'=>'payment', 'p.datep'=>'payment',
-			'p.num_paiement'=>'payment', 'pt.code'=>'payment', 'pt.libelle'=>'payment', 'p.note'=>'payment', 'f.fk_user_author'=>'user', 'uc.login'=>'user',
-			'f.fk_user_valid'=>'user', 'uv.login'=>'user', 'p.fk_bank'=>'account', 'ba.ref'=>'account'
-		);
-		$this->export_special_array[$r] = array('none.rest'=>'getRemainToPay');
-		$this->export_dependencies_array[$r] = array('payment'=>'p.rowid', 'none.rest'=>array('f.rowid', 'f.total_ttc')); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		$keyforselect = 'facture'; $keyforelement = 'invoice'; $keyforaliasextra = 'extra';
-		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c on s.fk_pays = c.rowid,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture as f';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON f.fk_projet = pj.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON f.fk_user_author = uc.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON f.fk_user_valid = uv.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_extrafields as extra ON f.rowid = extra.fk_object';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement as p ON pf.fk_paiement = p.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as pt ON pt.id = p.fk_paiement';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON b.rowid = p.fk_bank';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON ba.rowid = b.fk_account';
-		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('invoice').')';
-		if (isset($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
-		$r++;
-	}
-
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
+        $r++;
+        $this->rights[$r][0] = 16;
+        $this->rights[$r][1] = 'Issue payments on invoices';
+        $this->rights[$r][2] = 'a';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'paiement';
+
+        $r++;
+        $this->rights[$r][0] = 19;
+        $this->rights[$r][1] = 'Delete invoices';
+        $this->rights[$r][2] = 'a';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'supprimer';
+
+        $r++;
+        $this->rights[$r][0] = 1321;
+        $this->rights[$r][1] = 'Export customer invoices, attributes and payments';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'facture';
+        $this->rights[$r][5] = 'export';
+
+        $r++;
+        $this->rights[$r][0] = 1322;
+        $this->rights[$r][1] = 'Re-open a fully paid invoice';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'invoice_advance';
+        $this->rights[$r][5] = 'reopen';
+
+
+        // Menus
+        //-------
+        $this->menu = 1; // This module add menu entries. They are coded into menu manager.
+
+
+        // Exports
+        //--------
+        $r = 1;
+
+        $this->export_code[$r] = $this->rights_class.'_'.$r;
+        $this->export_label[$r] = 'CustomersInvoicesAndInvoiceLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
+        $this->export_icon[$r] = 'invoice';
+        $this->export_permission[$r] = array(array("facture", "facture", "export", "other"));
+        $this->export_fields_array[$r] = array(
+            's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 's.phone'=>'Phone',
+            's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.code_compta'=>'CustomerAccountancyCode',
+            's.code_compta_fournisseur'=>'SupplierAccountancyCode', 's.tva_intra'=>'VATIntra',
+            'f.rowid'=>"InvoiceId", 'f.ref'=>"InvoiceRef", 'f.ref_client'=>'RefCustomer',
+            'f.type'=>"Type", 'f.datec'=>"InvoiceDateCreation", 'f.datef'=>"DateInvoice", 'f.date_lim_reglement'=>"DateDue", 'f.total'=>"TotalHT",
+            'f.total_ttc'=>"TotalTTC", 'f.tva'=>"TotalVAT", 'none.rest'=>'Rest', 'f.paye'=>"InvoicePaid", 'f.fk_statut'=>'InvoiceStatus',
+            'f.note_private'=>"NotePrivate", 'f.note_public'=>"NotePublic", 'f.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin',
+            'f.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin', 'pj.ref'=>'ProjectRef', 'fd.rowid'=>'LineId', 'fd.description'=>"LineDescription",
+            'fd.subprice'=>"LineUnitPrice", 'fd.tva_tx'=>"LineVATRate", 'fd.qty'=>"LineQty", 'fd.total_ht'=>"LineTotalHT", 'fd.total_tva'=>"LineTotalVAT",
+            'fd.total_ttc'=>"LineTotalTTC", 'fd.date_start'=>"DateStart", 'fd.date_end'=>"DateEnd", 'fd.special_code'=>'SpecialCode',
+            'fd.product_type'=>"TypeOfLineServiceOrProduct", 'fd.fk_product'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel',
+            'p.accountancy_code_sell'=>'ProductAccountancySellCode'
+        );
+        $this->export_TypeFields_array[$r] = array(
+            's.rowid'=>'Numeric', 's.nom'=>'Text', 's.code_client'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text',
+            's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text',
+            'f.rowid'=>'Numeric', 'f.ref'=>"Text", 'f.ref_client'=>'Text', 'f.type'=>"Numeric", 'f.datec'=>"Date", 'f.datef'=>"Date", 'f.date_lim_reglement'=>"Date",
+            'f.total'=>"Numeric", 'f.total_ttc'=>"Numeric", 'f.tva'=>"Numeric", 'none.rest'=>"NumericCompute", 'f.paye'=>"Boolean", 'f.fk_statut'=>'Numeric',
+            'f.note_private'=>"Text", 'f.note_public'=>"Text", 'f.fk_user_author'=>'Numeric', 'uc.login'=>'Text', 'f.fk_user_valid'=>'Numeric', 'uv.login'=>'Text',
+            'pj.ref'=>'Text', 'fd.rowid'=>'Numeric', 'fd.label'=>'Text', 'fd.description'=>"Text", 'fd.subprice'=>"Numeric", 'fd.tva_tx'=>"Numeric",
+            'fd.qty'=>"Numeric", 'fd.total_ht'=>"Numeric", 'fd.total_tva'=>"Numeric", 'fd.total_ttc'=>"Numeric", 'fd.date_start'=>"Date", 'fd.date_end'=>"Date",
+            'fd.special_code'=>'Numeric', 'fd.product_type'=>"Numeric", 'fd.fk_product'=>'List:product:label', 'p.ref'=>'Text', 'p.label'=>'Text',
+            'p.accountancy_code_sell'=>'Text'
+        );
+        $this->export_entities_array[$r] = array(
+            's.rowid'=>"company", 's.nom'=>'company', 's.code_client'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 's.phone'=>'company',
+            's.siren'=>'company', 's.siret'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.code_compta'=>'company', 's.code_compta_fournisseur'=>'company',
+            's.tva_intra'=>'company', 'pj.ref'=>'project', 'fd.rowid'=>'invoice_line', 'fd.label'=>"invoice_line", 'fd.description'=>"invoice_line",
+            'fd.subprice'=>"invoice_line", 'fd.total_ht'=>"invoice_line", 'fd.total_tva'=>"invoice_line", 'fd.total_ttc'=>"invoice_line", 'fd.tva_tx'=>"invoice_line",
+            'fd.qty'=>"invoice_line", 'fd.date_start'=>"invoice_line", 'fd.date_end'=>"invoice_line", 'fd.special_code'=>'invoice_line',
+            'fd.product_type'=>'invoice_line', 'fd.fk_product'=>'product', 'p.ref'=>'product', 'p.label'=>'product', 'p.accountancy_code_sell'=>'product',
+            'f.fk_user_author'=>'user', 'uc.login'=>'user', 'f.fk_user_valid'=>'user', 'uv.login'=>'user'
+        );
+        $this->export_special_array[$r] = array('none.rest'=>'getRemainToPay');
+        $this->export_dependencies_array[$r] = array('invoice_line'=>'fd.rowid', 'product'=>'fd.rowid', 'none.rest'=>array('f.rowid', 'f.total_ttc')); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+        $keyforselect = 'facture'; $keyforelement = 'invoice'; $keyforaliasextra = 'extra';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+        $keyforselect = 'facturedet'; $keyforelement = 'invoice_line'; $keyforaliasextra = 'extra2';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+        $keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra3';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+        $this->export_sql_start[$r] = 'SELECT DISTINCT ';
+        $this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
+        if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c on s.fk_pays = c.rowid,';
+        $this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'facture as f';
+        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON f.fk_projet = pj.rowid';
+        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON f.fk_user_author = uc.rowid';
+        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON f.fk_user_valid = uv.rowid';
+        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_extrafields as extra ON f.rowid = extra.fk_object';
+        $this->export_sql_end[$r] .= ' , '.MAIN_DB_PREFIX.'facturedet as fd';
+        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet_extrafields as extra2 on fd.rowid = extra2.fk_object';
+        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
+        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
+        $this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
+        $this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('invoice').')';
+        if (isset($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+        $r++;
+
+        $this->export_code[$r] = $this->rights_class.'_'.$r;
+        $this->export_label[$r] = 'CustomersInvoicesAndPayments'; // Translation key (used only if key ExportDataset_xxx_z not found)
+        $this->export_icon[$r] = 'invoice';
+        $this->export_permission[$r] = array(array("facture", "facture", "export"));
+        $this->export_fields_array[$r] = array(
+            's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 's.phone'=>'Phone',
+            's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.code_compta'=>'CustomerAccountancyCode',
+            's.code_compta_fournisseur'=>'SupplierAccountancyCode', 's.tva_intra'=>'VATIntra',
+            'f.rowid'=>"InvoiceId", 'f.ref'=>"InvoiceRef",  'f.ref_client'=>'RefCustomer',
+            'f.type'=>"Type", 'f.datec'=>"InvoiceDateCreation", 'f.datef'=>"DateInvoice", 'f.date_lim_reglement'=>"DateDue", 'f.total'=>"TotalHT",
+            'f.total_ttc'=>"TotalTTC", 'f.tva'=>"TotalVAT", 'none.rest'=>'Rest', 'f.paye'=>"InvoicePaid", 'f.fk_statut'=>'InvoiceStatus',
+            'f.note_private'=>"NotePrivate", 'f.note_public'=>"NotePublic", 'f.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin',
+            'f.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin', 'pj.ref'=>'ProjectRef', 'p.rowid'=>'PaymentId', 'p.ref'=>'PaymentRef',
+            'p.amount'=>'AmountPayment', 'pf.amount'=>'AmountPaymentDistributedOnInvoice', 'p.datep'=>'DatePayment', 'p.num_paiement'=>'PaymentNumber',
+            'pt.code'=>'CodePaymentMode', 'pt.libelle'=>'LabelPaymentMode', 'p.note'=>'PaymentNote', 'p.fk_bank'=>'IdTransaction', 'ba.ref'=>'AccountRef'
+        );
+        $this->export_TypeFields_array[$r] = array(
+            's.rowid'=>'Numeric', 's.nom'=>'Text', 's.code_client'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text',
+            's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text',
+            'f.rowid'=>"Numeric", 'f.ref'=>"Text", 'f.ref_client'=>'Text', 'f.type'=>"Numeric", 'f.datec'=>"Date", 'f.datef'=>"Date", 'f.date_lim_reglement'=>"Date",
+            'f.total'=>"Numeric", 'f.total_ttc'=>"Numeric", 'f.tva'=>"Numeric", 'none.rest'=>'NumericCompute', 'f.paye'=>"Boolean", 'f.fk_statut'=>'Status',
+            'f.note_private'=>"Text", 'f.note_public'=>"Text", 'f.fk_user_author'=>'Numeric', 'uc.login'=>'Text', 'f.fk_user_valid'=>'Numeric', 'uv.login'=>'Text',
+            'pj.ref'=>'Text', 'p.amount'=>'Numeric', 'pf.amount'=>'Numeric', 'p.rowid'=>'Numeric', 'p.ref'=>'Text', 'p.datep'=>'Date', 'p.num_paiement'=>'Numeric',
+            'p.fk_bank'=>'Numeric', 'p.note'=>'Text', 'pt.code'=>'Text', 'pt.libelle'=>'text', 'ba.ref'=>'Text'
+        );
+        $this->export_entities_array[$r] = array(
+            's.rowid'=>"company", 's.nom'=>'company', 's.code_client'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 's.phone'=>'company',
+            's.siren'=>'company', 's.siret'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.code_compta'=>'company', 's.code_compta_fournisseur'=>'company',
+            's.tva_intra'=>'company', 'pj.ref'=>'project', 'p.rowid'=>'payment', 'p.ref'=>'payment', 'p.amount'=>'payment', 'pf.amount'=>'payment', 'p.datep'=>'payment',
+            'p.num_paiement'=>'payment', 'pt.code'=>'payment', 'pt.libelle'=>'payment', 'p.note'=>'payment', 'f.fk_user_author'=>'user', 'uc.login'=>'user',
+            'f.fk_user_valid'=>'user', 'uv.login'=>'user', 'p.fk_bank'=>'account', 'ba.ref'=>'account'
+        );
+        $this->export_special_array[$r] = array('none.rest'=>'getRemainToPay');
+        $this->export_dependencies_array[$r] = array('payment'=>'p.rowid', 'none.rest'=>array('f.rowid', 'f.total_ttc')); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+        $keyforselect = 'facture'; $keyforelement = 'invoice'; $keyforaliasextra = 'extra';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
+        if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c on s.fk_pays = c.rowid,';
+        $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture as f';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON f.fk_projet = pj.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON f.fk_user_author = uc.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON f.fk_user_valid = uv.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_extrafields as extra ON f.rowid = extra.fk_object';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement as p ON pf.fk_paiement = p.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as pt ON pt.id = p.fk_paiement';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON b.rowid = p.fk_bank';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON ba.rowid = b.fk_account';
+        $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
+        $this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('invoice').')';
+        if (isset($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+        $r++;
+    }
+
+
+    /**
+     *		Function called when module is enabled.
+     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *		It also creates data directories
+     *
      *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options = '')
-	{
-		global $conf, $langs;
-
-		// Remove permissions and default values
-		$this->remove($options);
-
-		//ODT template
-		$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/invoices/template_invoice.odt';
-		$dirodt = DOL_DATA_ROOT.'/doctemplates/invoices';
-		$dest = $dirodt.'/template_invoice.odt';
-
-		if (file_exists($src) && !file_exists($dest))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			dol_mkdir($dirodt);
-			$result = dol_copy($src, $dest, 0, 0);
-			if ($result < 0)
-			{
-				$langs->load("errors");
-				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
-				return 0;
-			}
-		}
-
-		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[1][2])."' AND type = 'invoice' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[1][2])."','invoice',".$conf->entity.")"
-		);
-
-		return $this->_init($sql, $options);
-	}
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options = '')
+    {
+        global $conf, $langs;
+
+        // Remove permissions and default values
+        $this->remove($options);
+
+        //ODT template
+        $src = DOL_DOCUMENT_ROOT.'/install/doctemplates/invoices/template_invoice.odt';
+        $dirodt = DOL_DATA_ROOT.'/doctemplates/invoices';
+        $dest = $dirodt.'/template_invoice.odt';
+
+        if (file_exists($src) && !file_exists($dest))
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+            dol_mkdir($dirodt);
+            $result = dol_copy($src, $dest, 0, 0);
+            if ($result < 0)
+            {
+                $langs->load("errors");
+                $this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
+                return 0;
+            }
+        }
+
+        $sql = array(
+                "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[1][2])."' AND type = 'invoice' AND entity = ".$conf->entity,
+                "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[1][2])."','invoice',".$conf->entity.")"
+        );
+
+        return $this->_init($sql, $options);
+    }
 }

Spacing +20 added lines, -20 removed lines

@@ -115,8 +115,8 @@ 
 		);
 
 		// Cronjobs
-		$arraydate=dol_getdate(dol_now());
-		$datestart=dol_mktime(23, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
+		$arraydate = dol_getdate(dol_now());
+		$datestart = dol_mktime(23, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
 		$this->cronjobs = array(
 			0=>array('label'=>'RecurringInvoices', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture-rec.class.php', 'objectname'=>'FactureRec', 'method'=>'createRecurringInvoices', 'parameters'=>'', 'comment'=>'Generate recurring invoices', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>1, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
 		);
@@ -277,7 +277,7 @@ 
 			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 's.phone'=>'Phone',
 			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.code_compta'=>'CustomerAccountancyCode',
 			's.code_compta_fournisseur'=>'SupplierAccountancyCode', 's.tva_intra'=>'VATIntra',
-			'f.rowid'=>"InvoiceId", 'f.ref'=>"InvoiceRef",  'f.ref_client'=>'RefCustomer',
+			'f.rowid'=>"InvoiceId", 'f.ref'=>"InvoiceRef", 'f.ref_client'=>'RefCustomer',
 			'f.type'=>"Type", 'f.datec'=>"InvoiceDateCreation", 'f.datef'=>"DateInvoice", 'f.date_lim_reglement'=>"DateDue", 'f.total'=>"TotalHT",
 			'f.total_ttc'=>"TotalTTC", 'f.tva'=>"TotalVAT", 'none.rest'=>'Rest', 'f.paye'=>"InvoicePaid", 'f.fk_statut'=>'InvoiceStatus',
 			'f.note_private'=>"NotePrivate", 'f.note_public'=>"NotePublic", 'f.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin',
@@ -305,23 +305,23 @@ 
 		$this->export_dependencies_array[$r] = array('payment'=>'p.rowid', 'none.rest'=>array('f.rowid', 'f.total_ttc')); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		$keyforselect = 'facture'; $keyforelement = 'invoice'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c on s.fk_pays = c.rowid,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture as f';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON f.fk_projet = pj.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON f.fk_user_author = uc.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON f.fk_user_valid = uv.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_extrafields as extra ON f.rowid = extra.fk_object';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement as p ON pf.fk_paiement = p.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as pt ON pt.id = p.fk_paiement';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON b.rowid = p.fk_bank';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON ba.rowid = b.fk_account';
-		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('invoice').')';
-		if (isset($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c on s.fk_pays = c.rowid,';
+		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'facture as f';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON f.fk_projet = pj.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON f.fk_user_author = uc.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON f.fk_user_valid = uv.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_extrafields as extra ON f.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement as p ON pf.fk_paiement = p.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as pt ON pt.id = p.fk_paiement';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON b.rowid = p.fk_bank';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON ba.rowid = b.fk_account';
+		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid';
+		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('invoice').')';
+		if (isset($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
 		$r++;
 	}
 

Braces +12 added lines, -4 removed lines

@@ -253,7 +253,9 @@ 
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) {
+		    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c on s.fk_pays = c.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'facture as f';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON f.fk_projet = pj.rowid';
@@ -266,7 +268,9 @@ 
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
 		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('invoice').')';
-		if (isset($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		if (isset($user) && empty($user->rights->societe->client->voir)) {
+		    $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		}
 		$r++;
 
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -307,7 +311,9 @@ 
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) {
+		    $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c on s.fk_pays = c.rowid,';
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture as f';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON f.fk_projet = pj.rowid';
@@ -321,7 +327,9 @@ 
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON ba.rowid = b.fk_account';
 		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('invoice').')';
-		if (isset($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+		if (isset($user) && empty($user->rights->societe->client->voir)) {
+		    $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+		}
 		$r++;
 	}
 

dolibarr/htdocs/core/modules/oauth/stripetest_oauthcallback.php

Indentation +6 added lines, -6 removed lines

@@ -66,7 +66,7 @@ 
 // Setup the credentials for the requests
 $credentials = new Credentials(
     $conf->global->OAUTH_STRIPE_TEST_ID,
-	$conf->global->STRIPE_TEST_SECRET_KEY,
+    $conf->global->STRIPE_TEST_SECRET_KEY,
     $currentUri->getAbsoluteUri()
 );
 
@@ -109,10 +109,10 @@ 
 
 if (! empty($_GET['code']))     // We are coming from oauth provider page
 {
-	// We should have
-	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
+    // We should have
+    //$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
 
-	dol_syslog("We are coming from the oauth provider page");
+    dol_syslog("We are coming from the oauth provider page");
     //llxHeader('',$langs->trans("OAuthSetup"));
 
     //$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
@@ -160,8 +160,8 @@ 
     else
     {
         //$url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
-    	//https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_AX27ut70tJ1j6eyFCV3ObEXhNOo2jY6V&scope=read_write
-    	$url = 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id='.$conf->global->OAUTH_STRIPE_TEST_ID.'&scope=read_write';
+        //https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_AX27ut70tJ1j6eyFCV3ObEXhNOo2jY6V&scope=read_write
+        $url = 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id='.$conf->global->OAUTH_STRIPE_TEST_ID.'&scope=read_write';
     }
 
     // we go on oauth provider authorization page

Braces +9 added lines, -6 removed lines

@@ -71,7 +71,10 @@ 
 );
 
 $requestedpermissionsarray=array();
-if (GETPOST('state')) $requestedpermissionsarray=explode(',', GETPOST('state'));       // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
+if (GETPOST('state')) {
+    $requestedpermissionsarray=explode(',', GETPOST('state'));
+}
+// Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
 /*if ($action != 'delete' && empty($requestedpermissionsarray))
 {
     print 'Error, parameter state is not defined';
@@ -107,12 +110,14 @@ 
     exit();
 }
 
-if (! empty($_GET['code']))     // We are coming from oauth provider page
+if (! empty($_GET['code'])) {
+    // We are coming from oauth provider page
 {
 	// We should have
 	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
 
 	dol_syslog("We are coming from the oauth provider page");
+}
     //llxHeader('',$langs->trans("OAuthSetup"));
 
     //$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
@@ -146,8 +151,7 @@ 
     } catch (Exception $e) {
         print $e->getMessage();
     }
-}
-else // If entry on page with no parameter, we arrive here
+} else // If entry on page with no parameter, we arrive here
 {
     $_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl;
 
@@ -156,8 +160,7 @@ 
     if (GETPOST('state'))
     {
         $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-    }
-    else
+    } else
     {
         //$url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
     	//https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_AX27ut70tJ1j6eyFCV3ObEXhNOo2jY6V&scope=read_write

Spacing +12 added lines, -12 removed lines

@@ -25,15 +25,15 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
 use OAuth\Common\Storage\DoliStorage;
 use OAuth\Common\Consumer\Credentials;
 use OAuth\OAuth2\Service\GitHub;
 
 // Define $urlwithroot
-$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 
@@ -73,8 +73,8 @@ 
     $currentUri->getAbsoluteUri()
 );
 
-$requestedpermissionsarray=array();
-if (GETPOST('state')) $requestedpermissionsarray=explode(',', GETPOST('state'));       // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
+$requestedpermissionsarray = array();
+if (GETPOST('state')) $requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
 /*if ($action != 'delete' && empty($requestedpermissionsarray))
 {
     print 'Error, parameter state is not defined';
@@ -86,7 +86,7 @@ 
 /** @var $apiService Service */
 //$apiService = $serviceFactory->createService('StripeTest', $credentials, $storage, $requestedpermissionsarray);
 
-$sql="INSERT INTO ".MAIN_DB_PREFIX."oauth_token set service='StripeTest', entity=".$conf->entity;
+$sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_token set service='StripeTest', entity=".$conf->entity;
 $db->query($sql);
 
 // access type needed to have oauth provider refreshing token
@@ -106,11 +106,11 @@ 
 
     setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
 
-    header('Location: ' . $backtourl);
+    header('Location: '.$backtourl);
     exit();
 }
 
-if (! empty($_GET['code']))     // We are coming from oauth provider page
+if (!empty($_GET['code']))     // We are coming from oauth provider page
 {
 	// We should have
 	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
@@ -139,12 +139,12 @@ 
         // parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri)
         // has not the ending parameter to true like the Google class constructor.
 
-        setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');   // Stored into object managed by class DoliStorage so into table oauth_token
+        setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
 
         $backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
         unset($_SESSION["backtourlsavedbeforeoauthjump"]);
 
-        header('Location: ' . $backtourl);
+        header('Location: '.$backtourl);
         exit();
     } catch (Exception $e) {
         print $e->getMessage();
@@ -152,7 +152,7 @@ 
 }
 else // If entry on page with no parameter, we arrive here
 {
-    $_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl;
+    $_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
     // This may create record into oauth_state before the header redirect.
     // Creation of record with state in this tables depend on the Provider used (see its constructor).
@@ -168,7 +168,7 @@ 
     }
 
     // we go on oauth provider authorization page
-    header('Location: ' . $url);
+    header('Location: '.$url);
     exit();
 }
 

dolibarr/htdocs/core/modules/oauth/google_oauthcallback.php

Indentation +2 added lines, -2 removed lines

@@ -109,8 +109,8 @@
 
 if (! empty($_GET['code']))     // We are coming from oauth provider page
 {
-	dol_syslog("We are coming from the oauth provider page");
-	//llxHeader('',$langs->trans("OAuthSetup"));
+    dol_syslog("We are coming from the oauth provider page");
+    //llxHeader('',$langs->trans("OAuthSetup"));
 
     //$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
     //print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');

Braces +9 added lines, -6 removed lines

@@ -71,7 +71,10 @@ 
 );
 
 $requestedpermissionsarray=array();
-if (GETPOST('state')) $requestedpermissionsarray=explode(',', GETPOST('state'));       // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
+if (GETPOST('state')) {
+    $requestedpermissionsarray=explode(',', GETPOST('state'));
+}
+// Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
 if ($action != 'delete' && empty($requestedpermissionsarray))
 {
     print 'Error, parameter state is not defined';
@@ -107,9 +110,11 @@ 
     exit();
 }
 
-if (! empty($_GET['code']))     // We are coming from oauth provider page
+if (! empty($_GET['code'])) {
+    // We are coming from oauth provider page
 {
 	dol_syslog("We are coming from the oauth provider page");
+}
 	//llxHeader('',$langs->trans("OAuthSetup"));
 
     //$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
@@ -138,8 +143,7 @@ 
     } catch (Exception $e) {
         print $e->getMessage();
     }
-}
-else // If entry on page with no parameter, we arrive here
+} else // If entry on page with no parameter, we arrive here
 {
     $_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl;
 
@@ -148,8 +152,7 @@ 
     if (GETPOST('state'))
     {
         $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-    }
-    else
+    } else
     {
         $url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
     }

Spacing +12 added lines, -12 removed lines

@@ -25,15 +25,15 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
 use OAuth\Common\Storage\DoliStorage;
 use OAuth\Common\Consumer\Credentials;
 use OAuth\OAuth2\Service\Google;
 
 // Define $urlwithroot
-$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 
@@ -73,8 +73,8 @@ 
     $currentUri->getAbsoluteUri()
 );
 
-$requestedpermissionsarray=array();
-if (GETPOST('state')) $requestedpermissionsarray=explode(',', GETPOST('state'));       // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
+$requestedpermissionsarray = array();
+if (GETPOST('state')) $requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
 if ($action != 'delete' && empty($requestedpermissionsarray))
 {
     print 'Error, parameter state is not defined';
@@ -106,11 +106,11 @@ 
 
     setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
 
-    header('Location: ' . $backtourl);
+    header('Location: '.$backtourl);
     exit();
 }
 
-if (! empty($_GET['code']))     // We are coming from oauth provider page
+if (!empty($_GET['code']))     // We are coming from oauth provider page
 {
 	dol_syslog("We are coming from the oauth provider page");
 	//llxHeader('',$langs->trans("OAuthSetup"));
@@ -131,12 +131,12 @@ 
 
         $token = $apiService->requestAccessToken($_GET['code'], $state);
 
-        setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');   // Stored into object managed by class DoliStorage so into table oauth_token
+        setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
 
         $backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
         unset($_SESSION["backtourlsavedbeforeoauthjump"]);
 
-        header('Location: ' . $backtourl);
+        header('Location: '.$backtourl);
         exit();
     } catch (Exception $e) {
         print $e->getMessage();
@@ -144,7 +144,7 @@ 
 }
 else // If entry on page with no parameter, we arrive here
 {
-    $_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl;
+    $_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
     // This may create record into oauth_state before the header redirect.
     // Creation of record with state in this tables depend on the Provider used (see its constructor).
@@ -154,11 +154,11 @@ 
     }
     else
     {
-        $url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
+        $url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
     }
 
     // we go on oauth provider authorization page
-    header('Location: ' . $url);
+    header('Location: '.$url);
     exit();
 }
 

dolibarr/htdocs/core/modules/oauth/github_oauthcallback.php

Indentation +3 added lines, -3 removed lines

@@ -106,10 +106,10 @@
 
 if (! empty($_GET['code']))     // We are coming from oauth provider page
 {
-	// We should have
-	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
+    // We should have
+    //$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
 
-	dol_syslog("We are coming from the oauth provider page");
+    dol_syslog("We are coming from the oauth provider page");
     //llxHeader('',$langs->trans("OAuthSetup"));
 
     //$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';

Braces +9 added lines, -6 removed lines

@@ -71,7 +71,10 @@ 
 );
 
 $requestedpermissionsarray=array();
-if (GETPOST('state')) $requestedpermissionsarray=explode(',', GETPOST('state'));       // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
+if (GETPOST('state')) {
+    $requestedpermissionsarray=explode(',', GETPOST('state'));
+}
+// Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
 if ($action != 'delete' && empty($requestedpermissionsarray))
 {
     print 'Error, parameter state is not defined';
@@ -104,12 +107,14 @@ 
     exit();
 }
 
-if (! empty($_GET['code']))     // We are coming from oauth provider page
+if (! empty($_GET['code'])) {
+    // We are coming from oauth provider page
 {
 	// We should have
 	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
 
 	dol_syslog("We are coming from the oauth provider page");
+}
     //llxHeader('',$langs->trans("OAuthSetup"));
 
     //$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
@@ -143,8 +148,7 @@ 
     } catch (Exception $e) {
         print $e->getMessage();
     }
-}
-else // If entry on page with no parameter, we arrive here
+} else // If entry on page with no parameter, we arrive here
 {
     $_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl;
 
@@ -153,8 +157,7 @@ 
     if (GETPOST('state'))
     {
         $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-    }
-    else
+    } else
     {
         $url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
     }

Spacing +12 added lines, -12 removed lines

@@ -25,15 +25,15 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
 use OAuth\Common\Storage\DoliStorage;
 use OAuth\Common\Consumer\Credentials;
 use OAuth\OAuth2\Service\GitHub;
 
 // Define $urlwithroot
-$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 
@@ -73,8 +73,8 @@ 
     $currentUri->getAbsoluteUri()
 );
 
-$requestedpermissionsarray=array();
-if (GETPOST('state')) $requestedpermissionsarray=explode(',', GETPOST('state'));       // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
+$requestedpermissionsarray = array();
+if (GETPOST('state')) $requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
 if ($action != 'delete' && empty($requestedpermissionsarray))
 {
     print 'Error, parameter state is not defined';
@@ -103,11 +103,11 @@ 
 
     setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
 
-    header('Location: ' . $backtourl);
+    header('Location: '.$backtourl);
     exit();
 }
 
-if (! empty($_GET['code']))     // We are coming from oauth provider page
+if (!empty($_GET['code']))     // We are coming from oauth provider page
 {
 	// We should have
 	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
@@ -136,12 +136,12 @@ 
         // parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri)
         // has not the ending parameter to true like the Google class constructor.
 
-        setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');   // Stored into object managed by class DoliStorage so into table oauth_token
+        setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
 
         $backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
         unset($_SESSION["backtourlsavedbeforeoauthjump"]);
 
-        header('Location: ' . $backtourl);
+        header('Location: '.$backtourl);
         exit();
     } catch (Exception $e) {
         print $e->getMessage();
@@ -149,7 +149,7 @@ 
 }
 else // If entry on page with no parameter, we arrive here
 {
-    $_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl;
+    $_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
     // This may create record into oauth_state before the header redirect.
     // Creation of record with state in this tables depend on the Provider used (see its constructor).
@@ -159,11 +159,11 @@ 
     }
     else
     {
-        $url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
+        $url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
     }
 
     // we go on oauth provider authorization page
-    header('Location: ' . $url);
+    header('Location: '.$url);
     exit();
 }
 

dolibarr/htdocs/core/modules/printing/modules_printing.php

Indentation +4 added lines, -4 removed lines

@@ -37,9 +37,9 @@ 
     public $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     /**
@@ -58,7 +58,7 @@ 
      *  @param  DoliDB  $db                 Database handler
      *  @param  integer  $maxfilenamelength  Max length of value to show
      *  @return array                       List of drivers
-    */
+     */
     static function listDrivers($db,$maxfilenamelength=0)
     {
         global $conf;

Spacing +7 added lines, -7 removed lines

@@ -39,7 +39,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     /**
@@ -59,17 +59,17 @@ 
      *  @param  integer  $maxfilenamelength  Max length of value to show
      *  @return array                       List of drivers
     */
-    static function listDrivers($db,$maxfilenamelength=0)
+    static function listDrivers($db, $maxfilenamelength = 0)
     {
         global $conf;
 
         $type = 'printing';
         $list = array();
 
-        $moduledir=DOL_DOCUMENT_ROOT."/core/modules/printing/";
-        $tmpfiles=dol_dir_list($moduledir,'all',0,'\modules.php','','name',SORT_ASC,0);
-        foreach($tmpfiles as $record) {
-            $list[$record['fullname']]=str_replace('.modules.php', '',$record['name']);
+        $moduledir = DOL_DOCUMENT_ROOT."/core/modules/printing/";
+        $tmpfiles = dol_dir_list($moduledir, 'all', 0, '\modules.php', '', 'name', SORT_ASC, 0);
+        foreach ($tmpfiles as $record) {
+            $list[$record['fullname']] = str_replace('.modules.php', '', $record['name']);
         }
 
         return $list;
@@ -84,7 +84,7 @@ 
     {
         global $langs;
         $langs->load("printing");
-        $transstring="PrintingModuleDesc".$this->name;
+        $transstring = "PrintingModuleDesc".$this->name;
         if ($langs->trans($transstring) != $transstring) return $langs->trans($transstring);
         else return $this->desc;
     }

Braces +5 added lines, -2 removed lines

@@ -85,7 +85,10 @@
         global $langs;
         $langs->load("printing");
         $transstring="PrintingModuleDesc".$this->name;
-        if ($langs->trans($transstring) != $transstring) return $langs->trans($transstring);
-        else return $this->desc;
+        if ($langs->trans($transstring) != $transstring) {
+            return $langs->trans($transstring);
+        } else {
+            return $this->desc;
+        }
     }
 }

dolibarr/htdocs/core/modules/printing/printgcp.modules.php

Indentation +41 added lines, -41 removed lines

@@ -89,47 +89,47 @@
             );
         } else {
 
-        	$this->google_id = $conf->global->OAUTH_GOOGLE_ID;
-        	$this->google_secret = $conf->global->OAUTH_GOOGLE_SECRET;
-        	// Token storage
-        	$storage = new DoliStorage($this->db, $this->conf);
-        	//$storage->clearToken($this->OAUTH_SERVICENAME_GOOGLE);
-        	// Setup the credentials for the requests
-        	$credentials = new Credentials(
-            	$this->google_id,
-            	$this->google_secret,
-            	$urlwithroot.'/core/modules/oauth/google_oauthcallback.php'
-        	);
-        	$access = ($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE)?'HasAccessToken':'NoAccessToken');
-        	$serviceFactory = new \OAuth\ServiceFactory();
-        	$apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
-        	$token_ok=true;
-        	try {
-            	$token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
-        	} catch (Exception $e) {
-            	$this->errors[] = $e->getMessage();
-            	$token_ok = false;
-        	}
-        	//var_dump($this->errors);exit;
-
-        	$expire = false;
-        	// Is token expired or will token expire in the next 30 seconds
-        	if ($token_ok) {
-            	$expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
-        	}
-
-        	// Token expired so we refresh it
-        	if ($token_ok && $expire) {
-            	try {
-                	// il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
-                	$refreshtoken = $token->getRefreshToken();
-                	$token = $apiService->refreshAccessToken($token);
-                	$token->setRefreshToken($refreshtoken);
-                	$storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
-            	} catch (Exception $e) {
-                	$this->errors[] = $e->getMessage();
-            	}
-        	}
+            $this->google_id = $conf->global->OAUTH_GOOGLE_ID;
+            $this->google_secret = $conf->global->OAUTH_GOOGLE_SECRET;
+            // Token storage
+            $storage = new DoliStorage($this->db, $this->conf);
+            //$storage->clearToken($this->OAUTH_SERVICENAME_GOOGLE);
+            // Setup the credentials for the requests
+            $credentials = new Credentials(
+                $this->google_id,
+                $this->google_secret,
+                $urlwithroot.'/core/modules/oauth/google_oauthcallback.php'
+            );
+            $access = ($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE)?'HasAccessToken':'NoAccessToken');
+            $serviceFactory = new \OAuth\ServiceFactory();
+            $apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
+            $token_ok=true;
+            try {
+                $token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
+            } catch (Exception $e) {
+                $this->errors[] = $e->getMessage();
+                $token_ok = false;
+            }
+            //var_dump($this->errors);exit;
+
+            $expire = false;
+            // Is token expired or will token expire in the next 30 seconds
+            if ($token_ok) {
+                $expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
+            }
+
+            // Token expired so we refresh it
+            if ($token_ok && $expire) {
+                try {
+                    // il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
+                    $refreshtoken = $token->getRefreshToken();
+                    $token = $apiService->refreshAccessToken($token);
+                    $token->setRefreshToken($refreshtoken);
+                    $storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
+                } catch (Exception $e) {
+                    $this->errors[] = $e->getMessage();
+                }
+            }
             if ($this->google_id != '' && $this->google_secret != '') {
                 $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthConfigured', 'type'=>'info');
                 $this->conf[] = array(

Spacing +49 added lines, -49 removed lines

@@ -75,8 +75,8 @@ 
         global $conf, $langs, $dolibarr_main_url_root;
 
         // Define $urlwithroot
-        $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-        $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+        $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+        $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
         //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
         $this->db = $db;
@@ -100,10 +100,10 @@ 
             	$this->google_secret,
             	$urlwithroot.'/core/modules/oauth/google_oauthcallback.php'
         	);
-        	$access = ($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE)?'HasAccessToken':'NoAccessToken');
+        	$access = ($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE) ? 'HasAccessToken' : 'NoAccessToken');
         	$serviceFactory = new \OAuth\ServiceFactory();
         	$apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
-        	$token_ok=true;
+        	$token_ok = true;
         	try {
             	$token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
         	} catch (Exception $e) {
@@ -137,10 +137,10 @@ 
                     'info'=>$access,
                     'type'=>'info',
                     'renew'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?state=userinfo_email,userinfo_profile,cloud_print&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'),
-                    'delete'=>($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE)?$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'):'')
+                    'delete'=>($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE) ? $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp') : '')
                 );
                 if ($token_ok) {
-                    $expiredat='';
+                    $expiredat = '';
 
                     $refreshtoken = $token->getRefreshToken();
 
@@ -156,11 +156,11 @@ 
                     }
                     else
                     {
-                        $expiredat=dol_print_date($endoflife, "dayhour");
+                        $expiredat = dol_print_date($endoflife, "dayhour");
                     }
 
-                    $this->conf[] = array('varname'=>'TOKEN_REFRESH',   'info'=>((! empty($refreshtoken))?'Yes':'No'), 'type'=>'info');
-                    $this->conf[] = array('varname'=>'TOKEN_EXPIRED',   'info'=>($expire?'Yes':'No'), 'type'=>'info');
+                    $this->conf[] = array('varname'=>'TOKEN_REFRESH', 'info'=>((!empty($refreshtoken)) ? 'Yes' : 'No'), 'type'=>'info');
+                    $this->conf[] = array('varname'=>'TOKEN_EXPIRED', 'info'=>($expire ? 'Yes' : 'No'), 'type'=>'info');
                     $this->conf[] = array('varname'=>'TOKEN_EXPIRE_AT', 'info'=>($expiredat), 'type'=>'info');
                 }
                 /*
@@ -190,37 +190,37 @@ 
         $langs->load('printing');
 
         $html = '<tr class="liste_titre">';
-        $html.= '<td>'.$langs->trans('GCP_Name').'</td>';
-        $html.= '<td>'.$langs->trans('GCP_displayName').'</td>';
-        $html.= '<td>'.$langs->trans('GCP_Id').'</td>';
-        $html.= '<td>'.$langs->trans('GCP_OwnerName').'</td>';
-        $html.= '<td>'.$langs->trans('GCP_State').'</td>';
-        $html.= '<td>'.$langs->trans('GCP_connectionStatus').'</td>';
-        $html.= '<td>'.$langs->trans('GCP_Type').'</td>';
-        $html.= '<td align="center">'.$langs->trans("Select").'</td>';
-        $html.= '</tr>'."\n";
+        $html .= '<td>'.$langs->trans('GCP_Name').'</td>';
+        $html .= '<td>'.$langs->trans('GCP_displayName').'</td>';
+        $html .= '<td>'.$langs->trans('GCP_Id').'</td>';
+        $html .= '<td>'.$langs->trans('GCP_OwnerName').'</td>';
+        $html .= '<td>'.$langs->trans('GCP_State').'</td>';
+        $html .= '<td>'.$langs->trans('GCP_connectionStatus').'</td>';
+        $html .= '<td>'.$langs->trans('GCP_Type').'</td>';
+        $html .= '<td align="center">'.$langs->trans("Select").'</td>';
+        $html .= '</tr>'."\n";
         $list = $this->getlistAvailablePrinters();
         //$html.= '<td><pre>'.print_r($list,true).'</pre></td>';
         foreach ($list['available'] as $printer_det)
         {
-            $html.= '<tr class="oddeven">';
-            $html.= '<td>'.$printer_det['name'].'</td>';
-            $html.= '<td>'.$printer_det['displayName'].'</td>';
-            $html.= '<td>'.$printer_det['id'].'</td>';  // id to identify printer to use
-            $html.= '<td>'.$printer_det['ownerName'].'</td>';
-            $html.= '<td>'.$printer_det['status'].'</td>';
-            $html.= '<td>'.$langs->trans('STATE_'.$printer_det['connectionStatus']).'</td>';
-            $html.= '<td>'.$langs->trans('TYPE_'.$printer_det['type']).'</td>';
+            $html .= '<tr class="oddeven">';
+            $html .= '<td>'.$printer_det['name'].'</td>';
+            $html .= '<td>'.$printer_det['displayName'].'</td>';
+            $html .= '<td>'.$printer_det['id'].'</td>'; // id to identify printer to use
+            $html .= '<td>'.$printer_det['ownerName'].'</td>';
+            $html .= '<td>'.$printer_det['status'].'</td>';
+            $html .= '<td>'.$langs->trans('STATE_'.$printer_det['connectionStatus']).'</td>';
+            $html .= '<td>'.$langs->trans('TYPE_'.$printer_det['type']).'</td>';
             // Defaut
-            $html.= '<td align="center">';
+            $html .= '<td align="center">';
             if ($conf->global->PRINTING_GCP_DEFAULT == $printer_det['id'])
             {
-                $html.= img_picto($langs->trans("Default"),'on');
+                $html .= img_picto($langs->trans("Default"), 'on');
             }
             else
-                $html.= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
-            $html.= '</td>';
-            $html.= '</tr>'."\n";
+                $html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+            $html .= '</td>';
+            $html .= '</tr>'."\n";
         }
         $this->resprint = $html;
         return $error;
@@ -245,7 +245,7 @@ 
         $serviceFactory = new \OAuth\ServiceFactory();
         $apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
         // Check if we have auth token
-        $token_ok=true;
+        $token_ok = true;
         try {
             $token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
         } catch (Exception $e) {
@@ -275,18 +275,18 @@ 
             $response = $apiService->request(self::PRINTERS_SEARCH_URL);
         } catch (Exception $e) {
             $this->errors[] = $e->getMessage();
-            print '<pre>'.print_r($e->getMessage(),true).'</pre>';
+            print '<pre>'.print_r($e->getMessage(), true).'</pre>';
         }
         //print '<tr><td><pre>'.print_r($response, true).'</pre></td></tr>';
         $responsedata = json_decode($response, true);
         $printers = $responsedata['printers'];
         // Check if we have printers?
-        if(count($printers)==0) {
+        if (count($printers) == 0) {
             // We dont have printers so return blank array
-            $ret['available'] =  array();
+            $ret['available'] = array();
         } else {
             // We have printers so returns printers as array
-            $ret['available'] =  $printers;
+            $ret['available'] = $printers;
         }
         return $ret;
     }
@@ -299,7 +299,7 @@ 
      * @param   string      $subdir     subdir for file
      * @return  int                     0 if OK, >0 if KO
      */
-    public function printFile($file, $module, $subdir='')
+    public function printFile($file, $module, $subdir = '')
     {
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -307,10 +307,10 @@ 
         $error = 0;
 
         $fileprint = $conf->{$module}->dir_output;
-        if ($subdir!='') {
-            $fileprint.='/'.$subdir;
+        if ($subdir != '') {
+            $fileprint .= '/'.$subdir;
         }
-        $fileprint.='/'.$file;
+        $fileprint .= '/'.$file;
         $mimetype = dol_mimetype($fileprint);
         // select printer uri for module order, propal,...
         $sql = "SELECT rowid, printer_id, copy FROM ".MAIN_DB_PREFIX."printing WHERE module='".$module."' AND driver='printgcp' AND userid=".$user->id;
@@ -324,9 +324,9 @@ 
             }
             else
             {
-                if (! empty($conf->global->PRINTING_GCP_DEFAULT))
+                if (!empty($conf->global->PRINTING_GCP_DEFAULT))
                 {
-                    $printer_id=$conf->global->PRINTING_GCP_DEFAULT;
+                    $printer_id = $conf->global->PRINTING_GCP_DEFAULT;
                 }
                 else
                 {
@@ -340,7 +340,7 @@ 
 
         $ret = $this->sendPrintToPrinter($printer_id, $file, $fileprint, $mimetype);
         $this->error = 'PRINTGCP: '.$ret['errormessage'];
-        if ($ret['status']!=1) {
+        if ($ret['status'] != 1) {
             $error++;
         }
         return $error;
@@ -358,13 +358,13 @@ 
     public function sendPrintToPrinter($printerid, $printjobtitle, $filepath, $contenttype)
     {
         // Check if printer id
-        if(empty($printerid)) {
-            return array('status' =>0, 'errorcode' =>'','errormessage'=>'No provided printer ID');
+        if (empty($printerid)) {
+            return array('status' =>0, 'errorcode' =>'', 'errormessage'=>'No provided printer ID');
         }
         // Open the file which needs to be print
         $handle = fopen($filepath, "rb");
-        if(!$handle) {
-            return array('status' =>0, 'errorcode' =>'','errormessage'=>'Could not read the file.');
+        if (!$handle) {
+            return array('status' =>0, 'errorcode' =>'', 'errormessage'=>'Could not read the file.');
         }
         // Read file content
         $contents = fread($handle, filesize($filepath));
@@ -389,7 +389,7 @@ 
         $apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
 
         // Check if we have auth token and refresh it
-        $token_ok=true;
+        $token_ok = true;
         try {
             $token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
         } catch (Exception $e) {
@@ -437,7 +437,7 @@ 
         $serviceFactory = new \OAuth\ServiceFactory();
         $apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
         // Check if we have auth token
-        $token_ok=true;
+        $token_ok = true;
         try {
             $token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
         } catch (Exception $e) {

Braces +9 added lines, -13 removed lines

@@ -149,12 +149,10 @@ 
                     if ($endoflife == $token::EOL_NEVER_EXPIRES)
                     {
                         $expiredat = $langs->trans("Never");
-                    }
-                    elseif ($endoflife == $token::EOL_UNKNOWN)
+                    } elseif ($endoflife == $token::EOL_UNKNOWN)
                     {
                         $expiredat = $langs->trans("Unknown");
-                    }
-                    else
+                    } else
                     {
                         $expiredat=dol_print_date($endoflife, "dayhour");
                     }
@@ -216,9 +214,9 @@ 
             if ($conf->global->PRINTING_GCP_DEFAULT == $printer_det['id'])
             {
                 $html.= img_picto($langs->trans("Default"),'on');
+            } else {
+                            $html.= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
             }
-            else
-                $html.= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
             $html.= '</td>';
             $html.= '</tr>'."\n";
         }
@@ -321,22 +319,21 @@ 
             if ($obj)
             {
                 $printer_id = $obj->printer_id;
-            }
-            else
+            } else
             {
                 if (! empty($conf->global->PRINTING_GCP_DEFAULT))
                 {
                     $printer_id=$conf->global->PRINTING_GCP_DEFAULT;
-                }
-                else
+                } else
                 {
                     $this->errors[] = 'NoDefaultPrinterDefined';
                     $error++;
                     return $error;
                 }
             }
+        } else {
+            dol_print_error($this->db);
         }
-        else dol_print_error($this->db);
 
         $ret = $this->sendPrintToPrinter($printer_id, $file, $fileprint, $mimetype);
         $this->error = 'PRINTGCP: '.$ret['errormessage'];
@@ -501,8 +498,7 @@ 
                 $html .= '<td>&nbsp;</td>';
                 $html .= '</tr>';
             }
-        }
-        else
+        } else
         {
                 $html .= '<tr class="oddeven">';
                 $html .= '<td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td>';