alxarafe / alixar

dolibarr/htdocs/core/modules/mailings/example.modules.php

Indentation +28 added lines, -28 removed lines

@@ -30,7 +30,7 @@ 
     // CHANGE THIS: Put here a description of your selector module.
     // This label is used if no translation is found for key MailingModuleDescXXX where XXX=name is found
     var $desc='Put here a description';
-	// CHANGE THIS: Set to 1 if selector is available for admin users only
+    // CHANGE THIS: Set to 1 if selector is available for admin users only
     var $require_admin=0;
     // CHANGE THIS: Add a tooltip language key to add a tooltip help icon after the email target selector
     var $tooltip='MyTooltipLangKey';
@@ -45,11 +45,11 @@ 
 
 
     // CHANGE THIS: Constructor name must be called mailing_xxx with xxx=name of your selector
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
     function __construct($db)
     {
         $this->db=$db;
@@ -68,38 +68,38 @@ 
         // phpcs:enable
         $target = array();
 
-	    // CHANGE THIS
-	    // ----- Your code start here -----
+        // CHANGE THIS
+        // ----- Your code start here -----
 
-	    // You must fill the $target array with record like this
-	    // $target[0]=array('email'=>'email_0','name'=>'name_0','firstname'=>'firstname_0', 'other'=>'other_0');
-		// ...
-	    // $target[n]=array('email'=>'email_n','name'=>'name_n','firstname'=>'firstname_n', 'other'=>'other_n');
+        // You must fill the $target array with record like this
+        // $target[0]=array('email'=>'email_0','name'=>'name_0','firstname'=>'firstname_0', 'other'=>'other_0');
+        // ...
+        // $target[n]=array('email'=>'email_n','name'=>'name_n','firstname'=>'firstname_n', 'other'=>'other_n');
 
-		// Example: $target[0]=array('email'=>'myemail@example.com', 'name'=>'Doe', 'firstname'=>'John', 'other'=>'Other information');
+        // Example: $target[0]=array('email'=>'myemail@example.com', 'name'=>'Doe', 'firstname'=>'John', 'other'=>'Other information');
 
-		// ----- Your code end here -----
+        // ----- Your code end here -----
 
         return parent::add_to_target($mailing_id, $target);
     }
 
 
     /**
-	 *	On the main mailing area, there is a box with statistics.
-	 *	If you want to add a line in this report you must provide an
-	 *	array of SQL request that returns two field:
-	 *	One called "label", One called "nb".
-	 *
-	 *	@return		array		Array with SQL requests
-	 */
-	function getSqlArrayForStats()
-	{
-	    // CHANGE THIS: Optionnal
-
-		//var $statssql=array();
+     *	On the main mailing area, there is a box with statistics.
+     *	If you want to add a line in this report you must provide an
+     *	array of SQL request that returns two field:
+     *	One called "label", One called "nb".
+     *
+     *	@return		array		Array with SQL requests
+     */
+    function getSqlArrayForStats()
+    {
+        // CHANGE THIS: Optionnal
+
+        //var $statssql=array();
         //$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
-		return array();
-	}
+        return array();
+    }
 
 
     /**

Spacing +9 added lines, -9 removed lines

@@ -26,17 +26,17 @@ 
 class mailing_example extends MailingTargets
 {
     // CHANGE THIS: Put here a name not already used
-    var $name='example';
+    var $name = 'example';
     // CHANGE THIS: Put here a description of your selector module.
     // This label is used if no translation is found for key MailingModuleDescXXX where XXX=name is found
-    var $desc='Put here a description';
+    var $desc = 'Put here a description';
 	// CHANGE THIS: Set to 1 if selector is available for admin users only
-    var $require_admin=0;
+    var $require_admin = 0;
     // CHANGE THIS: Add a tooltip language key to add a tooltip help icon after the email target selector
-    var $tooltip='MyTooltipLangKey';
+    var $tooltip = 'MyTooltipLangKey';
 
-    var $require_module=array();
-    var $picto='';
+    var $require_module = array();
+    var $picto = '';
 
     /**
      * @var DoliDB Database handler.
@@ -52,7 +52,7 @@ 
 	 */
     function __construct($db)
     {
-        $this->db=$db;
+        $this->db = $db;
     }
 
 
@@ -110,7 +110,7 @@ 
      *  @param		string		$sql		Requete sql de comptage
      *	@return		int|string				Number of recipient or '?'
      */
-    function getNbOfRecipients($sql='')
+    function getNbOfRecipients($sql = '')
     {
         // CHANGE THIS: Optionnal
 
@@ -129,7 +129,7 @@ 
     {
         // CHANGE THIS: Optionnal
 
-        $s='';
+        $s = '';
         return $s;
     }
 

dolibarr/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php

Indentation +11 added lines, -11 removed lines

@@ -23,7 +23,7 @@ 
 class mailing_thirdparties_services_expired extends MailingTargets
 {
     var $name='DolibarrContractsLinesExpired';
-	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
+    // This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
     var $desc='Third parties with expired contract\'s lines';
     var $require_admin=0;
 
@@ -45,7 +45,7 @@ 
      */
     function __construct($db)
     {
-    	global $conf;
+        global $conf;
 
         $this->db=$db;
 
@@ -95,9 +95,9 @@ 
         $product='';
         if ($key == '0')
         {
-        	$this->error = "Error: You must choose a filter";
-        	$this->errors[] = $this->error;
-        	return $this->error;
+            $this->error = "Error: You must choose a filter";
+            $this->errors[] = $this->error;
+            return $this->error;
         }
 
         $product=$this->arrayofproducts[$key];
@@ -131,17 +131,17 @@ 
                 if ($old <> $obj->email)
                 {
                     $cibles[$j] = array(
-					'email' => $obj->email,
-					'lastname' => $obj->name,	// For thirdparties, lastname must be name
+                    'email' => $obj->email,
+                    'lastname' => $obj->name,	// For thirdparties, lastname must be name
                     'firstname' => '',			// For thirdparties, firstname is ''
-					'other' =>
+                    'other' =>
                     ('DateStart='.dol_print_date($this->db->jdate($obj->date_ouverture),'day')).';'.
                     ('DateEnd='.dol_print_date($this->db->jdate($obj->date_fin_validite),'day')).';'.
                     ('Contract='.$obj->fk_contrat).';'.
                     ('ContactLine='.$obj->cdid),
-					'source_url' => $this->url($obj->id),
-					'source_id' => $obj->id,
-					'source_type' => 'thirdparty'
+                    'source_url' => $this->url($obj->id),
+                    'source_id' => $obj->id,
+                    'source_type' => 'thirdparty'
                     );
                     $old = $obj->email;
                     $j++;

Spacing +49 added lines, -49 removed lines

@@ -22,20 +22,20 @@ 
  */
 class mailing_thirdparties_services_expired extends MailingTargets
 {
-    var $name='DolibarrContractsLinesExpired';
+    var $name = 'DolibarrContractsLinesExpired';
 	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-    var $desc='Third parties with expired contract\'s lines';
-    var $require_admin=0;
+    var $desc = 'Third parties with expired contract\'s lines';
+    var $require_admin = 0;
 
-    var $require_module=array('contrat');
-    var $picto='company';
+    var $require_module = array('contrat');
+    var $picto = 'company';
 
     /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-    var $arrayofproducts=array();
+    var $arrayofproducts = array();
 
 
     /**
@@ -47,16 +47,16 @@ 
     {
     	global $conf;
 
-        $this->db=$db;
+        $this->db = $db;
 
-        $this->arrayofproducts=array();
+        $this->arrayofproducts = array();
 
         // List of services
         $sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product').")";
-        if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $sql.= " AND fk_product_type = 1";	// By default, only services
-        $sql.= " ORDER BY ref";
-        $result=$this->db->query($sql);
+        $sql .= " WHERE entity IN (".getEntity('product').")";
+        if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $sql .= " AND fk_product_type = 1"; // By default, only services
+        $sql .= " ORDER BY ref";
+        $result = $this->db->query($sql);
         if ($result)
         {
             $num = $this->db->num_rows($result);
@@ -67,7 +67,7 @@ 
             {
                 $obj = $this->db->fetch_object($result);
                 $i++;
-                $this->arrayofproducts[$i]=$obj->ref;
+                $this->arrayofproducts[$i] = $obj->ref;
             }
         }
         else
@@ -87,12 +87,12 @@ 
     function add_to_target($mailing_id)
     {
         // phpcs:enable
-        $key=GETPOST('filter','int');
+        $key = GETPOST('filter', 'int');
 
         $cibles = array();
         $j = 0;
 
-        $product='';
+        $product = '';
         if ($key == '0')
         {
         	$this->error = "Error: You must choose a filter";
@@ -100,23 +100,23 @@ 
         	return $this->error;
         }
 
-        $product=$this->arrayofproducts[$key];
+        $product = $this->arrayofproducts[$key];
 
-        $now=dol_now();
+        $now = dol_now();
 
         // La requete doit retourner: id, email, name
         $sql = "SELECT s.rowid as id, s.email, s.nom as name, cd.rowid as cdid, cd.date_ouverture, cd.date_fin_validite, cd.fk_contrat";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
-        $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
-        $sql.= " WHERE s.entity IN (".getEntity('societe').")";
-        $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-        $sql.= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
-        $sql.= " AND cd.statut= 4 AND cd.fk_product=p.rowid AND p.ref = '".$product."'";
-        $sql.= " AND cd.date_fin_validite < '".$this->db->idate($now)."'";
-        $sql.= " ORDER BY s.email";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
+        $sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
+        $sql .= " WHERE s.entity IN (".getEntity('societe').")";
+        $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+        $sql .= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
+        $sql .= " AND cd.statut= 4 AND cd.fk_product=p.rowid AND p.ref = '".$product."'";
+        $sql .= " AND cd.date_fin_validite < '".$this->db->idate($now)."'";
+        $sql .= " ORDER BY s.email";
 
         // Stocke destinataires dans cibles
-        $result=$this->db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             $num = $this->db->num_rows($result);
@@ -132,11 +132,11 @@ 
                 {
                     $cibles[$j] = array(
 					'email' => $obj->email,
-					'lastname' => $obj->name,	// For thirdparties, lastname must be name
-                    'firstname' => '',			// For thirdparties, firstname is ''
+					'lastname' => $obj->name, // For thirdparties, lastname must be name
+                    'firstname' => '', // For thirdparties, firstname is ''
 					'other' =>
-                    ('DateStart='.dol_print_date($this->db->jdate($obj->date_ouverture),'day')).';'.
-                    ('DateEnd='.dol_print_date($this->db->jdate($obj->date_fin_validite),'day')).';'.
+                    ('DateStart='.dol_print_date($this->db->jdate($obj->date_ouverture), 'day')).';'.
+                    ('DateEnd='.dol_print_date($this->db->jdate($obj->date_fin_validite), 'day')).';'.
                     ('Contract='.$obj->fk_contrat).';'.
                     ('ContactLine='.$obj->cdid),
 					'source_url' => $this->url($obj->id),
@@ -153,7 +153,7 @@ 
         else
         {
             dol_syslog($this->db->lasterror());
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             return -1;
         }
 
@@ -189,22 +189,22 @@ 
      *	@param	string	$sql		SQL request to use to count
      *	@return	int					Number of recipients
      */
-    function getNbOfRecipients($sql='')
+    function getNbOfRecipients($sql = '')
     {
-        $now=dol_now();
+        $now = dol_now();
 
         // Example: return parent::getNbOfRecipients("SELECT count(*) as nb from dolibarr_table");
         // Example: return 500;
         $sql = "SELECT count(*) as nb";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
-        $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
-        $sql.= " WHERE s.entity IN (".getEntity('societe').")";
-        $sql.= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
-        $sql.= " AND cd.statut= 4 AND cd.fk_product=p.rowid";
-        $sql.= " AND p.ref IN ('".join("','",$this->arrayofproducts)."')";
-        $sql.= " AND cd.date_fin_validite < '".$this->db->idate($now)."'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
+        $sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
+        $sql .= " WHERE s.entity IN (".getEntity('societe').")";
+        $sql .= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
+        $sql .= " AND cd.statut= 4 AND cd.fk_product=p.rowid";
+        $sql .= " AND p.ref IN ('".join("','", $this->arrayofproducts)."')";
+        $sql .= " AND cd.date_fin_validite < '".$this->db->idate($now)."'";
 
-        $a=parent::getNbOfRecipients($sql);
+        $a = parent::getNbOfRecipients($sql);
 
         return $a;
     }
@@ -219,15 +219,15 @@ 
     {
         global $langs;
 
-        $s=$langs->trans("ProductOrService");
-        $s.='<select name="filter" class="flat">';
-        if (count($this->arrayofproducts)) $s.='<option value="0">&nbsp;</option>';
-        else $s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
-        foreach($this->arrayofproducts as $key => $val)
+        $s = $langs->trans("ProductOrService");
+        $s .= '<select name="filter" class="flat">';
+        if (count($this->arrayofproducts)) $s .= '<option value="0">&nbsp;</option>';
+        else $s .= '<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+        foreach ($this->arrayofproducts as $key => $val)
         {
-            $s.='<option value="'.$key.'">'.$val.'</option>';
+            $s .= '<option value="'.$key.'">'.$val.'</option>';
         }
-        $s.='</select>';
+        $s .= '</select>';
         return $s;
     }
 
@@ -240,6 +240,6 @@ 
      */
     function url($id)
     {
-        return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$id.'">'.img_object('',"company").'</a>';
+        return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$id.'">'.img_object('', "company").'</a>';
     }
 }

Braces +11 added lines, -7 removed lines

@@ -54,7 +54,10 @@ 
         // List of services
         $sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
         $sql.= " WHERE entity IN (".getEntity('product').")";
-        if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $sql.= " AND fk_product_type = 1";	// By default, only services
+        if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
+            $sql.= " AND fk_product_type = 1";
+        }
+        // By default, only services
         $sql.= " ORDER BY ref";
         $result=$this->db->query($sql);
         if ($result)
@@ -69,8 +72,7 @@ 
                 $i++;
                 $this->arrayofproducts[$i]=$obj->ref;
             }
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -149,8 +151,7 @@ 
 
                 $i++;
             }
-        }
-        else
+        } else
         {
             dol_syslog($this->db->lasterror());
             $this->error=$this->db->lasterror();
@@ -221,8 +222,11 @@ 
 
         $s=$langs->trans("ProductOrService");
         $s.='<select name="filter" class="flat">';
-        if (count($this->arrayofproducts)) $s.='<option value="0">&nbsp;</option>';
-        else $s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+        if (count($this->arrayofproducts)) {
+            $s.='<option value="0">&nbsp;</option>';
+        } else {
+            $s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+        }
         foreach($this->arrayofproducts as $key => $val)
         {
             $s.='<option value="'.$key.'">'.$val.'</option>';

dolibarr/htdocs/core/modules/mailings/xinputfile.modules.php

Indentation +181 added lines, -181 removed lines

@@ -30,195 +30,195 @@
  */
 class mailing_xinputfile extends MailingTargets
 {
-	var $name='EmailsFromFile';              // Identifiant du module mailing
-	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-	var $desc='EMails from a file';          // Libelle utilise si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv�e
-	var $require_module=array();             // Module mailing actif si modules require_module actifs
-	var $require_admin=0;                    // Module mailing actif pour user admin ou non
-	var $picto='generic';
-	var $tooltip='UseFormatFileEmailToTarget';
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db=$db;
-	}
+    var $name='EmailsFromFile';              // Identifiant du module mailing
+    // This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
+    var $desc='EMails from a file';          // Libelle utilise si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv�e
+    var $require_module=array();             // Module mailing actif si modules require_module actifs
+    var $require_admin=0;                    // Module mailing actif pour user admin ou non
+    var $picto='generic';
+    var $tooltip='UseFormatFileEmailToTarget';
 
 
     /**
-	 *	On the main mailing area, there is a box with statistics.
-	 *	If you want to add a line in this report you must provide an
-	 *	array of SQL request that returns two field:
-	 *	One called "label", One called "nb".
-	 *
-	 *	@return		array		Array with SQL requests
-	 */
-	function getSqlArrayForStats()
-	{
-		global $langs;
-		$langs->load("users");
-
-		$statssql=array();
-		return $statssql;
-	}
-
-
-	/**
-	 *	Return here number of distinct emails returned by your selector.
-	 *	For example if this selector is used to extract 500 different
-	 *	emails from a text file, this function must return 500.
-	 *
-	 *  @param      string	$sql        Sql request to count
-	 *	@return		string				'' means NA
-	 */
-	function getNbOfRecipients($sql='')
-	{
-		return '';
-	}
-
-
-	/**
-	 *  Renvoie url lien vers fiche de la source du destinataire du mailing
-	 *
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db=$db;
+    }
+
+
+    /**
+     *	On the main mailing area, there is a box with statistics.
+     *	If you want to add a line in this report you must provide an
+     *	array of SQL request that returns two field:
+     *	One called "label", One called "nb".
+     *
+     *	@return		array		Array with SQL requests
+     */
+    function getSqlArrayForStats()
+    {
+        global $langs;
+        $langs->load("users");
+
+        $statssql=array();
+        return $statssql;
+    }
+
+
+    /**
+     *	Return here number of distinct emails returned by your selector.
+     *	For example if this selector is used to extract 500 different
+     *	emails from a text file, this function must return 500.
+     *
+     *  @param      string	$sql        Sql request to count
+     *	@return		string				'' means NA
+     */
+    function getNbOfRecipients($sql='')
+    {
+        return '';
+    }
+
+
+    /**
+     *  Renvoie url lien vers fiche de la source du destinataire du mailing
+     *
      *  @param	int		$id		ID
-	 *  @return string      	Url lien
-	 */
-	function url($id)
-	{
-		global $langs;
-		return $langs->trans('LineInFile',$id);
-		//' - '.$langs->trans("File").' '.dol_trunc(,12);
-	}
-
-
-	/**
-	 *   Affiche formulaire de filtre qui apparait dans page de selection des destinataires de mailings
-	 *
-	 *   @return     string      Retourne zone select
-	 */
-	function formFilter()
-	{
-		global $langs;
-
-		$s='';
-		$s.='<input type="file" name="username" class="flat">';
-		return $s;
-	}
+     *  @return string      	Url lien
+     */
+    function url($id)
+    {
+        global $langs;
+        return $langs->trans('LineInFile',$id);
+        //' - '.$langs->trans("File").' '.dol_trunc(,12);
+    }
+
+
+    /**
+     *   Affiche formulaire de filtre qui apparait dans page de selection des destinataires de mailings
+     *
+     *   @return     string      Retourne zone select
+     */
+    function formFilter()
+    {
+        global $langs;
+
+        $s='';
+        $s.='<input type="file" name="username" class="flat">';
+        return $s;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Ajoute destinataires dans table des cibles
-	 *
-	 *  @param	int		$mailing_id    	Id of emailing
-	 *  @return int           			< 0 si erreur, nb ajout si ok
-	 */
-	function add_to_target($mailing_id)
-	{
+    /**
+     *  Ajoute destinataires dans table des cibles
+     *
+     *  @param	int		$mailing_id    	Id of emailing
+     *  @return int           			< 0 si erreur, nb ajout si ok
+     */
+    function add_to_target($mailing_id)
+    {
         // phpcs:enable
-		global $conf,$langs,$_FILES;
-
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		// For compatibility with Unix, MS-Dos or Macintosh
-		ini_set('auto_detect_line_endings', true);
-
-		$cibles = array();
-
-		$upload_dir=$conf->mailing->dir_temp;
-
-		if (dol_mkdir($upload_dir) >= 0)
-		{
-			$resupload = dol_move_uploaded_file($_FILES['username']['tmp_name'], $upload_dir . "/" . $_FILES['username']['name'], 1, 0, $_FILES['username']['error']);
-			if (is_numeric($resupload) && $resupload > 0)
-			{
-				$cpt=0;
-
-				$file=$upload_dir . "/" . $_FILES['username']['name'];
-				$handle = @fopen($file, "r");
-				if ($handle)
-				{
-					$i = 0;
-		            $j = 0;
-
-            		$old = '';
-					while (!feof($handle))
-					{
-						$cpt++;
-				        $buffer = trim(fgets($handle));
-			        	$tab=explode(';',$buffer,4);
-				        $email=$tab[0];
-				        $name=$tab[1];
-				        $firstname=$tab[2];
-				        $other=$tab[3];
-				        if (! empty($buffer))
-				        {
-			        		//print 'xx'.dol_strlen($buffer).empty($buffer)."<br>\n";
-				        	$id=$cpt;
-					        if (isValidEMail($email))
-					        {
-		   						if ($old <> $email)
-								{
-									$cibles[$j] = array(
-					                    			'email' => $email,
-					                    			'lastname' => $name,
-					                    			'firstname' => $firstname,
-													'other' => $other,
+        global $conf,$langs,$_FILES;
+
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+        // For compatibility with Unix, MS-Dos or Macintosh
+        ini_set('auto_detect_line_endings', true);
+
+        $cibles = array();
+
+        $upload_dir=$conf->mailing->dir_temp;
+
+        if (dol_mkdir($upload_dir) >= 0)
+        {
+            $resupload = dol_move_uploaded_file($_FILES['username']['tmp_name'], $upload_dir . "/" . $_FILES['username']['name'], 1, 0, $_FILES['username']['error']);
+            if (is_numeric($resupload) && $resupload > 0)
+            {
+                $cpt=0;
+
+                $file=$upload_dir . "/" . $_FILES['username']['name'];
+                $handle = @fopen($file, "r");
+                if ($handle)
+                {
+                    $i = 0;
+                    $j = 0;
+
+                    $old = '';
+                    while (!feof($handle))
+                    {
+                        $cpt++;
+                        $buffer = trim(fgets($handle));
+                        $tab=explode(';',$buffer,4);
+                        $email=$tab[0];
+                        $name=$tab[1];
+                        $firstname=$tab[2];
+                        $other=$tab[3];
+                        if (! empty($buffer))
+                        {
+                            //print 'xx'.dol_strlen($buffer).empty($buffer)."<br>\n";
+                            $id=$cpt;
+                            if (isValidEMail($email))
+                            {
+                                    if ($old <> $email)
+                                {
+                                    $cibles[$j] = array(
+                                                    'email' => $email,
+                                                    'lastname' => $name,
+                                                    'firstname' => $firstname,
+                                                    'other' => $other,
                                                     'source_url' => '',
                                                     'source_id' => '',
                                                     'source_type' => 'file'
-									);
-									$old = $email;
-									$j++;
-								}
-					        }
-					        else
-					        {
-					        	$i++;
-					        	$langs->load("errors");
-					        	$this->error = $langs->trans("ErrorFoundBadEmailInFile",$i,$cpt,$email);
-					        }
-				        }
-				    }
-				    fclose($handle);
-
-				    if ($i > 0)
-				    {
-				    	return -$i;
-				    }
-				}
-				else
-				{
-					$this->error = $langs->trans("ErrorFaildToOpenFile");
-					return -1;
-				}
-
-				dol_syslog(get_class($this)."::add_to_target mailing ".$cpt." targets found");
-			}
-			else
-			{
-				$langs->load("errors");
-				if ($resupload < 0)	// Unknown error
-				{
-					$this->error = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>';
-				}
-				else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
-				{
-					$this->error = '<div class="error">'.$langs->trans("ErrorFileIsInfectedWithAVirus").'</div>';
-				}
-				else	// Known error
-				{
-					$this->error = '<div class="error">'.$langs->trans($resupload).'</div>';
-				}
-			}
-		}
-
-		ini_set('auto_detect_line_endings', false);
-
-		return parent::add_to_target($mailing_id, $cibles);
-	}
+                                    );
+                                    $old = $email;
+                                    $j++;
+                                }
+                            }
+                            else
+                            {
+                                $i++;
+                                $langs->load("errors");
+                                $this->error = $langs->trans("ErrorFoundBadEmailInFile",$i,$cpt,$email);
+                            }
+                        }
+                    }
+                    fclose($handle);
+
+                    if ($i > 0)
+                    {
+                        return -$i;
+                    }
+                }
+                else
+                {
+                    $this->error = $langs->trans("ErrorFaildToOpenFile");
+                    return -1;
+                }
+
+                dol_syslog(get_class($this)."::add_to_target mailing ".$cpt." targets found");
+            }
+            else
+            {
+                $langs->load("errors");
+                if ($resupload < 0)	// Unknown error
+                {
+                    $this->error = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>';
+                }
+                else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
+                {
+                    $this->error = '<div class="error">'.$langs->trans("ErrorFileIsInfectedWithAVirus").'</div>';
+                }
+                else	// Known error
+                {
+                    $this->error = '<div class="error">'.$langs->trans($resupload).'</div>';
+                }
+            }
+        }
+
+        ini_set('auto_detect_line_endings', false);
+
+        return parent::add_to_target($mailing_id, $cibles);
+    }
 }

Spacing +26 added lines, -26 removed lines

@@ -30,13 +30,13 @@ 
  */
 class mailing_xinputfile extends MailingTargets
 {
-	var $name='EmailsFromFile';              // Identifiant du module mailing
+	var $name = 'EmailsFromFile'; // Identifiant du module mailing
 	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-	var $desc='EMails from a file';          // Libelle utilise si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv�e
-	var $require_module=array();             // Module mailing actif si modules require_module actifs
-	var $require_admin=0;                    // Module mailing actif pour user admin ou non
-	var $picto='generic';
-	var $tooltip='UseFormatFileEmailToTarget';
+	var $desc = 'EMails from a file'; // Libelle utilise si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv�e
+	var $require_module = array(); // Module mailing actif si modules require_module actifs
+	var $require_admin = 0; // Module mailing actif pour user admin ou non
+	var $picto = 'generic';
+	var $tooltip = 'UseFormatFileEmailToTarget';
 
 
 	/**
@@ -46,7 +46,7 @@ 
 	 */
 	function __construct($db)
 	{
-		$this->db=$db;
+		$this->db = $db;
 	}
 
 
@@ -63,7 +63,7 @@ 
 		global $langs;
 		$langs->load("users");
 
-		$statssql=array();
+		$statssql = array();
 		return $statssql;
 	}
 
@@ -76,7 +76,7 @@ 
 	 *  @param      string	$sql        Sql request to count
 	 *	@return		string				'' means NA
 	 */
-	function getNbOfRecipients($sql='')
+	function getNbOfRecipients($sql = '')
 	{
 		return '';
 	}
@@ -91,7 +91,7 @@ 
 	function url($id)
 	{
 		global $langs;
-		return $langs->trans('LineInFile',$id);
+		return $langs->trans('LineInFile', $id);
 		//' - '.$langs->trans("File").' '.dol_trunc(,12);
 	}
 
@@ -105,8 +105,8 @@ 
 	{
 		global $langs;
 
-		$s='';
-		$s.='<input type="file" name="username" class="flat">';
+		$s = '';
+		$s .= '<input type="file" name="username" class="flat">';
 		return $s;
 	}
 
@@ -120,7 +120,7 @@ 
 	function add_to_target($mailing_id)
 	{
         // phpcs:enable
-		global $conf,$langs,$_FILES;
+		global $conf, $langs, $_FILES;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -129,16 +129,16 @@ 
 
 		$cibles = array();
 
-		$upload_dir=$conf->mailing->dir_temp;
+		$upload_dir = $conf->mailing->dir_temp;
 
 		if (dol_mkdir($upload_dir) >= 0)
 		{
-			$resupload = dol_move_uploaded_file($_FILES['username']['tmp_name'], $upload_dir . "/" . $_FILES['username']['name'], 1, 0, $_FILES['username']['error']);
+			$resupload = dol_move_uploaded_file($_FILES['username']['tmp_name'], $upload_dir."/".$_FILES['username']['name'], 1, 0, $_FILES['username']['error']);
 			if (is_numeric($resupload) && $resupload > 0)
 			{
-				$cpt=0;
+				$cpt = 0;
 
-				$file=$upload_dir . "/" . $_FILES['username']['name'];
+				$file = $upload_dir."/".$_FILES['username']['name'];
 				$handle = @fopen($file, "r");
 				if ($handle)
 				{
@@ -150,15 +150,15 @@ 
 					{
 						$cpt++;
 				        $buffer = trim(fgets($handle));
-			        	$tab=explode(';',$buffer,4);
-				        $email=$tab[0];
-				        $name=$tab[1];
-				        $firstname=$tab[2];
-				        $other=$tab[3];
-				        if (! empty($buffer))
+			        	$tab = explode(';', $buffer, 4);
+				        $email = $tab[0];
+				        $name = $tab[1];
+				        $firstname = $tab[2];
+				        $other = $tab[3];
+				        if (!empty($buffer))
 				        {
 			        		//print 'xx'.dol_strlen($buffer).empty($buffer)."<br>\n";
-				        	$id=$cpt;
+				        	$id = $cpt;
 					        if (isValidEMail($email))
 					        {
 		   						if ($old <> $email)
@@ -180,7 +180,7 @@ 
 					        {
 					        	$i++;
 					        	$langs->load("errors");
-					        	$this->error = $langs->trans("ErrorFoundBadEmailInFile",$i,$cpt,$email);
+					        	$this->error = $langs->trans("ErrorFoundBadEmailInFile", $i, $cpt, $email);
 					        }
 				        }
 				    }
@@ -206,7 +206,7 @@ 
 				{
 					$this->error = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>';
 				}
-				else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
+				else if (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
 				{
 					$this->error = '<div class="error">'.$langs->trans("ErrorFileIsInfectedWithAVirus").'</div>';
 				}

Braces +8 added lines, -9 removed lines

@@ -175,8 +175,7 @@ 
 									$old = $email;
 									$j++;
 								}
-					        }
-					        else
+					        } else
 					        {
 					        	$i++;
 					        	$langs->load("errors");
@@ -190,27 +189,27 @@ 
 				    {
 				    	return -$i;
 				    }
-				}
-				else
+				} else
 				{
 					$this->error = $langs->trans("ErrorFaildToOpenFile");
 					return -1;
 				}
 
 				dol_syslog(get_class($this)."::add_to_target mailing ".$cpt." targets found");
-			}
-			else
+			} else
 			{
 				$langs->load("errors");
-				if ($resupload < 0)	// Unknown error
+				if ($resupload < 0) {
+				    // Unknown error
 				{
 					$this->error = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>';
 				}
-				else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
+				} else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload)) {
+				    // Files infected by a virus
 				{
 					$this->error = '<div class="error">'.$langs->trans("ErrorFileIsInfectedWithAVirus").'</div>';
 				}
-				else	// Known error
+				} else	// Known error
 				{
 					$this->error = '<div class="error">'.$langs->trans($resupload).'</div>';
 				}

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

Indentation +185 added lines, -185 removed lines

@@ -36,189 +36,189 @@
 class modBanque extends DolibarrModules
 {
 
-	/**
-	 *	Constructor.
-	 *
-	 *	@param	DoliDB	$db		Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf;
-
-		$this->db = $db;
-		$this->numero = 85;
-
-		$this->family = "financial";
-		$this->module_position = '51';
-		// 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 comptes financiers de type Comptes bancaires ou postaux";
-
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='account';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array("/banque/temp");
-
-		// Config pages
-		//-------------
-		$this->config_page_url = array("bank.php");
-
-		// Dependancies
-		$this->depends = array();
-		$this->requiredby = array("modComptabilite","modAccounting","modPrelevement");
-		$this->conflictwith = array();
-		$this->langfiles = array("banks","compta","bills","companies");
-
-		// Constants
-		$this->const = array();
-
-		// Boxes
-		$this->boxes = array(0=>array('file'=>'box_comptes.php','enabledbydefaulton'=>'Home'));
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'banque';
-		$r=0;
-
-		$r++;
-		$this->rights[$r][0] = 111; // id de la permission
-		$this->rights[$r][1] = 'Read bank account and transactions';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'lire';
-
-		$r++;
-		$this->rights[$r][0] = 112; // id de la permission
-		$this->rights[$r][1] = 'Creer/modifier montant/supprimer ecriture bancaire';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'modifier';
-
-		$r++;
-		$this->rights[$r][0] = 113; // id de la permission
-		$this->rights[$r][1] = 'Configurer les comptes bancaires (creer, gerer categories)';
-		$this->rights[$r][2] = 'a';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'configurer';
-
-		$r++;
-		$this->rights[$r][0] = 114; // id de la permission
-		$this->rights[$r][1] = 'Rapprocher les ecritures bancaires';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'consolidate';
-
-		$r++;
-		$this->rights[$r][0] = 115; // id de la permission
-		$this->rights[$r][1] = 'Exporter transactions et releves';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'export';
-
-		$r++;
-		$this->rights[$r][0] = 116; // id de la permission
-		$this->rights[$r][1] = 'Virements entre comptes';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'transfer';
-
-		$r++;
-		$this->rights[$r][0] = 117; // id de la permission
-		$this->rights[$r][1] = 'Gerer les envois de cheques';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'cheque';
-
-
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
-
-		// Exports
-		//--------
-		$r=0;
-
-		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='Ecritures bancaires et releves';
-		$this->export_permission[$r]=array(array("banque","export"));
-		$this->export_fields_array[$r]=array(
-			'b.rowid'=>'IdTransaction','ba.ref'=>'AccountRef','ba.label'=>'AccountLabel','b.datev'=>'DateValue','b.dateo'=>'DateOperation','b.label'=>'Label',
-			'b.num_chq'=>'ChequeOrTransferNumber','b.fk_bordereau'=>'ChequeBordereau','-b.amount'=>'Debit','b.amount'=>'Credit',
-			'b.num_releve'=>'AccountStatement','b.datec'=>"DateCreation","bu.url_id"=>"IdThirdParty","s.nom"=>"ThirdParty",
-			"s.code_compta"=>"CustomerAccountancyCode","s.code_compta_fournisseur"=>"SupplierAccountancyCode"
-		);
-		$this->export_TypeFields_array[$r]=array('ba.ref'=>'Text','ba.label'=>'Text','b.datev'=>'Date','b.dateo'=>'Date','b.label'=>'Text','b.num_chq'=>'Text','b.fk_bordereau'=>'Text','-b.amount'=>'Numeric','b.amount'=>'Numeric','b.num_releve'=>'Text','b.datec'=>"Date","bu.url_id"=>"Text","s.nom"=>"Text","s.code_compta"=>"Text","s.code_compta_fournisseur"=>"Text");
-		$this->export_entities_array[$r]=array(
-			'b.rowid'=>'account','ba.ref'=>'account','ba.label'=>'account','b.datev'=>'account','b.dateo'=>'account','b.label'=>'account',
-			'b.num_chq'=>'account','b.fk_bordereau'=>'account','-b.amount'=>'account','b.amount'=>'account','b.num_releve'=>'account',
-			'b.datec'=>"account","bu.url_id"=>"company","s.nom"=>"company","s.code_compta"=>"company","s.code_compta_fournisseur"=>"company"
-		);
-		$this->export_special_array[$r]=array('-b.amount'=>'NULLIFNEG','b.amount'=>'NULLIFNEG');
-		if (empty($conf->fournisseur->enabled))
-		{
-			unset($this->export_fields_array[$r]['s.code_compta_fournisseur']);
-			unset($this->export_entities_array[$r]['s.code_compta_fournisseur']);
-		}
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'bank_account as ba, '.MAIN_DB_PREFIX.'bank as b)';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."bank_url as bu ON (bu.fk_bank = b.rowid AND bu.type = 'company')";
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON bu.url_id = s.rowid';
-		$this->export_sql_end[$r] .=' WHERE ba.rowid = b.fk_account';
-		$this->export_sql_end[$r] .=' AND ba.entity IN ('.getEntity('bank_account').')';
-		$this->export_sql_order[$r] =' ORDER BY b.datev, b.num_releve';
-
-		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='Bordereaux remise Chq/Fact';
-		$this->export_permission[$r]=array(array("banque","export"));
-		$this->export_fields_array[$r]=array("bch.rowid"=>"DepositId","bch.ref"=>"Numero","bch.ref_ext"=>"RefExt",'ba.ref'=>'AccountRef','ba.label'=>'AccountLabel','b.datev'=>'DateValue','b.num_chq'=>'ChequeOrTransferNumber','b.amount'=>'Credit','b.num_releve'=>'AccountStatement','b.datec'=>"DateCreation",
-			"bch.date_bordereau"=>"Date","bch.amount"=>"Total","bch.nbcheque"=>"NbCheque","bu.url_id"=>"IdThirdParty","s.nom"=>"ThirdParty","s.code_compta"=>"CustomerAccountancyCode","f.ref"=>"InvoiceRef"
-			);
-		$this->export_TypeFields_array[$r]=array('ba.ref'=>'Text','ba.label'=>'Text','b.datev'=>'Date','b.num_chq'=>'Text','b.amount'=>'Numeric','b.num_releve'=>'Text','b.datec'=>"Date",
-			"bch.date_bordereau"=>"Date","bch.rowid"=>"Numeric","bch.ref"=>"Numeric","bch.ref_ext"=>"Text","bch.amount"=>"Numeric","bch.nbcheque"=>"Numeric","bu.url_id"=>"Text","s.nom"=>"Text","s.code_compta"=>"Text","f.ref"=>"Text"
-			);
-		$this->export_entities_array[$r]=array('ba.ref'=>'account','ba.label'=>'account','b.datev'=>'account','b.num_chq'=>'account','b.amount'=>'account','b.num_releve'=>'account','b.datec'=>"account",
-			"bu.url_id"=>"company","s.nom"=>"company","s.code_compta"=>"company","s.code_compta_fournisseur"=>"company","f.ref"=>"invoice");
-		$this->export_special_array[$r]=array('b.amount'=>'NULLIFNEG');
-
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'bordereau_cheque as bch, '.MAIN_DB_PREFIX.'bank_account as ba, '.MAIN_DB_PREFIX.'bank as b)';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."bank_url as bu ON (bu.fk_bank = b.rowid AND bu.type = 'company')";
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement as p ON b.rowid = p.fk_bank';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON p.rowid = pf.fk_paiement';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture as f ON f.rowid = pf.fk_facture';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON f.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' WHERE ba.rowid = b.fk_account AND bch.rowid = b.fk_bordereau and bch.fk_bank_account=ba.rowid';
-		$this->export_sql_end[$r] .=" AND b.fk_type = 'CHQ'";
-		$this->export_sql_end[$r] .=' AND p.fk_paiement = 7';
-		$this->export_sql_end[$r] .=' AND ba.entity IN ('.getEntity('bank_account').')';
-		$this->export_sql_order[$r] =' ORDER BY b.datev, b.num_releve';
-	}
-
-
-	/**
-	 *      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
-	 */
-	function init($options='')
-	{
-		global $conf;
-
-		// Permissions
-		$this->remove($options);
-
-		$sql = array();
-
-		return $this->_init($sql,$options);
-	}
+    /**
+     *	Constructor.
+     *
+     *	@param	DoliDB	$db		Database handler
+     */
+    function __construct($db)
+    {
+        global $conf;
+
+        $this->db = $db;
+        $this->numero = 85;
+
+        $this->family = "financial";
+        $this->module_position = '51';
+        // 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 comptes financiers de type Comptes bancaires ou postaux";
+
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='account';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array("/banque/temp");
+
+        // Config pages
+        //-------------
+        $this->config_page_url = array("bank.php");
+
+        // Dependancies
+        $this->depends = array();
+        $this->requiredby = array("modComptabilite","modAccounting","modPrelevement");
+        $this->conflictwith = array();
+        $this->langfiles = array("banks","compta","bills","companies");
+
+        // Constants
+        $this->const = array();
+
+        // Boxes
+        $this->boxes = array(0=>array('file'=>'box_comptes.php','enabledbydefaulton'=>'Home'));
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'banque';
+        $r=0;
+
+        $r++;
+        $this->rights[$r][0] = 111; // id de la permission
+        $this->rights[$r][1] = 'Read bank account and transactions';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'lire';
+
+        $r++;
+        $this->rights[$r][0] = 112; // id de la permission
+        $this->rights[$r][1] = 'Creer/modifier montant/supprimer ecriture bancaire';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'modifier';
+
+        $r++;
+        $this->rights[$r][0] = 113; // id de la permission
+        $this->rights[$r][1] = 'Configurer les comptes bancaires (creer, gerer categories)';
+        $this->rights[$r][2] = 'a';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'configurer';
+
+        $r++;
+        $this->rights[$r][0] = 114; // id de la permission
+        $this->rights[$r][1] = 'Rapprocher les ecritures bancaires';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'consolidate';
+
+        $r++;
+        $this->rights[$r][0] = 115; // id de la permission
+        $this->rights[$r][1] = 'Exporter transactions et releves';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'export';
+
+        $r++;
+        $this->rights[$r][0] = 116; // id de la permission
+        $this->rights[$r][1] = 'Virements entre comptes';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'transfer';
+
+        $r++;
+        $this->rights[$r][0] = 117; // id de la permission
+        $this->rights[$r][1] = 'Gerer les envois de cheques';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'cheque';
+
+
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+
+
+        // Exports
+        //--------
+        $r=0;
+
+        $r++;
+        $this->export_code[$r]=$this->rights_class.'_'.$r;
+        $this->export_label[$r]='Ecritures bancaires et releves';
+        $this->export_permission[$r]=array(array("banque","export"));
+        $this->export_fields_array[$r]=array(
+            'b.rowid'=>'IdTransaction','ba.ref'=>'AccountRef','ba.label'=>'AccountLabel','b.datev'=>'DateValue','b.dateo'=>'DateOperation','b.label'=>'Label',
+            'b.num_chq'=>'ChequeOrTransferNumber','b.fk_bordereau'=>'ChequeBordereau','-b.amount'=>'Debit','b.amount'=>'Credit',
+            'b.num_releve'=>'AccountStatement','b.datec'=>"DateCreation","bu.url_id"=>"IdThirdParty","s.nom"=>"ThirdParty",
+            "s.code_compta"=>"CustomerAccountancyCode","s.code_compta_fournisseur"=>"SupplierAccountancyCode"
+        );
+        $this->export_TypeFields_array[$r]=array('ba.ref'=>'Text','ba.label'=>'Text','b.datev'=>'Date','b.dateo'=>'Date','b.label'=>'Text','b.num_chq'=>'Text','b.fk_bordereau'=>'Text','-b.amount'=>'Numeric','b.amount'=>'Numeric','b.num_releve'=>'Text','b.datec'=>"Date","bu.url_id"=>"Text","s.nom"=>"Text","s.code_compta"=>"Text","s.code_compta_fournisseur"=>"Text");
+        $this->export_entities_array[$r]=array(
+            'b.rowid'=>'account','ba.ref'=>'account','ba.label'=>'account','b.datev'=>'account','b.dateo'=>'account','b.label'=>'account',
+            'b.num_chq'=>'account','b.fk_bordereau'=>'account','-b.amount'=>'account','b.amount'=>'account','b.num_releve'=>'account',
+            'b.datec'=>"account","bu.url_id"=>"company","s.nom"=>"company","s.code_compta"=>"company","s.code_compta_fournisseur"=>"company"
+        );
+        $this->export_special_array[$r]=array('-b.amount'=>'NULLIFNEG','b.amount'=>'NULLIFNEG');
+        if (empty($conf->fournisseur->enabled))
+        {
+            unset($this->export_fields_array[$r]['s.code_compta_fournisseur']);
+            unset($this->export_entities_array[$r]['s.code_compta_fournisseur']);
+        }
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'bank_account as ba, '.MAIN_DB_PREFIX.'bank as b)';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."bank_url as bu ON (bu.fk_bank = b.rowid AND bu.type = 'company')";
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON bu.url_id = s.rowid';
+        $this->export_sql_end[$r] .=' WHERE ba.rowid = b.fk_account';
+        $this->export_sql_end[$r] .=' AND ba.entity IN ('.getEntity('bank_account').')';
+        $this->export_sql_order[$r] =' ORDER BY b.datev, b.num_releve';
+
+        $r++;
+        $this->export_code[$r]=$this->rights_class.'_'.$r;
+        $this->export_label[$r]='Bordereaux remise Chq/Fact';
+        $this->export_permission[$r]=array(array("banque","export"));
+        $this->export_fields_array[$r]=array("bch.rowid"=>"DepositId","bch.ref"=>"Numero","bch.ref_ext"=>"RefExt",'ba.ref'=>'AccountRef','ba.label'=>'AccountLabel','b.datev'=>'DateValue','b.num_chq'=>'ChequeOrTransferNumber','b.amount'=>'Credit','b.num_releve'=>'AccountStatement','b.datec'=>"DateCreation",
+            "bch.date_bordereau"=>"Date","bch.amount"=>"Total","bch.nbcheque"=>"NbCheque","bu.url_id"=>"IdThirdParty","s.nom"=>"ThirdParty","s.code_compta"=>"CustomerAccountancyCode","f.ref"=>"InvoiceRef"
+            );
+        $this->export_TypeFields_array[$r]=array('ba.ref'=>'Text','ba.label'=>'Text','b.datev'=>'Date','b.num_chq'=>'Text','b.amount'=>'Numeric','b.num_releve'=>'Text','b.datec'=>"Date",
+            "bch.date_bordereau"=>"Date","bch.rowid"=>"Numeric","bch.ref"=>"Numeric","bch.ref_ext"=>"Text","bch.amount"=>"Numeric","bch.nbcheque"=>"Numeric","bu.url_id"=>"Text","s.nom"=>"Text","s.code_compta"=>"Text","f.ref"=>"Text"
+            );
+        $this->export_entities_array[$r]=array('ba.ref'=>'account','ba.label'=>'account','b.datev'=>'account','b.num_chq'=>'account','b.amount'=>'account','b.num_releve'=>'account','b.datec'=>"account",
+            "bu.url_id"=>"company","s.nom"=>"company","s.code_compta"=>"company","s.code_compta_fournisseur"=>"company","f.ref"=>"invoice");
+        $this->export_special_array[$r]=array('b.amount'=>'NULLIFNEG');
+
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'bordereau_cheque as bch, '.MAIN_DB_PREFIX.'bank_account as ba, '.MAIN_DB_PREFIX.'bank as b)';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."bank_url as bu ON (bu.fk_bank = b.rowid AND bu.type = 'company')";
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement as p ON b.rowid = p.fk_bank';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON p.rowid = pf.fk_paiement';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture as f ON f.rowid = pf.fk_facture';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON f.fk_soc = s.rowid';
+        $this->export_sql_end[$r] .=' WHERE ba.rowid = b.fk_account AND bch.rowid = b.fk_bordereau and bch.fk_bank_account=ba.rowid';
+        $this->export_sql_end[$r] .=" AND b.fk_type = 'CHQ'";
+        $this->export_sql_end[$r] .=' AND p.fk_paiement = 7';
+        $this->export_sql_end[$r] .=' AND ba.entity IN ('.getEntity('bank_account').')';
+        $this->export_sql_order[$r] =' ORDER BY b.datev, b.num_releve';
+    }
+
+
+    /**
+     *      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
+     */
+    function init($options='')
+    {
+        global $conf;
+
+        // Permissions
+        $this->remove($options);
+
+        $sql = array();
+
+        return $this->_init($sql,$options);
+    }
 }

Spacing +55 added lines, -55 removed lines

@@ -27,7 +27,7 @@ 
  *	\brief      Fichier de description et activation du module Banque
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -51,14 +51,14 @@ 
 		$this->family = "financial";
 		$this->module_position = '51';
 		// 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->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Gestion des comptes financiers de type Comptes bancaires ou postaux";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='account';
+		$this->picto = 'account';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/banque/temp");
@@ -69,20 +69,20 @@ 
 
 		// Dependancies
 		$this->depends = array();
-		$this->requiredby = array("modComptabilite","modAccounting","modPrelevement");
+		$this->requiredby = array("modComptabilite", "modAccounting", "modPrelevement");
 		$this->conflictwith = array();
-		$this->langfiles = array("banks","compta","bills","companies");
+		$this->langfiles = array("banks", "compta", "bills", "companies");
 
 		// Constants
 		$this->const = array();
 
 		// Boxes
-		$this->boxes = array(0=>array('file'=>'box_comptes.php','enabledbydefaulton'=>'Home'));
+		$this->boxes = array(0=>array('file'=>'box_comptes.php', 'enabledbydefaulton'=>'Home'));
 
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'banque';
-		$r=0;
+		$r = 0;
 
 		$r++;
 		$this->rights[$r][0] = 111; // id de la permission
@@ -136,69 +136,69 @@ 
 
 		// Menus
 		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 
 		// Exports
 		//--------
-		$r=0;
+		$r = 0;
 
 		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='Ecritures bancaires et releves';
-		$this->export_permission[$r]=array(array("banque","export"));
-		$this->export_fields_array[$r]=array(
-			'b.rowid'=>'IdTransaction','ba.ref'=>'AccountRef','ba.label'=>'AccountLabel','b.datev'=>'DateValue','b.dateo'=>'DateOperation','b.label'=>'Label',
-			'b.num_chq'=>'ChequeOrTransferNumber','b.fk_bordereau'=>'ChequeBordereau','-b.amount'=>'Debit','b.amount'=>'Credit',
-			'b.num_releve'=>'AccountStatement','b.datec'=>"DateCreation","bu.url_id"=>"IdThirdParty","s.nom"=>"ThirdParty",
-			"s.code_compta"=>"CustomerAccountancyCode","s.code_compta_fournisseur"=>"SupplierAccountancyCode"
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'Ecritures bancaires et releves';
+		$this->export_permission[$r] = array(array("banque", "export"));
+		$this->export_fields_array[$r] = array(
+			'b.rowid'=>'IdTransaction', 'ba.ref'=>'AccountRef', 'ba.label'=>'AccountLabel', 'b.datev'=>'DateValue', 'b.dateo'=>'DateOperation', 'b.label'=>'Label',
+			'b.num_chq'=>'ChequeOrTransferNumber', 'b.fk_bordereau'=>'ChequeBordereau', '-b.amount'=>'Debit', 'b.amount'=>'Credit',
+			'b.num_releve'=>'AccountStatement', 'b.datec'=>"DateCreation", "bu.url_id"=>"IdThirdParty", "s.nom"=>"ThirdParty",
+			"s.code_compta"=>"CustomerAccountancyCode", "s.code_compta_fournisseur"=>"SupplierAccountancyCode"
 		);
-		$this->export_TypeFields_array[$r]=array('ba.ref'=>'Text','ba.label'=>'Text','b.datev'=>'Date','b.dateo'=>'Date','b.label'=>'Text','b.num_chq'=>'Text','b.fk_bordereau'=>'Text','-b.amount'=>'Numeric','b.amount'=>'Numeric','b.num_releve'=>'Text','b.datec'=>"Date","bu.url_id"=>"Text","s.nom"=>"Text","s.code_compta"=>"Text","s.code_compta_fournisseur"=>"Text");
-		$this->export_entities_array[$r]=array(
-			'b.rowid'=>'account','ba.ref'=>'account','ba.label'=>'account','b.datev'=>'account','b.dateo'=>'account','b.label'=>'account',
-			'b.num_chq'=>'account','b.fk_bordereau'=>'account','-b.amount'=>'account','b.amount'=>'account','b.num_releve'=>'account',
-			'b.datec'=>"account","bu.url_id"=>"company","s.nom"=>"company","s.code_compta"=>"company","s.code_compta_fournisseur"=>"company"
+		$this->export_TypeFields_array[$r] = array('ba.ref'=>'Text', 'ba.label'=>'Text', 'b.datev'=>'Date', 'b.dateo'=>'Date', 'b.label'=>'Text', 'b.num_chq'=>'Text', 'b.fk_bordereau'=>'Text', '-b.amount'=>'Numeric', 'b.amount'=>'Numeric', 'b.num_releve'=>'Text', 'b.datec'=>"Date", "bu.url_id"=>"Text", "s.nom"=>"Text", "s.code_compta"=>"Text", "s.code_compta_fournisseur"=>"Text");
+		$this->export_entities_array[$r] = array(
+			'b.rowid'=>'account', 'ba.ref'=>'account', 'ba.label'=>'account', 'b.datev'=>'account', 'b.dateo'=>'account', 'b.label'=>'account',
+			'b.num_chq'=>'account', 'b.fk_bordereau'=>'account', '-b.amount'=>'account', 'b.amount'=>'account', 'b.num_releve'=>'account',
+			'b.datec'=>"account", "bu.url_id"=>"company", "s.nom"=>"company", "s.code_compta"=>"company", "s.code_compta_fournisseur"=>"company"
 		);
-		$this->export_special_array[$r]=array('-b.amount'=>'NULLIFNEG','b.amount'=>'NULLIFNEG');
+		$this->export_special_array[$r] = array('-b.amount'=>'NULLIFNEG', 'b.amount'=>'NULLIFNEG');
 		if (empty($conf->fournisseur->enabled))
 		{
 			unset($this->export_fields_array[$r]['s.code_compta_fournisseur']);
 			unset($this->export_entities_array[$r]['s.code_compta_fournisseur']);
 		}
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'bank_account as ba, '.MAIN_DB_PREFIX.'bank as b)';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."bank_url as bu ON (bu.fk_bank = b.rowid AND bu.type = 'company')";
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON bu.url_id = s.rowid';
-		$this->export_sql_end[$r] .=' WHERE ba.rowid = b.fk_account';
-		$this->export_sql_end[$r] .=' AND ba.entity IN ('.getEntity('bank_account').')';
-		$this->export_sql_order[$r] =' ORDER BY b.datev, b.num_releve';
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM ('.MAIN_DB_PREFIX.'bank_account as ba, '.MAIN_DB_PREFIX.'bank as b)';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX."bank_url as bu ON (bu.fk_bank = b.rowid AND bu.type = 'company')";
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON bu.url_id = s.rowid';
+		$this->export_sql_end[$r] .= ' WHERE ba.rowid = b.fk_account';
+		$this->export_sql_end[$r] .= ' AND ba.entity IN ('.getEntity('bank_account').')';
+		$this->export_sql_order[$r] = ' ORDER BY b.datev, b.num_releve';
 
 		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='Bordereaux remise Chq/Fact';
-		$this->export_permission[$r]=array(array("banque","export"));
-		$this->export_fields_array[$r]=array("bch.rowid"=>"DepositId","bch.ref"=>"Numero","bch.ref_ext"=>"RefExt",'ba.ref'=>'AccountRef','ba.label'=>'AccountLabel','b.datev'=>'DateValue','b.num_chq'=>'ChequeOrTransferNumber','b.amount'=>'Credit','b.num_releve'=>'AccountStatement','b.datec'=>"DateCreation",
-			"bch.date_bordereau"=>"Date","bch.amount"=>"Total","bch.nbcheque"=>"NbCheque","bu.url_id"=>"IdThirdParty","s.nom"=>"ThirdParty","s.code_compta"=>"CustomerAccountancyCode","f.ref"=>"InvoiceRef"
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'Bordereaux remise Chq/Fact';
+		$this->export_permission[$r] = array(array("banque", "export"));
+		$this->export_fields_array[$r] = array("bch.rowid"=>"DepositId", "bch.ref"=>"Numero", "bch.ref_ext"=>"RefExt", 'ba.ref'=>'AccountRef', 'ba.label'=>'AccountLabel', 'b.datev'=>'DateValue', 'b.num_chq'=>'ChequeOrTransferNumber', 'b.amount'=>'Credit', 'b.num_releve'=>'AccountStatement', 'b.datec'=>"DateCreation",
+			"bch.date_bordereau"=>"Date", "bch.amount"=>"Total", "bch.nbcheque"=>"NbCheque", "bu.url_id"=>"IdThirdParty", "s.nom"=>"ThirdParty", "s.code_compta"=>"CustomerAccountancyCode", "f.ref"=>"InvoiceRef"
 			);
-		$this->export_TypeFields_array[$r]=array('ba.ref'=>'Text','ba.label'=>'Text','b.datev'=>'Date','b.num_chq'=>'Text','b.amount'=>'Numeric','b.num_releve'=>'Text','b.datec'=>"Date",
-			"bch.date_bordereau"=>"Date","bch.rowid"=>"Numeric","bch.ref"=>"Numeric","bch.ref_ext"=>"Text","bch.amount"=>"Numeric","bch.nbcheque"=>"Numeric","bu.url_id"=>"Text","s.nom"=>"Text","s.code_compta"=>"Text","f.ref"=>"Text"
+		$this->export_TypeFields_array[$r] = array('ba.ref'=>'Text', 'ba.label'=>'Text', 'b.datev'=>'Date', 'b.num_chq'=>'Text', 'b.amount'=>'Numeric', 'b.num_releve'=>'Text', 'b.datec'=>"Date",
+			"bch.date_bordereau"=>"Date", "bch.rowid"=>"Numeric", "bch.ref"=>"Numeric", "bch.ref_ext"=>"Text", "bch.amount"=>"Numeric", "bch.nbcheque"=>"Numeric", "bu.url_id"=>"Text", "s.nom"=>"Text", "s.code_compta"=>"Text", "f.ref"=>"Text"
 			);
-		$this->export_entities_array[$r]=array('ba.ref'=>'account','ba.label'=>'account','b.datev'=>'account','b.num_chq'=>'account','b.amount'=>'account','b.num_releve'=>'account','b.datec'=>"account",
-			"bu.url_id"=>"company","s.nom"=>"company","s.code_compta"=>"company","s.code_compta_fournisseur"=>"company","f.ref"=>"invoice");
-		$this->export_special_array[$r]=array('b.amount'=>'NULLIFNEG');
-
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'bordereau_cheque as bch, '.MAIN_DB_PREFIX.'bank_account as ba, '.MAIN_DB_PREFIX.'bank as b)';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."bank_url as bu ON (bu.fk_bank = b.rowid AND bu.type = 'company')";
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement as p ON b.rowid = p.fk_bank';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON p.rowid = pf.fk_paiement';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture as f ON f.rowid = pf.fk_facture';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON f.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' WHERE ba.rowid = b.fk_account AND bch.rowid = b.fk_bordereau and bch.fk_bank_account=ba.rowid';
-		$this->export_sql_end[$r] .=" AND b.fk_type = 'CHQ'";
-		$this->export_sql_end[$r] .=' AND p.fk_paiement = 7';
-		$this->export_sql_end[$r] .=' AND ba.entity IN ('.getEntity('bank_account').')';
-		$this->export_sql_order[$r] =' ORDER BY b.datev, b.num_releve';
+		$this->export_entities_array[$r] = array('ba.ref'=>'account', 'ba.label'=>'account', 'b.datev'=>'account', 'b.num_chq'=>'account', 'b.amount'=>'account', 'b.num_releve'=>'account', 'b.datec'=>"account",
+			"bu.url_id"=>"company", "s.nom"=>"company", "s.code_compta"=>"company", "s.code_compta_fournisseur"=>"company", "f.ref"=>"invoice");
+		$this->export_special_array[$r] = array('b.amount'=>'NULLIFNEG');
+
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM ('.MAIN_DB_PREFIX.'bordereau_cheque as bch, '.MAIN_DB_PREFIX.'bank_account as ba, '.MAIN_DB_PREFIX.'bank as b)';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX."bank_url as bu ON (bu.fk_bank = b.rowid AND bu.type = 'company')";
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement as p ON b.rowid = p.fk_bank';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON p.rowid = pf.fk_paiement';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture as f ON f.rowid = pf.fk_facture';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON f.fk_soc = s.rowid';
+		$this->export_sql_end[$r] .= ' WHERE ba.rowid = b.fk_account AND bch.rowid = b.fk_bordereau and bch.fk_bank_account=ba.rowid';
+		$this->export_sql_end[$r] .= " AND b.fk_type = 'CHQ'";
+		$this->export_sql_end[$r] .= ' AND p.fk_paiement = 7';
+		$this->export_sql_end[$r] .= ' AND ba.entity IN ('.getEntity('bank_account').')';
+		$this->export_sql_order[$r] = ' ORDER BY b.datev, b.num_releve';
 	}
 
 
@@ -210,7 +210,7 @@ 
 	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
 		global $conf;
 
@@ -219,6 +219,6 @@ 
 
 		$sql = array();
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

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

Indentation +4 added lines, -4 removed lines

@@ -95,10 +95,10 @@
 
         // 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->phpmin = array(5,4);		// Minimum version of PHP required by 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->phpmin = array(5,4);		// Minimum version of PHP required by module
         $this->langfiles = array("ticket");
         // Constants
         // List of particular constants to add when module is enabled

Spacing +13 added lines, -13 removed lines

@@ -24,7 +24,7 @@ 
  *     \ingroup     ticket
  *     \brief       Description and activation file for module Ticket
  */
-require_once DOL_DOCUMENT_ROOT . "/core/modules/DolibarrModules.class.php";
+require_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
 
 
 /**
@@ -67,7 +67,7 @@ 
         $this->version = 'experimental';
         // Key used in llx_const table to save module status enabled/disabled
         // (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+        $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'
@@ -94,11 +94,11 @@ 
         $this->config_page_url = array("ticket.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->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $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->phpmin = array(5, 4); // Minimum version of PHP required by module
         $this->langfiles = array("ticket");
         // Constants
         // List of particular constants to add when module is enabled
@@ -114,15 +114,15 @@ 
         );
 
         // Dictionaries
-        if (! isset($conf->ticket->enabled)) {
-            $conf->ticket=new stdClass();
-            $conf->ticket->enabled=0;
+        if (!isset($conf->ticket->enabled)) {
+            $conf->ticket = new stdClass();
+            $conf->ticket->enabled = 0;
         }
         $this->dictionaries = array(
             'langs' => 'ticket',
-            'tabname' => array(MAIN_DB_PREFIX . "c_ticket_type", MAIN_DB_PREFIX . "c_ticket_category", MAIN_DB_PREFIX . "c_ticket_severity"),
+            'tabname' => array(MAIN_DB_PREFIX."c_ticket_type", MAIN_DB_PREFIX."c_ticket_category", MAIN_DB_PREFIX."c_ticket_severity"),
             'tablib' => array("TicketDictType", "TicketDictCategory", "TicketDictSeverity"),
-            'tabsql' => array('SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM ' . MAIN_DB_PREFIX . 'c_ticket_type as f', 'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM ' . MAIN_DB_PREFIX . 'c_ticket_category as f', 'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM ' . MAIN_DB_PREFIX . 'c_ticket_severity as f'),
+            'tabsql' => array('SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_type as f', 'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_category as f', 'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_severity as f'),
             'tabsqlsort' => array("pos ASC", "pos ASC", "pos ASC"),
             'tabfield' => array("pos,code,label,use_default", "pos,code,label,use_default", "pos,code,label,use_default"),
             'tabfieldvalue' => array("pos,code,label,use_default", "pos,code,label,use_default", "pos,code,label,use_default"),
@@ -146,7 +146,7 @@ 
         // Permissions
         $this->rights = array(); // Permission array used by this module
 
-        $r=0;
+        $r = 0;
         $this->rights[$r][0] = 56001; // id de la permission
         $this->rights[$r][1] = "Read ticket"; // libelle de la permission
         $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)

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

Indentation +280 added lines, -280 removed lines

@@ -33,288 +33,288 @@
 class modResource extends DolibarrModules
 {
 
-	/**
-	 * 	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 a free id here
-		// (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 63000;
-
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'resource';
-
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		// It is used to group modules in module setup page
-		$this->family = "projects";
-		$this->module_position = '20';
-		// 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));
-		// Module description
-		// used if translation string 'ModuleXXXDesc' not found
-		// (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Manage resources (printers, cars, room, ...) you can then share into events";
-		// Possible values for version are: 'development', 'experimental' or version
-		$this->version = 'dolibarr';
-		// Key used in llx_const table to save module status enabled/disabled
-		// (where MYMODULE 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 = 'resource'; // mypicto@resource
-		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-		// for default path (eg: /resource/core/xxxxx) (0=disable, 1=enable)
-		// for specific path of parts (eg: /resource/core/modules/barcode)
-		// for specific css file (eg: /resource/css/resource.css.php)
-		$this->module_parts = array();
-
-		// Data directories to create when module is enabled.
-		// Example: this->dirs = array("/resource/temp");
-		//$this->dirs = array("/resource");
-
-		// Config pages. Put here list of php pages
-		// stored into resource/admin directory, used to setup module.
-		$this->config_page_url = array("resource.php");
-
-		// Dependencies
-		// List of modules id that must be enabled if this module is enabled
-		$this->depends = array();
-		// List of modules id to disable if this one is disabled
-		$this->requiredby = array('modPlace');
-		// Minimum version of PHP required by module
-		$this->phpmin = array(5, 4);
-
-		$this->langfiles = array("resource"); // langfiles@resource
-		// Constants
-		// List of particular constants to add when module is enabled
-		// (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-		// Example:
-		$this->const = array();
-
-		// Array to add new pages in new tabs
-		// Example:
-		$this->tabs = array(
-			//	// To add a new tab identified by code tabname1
-			//	'objecttype:+tabname1:Title1:langfile@resource:$user->rights->resource->read:/resource/mynewtab1.php?id=__ID__',
-			//	// To add another new tab identified by code tabname2
-			//	'objecttype:+tabname2:Title2:langfile@resource:$user->rights->othermodule->read:/resource/mynewtab2.php?id=__ID__',
-			//	// To remove an existing tab identified by code tabname
-			//	'objecttype:-tabname'
-		);
-		// where objecttype can be
-		// 'thirdparty'			to add a tab in third party view
-		// 'intervention'		to add a tab in intervention view
-		// 'order_supplier'		to add a tab in supplier order view
-		// 'invoice_supplier'	to add a tab in supplier invoice view
-		// 'invoice'			to add a tab in customer invoice view
-		// 'order'				to add a tab in customer order view
-		// 'product'			to add a tab in product view
-		// 'stock'				to add a tab in stock view
-		// 'propal'				to add a tab in propal view
-		// 'member'				to add a tab in fundation member view
-		// 'contract'			to add a tab in contract view
-		// 'user'				to add a tab in user view
-		// 'group'				to add a tab in group view
-		// 'contact'			to add a tab in contact view
-		// 'categories_x'		to add a tab in category view
-		// (reresource 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-
-		// Boxes
-		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
-		$this->boxes = array(); // Boxes list
-		$r = 0;
-		// Example:
-
-		//$this->boxes[$r][1] = "MyBox@resource";
-		//$r ++;
-		/*
+    /**
+     * 	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 a free id here
+        // (See in Home -> System information -> Dolibarr for list of used modules id).
+        $this->numero = 63000;
+
+        // Key text used to identify module (for permissions, menus, etc...)
+        $this->rights_class = 'resource';
+
+        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+        // It is used to group modules in module setup page
+        $this->family = "projects";
+        $this->module_position = '20';
+        // 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));
+        // Module description
+        // used if translation string 'ModuleXXXDesc' not found
+        // (where XXX is value of numeric property 'numero' of module)
+        $this->description = "Manage resources (printers, cars, room, ...) you can then share into events";
+        // Possible values for version are: 'development', 'experimental' or version
+        $this->version = 'dolibarr';
+        // Key used in llx_const table to save module status enabled/disabled
+        // (where MYMODULE 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 = 'resource'; // mypicto@resource
+        // Defined all module parts (triggers, login, substitutions, menus, css, etc...)
+        // for default path (eg: /resource/core/xxxxx) (0=disable, 1=enable)
+        // for specific path of parts (eg: /resource/core/modules/barcode)
+        // for specific css file (eg: /resource/css/resource.css.php)
+        $this->module_parts = array();
+
+        // Data directories to create when module is enabled.
+        // Example: this->dirs = array("/resource/temp");
+        //$this->dirs = array("/resource");
+
+        // Config pages. Put here list of php pages
+        // stored into resource/admin directory, used to setup module.
+        $this->config_page_url = array("resource.php");
+
+        // Dependencies
+        // List of modules id that must be enabled if this module is enabled
+        $this->depends = array();
+        // List of modules id to disable if this one is disabled
+        $this->requiredby = array('modPlace');
+        // Minimum version of PHP required by module
+        $this->phpmin = array(5, 4);
+
+        $this->langfiles = array("resource"); // langfiles@resource
+        // Constants
+        // List of particular constants to add when module is enabled
+        // (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+        // Example:
+        $this->const = array();
+
+        // Array to add new pages in new tabs
+        // Example:
+        $this->tabs = array(
+            //	// To add a new tab identified by code tabname1
+            //	'objecttype:+tabname1:Title1:langfile@resource:$user->rights->resource->read:/resource/mynewtab1.php?id=__ID__',
+            //	// To add another new tab identified by code tabname2
+            //	'objecttype:+tabname2:Title2:langfile@resource:$user->rights->othermodule->read:/resource/mynewtab2.php?id=__ID__',
+            //	// To remove an existing tab identified by code tabname
+            //	'objecttype:-tabname'
+        );
+        // where objecttype can be
+        // 'thirdparty'			to add a tab in third party view
+        // 'intervention'		to add a tab in intervention view
+        // 'order_supplier'		to add a tab in supplier order view
+        // 'invoice_supplier'	to add a tab in supplier invoice view
+        // 'invoice'			to add a tab in customer invoice view
+        // 'order'				to add a tab in customer order view
+        // 'product'			to add a tab in product view
+        // 'stock'				to add a tab in stock view
+        // 'propal'				to add a tab in propal view
+        // 'member'				to add a tab in fundation member view
+        // 'contract'			to add a tab in contract view
+        // 'user'				to add a tab in user view
+        // 'group'				to add a tab in group view
+        // 'contact'			to add a tab in contact view
+        // 'categories_x'		to add a tab in category view
+        // (reresource 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+
+        // Boxes
+        // Add here list of php file(s) stored in core/boxes that contains class to show a box.
+        $this->boxes = array(); // Boxes list
+        $r = 0;
+        // Example:
+
+        //$this->boxes[$r][1] = "MyBox@resource";
+        //$r ++;
+        /*
 		  $this->boxes[$r][1] = "myboxb.php";
 		  $r++;
 		 */
 
-		// Permissions
-		$this->rights = array(); // Permission array used by this module
-		$r = 0;
-
-		$this->rights[$r][0] = 63001;
-		$this->rights[$r][1] = 'Read resources';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'read';
-		$r++;
-
-		$this->rights[$r][0] = 63002;
-		$this->rights[$r][1] = 'Create/Modify resources';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'write';
-		$r++;
-
-		$this->rights[$r][0] = 63003;
-		$this->rights[$r][1] = 'Delete resources';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'delete';
-		$r++;
-
-		$this->rights[$r][0] = 63004;
-		$this->rights[$r][1] = 'Link resources to agenda events';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'link';
-		$r++;
-
-
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
-
-		// Main menu entries
-		$this->menu = array(); // List of menus to add
-		$r = 0;
-
-		// Menus declaration
-		$this->menu[$r]=array(
-			'fk_menu'=>'fk_mainmenu=tools',
-			'type'=>'left',
-			'titre'=> 'MenuResourceIndex',
-			'mainmenu'=>'tools',
-			'leftmenu'=> 'resource',
-			'url'=> '/resource/list.php',
-			'langs'=> 'resource',
-			'position'=> 100,
-			'enabled'=> '1',
-			'perms'=> '$user->rights->resource->read',
-			'user'=> 0
-		);
-		$r++;
-
-		$this->menu[$r++]=array(
-			'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
-			'type'=> 'left', // Toujours un menu gauche
-			'titre'=> 'MenuResourceAdd',
-			'mainmenu'=> 'tools',
-			'leftmenu'=> 'resource_add',
-			'url'=> '/resource/card.php?action=create',
-			'langs'=> 'resource',
-			'position'=> 101,
-			'enabled'=> '1',
-			'perms'=> '$user->rights->resource->write',
-			'target'=> '',
-			'user'=> 0
-		);
-
-		$this->menu[$r++]=array(
-			'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
-			'type'=> 'left', // Toujours un menu gauche
-			'titre'=> 'List',
-			'mainmenu'=> 'tools',
-			'leftmenu'=> 'resource_list',
-			'url'=> '/resource/list.php',
-			'langs'=> 'resource',
-			'position'=> 102,
-			'enabled'=> '1',
-			'perms'=> '$user->rights->resource->read',
-			'target'=> '',
-			'user'=> 0
-		);
-
-
-		// Exports
-		//--------
-		$r=0;
-
-		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]="ResourceSingular";	// Translation key (used only if key ExportDataset_xxx_z not found)
-		$this->export_permission[$r]=array(array("resource","read"));
-		$this->export_fields_array[$r]=array('r.rowid'=>'IdResource','r.ref'=>'ResourceFormLabel_ref','c.code'=>'ResourceTypeCode','c.label'=>'ResourceType','r.description'=>'ResourceFormLabel_description','r.note_private'=>"NotePrivate",'r.note_public'=>"NotePublic",'r.asset_number'=>'AssetNumber','r.datec'=>"DateCreation",'r.tms'=>"DateLastModification");
-		$this->export_TypeFields_array[$r]=array('r.rowid'=>'List:resource:ref','r.ref'=>'Text','r.asset_number'=>'Text','r.description'=>'Text','c.code'=>'Text','c.label'=>'List:c_type_resource:label','r.datec'=>'Date','r.tms'=>'Date','r.note_private'=>'Text','r.note_public'=>'Text');
-		$this->export_entities_array[$r]=array('r.rowid'=>'resource','r.ref'=>'resource','c.code'=>'resource','c.label'=>'resource','r.description'=>'resource','r.note_private'=>"resource",'r.resource'=>"resource",'r.asset_number'=>'resource','r.datec'=>"resource",'r.tms'=>"resource");
-		$keyforselect='resource'; $keyforelement='resource'; $keyforaliasextra='extra';
-		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-
-		$this->export_dependencies_array[$r]=array('resource'=>array('r.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'resource as r ';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_resource as c ON c.rowid=r.fk_code_type_resource';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'resource_extrafields as extra ON extra.fk_object = c.rowid';
-		$this->export_sql_end[$r] .=' AND r.entity IN ('.getEntity('resource').')';
-
-
-		// Imports
-		//--------
-		$r=0;
-
-		// Import list of third parties and attributes
-		$r++;
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
-		$this->import_label[$r]='ImportDataset_resource_1';
-		$this->import_icon[$r]='resource';
-		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r]=array('r'=>MAIN_DB_PREFIX.'resource','extra'=>MAIN_DB_PREFIX.'resource_extrafields');	// List of tables to insert into (insert done in same order)
-		$this->import_fields_array[$r]=array('r.ref'=>"ResourceFormLabel_ref*",'r.fk_code_type_resource'=>'ResourceTypeCode','r.description'=>'ResourceFormLabel_description','r.note_private'=>"NotePrivate",'r.note_public'=>"NotePublic",'r.asset_number'=>'AssetNumber','r.datec'=>'DateCreation');
-		// Add extra fields
-		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'resource' AND entity IN (0,".$conf->entity.")";
-		$resql=$this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
-		{
-			while ($obj=$this->db->fetch_object($resql))
-			{
-				$fieldname='extra.'.$obj->name;
-				$fieldlabel=ucfirst($obj->label);
-				$this->import_fields_array[$r][$fieldname]=$fieldlabel.($obj->fieldrequired?'*':'');
-			}
-		}
-		// End add extra fields
-		$this->import_fieldshidden_array[$r]=array('r.fk_user_author'=>'user->id','extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'resource');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
-		$this->import_convertvalue_array[$r]=array(
-				'r.fk_code_type_resource'=>array('rule'=>'fetchidfromcodeorlabel','classfile'=>'/core/class/ctyperesource.class.php','class'=>'Ctyperesource','method'=>'fetch','dict'=>'DictionaryResourceType'),
-		);
-		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
-		$this->import_regex_array[$r]=array('s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
-		$this->import_examplevalues_array[$r]=array('r.ref'=>"REF1",'r.fk_code_type_resource'=>"Code from dictionary resource type",'r.datec'=>"2017-01-01 or 2017-01-01 12:30:00");
-		$this->import_updatekeys_array[$r]=array('r.rf'=>'ResourceFormLabel_ref');
-	}
-
-	/**
-	 * 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 = '')
-	{
-		$sql = array();
-
-		$result = $this->loadTables();
-
-		return $this->_init($sql, $options);
-	}
-
-	/**
-	 * Create tables, keys and data required by module
-	 * Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys
-	 * and create data commands must be stored in directory /resource/sql/
-	 * This function is called by this->init
-	 *
-	 * 	@return		int		<=0 if KO, >0 if OK
-	 */
-	private function loadTables()
-	{
-		return $this->_load_tables('/resource/sql/');
-	}
+        // Permissions
+        $this->rights = array(); // Permission array used by this module
+        $r = 0;
+
+        $this->rights[$r][0] = 63001;
+        $this->rights[$r][1] = 'Read resources';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'read';
+        $r++;
+
+        $this->rights[$r][0] = 63002;
+        $this->rights[$r][1] = 'Create/Modify resources';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'write';
+        $r++;
+
+        $this->rights[$r][0] = 63003;
+        $this->rights[$r][1] = 'Delete resources';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'delete';
+        $r++;
+
+        $this->rights[$r][0] = 63004;
+        $this->rights[$r][1] = 'Link resources to agenda events';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'link';
+        $r++;
+
+
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+
+
+        // Main menu entries
+        $this->menu = array(); // List of menus to add
+        $r = 0;
+
+        // Menus declaration
+        $this->menu[$r]=array(
+            'fk_menu'=>'fk_mainmenu=tools',
+            'type'=>'left',
+            'titre'=> 'MenuResourceIndex',
+            'mainmenu'=>'tools',
+            'leftmenu'=> 'resource',
+            'url'=> '/resource/list.php',
+            'langs'=> 'resource',
+            'position'=> 100,
+            'enabled'=> '1',
+            'perms'=> '$user->rights->resource->read',
+            'user'=> 0
+        );
+        $r++;
+
+        $this->menu[$r++]=array(
+            'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
+            'type'=> 'left', // Toujours un menu gauche
+            'titre'=> 'MenuResourceAdd',
+            'mainmenu'=> 'tools',
+            'leftmenu'=> 'resource_add',
+            'url'=> '/resource/card.php?action=create',
+            'langs'=> 'resource',
+            'position'=> 101,
+            'enabled'=> '1',
+            'perms'=> '$user->rights->resource->write',
+            'target'=> '',
+            'user'=> 0
+        );
+
+        $this->menu[$r++]=array(
+            'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
+            'type'=> 'left', // Toujours un menu gauche
+            'titre'=> 'List',
+            'mainmenu'=> 'tools',
+            'leftmenu'=> 'resource_list',
+            'url'=> '/resource/list.php',
+            'langs'=> 'resource',
+            'position'=> 102,
+            'enabled'=> '1',
+            'perms'=> '$user->rights->resource->read',
+            'target'=> '',
+            'user'=> 0
+        );
+
+
+        // Exports
+        //--------
+        $r=0;
+
+        $r++;
+        $this->export_code[$r]=$this->rights_class.'_'.$r;
+        $this->export_label[$r]="ResourceSingular";	// Translation key (used only if key ExportDataset_xxx_z not found)
+        $this->export_permission[$r]=array(array("resource","read"));
+        $this->export_fields_array[$r]=array('r.rowid'=>'IdResource','r.ref'=>'ResourceFormLabel_ref','c.code'=>'ResourceTypeCode','c.label'=>'ResourceType','r.description'=>'ResourceFormLabel_description','r.note_private'=>"NotePrivate",'r.note_public'=>"NotePublic",'r.asset_number'=>'AssetNumber','r.datec'=>"DateCreation",'r.tms'=>"DateLastModification");
+        $this->export_TypeFields_array[$r]=array('r.rowid'=>'List:resource:ref','r.ref'=>'Text','r.asset_number'=>'Text','r.description'=>'Text','c.code'=>'Text','c.label'=>'List:c_type_resource:label','r.datec'=>'Date','r.tms'=>'Date','r.note_private'=>'Text','r.note_public'=>'Text');
+        $this->export_entities_array[$r]=array('r.rowid'=>'resource','r.ref'=>'resource','c.code'=>'resource','c.label'=>'resource','r.description'=>'resource','r.note_private'=>"resource",'r.resource'=>"resource",'r.asset_number'=>'resource','r.datec'=>"resource",'r.tms'=>"resource");
+        $keyforselect='resource'; $keyforelement='resource'; $keyforaliasextra='extra';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+
+        $this->export_dependencies_array[$r]=array('resource'=>array('r.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'resource as r ';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_resource as c ON c.rowid=r.fk_code_type_resource';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'resource_extrafields as extra ON extra.fk_object = c.rowid';
+        $this->export_sql_end[$r] .=' AND r.entity IN ('.getEntity('resource').')';
+
+
+        // Imports
+        //--------
+        $r=0;
+
+        // Import list of third parties and attributes
+        $r++;
+        $this->import_code[$r]=$this->rights_class.'_'.$r;
+        $this->import_label[$r]='ImportDataset_resource_1';
+        $this->import_icon[$r]='resource';
+        $this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
+        $this->import_tables_array[$r]=array('r'=>MAIN_DB_PREFIX.'resource','extra'=>MAIN_DB_PREFIX.'resource_extrafields');	// List of tables to insert into (insert done in same order)
+        $this->import_fields_array[$r]=array('r.ref'=>"ResourceFormLabel_ref*",'r.fk_code_type_resource'=>'ResourceTypeCode','r.description'=>'ResourceFormLabel_description','r.note_private'=>"NotePrivate",'r.note_public'=>"NotePublic",'r.asset_number'=>'AssetNumber','r.datec'=>'DateCreation');
+        // Add extra fields
+        $sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'resource' AND entity IN (0,".$conf->entity.")";
+        $resql=$this->db->query($sql);
+        if ($resql)    // This can fail when class is used on old database (during migration for example)
+        {
+            while ($obj=$this->db->fetch_object($resql))
+            {
+                $fieldname='extra.'.$obj->name;
+                $fieldlabel=ucfirst($obj->label);
+                $this->import_fields_array[$r][$fieldname]=$fieldlabel.($obj->fieldrequired?'*':'');
+            }
+        }
+        // End add extra fields
+        $this->import_fieldshidden_array[$r]=array('r.fk_user_author'=>'user->id','extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'resource');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+        $this->import_convertvalue_array[$r]=array(
+                'r.fk_code_type_resource'=>array('rule'=>'fetchidfromcodeorlabel','classfile'=>'/core/class/ctyperesource.class.php','class'=>'Ctyperesource','method'=>'fetch','dict'=>'DictionaryResourceType'),
+        );
+        //$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
+        $this->import_regex_array[$r]=array('s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
+        $this->import_examplevalues_array[$r]=array('r.ref'=>"REF1",'r.fk_code_type_resource'=>"Code from dictionary resource type",'r.datec'=>"2017-01-01 or 2017-01-01 12:30:00");
+        $this->import_updatekeys_array[$r]=array('r.rf'=>'ResourceFormLabel_ref');
+    }
+
+    /**
+     * 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 = '')
+    {
+        $sql = array();
+
+        $result = $this->loadTables();
+
+        return $this->_init($sql, $options);
+    }
+
+    /**
+     * Create tables, keys and data required by module
+     * Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys
+     * and create data commands must be stored in directory /resource/sql/
+     * This function is called by this->init
+     *
+     * 	@return		int		<=0 if KO, >0 if OK
+     */
+    private function loadTables()
+    {
+        return $this->_load_tables('/resource/sql/');
+    }
 }

Spacing +39 added lines, -39 removed lines

@@ -25,7 +25,7 @@ 
  * 	\ingroup	resource
  * 	\brief		Description and activation file for module Resource
  */
-include_once DOL_DOCUMENT_ROOT . "/core/modules/DolibarrModules.class.php";
+include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
 
 /**
  * Description and activation class for module Resource
@@ -68,7 +68,7 @@ 
 		$this->version = 'dolibarr';
 		// Key used in llx_const table to save module status enabled/disabled
 		// (where MYMODULE is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+		$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'
@@ -176,7 +176,7 @@ 
 
 		// Menus
 		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 
 		// Main menu entries
@@ -184,7 +184,7 @@ 
 		$r = 0;
 
 		// Menus declaration
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 			'fk_menu'=>'fk_mainmenu=tools',
 			'type'=>'left',
 			'titre'=> 'MenuResourceIndex',
@@ -199,7 +199,7 @@ 
 		);
 		$r++;
 
-		$this->menu[$r++]=array(
+		$this->menu[$r++] = array(
 			'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
 			'type'=> 'left', // Toujours un menu gauche
 			'titre'=> 'MenuResourceAdd',
@@ -214,7 +214,7 @@ 
 			'user'=> 0
 		);
 
-		$this->menu[$r++]=array(
+		$this->menu[$r++] = array(
 			'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
 			'type'=> 'left', // Toujours un menu gauche
 			'titre'=> 'List',
@@ -232,59 +232,59 @@ 
 
 		// Exports
 		//--------
-		$r=0;
+		$r = 0;
 
 		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]="ResourceSingular";	// Translation key (used only if key ExportDataset_xxx_z not found)
-		$this->export_permission[$r]=array(array("resource","read"));
-		$this->export_fields_array[$r]=array('r.rowid'=>'IdResource','r.ref'=>'ResourceFormLabel_ref','c.code'=>'ResourceTypeCode','c.label'=>'ResourceType','r.description'=>'ResourceFormLabel_description','r.note_private'=>"NotePrivate",'r.note_public'=>"NotePublic",'r.asset_number'=>'AssetNumber','r.datec'=>"DateCreation",'r.tms'=>"DateLastModification");
-		$this->export_TypeFields_array[$r]=array('r.rowid'=>'List:resource:ref','r.ref'=>'Text','r.asset_number'=>'Text','r.description'=>'Text','c.code'=>'Text','c.label'=>'List:c_type_resource:label','r.datec'=>'Date','r.tms'=>'Date','r.note_private'=>'Text','r.note_public'=>'Text');
-		$this->export_entities_array[$r]=array('r.rowid'=>'resource','r.ref'=>'resource','c.code'=>'resource','c.label'=>'resource','r.description'=>'resource','r.note_private'=>"resource",'r.resource'=>"resource",'r.asset_number'=>'resource','r.datec'=>"resource",'r.tms'=>"resource");
-		$keyforselect='resource'; $keyforelement='resource'; $keyforaliasextra='extra';
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = "ResourceSingular"; // Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_permission[$r] = array(array("resource", "read"));
+		$this->export_fields_array[$r] = array('r.rowid'=>'IdResource', 'r.ref'=>'ResourceFormLabel_ref', 'c.code'=>'ResourceTypeCode', 'c.label'=>'ResourceType', 'r.description'=>'ResourceFormLabel_description', 'r.note_private'=>"NotePrivate", 'r.note_public'=>"NotePublic", 'r.asset_number'=>'AssetNumber', 'r.datec'=>"DateCreation", 'r.tms'=>"DateLastModification");
+		$this->export_TypeFields_array[$r] = array('r.rowid'=>'List:resource:ref', 'r.ref'=>'Text', 'r.asset_number'=>'Text', 'r.description'=>'Text', 'c.code'=>'Text', 'c.label'=>'List:c_type_resource:label', 'r.datec'=>'Date', 'r.tms'=>'Date', 'r.note_private'=>'Text', 'r.note_public'=>'Text');
+		$this->export_entities_array[$r] = array('r.rowid'=>'resource', 'r.ref'=>'resource', 'c.code'=>'resource', 'c.label'=>'resource', 'r.description'=>'resource', 'r.note_private'=>"resource", 'r.resource'=>"resource", 'r.asset_number'=>'resource', 'r.datec'=>"resource", 'r.tms'=>"resource");
+		$keyforselect = 'resource'; $keyforelement = 'resource'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
-		$this->export_dependencies_array[$r]=array('resource'=>array('r.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'resource as r ';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_resource as c ON c.rowid=r.fk_code_type_resource';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'resource_extrafields as extra ON extra.fk_object = c.rowid';
-		$this->export_sql_end[$r] .=' AND r.entity IN ('.getEntity('resource').')';
+		$this->export_dependencies_array[$r] = array('resource'=>array('r.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'resource as r ';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_resource as c ON c.rowid=r.fk_code_type_resource';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'resource_extrafields as extra ON extra.fk_object = c.rowid';
+		$this->export_sql_end[$r] .= ' AND r.entity IN ('.getEntity('resource').')';
 
 
 		// Imports
 		//--------
-		$r=0;
+		$r = 0;
 
 		// Import list of third parties and attributes
 		$r++;
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
-		$this->import_label[$r]='ImportDataset_resource_1';
-		$this->import_icon[$r]='resource';
-		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r]=array('r'=>MAIN_DB_PREFIX.'resource','extra'=>MAIN_DB_PREFIX.'resource_extrafields');	// List of tables to insert into (insert done in same order)
-		$this->import_fields_array[$r]=array('r.ref'=>"ResourceFormLabel_ref*",'r.fk_code_type_resource'=>'ResourceTypeCode','r.description'=>'ResourceFormLabel_description','r.note_private'=>"NotePrivate",'r.note_public'=>"NotePublic",'r.asset_number'=>'AssetNumber','r.datec'=>'DateCreation');
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = 'ImportDataset_resource_1';
+		$this->import_icon[$r] = 'resource';
+		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = array('r'=>MAIN_DB_PREFIX.'resource', 'extra'=>MAIN_DB_PREFIX.'resource_extrafields'); // List of tables to insert into (insert done in same order)
+		$this->import_fields_array[$r] = array('r.ref'=>"ResourceFormLabel_ref*", 'r.fk_code_type_resource'=>'ResourceTypeCode', 'r.description'=>'ResourceFormLabel_description', 'r.note_private'=>"NotePrivate", 'r.note_public'=>"NotePublic", 'r.asset_number'=>'AssetNumber', 'r.datec'=>'DateCreation');
 		// Add extra fields
-		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'resource' AND entity IN (0,".$conf->entity.")";
-		$resql=$this->db->query($sql);
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'resource' AND entity IN (0,".$conf->entity.")";
+		$resql = $this->db->query($sql);
 		if ($resql)    // This can fail when class is used on old database (during migration for example)
 		{
-			while ($obj=$this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
-				$fieldname='extra.'.$obj->name;
-				$fieldlabel=ucfirst($obj->label);
-				$this->import_fields_array[$r][$fieldname]=$fieldlabel.($obj->fieldrequired?'*':'');
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
 			}
 		}
 		// End add extra fields
-		$this->import_fieldshidden_array[$r]=array('r.fk_user_author'=>'user->id','extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'resource');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
-		$this->import_convertvalue_array[$r]=array(
-				'r.fk_code_type_resource'=>array('rule'=>'fetchidfromcodeorlabel','classfile'=>'/core/class/ctyperesource.class.php','class'=>'Ctyperesource','method'=>'fetch','dict'=>'DictionaryResourceType'),
+		$this->import_fieldshidden_array[$r] = array('r.fk_user_author'=>'user->id', 'extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'resource'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+		$this->import_convertvalue_array[$r] = array(
+				'r.fk_code_type_resource'=>array('rule'=>'fetchidfromcodeorlabel', 'classfile'=>'/core/class/ctyperesource.class.php', 'class'=>'Ctyperesource', 'method'=>'fetch', 'dict'=>'DictionaryResourceType'),
 		);
 		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
-		$this->import_regex_array[$r]=array('s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
-		$this->import_examplevalues_array[$r]=array('r.ref'=>"REF1",'r.fk_code_type_resource'=>"Code from dictionary resource type",'r.datec'=>"2017-01-01 or 2017-01-01 12:30:00");
-		$this->import_updatekeys_array[$r]=array('r.rf'=>'ResourceFormLabel_ref');
+		$this->import_regex_array[$r] = array('s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
+		$this->import_examplevalues_array[$r] = array('r.ref'=>"REF1", 'r.fk_code_type_resource'=>"Code from dictionary resource type", 'r.datec'=>"2017-01-01 or 2017-01-01 12:30:00");
+		$this->import_updatekeys_array[$r] = array('r.rf'=>'ResourceFormLabel_ref');
 	}
 
 	/**

Braces +3 added lines, -1 removed lines

@@ -267,11 +267,13 @@
 		// Add extra fields
 		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'resource' AND entity IN (0,".$conf->entity.")";
 		$resql=$this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		if ($resql) {
+		    // This can fail when class is used on old database (during migration for example)
 		{
 			while ($obj=$this->db->fetch_object($resql))
 			{
 				$fieldname='extra.'.$obj->name;
+		}
 				$fieldlabel=ucfirst($obj->label);
 				$this->import_fields_array[$r][$fieldname]=$fieldlabel.($obj->fieldrequired?'*':'');
 			}

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

Indentation +73 added lines, -73 removed lines

@@ -33,80 +33,80 @@
 class modLabel extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-		$this->numero = 60;
-
-		$this->family = "technic";
-		$this->module_position = '75';
-		// 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 etiquettes";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'development';
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='label';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array("/label/temp");
-
-		// 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->phpmin = array(5,4);		// Minimum version of PHP required by module
-
-		// Config pages
-		// $this->config_page_url = array("label.php");
-
-		// Constants
-		$this->const = array();
-
-		// Boxes
-		$this->boxes = array();
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'label';
-
-		$this->rights[1][0] = 601; // id de la permission
-		$this->rights[1][1] = 'Lire les etiquettes'; // libelle de la permission
-		$this->rights[1][3] = 1; // La permission est-elle une permission par defaut
-		$this->rights[1][4] = 'lire';
-
-		$this->rights[2][0] = 602; // id de la permission
-		$this->rights[2][1] = 'Creer/modifier les etiquettes'; // libelle de la permission
-		$this->rights[2][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[2][4] = 'creer';
-
-		$this->rights[4][0] = 609; // id de la permission
-		$this->rights[4][1] = 'Supprimer les etiquettes'; // libelle de la permission
-		$this->rights[4][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[4][4] = 'supprimer';
-	}
-
-	/**
-	 *		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
-	 *
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->numero = 60;
+
+        $this->family = "technic";
+        $this->module_position = '75';
+        // 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 etiquettes";
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'development';
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='label';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array("/label/temp");
+
+        // 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->phpmin = array(5,4);		// Minimum version of PHP required by module
+
+        // Config pages
+        // $this->config_page_url = array("label.php");
+
+        // Constants
+        $this->const = array();
+
+        // Boxes
+        $this->boxes = array();
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'label';
+
+        $this->rights[1][0] = 601; // id de la permission
+        $this->rights[1][1] = 'Lire les etiquettes'; // libelle de la permission
+        $this->rights[1][3] = 1; // La permission est-elle une permission par defaut
+        $this->rights[1][4] = 'lire';
+
+        $this->rights[2][0] = 602; // id de la permission
+        $this->rights[2][1] = 'Creer/modifier les etiquettes'; // libelle de la permission
+        $this->rights[2][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[2][4] = 'creer';
+
+        $this->rights[4][0] = 609; // id de la permission
+        $this->rights[4][1] = 'Supprimer les etiquettes'; // libelle de la permission
+        $this->rights[4][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[4][4] = 'supprimer';
+    }
+
+    /**
+     *		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
-	 */
-	function init($options='')
-	{
-		// Permissions
-		$this->remove($options);
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        // Permissions
+        $this->remove($options);
 
-		$sql = array();
+        $sql = array();
 
-		return $this->_init($sql,$options);
-	}
+        return $this->_init($sql,$options);
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -24,7 +24,7 @@ 
  *	\brief      Fichier de description et activation du module Label
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -46,22 +46,22 @@ 
 		$this->family = "technic";
 		$this->module_position = '75';
 		// 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->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Gestion des etiquettes";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'development';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='label';
+		$this->picto = 'label';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/label/temp");
 
 		// 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->phpmin = array(5,4);		// Minimum version of PHP required by module
+		$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->phpmin = array(5, 4); // Minimum version of PHP required by module
 
 		// Config pages
 		// $this->config_page_url = array("label.php");
@@ -100,13 +100,13 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
 		// Permissions
 		$this->remove($options);
 
 		$sql = array();
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

dolibarr/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php

Indentation +581 added lines, -581 removed lines

@@ -43,137 +43,137 @@ 
      */
     public $db;
 
-	/**
+    /**
      * @var string model name
      */
     public $name;
 
-	/**
+    /**
      * @var string model description (short text)
      */
     public $description;
 
-	/**
+    /**
      * @var string document type
      */
     public $type;
 
     /**
      * @var array() Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.4 = array(5, 4)
+     * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 4);
+    public $phpmin = array(5, 4);
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
-	/**
+    /**
      * @var int page_largeur
      */
     public $page_largeur;
 
-	/**
+    /**
      * @var int page_hauteur
      */
     public $page_hauteur;
 
-	/**
+    /**
      * @var array format
      */
     public $format;
 
-	/**
+    /**
      * @var int marge_gauche
      */
-	public $marge_gauche;
+    public $marge_gauche;
 
-	/**
+    /**
      * @var int marge_droite
      */
-	public $marge_droite;
+    public $marge_droite;
 
-	/**
+    /**
      * @var int marge_haute
      */
-	public $marge_haute;
+    public $marge_haute;
 
-	/**
+    /**
      * @var int marge_basse
      */
-	public $marge_basse;
-
-	/**
-	 * Issuer
-	 * @var Societe
-	 */
-	public $emetteur;
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param	DoliDB		$db     	Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $langs, $mysoc;
-
-		// Load translation files required by the page
-		$langs->loadLangs(array("main", "bills"));
-
-		$this->db = $db;
-		$this->name = "standard";
-		$this->description = $langs->trans('DocumentModelStandardPDF');
-
-		// Dimension page pour format A4
-		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
-		$this->page_largeur = $formatarray['width'];
-		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_multilang = 1;               // Dispo en plusieurs langues
-
-		$this->franchise=!$mysoc->tva_assuj;
+    public $marge_basse;
+
+    /**
+     * Issuer
+     * @var Societe
+     */
+    public $emetteur;
 
-        // Defini position des colonnes
-		$this->posxdate=$this->marge_gauche+1;
-		$this->posxreffacturefourn=30;
-		$this->posxreffacture=65;
-		$this->posxtype=100;
-		$this->posxtotalht=80;
-		$this->posxtva=90;
-		$this->posxtotalttc=180;
-
-		//if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
-			$this->posxreffacturefourn-=20;
-			$this->posxreffacture-=20;
-			$this->posxtype-=20;
-			$this->posxtotalht-=20;
-			$this->posxtva-=20;
-			$this->posxtotalttc-=20;
-		}
 
-		$this->tva=array();
+    /**
+     *	Constructor
+     *
+     *  @param	DoliDB		$db     	Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $langs, $mysoc;
+
+        // Load translation files required by the page
+        $langs->loadLangs(array("main", "bills"));
+
+        $this->db = $db;
+        $this->name = "standard";
+        $this->description = $langs->trans('DocumentModelStandardPDF');
+
+        // Dimension page pour format A4
+        $this->type = 'pdf';
+        $formatarray=pdf_getFormat();
+        $this->page_largeur = $formatarray['width'];
+        $this->page_hauteur = $formatarray['height'];
+        $this->format = array($this->page_largeur,$this->page_hauteur);
+        $this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
+        $this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
+        $this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
+        $this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+
+        $this->option_logo = 1;                    // Affiche logo
+        $this->option_multilang = 1;               // Dispo en plusieurs langues
+
+        $this->franchise=!$mysoc->tva_assuj;
+
+        // Defini position des colonnes
+        $this->posxdate=$this->marge_gauche+1;
+        $this->posxreffacturefourn=30;
+        $this->posxreffacture=65;
+        $this->posxtype=100;
+        $this->posxtotalht=80;
+        $this->posxtva=90;
+        $this->posxtotalttc=180;
+
+        //if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
+        if ($this->page_largeur < 210) // To work with US executive format
+        {
+            $this->posxreffacturefourn-=20;
+            $this->posxreffacture-=20;
+            $this->posxtype-=20;
+            $this->posxtotalht-=20;
+            $this->posxtva-=20;
+            $this->posxtotalttc-=20;
+        }
+
+        $this->tva=array();
         $this->localtax1=array();
         $this->localtax2=array();
-		$this->atleastoneratenotnull=0;
-		$this->atleastonediscount=0;
+        $this->atleastoneratenotnull=0;
+        $this->atleastonediscount=0;
 
-		// Recupere emetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
-	}
+        // Recupere emetteur
+        $this->emetteur=$mysoc;
+        if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -188,90 +188,90 @@ 
      *  @param		int					$hideref			Do not show ref
      *  @return		int										1=OK, 0=KO
      */
-	function write_file($object, $outputlangs='', $srctemplatepath='', $hidedetails=0, $hidedesc=0, $hideref=0)
-	{
+    function write_file($object, $outputlangs='', $srctemplatepath='', $hidedetails=0, $hidedesc=0, $hideref=0)
+    {
         // phpcs:enable
-		global $user, $langs, $conf, $mysoc, $hookmanager;
-
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-
-		// Load translation files required by the page
-		$outputlangs->loadLangs(array("main", "suppliers", "companies", "bills", "dict", "products"));
-
-		$object->factures = array();
-
-		if ($conf->fournisseur->payment->dir_output)
-		{
-			$object->fetch_thirdparty();
-			/**
-			 *	Supplier invoice list
-			 */
-			$sql = 'SELECT f.rowid, f.ref, f.datef, f.ref_supplier, f.total_ht, f.total_tva, f.total_ttc, pf.amount, f.rowid as facid, f.paye';
-			$sql .= ', f.fk_statut, s.nom as name, s.rowid as socid';
-			$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf,'.MAIN_DB_PREFIX.'facture_fourn as f,'.MAIN_DB_PREFIX.'societe as s';
-			$sql .= ' WHERE pf.fk_facturefourn = f.rowid AND f.fk_soc = s.rowid';
-			$sql .= ' AND pf.fk_paiementfourn = '.$object->id;
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				if ($this->db->num_rows($resql) > 0)
-				{
-					while($objp = $this->db->fetch_object($resql)) {
-						$objp->type = $outputlangs->trans('SupplierInvoice');
-						$object->lines[] = $objp;
-					}
-				}
-			}
-
-			$total = $object->montant;
-
-			// Definition of $dir and $file
-			if ($object->specimen)
-			{
-				$dir = $conf->fournisseur->payment->dir_output;
-				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
-			{
-				$objectref = dol_sanitizeFileName($object->ref);
-				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
+        global $user, $langs, $conf, $mysoc, $hookmanager;
+
+        if (! is_object($outputlangs)) $outputlangs=$langs;
+        // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+        if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+
+        // Load translation files required by the page
+        $outputlangs->loadLangs(array("main", "suppliers", "companies", "bills", "dict", "products"));
+
+        $object->factures = array();
+
+        if ($conf->fournisseur->payment->dir_output)
+        {
+            $object->fetch_thirdparty();
+            /**
+             *	Supplier invoice list
+             */
+            $sql = 'SELECT f.rowid, f.ref, f.datef, f.ref_supplier, f.total_ht, f.total_tva, f.total_ttc, pf.amount, f.rowid as facid, f.paye';
+            $sql .= ', f.fk_statut, s.nom as name, s.rowid as socid';
+            $sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf,'.MAIN_DB_PREFIX.'facture_fourn as f,'.MAIN_DB_PREFIX.'societe as s';
+            $sql .= ' WHERE pf.fk_facturefourn = f.rowid AND f.fk_soc = s.rowid';
+            $sql .= ' AND pf.fk_paiementfourn = '.$object->id;
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                if ($this->db->num_rows($resql) > 0)
+                {
+                    while($objp = $this->db->fetch_object($resql)) {
+                        $objp->type = $outputlangs->trans('SupplierInvoice');
+                        $object->lines[] = $objp;
+                    }
+                }
+            }
+
+            $total = $object->montant;
+
+            // Definition of $dir and $file
+            if ($object->specimen)
+            {
+                $dir = $conf->fournisseur->payment->dir_output;
+                $file = $dir . "/SPECIMEN.pdf";
+            }
+            else
+            {
+                $objectref = dol_sanitizeFileName($object->ref);
+                $objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
                 $dir = $conf->fournisseur->payment->dir_output.'/'.$objectref;
-				$file = $dir . "/" . $objectref . ".pdf";
-				if (! empty($conf->global->SUPPLIER_REF_IN_NAME)) $file = $dir . "/" . $objectref . ($objectrefsupplier?"_".$objectrefsupplier:"").".pdf";
-			}
+                $file = $dir . "/" . $objectref . ".pdf";
+                if (! empty($conf->global->SUPPLIER_REF_IN_NAME)) $file = $dir . "/" . $objectref . ($objectrefsupplier?"_".$objectrefsupplier:"").".pdf";
+            }
 
-			if (! file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-					return 0;
-				}
-			}
+            if (! file_exists($dir))
+            {
+                if (dol_mkdir($dir) < 0)
+                {
+                    $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                    return 0;
+                }
+            }
 
-			if (file_exists($dir))
-			{
-				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
-				}
-				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-				global $action;
-				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-				$nblignes = count($object->lines);
+            if (file_exists($dir))
+            {
+                // Add pdfgeneration hook
+                if (! is_object($hookmanager))
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+                    $hookmanager=new HookManager($this->db);
+                }
+                $hookmanager->initHooks(array('pdfgeneration'));
+                $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+                global $action;
+                $reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+                $nblignes = count($object->lines);
 
                 $pdf=pdf_getInstance($this->format);
                 $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
                 $heightforinfotot = 50;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
+                $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
+                $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
+                if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
                 $pdf->SetAutoPageBreak(1,0);
 
                 if (class_exists('TCPDF'))
@@ -287,387 +287,387 @@ 
                     $tplidx = $pdf->importPage(1);
                 }
 
-				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
+                $pdf->Open();
+                $pagenb=0;
+                $pdf->SetDrawColor(128,128,128);
 
-				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-				$pdf->SetSubject($outputlangs->transnoentities("Invoice"));
-				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
-				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+                $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+                $pdf->SetSubject($outputlangs->transnoentities("Invoice"));
+                $pdf->SetCreator("Dolibarr ".DOL_VERSION);
+                $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+                $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
+                if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+                $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 
 
                 // New page
-				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-				$pagenb++;
-				$this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', $default_font_size - 1);
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
-				$pdf->SetTextColor(0,0,0);
-
-				$tab_top = 90;
-				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
-				$tab_height = 130;
-				$tab_height_newpage = 150;
-
-				// Incoterm
-				$height_incoterms = 0;
-
-				$height_note=0;
-
-				$iniY = $tab_top + 7;
-				$curY = $tab_top + 7;
-				$nexY = $tab_top + 7;
-
-				// Loop on each lines
-				for ($i = 0 ; $i < $nblignes ; $i++)
-				{
-					$curY = $nexY;
-					$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
-					$pdf->SetTextColor(0,0,0);
-
-					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
-					$pageposbefore=$pdf->getPage();
-
-					// Description of product line
-					$curX = $this->posxdate-1;
-					$showpricebeforepagebreak=1;
-
-					$pdf->startTransaction();
-					//pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc,1);
-					$pdf->writeHTMLCell($this->posxtva-$curX, 4, $curX, $curY, $object->lines[$i]->datef, 0, 1, false, true, 'J',true);
-					$pageposafter=$pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					{
-						$pdf->rollbackTransaction(true);
-						$pageposafter=$pageposbefore;
-						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-						//pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc,1);
-						$pdf->writeHTMLCell($this->posxtva-$curX, 4, $curX, $curY, $object->lines[$i]->datef, 0, 1, false, true, 'J',true);
-						$posyafter=$pdf->GetY();
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
-						{
-							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
-							{
-								$pdf->AddPage('','',true);
-								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-								$pdf->setPage($pageposafter+1);
-							}
-						}
-						else
-						{
-							// We found a page break
-							$showpricebeforepagebreak=0;
-						}
-					}
-					else	// No pagebreak
-					{
-						$pdf->commitTransaction();
-					}
-
-					$nexY = $pdf->GetY();
+                $pdf->AddPage();
+                if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                $pagenb++;
+                $this->_pagehead($pdf, $object, 1, $outputlangs);
+                $pdf->SetFont('','', $default_font_size - 1);
+                $pdf->MultiCell(0, 3, '');		// Set interline to 3
+                $pdf->SetTextColor(0,0,0);
+
+                $tab_top = 90;
+                $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
+                $tab_height = 130;
+                $tab_height_newpage = 150;
+
+                // Incoterm
+                $height_incoterms = 0;
+
+                $height_note=0;
+
+                $iniY = $tab_top + 7;
+                $curY = $tab_top + 7;
+                $nexY = $tab_top + 7;
+
+                // Loop on each lines
+                for ($i = 0 ; $i < $nblignes ; $i++)
+                {
+                    $curY = $nexY;
+                    $pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
+                    $pdf->SetTextColor(0,0,0);
+
+                    $pdf->setTopMargin($tab_top_newpage);
+                    $pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
+                    $pageposbefore=$pdf->getPage();
+
+                    // Description of product line
+                    $curX = $this->posxdate-1;
+                    $showpricebeforepagebreak=1;
+
+                    $pdf->startTransaction();
+                    //pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc,1);
+                    $pdf->writeHTMLCell($this->posxtva-$curX, 4, $curX, $curY, $object->lines[$i]->datef, 0, 1, false, true, 'J',true);
+                    $pageposafter=$pdf->getPage();
+                    if ($pageposafter > $pageposbefore)	// There is a pagebreak
+                    {
+                        $pdf->rollbackTransaction(true);
+                        $pageposafter=$pageposbefore;
+                        //print $pageposafter.'-'.$pageposbefore;exit;
+                        $pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+                        //pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc,1);
+                        $pdf->writeHTMLCell($this->posxtva-$curX, 4, $curX, $curY, $object->lines[$i]->datef, 0, 1, false, true, 'J',true);
+                        $posyafter=$pdf->GetY();
+                        if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
+                        {
+                            if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
+                            {
+                                $pdf->AddPage('','',true);
+                                if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                                if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+                                $pdf->setPage($pageposafter+1);
+                            }
+                        }
+                        else
+                        {
+                            // We found a page break
+                            $showpricebeforepagebreak=0;
+                        }
+                    }
+                    else	// No pagebreak
+                    {
+                        $pdf->commitTransaction();
+                    }
+
+                    $nexY = $pdf->GetY();
                     $pageposafter=$pdf->getPage();
-					$pdf->setPage($pageposbefore);
-					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+                    $pdf->setPage($pageposbefore);
+                    $pdf->setTopMargin($this->marge_haute);
+                    $pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
 
-					// We suppose that a too long description is moved completely on next page
-					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
-						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
-					}
+                    // We suppose that a too long description is moved completely on next page
+                    if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+                        $pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+                    }
 
-					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
+                    $pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
 
-					// ref fourn
-					$pdf->SetXY($this->posxreffacturefourn, $curY);
-					$pdf->MultiCell($this->posxreffacturefourn-$this->posxup-0.8, 3, $object->lines[$i]->ref_supplier, 0, 'L', 0);
+                    // ref fourn
+                    $pdf->SetXY($this->posxreffacturefourn, $curY);
+                    $pdf->MultiCell($this->posxreffacturefourn-$this->posxup-0.8, 3, $object->lines[$i]->ref_supplier, 0, 'L', 0);
 
-					// ref facture fourn
-					$pdf->SetXY($this->posxreffacture, $curY);
-					$pdf->MultiCell($this->posxreffacture-$this->posxup-0.8, 3, $object->lines[$i]->ref, 0, 'L', 0);
+                    // ref facture fourn
+                    $pdf->SetXY($this->posxreffacture, $curY);
+                    $pdf->MultiCell($this->posxreffacture-$this->posxup-0.8, 3, $object->lines[$i]->ref, 0, 'L', 0);
 
-					// type
-					$pdf->SetXY($this->posxtype, $curY);
-					$pdf->MultiCell($this->posxtype-$this->posxup-0.8, 3, $object->lines[$i]->type, 0, 'L', 0);
+                    // type
+                    $pdf->SetXY($this->posxtype, $curY);
+                    $pdf->MultiCell($this->posxtype-$this->posxup-0.8, 3, $object->lines[$i]->type, 0, 'L', 0);
 
-					// Total ht
-					$pdf->SetXY($this->posxtotalht, $curY);
-					$pdf->MultiCell($this->posxtotalht-$this->posxup-0.8, 3, price($object->lines[$i]->total_ht), 0, 'R', 0);
+                    // Total ht
+                    $pdf->SetXY($this->posxtotalht, $curY);
+                    $pdf->MultiCell($this->posxtotalht-$this->posxup-0.8, 3, price($object->lines[$i]->total_ht), 0, 'R', 0);
 
-					// Total tva
-					$pdf->SetXY($this->posxtva, $curY);
-					$pdf->MultiCell($this->posxtva-$this->posxup-0.8, 3, price($object->lines[$i]->total_tva), 0, 'R', 0);
+                    // Total tva
+                    $pdf->SetXY($this->posxtva, $curY);
+                    $pdf->MultiCell($this->posxtva-$this->posxup-0.8, 3, price($object->lines[$i]->total_tva), 0, 'R', 0);
 
-					// Total TTC line
+                    // Total TTC line
                     $pdf->SetXY($this->posxtotalttc, $curY);
                     $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->posxtotalttc, 3, price($object->lines[$i]->total_ttc), 0, 'R', 0);
 
 
-					// Add line
-					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
-					{
-						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
-						//$pdf->SetDrawColor(190,190,200);
-						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
-						$pdf->SetLineStyle(array('dash'=>0));
-					}
-
-					$nexY+=2;    // Passe espace entre les lignes
-
-					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
-						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
-						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
-						$pagenb++;
-						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-					}
-					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
-						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
-						// New page
-						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-					}
-				}
-
-				// Show square
-				if ($pagenb == 1)
-				{
-					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-
-				// Affiche zone cheèque
-				$posy=$this->_tableau_cheque($pdf, $object, $bottomlasttab, $outputlangs);
-
-				// Affiche zone totaux
-				//$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
-
-				// Pied de page
-				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
-
-				$pdf->Close();
-
-				$pdf->Output($file,'F');
-
-				// Add pdfgeneration hook
-				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-				global $action;
-				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-				if (! empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
-
-				$this->result = array('fullpath'=>$file);
-
-				return 1;   // Pas d'erreur
-			}
-			else
-			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
-				return 0;
-			}
-		}
-		else
-		{
-			$this->error=$langs->trans("ErrorConstantNotDefined","SUPPLIER_OUTPUTDIR");
-			return 0;
-		}
-	}
+                    // Add line
+                    if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+                    {
+                        $pdf->setPage($pageposafter);
+                        $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
+                        //$pdf->SetDrawColor(190,190,200);
+                        $pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+                        $pdf->SetLineStyle(array('dash'=>0));
+                    }
+
+                    $nexY+=2;    // Passe espace entre les lignes
+
+                    // Detect if some page were added automatically and output _tableau for past pages
+                    while ($pagenb < $pageposafter)
+                    {
+                        $pdf->setPage($pagenb);
+                        if ($pagenb == 1)
+                        {
+                            $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+                        }
+                        else
+                        {
+                            $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+                        }
+                        $this->_pagefoot($pdf,$object,$outputlangs,1);
+                        $pagenb++;
+                        $pdf->setPage($pagenb);
+                        $pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+                    }
+                    if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
+                    {
+                        if ($pagenb == 1)
+                        {
+                            $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+                        }
+                        else
+                        {
+                            $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+                        }
+                        $this->_pagefoot($pdf,$object,$outputlangs,1);
+                        // New page
+                        $pdf->AddPage();
+                        if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                        $pagenb++;
+                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+                    }
+                }
+
+                // Show square
+                if ($pagenb == 1)
+                {
+                    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
+                    $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+                }
+                else
+                {
+                    $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+                    $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+                }
+
+                // Affiche zone cheèque
+                $posy=$this->_tableau_cheque($pdf, $object, $bottomlasttab, $outputlangs);
+
+                // Affiche zone totaux
+                //$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
+
+                // Pied de page
+                $this->_pagefoot($pdf, $object, $outputlangs);
+                if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+
+                $pdf->Close();
+
+                $pdf->Output($file,'F');
+
+                // Add pdfgeneration hook
+                $hookmanager->initHooks(array('pdfgeneration'));
+                $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+                global $action;
+                $reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+                if (! empty($conf->global->MAIN_UMASK))
+                @chmod($file, octdec($conf->global->MAIN_UMASK));
+
+                $this->result = array('fullpath'=>$file);
+
+                return 1;   // Pas d'erreur
+            }
+            else
+            {
+                $this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+                return 0;
+            }
+        }
+        else
+        {
+            $this->error=$langs->trans("ErrorConstantNotDefined","SUPPLIER_OUTPUTDIR");
+            return 0;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Show total to pay
-	 *
-	 *	@param	PDF				$pdf			Object PDF
-	 *	@param  PaiementFourn	$object         Object PaiementFourn
-	 *	@param	int				$posy			Position depart
-	 *	@param	Translate		$outputlangs	Objet langs
-	 *	@return int								Position pour suite
-	 */
-	function _tableau_cheque(&$pdf, $object, $posy, $outputlangs)
-	{
+    /**
+     *	Show total to pay
+     *
+     *	@param	PDF				$pdf			Object PDF
+     *	@param  PaiementFourn	$object         Object PaiementFourn
+     *	@param	int				$posy			Position depart
+     *	@param	Translate		$outputlangs	Objet langs
+     *	@return int								Position pour suite
+     */
+    function _tableau_cheque(&$pdf, $object, $posy, $outputlangs)
+    {
         // phpcs:enable
-		global $conf,$mysoc;
+        global $conf,$mysoc;
 
         $default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$pdf->SetFont('','', $default_font_size - 1);
-		$pdf->SetFillColor(255,255,255);
-
-		// N° payment
-		$pdf->SetXY($this->marge_gauche, $posy);
-		$pdf->MultiCell(30, 4, 'N° '.$outputlangs->transnoentities("Payment"), 0, 'L', 1);
-
-		// Ref payment
-		$pdf->SetXY($this->marge_gauche + 30, $posy);
-		$pdf->MultiCell(50, 4, $object->ref, 0, 'L', 1);
-
-		// Total payments
-		$pdf->SetXY($this->page_largeur - $this->marge_droite - 50, $posy);
-		$pdf->MultiCell(50, 4, price($object->montant), 0, 'R', 1);
-		$posy += 20;
-
-		// translate amount
-		$currency = $conf->currency;
-		$translateinletter = strtoupper(dol_convertToWord($object->montant,$outputlangs,$currency));
-		$pdf->SetXY($this->marge_gauche + 50, $posy);
-		$pdf->MultiCell(90, 8, $translateinletter, 0, 'L', 1);
-		$posy += 8;
-
-		// To
-		$pdf->SetXY($this->marge_gauche + 50, $posy);
-		$pdf->MultiCell(150, 4, $object->thirdparty->nom, 0, 'L', 1);
-
-		$pdf->SetXY($this->page_largeur - $this->marge_droite - 30, $posy);
-		$pdf->MultiCell(35, 4, str_pad(price($object->montant). ' '.$currency,18,'*',STR_PAD_LEFT), 0, 'R', 1);
-		$posy += 10;
-
-
-		// City
-		$pdf->SetXY($this->page_largeur - $this->marge_droite - 30, $posy);
-		$pdf->MultiCell(150, 4, $mysoc->town, 0, 'L', 1);
-		$posy += 4;
-
-		// Date
-		$pdf->SetXY($this->page_largeur - $this->marge_droite - 30, $posy);
-		$pdf->MultiCell(150, 4, date("d").' '.$outputlangs->transnoentitiesnoconv(date("F")).' '.date("Y"), 0, 'L', 1);
-	}
-
-
-	/**
-	 *   Show table for lines
-	 *
-	 *   @param		PDF			$pdf     		Object PDF
-	 *   @param		integer		$tab_top		Top position of table
-	 *   @param		integer		$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y (not used)
-	 *   @param		Translate	$outputlangs	Langs object
-	 *   @param		int			$hidetop		Hide top bar of array
-	 *   @param		int			$hidebottom		Hide bottom bar of array
-	 *   @param		string		$currency		Currency code
-	 *   @return	void
-	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
-	{
-		global $conf,$mysoc;
-
-		// Force to disable hidetop and hidebottom
-		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
-
-		$currency = !empty($currency) ? $currency : $conf->currency;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
+        $pdf->SetFont('','', $default_font_size - 1);
+        $pdf->SetFillColor(255,255,255);
 
-        // Amount in (at tab_top - 1)
-		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','',$default_font_size - 2);
+        // N° payment
+        $pdf->SetXY($this->marge_gauche, $posy);
+        $pdf->MultiCell(30, 4, 'N° '.$outputlangs->transnoentities("Payment"), 0, 'L', 1);
 
-		$titre = strtoupper($mysoc->town).', le '.date("d").' '.$outputlangs->transnoentitiesnoconv(date("F")).' '.date("Y");
-		$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3) - 60, $tab_top-6);
-		$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+        // Ref payment
+        $pdf->SetXY($this->marge_gauche + 30, $posy);
+        $pdf->MultiCell(50, 4, $object->ref, 0, 'L', 1);
 
-		$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
-		$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top);
-		$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+        // Total payments
+        $pdf->SetXY($this->page_largeur - $this->marge_droite - 50, $posy);
+        $pdf->MultiCell(50, 4, price($object->montant), 0, 'R', 1);
+        $posy += 20;
 
+        // translate amount
+        $currency = $conf->currency;
+        $translateinletter = strtoupper(dol_convertToWord($object->montant,$outputlangs,$currency));
+        $pdf->SetXY($this->marge_gauche + 50, $posy);
+        $pdf->MultiCell(90, 8, $translateinletter, 0, 'L', 1);
+        $posy += 8;
 
-		$pdf->SetDrawColor(128,128,128);
-		$pdf->SetFont('','', $default_font_size - 1);
+        // To
+        $pdf->SetXY($this->marge_gauche + 50, $posy);
+        $pdf->MultiCell(150, 4, $object->thirdparty->nom, 0, 'L', 1);
 
-		// Output Rect
-		//$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
-	}
+        $pdf->SetXY($this->page_largeur - $this->marge_droite - 30, $posy);
+        $pdf->MultiCell(35, 4, str_pad(price($object->montant). ' '.$currency,18,'*',STR_PAD_LEFT), 0, 'R', 1);
+        $posy += 10;
 
 
-	/**
-	 *  Show top header of page.
-	 *
-	 *  @param	PDF			$pdf     		Object PDF
-	 *  @param  FactureFournisseur		$object     	Object to show
-	 *  @param  int	    	$showaddress    0=no, 1=yes
-	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @return	void
-	 */
-	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
-	{
-		global $langs, $conf, $mysoc;
+        // City
+        $pdf->SetXY($this->page_largeur - $this->marge_droite - 30, $posy);
+        $pdf->MultiCell(150, 4, $mysoc->town, 0, 'L', 1);
+        $posy += 4;
 
-		// Load translation files required by the page
-		$outputlangs->loadLangs(array("main", "orders", "companies", "bills"));
+        // Date
+        $pdf->SetXY($this->page_largeur - $this->marge_droite - 30, $posy);
+        $pdf->MultiCell(150, 4, date("d").' '.$outputlangs->transnoentitiesnoconv(date("F")).' '.date("Y"), 0, 'L', 1);
+    }
 
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		// Do not add the BACKGROUND as this is for suppliers
-		//pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+    /**
+     *   Show table for lines
+     *
+     *   @param		PDF			$pdf     		Object PDF
+     *   @param		integer		$tab_top		Top position of table
+     *   @param		integer		$tab_height		Height of table (rectangle)
+     *   @param		int			$nexY			Y (not used)
+     *   @param		Translate	$outputlangs	Langs object
+     *   @param		int			$hidetop		Hide top bar of array
+     *   @param		int			$hidebottom		Hide bottom bar of array
+     *   @param		string		$currency		Currency code
+     *   @return	void
+     */
+    function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
+    {
+        global $conf,$mysoc;
 
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
+        // Force to disable hidetop and hidebottom
+        $hidebottom=0;
+        if ($hidetop) $hidetop=-1;
 
-		$posy=$this->marge_haute;
-		$posx=$this->page_largeur-$this->marge_droite-100;
+        $currency = !empty($currency) ? $currency : $conf->currency;
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$pdf->SetXY($this->marge_gauche,$posy);
+        // Amount in (at tab_top - 1)
+        $pdf->SetTextColor(0,0,0);
+        $pdf->SetFont('','',$default_font_size - 2);
 
-		// Logo
-		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-		if ($mysoc->logo)
-		{
-			if (is_readable($logo))
-			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-			}
-			else
-			{
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B', $default_font_size - 2);
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
-			}
-		}
-		else
-		{
-			$text=$this->emetteur->name;
-			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
-		}
+        $titre = strtoupper($mysoc->town).', le '.date("d").' '.$outputlangs->transnoentitiesnoconv(date("F")).' '.date("Y");
+        $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3) - 60, $tab_top-6);
+        $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+
+        $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
+        $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top);
+        $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+
+
+        $pdf->SetDrawColor(128,128,128);
+        $pdf->SetFont('','', $default_font_size - 1);
+
+        // Output Rect
+        //$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
+    }
+
+
+    /**
+     *  Show top header of page.
+     *
+     *  @param	PDF			$pdf     		Object PDF
+     *  @param  FactureFournisseur		$object     	Object to show
+     *  @param  int	    	$showaddress    0=no, 1=yes
+     *  @param  Translate	$outputlangs	Object lang for output
+     *  @return	void
+     */
+    function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+    {
+        global $langs, $conf, $mysoc;
+
+        // Load translation files required by the page
+        $outputlangs->loadLangs(array("main", "orders", "companies", "bills"));
+
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+        // Do not add the BACKGROUND as this is for suppliers
+        //pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+
+        $pdf->SetTextColor(0,0,60);
+        $pdf->SetFont('','B', $default_font_size + 3);
+
+        $posy=$this->marge_haute;
+        $posx=$this->page_largeur-$this->marge_droite-100;
+
+        $pdf->SetXY($this->marge_gauche,$posy);
+
+        // Logo
+        $logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+        if ($mysoc->logo)
+        {
+            if (is_readable($logo))
+            {
+                $height=pdf_getHeightForLogo($logo);
+                $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+            }
+            else
+            {
+                $pdf->SetTextColor(200,0,0);
+                $pdf->SetFont('','B', $default_font_size - 2);
+                $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+                $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
+            }
+        }
+        else
+        {
+            $text=$this->emetteur->name;
+            $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+        }
 /*
 		$pdf->SetFont('','B', $default_font_size + 3);
 		$pdf->SetXY($posx,$posy);
@@ -729,86 +729,86 @@ 
 		// Show list of linked objects
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
 */
-		if ($showaddress)
-		{
-			// Sender properties
-			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
-
-			// Show payer
-			$posy=42;
-			$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
-			$hautcadre=40;
-
-			// Show sender frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell(66,5, $outputlangs->transnoentities("PayedBy").":", 0, 'L');
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetFillColor(230,230,230);
-			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
-			$pdf->SetTextColor(0,0,60);
-
-			// Show sender name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
-			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-			$posy=$pdf->getY();
-
-			// Show sender information
-			$pdf->SetXY($posx+2,$posy);
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
-
-			// Payed
-			$thirdparty = $object->thirdparty;
-
-			$carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
-
-			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$mysoc,((!empty($object->contact))?$object->contact:null),$usecontact,'target',$object);
-
-			// Show recipient
-			$widthrecbox=90;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
-			$posy=42;
-			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+        if ($showaddress)
+        {
+            // Sender properties
+            $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
+
+            // Show payer
+            $posy=42;
+            $posx=$this->marge_gauche;
+            if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+            $hautcadre=40;
+
+            // Show sender frame
+            $pdf->SetTextColor(0,0,0);
+            $pdf->SetFont('','', $default_font_size - 2);
+            $pdf->SetXY($posx,$posy-5);
+            $pdf->MultiCell(66,5, $outputlangs->transnoentities("PayedBy").":", 0, 'L');
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetFillColor(230,230,230);
+            $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+            $pdf->SetTextColor(0,0,60);
+
+            // Show sender name
+            $pdf->SetXY($posx+2,$posy+3);
+            $pdf->SetFont('','B', $default_font_size);
+            $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+            $posy=$pdf->getY();
+
+            // Show sender information
+            $pdf->SetXY($posx+2,$posy);
+            $pdf->SetFont('','', $default_font_size - 1);
+            $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+
+            // Payed
+            $thirdparty = $object->thirdparty;
+
+            $carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
+
+            $carac_client=pdf_build_address($outputlangs,$this->emetteur,$mysoc,((!empty($object->contact))?$object->contact:null),$usecontact,'target',$object);
+
+            // Show recipient
+            $widthrecbox=90;
+            if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
+            $posy=42;
+            $posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
+            if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+
+            // Show recipient frame
+            $pdf->SetTextColor(0,0,0);
+            $pdf->SetFont('','', $default_font_size - 2);
+            $pdf->SetXY($posx+2,$posy-5);
+            $pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("PayedTo").":",0,'L');
+            $pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+
+            // Show recipient name
+            $pdf->SetXY($posx+2,$posy+3);
+            $pdf->SetFont('','B', $default_font_size);
+            $pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+
+            $posy = $pdf->getY();
+
+            // Show recipient information
+            $pdf->SetFont('','', $default_font_size - 1);
+            $pdf->SetXY($posx+2,$posy);
+            $pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+        }
+    }
 
-			// Show recipient frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx+2,$posy-5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("PayedTo").":",0,'L');
-			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
-
-			// Show recipient name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
-
-			$posy = $pdf->getY();
-
-			// Show recipient information
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->SetXY($posx+2,$posy);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
-		}
-	}
-
-	/**
-	 *   	Show footer of page. Need this->emetteur object
+    /**
+     *   	Show footer of page. Need this->emetteur object
      *
-	 *   	@param	PDF			$pdf     			PDF
-	 * 		@param	FactureFournisseur		$object				Object to show
-	 *      @param	Translate	$outputlangs		Object lang for output
-	 *      @param	int			$hidefreetext		1=Hide free text
-	 *      @return	int								Return height of bottom margin including footer text
-	 */
-	function _pagefoot(&$pdf, $object, $outputlangs,$hidefreetext=0)
-	{
-		global $conf;
-		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf,$outputlangs,'SUPPLIER_INVOICE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
-	}
+     *   	@param	PDF			$pdf     			PDF
+     * 		@param	FactureFournisseur		$object				Object to show
+     *      @param	Translate	$outputlangs		Object lang for output
+     *      @param	int			$hidefreetext		1=Hide free text
+     *      @return	int								Return height of bottom margin including footer text
+     */
+    function _pagefoot(&$pdf, $object, $outputlangs,$hidefreetext=0)
+    {
+        global $conf;
+        $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+        return pdf_pagefoot($pdf,$outputlangs,'SUPPLIER_INVOICE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+    }
 }

Spacing +170 added lines, -170 removed lines

@@ -130,49 +130,49 @@ 
 
 		// Dimension page pour format A4
 		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
+		$formatarray = pdf_getFormat();
 		$this->page_largeur = $formatarray['width'];
 		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_multilang = 1;               // Dispo en plusieurs langues
+		$this->option_logo = 1; // Affiche logo
+		$this->option_multilang = 1; // Dispo en plusieurs langues
 
-		$this->franchise=!$mysoc->tva_assuj;
+		$this->franchise = !$mysoc->tva_assuj;
 
         // Defini position des colonnes
-		$this->posxdate=$this->marge_gauche+1;
-		$this->posxreffacturefourn=30;
-		$this->posxreffacture=65;
-		$this->posxtype=100;
-		$this->posxtotalht=80;
-		$this->posxtva=90;
-		$this->posxtotalttc=180;
+		$this->posxdate = $this->marge_gauche + 1;
+		$this->posxreffacturefourn = 30;
+		$this->posxreffacture = 65;
+		$this->posxtype = 100;
+		$this->posxtotalht = 80;
+		$this->posxtva = 90;
+		$this->posxtotalttc = 180;
 
 		//if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
-			$this->posxreffacturefourn-=20;
-			$this->posxreffacture-=20;
-			$this->posxtype-=20;
-			$this->posxtotalht-=20;
-			$this->posxtva-=20;
-			$this->posxtotalttc-=20;
+			$this->posxreffacturefourn -= 20;
+			$this->posxreffacture -= 20;
+			$this->posxtype -= 20;
+			$this->posxtotalht -= 20;
+			$this->posxtva -= 20;
+			$this->posxtotalttc -= 20;
 		}
 
-		$this->tva=array();
-        $this->localtax1=array();
-        $this->localtax2=array();
-		$this->atleastoneratenotnull=0;
-		$this->atleastonediscount=0;
+		$this->tva = array();
+        $this->localtax1 = array();
+        $this->localtax2 = array();
+		$this->atleastoneratenotnull = 0;
+		$this->atleastonediscount = 0;
 
 		// Recupere emetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 	}
 
 
@@ -188,14 +188,14 @@ 
      *  @param		int					$hideref			Do not show ref
      *  @return		int										1=OK, 0=KO
      */
-	function write_file($object, $outputlangs='', $srctemplatepath='', $hidedetails=0, $hidedesc=0, $hideref=0)
+	function write_file($object, $outputlangs = '', $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
         // phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "suppliers", "companies", "bills", "dict", "products"));
@@ -213,12 +213,12 @@ 
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf,'.MAIN_DB_PREFIX.'facture_fourn as f,'.MAIN_DB_PREFIX.'societe as s';
 			$sql .= ' WHERE pf.fk_facturefourn = f.rowid AND f.fk_soc = s.rowid';
 			$sql .= ' AND pf.fk_paiementfourn = '.$object->id;
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				if ($this->db->num_rows($resql) > 0)
 				{
-					while($objp = $this->db->fetch_object($resql)) {
+					while ($objp = $this->db->fetch_object($resql)) {
 						$objp->type = $outputlangs->trans('SupplierInvoice');
 						$object->lines[] = $objp;
 					}
@@ -231,22 +231,22 @@ 
 			if ($object->specimen)
 			{
 				$dir = $conf->fournisseur->payment->dir_output;
-				$file = $dir . "/SPECIMEN.pdf";
+				$file = $dir."/SPECIMEN.pdf";
 			}
 			else
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
                 $dir = $conf->fournisseur->payment->dir_output.'/'.$objectref;
-				$file = $dir . "/" . $objectref . ".pdf";
-				if (! empty($conf->global->SUPPLIER_REF_IN_NAME)) $file = $dir . "/" . $objectref . ($objectrefsupplier?"_".$objectrefsupplier:"").".pdf";
+				$file = $dir."/".$objectref.".pdf";
+				if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) $file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
 			}
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
@@ -254,25 +254,25 @@ 
 			if (file_exists($dir))
 			{
 				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
+				if (!is_object($hookmanager))
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
+					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
-				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
 				$nblignes = count($object->lines);
 
-                $pdf=pdf_getInstance($this->format);
-                $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
-                $heightforinfotot = 50;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
-                $pdf->SetAutoPageBreak(1,0);
+                $pdf = pdf_getInstance($this->format);
+                $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+                $heightforinfotot = 50; // Height reserved to output the info and total part
+		        $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+	            $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+                $pdf->SetAutoPageBreak(1, 0);
 
                 if (class_exists('TCPDF'))
                 {
@@ -281,91 +281,91 @@ 
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
                 // Set path to the background PDF File
-                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
                 }
 
 				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("Invoice"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 
                 // New page
 				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', $default_font_size - 1);
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
-				$pdf->SetTextColor(0,0,0);
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
 
 				$tab_top = 90;
-				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
 				$tab_height = 130;
 				$tab_height_newpage = 150;
 
 				// Incoterm
 				$height_incoterms = 0;
 
-				$height_note=0;
+				$height_note = 0;
 
 				$iniY = $tab_top + 7;
 				$curY = $tab_top + 7;
 				$nexY = $tab_top + 7;
 
 				// Loop on each lines
-				for ($i = 0 ; $i < $nblignes ; $i++)
+				for ($i = 0; $i < $nblignes; $i++)
 				{
 					$curY = $nexY;
-					$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
-					$pdf->SetTextColor(0,0,0);
+					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
+					$pdf->SetTextColor(0, 0, 0);
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
-					$pageposbefore=$pdf->getPage();
+					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pageposbefore = $pdf->getPage();
 
 					// Description of product line
-					$curX = $this->posxdate-1;
-					$showpricebeforepagebreak=1;
+					$curX = $this->posxdate - 1;
+					$showpricebeforepagebreak = 1;
 
 					$pdf->startTransaction();
 					//pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc,1);
-					$pdf->writeHTMLCell($this->posxtva-$curX, 4, $curX, $curY, $object->lines[$i]->datef, 0, 1, false, true, 'J',true);
-					$pageposafter=$pdf->getPage();
+					$pdf->writeHTMLCell($this->posxtva - $curX, 4, $curX, $curY, $object->lines[$i]->datef, 0, 1, false, true, 'J', true);
+					$pageposafter = $pdf->getPage();
 					if ($pageposafter > $pageposbefore)	// There is a pagebreak
 					{
 						$pdf->rollbackTransaction(true);
-						$pageposafter=$pageposbefore;
+						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 						//pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc,1);
-						$pdf->writeHTMLCell($this->posxtva-$curX, 4, $curX, $curY, $object->lines[$i]->datef, 0, 1, false, true, 'J',true);
-						$posyafter=$pdf->GetY();
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
+						$pdf->writeHTMLCell($this->posxtva - $curX, 4, $curX, $curY, $object->lines[$i]->datef, 0, 1, false, true, 'J', true);
+						$posyafter = $pdf->GetY();
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
 						{
-							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
+							if ($i == ($nblignes - 1))	// No more lines, and no space left to show total, so we create a new page
 							{
-								$pdf->AddPage('','',true);
-								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+								$pdf->AddPage('', '', true);
+								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-								$pdf->setPage($pageposafter+1);
+								$pdf->setPage($pageposafter + 1);
 							}
 						}
 						else
 						{
 							// We found a page break
-							$showpricebeforepagebreak=0;
+							$showpricebeforepagebreak = 0;
 						}
 					}
 					else	// No pagebreak
@@ -374,54 +374,54 @@ 
 					}
 
 					$nexY = $pdf->GetY();
-                    $pageposafter=$pdf->getPage();
+                    $pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description is moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
 						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
 					// ref fourn
 					$pdf->SetXY($this->posxreffacturefourn, $curY);
-					$pdf->MultiCell($this->posxreffacturefourn-$this->posxup-0.8, 3, $object->lines[$i]->ref_supplier, 0, 'L', 0);
+					$pdf->MultiCell($this->posxreffacturefourn - $this->posxup - 0.8, 3, $object->lines[$i]->ref_supplier, 0, 'L', 0);
 
 					// ref facture fourn
 					$pdf->SetXY($this->posxreffacture, $curY);
-					$pdf->MultiCell($this->posxreffacture-$this->posxup-0.8, 3, $object->lines[$i]->ref, 0, 'L', 0);
+					$pdf->MultiCell($this->posxreffacture - $this->posxup - 0.8, 3, $object->lines[$i]->ref, 0, 'L', 0);
 
 					// type
 					$pdf->SetXY($this->posxtype, $curY);
-					$pdf->MultiCell($this->posxtype-$this->posxup-0.8, 3, $object->lines[$i]->type, 0, 'L', 0);
+					$pdf->MultiCell($this->posxtype - $this->posxup - 0.8, 3, $object->lines[$i]->type, 0, 'L', 0);
 
 					// Total ht
 					$pdf->SetXY($this->posxtotalht, $curY);
-					$pdf->MultiCell($this->posxtotalht-$this->posxup-0.8, 3, price($object->lines[$i]->total_ht), 0, 'R', 0);
+					$pdf->MultiCell($this->posxtotalht - $this->posxup - 0.8, 3, price($object->lines[$i]->total_ht), 0, 'R', 0);
 
 					// Total tva
 					$pdf->SetXY($this->posxtva, $curY);
-					$pdf->MultiCell($this->posxtva-$this->posxup-0.8, 3, price($object->lines[$i]->total_tva), 0, 'R', 0);
+					$pdf->MultiCell($this->posxtva - $this->posxup - 0.8, 3, price($object->lines[$i]->total_tva), 0, 'R', 0);
 
 					// Total TTC line
                     $pdf->SetXY($this->posxtotalttc, $curY);
-                    $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->posxtotalttc, 3, price($object->lines[$i]->total_ttc), 0, 'R', 0);
+                    $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalttc, 3, price($object->lines[$i]->total_ttc), 0, 'R', 0);
 
 
 					// Add line
-					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
 					{
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
+						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
-						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
 						$pdf->SetLineStyle(array('dash'=>0));
 					}
 
-					$nexY+=2;    // Passe espace entre les lignes
+					$nexY += 2; // Passe espace entre les lignes
 
 					// Detect if some page were added automatically and output _tableau for past pages
 					while ($pagenb < $pageposafter)
@@ -435,13 +435,13 @@ 
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
-					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
 					{
 						if ($pagenb == 1)
 						{
@@ -451,10 +451,10 @@ 
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 						$pagenb++;
 						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
@@ -464,50 +464,50 @@ 
 				if ($pagenb == 1)
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 				else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 
 				// Affiche zone cheèque
-				$posy=$this->_tableau_cheque($pdf, $object, $bottomlasttab, $outputlangs);
+				$posy = $this->_tableau_cheque($pdf, $object, $bottomlasttab, $outputlangs);
 
 				// Affiche zone totaux
 				//$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->Close();
 
-				$pdf->Output($file,'F');
+				$pdf->Output($file, 'F');
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
-				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 				$this->result = array('fullpath'=>$file);
 
-				return 1;   // Pas d'erreur
+				return 1; // Pas d'erreur
 			}
 			else
 			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
 		else
 		{
-			$this->error=$langs->trans("ErrorConstantNotDefined","SUPPLIER_OUTPUTDIR");
+			$this->error = $langs->trans("ErrorConstantNotDefined", "SUPPLIER_OUTPUTDIR");
 			return 0;
 		}
 	}
@@ -525,12 +525,12 @@ 
 	function _tableau_cheque(&$pdf, $object, $posy, $outputlangs)
 	{
         // phpcs:enable
-		global $conf,$mysoc;
+		global $conf, $mysoc;
 
         $default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$pdf->SetFont('','', $default_font_size - 1);
-		$pdf->SetFillColor(255,255,255);
+		$pdf->SetFont('', '', $default_font_size - 1);
+		$pdf->SetFillColor(255, 255, 255);
 
 		// N° payment
 		$pdf->SetXY($this->marge_gauche, $posy);
@@ -547,7 +547,7 @@ 
 
 		// translate amount
 		$currency = $conf->currency;
-		$translateinletter = strtoupper(dol_convertToWord($object->montant,$outputlangs,$currency));
+		$translateinletter = strtoupper(dol_convertToWord($object->montant, $outputlangs, $currency));
 		$pdf->SetXY($this->marge_gauche + 50, $posy);
 		$pdf->MultiCell(90, 8, $translateinletter, 0, 'L', 1);
 		$posy += 8;
@@ -557,7 +557,7 @@ 
 		$pdf->MultiCell(150, 4, $object->thirdparty->nom, 0, 'L', 1);
 
 		$pdf->SetXY($this->page_largeur - $this->marge_droite - 30, $posy);
-		$pdf->MultiCell(35, 4, str_pad(price($object->montant). ' '.$currency,18,'*',STR_PAD_LEFT), 0, 'R', 1);
+		$pdf->MultiCell(35, 4, str_pad(price($object->montant).' '.$currency, 18, '*', STR_PAD_LEFT), 0, 'R', 1);
 		$posy += 10;
 
 
@@ -585,32 +585,32 @@ 
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
-		global $conf,$mysoc;
+		global $conf, $mysoc;
 
 		// Force to disable hidetop and hidebottom
-		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
+		$hidebottom = 0;
+		if ($hidetop) $hidetop = -1;
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
         // Amount in (at tab_top - 1)
-		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','',$default_font_size - 2);
+		$pdf->SetTextColor(0, 0, 0);
+		$pdf->SetFont('', '', $default_font_size - 2);
 
 		$titre = strtoupper($mysoc->town).', le '.date("d").' '.$outputlangs->transnoentitiesnoconv(date("F")).' '.date("Y");
-		$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3) - 60, $tab_top-6);
+		$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3) - 60, $tab_top - 6);
 		$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
-		$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
+		$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
 		$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top);
 		$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 
-		$pdf->SetDrawColor(128,128,128);
-		$pdf->SetFont('','', $default_font_size - 1);
+		$pdf->SetDrawColor(128, 128, 128);
+		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// Output Rect
 		//$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
@@ -638,34 +638,34 @@ 
 		// Do not add the BACKGROUND as this is for suppliers
 		//pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-		$posy=$this->marge_haute;
-		$posx=$this->page_largeur-$this->marge_droite-100;
+		$posy = $this->marge_haute;
+		$posx = $this->page_largeur - $this->marge_droite - 100;
 
-		$pdf->SetXY($this->marge_gauche,$posy);
+		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
-		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 		if ($mysoc->logo)
 		{
 			if (is_readable($logo))
 			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+			    $height = pdf_getHeightForLogo($logo);
+			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
 			else
 			{
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B', $default_font_size - 2);
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+				$pdf->SetTextColor(200, 0, 0);
+				$pdf->SetFont('', 'B', $default_font_size - 2);
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
 		}
 		else
 		{
-			$text=$this->emetteur->name;
+			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
 /*
@@ -735,63 +735,63 @@ 
 			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
 
 			// Show payer
-			$posy=42;
-			$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
-			$hautcadre=40;
+			$posy = 42;
+			$posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			$hautcadre = 40;
 
 			// Show sender frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell(66,5, $outputlangs->transnoentities("PayedBy").":", 0, 'L');
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetFillColor(230,230,230);
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx, $posy - 5);
+			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("PayedBy").":", 0, 'L');
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetFillColor(230, 230, 230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
-			$pdf->SetTextColor(0,0,60);
+			$pdf->SetTextColor(0, 0, 60);
 
 			// Show sender name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
 			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-			$posy=$pdf->getY();
+			$posy = $pdf->getY();
 
 			// Show sender information
-			$pdf->SetXY($posx+2,$posy);
-			$pdf->SetFont('','', $default_font_size - 1);
+			$pdf->SetXY($posx + 2, $posy);
+			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 
 			// Payed
 			$thirdparty = $object->thirdparty;
 
-			$carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs);
+			$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$mysoc,((!empty($object->contact))?$object->contact:null),$usecontact,'target',$object);
+			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $mysoc, ((!empty($object->contact)) ? $object->contact : null), $usecontact, 'target', $object);
 
 			// Show recipient
-			$widthrecbox=90;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
-			$posy=42;
-			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+			$widthrecbox = 90;
+			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			$posy = 42;
+			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
 
 			// Show recipient frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx+2,$posy-5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("PayedTo").":",0,'L');
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx + 2, $posy - 5);
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("PayedTo").":", 0, 'L');
 			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
 
 			// Show recipient name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
 			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
 
 			$posy = $pdf->getY();
 
 			// Show recipient information
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->SetXY($posx+2,$posy);
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->SetXY($posx + 2, $posy);
 			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
 		}
 	}
@@ -805,10 +805,10 @@ 
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
 	 */
-	function _pagefoot(&$pdf, $object, $outputlangs,$hidefreetext=0)
+	function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf,$outputlangs,'SUPPLIER_INVOICE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		return pdf_pagefoot($pdf, $outputlangs, 'SUPPLIER_INVOICE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }

Braces +75 added lines, -42 removed lines

@@ -154,9 +154,11 @@ 
 		$this->posxtotalttc=180;
 
 		//if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
-		if ($this->page_largeur < 210) // To work with US executive format
+		if ($this->page_largeur < 210) {
+		    // To work with US executive format
 		{
 			$this->posxreffacturefourn-=20;
+		}
 			$this->posxreffacture-=20;
 			$this->posxtype-=20;
 			$this->posxtotalht-=20;
@@ -172,7 +174,10 @@ 
 
 		// Recupere emetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		if (! $this->emetteur->country_code) {
+		    $this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default if not defined
 	}
 
 
@@ -193,9 +198,13 @@ 
         // phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (! empty($conf->global->MAIN_USE_FPDF)) {
+		    $outputlangs->charset_output='ISO-8859-1';
+		}
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "suppliers", "companies", "bills", "dict", "products"));
@@ -232,14 +241,15 @@ 
 			{
 				$dir = $conf->fournisseur->payment->dir_output;
 				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
+			} else
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
                 $dir = $conf->fournisseur->payment->dir_output.'/'.$objectref;
 				$file = $dir . "/" . $objectref . ".pdf";
-				if (! empty($conf->global->SUPPLIER_REF_IN_NAME)) $file = $dir . "/" . $objectref . ($objectrefsupplier?"_".$objectrefsupplier:"").".pdf";
+				if (! empty($conf->global->SUPPLIER_REF_IN_NAME)) {
+				    $file = $dir . "/" . $objectref . ($objectrefsupplier?"_".$objectrefsupplier:"").".pdf";
+				}
 			}
 
 			if (! file_exists($dir))
@@ -271,7 +281,9 @@ 
                 $heightforinfotot = 50;	// Height reserved to output the info and total part
 		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
 	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
+	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) {
+	                $heightforfooter+= 6;
+	            }
                 $pdf->SetAutoPageBreak(1,0);
 
                 if (class_exists('TCPDF'))
@@ -296,14 +308,18 @@ 
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+				    $pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 
 
                 // New page
 				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (! empty($tplidx)) {
+				    $pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('','', $default_font_size - 1);
@@ -343,32 +359,38 @@ 
 					//pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc,1);
 					$pdf->writeHTMLCell($this->posxtva-$curX, 4, $curX, $curY, $object->lines[$i]->datef, 0, 1, false, true, 'J',true);
 					$pageposafter=$pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
+					if ($pageposafter > $pageposbefore) {
+					    // There is a pagebreak
 					{
 						$pdf->rollbackTransaction(true);
+					}
 						$pageposafter=$pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
 						//pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc,1);
 						$pdf->writeHTMLCell($this->posxtva-$curX, 4, $curX, $curY, $object->lines[$i]->datef, 0, 1, false, true, 'J',true);
 						$posyafter=$pdf->GetY();
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) {
+						    // There is no space left for total+free text
 						{
 							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
 							{
 								$pdf->AddPage('','',true);
-								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
+								if (! empty($tplidx)) {
+								    $pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								    $this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter+1);
 							}
-						}
-						else
+						} else
 						{
 							// We found a page break
 							$showpricebeforepagebreak=0;
 						}
-					}
-					else	// No pagebreak
+					} else	// No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -430,8 +452,7 @@ 
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
+						} else
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
@@ -439,24 +460,29 @@ 
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						    $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
 					{
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
+						} else
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf,$object,$outputlangs,1);
 						// New page
 						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (! empty($tplidx)) {
+						    $pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						    $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
@@ -465,8 +491,7 @@ 
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
+				} else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
@@ -480,7 +505,9 @@ 
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) {
+				    $pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -492,20 +519,19 @@ 
 				global $action;
 				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+								@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;   // Pas d'erreur
-			}
-			else
+			} else
 			{
 				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$langs->trans("ErrorConstantNotDefined","SUPPLIER_OUTPUTDIR");
 			return 0;
@@ -591,7 +617,9 @@ 
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
+		if ($hidetop) {
+		    $hidetop=-1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -654,16 +682,14 @@ 
 			{
 			    $height=pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-			}
-			else
+			} else
 			{
 				$pdf->SetTextColor(200,0,0);
 				$pdf->SetFont('','B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else
+		} else
 		{
 			$text=$this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
@@ -737,7 +763,9 @@ 
 			// Show payer
 			$posy=42;
 			$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			    $posx=$this->page_largeur-$this->marge_droite-80;
+			}
 			$hautcadre=40;
 
 			// Show sender frame
@@ -770,10 +798,15 @@ 
 
 			// Show recipient
 			$widthrecbox=90;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
+			if ($this->page_largeur < 210) {
+			    $widthrecbox=84;
+			}
+			// To work with US executive format
 			$posy=42;
 			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			    $posx=$this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0,0,0);

dolibarr/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php

Indentation +116 added lines, -116 removed lines

@@ -29,30 +29,30 @@ 
  */
 class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
 
-	public $prefix='SPAY';
+    public $prefix='SPAY';
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Bronan';
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see name
+     */
+    public $nom='Bronan';
 
-	/**
-	 * @var string model name
-	 */
-	public $name='Bronan';
+    /**
+     * @var string model name
+     */
+    public $name='Bronan';
 
 
     /**
@@ -62,110 +62,110 @@ 
      */
     function info()
     {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+        global $langs;
+            return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
     }
 
 
-	/**
-	 *  Renvoi un exemple de numerotation
-	 *
-	 *  @return     string      Example
-	 */
-	function getExample()
-	{
-		return $this->prefix."0501-0001";
-	}
-
-
-	/**
-	 *  Test si les numeros deje 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 $conf,$langs,$db;
-
-		$payyymm=''; $max='';
-
-		$posindice=9;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$row = $db->fetch_row($resql);
-			if ($row) { $payyymm = substr($row[0],0,6); $max=$row[0]; }
-		}
-		if ($payyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$payyymm))
-		{
-			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel', $max);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * 	Return next free value
-	 *
-	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Object		$object		Object we need next value for
-	 *  @return string      			Value if KO, <0 if KO
-	 */
-	function getNextValue($objsoc,$object)
-	{
-		global $db,$conf;
-
-		// D'abord on recupere la valeur max
-		$posindice=10;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
-		{
-			dol_syslog(__METHOD__, LOG_DEBUG);
-			return -1;
-		}
-
-		//$date=time();
-		$date=$object->datepaye;
-		$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(__METHOD__." return ".$this->prefix.$yymm."-".$num);
-		return $this->prefix.$yymm."-".$num;
-	}
+    /**
+     *  Renvoi un exemple de numerotation
+     *
+     *  @return     string      Example
+     */
+    function getExample()
+    {
+        return $this->prefix."0501-0001";
+    }
+
+
+    /**
+     *  Test si les numeros deje 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 $conf,$langs,$db;
+
+        $payyymm=''; $max='';
+
+        $posindice=9;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+        $sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+        $sql.= " AND entity = ".$conf->entity;
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $row = $db->fetch_row($resql);
+            if ($row) { $payyymm = substr($row[0],0,6); $max=$row[0]; }
+        }
+        if ($payyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$payyymm))
+        {
+            $langs->load("errors");
+            $this->error=$langs->trans('ErrorNumRefModel', $max);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * 	Return next free value
+     *
+     *  @param	Societe		$objsoc     Object thirdparty
+     *  @param  Object		$object		Object we need next value for
+     *  @return string      			Value if KO, <0 if KO
+     */
+    function getNextValue($objsoc,$object)
+    {
+        global $db,$conf;
+
+        // D'abord on recupere la valeur max
+        $posindice=10;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+        $sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+        $sql.= " AND entity = ".$conf->entity;
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj) $max = intval($obj->max);
+            else $max=0;
+        }
+        else
+        {
+            dol_syslog(__METHOD__, LOG_DEBUG);
+            return -1;
+        }
+
+        //$date=time();
+        $date=$object->datepaye;
+        $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(__METHOD__." return ".$this->prefix.$yymm."-".$num);
+        return $this->prefix.$yymm."-".$num;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return next free value
-	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 * 	@param	string		$objforref	Object for number to search
-	 *  @return string      			Next free value
-	 */
-	function payment_get_num($objsoc,$objforref)
-	{
+    /**
+     *  Return next free value
+     *
+     *  @param	Societe		$objsoc     Object third party
+     * 	@param	string		$objforref	Object for number to search
+     *  @return string      			Next free value
+     */
+    function payment_get_num($objsoc,$objforref)
+    {
         // phpcs:enable
-		return $this->getNextValue($objsoc,$objforref);
-	}
+        return $this->getNextValue($objsoc,$objforref);
+    }
 }

Spacing +31 added lines, -31 removed lines

@@ -22,7 +22,7 @@ 
  * \brief      File containing class for numbering module Bronan
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_payment/modules_supplier_payment.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
 
 /**
  *	Class to manage customer payment numbering rules Cicada
@@ -33,26 +33,26 @@ 
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	public $prefix='SPAY';
+	public $prefix = 'SPAY';
 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Bronan';
+	public $nom = 'Bronan';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Bronan';
+	public $name = 'Bronan';
 
 
     /**
@@ -63,7 +63,7 @@ 
     function info()
     {
     	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
     }
 
 
@@ -86,26 +86,26 @@ 
 	 */
 	function canBeActivated()
 	{
-		global $conf,$langs,$db;
+		global $conf, $langs, $db;
 
-		$payyymm=''; $max='';
+		$payyymm = ''; $max = '';
 
-		$posindice=9;
+		$posindice = 9;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$row = $db->fetch_row($resql);
-			if ($row) { $payyymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $payyymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
-		if ($payyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$payyymm))
+		if ($payyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $payyymm))
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel', $max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
 
@@ -119,23 +119,23 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-	function getNextValue($objsoc,$object)
+	function getNextValue($objsoc, $object)
 	{
-		global $db,$conf;
+		global $db, $conf;
 
 		// D'abord on recupere la valeur max
-		$posindice=10;
+		$posindice = 10;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
-			else $max=0;
+			else $max = 0;
 		}
 		else
 		{
@@ -144,11 +144,11 @@ 
 		}
 
 		//$date=time();
-		$date=$object->datepaye;
-		$yymm = strftime("%y%m",$date);
+		$date = $object->datepaye;
+		$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(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
@@ -163,9 +163,9 @@ 
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
 	 */
-	function payment_get_num($objsoc,$objforref)
+	function payment_get_num($objsoc, $objforref)
 	{
         // phpcs:enable
-		return $this->getNextValue($objsoc,$objforref);
+		return $this->getNextValue($objsoc, $objforref);
 	}
 }

Braces +13 added lines, -6 removed lines

@@ -134,10 +134,12 @@ 
 		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
 		{
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
@@ -147,8 +149,13 @@ 
 		$date=$object->datepaye;
 		$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(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;