alxarafe / alixar

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

Indentation +69 added lines, -69 removed lines

@@ -33,24 +33,24 @@ 
 {
 
     /**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
      */
     function __construct($db)
     {
-    	global $langs, $conf;
+        global $langs, $conf;
 
         $this->db = $db;
         $this->numero = 2300;
 
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		// It is used to group modules in module setup page
+        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+        // It is used to group modules in module setup page
         $this->family = "base";
         // 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 = "Enable the Dolibarr cron service";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' 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);
@@ -64,26 +64,26 @@ 
         //-------------
         $this->config_page_url = array("cron.php@cron");
 
-		// Dependancies
-		//-------------
-		$this->hidden = !empty($conf->global->MODULE_CRON_DISABLED); // A condition to disable module
-		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
-		$this->requiredby = array(); // List of modules id to disable if this one is disabled
-		$this->conflictwith = array(); // List of modules id this module is in conflict with
-		$this->langfiles = array("cron");
-
-		// Constants
-		//-----------
-		$this->const = array(
-				0=>array(
-					'CRON_KEY',
-					'chaine',
-					'',
-					'CRON KEY',
-					0,
-					'main',
-					0
-				),);
+        // Dependancies
+        //-------------
+        $this->hidden = !empty($conf->global->MODULE_CRON_DISABLED); // A condition to disable module
+        $this->depends = array(); // List of modules id that must be enabled if this module is enabled
+        $this->requiredby = array(); // List of modules id to disable if this one is disabled
+        $this->conflictwith = array(); // List of modules id this module is in conflict with
+        $this->langfiles = array("cron");
+
+        // Constants
+        //-----------
+        $this->const = array(
+                0=>array(
+                    'CRON_KEY',
+                    'chaine',
+                    '',
+                    'CRON KEY',
+                    0,
+                    'main',
+                    0
+                ),);
 
         // New pages on tabs
         // -----------------
@@ -93,54 +93,54 @@ 
         //------
         $this->boxes = array();
 
-		// Cronjobs
-		$this->cronjobs = array(
-			0=>array('entity'=>0, 'label'=>'PurgeDeleteTemporaryFilesShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'purgeFiles', 'parameters'=>'', 'comment'=>'PurgeDeleteTemporaryFiles', 'frequency'=>2, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>50, 'status'=>1, 'test'=>true),
-			1=>array('entity'=>0, 'label'=>'MakeLocalDatabaseDumpShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'dumpDatabase', 'parameters'=>'none,auto,1,auto,10', 'comment'=>'MakeLocalDatabaseDump', 'frequency'=>1, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>90, 'status'=>0, 'test'=>in_array($db->type, array('mysql', 'mysqli'))),
-			// 1=>array('entity'=>0, 'label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24)
-		);
+        // Cronjobs
+        $this->cronjobs = array(
+            0=>array('entity'=>0, 'label'=>'PurgeDeleteTemporaryFilesShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'purgeFiles', 'parameters'=>'', 'comment'=>'PurgeDeleteTemporaryFiles', 'frequency'=>2, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>50, 'status'=>1, 'test'=>true),
+            1=>array('entity'=>0, 'label'=>'MakeLocalDatabaseDumpShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'dumpDatabase', 'parameters'=>'none,auto,1,auto,10', 'comment'=>'MakeLocalDatabaseDump', 'frequency'=>1, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>90, 'status'=>0, 'test'=>in_array($db->type, array('mysql', 'mysqli'))),
+            // 1=>array('entity'=>0, 'label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24)
+        );
 
         // Permissions
-		$this->rights = array(); // Permission array used by this module
-		$this->rights_class = 'cron';
-		$r = 0;
-
-		$this->rights[$r][0] = 23001;
-		$this->rights[$r][1] = 'Read cron jobs';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'read';
-		$r++;
-
-		$this->rights[$r][0] = 23002;
-		$this->rights[$r][1] = 'Create cron Jobs';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'create';
-		$r++;
-
-		$this->rights[$r][0] = 23003;
-		$this->rights[$r][1] = 'Delete cron Jobs';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'delete';
-		$r++;
-
-		$this->rights[$r][0] = 23004;
-		$this->rights[$r][1] = 'Execute cron Jobs';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'execute';
-		$r++;
+        $this->rights = array(); // Permission array used by this module
+        $this->rights_class = 'cron';
+        $r = 0;
+
+        $this->rights[$r][0] = 23001;
+        $this->rights[$r][1] = 'Read cron jobs';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'read';
+        $r++;
+
+        $this->rights[$r][0] = 23002;
+        $this->rights[$r][1] = 'Create cron Jobs';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'create';
+        $r++;
+
+        $this->rights[$r][0] = 23003;
+        $this->rights[$r][1] = 'Delete cron Jobs';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'delete';
+        $r++;
+
+        $this->rights[$r][0] = 23004;
+        $this->rights[$r][1] = 'Execute cron Jobs';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'execute';
+        $r++;
 
         // Main menu entries
         $r = 0;
         $this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-						        'type'=>'left', // This is a Left menu entry
-						        'titre'=>'CronList',
-						        'url'=>'/cron/list.php?status=-2&leftmenu=admintools',
-						        'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-						        'position'=>200,
-						        'enabled'=>'$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-						        'perms'=>'$user->rights->cron->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-						        'target'=>'',
-						        'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+                                'type'=>'left', // This is a Left menu entry
+                                'titre'=>'CronList',
+                                'url'=>'/cron/list.php?status=-2&leftmenu=admintools',
+                                'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+                                'position'=>200,
+                                'enabled'=>'$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+                                'perms'=>'$user->rights->cron->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+                                'target'=>'',
+                                'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
         $r++;
     }
 }

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

Indentation +131 added lines, -131 removed lines

@@ -32,139 +32,139 @@
 class modLoan extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf;
-
-		$this->db = $db;
-		$this->numero = 520;
-
-		$this->family = "financial";
-		// 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 = "Loans management";
-
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='bill';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array("/loan/temp");
-
-		// Config pages
-		$this->config_page_url = array('loan.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->langfiles = array("loan");
-
-		// Constants
-		$this->const = array();
-		$this->const[0] = array(
-				"LOAN_ACCOUNTING_ACCOUNT_CAPITAL",
-				"chaine",
-				"164"
-		);
-		$this->const[1] = array(
-				"LOAN_ACCOUNTING_ACCOUNT_INTEREST",
-				"chaine",
-				"6611"
-		);
-		$this->const[1] = array(
-				"LOAN_ACCOUNTING_ACCOUNT_INSURANCE",
-				"chaine",
-				"6162"
-		);
-
-		// Boxes
-		$this->boxes = array();
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'loan';
-		$r=0;
-
-		$r++;
-		$this->rights[$r][0] = 520;
-		$this->rights[$r][1] = 'Read loans';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'read';
-		$this->rights[$r][5] = '';
-
-		$r++;
-		$this->rights[$r][0] = 522;
-		$this->rights[$r][1] = 'Create/modify loans';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'write';
-		$this->rights[$r][5] = '';
-
-		$r++;
-		$this->rights[$r][0] = 524;
-		$this->rights[$r][1] = 'Delete loans';
-		$this->rights[$r][2] = 'd';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'delete';
-		$this->rights[$r][5] = '';
-
-		$r++;
-		$this->rights[$r][0] = 525;
-		$this->rights[$r][1] = 'Access loan calculator';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'calc';
-		$this->rights[$r][5] = '';
-
-		$r++;
-		$this->rights[$r][0] = 527;
-		$this->rights[$r][1] = 'Export loans';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'export';
-		$this->rights[$r][5] = '';
-
-
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
-
-		// Exports
-		//--------
-		$r=0;
-	}
-
-
-	/**
-	 *		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)
+    {
+        global $conf;
+
+        $this->db = $db;
+        $this->numero = 520;
+
+        $this->family = "financial";
+        // 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 = "Loans management";
+
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='bill';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array("/loan/temp");
+
+        // Config pages
+        $this->config_page_url = array('loan.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->langfiles = array("loan");
+
+        // Constants
+        $this->const = array();
+        $this->const[0] = array(
+                "LOAN_ACCOUNTING_ACCOUNT_CAPITAL",
+                "chaine",
+                "164"
+        );
+        $this->const[1] = array(
+                "LOAN_ACCOUNTING_ACCOUNT_INTEREST",
+                "chaine",
+                "6611"
+        );
+        $this->const[1] = array(
+                "LOAN_ACCOUNTING_ACCOUNT_INSURANCE",
+                "chaine",
+                "6162"
+        );
+
+        // Boxes
+        $this->boxes = array();
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'loan';
+        $r=0;
+
+        $r++;
+        $this->rights[$r][0] = 520;
+        $this->rights[$r][1] = 'Read loans';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'read';
+        $this->rights[$r][5] = '';
+
+        $r++;
+        $this->rights[$r][0] = 522;
+        $this->rights[$r][1] = 'Create/modify loans';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'write';
+        $this->rights[$r][5] = '';
+
+        $r++;
+        $this->rights[$r][0] = 524;
+        $this->rights[$r][1] = 'Delete loans';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'delete';
+        $this->rights[$r][5] = '';
+
+        $r++;
+        $this->rights[$r][0] = 525;
+        $this->rights[$r][1] = 'Access loan calculator';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'calc';
+        $this->rights[$r][5] = '';
+
+        $r++;
+        $this->rights[$r][0] = 527;
+        $this->rights[$r][1] = 'Export loans';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'export';
+        $this->rights[$r][5] = '';
+
+
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+
+
+        // Exports
+        //--------
+        $r=0;
+    }
+
+
+    /**
+     *		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;
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        global $conf;
 
-		// Clean before activation
-		$this->remove($options);
+        // Clean before activation
+        $this->remove($options);
 
-		$sql = array();
+        $sql = array();
 
-		return $this->_init($sql,$options);
-	}
+        return $this->_init($sql,$options);
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -23,7 +23,7 @@ 
  *      \ingroup    loan
  *      \brief      File to activate module loan
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -46,7 +46,7 @@ 
 
 		$this->family = "financial";
 		// 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));
 		// Module description used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
 		$this->description = "Loans management";
 
@@ -54,7 +54,7 @@ 
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='bill';
+		$this->picto = 'bill';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/loan/temp");
@@ -63,11 +63,11 @@ 
 		$this->config_page_url = array('loan.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("loan");
 
 		// Constants
@@ -94,7 +94,7 @@ 
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'loan';
-		$r=0;
+		$r = 0;
 
 		$r++;
 		$this->rights[$r][0] = 520;
@@ -139,12 +139,12 @@ 
 
 		// 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;
 	}
 
 
@@ -156,7 +156,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;
 
@@ -165,6 +165,6 @@ 
 
 		$sql = array();
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

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

Indentation +4 added lines, -4 removed lines

@@ -68,10 +68,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                    // 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                    // Minimum version of PHP required by module
         $this->need_dolibarr_version = array(3,7,-2);   // Minimum version of Dolibarr required by module
         $this->conflictwith = array();
         $this->langfiles = array("oauth");

Spacing +13 added lines, -13 removed lines

@@ -25,7 +25,7 @@ 
  *  \ingroup    oauth
  *  \brief      File of class to describe and activate module Oauth
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 
@@ -42,14 +42,14 @@ 
      */
     function __construct($db)
     {
-        $this->db = $db ;
+        $this->db = $db;
         $this->numero = 66000;
         // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
         // It is used to group modules in module setup page
         $this->family = "interface";
         $this->module_position = '31';
         // 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));
         // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
         $this->description = "Enable OAuth authentication";
         // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
@@ -67,12 +67,12 @@ 
         $this->config_page_url = array("oauth.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                    // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(3,7,-2);   // Minimum version of Dolibarr 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                    // Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(3, 7, -2); // Minimum version of Dolibarr required by module
         $this->conflictwith = array();
         $this->langfiles = array("oauth");
 
@@ -86,7 +86,7 @@ 
         $this->rights = array();
         $this->rights_class = 'oauth';
 
-        $r=0;
+        $r = 0;
         // $this->rights[$r][0]     Id permission (unique tous modules confondus)
         // $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
         // $this->rights[$r][2]     Non utilise
@@ -102,8 +102,8 @@ 
         $this->rights[$r][4] = 'read';*/
 
         // Main menu entries
-        $this->menus = array();         // List of menus to add
-        $r=0;
+        $this->menus = array(); // List of menus to add
+        $r = 0;
 
         // This is to declare the Top Menu entry:
         //$this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',               // Put 0 if this is a top menu
@@ -130,7 +130,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;
 

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

Indentation +220 added lines, -220 removed lines

@@ -36,225 +36,225 @@
  */
 class modHoliday extends DolibarrModules
 {
-	/**
-	 *  Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *  @param	DoliDB	$db		Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 20000;
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'holiday';
-
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		// It is used to group modules in module setup page
-		$this->family = "hr";
-		$this->module_position = '30';
-		// 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 = "Leave requests";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' 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='holiday';
-
-		// Data directories to create when module is enabled.
-		// Example: this->dirs = array("/mymodule/temp");
-		$this->dirs = array("/holiday/temp");
-		$r=0;
-
-		// Config pages
-		$this->config_page_url = array("holiday.php");
-
-
-		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
-		// $this->config_page_url = array("holiday.php?leftmenu=setup@holiday");
-
-		// 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->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("holiday");
-
-		// Constants
-		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',0),
-		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0) );
-		//                             2=>array('MAIN_MODULE_MYMODULE_NEEDSMARTY','chaine',1,'Constant to say module need smarty',0)
-		$this->const = array();			// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
-		$r=0;
-
-		$this->const[$r][0] = "HOLIDAY_ADDON";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "mod_holiday_madonna";
-		$this->const[$r][3] = 'Nom du gestionnaire de numerotation des congés';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "HOLIDAY_ADDON_PDF";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "celebrate";
-		$this->const[$r][3] = 'Name of PDF model of holiday';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "HOLIDAY_ADDON_PDF_ODT_PATH";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/holiday";
-		$this->const[$r][3] = "";
-		$this->const[$r][4] = 0;
-		$r++;
-
-		// Array to add new pages in new tabs
-		//$this->tabs[] = array('data'=>'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->read:/holiday/list.php?mainmenu=hrm&id=__ID__');	// We avoid to get one tab for each module. RH data are already in RH tab.
-		$this->tabs[] = array();  					// To add a new tab identified by code tabname1
-
-		// Boxes
-		$this->boxes = array();			// List of boxes
-		$r=0;
-
-		// Add here list of php file(s) stored in includes/boxes that contains class to show a box.
-		// Example:
-		//$this->boxes[$r][1] = "myboxa.php";
-		//$r++;
-		//$this->boxes[$r][1] = "myboxb.php";
-		//$r++;
-
-
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
-
-		$this->rights[$r][0] = 20001; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read your own leave requests';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-
-		$this->rights[$r][0] = 20002; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/modify your own leave requests';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-
-		$this->rights[$r][0] = 20003; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Delete leave requests';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'delete';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-
-		$this->rights[$r][0] = 20007;
-		$this->rights[$r][1] = 'Approve leave requests';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'approve';
-		$r++;
-
-		$this->rights[$r][0] = 20004; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read leave requests for everybody';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read_all';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-
-		$this->rights[$r][0] = 20005; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/modify leave requests for everybody';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write_all';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-
-		$this->rights[$r][0] = 20006; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Setup leave requests of users (setup and update balance)';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'define_holiday';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-
-
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
-
-		// Exports
-		$r=0;
-
-		$r++;
-		$this->export_code[$r]='leaverequest_'.$r;
-		$this->export_label[$r]='ListeCP';
-		$this->export_icon[$r]='holiday';
-		$this->export_permission[$r]=array(array("holiday","read_all"));
-		$this->export_fields_array[$r]=array(
-			'd.rowid'=>"LeaveId",'d.fk_type'=>'TypeOfLeaveId','t.code'=>'TypeOfLeaveCode','t.label'=>'TypeOfLeaveLabel','d.fk_user'=>'UserID',
-			'u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>"Login",'d.date_debut'=>'DateStart','d.date_fin'=>'DateEnd','d.halfday'=>'HalfDay',
-			'd.date_valid'=>'DateApprove','d.fk_validator'=>"UserForApprovalID",'ua.lastname'=>"UserForApprovalLastname",'ua.firstname'=>"UserForApprovalFirstname",
-			'ua.login'=>"UserForApprovalLogin",'d.description'=>'Description','d.statut'=>'Status'
-		);
-		$this->export_entities_array[$r]=array(
-			'u.lastname'=>'user','u.firstname'=>'user','u.login'=>'user','ua.lastname'=>'user','ua.firstname'=>'user','ua.login'=>'user'
-		);
-		$this->export_alias_array[$r]=array('d.rowid'=>"idholiday");
-		$this->export_dependencies_array[$r]=array(); // 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.'holiday as d';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_holiday_types as t ON t.rowid = d.fk_type';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as ua ON ua.rowid = d.fk_validator,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'user as u';
-		$this->export_sql_end[$r] .=' WHERE d.fk_user = u.rowid';
-		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('holiday').')';
-
-		// Example:
-		// $this->export_code[$r]=$this->rights_class.'_'.$r;
-		// $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-		// $this->export_permission[$r]=array(array("facture","facture","export"));
-		// $this->export_fields_array[$r]=array(
-		//	's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
-		//	's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode',
-		//	's.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",
-		//	'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus',
-		//	'f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",
-		//	'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",
-		//	'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef'
-		//);
-		// $this->export_entities_array[$r]=array(
-		//	's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company',
-		//	's.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company',
-		//	'f.rowid'=>"invoice",'f.ref'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",
-		//	'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",
-		//	'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",
-		//	'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product'
-		//);
-		// $this->export_alias_array[$r]=array(
-		//	's.rowid'=>"socid",'s.nom'=>'soc_name','s.address'=>'soc_adres','s.zip'=>'soc_zip','s.town'=>'soc_town','s.fk_pays'=>'soc_pays','s.phone'=>'soc_tel',
-		//	's.siren'=>'soc_siren','s.siret'=>'soc_siret','s.ape'=>'soc_ape','s.idprof4'=>'soc_idprof4','s.code_compta'=>'soc_customer_accountancy',
-		//	's.code_compta_fournisseur'=>'soc_supplier_accountancy','f.rowid'=>"invoiceid",'f.ref'=>"ref",'f.datec'=>"datecreation",'f.datef'=>"dateinvoice",
-		//	'f.total'=>"totalht",'f.total_ttc'=>"totalttc",'f.tva'=>"totalvat",'f.paye'=>"paid",'f.fk_statut'=>'status','f.note'=>"note",'fd.rowid'=>'lineid',
-		//	'fd.description'=>"linedescription",'fd.price'=>"lineprice",'fd.total_ht'=>"linetotalht",'fd.total_tva'=>"linetotaltva",'fd.total_ttc'=>"linetotalttc",
-		//	'fd.tva_tx'=>"linevatrate",'fd.qty'=>"lineqty",'fd.date_start'=>"linedatestart",'fd.date_end'=>"linedateend",'fd.fk_product'=>'productid',
-		//	'p.ref'=>'productref'
-		//);
-		// $this->export_sql_start[$r]='SELECT DISTINCT ';
-		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
-		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
-		// $r++;
-	}
+    /**
+     *  Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *  @param	DoliDB	$db		Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+
+        // Id for module (must be unique).
+        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+        $this->numero = 20000;
+        // Key text used to identify module (for permissions, menus, etc...)
+        $this->rights_class = 'holiday';
+
+        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+        // It is used to group modules in module setup page
+        $this->family = "hr";
+        $this->module_position = '30';
+        // 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 = "Leave requests";
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' 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='holiday';
+
+        // Data directories to create when module is enabled.
+        // Example: this->dirs = array("/mymodule/temp");
+        $this->dirs = array("/holiday/temp");
+        $r=0;
+
+        // Config pages
+        $this->config_page_url = array("holiday.php");
+
+
+        // Config pages. Put here list of php page names stored in admmin directory used to setup module.
+        // $this->config_page_url = array("holiday.php?leftmenu=setup@holiday");
+
+        // 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->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+        $this->langfiles = array("holiday");
+
+        // Constants
+        // Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',0),
+        //                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0) );
+        //                             2=>array('MAIN_MODULE_MYMODULE_NEEDSMARTY','chaine',1,'Constant to say module need smarty',0)
+        $this->const = array();			// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
+        $r=0;
+
+        $this->const[$r][0] = "HOLIDAY_ADDON";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "mod_holiday_madonna";
+        $this->const[$r][3] = 'Nom du gestionnaire de numerotation des congés';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "HOLIDAY_ADDON_PDF";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "celebrate";
+        $this->const[$r][3] = 'Name of PDF model of holiday';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "HOLIDAY_ADDON_PDF_ODT_PATH";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/holiday";
+        $this->const[$r][3] = "";
+        $this->const[$r][4] = 0;
+        $r++;
+
+        // Array to add new pages in new tabs
+        //$this->tabs[] = array('data'=>'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->read:/holiday/list.php?mainmenu=hrm&id=__ID__');	// We avoid to get one tab for each module. RH data are already in RH tab.
+        $this->tabs[] = array();  					// To add a new tab identified by code tabname1
+
+        // Boxes
+        $this->boxes = array();			// List of boxes
+        $r=0;
+
+        // Add here list of php file(s) stored in includes/boxes that contains class to show a box.
+        // Example:
+        //$this->boxes[$r][1] = "myboxa.php";
+        //$r++;
+        //$this->boxes[$r][1] = "myboxb.php";
+        //$r++;
+
+
+        // Permissions
+        $this->rights = array();		// Permission array used by this module
+        $r=0;
+
+        $this->rights[$r][0] = 20001; 				// Permission id (must not be already used)
+        $this->rights[$r][1] = 'Read your own leave requests';	// Permission label
+        $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+        $this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $r++;
+
+        $this->rights[$r][0] = 20002; 				// Permission id (must not be already used)
+        $this->rights[$r][1] = 'Create/modify your own leave requests';	// Permission label
+        $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+        $this->rights[$r][4] = 'write';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $r++;
+
+        $this->rights[$r][0] = 20003; 				// Permission id (must not be already used)
+        $this->rights[$r][1] = 'Delete leave requests';	// Permission label
+        $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+        $this->rights[$r][4] = 'delete';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $r++;
+
+        $this->rights[$r][0] = 20007;
+        $this->rights[$r][1] = 'Approve leave requests';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'approve';
+        $r++;
+
+        $this->rights[$r][0] = 20004; 				// Permission id (must not be already used)
+        $this->rights[$r][1] = 'Read leave requests for everybody';	// Permission label
+        $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+        $this->rights[$r][4] = 'read_all';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $r++;
+
+        $this->rights[$r][0] = 20005; 				// Permission id (must not be already used)
+        $this->rights[$r][1] = 'Create/modify leave requests for everybody';	// Permission label
+        $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+        $this->rights[$r][4] = 'write_all';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $r++;
+
+        $this->rights[$r][0] = 20006; 				// Permission id (must not be already used)
+        $this->rights[$r][1] = 'Setup leave requests of users (setup and update balance)';	// Permission label
+        $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+        $this->rights[$r][4] = 'define_holiday';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $r++;
+
+
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+
+
+        // Exports
+        $r=0;
+
+        $r++;
+        $this->export_code[$r]='leaverequest_'.$r;
+        $this->export_label[$r]='ListeCP';
+        $this->export_icon[$r]='holiday';
+        $this->export_permission[$r]=array(array("holiday","read_all"));
+        $this->export_fields_array[$r]=array(
+            'd.rowid'=>"LeaveId",'d.fk_type'=>'TypeOfLeaveId','t.code'=>'TypeOfLeaveCode','t.label'=>'TypeOfLeaveLabel','d.fk_user'=>'UserID',
+            'u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>"Login",'d.date_debut'=>'DateStart','d.date_fin'=>'DateEnd','d.halfday'=>'HalfDay',
+            'd.date_valid'=>'DateApprove','d.fk_validator'=>"UserForApprovalID",'ua.lastname'=>"UserForApprovalLastname",'ua.firstname'=>"UserForApprovalFirstname",
+            'ua.login'=>"UserForApprovalLogin",'d.description'=>'Description','d.statut'=>'Status'
+        );
+        $this->export_entities_array[$r]=array(
+            'u.lastname'=>'user','u.firstname'=>'user','u.login'=>'user','ua.lastname'=>'user','ua.firstname'=>'user','ua.login'=>'user'
+        );
+        $this->export_alias_array[$r]=array('d.rowid'=>"idholiday");
+        $this->export_dependencies_array[$r]=array(); // 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.'holiday as d';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_holiday_types as t ON t.rowid = d.fk_type';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as ua ON ua.rowid = d.fk_validator,';
+        $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'user as u';
+        $this->export_sql_end[$r] .=' WHERE d.fk_user = u.rowid';
+        $this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('holiday').')';
+
+        // Example:
+        // $this->export_code[$r]=$this->rights_class.'_'.$r;
+        // $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+        // $this->export_permission[$r]=array(array("facture","facture","export"));
+        // $this->export_fields_array[$r]=array(
+        //	's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
+        //	's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode',
+        //	's.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",
+        //	'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus',
+        //	'f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",
+        //	'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",
+        //	'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef'
+        //);
+        // $this->export_entities_array[$r]=array(
+        //	's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company',
+        //	's.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company',
+        //	'f.rowid'=>"invoice",'f.ref'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",
+        //	'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",
+        //	'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",
+        //	'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product'
+        //);
+        // $this->export_alias_array[$r]=array(
+        //	's.rowid'=>"socid",'s.nom'=>'soc_name','s.address'=>'soc_adres','s.zip'=>'soc_zip','s.town'=>'soc_town','s.fk_pays'=>'soc_pays','s.phone'=>'soc_tel',
+        //	's.siren'=>'soc_siren','s.siret'=>'soc_siret','s.ape'=>'soc_ape','s.idprof4'=>'soc_idprof4','s.code_compta'=>'soc_customer_accountancy',
+        //	's.code_compta_fournisseur'=>'soc_supplier_accountancy','f.rowid'=>"invoiceid",'f.ref'=>"ref",'f.datec'=>"datecreation",'f.datef'=>"dateinvoice",
+        //	'f.total'=>"totalht",'f.total_ttc'=>"totalttc",'f.tva'=>"totalvat",'f.paye'=>"paid",'f.fk_statut'=>'status','f.note'=>"note",'fd.rowid'=>'lineid',
+        //	'fd.description'=>"linedescription",'fd.price'=>"lineprice",'fd.total_ht'=>"linetotalht",'fd.total_tva'=>"linetotaltva",'fd.total_ttc'=>"linetotalttc",
+        //	'fd.tva_tx'=>"linevatrate",'fd.qty'=>"lineqty",'fd.date_start'=>"linedatestart",'fd.date_end'=>"linedateend",'fd.fk_product'=>'productid',
+        //	'p.ref'=>'productref'
+        //);
+        // $this->export_sql_start[$r]='SELECT DISTINCT ';
+        // $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
+        // $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
+        // $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
+        // $r++;
+    }
 }
 

Spacing +71 added lines, -71 removed lines

@@ -28,7 +28,7 @@ 
  *    \ingroup    holiday
  *    \brief      Description and activation file for module holiday
  */
-include_once DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php";
+include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
 
 
 /**
@@ -56,7 +56,7 @@ 
 		$this->family = "hr";
 		$this->module_position = '30';
 		// 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));
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
 		$this->description = "Leave requests";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
@@ -66,12 +66,12 @@ 
 		// 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='holiday';
+		$this->picto = 'holiday';
 
 		// Data directories to create when module is enabled.
 		// Example: this->dirs = array("/mymodule/temp");
 		$this->dirs = array("/holiday/temp");
-		$r=0;
+		$r = 0;
 
 		// Config pages
 		$this->config_page_url = array("holiday.php");
@@ -81,20 +81,20 @@ 
 		// $this->config_page_url = array("holiday.php?leftmenu=setup@holiday");
 
 		// 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->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr 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->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("holiday");
 
 		// Constants
 		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',0),
 		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0) );
 		//                             2=>array('MAIN_MODULE_MYMODULE_NEEDSMARTY','chaine',1,'Constant to say module need smarty',0)
-		$this->const = array();			// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
-		$r=0;
+		$this->const = array(); // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
+		$r = 0;
 
 		$this->const[$r][0] = "HOLIDAY_ADDON";
 		$this->const[$r][1] = "chaine";
@@ -119,11 +119,11 @@ 
 
 		// Array to add new pages in new tabs
 		//$this->tabs[] = array('data'=>'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->read:/holiday/list.php?mainmenu=hrm&id=__ID__');	// We avoid to get one tab for each module. RH data are already in RH tab.
-		$this->tabs[] = array();  					// To add a new tab identified by code tabname1
+		$this->tabs[] = array(); // To add a new tab identified by code tabname1
 
 		// Boxes
-		$this->boxes = array();			// List of boxes
-		$r=0;
+		$this->boxes = array(); // List of boxes
+		$r = 0;
 
 		// Add here list of php file(s) stored in includes/boxes that contains class to show a box.
 		// Example:
@@ -134,28 +134,28 @@ 
 
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
-
-		$this->rights[$r][0] = 20001; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read your own leave requests';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
+
+		$this->rights[$r][0] = 20001; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read your own leave requests'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
-		$this->rights[$r][0] = 20002; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/modify your own leave requests';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][0] = 20002; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/modify your own leave requests'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
-		$this->rights[$r][0] = 20003; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Delete leave requests';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'delete';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][0] = 20003; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Delete leave requests'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'delete'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		$this->rights[$r][0] = 20007;
@@ -165,60 +165,60 @@ 
 		$this->rights[$r][4] = 'approve';
 		$r++;
 
-		$this->rights[$r][0] = 20004; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read leave requests for everybody';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read_all';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][0] = 20004; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read leave requests for everybody'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'read_all'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
-		$this->rights[$r][0] = 20005; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/modify leave requests for everybody';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write_all';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][0] = 20005; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/modify leave requests for everybody'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'write_all'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
-		$this->rights[$r][0] = 20006; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Setup leave requests of users (setup and update balance)';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'define_holiday';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][0] = 20006; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Setup leave requests of users (setup and update balance)'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'define_holiday'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 
 		// 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]='leaverequest_'.$r;
-		$this->export_label[$r]='ListeCP';
-		$this->export_icon[$r]='holiday';
-		$this->export_permission[$r]=array(array("holiday","read_all"));
-		$this->export_fields_array[$r]=array(
-			'd.rowid'=>"LeaveId",'d.fk_type'=>'TypeOfLeaveId','t.code'=>'TypeOfLeaveCode','t.label'=>'TypeOfLeaveLabel','d.fk_user'=>'UserID',
-			'u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>"Login",'d.date_debut'=>'DateStart','d.date_fin'=>'DateEnd','d.halfday'=>'HalfDay',
-			'd.date_valid'=>'DateApprove','d.fk_validator'=>"UserForApprovalID",'ua.lastname'=>"UserForApprovalLastname",'ua.firstname'=>"UserForApprovalFirstname",
-			'ua.login'=>"UserForApprovalLogin",'d.description'=>'Description','d.statut'=>'Status'
+		$this->export_code[$r] = 'leaverequest_'.$r;
+		$this->export_label[$r] = 'ListeCP';
+		$this->export_icon[$r] = 'holiday';
+		$this->export_permission[$r] = array(array("holiday", "read_all"));
+		$this->export_fields_array[$r] = array(
+			'd.rowid'=>"LeaveId", 'd.fk_type'=>'TypeOfLeaveId', 't.code'=>'TypeOfLeaveCode', 't.label'=>'TypeOfLeaveLabel', 'd.fk_user'=>'UserID',
+			'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>"Login", 'd.date_debut'=>'DateStart', 'd.date_fin'=>'DateEnd', 'd.halfday'=>'HalfDay',
+			'd.date_valid'=>'DateApprove', 'd.fk_validator'=>"UserForApprovalID", 'ua.lastname'=>"UserForApprovalLastname", 'ua.firstname'=>"UserForApprovalFirstname",
+			'ua.login'=>"UserForApprovalLogin", 'd.description'=>'Description', 'd.statut'=>'Status'
 		);
-		$this->export_entities_array[$r]=array(
-			'u.lastname'=>'user','u.firstname'=>'user','u.login'=>'user','ua.lastname'=>'user','ua.firstname'=>'user','ua.login'=>'user'
+		$this->export_entities_array[$r] = array(
+			'u.lastname'=>'user', 'u.firstname'=>'user', 'u.login'=>'user', 'ua.lastname'=>'user', 'ua.firstname'=>'user', 'ua.login'=>'user'
 		);
-		$this->export_alias_array[$r]=array('d.rowid'=>"idholiday");
-		$this->export_dependencies_array[$r]=array(); // 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.'holiday as d';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_holiday_types as t ON t.rowid = d.fk_type';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as ua ON ua.rowid = d.fk_validator,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'user as u';
-		$this->export_sql_end[$r] .=' WHERE d.fk_user = u.rowid';
-		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('holiday').')';
+		$this->export_alias_array[$r] = array('d.rowid'=>"idholiday");
+		$this->export_dependencies_array[$r] = array(); // 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.'holiday as d';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_holiday_types as t ON t.rowid = d.fk_type';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as ua ON ua.rowid = d.fk_validator,';
+		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'user as u';
+		$this->export_sql_end[$r] .= ' WHERE d.fk_user = u.rowid';
+		$this->export_sql_end[$r] .= ' AND d.entity IN ('.getEntity('holiday').')';
 
 		// Example:
 		// $this->export_code[$r]=$this->rights_class.'_'.$r;

dolibarr/htdocs/core/modules/import/import_xlsx.modules.php

Indentation +546 added lines, -546 removed lines

@@ -41,76 +41,76 @@ 
     public $datatoimport;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+    /**
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
 
     /**
-	 * @var int ID
-	 */
-	public $id;
+     * @var int ID
+     */
+    public $id;
 
-	/**
+    /**
      * @var string label
      */
     public $label;
 
-	public $extension;    // Extension of files imported by driver
+    public $extension;    // Extension of files imported by driver
 
-	/**
+    /**
      * Dolibarr version of driver
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
-	public $label_lib;    // Label of external lib used by driver
+    public $label_lib;    // Label of external lib used by driver
 
-	public $version_lib;  // Version of external lib used by driver
+    public $version_lib;  // Version of external lib used by driver
 
-	public $separator;
+    public $separator;
 
     public $file;      // Path of file
 
-	public $handle;    // Handle fichier
-
-	public $cacheconvert=array();      // Array to cache list of value found after a convertion
+    public $handle;    // Handle fichier
 
-	public $cachefieldtable=array();   // Array to cache list of value found into fields@tables
+    public $cacheconvert=array();      // Array to cache list of value found after a convertion
 
-	public $workbook; // temporary import file
+    public $cachefieldtable=array();   // Array to cache list of value found into fields@tables
 
-	public $record; // current record
+    public $workbook; // temporary import file
 
-	public $headers;
+    public $record; // current record
 
+    public $headers;
 
-	/**
-	 *	Constructor
-	 *
-	 *	@param	DoliDB		$db				Database handler
-	 *	@param	string		$datatoimport	String code describing import set (ex: 'societe_1')
-	 */
-	function __construct($db,$datatoimport)
-	{
-		global $conf,$langs;
-		$this->db = $db;
 
-		// this is used as an extension from the example file code, so we have to put xlsx here !!!
-		$this->id='xlsx';                // Same value as xxx in file name export_xxx.modules.php
-		$this->label='Excel 2007';             // Label of driver
-		$this->desc=$langs->trans("Excel2007FormatDesc");
-		$this->extension='xlsx';         // Extension for generated file by this driver
-		$this->picto='mime/xls';		// Picto (This is not used by the example file code as Mime type, too bad ...)
-		$this->version='1.0';         // Driver version
-
-		// If driver use an external library, put its name here
+    /**
+     *	Constructor
+     *
+     *	@param	DoliDB		$db				Database handler
+     *	@param	string		$datatoimport	String code describing import set (ex: 'societe_1')
+     */
+    function __construct($db,$datatoimport)
+    {
+        global $conf,$langs;
+        $this->db = $db;
+
+        // this is used as an extension from the example file code, so we have to put xlsx here !!!
+        $this->id='xlsx';                // Same value as xxx in file name export_xxx.modules.php
+        $this->label='Excel 2007';             // Label of driver
+        $this->desc=$langs->trans("Excel2007FormatDesc");
+        $this->extension='xlsx';         // Extension for generated file by this driver
+        $this->picto='mime/xls';		// Picto (This is not used by the example file code as Mime type, too bad ...)
+        $this->version='1.0';         // Driver version
+
+        // If driver use an external library, put its name here
         require_once PHPEXCEL_PATH.'PHPExcel.php';
-		require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
+        require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
         if (! class_exists('ZipArchive')) // For Excel2007, PHPExcel need ZipArchive
         {
                 $langs->load("errors");
@@ -120,20 +120,20 @@ 
         $this->label_lib='PhpExcel';
         $this->version_lib='1.8.0';
 
-		$this->datatoimport=$datatoimport;
-		if (preg_match('/^societe_/',$datatoimport)) $this->thirpartyobject=new Societe($this->db);
-	}
+        $this->datatoimport=$datatoimport;
+        if (preg_match('/^societe_/',$datatoimport)) $this->thirpartyobject=new Societe($this->db);
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output header of an example file for this format
-	 *
-	 * 	@param	Translate	$outputlangs		Output language
-	 *  @return	string
-	 */
-	function write_header_example($outputlangs)
-	{
+    /**
+     * 	Output header of an example file for this format
+     *
+     * 	@param	Translate	$outputlangs		Output language
+     *  @return	string
+     */
+    function write_header_example($outputlangs)
+    {
         // phpcs:enable
         global $user,$conf,$langs;
         // create a temporary object, the final output will be generated in footer
@@ -159,291 +159,291 @@ 
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output title line of an example file for this format
-	 *
-	 * 	@param	Translate	$outputlangs		Output language
-	 *  @param	array		$headerlinefields	Array of fields name
-	 * 	@return	string
-	 */
-	function write_title_example($outputlangs,$headerlinefields)
-	{
+    /**
+     * 	Output title line of an example file for this format
+     *
+     * 	@param	Translate	$outputlangs		Output language
+     *  @param	array		$headerlinefields	Array of fields name
+     * 	@return	string
+     */
+    function write_title_example($outputlangs,$headerlinefields)
+    {
         // phpcs:enable
-		global $conf;
-		$this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
-		$this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
-
-		$col = 0;
-		foreach($headerlinefields as $field) {
-			$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($col, 1, $outputlangs->transnoentities($field));
-			// set autowidth
-			//$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($col + 1))->setAutoSize(true);
-			$col++;
-		}
+        global $conf;
+        $this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
+        $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
+
+        $col = 0;
+        foreach($headerlinefields as $field) {
+            $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($col, 1, $outputlangs->transnoentities($field));
+            // set autowidth
+            //$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($col + 1))->setAutoSize(true);
+            $col++;
+        }
 
-		return ''; // final output will be generated in footer
-	}
+        return ''; // final output will be generated in footer
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output record of an example file for this format
-	 *
-	 * 	@param	Translate	$outputlangs		Output language
-	 * 	@param	array		$contentlinevalues	Array of lines
-	 * 	@return	string
-	 */
-	function write_record_example($outputlangs,$contentlinevalues)
-	{
+    /**
+     * 	Output record of an example file for this format
+     *
+     * 	@param	Translate	$outputlangs		Output language
+     * 	@param	array		$contentlinevalues	Array of lines
+     * 	@return	string
+     */
+    function write_record_example($outputlangs,$contentlinevalues)
+    {
         // phpcs:enable
-		$col = 0;
-		$row = 2;
-		foreach($contentlinevalues as $cell) {
-			$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($col, $row, $cell);
-			$col++;
-		}
+        $col = 0;
+        $row = 2;
+        foreach($contentlinevalues as $cell) {
+            $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($col, $row, $cell);
+            $col++;
+        }
 
-		return ''; // final output will be generated in footer
-	}
+        return ''; // final output will be generated in footer
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output footer of an example file for this format
-	 *
-	 * 	@param	Translate	$outputlangs		Output language
-	 *  @return	string
-	 */
-	function write_footer_example($outputlangs)
-	{
+    /**
+     * 	Output footer of an example file for this format
+     *
+     * 	@param	Translate	$outputlangs		Output language
+     *  @return	string
+     */
+    function write_footer_example($outputlangs)
+    {
         // phpcs:enable
-		// return the file content as a string
-		$tempfile = tempnam(sys_get_temp_dir(), 'dol');
-		$objWriter = new PHPExcel_Writer_Excel2007($this->workbook);
-		$objWriter->save($tempfile);
-		$this->workbook->disconnectWorksheets();
-		unset($this->workbook);
-
-		$content = file_get_contents($tempfile);
-		unlink($tempfile);
-		return $content;
-	}
+        // return the file content as a string
+        $tempfile = tempnam(sys_get_temp_dir(), 'dol');
+        $objWriter = new PHPExcel_Writer_Excel2007($this->workbook);
+        $objWriter->save($tempfile);
+        $this->workbook->disconnectWorksheets();
+        unset($this->workbook);
+
+        $content = file_get_contents($tempfile);
+        unlink($tempfile);
+        return $content;
+    }
 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Open input file
-	 *
-	 *	@param	string	$file		Path of filename
-	 *	@return	int					<0 if KO, >=0 if OK
-	 */
-	function import_open_file($file)
-	{
+    /**
+     *	Open input file
+     *
+     *	@param	string	$file		Path of filename
+     *	@return	int					<0 if KO, >=0 if OK
+     */
+    function import_open_file($file)
+    {
         // phpcs:enable
-		global $langs;
-		$ret=1;
+        global $langs;
+        $ret=1;
 
-		dol_syslog(get_class($this)."::open_file file=".$file);
+        dol_syslog(get_class($this)."::open_file file=".$file);
 
-		$reader = new PHPExcel_Reader_Excel2007();
-		$this->workbook = $reader->load($file);
-		$this->record = 1;
-		$this->file = $file;
+        $reader = new PHPExcel_Reader_Excel2007();
+        $this->workbook = $reader->load($file);
+        $this->record = 1;
+        $this->file = $file;
 
-		return $ret;
-	}
+        return $ret;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Return nb of records. File must be closed.
-	 *
-	 *	@param	string	$file		Path of filename
-	 * 	@return		int		<0 if KO, >=0 if OK
-	 */
-	function import_get_nb_of_lines($file)
-	{
+    /**
+     * 	Return nb of records. File must be closed.
+     *
+     *	@param	string	$file		Path of filename
+     * 	@return		int		<0 if KO, >=0 if OK
+     */
+    function import_get_nb_of_lines($file)
+    {
         // phpcs:enable
-		$reader = new PHPExcel_Reader_Excel2007();
-		$this->workbook = $reader->load($file);
+        $reader = new PHPExcel_Reader_Excel2007();
+        $this->workbook = $reader->load($file);
 
-		$rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
+        $rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
 
-		$this->workbook->disconnectWorksheets();
-		unset($this->workbook);
+        $this->workbook->disconnectWorksheets();
+        unset($this->workbook);
 
-		return $rowcount;
-	}
+        return $rowcount;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Input header line from file
-	 *
-	 * 	@return		int		<0 if KO, >=0 if OK
-	 */
-	function import_read_header()
-	{
+    /**
+     * 	Input header line from file
+     *
+     * 	@return		int		<0 if KO, >=0 if OK
+     */
+    function import_read_header()
+    {
         // phpcs:enable
-		// This is not called by the import code !!!
-		$this->headers = array();
-		$colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn());
-		for($col=0;$col<$colcount;$col++) {
-			$this->headers[$col] = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, 1)->getValue();
-		}
-		return 0;
-	}
+        // This is not called by the import code !!!
+        $this->headers = array();
+        $colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn());
+        for($col=0;$col<$colcount;$col++) {
+            $this->headers[$col] = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, 1)->getValue();
+        }
+        return 0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Return array of next record in input file.
-	 *
-	 * 	@return		Array		Array of field values. Data are UTF8 encoded. [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=not empty string)
-	 */
-	function import_read_record()
-	{
+    /**
+     * 	Return array of next record in input file.
+     *
+     * 	@return		Array		Array of field values. Data are UTF8 encoded. [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=not empty string)
+     */
+    function import_read_record()
+    {
         // phpcs:enable
-		global $conf;
-
-		$rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
-		if($this->record > $rowcount)
-			return false;
-		$array = array();
-		$colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn(0));
-		for($col=0;$col<$colcount;$col++) {
-			$val = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, $this->record)->getValue();
-			$array[$col]['val'] = $val;
-			$array[$col]['type'] = (dol_strlen($val)?1:-1); // If empty we consider it null
-		}
-		$this->record++;
-		return $array;
-	}
+        global $conf;
+
+        $rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
+        if($this->record > $rowcount)
+            return false;
+        $array = array();
+        $colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn(0));
+        for($col=0;$col<$colcount;$col++) {
+            $val = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, $this->record)->getValue();
+            $array[$col]['val'] = $val;
+            $array[$col]['type'] = (dol_strlen($val)?1:-1); // If empty we consider it null
+        }
+        $this->record++;
+        return $array;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Close file handle
-	 *
-	 *  @return	integer
-	 */
-	function import_close_file()
-	{
+    /**
+     * 	Close file handle
+     *
+     *  @return	integer
+     */
+    function import_close_file()
+    {
         // phpcs:enable
-		$this->workbook->disconnectWorksheets();
-		unset($this->workbook);
-	}
+        $this->workbook->disconnectWorksheets();
+        unset($this->workbook);
+    }
 
 
     // What is this doing here ? it is common to all imports, is should be in the parent class
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Insert a record into database
-	 *
-	 * @param	array	$arrayrecord					Array of read values: [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=string), [fieldpos+1]...
-	 * @param	array	$array_match_file_to_database	Array of target fields where to insert data: [fieldpos] => 's.fieldname', [fieldpos+1]...
-	 * @param 	Object	$objimport						Object import (contains objimport->array_import_tables, objimport->array_import_fields, objimport->array_import_convertvalue, ...)
-	 * @param	int		$maxfields						Max number of fields to use
-	 * @param	string	$importid						Import key
-	 * @param	array	$updatekeys						Array of keys to use to try to do an update first before insert. This field are defined into the module descriptor.
-	 * @return	int										<0 if KO, >0 if OK
-	 */
-	function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$maxfields,$importid,$updatekeys)
-	{
+    /**
+     * Insert a record into database
+     *
+     * @param	array	$arrayrecord					Array of read values: [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=string), [fieldpos+1]...
+     * @param	array	$array_match_file_to_database	Array of target fields where to insert data: [fieldpos] => 's.fieldname', [fieldpos+1]...
+     * @param 	Object	$objimport						Object import (contains objimport->array_import_tables, objimport->array_import_fields, objimport->array_import_convertvalue, ...)
+     * @param	int		$maxfields						Max number of fields to use
+     * @param	string	$importid						Import key
+     * @param	array	$updatekeys						Array of keys to use to try to do an update first before insert. This field are defined into the module descriptor.
+     * @return	int										<0 if KO, >0 if OK
+     */
+    function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$maxfields,$importid,$updatekeys)
+    {
         // phpcs:enable
-		global $langs,$conf,$user;
+        global $langs,$conf,$user;
         global $thirdparty_static;    	// Specific to thirdparty import
-		global $tablewithentity_cache;	// Cache to avoid to call  desc at each rows on tables
-
-		$error=0;
-		$warning=0;
-		$this->errors=array();
-		$this->warnings=array();
-
-		//dol_syslog("import_csv.modules maxfields=".$maxfields." importid=".$importid);
-
-		//var_dump($array_match_file_to_database);
-		//var_dump($arrayrecord);
-		$array_match_database_to_file=array_flip($array_match_file_to_database);
-		$sort_array_match_file_to_database=$array_match_file_to_database;
-		ksort($sort_array_match_file_to_database);
-
-		//var_dump($sort_array_match_file_to_database);
-
-		if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val'])))
-		{
-			//print 'W';
-			$this->warnings[$warning]['lib']=$langs->trans('EmptyLine');
-			$this->warnings[$warning]['type']='EMPTY';
-			$warning++;
-		}
-		else
-		{
-			$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
-			$updatedone = false;
-			$insertdone = false;
-			// For each table to insert, me make a separate insert
-			foreach($objimport->array_import_tables[0] as $alias => $tablename)
-			{
-				// Build sql request
-				$sql='';
-				$listfields=array();
-				$listvalues=array();
-				$i=0;
-				$errorforthistable=0;
-
-				// Define $tablewithentity_cache[$tablename] if not already defined
-				if (! isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
-				{
-					dol_syslog("Check if table ".$tablename." has an entity field");
-					$resql=$this->db->DDLDescTable($tablename,'entity');
-					if ($resql)
-					{
-						$obj=$this->db->fetch_object($resql);
-						if ($obj) $tablewithentity_cache[$tablename]=1;		// table contains entity field
-						else $tablewithentity_cache[$tablename]=0;			// table does not contains entity field
-					}
-					else dol_print_error($this->db);
-				}
-				else
-				{
-					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
-				}
-
-
-				// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
-				foreach($sort_array_match_file_to_database as $key => $val)
-				{
-				    $fieldalias=preg_replace('/\..*$/i','',$val);
-				    $fieldname=preg_replace('/^.*\./i','',$val);
-
-				    if ($alias != $fieldalias) continue;    // Not a field of current table
-
-					if ($key <= $maxfields)
-					{
-						// Set $newval with value to insert and set $listvalues with sql request part for insert
-						$newval='';
-						if ($arrayrecord[($key-1)]['type'] > 0) $newval=$arrayrecord[($key-1)]['val'];    // If type of field into input file is not empty string (so defined into input file), we get value
-
-						// Make some tests on $newval
-
-						// Is it a required field ?
-						if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ((string) $newval==''))
-						{
-							$this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key);
-							$this->errors[$error]['type']='NOTNULL';
-							$errorforthistable++;
-							$error++;
-						}
-						// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
-						else
-						{
-						    // We convert field if required
-						    if (! empty($objimport->array_import_convertvalue[0][$val]))
-						    {
+        global $tablewithentity_cache;	// Cache to avoid to call  desc at each rows on tables
+
+        $error=0;
+        $warning=0;
+        $this->errors=array();
+        $this->warnings=array();
+
+        //dol_syslog("import_csv.modules maxfields=".$maxfields." importid=".$importid);
+
+        //var_dump($array_match_file_to_database);
+        //var_dump($arrayrecord);
+        $array_match_database_to_file=array_flip($array_match_file_to_database);
+        $sort_array_match_file_to_database=$array_match_file_to_database;
+        ksort($sort_array_match_file_to_database);
+
+        //var_dump($sort_array_match_file_to_database);
+
+        if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val'])))
+        {
+            //print 'W';
+            $this->warnings[$warning]['lib']=$langs->trans('EmptyLine');
+            $this->warnings[$warning]['type']='EMPTY';
+            $warning++;
+        }
+        else
+        {
+            $last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
+            $updatedone = false;
+            $insertdone = false;
+            // For each table to insert, me make a separate insert
+            foreach($objimport->array_import_tables[0] as $alias => $tablename)
+            {
+                // Build sql request
+                $sql='';
+                $listfields=array();
+                $listvalues=array();
+                $i=0;
+                $errorforthistable=0;
+
+                // Define $tablewithentity_cache[$tablename] if not already defined
+                if (! isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
+                {
+                    dol_syslog("Check if table ".$tablename." has an entity field");
+                    $resql=$this->db->DDLDescTable($tablename,'entity');
+                    if ($resql)
+                    {
+                        $obj=$this->db->fetch_object($resql);
+                        if ($obj) $tablewithentity_cache[$tablename]=1;		// table contains entity field
+                        else $tablewithentity_cache[$tablename]=0;			// table does not contains entity field
+                    }
+                    else dol_print_error($this->db);
+                }
+                else
+                {
+                    //dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
+                }
+
+
+                // Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
+                foreach($sort_array_match_file_to_database as $key => $val)
+                {
+                    $fieldalias=preg_replace('/\..*$/i','',$val);
+                    $fieldname=preg_replace('/^.*\./i','',$val);
+
+                    if ($alias != $fieldalias) continue;    // Not a field of current table
+
+                    if ($key <= $maxfields)
+                    {
+                        // Set $newval with value to insert and set $listvalues with sql request part for insert
+                        $newval='';
+                        if ($arrayrecord[($key-1)]['type'] > 0) $newval=$arrayrecord[($key-1)]['val'];    // If type of field into input file is not empty string (so defined into input file), we get value
+
+                        // Make some tests on $newval
+
+                        // Is it a required field ?
+                        if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ((string) $newval==''))
+                        {
+                            $this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key);
+                            $this->errors[$error]['type']='NOTNULL';
+                            $errorforthistable++;
+                            $error++;
+                        }
+                        // Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
+                        else
+                        {
+                            // We convert field if required
+                            if (! empty($objimport->array_import_convertvalue[0][$val]))
+                            {
                                 //print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
                                 if ($objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeid'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromref'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel'
-                                	)
+                                    || $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromref'
+                                    || $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel'
+                                    )
                                 {
                                     // New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
                                     $isidorref='id';
@@ -458,10 +458,10 @@ 
                                         $method=$objimport->array_import_convertvalue[0][$val]['method'];
                                         if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
-                                        	$newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
+                                            $newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
                                         }
                                         else
-										{
+                                        {
                                             $resultload = dol_include_once($file);
                                             if (empty($resultload))
                                             {
@@ -474,7 +474,7 @@ 
                                             // If not found, try the fetch from label
                                             if (! ($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel')
                                             {
-												call_user_func_array(array($classinstance, $method),array('', '', $newval));
+                                                call_user_func_array(array($classinstance, $method),array('', '', $newval));
                                             }
                                             $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval]=$classinstance->id;
                                             //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
@@ -561,257 +561,257 @@ 
                                 }
 
                                 //print 'Val to use as insert is '.$newval.'<br>';
-						    }
-
-						    // Test regexp
-							if (! empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
-							{
-								// If test is "Must exist in a field@table"
-								if (preg_match('/^(.*)@(.*)$/',$objimport->array_import_regex[0][$val],$reg))
-								{
-									$field=$reg[1];
-									$table=$reg[2];
-
-									// Load content of field@table into cache array
-									if (! is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
-									{
-										$sql="SELECT ".$field." as aliasfield FROM ".$table;
-										$resql=$this->db->query($sql);
-										if ($resql)
-										{
-											$num=$this->db->num_rows($resql);
-											$i=0;
-											while ($i < $num)
-											{
-												$obj=$this->db->fetch_object($resql);
-												if ($obj) $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
-												$i++;
-											}
-										}
-										else
-										{
-											dol_print_error($this->db);
-										}
-									}
-
-									// Now we check cache is not empty (should not) and key is into cache
-									if (! is_array($this->cachefieldtable[$field.'@'.$table]) || ! in_array($newval,$this->cachefieldtable[$field.'@'.$table]))
-									{
-										$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorFieldValueNotIn',$key,$newval,$field,$table);
-										$this->errors[$error]['type']='FOREIGNKEY';
-									    $errorforthistable++;
-										$error++;
-									}
-								}
-								// If test is just a static regex
-								else if (! preg_match('/'.$objimport->array_import_regex[0][$val].'/i',$newval))
-								{
-								    //if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
-									$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorWrongValueForField',$key,$newval,$objimport->array_import_regex[0][$val]);
-									$this->errors[$error]['type']='REGEX';
-									$errorforthistable++;
-									$error++;
-								}
-							}
-
-							// Other tests
-							// ...
-						}
-
-						// Define $listfields and $listvalues to build SQL request
-						$listfields[] = $fieldname;
-
-						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
-						if (empty($newval) && $arrayrecord[($key-1)]['type'] < 0)		 $listvalues[] = ($newval=='0'?$newval:"null");
-						elseif (empty($newval) && $arrayrecord[($key-1)]['type'] == 0)	 $listvalues[] = "''";
-						else															 $listvalues[] = "'".$this->db->escape($newval)."'";
-					}
-					$i++;
-				}
-
-				// We add hidden fields (but only if there is at least one field to add into table)
-				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0]))
-				{
-    				// Loop on each hidden fields to add them into listfields/listvalues
-				    foreach($objimport->array_import_fieldshidden[0] as $key => $val)
-    				{
-    				    if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue;    // Not a field of current table
-    				    if ($val == 'user->id')
-    				    {
-    				        $listfields[] = preg_replace('/^'.preg_quote($alias).'\./','',$key);
-    				        $listvalues[] = $user->id;
-    				    }
-    				    elseif (preg_match('/^lastrowid-/',$val))
-    				    {
-    				        $tmp=explode('-',$val);
-    				        $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
-							$keyfield = preg_replace('/^'.preg_quote($alias).'\./','',$key);
-    				        $listfields[] = $keyfield;
+                            }
+
+                            // Test regexp
+                            if (! empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
+                            {
+                                // If test is "Must exist in a field@table"
+                                if (preg_match('/^(.*)@(.*)$/',$objimport->array_import_regex[0][$val],$reg))
+                                {
+                                    $field=$reg[1];
+                                    $table=$reg[2];
+
+                                    // Load content of field@table into cache array
+                                    if (! is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
+                                    {
+                                        $sql="SELECT ".$field." as aliasfield FROM ".$table;
+                                        $resql=$this->db->query($sql);
+                                        if ($resql)
+                                        {
+                                            $num=$this->db->num_rows($resql);
+                                            $i=0;
+                                            while ($i < $num)
+                                            {
+                                                $obj=$this->db->fetch_object($resql);
+                                                if ($obj) $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
+                                                $i++;
+                                            }
+                                        }
+                                        else
+                                        {
+                                            dol_print_error($this->db);
+                                        }
+                                    }
+
+                                    // Now we check cache is not empty (should not) and key is into cache
+                                    if (! is_array($this->cachefieldtable[$field.'@'.$table]) || ! in_array($newval,$this->cachefieldtable[$field.'@'.$table]))
+                                    {
+                                        $this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorFieldValueNotIn',$key,$newval,$field,$table);
+                                        $this->errors[$error]['type']='FOREIGNKEY';
+                                        $errorforthistable++;
+                                        $error++;
+                                    }
+                                }
+                                // If test is just a static regex
+                                else if (! preg_match('/'.$objimport->array_import_regex[0][$val].'/i',$newval))
+                                {
+                                    //if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
+                                    $this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorWrongValueForField',$key,$newval,$objimport->array_import_regex[0][$val]);
+                                    $this->errors[$error]['type']='REGEX';
+                                    $errorforthistable++;
+                                    $error++;
+                                }
+                            }
+
+                            // Other tests
+                            // ...
+                        }
+
+                        // Define $listfields and $listvalues to build SQL request
+                        $listfields[] = $fieldname;
+
+                        // Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
+                        if (empty($newval) && $arrayrecord[($key-1)]['type'] < 0)		 $listvalues[] = ($newval=='0'?$newval:"null");
+                        elseif (empty($newval) && $arrayrecord[($key-1)]['type'] == 0)	 $listvalues[] = "''";
+                        else															 $listvalues[] = "'".$this->db->escape($newval)."'";
+                    }
+                    $i++;
+                }
+
+                // We add hidden fields (but only if there is at least one field to add into table)
+                if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0]))
+                {
+                    // Loop on each hidden fields to add them into listfields/listvalues
+                    foreach($objimport->array_import_fieldshidden[0] as $key => $val)
+                    {
+                        if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue;    // Not a field of current table
+                        if ($val == 'user->id')
+                        {
+                            $listfields[] = preg_replace('/^'.preg_quote($alias).'\./','',$key);
+                            $listvalues[] = $user->id;
+                        }
+                        elseif (preg_match('/^lastrowid-/',$val))
+                        {
+                            $tmp=explode('-',$val);
+                            $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
+                            $keyfield = preg_replace('/^'.preg_quote($alias).'\./','',$key);
+                            $listfields[] = $keyfield;
                             $listvalues[] = $lastinsertid;
-    				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
-    				    }
-    				}
-				}
-				//print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
-
-				// If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
-				// so we can try to make the insert or update now.
-				if (! $errorforthistable)
-				{
-					//print "$alias/$tablename/$listfields/$listvalues<br>";
-					if (!empty($listfields))
-					{
-						$updatedone = false;
-						$insertdone = false;
-						if (!empty($updatekeys)) {
-							// We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
-
-							if (empty($lastinsertid)) {	// No insert done yet for a parent table
-								$sqlSelect = 'SELECT rowid FROM '.$tablename;
-
-								$data = array_combine($listfields, $listvalues);
-								$where = array();
-								$filters = array();
-								foreach ($updatekeys as $key) {
-									$col = $objimport->array_import_updatekeys[0][$key];
-									$key=preg_replace('/^.*\./i','',$key);
-									$where[] = $key.' = '.$data[$key];
-									$filters[] = $col.' = '.$data[$key];
-								}
-								$sqlSelect.= ' WHERE '.implode(' AND ', $where);
-
-								$resql=$this->db->query($sqlSelect);
-								if($resql) {
-									$res = $this->db->fetch_object($resql);
-									if($resql->num_rows == 1) {
-										$lastinsertid = $res->rowid;
-										$last_insert_id_array[$tablename] = $lastinsertid;
-									} else if($resql->num_rows > 1) {
-										$this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', '));
-										$this->errors[$error]['type']='SQL';
-										$error++;
-									} else {
-										// No record found with filters, insert will be tried below
-									}
-								}
-								else
-								{
-									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
-									$error++;
-								}
-							} else {
-								// We have a last INSERT ID. Check if we have a row referencing this foreign key.
-								// This is required when updating table with some extrafields. When inserting a record in parent table, we can make
-								// a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
-								// may already exists. So we rescan the extrafield table to know if record exists or not for the rowid.
-								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
-								$sqlSelect = 'SELECT rowid FROM '.$tablename;
-
-								if(empty($keyfield)) $keyfield = 'rowid';
-								$sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
-
-								$resql=$this->db->query($sqlSelect);
-								if($resql) {
-									$res = $this->db->fetch_object($resql);
-									if($resql->num_rows == 1) {
-										// We have a row referencing this last foreign key, continue with UPDATE.
-									} else {
-										// No record found referencing this last foreign key,
-										// force $lastinsertid to 0 so we INSERT below.
-										$lastinsertid = 0;
-									}
-								}
-								else
-								{
-									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
-									$error++;
-								}
-							}
-
-							if (!empty($lastinsertid)) {
-								// Build SQL UPDATE request
-								$sqlstart = 'UPDATE '.$tablename;
-
-								$data = array_combine($listfields, $listvalues);
-								$set = array();
-								foreach ($data as $key => $val) {
-									$set[] = $key.' = '.$val;
-								}
-								$sqlstart.= ' SET '.implode(', ', $set);
-
-								if(empty($keyfield)) $keyfield = 'rowid';
-								$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
-
-								$sql = $sqlstart.$sqlend;
-
-								// Run update request
-								$resql=$this->db->query($sql);
-								if($resql) {
-									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
-									$updatedone = true;
-								}
-								else
-								{
-									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
-									$error++;
-								}
-							}
-						}
-
-						// Update not done, we do insert
-						if (!$error && !$updatedone) {
-							// Build SQL INSERT request
-							$sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
-							$sqlend = ') VALUES('.implode(', ', $listvalues).", '".$importid."'";
-							if (! empty($tablewithentity_cache[$tablename])) {
-								$sqlstart.= ', entity';
-								$sqlend.= ', '.$conf->entity;
-							}
-							if (! empty($objimport->array_import_tables_creator[0][$alias])) {
-								$sqlstart.= ', '.$objimport->array_import_tables_creator[0][$alias];
-								$sqlend.=', '.$user->id;
-							}
-							$sql = $sqlstart.$sqlend.')';
-							dol_syslog("import_xlsx.modules", LOG_DEBUG);
-
-							// Run insert request
-							if ($sql)
-							{
-								$resql=$this->db->query($sql);
-								if ($resql)
-								{
-								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
-								    $insertdone = true;
-								}
-								else
-								{
-									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
-									$error++;
-								}
-							}
-						}
-					}
-					/*else
+                            //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
+                        }
+                    }
+                }
+                //print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
+
+                // If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
+                // so we can try to make the insert or update now.
+                if (! $errorforthistable)
+                {
+                    //print "$alias/$tablename/$listfields/$listvalues<br>";
+                    if (!empty($listfields))
+                    {
+                        $updatedone = false;
+                        $insertdone = false;
+                        if (!empty($updatekeys)) {
+                            // We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
+
+                            if (empty($lastinsertid)) {	// No insert done yet for a parent table
+                                $sqlSelect = 'SELECT rowid FROM '.$tablename;
+
+                                $data = array_combine($listfields, $listvalues);
+                                $where = array();
+                                $filters = array();
+                                foreach ($updatekeys as $key) {
+                                    $col = $objimport->array_import_updatekeys[0][$key];
+                                    $key=preg_replace('/^.*\./i','',$key);
+                                    $where[] = $key.' = '.$data[$key];
+                                    $filters[] = $col.' = '.$data[$key];
+                                }
+                                $sqlSelect.= ' WHERE '.implode(' AND ', $where);
+
+                                $resql=$this->db->query($sqlSelect);
+                                if($resql) {
+                                    $res = $this->db->fetch_object($resql);
+                                    if($resql->num_rows == 1) {
+                                        $lastinsertid = $res->rowid;
+                                        $last_insert_id_array[$tablename] = $lastinsertid;
+                                    } else if($resql->num_rows > 1) {
+                                        $this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', '));
+                                        $this->errors[$error]['type']='SQL';
+                                        $error++;
+                                    } else {
+                                        // No record found with filters, insert will be tried below
+                                    }
+                                }
+                                else
+                                {
+                                    //print 'E';
+                                    $this->errors[$error]['lib']=$this->db->lasterror();
+                                    $this->errors[$error]['type']='SQL';
+                                    $error++;
+                                }
+                            } else {
+                                // We have a last INSERT ID. Check if we have a row referencing this foreign key.
+                                // This is required when updating table with some extrafields. When inserting a record in parent table, we can make
+                                // a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
+                                // may already exists. So we rescan the extrafield table to know if record exists or not for the rowid.
+                                // Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
+                                $sqlSelect = 'SELECT rowid FROM '.$tablename;
+
+                                if(empty($keyfield)) $keyfield = 'rowid';
+                                $sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
+
+                                $resql=$this->db->query($sqlSelect);
+                                if($resql) {
+                                    $res = $this->db->fetch_object($resql);
+                                    if($resql->num_rows == 1) {
+                                        // We have a row referencing this last foreign key, continue with UPDATE.
+                                    } else {
+                                        // No record found referencing this last foreign key,
+                                        // force $lastinsertid to 0 so we INSERT below.
+                                        $lastinsertid = 0;
+                                    }
+                                }
+                                else
+                                {
+                                    //print 'E';
+                                    $this->errors[$error]['lib']=$this->db->lasterror();
+                                    $this->errors[$error]['type']='SQL';
+                                    $error++;
+                                }
+                            }
+
+                            if (!empty($lastinsertid)) {
+                                // Build SQL UPDATE request
+                                $sqlstart = 'UPDATE '.$tablename;
+
+                                $data = array_combine($listfields, $listvalues);
+                                $set = array();
+                                foreach ($data as $key => $val) {
+                                    $set[] = $key.' = '.$val;
+                                }
+                                $sqlstart.= ' SET '.implode(', ', $set);
+
+                                if(empty($keyfield)) $keyfield = 'rowid';
+                                $sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
+
+                                $sql = $sqlstart.$sqlend;
+
+                                // Run update request
+                                $resql=$this->db->query($sql);
+                                if($resql) {
+                                    // No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
+                                    $updatedone = true;
+                                }
+                                else
+                                {
+                                    //print 'E';
+                                    $this->errors[$error]['lib']=$this->db->lasterror();
+                                    $this->errors[$error]['type']='SQL';
+                                    $error++;
+                                }
+                            }
+                        }
+
+                        // Update not done, we do insert
+                        if (!$error && !$updatedone) {
+                            // Build SQL INSERT request
+                            $sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
+                            $sqlend = ') VALUES('.implode(', ', $listvalues).", '".$importid."'";
+                            if (! empty($tablewithentity_cache[$tablename])) {
+                                $sqlstart.= ', entity';
+                                $sqlend.= ', '.$conf->entity;
+                            }
+                            if (! empty($objimport->array_import_tables_creator[0][$alias])) {
+                                $sqlstart.= ', '.$objimport->array_import_tables_creator[0][$alias];
+                                $sqlend.=', '.$user->id;
+                            }
+                            $sql = $sqlstart.$sqlend.')';
+                            dol_syslog("import_xlsx.modules", LOG_DEBUG);
+
+                            // Run insert request
+                            if ($sql)
+                            {
+                                $resql=$this->db->query($sql);
+                                if ($resql)
+                                {
+                                    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
+                                    $insertdone = true;
+                                }
+                                else
+                                {
+                                    //print 'E';
+                                    $this->errors[$error]['lib']=$this->db->lasterror();
+                                    $this->errors[$error]['type']='SQL';
+                                    $error++;
+                                }
+                            }
+                        }
+                    }
+                    /*else
 					{
 						dol_print_error('','ErrorFieldListEmptyFor '.$alias."/".$tablename);
 					}*/
-				}
+                }
 
-			    if ($error) break;
-			}
+                if ($error) break;
+            }
 
-			if($updatedone) $this->nbupdate++;
-			if($insertdone) $this->nbinsert++;
-		}
+            if($updatedone) $this->nbupdate++;
+            if($insertdone) $this->nbinsert++;
+        }
 
-		return 1;
-	}
+        return 1;
+    }
 }

Spacing +173 added lines, -173 removed lines

@@ -25,7 +25,7 @@ 
  *		\brief      File to load import files with Excel format
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/import/modules_import.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
 
 
 /**
@@ -43,7 +43,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[] Error codes (or messages)
@@ -60,7 +60,7 @@ 
      */
     public $label;
 
-	public $extension;    // Extension of files imported by driver
+	public $extension; // Extension of files imported by driver
 
 	/**
      * Dolibarr version of driver
@@ -68,19 +68,19 @@ 
      */
 	public $version = 'dolibarr';
 
-	public $label_lib;    // Label of external lib used by driver
+	public $label_lib; // Label of external lib used by driver
 
-	public $version_lib;  // Version of external lib used by driver
+	public $version_lib; // Version of external lib used by driver
 
 	public $separator;
 
-    public $file;      // Path of file
+    public $file; // Path of file
 
-	public $handle;    // Handle fichier
+	public $handle; // Handle fichier
 
-	public $cacheconvert=array();      // Array to cache list of value found after a convertion
+	public $cacheconvert = array(); // Array to cache list of value found after a convertion
 
-	public $cachefieldtable=array();   // Array to cache list of value found into fields@tables
+	public $cachefieldtable = array(); // Array to cache list of value found into fields@tables
 
 	public $workbook; // temporary import file
 
@@ -95,33 +95,33 @@ 
 	 *	@param	DoliDB		$db				Database handler
 	 *	@param	string		$datatoimport	String code describing import set (ex: 'societe_1')
 	 */
-	function __construct($db,$datatoimport)
+	function __construct($db, $datatoimport)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 		$this->db = $db;
 
 		// this is used as an extension from the example file code, so we have to put xlsx here !!!
-		$this->id='xlsx';                // Same value as xxx in file name export_xxx.modules.php
-		$this->label='Excel 2007';             // Label of driver
-		$this->desc=$langs->trans("Excel2007FormatDesc");
-		$this->extension='xlsx';         // Extension for generated file by this driver
-		$this->picto='mime/xls';		// Picto (This is not used by the example file code as Mime type, too bad ...)
-		$this->version='1.0';         // Driver version
+		$this->id = 'xlsx'; // Same value as xxx in file name export_xxx.modules.php
+		$this->label = 'Excel 2007'; // Label of driver
+		$this->desc = $langs->trans("Excel2007FormatDesc");
+		$this->extension = 'xlsx'; // Extension for generated file by this driver
+		$this->picto = 'mime/xls'; // Picto (This is not used by the example file code as Mime type, too bad ...)
+		$this->version = '1.0'; // Driver version
 
 		// If driver use an external library, put its name here
         require_once PHPEXCEL_PATH.'PHPExcel.php';
 		require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-        if (! class_exists('ZipArchive')) // For Excel2007, PHPExcel need ZipArchive
+        if (!class_exists('ZipArchive')) // For Excel2007, PHPExcel need ZipArchive
         {
                 $langs->load("errors");
-                $this->error=$langs->trans('ErrorPHPNeedModule','zip');
+                $this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
                 return -1;
         }
-        $this->label_lib='PhpExcel';
-        $this->version_lib='1.8.0';
+        $this->label_lib = 'PhpExcel';
+        $this->version_lib = '1.8.0';
 
-		$this->datatoimport=$datatoimport;
-		if (preg_match('/^societe_/',$datatoimport)) $this->thirpartyobject=new Societe($this->db);
+		$this->datatoimport = $datatoimport;
+		if (preg_match('/^societe_/', $datatoimport)) $this->thirpartyobject = new Societe($this->db);
 	}
 
 
@@ -135,11 +135,11 @@ 
 	function write_header_example($outputlangs)
 	{
         // phpcs:enable
-        global $user,$conf,$langs;
+        global $user, $conf, $langs;
         // create a temporary object, the final output will be generated in footer
         if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
             $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
-            $cacheSettings = array (
+            $cacheSettings = array(
                 'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
             );
             PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
@@ -166,7 +166,7 @@ 
 	 *  @param	array		$headerlinefields	Array of fields name
 	 * 	@return	string
 	 */
-	function write_title_example($outputlangs,$headerlinefields)
+	function write_title_example($outputlangs, $headerlinefields)
 	{
         // phpcs:enable
 		global $conf;
@@ -174,7 +174,7 @@ 
 		$this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
 
 		$col = 0;
-		foreach($headerlinefields as $field) {
+		foreach ($headerlinefields as $field) {
 			$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($col, 1, $outputlangs->transnoentities($field));
 			// set autowidth
 			//$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($col + 1))->setAutoSize(true);
@@ -192,12 +192,12 @@ 
 	 * 	@param	array		$contentlinevalues	Array of lines
 	 * 	@return	string
 	 */
-	function write_record_example($outputlangs,$contentlinevalues)
+	function write_record_example($outputlangs, $contentlinevalues)
 	{
         // phpcs:enable
 		$col = 0;
 		$row = 2;
-		foreach($contentlinevalues as $cell) {
+		foreach ($contentlinevalues as $cell) {
 			$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($col, $row, $cell);
 			$col++;
 		}
@@ -240,7 +240,7 @@ 
 	{
         // phpcs:enable
 		global $langs;
-		$ret=1;
+		$ret = 1;
 
 		dol_syslog(get_class($this)."::open_file file=".$file);
 
@@ -287,7 +287,7 @@ 
 		// This is not called by the import code !!!
 		$this->headers = array();
 		$colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn());
-		for($col=0;$col<$colcount;$col++) {
+		for ($col = 0; $col < $colcount; $col++) {
 			$this->headers[$col] = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, 1)->getValue();
 		}
 		return 0;
@@ -306,14 +306,14 @@ 
 		global $conf;
 
 		$rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
-		if($this->record > $rowcount)
+		if ($this->record > $rowcount)
 			return false;
 		$array = array();
 		$colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn(0));
-		for($col=0;$col<$colcount;$col++) {
+		for ($col = 0; $col < $colcount; $col++) {
 			$val = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, $this->record)->getValue();
 			$array[$col]['val'] = $val;
-			$array[$col]['type'] = (dol_strlen($val)?1:-1); // If empty we consider it null
+			$array[$col]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we consider it null
 		}
 		$this->record++;
 		return $array;
@@ -346,24 +346,24 @@ 
 	 * @param	array	$updatekeys						Array of keys to use to try to do an update first before insert. This field are defined into the module descriptor.
 	 * @return	int										<0 if KO, >0 if OK
 	 */
-	function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$maxfields,$importid,$updatekeys)
+	function import_insert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys)
 	{
         // phpcs:enable
-		global $langs,$conf,$user;
-        global $thirdparty_static;    	// Specific to thirdparty import
-		global $tablewithentity_cache;	// Cache to avoid to call  desc at each rows on tables
+		global $langs, $conf, $user;
+        global $thirdparty_static; // Specific to thirdparty import
+		global $tablewithentity_cache; // Cache to avoid to call  desc at each rows on tables
 
-		$error=0;
-		$warning=0;
-		$this->errors=array();
-		$this->warnings=array();
+		$error = 0;
+		$warning = 0;
+		$this->errors = array();
+		$this->warnings = array();
 
 		//dol_syslog("import_csv.modules maxfields=".$maxfields." importid=".$importid);
 
 		//var_dump($array_match_file_to_database);
 		//var_dump($arrayrecord);
-		$array_match_database_to_file=array_flip($array_match_file_to_database);
-		$sort_array_match_file_to_database=$array_match_file_to_database;
+		$array_match_database_to_file = array_flip($array_match_file_to_database);
+		$sort_array_match_file_to_database = $array_match_file_to_database;
 		ksort($sort_array_match_file_to_database);
 
 		//var_dump($sort_array_match_file_to_database);
@@ -371,8 +371,8 @@ 
 		if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val'])))
 		{
 			//print 'W';
-			$this->warnings[$warning]['lib']=$langs->trans('EmptyLine');
-			$this->warnings[$warning]['type']='EMPTY';
+			$this->warnings[$warning]['lib'] = $langs->trans('EmptyLine');
+			$this->warnings[$warning]['type'] = 'EMPTY';
 			$warning++;
 		}
 		else
@@ -381,25 +381,25 @@ 
 			$updatedone = false;
 			$insertdone = false;
 			// For each table to insert, me make a separate insert
-			foreach($objimport->array_import_tables[0] as $alias => $tablename)
+			foreach ($objimport->array_import_tables[0] as $alias => $tablename)
 			{
 				// Build sql request
-				$sql='';
-				$listfields=array();
-				$listvalues=array();
-				$i=0;
-				$errorforthistable=0;
+				$sql = '';
+				$listfields = array();
+				$listvalues = array();
+				$i = 0;
+				$errorforthistable = 0;
 
 				// Define $tablewithentity_cache[$tablename] if not already defined
-				if (! isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
+				if (!isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
 				{
 					dol_syslog("Check if table ".$tablename." has an entity field");
-					$resql=$this->db->DDLDescTable($tablename,'entity');
+					$resql = $this->db->DDLDescTable($tablename, 'entity');
 					if ($resql)
 					{
-						$obj=$this->db->fetch_object($resql);
-						if ($obj) $tablewithentity_cache[$tablename]=1;		// table contains entity field
-						else $tablewithentity_cache[$tablename]=0;			// table does not contains entity field
+						$obj = $this->db->fetch_object($resql);
+						if ($obj) $tablewithentity_cache[$tablename] = 1; // table contains entity field
+						else $tablewithentity_cache[$tablename] = 0; // table does not contains entity field
 					}
 					else dol_print_error($this->db);
 				}
@@ -410,26 +410,26 @@ 
 
 
 				// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
-				foreach($sort_array_match_file_to_database as $key => $val)
+				foreach ($sort_array_match_file_to_database as $key => $val)
 				{
-				    $fieldalias=preg_replace('/\..*$/i','',$val);
-				    $fieldname=preg_replace('/^.*\./i','',$val);
+				    $fieldalias = preg_replace('/\..*$/i', '', $val);
+				    $fieldname = preg_replace('/^.*\./i', '', $val);
 
-				    if ($alias != $fieldalias) continue;    // Not a field of current table
+				    if ($alias != $fieldalias) continue; // Not a field of current table
 
 					if ($key <= $maxfields)
 					{
 						// Set $newval with value to insert and set $listvalues with sql request part for insert
-						$newval='';
-						if ($arrayrecord[($key-1)]['type'] > 0) $newval=$arrayrecord[($key-1)]['val'];    // If type of field into input file is not empty string (so defined into input file), we get value
+						$newval = '';
+						if ($arrayrecord[($key - 1)]['type'] > 0) $newval = $arrayrecord[($key - 1)]['val']; // If type of field into input file is not empty string (so defined into input file), we get value
 
 						// Make some tests on $newval
 
 						// Is it a required field ?
-						if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ((string) $newval==''))
+						if (preg_match('/\*/', $objimport->array_import_fields[0][$val]) && ((string) $newval == ''))
 						{
-							$this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key);
-							$this->errors[$error]['type']='NOTNULL';
+							$this->errors[$error]['lib'] = $langs->trans('ErrorMissingMandatoryValue', $key);
+							$this->errors[$error]['type'] = 'NOTNULL';
 							$errorforthistable++;
 							$error++;
 						}
@@ -437,28 +437,28 @@ 
 						else
 						{
 						    // We convert field if required
-						    if (! empty($objimport->array_import_convertvalue[0][$val]))
+						    if (!empty($objimport->array_import_convertvalue[0][$val]))
 						    {
                                 //print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
-                                if ($objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeid'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromref'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel'
+                                if ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
+                                	|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref'
+                                	|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel'
                                 	)
                                 {
                                     // New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
-                                    $isidorref='id';
-                                    if (! is_numeric($newval) && $newval != '' && ! preg_match('/^id:/i',$newval)) $isidorref='ref';
-                                    $newval=preg_replace('/^(id|ref):/i','',$newval);    // Remove id: or ref: that was used to force if field is id or ref
+                                    $isidorref = 'id';
+                                    if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
+                                    $newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
                                     //print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
 
                                     if ($isidorref == 'ref')    // If value into input import file is a ref, we apply the function defined into descriptor
                                     {
-                                        $file=(empty($objimport->array_import_convertvalue[0][$val]['classfile'])?$objimport->array_import_convertvalue[0][$val]['file']:$objimport->array_import_convertvalue[0][$val]['classfile']);
-                                        $class=$objimport->array_import_convertvalue[0][$val]['class'];
-                                        $method=$objimport->array_import_convertvalue[0][$val]['method'];
+                                        $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+                                        $class = $objimport->array_import_convertvalue[0][$val]['class'];
+                                        $method = $objimport->array_import_convertvalue[0][$val]['method'];
                                         if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
-                                        	$newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
+                                        	$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
                                         }
                                         else
 										{
@@ -468,94 +468,94 @@ 
                                                 dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
                                                 break;
                                             }
-                                            $classinstance=new $class($this->db);
+                                            $classinstance = new $class($this->db);
                                             // Try the fetch from code or ref
-                                            call_user_func_array(array($classinstance, $method),array('', $newval));
+                                            call_user_func_array(array($classinstance, $method), array('', $newval));
                                             // If not found, try the fetch from label
-                                            if (! ($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel')
+                                            if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel')
                                             {
-												call_user_func_array(array($classinstance, $method),array('', '', $newval));
+												call_user_func_array(array($classinstance, $method), array('', '', $newval));
                                             }
-                                            $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval]=$classinstance->id;
+                                            $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] = $classinstance->id;
                                             //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
                                             if ($classinstance->id != '')	// id may be 0, it is a found value
                                             {
-                                                $newval=$classinstance->id;
+                                                $newval = $classinstance->id;
                                             }
                                             else
                                             {
-                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldValueNotIn',$key,$newval,'code',$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                                else if (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldRefNotIn',$key,$newval,$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
-                                                else $this->errors[$error]['lib']='ErrorFieldValueNotIn';
-                                                $this->errors[$error]['type']='FOREIGNKEY';
+                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+                                                else if (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
+                                                else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+                                                $this->errors[$error]['type'] = 'FOREIGNKEY';
                                                 $errorforthistable++;
                                                 $error++;
                                             }
                                         }
                                     }
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='zeroifnull')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
                                 {
-                                    if (empty($newval)) $newval='0';
+                                    if (empty($newval)) $newval = '0';
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
-                                        $this->thirpartyobject->get_codeclient(0,0);
-                                        $newval=$this->thirpartyobject->code_client;
+                                        $this->thirpartyobject->get_codeclient(0, 0);
+                                        $newval = $this->thirpartyobject->code_client;
                                         //print 'code_client='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsuppliercodeifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
-                                        $newval=$this->thirpartyobject->get_codefournisseur(0,1);
-                                        $newval=$this->thirpartyobject->code_fournisseur;
+                                        $newval = $this->thirpartyobject->get_codefournisseur(0, 1);
+                                        $newval = $this->thirpartyobject->code_fournisseur;
                                         //print 'code_fournisseur='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomeraccountancycodeifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
                                         $this->thirpartyobject->get_codecompta('customer');
-                                        $newval=$this->thirpartyobject->code_compta;
+                                        $newval = $this->thirpartyobject->code_compta;
                                         //print 'code_compta='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsupplieraccountancycodeifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
                                         $this->thirpartyobject->get_codecompta('supplier');
-                                        $newval=$this->thirpartyobject->code_compta_fournisseur;
-                                        if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                        $newval = $this->thirpartyobject->code_compta_fournisseur;
+                                        if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                         //print 'code_compta_fournisseur='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getrefifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto')
                                 {
-                                    $defaultref='';
+                                    $defaultref = '';
                                     // TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
-                                    $obj = empty($conf->global->PROJECT_TASK_ADDON)?'mod_task_simple':$conf->global->PROJECT_TASK_ADDON;
-                                    if (! empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
+                                    $obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
+                                    if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
                                     {
-                                        require_once DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
+                                        require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
                                         $modTask = new $obj;
-                                        $defaultref = $modTask->getNextValue(null,null);
+                                        $defaultref = $modTask->getNextValue(null, null);
                                     }
-                                    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
-                                    $newval=$defaultref;
+                                    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
+                                    $newval = $defaultref;
                                 }
 
 
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
                                 {
                                     $newval = price2num($newval);
                                 }
@@ -564,27 +564,27 @@ 
 						    }
 
 						    // Test regexp
-							if (! empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
+							if (!empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
 							{
 								// If test is "Must exist in a field@table"
-								if (preg_match('/^(.*)@(.*)$/',$objimport->array_import_regex[0][$val],$reg))
+								if (preg_match('/^(.*)@(.*)$/', $objimport->array_import_regex[0][$val], $reg))
 								{
-									$field=$reg[1];
-									$table=$reg[2];
+									$field = $reg[1];
+									$table = $reg[2];
 
 									// Load content of field@table into cache array
-									if (! is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
+									if (!is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
 									{
-										$sql="SELECT ".$field." as aliasfield FROM ".$table;
-										$resql=$this->db->query($sql);
+										$sql = "SELECT ".$field." as aliasfield FROM ".$table;
+										$resql = $this->db->query($sql);
 										if ($resql)
 										{
-											$num=$this->db->num_rows($resql);
-											$i=0;
+											$num = $this->db->num_rows($resql);
+											$i = 0;
 											while ($i < $num)
 											{
-												$obj=$this->db->fetch_object($resql);
-												if ($obj) $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
+												$obj = $this->db->fetch_object($resql);
+												if ($obj) $this->cachefieldtable[$field.'@'.$table][] = $obj->aliasfield;
 												$i++;
 											}
 										}
@@ -595,20 +595,20 @@ 
 									}
 
 									// Now we check cache is not empty (should not) and key is into cache
-									if (! is_array($this->cachefieldtable[$field.'@'.$table]) || ! in_array($newval,$this->cachefieldtable[$field.'@'.$table]))
+									if (!is_array($this->cachefieldtable[$field.'@'.$table]) || !in_array($newval, $this->cachefieldtable[$field.'@'.$table]))
 									{
-										$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorFieldValueNotIn',$key,$newval,$field,$table);
-										$this->errors[$error]['type']='FOREIGNKEY';
+										$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $table);
+										$this->errors[$error]['type'] = 'FOREIGNKEY';
 									    $errorforthistable++;
 										$error++;
 									}
 								}
 								// If test is just a static regex
-								else if (! preg_match('/'.$objimport->array_import_regex[0][$val].'/i',$newval))
+								else if (!preg_match('/'.$objimport->array_import_regex[0][$val].'/i', $newval))
 								{
 								    //if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
-									$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorWrongValueForField',$key,$newval,$objimport->array_import_regex[0][$val]);
-									$this->errors[$error]['type']='REGEX';
+									$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorWrongValueForField', $key, $newval, $objimport->array_import_regex[0][$val]);
+									$this->errors[$error]['type'] = 'REGEX';
 									$errorforthistable++;
 									$error++;
 								}
@@ -622,8 +622,8 @@ 
 						$listfields[] = $fieldname;
 
 						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
-						if (empty($newval) && $arrayrecord[($key-1)]['type'] < 0)		 $listvalues[] = ($newval=='0'?$newval:"null");
-						elseif (empty($newval) && $arrayrecord[($key-1)]['type'] == 0)	 $listvalues[] = "''";
+						if (empty($newval) && $arrayrecord[($key - 1)]['type'] < 0)		 $listvalues[] = ($newval == '0' ? $newval : "null");
+						elseif (empty($newval) && $arrayrecord[($key - 1)]['type'] == 0)	 $listvalues[] = "''";
 						else															 $listvalues[] = "'".$this->db->escape($newval)."'";
 					}
 					$i++;
@@ -633,19 +633,19 @@ 
 				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0]))
 				{
     				// Loop on each hidden fields to add them into listfields/listvalues
-				    foreach($objimport->array_import_fieldshidden[0] as $key => $val)
+				    foreach ($objimport->array_import_fieldshidden[0] as $key => $val)
     				{
-    				    if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue;    // Not a field of current table
+    				    if (!preg_match('/^'.preg_quote($alias).'\./', $key)) continue; // Not a field of current table
     				    if ($val == 'user->id')
     				    {
-    				        $listfields[] = preg_replace('/^'.preg_quote($alias).'\./','',$key);
+    				        $listfields[] = preg_replace('/^'.preg_quote($alias).'\./', '', $key);
     				        $listvalues[] = $user->id;
     				    }
-    				    elseif (preg_match('/^lastrowid-/',$val))
+    				    elseif (preg_match('/^lastrowid-/', $val))
     				    {
-    				        $tmp=explode('-',$val);
-    				        $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
-							$keyfield = preg_replace('/^'.preg_quote($alias).'\./','',$key);
+    				        $tmp = explode('-', $val);
+    				        $lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
+							$keyfield = preg_replace('/^'.preg_quote($alias).'\./', '', $key);
     				        $listfields[] = $keyfield;
                             $listvalues[] = $lastinsertid;
     				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
@@ -656,7 +656,7 @@ 
 
 				// If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
 				// so we can try to make the insert or update now.
-				if (! $errorforthistable)
+				if (!$errorforthistable)
 				{
 					//print "$alias/$tablename/$listfields/$listvalues<br>";
 					if (!empty($listfields))
@@ -674,21 +674,21 @@ 
 								$filters = array();
 								foreach ($updatekeys as $key) {
 									$col = $objimport->array_import_updatekeys[0][$key];
-									$key=preg_replace('/^.*\./i','',$key);
+									$key = preg_replace('/^.*\./i', '', $key);
 									$where[] = $key.' = '.$data[$key];
 									$filters[] = $col.' = '.$data[$key];
 								}
-								$sqlSelect.= ' WHERE '.implode(' AND ', $where);
+								$sqlSelect .= ' WHERE '.implode(' AND ', $where);
 
-								$resql=$this->db->query($sqlSelect);
-								if($resql) {
+								$resql = $this->db->query($sqlSelect);
+								if ($resql) {
 									$res = $this->db->fetch_object($resql);
-									if($resql->num_rows == 1) {
+									if ($resql->num_rows == 1) {
 										$lastinsertid = $res->rowid;
 										$last_insert_id_array[$tablename] = $lastinsertid;
-									} else if($resql->num_rows > 1) {
-										$this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', '));
-										$this->errors[$error]['type']='SQL';
+									} else if ($resql->num_rows > 1) {
+										$this->errors[$error]['lib'] = $langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', '));
+										$this->errors[$error]['type'] = 'SQL';
 										$error++;
 									} else {
 										// No record found with filters, insert will be tried below
@@ -697,8 +697,8 @@ 
 								else
 								{
 									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
+									$this->errors[$error]['lib'] = $this->db->lasterror();
+									$this->errors[$error]['type'] = 'SQL';
 									$error++;
 								}
 							} else {
@@ -709,13 +709,13 @@ 
 								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
 								$sqlSelect = 'SELECT rowid FROM '.$tablename;
 
-								if(empty($keyfield)) $keyfield = 'rowid';
+								if (empty($keyfield)) $keyfield = 'rowid';
 								$sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
 
-								$resql=$this->db->query($sqlSelect);
-								if($resql) {
+								$resql = $this->db->query($sqlSelect);
+								if ($resql) {
 									$res = $this->db->fetch_object($resql);
-									if($resql->num_rows == 1) {
+									if ($resql->num_rows == 1) {
 										// We have a row referencing this last foreign key, continue with UPDATE.
 									} else {
 										// No record found referencing this last foreign key,
@@ -726,8 +726,8 @@ 
 								else
 								{
 									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
+									$this->errors[$error]['lib'] = $this->db->lasterror();
+									$this->errors[$error]['type'] = 'SQL';
 									$error++;
 								}
 							}
@@ -741,24 +741,24 @@ 
 								foreach ($data as $key => $val) {
 									$set[] = $key.' = '.$val;
 								}
-								$sqlstart.= ' SET '.implode(', ', $set);
+								$sqlstart .= ' SET '.implode(', ', $set);
 
-								if(empty($keyfield)) $keyfield = 'rowid';
+								if (empty($keyfield)) $keyfield = 'rowid';
 								$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
 
 								$sql = $sqlstart.$sqlend;
 
 								// Run update request
-								$resql=$this->db->query($sql);
-								if($resql) {
+								$resql = $this->db->query($sql);
+								if ($resql) {
 									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
 									$updatedone = true;
 								}
 								else
 								{
 									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
+									$this->errors[$error]['lib'] = $this->db->lasterror();
+									$this->errors[$error]['type'] = 'SQL';
 									$error++;
 								}
 							}
@@ -769,13 +769,13 @@ 
 							// Build SQL INSERT request
 							$sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
 							$sqlend = ') VALUES('.implode(', ', $listvalues).", '".$importid."'";
-							if (! empty($tablewithentity_cache[$tablename])) {
-								$sqlstart.= ', entity';
-								$sqlend.= ', '.$conf->entity;
+							if (!empty($tablewithentity_cache[$tablename])) {
+								$sqlstart .= ', entity';
+								$sqlend .= ', '.$conf->entity;
 							}
-							if (! empty($objimport->array_import_tables_creator[0][$alias])) {
-								$sqlstart.= ', '.$objimport->array_import_tables_creator[0][$alias];
-								$sqlend.=', '.$user->id;
+							if (!empty($objimport->array_import_tables_creator[0][$alias])) {
+								$sqlstart .= ', '.$objimport->array_import_tables_creator[0][$alias];
+								$sqlend .= ', '.$user->id;
 							}
 							$sql = $sqlstart.$sqlend.')';
 							dol_syslog("import_xlsx.modules", LOG_DEBUG);
@@ -783,7 +783,7 @@ 
 							// Run insert request
 							if ($sql)
 							{
-								$resql=$this->db->query($sql);
+								$resql = $this->db->query($sql);
 								if ($resql)
 								{
 								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
@@ -792,8 +792,8 @@ 
 								else
 								{
 									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
+									$this->errors[$error]['lib'] = $this->db->lasterror();
+									$this->errors[$error]['type'] = 'SQL';
 									$error++;
 								}
 							}
@@ -808,8 +808,8 @@ 
 			    if ($error) break;
 			}
 
-			if($updatedone) $this->nbupdate++;
-			if($insertdone) $this->nbinsert++;
+			if ($updatedone) $this->nbupdate++;
+			if ($insertdone) $this->nbinsert++;
 		}
 
 		return 1;

Braces +120 added lines, -69 removed lines

@@ -111,9 +111,11 @@ 
 		// If driver use an external library, put its name here
         require_once PHPEXCEL_PATH.'PHPExcel.php';
 		require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-        if (! class_exists('ZipArchive')) // For Excel2007, PHPExcel need ZipArchive
+        if (! class_exists('ZipArchive')) {
+            // For Excel2007, PHPExcel need ZipArchive
         {
                 $langs->load("errors");
+        }
                 $this->error=$langs->trans('ErrorPHPNeedModule','zip');
                 return -1;
         }
@@ -121,7 +123,9 @@ 
         $this->version_lib='1.8.0';
 
 		$this->datatoimport=$datatoimport;
-		if (preg_match('/^societe_/',$datatoimport)) $this->thirpartyobject=new Societe($this->db);
+		if (preg_match('/^societe_/',$datatoimport)) {
+		    $this->thirpartyobject=new Societe($this->db);
+		}
 	}
 
 
@@ -306,8 +310,9 @@ 
 		global $conf;
 
 		$rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
-		if($this->record > $rowcount)
-			return false;
+		if($this->record > $rowcount) {
+					return false;
+		}
 		$array = array();
 		$colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn(0));
 		for($col=0;$col<$colcount;$col++) {
@@ -374,8 +379,7 @@ 
 			$this->warnings[$warning]['lib']=$langs->trans('EmptyLine');
 			$this->warnings[$warning]['type']='EMPTY';
 			$warning++;
-		}
-		else
+		} else
 		{
 			$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
 			$updatedone = false;
@@ -391,19 +395,27 @@ 
 				$errorforthistable=0;
 
 				// Define $tablewithentity_cache[$tablename] if not already defined
-				if (! isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
+				if (! isset($tablewithentity_cache[$tablename])) {
+				    // keep this test with "isset"
 				{
 					dol_syslog("Check if table ".$tablename." has an entity field");
+				}
 					$resql=$this->db->DDLDescTable($tablename,'entity');
 					if ($resql)
 					{
 						$obj=$this->db->fetch_object($resql);
-						if ($obj) $tablewithentity_cache[$tablename]=1;		// table contains entity field
-						else $tablewithentity_cache[$tablename]=0;			// table does not contains entity field
+						if ($obj) {
+						    $tablewithentity_cache[$tablename]=1;
+						}
+						// table contains entity field
+						else {
+						    $tablewithentity_cache[$tablename]=0;
+						}
+						// table does not contains entity field
+					} else {
+					    dol_print_error($this->db);
 					}
-					else dol_print_error($this->db);
-				}
-				else
+				} else
 				{
 					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
@@ -415,13 +427,19 @@ 
 				    $fieldalias=preg_replace('/\..*$/i','',$val);
 				    $fieldname=preg_replace('/^.*\./i','',$val);
 
-				    if ($alias != $fieldalias) continue;    // Not a field of current table
+				    if ($alias != $fieldalias) {
+				        continue;
+				    }
+				    // Not a field of current table
 
 					if ($key <= $maxfields)
 					{
 						// Set $newval with value to insert and set $listvalues with sql request part for insert
 						$newval='';
-						if ($arrayrecord[($key-1)]['type'] > 0) $newval=$arrayrecord[($key-1)]['val'];    // If type of field into input file is not empty string (so defined into input file), we get value
+						if ($arrayrecord[($key-1)]['type'] > 0) {
+						    $newval=$arrayrecord[($key-1)]['val'];
+						}
+						// If type of field into input file is not empty string (so defined into input file), we get value
 
 						// Make some tests on $newval
 
@@ -447,20 +465,23 @@ 
                                 {
                                     // New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
                                     $isidorref='id';
-                                    if (! is_numeric($newval) && $newval != '' && ! preg_match('/^id:/i',$newval)) $isidorref='ref';
+                                    if (! is_numeric($newval) && $newval != '' && ! preg_match('/^id:/i',$newval)) {
+                                        $isidorref='ref';
+                                    }
                                     $newval=preg_replace('/^(id|ref):/i','',$newval);    // Remove id: or ref: that was used to force if field is id or ref
                                     //print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
 
-                                    if ($isidorref == 'ref')    // If value into input import file is a ref, we apply the function defined into descriptor
+                                    if ($isidorref == 'ref') {
+                                        // If value into input import file is a ref, we apply the function defined into descriptor
                                     {
                                         $file=(empty($objimport->array_import_convertvalue[0][$val]['classfile'])?$objimport->array_import_convertvalue[0][$val]['file']:$objimport->array_import_convertvalue[0][$val]['classfile']);
+                                    }
                                         $class=$objimport->array_import_convertvalue[0][$val]['class'];
                                         $method=$objimport->array_import_convertvalue[0][$val]['method'];
                                         if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
                                         	$newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
-                                        }
-                                        else
+                                        } else
 										{
                                             $resultload = dol_include_once($file);
                                             if (empty($resultload))
@@ -478,27 +499,32 @@ 
                                             }
                                             $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval]=$classinstance->id;
                                             //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
-                                            if ($classinstance->id != '')	// id may be 0, it is a found value
+                                            if ($classinstance->id != '') {
+                                                // id may be 0, it is a found value
                                             {
                                                 $newval=$classinstance->id;
                                             }
-                                            else
+                                            } else
                                             {
-                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldValueNotIn',$key,$newval,'code',$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                                else if (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldRefNotIn',$key,$newval,$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
-                                                else $this->errors[$error]['lib']='ErrorFieldValueNotIn';
+                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
+                                                    $this->errors[$error]['lib']=$langs->trans('ErrorFieldValueNotIn',$key,$newval,'code',$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+                                                } else if (!empty($objimport->array_import_convertvalue[0][$val]['element'])) {
+                                                    $this->errors[$error]['lib']=$langs->trans('ErrorFieldRefNotIn',$key,$newval,$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
+                                                } else {
+                                                    $this->errors[$error]['lib']='ErrorFieldValueNotIn';
+                                                }
                                                 $this->errors[$error]['type']='FOREIGNKEY';
                                                 $errorforthistable++;
                                                 $error++;
                                             }
                                         }
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='zeroifnull')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='zeroifnull')
                                 {
-                                    if (empty($newval)) $newval='0';
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifauto')
+                                    if (empty($newval)) {
+                                        $newval='0';
+                                    }
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -506,9 +532,11 @@ 
                                         $newval=$this->thirpartyobject->code_client;
                                         //print 'code_client='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsuppliercodeifauto')
+                                    if (empty($newval)) {
+                                        $arrayrecord[($key-1)]['type']=-1;
+                                    }
+                                    // If we get empty value, we will use "null"
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsuppliercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -516,9 +544,11 @@ 
                                         $newval=$this->thirpartyobject->code_fournisseur;
                                         //print 'code_fournisseur='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomeraccountancycodeifauto')
+                                    if (empty($newval)) {
+                                        $arrayrecord[($key-1)]['type']=-1;
+                                    }
+                                    // If we get empty value, we will use "null"
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomeraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -526,20 +556,27 @@ 
                                         $newval=$this->thirpartyobject->code_compta;
                                         //print 'code_compta='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsupplieraccountancycodeifauto')
+                                    if (empty($newval)) {
+                                        $arrayrecord[($key-1)]['type']=-1;
+                                    }
+                                    // If we get empty value, we will use "null"
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsupplieraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
                                         $this->thirpartyobject->get_codecompta('supplier');
                                         $newval=$this->thirpartyobject->code_compta_fournisseur;
-                                        if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                        if (empty($newval)) {
+                                            $arrayrecord[($key-1)]['type']=-1;
+                                        }
+                                        // If we get empty value, we will use "null"
                                         //print 'code_compta_fournisseur='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getrefifauto')
+                                    if (empty($newval)) {
+                                        $arrayrecord[($key-1)]['type']=-1;
+                                    }
+                                    // If we get empty value, we will use "null"
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getrefifauto')
                                 {
                                     $defaultref='';
                                     // TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
@@ -550,12 +587,11 @@ 
                                         $modTask = new $obj;
                                         $defaultref = $modTask->getNextValue(null,null);
                                     }
-                                    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
+                                    if (is_numeric($defaultref) && $defaultref <= 0) {
+                                        $defaultref='';
+                                    }
                                     $newval=$defaultref;
-                                }
-
-
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
                                 {
                                     $newval = price2num($newval);
                                 }
@@ -573,9 +609,11 @@ 
 									$table=$reg[2];
 
 									// Load content of field@table into cache array
-									if (! is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
+									if (! is_array($this->cachefieldtable[$field.'@'.$table])) {
+									    // If content of field@table not already loaded into cache
 									{
 										$sql="SELECT ".$field." as aliasfield FROM ".$table;
+									}
 										$resql=$this->db->query($sql);
 										if ($resql)
 										{
@@ -584,11 +622,12 @@ 
 											while ($i < $num)
 											{
 												$obj=$this->db->fetch_object($resql);
-												if ($obj) $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
+												if ($obj) {
+												    $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
+												}
 												$i++;
 											}
-										}
-										else
+										} else
 										{
 											dol_print_error($this->db);
 										}
@@ -622,9 +661,13 @@ 
 						$listfields[] = $fieldname;
 
 						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
-						if (empty($newval) && $arrayrecord[($key-1)]['type'] < 0)		 $listvalues[] = ($newval=='0'?$newval:"null");
-						elseif (empty($newval) && $arrayrecord[($key-1)]['type'] == 0)	 $listvalues[] = "''";
-						else															 $listvalues[] = "'".$this->db->escape($newval)."'";
+						if (empty($newval) && $arrayrecord[($key-1)]['type'] < 0) {
+						    $listvalues[] = ($newval=='0'?$newval:"null");
+						} elseif (empty($newval) && $arrayrecord[($key-1)]['type'] == 0) {
+						    $listvalues[] = "''";
+						} else {
+						    $listvalues[] = "'".$this->db->escape($newval)."'";
+						}
 					}
 					$i++;
 				}
@@ -635,13 +678,15 @@ 
     				// Loop on each hidden fields to add them into listfields/listvalues
 				    foreach($objimport->array_import_fieldshidden[0] as $key => $val)
     				{
-    				    if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue;    // Not a field of current table
+    				    if (! preg_match('/^'.preg_quote($alias).'\./', $key)) {
+    				        continue;
+    				    }
+    				    // Not a field of current table
     				    if ($val == 'user->id')
     				    {
     				        $listfields[] = preg_replace('/^'.preg_quote($alias).'\./','',$key);
     				        $listvalues[] = $user->id;
-    				    }
-    				    elseif (preg_match('/^lastrowid-/',$val))
+    				    } elseif (preg_match('/^lastrowid-/',$val))
     				    {
     				        $tmp=explode('-',$val);
     				        $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
@@ -693,8 +738,7 @@ 
 									} else {
 										// No record found with filters, insert will be tried below
 									}
-								}
-								else
+								} else
 								{
 									//print 'E';
 									$this->errors[$error]['lib']=$this->db->lasterror();
@@ -709,7 +753,9 @@ 
 								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
 								$sqlSelect = 'SELECT rowid FROM '.$tablename;
 
-								if(empty($keyfield)) $keyfield = 'rowid';
+								if(empty($keyfield)) {
+								    $keyfield = 'rowid';
+								}
 								$sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
 
 								$resql=$this->db->query($sqlSelect);
@@ -722,8 +768,7 @@ 
 										// force $lastinsertid to 0 so we INSERT below.
 										$lastinsertid = 0;
 									}
-								}
-								else
+								} else
 								{
 									//print 'E';
 									$this->errors[$error]['lib']=$this->db->lasterror();
@@ -743,7 +788,9 @@ 
 								}
 								$sqlstart.= ' SET '.implode(', ', $set);
 
-								if(empty($keyfield)) $keyfield = 'rowid';
+								if(empty($keyfield)) {
+								    $keyfield = 'rowid';
+								}
 								$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
 
 								$sql = $sqlstart.$sqlend;
@@ -753,8 +800,7 @@ 
 								if($resql) {
 									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
 									$updatedone = true;
-								}
-								else
+								} else
 								{
 									//print 'E';
 									$this->errors[$error]['lib']=$this->db->lasterror();
@@ -788,8 +834,7 @@ 
 								{
 								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
 								    $insertdone = true;
-								}
-								else
+								} else
 								{
 									//print 'E';
 									$this->errors[$error]['lib']=$this->db->lasterror();
@@ -805,11 +850,17 @@ 
 					}*/
 				}
 
-			    if ($error) break;
+			    if ($error) {
+			        break;
+			    }
 			}
 
-			if($updatedone) $this->nbupdate++;
-			if($insertdone) $this->nbinsert++;
+			if($updatedone) {
+			    $this->nbupdate++;
+			}
+			if($insertdone) {
+			    $this->nbinsert++;
+			}
 		}
 
 		return 1;

dolibarr/htdocs/core/modules/import/modules_import.php

Indentation +196 added lines, -196 removed lines

@@ -38,121 +38,121 @@ 
     public $datatoimport;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
     /**
-	 * @var int id of driver
-	 */
-	public $id;
+     * @var int id of driver
+     */
+    public $id;
 
     /**
      * @var string label
      */
     public $label;
 
-	public $extension;    // Extension of files imported by driver
+    public $extension;    // Extension of files imported by driver
 
-	/**
+    /**
      * Dolibarr version of driver
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
-	public $label_lib;    // Label of external lib used by driver
+    public $label_lib;    // Label of external lib used by driver
 
-	public $version_lib;  // Version of external lib used by driver
+    public $version_lib;  // Version of external lib used by driver
 
-	// Array of all drivers
-	public $driverlabel=array();
+    // Array of all drivers
+    public $driverlabel=array();
 
-	public $driverdesc=array();
+    public $driverdesc=array();
 
-	public $driverversion=array();
+    public $driverversion=array();
 
-	public $liblabel=array();
+    public $liblabel=array();
 
-	public $libversion=array();
+    public $libversion=array();
 
 
-	/**
+    /**
      *  Constructor
-	 */
-	function __construct()
-	{
-	}
-
-
-	/**
-	 * getDriverId
-	 *
-	 * @return string		Id
-	 */
-	function getDriverId()
-	{
-	    return $this->id;
-	}
-
-	/**
-	 *	getDriverLabel
-	 *
-	 *	@return string	Label
-	 */
-	function getDriverLabel()
-	{
-	    return $this->label;
-	}
-
-	/**
-	 *	getDriverDesc
-	 *
-	 *	@return string	Description
-	 */
-	function getDriverDesc()
-	{
-	    return $this->desc;
-	}
-
-	/**
-	 * getDriverExtension
-	 *
-	 * @return string	Driver suffix
-	 */
-	function getDriverExtension()
-	{
-	    return $this->extension;
-	}
-
-	/**
-	 *	getDriverVersion
-	 *
-	 *	@return string	Driver version
-	 */
-	function getDriverVersion()
-	{
-	    return $this->version;
-	}
-
-	/**
-	 *	getDriverLabel
-	 *
-	 *	@return string	Label of external lib
-	 */
-	function getLibLabel()
-	{
-	    return $this->label_lib;
-	}
-
-	/**
-	 * getLibVersion
-	 *
-	 *	@return string	Version of external lib
-	 */
-	function getLibVersion()
-	{
-	    return $this->version_lib;
-	}
+     */
+    function __construct()
+    {
+    }
+
+
+    /**
+     * getDriverId
+     *
+     * @return string		Id
+     */
+    function getDriverId()
+    {
+        return $this->id;
+    }
+
+    /**
+     *	getDriverLabel
+     *
+     *	@return string	Label
+     */
+    function getDriverLabel()
+    {
+        return $this->label;
+    }
+
+    /**
+     *	getDriverDesc
+     *
+     *	@return string	Description
+     */
+    function getDriverDesc()
+    {
+        return $this->desc;
+    }
+
+    /**
+     * getDriverExtension
+     *
+     * @return string	Driver suffix
+     */
+    function getDriverExtension()
+    {
+        return $this->extension;
+    }
+
+    /**
+     *	getDriverVersion
+     *
+     *	@return string	Driver version
+     */
+    function getDriverVersion()
+    {
+        return $this->version;
+    }
+
+    /**
+     *	getDriverLabel
+     *
+     *	@return string	Label of external lib
+     */
+    function getLibLabel()
+    {
+        return $this->label_lib;
+    }
+
+    /**
+     * getLibVersion
+     *
+     *	@return string	Version of external lib
+     */
+    function getLibVersion()
+    {
+        return $this->version_lib;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -162,114 +162,114 @@ 
      *  @param	DoliDB	$db     			Database handler
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
-	 */
-	function liste_modeles($db,$maxfilenamelength=0)
-	{
+     */
+    function liste_modeles($db,$maxfilenamelength=0)
+    {
         // phpcs:enable
-		dol_syslog(get_class($this)."::liste_modeles");
+        dol_syslog(get_class($this)."::liste_modeles");
 
-		$dir=DOL_DOCUMENT_ROOT."/core/modules/import/";
-		$handle=opendir($dir);
+        $dir=DOL_DOCUMENT_ROOT."/core/modules/import/";
+        $handle=opendir($dir);
 
-		// Recherche des fichiers drivers imports disponibles
-		$i=0;
+        // Recherche des fichiers drivers imports disponibles
+        $i=0;
         if (is_resource($handle))
         {
-    		while (($file = readdir($handle))!==false)
-    		{
-    			if (preg_match("/^import_(.*)\.modules\.php/i",$file,$reg))
-    			{
-    				$moduleid=$reg[1];
-
-    				// Loading Class
-    				$file = $dir."/import_".$moduleid.".modules.php";
-    				$classname = "Import".ucfirst($moduleid);
-
-    				require_once $file;
-    				$module = new $classname($db,'');
-
-    				// Picto
-    				$this->picto[$module->id]=$module->picto;
-    				// Driver properties
-    				$this->driverlabel[$module->id]=$module->getDriverLabel('');
-    				$this->driverdesc[$module->id]=$module->getDriverDesc('');
-    				$this->driverversion[$module->id]=$module->getDriverVersion('');
-    				// If use an external lib
-    				$this->liblabel[$module->id]=$module->getLibLabel('');
-    				$this->libversion[$module->id]=$module->getLibVersion('');
-
-    				$i++;
-    			}
-    		}
+            while (($file = readdir($handle))!==false)
+            {
+                if (preg_match("/^import_(.*)\.modules\.php/i",$file,$reg))
+                {
+                    $moduleid=$reg[1];
+
+                    // Loading Class
+                    $file = $dir."/import_".$moduleid.".modules.php";
+                    $classname = "Import".ucfirst($moduleid);
+
+                    require_once $file;
+                    $module = new $classname($db,'');
+
+                    // Picto
+                    $this->picto[$module->id]=$module->picto;
+                    // Driver properties
+                    $this->driverlabel[$module->id]=$module->getDriverLabel('');
+                    $this->driverdesc[$module->id]=$module->getDriverDesc('');
+                    $this->driverversion[$module->id]=$module->getDriverVersion('');
+                    // If use an external lib
+                    $this->liblabel[$module->id]=$module->getLibLabel('');
+                    $this->libversion[$module->id]=$module->getLibVersion('');
+
+                    $i++;
+                }
+            }
         }
 
-		return array_keys($this->driverlabel);
-	}
-
-
-	/**
-	 *  Return picto of import driver
-	 *
-	 *	@param	string	$key	Key
-	 *	@return	string
-	 */
-	function getPictoForKey($key)
-	{
-		return $this->picto[$key];
-	}
-
-	/**
-	 *  Renvoi libelle d'un driver import
-	 *
-	 *	@param	string	$key	Key
-	 *	@return	string
-	 */
-	function getDriverLabelForKey($key)
-	{
-		return $this->driverlabel[$key];
-	}
-
-	/**
-	 *  Renvoi la description d'un driver import
-	 *
-	 *	@param	string	$key	Key
-	 *	@return	string
-	 */
-	function getDriverDescForKey($key)
-	{
-		return $this->driverdesc[$key];
-	}
-
-	/**
-	 *  Renvoi version d'un driver import
-	 *
-	 *	@param	string	$key	Key
-	 *	@return	string
-	 */
-	function getDriverVersionForKey($key)
-	{
-		return $this->driverversion[$key];
-	}
-
-	/**
-	 *  Renvoi libelle de librairie externe du driver
-	 *
-	 *	@param	string	$key	Key
-	 *	@return	string
-	 */
-	function getLibLabelForKey($key)
-	{
-		return $this->liblabel[$key];
-	}
-
-	/**
-	 *  Renvoi version de librairie externe du driver
-	 *
-	 *	@param	string	$key	Key
-	 *	@return	string
-	 */
-	function getLibVersionForKey($key)
-	{
-		return $this->libversion[$key];
-	}
+        return array_keys($this->driverlabel);
+    }
+
+
+    /**
+     *  Return picto of import driver
+     *
+     *	@param	string	$key	Key
+     *	@return	string
+     */
+    function getPictoForKey($key)
+    {
+        return $this->picto[$key];
+    }
+
+    /**
+     *  Renvoi libelle d'un driver import
+     *
+     *	@param	string	$key	Key
+     *	@return	string
+     */
+    function getDriverLabelForKey($key)
+    {
+        return $this->driverlabel[$key];
+    }
+
+    /**
+     *  Renvoi la description d'un driver import
+     *
+     *	@param	string	$key	Key
+     *	@return	string
+     */
+    function getDriverDescForKey($key)
+    {
+        return $this->driverdesc[$key];
+    }
+
+    /**
+     *  Renvoi version d'un driver import
+     *
+     *	@param	string	$key	Key
+     *	@return	string
+     */
+    function getDriverVersionForKey($key)
+    {
+        return $this->driverversion[$key];
+    }
+
+    /**
+     *  Renvoi libelle de librairie externe du driver
+     *
+     *	@param	string	$key	Key
+     *	@return	string
+     */
+    function getLibLabelForKey($key)
+    {
+        return $this->liblabel[$key];
+    }
+
+    /**
+     *  Renvoi version de librairie externe du driver
+     *
+     *	@param	string	$key	Key
+     *	@return	string
+     */
+    function getLibVersionForKey($key)
+    {
+        return $this->libversion[$key];
+    }
 }

Spacing +23 added lines, -23 removed lines

@@ -40,7 +40,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
     /**
 	 * @var int id of driver
@@ -52,7 +52,7 @@ 
      */
     public $label;
 
-	public $extension;    // Extension of files imported by driver
+	public $extension; // Extension of files imported by driver
 
 	/**
      * Dolibarr version of driver
@@ -60,20 +60,20 @@ 
      */
 	public $version = 'dolibarr';
 
-	public $label_lib;    // Label of external lib used by driver
+	public $label_lib; // Label of external lib used by driver
 
-	public $version_lib;  // Version of external lib used by driver
+	public $version_lib; // Version of external lib used by driver
 
 	// Array of all drivers
-	public $driverlabel=array();
+	public $driverlabel = array();
 
-	public $driverdesc=array();
+	public $driverdesc = array();
 
-	public $driverversion=array();
+	public $driverversion = array();
 
-	public $liblabel=array();
+	public $liblabel = array();
 
-	public $libversion=array();
+	public $libversion = array();
 
 
 	/**
@@ -163,40 +163,40 @@ 
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
 	 */
-	function liste_modeles($db,$maxfilenamelength=0)
+	function liste_modeles($db, $maxfilenamelength = 0)
 	{
         // phpcs:enable
 		dol_syslog(get_class($this)."::liste_modeles");
 
-		$dir=DOL_DOCUMENT_ROOT."/core/modules/import/";
-		$handle=opendir($dir);
+		$dir = DOL_DOCUMENT_ROOT."/core/modules/import/";
+		$handle = opendir($dir);
 
 		// Recherche des fichiers drivers imports disponibles
-		$i=0;
+		$i = 0;
         if (is_resource($handle))
         {
-    		while (($file = readdir($handle))!==false)
+    		while (($file = readdir($handle)) !== false)
     		{
-    			if (preg_match("/^import_(.*)\.modules\.php/i",$file,$reg))
+    			if (preg_match("/^import_(.*)\.modules\.php/i", $file, $reg))
     			{
-    				$moduleid=$reg[1];
+    				$moduleid = $reg[1];
 
     				// Loading Class
     				$file = $dir."/import_".$moduleid.".modules.php";
     				$classname = "Import".ucfirst($moduleid);
 
     				require_once $file;
-    				$module = new $classname($db,'');
+    				$module = new $classname($db, '');
 
     				// Picto
-    				$this->picto[$module->id]=$module->picto;
+    				$this->picto[$module->id] = $module->picto;
     				// Driver properties
-    				$this->driverlabel[$module->id]=$module->getDriverLabel('');
-    				$this->driverdesc[$module->id]=$module->getDriverDesc('');
-    				$this->driverversion[$module->id]=$module->getDriverVersion('');
+    				$this->driverlabel[$module->id] = $module->getDriverLabel('');
+    				$this->driverdesc[$module->id] = $module->getDriverDesc('');
+    				$this->driverversion[$module->id] = $module->getDriverVersion('');
     				// If use an external lib
-    				$this->liblabel[$module->id]=$module->getLibLabel('');
-    				$this->libversion[$module->id]=$module->getLibVersion('');
+    				$this->liblabel[$module->id] = $module->getLibLabel('');
+    				$this->libversion[$module->id] = $module->getLibVersion('');
 
     				$i++;
     			}

dolibarr/htdocs/core/modules/import/import_csv.modules.php

Indentation +562 added lines, -562 removed lines

@@ -40,383 +40,383 @@ 
 
     public $datatoimport;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+    /**
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
 
     /**
-	 * @var int ID
-	 */
-	public $id;
+     * @var int ID
+     */
+    public $id;
 
-	/**
+    /**
      * @var string label
      */
     public $label;
 
-	public $extension;    // Extension of files imported by driver
+    public $extension;    // Extension of files imported by driver
 
-	/**
+    /**
      * Dolibarr version of driver
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
-	public $label_lib;    // Label of external lib used by driver
+    public $label_lib;    // Label of external lib used by driver
 
-	public $version_lib;  // Version of external lib used by driver
+    public $version_lib;  // Version of external lib used by driver
 
-	public $separator;
+    public $separator;
 
-	public $file;      // Path of file
+    public $file;      // Path of file
 
-	public $handle;    // Handle fichier
+    public $handle;    // Handle fichier
 
-	public $cacheconvert=array();      // Array to cache list of value found after a convertion
+    public $cacheconvert=array();      // Array to cache list of value found after a convertion
 
-	public $cachefieldtable=array();   // Array to cache list of value found into fields@tables
+    public $cachefieldtable=array();   // Array to cache list of value found into fields@tables
 
-	public $nbinsert = 0; // # of insert done during the import
+    public $nbinsert = 0; // # of insert done during the import
 
-	public $nbupdate = 0; // # of update done during the import
+    public $nbupdate = 0; // # of update done during the import
 
 
-	/**
-	 *	Constructor
-	 *
-	 *	@param	DoliDB		$db				Database handler
-	 *	@param	string		$datatoimport	String code describing import set (ex: 'societe_1')
-	 */
-	function __construct($db,$datatoimport)
-	{
-		global $conf, $langs;
-		$this->db = $db;
-
-		$this->separator=(GETPOST('separator')?GETPOST('separator'):(empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE)?',':$conf->global->IMPORT_CSV_SEPARATOR_TO_USE));
-		$this->enclosure='"';
-		$this->escape='"';
-
-		$this->id='csv';                // Same value then xxx in file name export_xxx.modules.php
-		$this->label='Csv';             // Label of driver
-		$this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
-		$this->extension='csv';         // Extension for generated file by this driver
-		$this->picto='mime/other';		// Picto
-		$this->version='1.34';         // Driver version
-
-		// If driver use an external library, put its name here
-		$this->label_lib='Dolibarr';
-		$this->version_lib=DOL_VERSION;
-
-		$this->datatoimport=$datatoimport;
-		if (preg_match('/^societe_/',$datatoimport)) $this->thirpartyobject=new Societe($this->db);
-	}
+    /**
+     *	Constructor
+     *
+     *	@param	DoliDB		$db				Database handler
+     *	@param	string		$datatoimport	String code describing import set (ex: 'societe_1')
+     */
+    function __construct($db,$datatoimport)
+    {
+        global $conf, $langs;
+        $this->db = $db;
+
+        $this->separator=(GETPOST('separator')?GETPOST('separator'):(empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE)?',':$conf->global->IMPORT_CSV_SEPARATOR_TO_USE));
+        $this->enclosure='"';
+        $this->escape='"';
+
+        $this->id='csv';                // Same value then xxx in file name export_xxx.modules.php
+        $this->label='Csv';             // Label of driver
+        $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
+        $this->extension='csv';         // Extension for generated file by this driver
+        $this->picto='mime/other';		// Picto
+        $this->version='1.34';         // Driver version
+
+        // If driver use an external library, put its name here
+        $this->label_lib='Dolibarr';
+        $this->version_lib=DOL_VERSION;
+
+        $this->datatoimport=$datatoimport;
+        if (preg_match('/^societe_/',$datatoimport)) $this->thirpartyobject=new Societe($this->db);
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output header of an example file for this format
-	 *
-	 * 	@param	Translate	$outputlangs		Output language
-	 *  @return	string
-	 */
-	function write_header_example($outputlangs)
-	{
+    /**
+     * 	Output header of an example file for this format
+     *
+     * 	@param	Translate	$outputlangs		Output language
+     *  @return	string
+     */
+    function write_header_example($outputlangs)
+    {
         // phpcs:enable
-		return '';
-	}
+        return '';
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output title line of an example file for this format
-	 *
-	 * 	@param	Translate	$outputlangs		Output language
-	 *  @param	array		$headerlinefields	Array of fields name
-	 * 	@return	string
-	 */
-	function write_title_example($outputlangs,$headerlinefields)
-	{
+    /**
+     * 	Output title line of an example file for this format
+     *
+     * 	@param	Translate	$outputlangs		Output language
+     *  @param	array		$headerlinefields	Array of fields name
+     * 	@return	string
+     */
+    function write_title_example($outputlangs,$headerlinefields)
+    {
         // phpcs:enable
-		$s=join($this->separator,array_map('cleansep',$headerlinefields));
-		return $s."\n";
-	}
+        $s=join($this->separator,array_map('cleansep',$headerlinefields));
+        return $s."\n";
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output record of an example file for this format
-	 *
-	 * 	@param	Translate	$outputlangs		Output language
-	 * 	@param	array		$contentlinevalues	Array of lines
-	 * 	@return	string
-	 */
-	function write_record_example($outputlangs,$contentlinevalues)
-	{
+    /**
+     * 	Output record of an example file for this format
+     *
+     * 	@param	Translate	$outputlangs		Output language
+     * 	@param	array		$contentlinevalues	Array of lines
+     * 	@return	string
+     */
+    function write_record_example($outputlangs,$contentlinevalues)
+    {
         // phpcs:enable
-		$s=join($this->separator,array_map('cleansep',$contentlinevalues));
-		return $s."\n";
-	}
+        $s=join($this->separator,array_map('cleansep',$contentlinevalues));
+        return $s."\n";
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output footer of an example file for this format
-	 *
-	 * 	@param	Translate	$outputlangs		Output language
-	 *  @return	string
-	 */
-	function write_footer_example($outputlangs)
-	{
+    /**
+     * 	Output footer of an example file for this format
+     *
+     * 	@param	Translate	$outputlangs		Output language
+     *  @return	string
+     */
+    function write_footer_example($outputlangs)
+    {
         // phpcs:enable
-		return '';
-	}
+        return '';
+    }
 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Open input file
-	 *
-	 *	@param	string	$file		Path of filename
-	 *	@return	int					<0 if KO, >=0 if OK
-	 */
-	function import_open_file($file)
-	{
+    /**
+     *	Open input file
+     *
+     *	@param	string	$file		Path of filename
+     *	@return	int					<0 if KO, >=0 if OK
+     */
+    function import_open_file($file)
+    {
         // phpcs:enable
-		global $langs;
-		$ret=1;
-
-		dol_syslog(get_class($this)."::open_file file=".$file);
-
-		ini_set('auto_detect_line_endings',1);	// For MAC compatibility
-
-		$this->handle = fopen(dol_osencode($file), "r");
-		if (! $this->handle)
-		{
-			$langs->load("errors");
-			$this->error=$langs->trans("ErrorFailToOpenFile",$file);
-			$ret=-1;
-		}
-		else
-		{
-			$this->file=$file;
-		}
-
-		return $ret;
-	}
+        global $langs;
+        $ret=1;
+
+        dol_syslog(get_class($this)."::open_file file=".$file);
+
+        ini_set('auto_detect_line_endings',1);	// For MAC compatibility
+
+        $this->handle = fopen(dol_osencode($file), "r");
+        if (! $this->handle)
+        {
+            $langs->load("errors");
+            $this->error=$langs->trans("ErrorFailToOpenFile",$file);
+            $ret=-1;
+        }
+        else
+        {
+            $this->file=$file;
+        }
+
+        return $ret;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Return nb of records. File must be closed.
-	 *
-	 *	@param	string	$file		Path of filename
-	 * 	@return		int		<0 if KO, >=0 if OK
-	 */
-	function import_get_nb_of_lines($file)
-	{
+    /**
+     * 	Return nb of records. File must be closed.
+     *
+     *	@param	string	$file		Path of filename
+     * 	@return		int		<0 if KO, >=0 if OK
+     */
+    function import_get_nb_of_lines($file)
+    {
         // phpcs:enable
-       return dol_count_nb_of_line($file);
+        return dol_count_nb_of_line($file);
     }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Input header line from file
-	 *
-	 * 	@return		int		<0 if KO, >=0 if OK
-	 */
-	function import_read_header()
-	{
+    /**
+     * 	Input header line from file
+     *
+     * 	@return		int		<0 if KO, >=0 if OK
+     */
+    function import_read_header()
+    {
         // phpcs:enable
-		return 0;
-	}
+        return 0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Return array of next record in input file.
-	 *
-	 * 	@return		Array		Array of field values. Data are UTF8 encoded. [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=not empty string)
-	 */
-	function import_read_record()
-	{
+    /**
+     * 	Return array of next record in input file.
+     *
+     * 	@return		Array		Array of field values. Data are UTF8 encoded. [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=not empty string)
+     */
+    function import_read_record()
+    {
         // phpcs:enable
-		global $conf;
-
-		$arrayres=fgetcsv($this->handle,100000,$this->separator,$this->enclosure,$this->escape);
-
-		// End of file
-		if ($arrayres === false) return false;
-
-		//var_dump($this->handle);
-		//var_dump($arrayres);exit;
-		$newarrayres=array();
-		if ($arrayres && is_array($arrayres))
-		{
-			foreach($arrayres as $key => $val)
-			{
-				if (! empty($conf->global->IMPORT_CSV_FORCE_CHARSET))	// Forced charset
-				{
-					if (strtolower($conf->global->IMPORT_CSV_FORCE_CHARSET) == 'utf8')
-					{
-						$newarrayres[$key]['val']=$val;
-						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
-					}
-					else
-					{
-						$newarrayres[$key]['val']=utf8_encode($val);
-						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
-					}
-				}
-				else	// Autodetect format (UTF8 or ISO)
-				{
-					if (utf8_check($val))
-					{
-						$newarrayres[$key]['val']=$val;
-						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
-					}
-					else
-					{
-						$newarrayres[$key]['val']=utf8_encode($val);
-						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
-					}
-				}
-			}
-
-			$this->col=count($newarrayres);
-		}
-
-		return $newarrayres;
-	}
+        global $conf;
+
+        $arrayres=fgetcsv($this->handle,100000,$this->separator,$this->enclosure,$this->escape);
+
+        // End of file
+        if ($arrayres === false) return false;
+
+        //var_dump($this->handle);
+        //var_dump($arrayres);exit;
+        $newarrayres=array();
+        if ($arrayres && is_array($arrayres))
+        {
+            foreach($arrayres as $key => $val)
+            {
+                if (! empty($conf->global->IMPORT_CSV_FORCE_CHARSET))	// Forced charset
+                {
+                    if (strtolower($conf->global->IMPORT_CSV_FORCE_CHARSET) == 'utf8')
+                    {
+                        $newarrayres[$key]['val']=$val;
+                        $newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
+                    }
+                    else
+                    {
+                        $newarrayres[$key]['val']=utf8_encode($val);
+                        $newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
+                    }
+                }
+                else	// Autodetect format (UTF8 or ISO)
+                {
+                    if (utf8_check($val))
+                    {
+                        $newarrayres[$key]['val']=$val;
+                        $newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
+                    }
+                    else
+                    {
+                        $newarrayres[$key]['val']=utf8_encode($val);
+                        $newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
+                    }
+                }
+            }
+
+            $this->col=count($newarrayres);
+        }
+
+        return $newarrayres;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Close file handle
-	 *
-	 *  @return	integer
-	 */
-	function import_close_file()
-	{
+    /**
+     * 	Close file handle
+     *
+     *  @return	integer
+     */
+    function import_close_file()
+    {
         // phpcs:enable
-		fclose($this->handle);
-		return 0;
-	}
+        fclose($this->handle);
+        return 0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Insert a record into database
-	 *
-	 * @param	array	$arrayrecord					Array of read values: [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=string), [fieldpos+1]...
-	 * @param	array	$array_match_file_to_database	Array of target fields where to insert data: [fieldpos] => 's.fieldname', [fieldpos+1]...
-	 * @param 	Object	$objimport						Object import (contains objimport->array_import_tables, objimport->array_import_fields, objimport->array_import_convertvalue, ...)
-	 * @param	int		$maxfields						Max number of fields to use
-	 * @param	string	$importid						Import key
-	 * @param	array	$updatekeys						Array of keys to use to try to do an update first before insert. This field are defined into the module descriptor.
-	 * @return	int										<0 if KO, >0 if OK
-	 */
-	function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$maxfields,$importid,$updatekeys)
-	{
+    /**
+     * Insert a record into database
+     *
+     * @param	array	$arrayrecord					Array of read values: [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=string), [fieldpos+1]...
+     * @param	array	$array_match_file_to_database	Array of target fields where to insert data: [fieldpos] => 's.fieldname', [fieldpos+1]...
+     * @param 	Object	$objimport						Object import (contains objimport->array_import_tables, objimport->array_import_fields, objimport->array_import_convertvalue, ...)
+     * @param	int		$maxfields						Max number of fields to use
+     * @param	string	$importid						Import key
+     * @param	array	$updatekeys						Array of keys to use to try to do an update first before insert. This field are defined into the module descriptor.
+     * @return	int										<0 if KO, >0 if OK
+     */
+    function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$maxfields,$importid,$updatekeys)
+    {
         // phpcs:enable
-		global $langs,$conf,$user;
+        global $langs,$conf,$user;
         global $thirdparty_static;    	// Specific to thirdparty import
-		global $tablewithentity_cache;	// Cache to avoid to call  desc at each rows on tables
-
-		$error=0;
-		$warning=0;
-		$this->errors=array();
-		$this->warnings=array();
-
-		//dol_syslog("import_csv.modules maxfields=".$maxfields." importid=".$importid);
-
-		//var_dump($array_match_file_to_database);
-		//var_dump($arrayrecord);
-		$array_match_database_to_file=array_flip($array_match_file_to_database);
-		$sort_array_match_file_to_database=$array_match_file_to_database;
-		ksort($sort_array_match_file_to_database);
-
-		//var_dump($sort_array_match_file_to_database);
-
-		if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val'])))
-		{
-			//print 'W';
-			$this->warnings[$warning]['lib']=$langs->trans('EmptyLine');
-			$this->warnings[$warning]['type']='EMPTY';
-			$warning++;
-		}
-		else
-		{
-			$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
-			$updatedone = false;
-			$insertdone = false;
-			// For each table to insert, me make a separate insert
-			foreach($objimport->array_import_tables[0] as $alias => $tablename)
-			{
-				// Build sql request
-				$sql='';
-				$listfields=array();
-				$listvalues=array();
-				$i=0;
-				$errorforthistable=0;
-
-				// Define $tablewithentity_cache[$tablename] if not already defined
-				if (! isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
-				{
-					dol_syslog("Check if table ".$tablename." has an entity field");
-					$resql=$this->db->DDLDescTable($tablename,'entity');
-					if ($resql)
-					{
-						$obj=$this->db->fetch_object($resql);
-						if ($obj) $tablewithentity_cache[$tablename]=1;		// table contains entity field
-						else $tablewithentity_cache[$tablename]=0;			// table does not contains entity field
-					}
-					else dol_print_error($this->db);
-				}
-				else
-				{
-					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
-				}
-
-
-				// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
-				foreach($sort_array_match_file_to_database as $key => $val)
-				{
-				    $fieldalias=preg_replace('/\..*$/i','',$val);
-				    $fieldname=preg_replace('/^.*\./i','',$val);
-
-				    if ($alias != $fieldalias) continue;    // Not a field of current table
-
-					if ($key <= $maxfields)
-					{
-						// Set $newval with value to insert and set $listvalues with sql request part for insert
-						$newval='';
-						if ($arrayrecord[($key-1)]['type'] > 0) $newval=$arrayrecord[($key-1)]['val'];    // If type of field into input file is not empty string (so defined into input file), we get value
-
-						// Make some tests on $newval
-
-						// Is it a required field ?
-						if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ((string) $newval==''))
-						{
-							$this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key);
-							$this->errors[$error]['type']='NOTNULL';
-							$errorforthistable++;
-							$error++;
-						}
-						// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
-						else
-						{
-						    // We convert field if required
-						    if (! empty($objimport->array_import_convertvalue[0][$val]))
-						    {
+        global $tablewithentity_cache;	// Cache to avoid to call  desc at each rows on tables
+
+        $error=0;
+        $warning=0;
+        $this->errors=array();
+        $this->warnings=array();
+
+        //dol_syslog("import_csv.modules maxfields=".$maxfields." importid=".$importid);
+
+        //var_dump($array_match_file_to_database);
+        //var_dump($arrayrecord);
+        $array_match_database_to_file=array_flip($array_match_file_to_database);
+        $sort_array_match_file_to_database=$array_match_file_to_database;
+        ksort($sort_array_match_file_to_database);
+
+        //var_dump($sort_array_match_file_to_database);
+
+        if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val'])))
+        {
+            //print 'W';
+            $this->warnings[$warning]['lib']=$langs->trans('EmptyLine');
+            $this->warnings[$warning]['type']='EMPTY';
+            $warning++;
+        }
+        else
+        {
+            $last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
+            $updatedone = false;
+            $insertdone = false;
+            // For each table to insert, me make a separate insert
+            foreach($objimport->array_import_tables[0] as $alias => $tablename)
+            {
+                // Build sql request
+                $sql='';
+                $listfields=array();
+                $listvalues=array();
+                $i=0;
+                $errorforthistable=0;
+
+                // Define $tablewithentity_cache[$tablename] if not already defined
+                if (! isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
+                {
+                    dol_syslog("Check if table ".$tablename." has an entity field");
+                    $resql=$this->db->DDLDescTable($tablename,'entity');
+                    if ($resql)
+                    {
+                        $obj=$this->db->fetch_object($resql);
+                        if ($obj) $tablewithentity_cache[$tablename]=1;		// table contains entity field
+                        else $tablewithentity_cache[$tablename]=0;			// table does not contains entity field
+                    }
+                    else dol_print_error($this->db);
+                }
+                else
+                {
+                    //dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
+                }
+
+
+                // Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
+                foreach($sort_array_match_file_to_database as $key => $val)
+                {
+                    $fieldalias=preg_replace('/\..*$/i','',$val);
+                    $fieldname=preg_replace('/^.*\./i','',$val);
+
+                    if ($alias != $fieldalias) continue;    // Not a field of current table
+
+                    if ($key <= $maxfields)
+                    {
+                        // Set $newval with value to insert and set $listvalues with sql request part for insert
+                        $newval='';
+                        if ($arrayrecord[($key-1)]['type'] > 0) $newval=$arrayrecord[($key-1)]['val'];    // If type of field into input file is not empty string (so defined into input file), we get value
+
+                        // Make some tests on $newval
+
+                        // Is it a required field ?
+                        if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ((string) $newval==''))
+                        {
+                            $this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key);
+                            $this->errors[$error]['type']='NOTNULL';
+                            $errorforthistable++;
+                            $error++;
+                        }
+                        // Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
+                        else
+                        {
+                            // We convert field if required
+                            if (! empty($objimport->array_import_convertvalue[0][$val]))
+                            {
                                 //print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
                                 if ($objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeid'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromref'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel'
-                                	)
+                                    || $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromref'
+                                    || $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel'
+                                    )
                                 {
                                     // New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
                                     $isidorref='id';
@@ -431,10 +431,10 @@ 
                                         $method=$objimport->array_import_convertvalue[0][$val]['method'];
                                         if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
-                                        	$newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
+                                            $newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
                                         }
                                         else
-										{
+                                        {
                                             $resultload = dol_include_once($file);
                                             if (empty($resultload))
                                             {
@@ -447,7 +447,7 @@ 
                                             // If not found, try the fetch from label
                                             if (! ($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel')
                                             {
-												call_user_func_array(array($classinstance, $method),array('', '', $newval));
+                                                call_user_func_array(array($classinstance, $method),array('', '', $newval));
                                             }
                                             $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval]=$classinstance->id;
                                             //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
@@ -534,264 +534,264 @@ 
                                 }
 
                                 //print 'Val to use as insert is '.$newval.'<br>';
-						    }
-
-						    // Test regexp
-							if (! empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
-							{
-								// If test is "Must exist in a field@table"
-								if (preg_match('/^(.*)@(.*)$/',$objimport->array_import_regex[0][$val],$reg))
-								{
-									$field=$reg[1];
-									$table=$reg[2];
-
-									// Load content of field@table into cache array
-									if (! is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
-									{
-										$sql="SELECT ".$field." as aliasfield FROM ".$table;
-										$resql=$this->db->query($sql);
-										if ($resql)
-										{
-											$num=$this->db->num_rows($resql);
-											$i=0;
-											while ($i < $num)
-											{
-												$obj=$this->db->fetch_object($resql);
-												if ($obj) $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
-												$i++;
-											}
-										}
-										else
-										{
-											dol_print_error($this->db);
-										}
-									}
-
-									// Now we check cache is not empty (should not) and key is into cache
-									if (! is_array($this->cachefieldtable[$field.'@'.$table]) || ! in_array($newval,$this->cachefieldtable[$field.'@'.$table]))
-									{
-										$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorFieldValueNotIn',$key,$newval,$field,$table);
-										$this->errors[$error]['type']='FOREIGNKEY';
-									    $errorforthistable++;
-										$error++;
-									}
-								}
-								// If test is just a static regex
-								else if (! preg_match('/'.$objimport->array_import_regex[0][$val].'/i',$newval))
-								{
-								    //if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
-									$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorWrongValueForField',$key,$newval,$objimport->array_import_regex[0][$val]);
-									$this->errors[$error]['type']='REGEX';
-									$errorforthistable++;
-									$error++;
-								}
-							}
-
-							// Other tests
-							// ...
-						}
-
-						// Define $listfields and $listvalues to build SQL request
-						$listfields[] = $fieldname;
-
-						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
-						if (empty($newval) && $arrayrecord[($key-1)]['type'] < 0) {
+                            }
+
+                            // Test regexp
+                            if (! empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
+                            {
+                                // If test is "Must exist in a field@table"
+                                if (preg_match('/^(.*)@(.*)$/',$objimport->array_import_regex[0][$val],$reg))
+                                {
+                                    $field=$reg[1];
+                                    $table=$reg[2];
+
+                                    // Load content of field@table into cache array
+                                    if (! is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
+                                    {
+                                        $sql="SELECT ".$field." as aliasfield FROM ".$table;
+                                        $resql=$this->db->query($sql);
+                                        if ($resql)
+                                        {
+                                            $num=$this->db->num_rows($resql);
+                                            $i=0;
+                                            while ($i < $num)
+                                            {
+                                                $obj=$this->db->fetch_object($resql);
+                                                if ($obj) $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
+                                                $i++;
+                                            }
+                                        }
+                                        else
+                                        {
+                                            dol_print_error($this->db);
+                                        }
+                                    }
+
+                                    // Now we check cache is not empty (should not) and key is into cache
+                                    if (! is_array($this->cachefieldtable[$field.'@'.$table]) || ! in_array($newval,$this->cachefieldtable[$field.'@'.$table]))
+                                    {
+                                        $this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorFieldValueNotIn',$key,$newval,$field,$table);
+                                        $this->errors[$error]['type']='FOREIGNKEY';
+                                        $errorforthistable++;
+                                        $error++;
+                                    }
+                                }
+                                // If test is just a static regex
+                                else if (! preg_match('/'.$objimport->array_import_regex[0][$val].'/i',$newval))
+                                {
+                                    //if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
+                                    $this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorWrongValueForField',$key,$newval,$objimport->array_import_regex[0][$val]);
+                                    $this->errors[$error]['type']='REGEX';
+                                    $errorforthistable++;
+                                    $error++;
+                                }
+                            }
+
+                            // Other tests
+                            // ...
+                        }
+
+                        // Define $listfields and $listvalues to build SQL request
+                        $listfields[] = $fieldname;
+
+                        // Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
+                        if (empty($newval) && $arrayrecord[($key-1)]['type'] < 0) {
                             $listvalues[] = ($newval=='0'?$newval:"null");
                         } elseif (empty($newval) && $arrayrecord[($key-1)]['type'] == 0) {
                             $listvalues[] = "''";
                         } else {
                             $listvalues[] = "'".$this->db->escape($newval)."'";
                         }
-					}
-					$i++;
-				}
-
-				// We add hidden fields (but only if there is at least one field to add into table)
-				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0]))
-				{
-    				// Loop on each hidden fields to add them into listfields/listvalues
-				    foreach($objimport->array_import_fieldshidden[0] as $key => $val)
-    				{
-    				    if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue;    // Not a field of current table
-    				    if ($val == 'user->id')
-    				    {
-    				        $listfields[] = preg_replace('/^'.preg_quote($alias).'\./','',$key);
-    				        $listvalues[] = $user->id;
-    				    }
-    				    elseif (preg_match('/^lastrowid-/',$val))
-    				    {
-    				        $tmp=explode('-',$val);
-    				        $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
-							$keyfield = preg_replace('/^'.preg_quote($alias).'\./','',$key);
-    				        $listfields[] = $keyfield;
+                    }
+                    $i++;
+                }
+
+                // We add hidden fields (but only if there is at least one field to add into table)
+                if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0]))
+                {
+                    // Loop on each hidden fields to add them into listfields/listvalues
+                    foreach($objimport->array_import_fieldshidden[0] as $key => $val)
+                    {
+                        if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue;    // Not a field of current table
+                        if ($val == 'user->id')
+                        {
+                            $listfields[] = preg_replace('/^'.preg_quote($alias).'\./','',$key);
+                            $listvalues[] = $user->id;
+                        }
+                        elseif (preg_match('/^lastrowid-/',$val))
+                        {
+                            $tmp=explode('-',$val);
+                            $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
+                            $keyfield = preg_replace('/^'.preg_quote($alias).'\./','',$key);
+                            $listfields[] = $keyfield;
                             $listvalues[] = $lastinsertid;
-    				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
-    				    }
-    				}
-				}
-				//print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
-
-				// If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
-				// so we can try to make the insert or update now.
-				if (! $errorforthistable)
-				{
-					//print "$alias/$tablename/$listfields/$listvalues<br>";
-					if (!empty($listfields))
-					{
-						$updatedone = false;
-						$insertdone = false;
-
-						if (!empty($updatekeys)) {
-							// We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
-
-							if (empty($lastinsertid)) {	// No insert done yet for a parent table
-								$sqlSelect = 'SELECT rowid FROM '.$tablename;
-
-								$data = array_combine($listfields, $listvalues);
-								$where = array();
-								$filters = array();
-								foreach ($updatekeys as $key) {
-									$col = $objimport->array_import_updatekeys[0][$key];
-									$key=preg_replace('/^.*\./i','',$key);
-									$where[] = $key.' = '.$data[$key];
-									$filters[] = $col.' = '.$data[$key];
-								}
-								$sqlSelect.= ' WHERE '.implode(' AND ', $where);
-
-								$resql=$this->db->query($sqlSelect);
-								if($resql) {
-									$res = $this->db->fetch_object($resql);
-									if($resql->num_rows == 1) {
-										$lastinsertid = $res->rowid;
-										$last_insert_id_array[$tablename] = $lastinsertid;
-									} else if($resql->num_rows > 1) {
-										$this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', '));
-										$this->errors[$error]['type']='SQL';
-										$error++;
-									} else {
-										// No record found with filters, insert will be tried below
-									}
-								}
-								else
-								{
-									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
-									$error++;
-								}
-							} else {
-								// We have a last INSERT ID (got by previous pass), so we check if we have a row referencing this foreign key.
-								// This is required when updating table with some extrafields. When inserting a record in parent table, we can make
-								// a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
-								// may already exists. So we rescan the extrafield table to know if record exists or not for the rowid.
-								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
-								$sqlSelect = 'SELECT rowid FROM '.$tablename;
-
-								if(empty($keyfield)) $keyfield = 'rowid';
-								$sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
-
-								$resql=$this->db->query($sqlSelect);
-								if($resql) {
-									$res = $this->db->fetch_object($resql);
-									if($resql->num_rows == 1) {
-										// We have a row referencing this last foreign key, continue with UPDATE.
-									} else {
-										// No record found referencing this last foreign key,
-										// force $lastinsertid to 0 so we INSERT below.
-										$lastinsertid = 0;
-									}
-								}
-								else
-								{
-									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
-									$error++;
-								}
-							}
-
-							if (!empty($lastinsertid)) {
-								// Build SQL UPDATE request
-								$sqlstart = 'UPDATE '.$tablename;
-
-								$data = array_combine($listfields, $listvalues);
-								$set = array();
-								foreach ($data as $key => $val) {
-									$set[] = $key.' = '.$val;
-								}
-								$sqlstart.= ' SET '.implode(', ', $set);
-
-								if(empty($keyfield)) $keyfield = 'rowid';
-								$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
-
-								$sql = $sqlstart.$sqlend;
-
-								// Run update request
-								$resql=$this->db->query($sql);
-								if($resql) {
-									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
-									$updatedone = true;
-								}
-								else
-								{
-									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
-									$error++;
-								}
-							}
-						}
-
-						// Update not done, we do insert
-						if (!$error && !$updatedone) {
-							// Build SQL INSERT request
-							$sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
-							$sqlend = ') VALUES('.implode(', ', $listvalues).", '".$importid."'";
-							if (! empty($tablewithentity_cache[$tablename])) {
-								$sqlstart.= ', entity';
-								$sqlend.= ', '.$conf->entity;
-							}
-							if (! empty($objimport->array_import_tables_creator[0][$alias])) {
-								$sqlstart.= ', '.$objimport->array_import_tables_creator[0][$alias];
-								$sqlend.=', '.$user->id;
-							}
-							$sql = $sqlstart.$sqlend.')';
-							dol_syslog("import_csv.modules", LOG_DEBUG);
-
-							// Run insert request
-							if ($sql)
-							{
-								$resql=$this->db->query($sql);
-								if ($resql)
-								{
-								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
-								    $insertdone = true;
-								}
-								else
-								{
-									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
-									$error++;
-								}
-							}
-						}
-					}
-					/*else
+                            //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
+                        }
+                    }
+                }
+                //print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
+
+                // If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
+                // so we can try to make the insert or update now.
+                if (! $errorforthistable)
+                {
+                    //print "$alias/$tablename/$listfields/$listvalues<br>";
+                    if (!empty($listfields))
+                    {
+                        $updatedone = false;
+                        $insertdone = false;
+
+                        if (!empty($updatekeys)) {
+                            // We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
+
+                            if (empty($lastinsertid)) {	// No insert done yet for a parent table
+                                $sqlSelect = 'SELECT rowid FROM '.$tablename;
+
+                                $data = array_combine($listfields, $listvalues);
+                                $where = array();
+                                $filters = array();
+                                foreach ($updatekeys as $key) {
+                                    $col = $objimport->array_import_updatekeys[0][$key];
+                                    $key=preg_replace('/^.*\./i','',$key);
+                                    $where[] = $key.' = '.$data[$key];
+                                    $filters[] = $col.' = '.$data[$key];
+                                }
+                                $sqlSelect.= ' WHERE '.implode(' AND ', $where);
+
+                                $resql=$this->db->query($sqlSelect);
+                                if($resql) {
+                                    $res = $this->db->fetch_object($resql);
+                                    if($resql->num_rows == 1) {
+                                        $lastinsertid = $res->rowid;
+                                        $last_insert_id_array[$tablename] = $lastinsertid;
+                                    } else if($resql->num_rows > 1) {
+                                        $this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', '));
+                                        $this->errors[$error]['type']='SQL';
+                                        $error++;
+                                    } else {
+                                        // No record found with filters, insert will be tried below
+                                    }
+                                }
+                                else
+                                {
+                                    //print 'E';
+                                    $this->errors[$error]['lib']=$this->db->lasterror();
+                                    $this->errors[$error]['type']='SQL';
+                                    $error++;
+                                }
+                            } else {
+                                // We have a last INSERT ID (got by previous pass), so we check if we have a row referencing this foreign key.
+                                // This is required when updating table with some extrafields. When inserting a record in parent table, we can make
+                                // a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
+                                // may already exists. So we rescan the extrafield table to know if record exists or not for the rowid.
+                                // Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
+                                $sqlSelect = 'SELECT rowid FROM '.$tablename;
+
+                                if(empty($keyfield)) $keyfield = 'rowid';
+                                $sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
+
+                                $resql=$this->db->query($sqlSelect);
+                                if($resql) {
+                                    $res = $this->db->fetch_object($resql);
+                                    if($resql->num_rows == 1) {
+                                        // We have a row referencing this last foreign key, continue with UPDATE.
+                                    } else {
+                                        // No record found referencing this last foreign key,
+                                        // force $lastinsertid to 0 so we INSERT below.
+                                        $lastinsertid = 0;
+                                    }
+                                }
+                                else
+                                {
+                                    //print 'E';
+                                    $this->errors[$error]['lib']=$this->db->lasterror();
+                                    $this->errors[$error]['type']='SQL';
+                                    $error++;
+                                }
+                            }
+
+                            if (!empty($lastinsertid)) {
+                                // Build SQL UPDATE request
+                                $sqlstart = 'UPDATE '.$tablename;
+
+                                $data = array_combine($listfields, $listvalues);
+                                $set = array();
+                                foreach ($data as $key => $val) {
+                                    $set[] = $key.' = '.$val;
+                                }
+                                $sqlstart.= ' SET '.implode(', ', $set);
+
+                                if(empty($keyfield)) $keyfield = 'rowid';
+                                $sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
+
+                                $sql = $sqlstart.$sqlend;
+
+                                // Run update request
+                                $resql=$this->db->query($sql);
+                                if($resql) {
+                                    // No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
+                                    $updatedone = true;
+                                }
+                                else
+                                {
+                                    //print 'E';
+                                    $this->errors[$error]['lib']=$this->db->lasterror();
+                                    $this->errors[$error]['type']='SQL';
+                                    $error++;
+                                }
+                            }
+                        }
+
+                        // Update not done, we do insert
+                        if (!$error && !$updatedone) {
+                            // Build SQL INSERT request
+                            $sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
+                            $sqlend = ') VALUES('.implode(', ', $listvalues).", '".$importid."'";
+                            if (! empty($tablewithentity_cache[$tablename])) {
+                                $sqlstart.= ', entity';
+                                $sqlend.= ', '.$conf->entity;
+                            }
+                            if (! empty($objimport->array_import_tables_creator[0][$alias])) {
+                                $sqlstart.= ', '.$objimport->array_import_tables_creator[0][$alias];
+                                $sqlend.=', '.$user->id;
+                            }
+                            $sql = $sqlstart.$sqlend.')';
+                            dol_syslog("import_csv.modules", LOG_DEBUG);
+
+                            // Run insert request
+                            if ($sql)
+                            {
+                                $resql=$this->db->query($sql);
+                                if ($resql)
+                                {
+                                    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
+                                    $insertdone = true;
+                                }
+                                else
+                                {
+                                    //print 'E';
+                                    $this->errors[$error]['lib']=$this->db->lasterror();
+                                    $this->errors[$error]['type']='SQL';
+                                    $error++;
+                                }
+                            }
+                        }
+                    }
+                    /*else
 					{
 						dol_print_error('','ErrorFieldListEmptyFor '.$alias."/".$tablename);
 					}*/
-				}
+                }
 
-			    if ($error) break;
-			}
+                if ($error) break;
+            }
 
-			if($updatedone) $this->nbupdate++;
-			if($insertdone) $this->nbinsert++;
-		}
+            if($updatedone) $this->nbupdate++;
+            if($insertdone) $this->nbinsert++;
+        }
 
-		return 1;
-	}
+        return 1;
+    }
 }
 
 /**
@@ -802,5 +802,5 @@ 
  */
 function cleansep($value)
 {
-	return str_replace(array(',',';'),'/',$value);
+    return str_replace(array(',',';'),'/',$value);
 };

Spacing +187 added lines, -187 removed lines

@@ -25,7 +25,7 @@ 
  *		\brief      File to load import files with CSV format
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/import/modules_import.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
 
 
 /**
@@ -43,7 +43,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[] Error codes (or messages)
@@ -60,7 +60,7 @@ 
      */
     public $label;
 
-	public $extension;    // Extension of files imported by driver
+	public $extension; // Extension of files imported by driver
 
 	/**
      * Dolibarr version of driver
@@ -68,19 +68,19 @@ 
      */
 	public $version = 'dolibarr';
 
-	public $label_lib;    // Label of external lib used by driver
+	public $label_lib; // Label of external lib used by driver
 
-	public $version_lib;  // Version of external lib used by driver
+	public $version_lib; // Version of external lib used by driver
 
 	public $separator;
 
-	public $file;      // Path of file
+	public $file; // Path of file
 
-	public $handle;    // Handle fichier
+	public $handle; // Handle fichier
 
-	public $cacheconvert=array();      // Array to cache list of value found after a convertion
+	public $cacheconvert = array(); // Array to cache list of value found after a convertion
 
-	public $cachefieldtable=array();   // Array to cache list of value found into fields@tables
+	public $cachefieldtable = array(); // Array to cache list of value found into fields@tables
 
 	public $nbinsert = 0; // # of insert done during the import
 
@@ -93,28 +93,28 @@ 
 	 *	@param	DoliDB		$db				Database handler
 	 *	@param	string		$datatoimport	String code describing import set (ex: 'societe_1')
 	 */
-	function __construct($db,$datatoimport)
+	function __construct($db, $datatoimport)
 	{
 		global $conf, $langs;
 		$this->db = $db;
 
-		$this->separator=(GETPOST('separator')?GETPOST('separator'):(empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE)?',':$conf->global->IMPORT_CSV_SEPARATOR_TO_USE));
-		$this->enclosure='"';
-		$this->escape='"';
+		$this->separator = (GETPOST('separator') ?GETPOST('separator') : (empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE) ? ',' : $conf->global->IMPORT_CSV_SEPARATOR_TO_USE));
+		$this->enclosure = '"';
+		$this->escape = '"';
 
-		$this->id='csv';                // Same value then xxx in file name export_xxx.modules.php
-		$this->label='Csv';             // Label of driver
-		$this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
-		$this->extension='csv';         // Extension for generated file by this driver
-		$this->picto='mime/other';		// Picto
-		$this->version='1.34';         // Driver version
+		$this->id = 'csv'; // Same value then xxx in file name export_xxx.modules.php
+		$this->label = 'Csv'; // Label of driver
+		$this->desc = $langs->trans("CSVFormatDesc", $this->separator, $this->enclosure, $this->escape);
+		$this->extension = 'csv'; // Extension for generated file by this driver
+		$this->picto = 'mime/other'; // Picto
+		$this->version = '1.34'; // Driver version
 
 		// If driver use an external library, put its name here
-		$this->label_lib='Dolibarr';
-		$this->version_lib=DOL_VERSION;
+		$this->label_lib = 'Dolibarr';
+		$this->version_lib = DOL_VERSION;
 
-		$this->datatoimport=$datatoimport;
-		if (preg_match('/^societe_/',$datatoimport)) $this->thirpartyobject=new Societe($this->db);
+		$this->datatoimport = $datatoimport;
+		if (preg_match('/^societe_/', $datatoimport)) $this->thirpartyobject = new Societe($this->db);
 	}
 
 
@@ -139,10 +139,10 @@ 
 	 *  @param	array		$headerlinefields	Array of fields name
 	 * 	@return	string
 	 */
-	function write_title_example($outputlangs,$headerlinefields)
+	function write_title_example($outputlangs, $headerlinefields)
 	{
         // phpcs:enable
-		$s=join($this->separator,array_map('cleansep',$headerlinefields));
+		$s = join($this->separator, array_map('cleansep', $headerlinefields));
 		return $s."\n";
 	}
 
@@ -154,10 +154,10 @@ 
 	 * 	@param	array		$contentlinevalues	Array of lines
 	 * 	@return	string
 	 */
-	function write_record_example($outputlangs,$contentlinevalues)
+	function write_record_example($outputlangs, $contentlinevalues)
 	{
         // phpcs:enable
-		$s=join($this->separator,array_map('cleansep',$contentlinevalues));
+		$s = join($this->separator, array_map('cleansep', $contentlinevalues));
 		return $s."\n";
 	}
 
@@ -187,22 +187,22 @@ 
 	{
         // phpcs:enable
 		global $langs;
-		$ret=1;
+		$ret = 1;
 
 		dol_syslog(get_class($this)."::open_file file=".$file);
 
-		ini_set('auto_detect_line_endings',1);	// For MAC compatibility
+		ini_set('auto_detect_line_endings', 1); // For MAC compatibility
 
 		$this->handle = fopen(dol_osencode($file), "r");
-		if (! $this->handle)
+		if (!$this->handle)
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans("ErrorFailToOpenFile",$file);
-			$ret=-1;
+			$this->error = $langs->trans("ErrorFailToOpenFile", $file);
+			$ret = -1;
 		}
 		else
 		{
-			$this->file=$file;
+			$this->file = $file;
 		}
 
 		return $ret;
@@ -247,47 +247,47 @@ 
         // phpcs:enable
 		global $conf;
 
-		$arrayres=fgetcsv($this->handle,100000,$this->separator,$this->enclosure,$this->escape);
+		$arrayres = fgetcsv($this->handle, 100000, $this->separator, $this->enclosure, $this->escape);
 
 		// End of file
 		if ($arrayres === false) return false;
 
 		//var_dump($this->handle);
 		//var_dump($arrayres);exit;
-		$newarrayres=array();
+		$newarrayres = array();
 		if ($arrayres && is_array($arrayres))
 		{
-			foreach($arrayres as $key => $val)
+			foreach ($arrayres as $key => $val)
 			{
-				if (! empty($conf->global->IMPORT_CSV_FORCE_CHARSET))	// Forced charset
+				if (!empty($conf->global->IMPORT_CSV_FORCE_CHARSET))	// Forced charset
 				{
 					if (strtolower($conf->global->IMPORT_CSV_FORCE_CHARSET) == 'utf8')
 					{
-						$newarrayres[$key]['val']=$val;
-						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
+						$newarrayres[$key]['val'] = $val;
+						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
 					else
 					{
-						$newarrayres[$key]['val']=utf8_encode($val);
-						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
+						$newarrayres[$key]['val'] = utf8_encode($val);
+						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
 				}
 				else	// Autodetect format (UTF8 or ISO)
 				{
 					if (utf8_check($val))
 					{
-						$newarrayres[$key]['val']=$val;
-						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
+						$newarrayres[$key]['val'] = $val;
+						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
 					else
 					{
-						$newarrayres[$key]['val']=utf8_encode($val);
-						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
+						$newarrayres[$key]['val'] = utf8_encode($val);
+						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
 				}
 			}
 
-			$this->col=count($newarrayres);
+			$this->col = count($newarrayres);
 		}
 
 		return $newarrayres;
@@ -319,24 +319,24 @@ 
 	 * @param	array	$updatekeys						Array of keys to use to try to do an update first before insert. This field are defined into the module descriptor.
 	 * @return	int										<0 if KO, >0 if OK
 	 */
-	function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$maxfields,$importid,$updatekeys)
+	function import_insert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys)
 	{
         // phpcs:enable
-		global $langs,$conf,$user;
-        global $thirdparty_static;    	// Specific to thirdparty import
-		global $tablewithentity_cache;	// Cache to avoid to call  desc at each rows on tables
+		global $langs, $conf, $user;
+        global $thirdparty_static; // Specific to thirdparty import
+		global $tablewithentity_cache; // Cache to avoid to call  desc at each rows on tables
 
-		$error=0;
-		$warning=0;
-		$this->errors=array();
-		$this->warnings=array();
+		$error = 0;
+		$warning = 0;
+		$this->errors = array();
+		$this->warnings = array();
 
 		//dol_syslog("import_csv.modules maxfields=".$maxfields." importid=".$importid);
 
 		//var_dump($array_match_file_to_database);
 		//var_dump($arrayrecord);
-		$array_match_database_to_file=array_flip($array_match_file_to_database);
-		$sort_array_match_file_to_database=$array_match_file_to_database;
+		$array_match_database_to_file = array_flip($array_match_file_to_database);
+		$sort_array_match_file_to_database = $array_match_file_to_database;
 		ksort($sort_array_match_file_to_database);
 
 		//var_dump($sort_array_match_file_to_database);
@@ -344,8 +344,8 @@ 
 		if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val'])))
 		{
 			//print 'W';
-			$this->warnings[$warning]['lib']=$langs->trans('EmptyLine');
-			$this->warnings[$warning]['type']='EMPTY';
+			$this->warnings[$warning]['lib'] = $langs->trans('EmptyLine');
+			$this->warnings[$warning]['type'] = 'EMPTY';
 			$warning++;
 		}
 		else
@@ -354,25 +354,25 @@ 
 			$updatedone = false;
 			$insertdone = false;
 			// For each table to insert, me make a separate insert
-			foreach($objimport->array_import_tables[0] as $alias => $tablename)
+			foreach ($objimport->array_import_tables[0] as $alias => $tablename)
 			{
 				// Build sql request
-				$sql='';
-				$listfields=array();
-				$listvalues=array();
-				$i=0;
-				$errorforthistable=0;
+				$sql = '';
+				$listfields = array();
+				$listvalues = array();
+				$i = 0;
+				$errorforthistable = 0;
 
 				// Define $tablewithentity_cache[$tablename] if not already defined
-				if (! isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
+				if (!isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
 				{
 					dol_syslog("Check if table ".$tablename." has an entity field");
-					$resql=$this->db->DDLDescTable($tablename,'entity');
+					$resql = $this->db->DDLDescTable($tablename, 'entity');
 					if ($resql)
 					{
-						$obj=$this->db->fetch_object($resql);
-						if ($obj) $tablewithentity_cache[$tablename]=1;		// table contains entity field
-						else $tablewithentity_cache[$tablename]=0;			// table does not contains entity field
+						$obj = $this->db->fetch_object($resql);
+						if ($obj) $tablewithentity_cache[$tablename] = 1; // table contains entity field
+						else $tablewithentity_cache[$tablename] = 0; // table does not contains entity field
 					}
 					else dol_print_error($this->db);
 				}
@@ -383,26 +383,26 @@ 
 
 
 				// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
-				foreach($sort_array_match_file_to_database as $key => $val)
+				foreach ($sort_array_match_file_to_database as $key => $val)
 				{
-				    $fieldalias=preg_replace('/\..*$/i','',$val);
-				    $fieldname=preg_replace('/^.*\./i','',$val);
+				    $fieldalias = preg_replace('/\..*$/i', '', $val);
+				    $fieldname = preg_replace('/^.*\./i', '', $val);
 
-				    if ($alias != $fieldalias) continue;    // Not a field of current table
+				    if ($alias != $fieldalias) continue; // Not a field of current table
 
 					if ($key <= $maxfields)
 					{
 						// Set $newval with value to insert and set $listvalues with sql request part for insert
-						$newval='';
-						if ($arrayrecord[($key-1)]['type'] > 0) $newval=$arrayrecord[($key-1)]['val'];    // If type of field into input file is not empty string (so defined into input file), we get value
+						$newval = '';
+						if ($arrayrecord[($key - 1)]['type'] > 0) $newval = $arrayrecord[($key - 1)]['val']; // If type of field into input file is not empty string (so defined into input file), we get value
 
 						// Make some tests on $newval
 
 						// Is it a required field ?
-						if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ((string) $newval==''))
+						if (preg_match('/\*/', $objimport->array_import_fields[0][$val]) && ((string) $newval == ''))
 						{
-							$this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key);
-							$this->errors[$error]['type']='NOTNULL';
+							$this->errors[$error]['lib'] = $langs->trans('ErrorMissingMandatoryValue', $key);
+							$this->errors[$error]['type'] = 'NOTNULL';
 							$errorforthistable++;
 							$error++;
 						}
@@ -410,28 +410,28 @@ 
 						else
 						{
 						    // We convert field if required
-						    if (! empty($objimport->array_import_convertvalue[0][$val]))
+						    if (!empty($objimport->array_import_convertvalue[0][$val]))
 						    {
                                 //print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
-                                if ($objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeid'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromref'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel'
+                                if ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
+                                	|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref'
+                                	|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel'
                                 	)
                                 {
                                     // New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
-                                    $isidorref='id';
-                                    if (! is_numeric($newval) && $newval != '' && ! preg_match('/^id:/i',$newval)) $isidorref='ref';
-                                    $newval=preg_replace('/^(id|ref):/i','',$newval);    // Remove id: or ref: that was used to force if field is id or ref
+                                    $isidorref = 'id';
+                                    if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
+                                    $newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
                                     //print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
 
                                     if ($isidorref == 'ref')    // If value into input import file is a ref, we apply the function defined into descriptor
                                     {
-                                        $file=(empty($objimport->array_import_convertvalue[0][$val]['classfile'])?$objimport->array_import_convertvalue[0][$val]['file']:$objimport->array_import_convertvalue[0][$val]['classfile']);
-                                        $class=$objimport->array_import_convertvalue[0][$val]['class'];
-                                        $method=$objimport->array_import_convertvalue[0][$val]['method'];
+                                        $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+                                        $class = $objimport->array_import_convertvalue[0][$val]['class'];
+                                        $method = $objimport->array_import_convertvalue[0][$val]['method'];
                                         if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
-                                        	$newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
+                                        	$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
                                         }
                                         else
 										{
@@ -441,94 +441,94 @@ 
                                                 dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
                                                 break;
                                             }
-                                            $classinstance=new $class($this->db);
+                                            $classinstance = new $class($this->db);
                                             // Try the fetch from code or ref
-                                            call_user_func_array(array($classinstance, $method),array('', $newval));
+                                            call_user_func_array(array($classinstance, $method), array('', $newval));
                                             // If not found, try the fetch from label
-                                            if (! ($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel')
+                                            if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel')
                                             {
-												call_user_func_array(array($classinstance, $method),array('', '', $newval));
+												call_user_func_array(array($classinstance, $method), array('', '', $newval));
                                             }
-                                            $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval]=$classinstance->id;
+                                            $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] = $classinstance->id;
                                             //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
                                             if ($classinstance->id != '')	// id may be 0, it is a found value
                                             {
-                                                $newval=$classinstance->id;
+                                                $newval = $classinstance->id;
                                             }
                                             else
                                             {
-                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldValueNotIn',$key,$newval,'code',$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                                else if (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldRefNotIn',$key,$newval,$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
-                                                else $this->errors[$error]['lib']='ErrorFieldValueNotIn';
-                                                $this->errors[$error]['type']='FOREIGNKEY';
+                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+                                                else if (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
+                                                else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+                                                $this->errors[$error]['type'] = 'FOREIGNKEY';
                                                 $errorforthistable++;
                                                 $error++;
                                             }
                                         }
                                     }
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='zeroifnull')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
                                 {
-                                    if (empty($newval)) $newval='0';
+                                    if (empty($newval)) $newval = '0';
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
-                                        $this->thirpartyobject->get_codeclient(0,0);
-                                        $newval=$this->thirpartyobject->code_client;
+                                        $this->thirpartyobject->get_codeclient(0, 0);
+                                        $newval = $this->thirpartyobject->code_client;
                                         //print 'code_client='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsuppliercodeifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
-                                        $newval=$this->thirpartyobject->get_codefournisseur(0,1);
-                                        $newval=$this->thirpartyobject->code_fournisseur;
+                                        $newval = $this->thirpartyobject->get_codefournisseur(0, 1);
+                                        $newval = $this->thirpartyobject->code_fournisseur;
                                         //print 'code_fournisseur='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomeraccountancycodeifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
                                         $this->thirpartyobject->get_codecompta('customer');
-                                        $newval=$this->thirpartyobject->code_compta;
+                                        $newval = $this->thirpartyobject->code_compta;
                                         //print 'code_compta='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsupplieraccountancycodeifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
                                         $this->thirpartyobject->get_codecompta('supplier');
-                                        $newval=$this->thirpartyobject->code_compta_fournisseur;
-                                        if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                        $newval = $this->thirpartyobject->code_compta_fournisseur;
+                                        if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                         //print 'code_compta_fournisseur='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getrefifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto')
                                 {
-                                    $defaultref='';
+                                    $defaultref = '';
                                     // TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
-                                    $obj = empty($conf->global->PROJECT_TASK_ADDON)?'mod_task_simple':$conf->global->PROJECT_TASK_ADDON;
-                                    if (! empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
+                                    $obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
+                                    if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
                                     {
-                                        require_once DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
+                                        require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
                                         $modTask = new $obj;
-                                        $defaultref = $modTask->getNextValue(null,null);
+                                        $defaultref = $modTask->getNextValue(null, null);
                                     }
-                                    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
-                                    $newval=$defaultref;
+                                    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
+                                    $newval = $defaultref;
                                 }
 
 
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
                                 {
                                     $newval = price2num($newval);
                                 }
@@ -537,27 +537,27 @@ 
 						    }
 
 						    // Test regexp
-							if (! empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
+							if (!empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
 							{
 								// If test is "Must exist in a field@table"
-								if (preg_match('/^(.*)@(.*)$/',$objimport->array_import_regex[0][$val],$reg))
+								if (preg_match('/^(.*)@(.*)$/', $objimport->array_import_regex[0][$val], $reg))
 								{
-									$field=$reg[1];
-									$table=$reg[2];
+									$field = $reg[1];
+									$table = $reg[2];
 
 									// Load content of field@table into cache array
-									if (! is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
+									if (!is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
 									{
-										$sql="SELECT ".$field." as aliasfield FROM ".$table;
-										$resql=$this->db->query($sql);
+										$sql = "SELECT ".$field." as aliasfield FROM ".$table;
+										$resql = $this->db->query($sql);
 										if ($resql)
 										{
-											$num=$this->db->num_rows($resql);
-											$i=0;
+											$num = $this->db->num_rows($resql);
+											$i = 0;
 											while ($i < $num)
 											{
-												$obj=$this->db->fetch_object($resql);
-												if ($obj) $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
+												$obj = $this->db->fetch_object($resql);
+												if ($obj) $this->cachefieldtable[$field.'@'.$table][] = $obj->aliasfield;
 												$i++;
 											}
 										}
@@ -568,20 +568,20 @@ 
 									}
 
 									// Now we check cache is not empty (should not) and key is into cache
-									if (! is_array($this->cachefieldtable[$field.'@'.$table]) || ! in_array($newval,$this->cachefieldtable[$field.'@'.$table]))
+									if (!is_array($this->cachefieldtable[$field.'@'.$table]) || !in_array($newval, $this->cachefieldtable[$field.'@'.$table]))
 									{
-										$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorFieldValueNotIn',$key,$newval,$field,$table);
-										$this->errors[$error]['type']='FOREIGNKEY';
+										$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $table);
+										$this->errors[$error]['type'] = 'FOREIGNKEY';
 									    $errorforthistable++;
 										$error++;
 									}
 								}
 								// If test is just a static regex
-								else if (! preg_match('/'.$objimport->array_import_regex[0][$val].'/i',$newval))
+								else if (!preg_match('/'.$objimport->array_import_regex[0][$val].'/i', $newval))
 								{
 								    //if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
-									$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorWrongValueForField',$key,$newval,$objimport->array_import_regex[0][$val]);
-									$this->errors[$error]['type']='REGEX';
+									$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorWrongValueForField', $key, $newval, $objimport->array_import_regex[0][$val]);
+									$this->errors[$error]['type'] = 'REGEX';
 									$errorforthistable++;
 									$error++;
 								}
@@ -595,9 +595,9 @@ 
 						$listfields[] = $fieldname;
 
 						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
-						if (empty($newval) && $arrayrecord[($key-1)]['type'] < 0) {
-                            $listvalues[] = ($newval=='0'?$newval:"null");
-                        } elseif (empty($newval) && $arrayrecord[($key-1)]['type'] == 0) {
+						if (empty($newval) && $arrayrecord[($key - 1)]['type'] < 0) {
+                            $listvalues[] = ($newval == '0' ? $newval : "null");
+                        } elseif (empty($newval) && $arrayrecord[($key - 1)]['type'] == 0) {
                             $listvalues[] = "''";
                         } else {
                             $listvalues[] = "'".$this->db->escape($newval)."'";
@@ -610,19 +610,19 @@ 
 				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0]))
 				{
     				// Loop on each hidden fields to add them into listfields/listvalues
-				    foreach($objimport->array_import_fieldshidden[0] as $key => $val)
+				    foreach ($objimport->array_import_fieldshidden[0] as $key => $val)
     				{
-    				    if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue;    // Not a field of current table
+    				    if (!preg_match('/^'.preg_quote($alias).'\./', $key)) continue; // Not a field of current table
     				    if ($val == 'user->id')
     				    {
-    				        $listfields[] = preg_replace('/^'.preg_quote($alias).'\./','',$key);
+    				        $listfields[] = preg_replace('/^'.preg_quote($alias).'\./', '', $key);
     				        $listvalues[] = $user->id;
     				    }
-    				    elseif (preg_match('/^lastrowid-/',$val))
+    				    elseif (preg_match('/^lastrowid-/', $val))
     				    {
-    				        $tmp=explode('-',$val);
-    				        $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
-							$keyfield = preg_replace('/^'.preg_quote($alias).'\./','',$key);
+    				        $tmp = explode('-', $val);
+    				        $lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
+							$keyfield = preg_replace('/^'.preg_quote($alias).'\./', '', $key);
     				        $listfields[] = $keyfield;
                             $listvalues[] = $lastinsertid;
     				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
@@ -633,7 +633,7 @@ 
 
 				// If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
 				// so we can try to make the insert or update now.
-				if (! $errorforthistable)
+				if (!$errorforthistable)
 				{
 					//print "$alias/$tablename/$listfields/$listvalues<br>";
 					if (!empty($listfields))
@@ -652,21 +652,21 @@ 
 								$filters = array();
 								foreach ($updatekeys as $key) {
 									$col = $objimport->array_import_updatekeys[0][$key];
-									$key=preg_replace('/^.*\./i','',$key);
+									$key = preg_replace('/^.*\./i', '', $key);
 									$where[] = $key.' = '.$data[$key];
 									$filters[] = $col.' = '.$data[$key];
 								}
-								$sqlSelect.= ' WHERE '.implode(' AND ', $where);
+								$sqlSelect .= ' WHERE '.implode(' AND ', $where);
 
-								$resql=$this->db->query($sqlSelect);
-								if($resql) {
+								$resql = $this->db->query($sqlSelect);
+								if ($resql) {
 									$res = $this->db->fetch_object($resql);
-									if($resql->num_rows == 1) {
+									if ($resql->num_rows == 1) {
 										$lastinsertid = $res->rowid;
 										$last_insert_id_array[$tablename] = $lastinsertid;
-									} else if($resql->num_rows > 1) {
-										$this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', '));
-										$this->errors[$error]['type']='SQL';
+									} else if ($resql->num_rows > 1) {
+										$this->errors[$error]['lib'] = $langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', '));
+										$this->errors[$error]['type'] = 'SQL';
 										$error++;
 									} else {
 										// No record found with filters, insert will be tried below
@@ -675,8 +675,8 @@ 
 								else
 								{
 									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
+									$this->errors[$error]['lib'] = $this->db->lasterror();
+									$this->errors[$error]['type'] = 'SQL';
 									$error++;
 								}
 							} else {
@@ -687,13 +687,13 @@ 
 								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
 								$sqlSelect = 'SELECT rowid FROM '.$tablename;
 
-								if(empty($keyfield)) $keyfield = 'rowid';
+								if (empty($keyfield)) $keyfield = 'rowid';
 								$sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
 
-								$resql=$this->db->query($sqlSelect);
-								if($resql) {
+								$resql = $this->db->query($sqlSelect);
+								if ($resql) {
 									$res = $this->db->fetch_object($resql);
-									if($resql->num_rows == 1) {
+									if ($resql->num_rows == 1) {
 										// We have a row referencing this last foreign key, continue with UPDATE.
 									} else {
 										// No record found referencing this last foreign key,
@@ -704,8 +704,8 @@ 
 								else
 								{
 									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
+									$this->errors[$error]['lib'] = $this->db->lasterror();
+									$this->errors[$error]['type'] = 'SQL';
 									$error++;
 								}
 							}
@@ -719,24 +719,24 @@ 
 								foreach ($data as $key => $val) {
 									$set[] = $key.' = '.$val;
 								}
-								$sqlstart.= ' SET '.implode(', ', $set);
+								$sqlstart .= ' SET '.implode(', ', $set);
 
-								if(empty($keyfield)) $keyfield = 'rowid';
+								if (empty($keyfield)) $keyfield = 'rowid';
 								$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
 
 								$sql = $sqlstart.$sqlend;
 
 								// Run update request
-								$resql=$this->db->query($sql);
-								if($resql) {
+								$resql = $this->db->query($sql);
+								if ($resql) {
 									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
 									$updatedone = true;
 								}
 								else
 								{
 									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
+									$this->errors[$error]['lib'] = $this->db->lasterror();
+									$this->errors[$error]['type'] = 'SQL';
 									$error++;
 								}
 							}
@@ -747,13 +747,13 @@ 
 							// Build SQL INSERT request
 							$sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
 							$sqlend = ') VALUES('.implode(', ', $listvalues).", '".$importid."'";
-							if (! empty($tablewithentity_cache[$tablename])) {
-								$sqlstart.= ', entity';
-								$sqlend.= ', '.$conf->entity;
+							if (!empty($tablewithentity_cache[$tablename])) {
+								$sqlstart .= ', entity';
+								$sqlend .= ', '.$conf->entity;
 							}
-							if (! empty($objimport->array_import_tables_creator[0][$alias])) {
-								$sqlstart.= ', '.$objimport->array_import_tables_creator[0][$alias];
-								$sqlend.=', '.$user->id;
+							if (!empty($objimport->array_import_tables_creator[0][$alias])) {
+								$sqlstart .= ', '.$objimport->array_import_tables_creator[0][$alias];
+								$sqlend .= ', '.$user->id;
 							}
 							$sql = $sqlstart.$sqlend.')';
 							dol_syslog("import_csv.modules", LOG_DEBUG);
@@ -761,7 +761,7 @@ 
 							// Run insert request
 							if ($sql)
 							{
-								$resql=$this->db->query($sql);
+								$resql = $this->db->query($sql);
 								if ($resql)
 								{
 								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
@@ -770,8 +770,8 @@ 
 								else
 								{
 									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
+									$this->errors[$error]['lib'] = $this->db->lasterror();
+									$this->errors[$error]['type'] = 'SQL';
 									$error++;
 								}
 							}
@@ -786,8 +786,8 @@ 
 			    if ($error) break;
 			}
 
-			if($updatedone) $this->nbupdate++;
-			if($insertdone) $this->nbinsert++;
+			if ($updatedone) $this->nbupdate++;
+			if ($insertdone) $this->nbinsert++;
 		}
 
 		return 1;
@@ -802,5 +802,5 @@ 
  */
 function cleansep($value)
 {
-	return str_replace(array(',',';'),'/',$value);
+	return str_replace(array(',', ';'), '/', $value);
 };

Braces +117 added lines, -73 removed lines

@@ -114,7 +114,9 @@ 
 		$this->version_lib=DOL_VERSION;
 
 		$this->datatoimport=$datatoimport;
-		if (preg_match('/^societe_/',$datatoimport)) $this->thirpartyobject=new Societe($this->db);
+		if (preg_match('/^societe_/',$datatoimport)) {
+		    $this->thirpartyobject=new Societe($this->db);
+		}
 	}
 
 
@@ -199,8 +201,7 @@ 
 			$langs->load("errors");
 			$this->error=$langs->trans("ErrorFailToOpenFile",$file);
 			$ret=-1;
-		}
-		else
+		} else
 		{
 			$this->file=$file;
 		}
@@ -250,7 +251,9 @@ 
 		$arrayres=fgetcsv($this->handle,100000,$this->separator,$this->enclosure,$this->escape);
 
 		// End of file
-		if ($arrayres === false) return false;
+		if ($arrayres === false) {
+		    return false;
+		}
 
 		//var_dump($this->handle);
 		//var_dump($arrayres);exit;
@@ -259,27 +262,26 @@ 
 		{
 			foreach($arrayres as $key => $val)
 			{
-				if (! empty($conf->global->IMPORT_CSV_FORCE_CHARSET))	// Forced charset
+				if (! empty($conf->global->IMPORT_CSV_FORCE_CHARSET)) {
+				    // Forced charset
 				{
 					if (strtolower($conf->global->IMPORT_CSV_FORCE_CHARSET) == 'utf8')
 					{
 						$newarrayres[$key]['val']=$val;
+				}
 						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
-					}
-					else
+					} else
 					{
 						$newarrayres[$key]['val']=utf8_encode($val);
 						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
 					}
-				}
-				else	// Autodetect format (UTF8 or ISO)
+				} else	// Autodetect format (UTF8 or ISO)
 				{
 					if (utf8_check($val))
 					{
 						$newarrayres[$key]['val']=$val;
 						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
-					}
-					else
+					} else
 					{
 						$newarrayres[$key]['val']=utf8_encode($val);
 						$newarrayres[$key]['type']=(dol_strlen($val)?1:-1);	// If empty we considere it's null
@@ -347,8 +349,7 @@ 
 			$this->warnings[$warning]['lib']=$langs->trans('EmptyLine');
 			$this->warnings[$warning]['type']='EMPTY';
 			$warning++;
-		}
-		else
+		} else
 		{
 			$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
 			$updatedone = false;
@@ -364,19 +365,27 @@ 
 				$errorforthistable=0;
 
 				// Define $tablewithentity_cache[$tablename] if not already defined
-				if (! isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
+				if (! isset($tablewithentity_cache[$tablename])) {
+				    // keep this test with "isset"
 				{
 					dol_syslog("Check if table ".$tablename." has an entity field");
+				}
 					$resql=$this->db->DDLDescTable($tablename,'entity');
 					if ($resql)
 					{
 						$obj=$this->db->fetch_object($resql);
-						if ($obj) $tablewithentity_cache[$tablename]=1;		// table contains entity field
-						else $tablewithentity_cache[$tablename]=0;			// table does not contains entity field
+						if ($obj) {
+						    $tablewithentity_cache[$tablename]=1;
+						}
+						// table contains entity field
+						else {
+						    $tablewithentity_cache[$tablename]=0;
+						}
+						// table does not contains entity field
+					} else {
+					    dol_print_error($this->db);
 					}
-					else dol_print_error($this->db);
-				}
-				else
+				} else
 				{
 					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
@@ -388,13 +397,19 @@ 
 				    $fieldalias=preg_replace('/\..*$/i','',$val);
 				    $fieldname=preg_replace('/^.*\./i','',$val);
 
-				    if ($alias != $fieldalias) continue;    // Not a field of current table
+				    if ($alias != $fieldalias) {
+				        continue;
+				    }
+				    // Not a field of current table
 
 					if ($key <= $maxfields)
 					{
 						// Set $newval with value to insert and set $listvalues with sql request part for insert
 						$newval='';
-						if ($arrayrecord[($key-1)]['type'] > 0) $newval=$arrayrecord[($key-1)]['val'];    // If type of field into input file is not empty string (so defined into input file), we get value
+						if ($arrayrecord[($key-1)]['type'] > 0) {
+						    $newval=$arrayrecord[($key-1)]['val'];
+						}
+						// If type of field into input file is not empty string (so defined into input file), we get value
 
 						// Make some tests on $newval
 
@@ -420,20 +435,23 @@ 
                                 {
                                     // New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
                                     $isidorref='id';
-                                    if (! is_numeric($newval) && $newval != '' && ! preg_match('/^id:/i',$newval)) $isidorref='ref';
+                                    if (! is_numeric($newval) && $newval != '' && ! preg_match('/^id:/i',$newval)) {
+                                        $isidorref='ref';
+                                    }
                                     $newval=preg_replace('/^(id|ref):/i','',$newval);    // Remove id: or ref: that was used to force if field is id or ref
                                     //print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
 
-                                    if ($isidorref == 'ref')    // If value into input import file is a ref, we apply the function defined into descriptor
+                                    if ($isidorref == 'ref') {
+                                        // If value into input import file is a ref, we apply the function defined into descriptor
                                     {
                                         $file=(empty($objimport->array_import_convertvalue[0][$val]['classfile'])?$objimport->array_import_convertvalue[0][$val]['file']:$objimport->array_import_convertvalue[0][$val]['classfile']);
+                                    }
                                         $class=$objimport->array_import_convertvalue[0][$val]['class'];
                                         $method=$objimport->array_import_convertvalue[0][$val]['method'];
                                         if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
                                         	$newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
-                                        }
-                                        else
+                                        } else
 										{
                                             $resultload = dol_include_once($file);
                                             if (empty($resultload))
@@ -451,27 +469,32 @@ 
                                             }
                                             $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval]=$classinstance->id;
                                             //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
-                                            if ($classinstance->id != '')	// id may be 0, it is a found value
+                                            if ($classinstance->id != '') {
+                                                // id may be 0, it is a found value
                                             {
                                                 $newval=$classinstance->id;
                                             }
-                                            else
+                                            } else
                                             {
-                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldValueNotIn',$key,$newval,'code',$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                                else if (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldRefNotIn',$key,$newval,$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
-                                                else $this->errors[$error]['lib']='ErrorFieldValueNotIn';
+                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
+                                                    $this->errors[$error]['lib']=$langs->trans('ErrorFieldValueNotIn',$key,$newval,'code',$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+                                                } else if (!empty($objimport->array_import_convertvalue[0][$val]['element'])) {
+                                                    $this->errors[$error]['lib']=$langs->trans('ErrorFieldRefNotIn',$key,$newval,$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
+                                                } else {
+                                                    $this->errors[$error]['lib']='ErrorFieldValueNotIn';
+                                                }
                                                 $this->errors[$error]['type']='FOREIGNKEY';
                                                 $errorforthistable++;
                                                 $error++;
                                             }
                                         }
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='zeroifnull')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='zeroifnull')
                                 {
-                                    if (empty($newval)) $newval='0';
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifauto')
+                                    if (empty($newval)) {
+                                        $newval='0';
+                                    }
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -479,9 +502,11 @@ 
                                         $newval=$this->thirpartyobject->code_client;
                                         //print 'code_client='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsuppliercodeifauto')
+                                    if (empty($newval)) {
+                                        $arrayrecord[($key-1)]['type']=-1;
+                                    }
+                                    // If we get empty value, we will use "null"
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsuppliercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -489,9 +514,11 @@ 
                                         $newval=$this->thirpartyobject->code_fournisseur;
                                         //print 'code_fournisseur='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomeraccountancycodeifauto')
+                                    if (empty($newval)) {
+                                        $arrayrecord[($key-1)]['type']=-1;
+                                    }
+                                    // If we get empty value, we will use "null"
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomeraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -499,20 +526,27 @@ 
                                         $newval=$this->thirpartyobject->code_compta;
                                         //print 'code_compta='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsupplieraccountancycodeifauto')
+                                    if (empty($newval)) {
+                                        $arrayrecord[($key-1)]['type']=-1;
+                                    }
+                                    // If we get empty value, we will use "null"
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsupplieraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
                                         $this->thirpartyobject->get_codecompta('supplier');
                                         $newval=$this->thirpartyobject->code_compta_fournisseur;
-                                        if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                        if (empty($newval)) {
+                                            $arrayrecord[($key-1)]['type']=-1;
+                                        }
+                                        // If we get empty value, we will use "null"
                                         //print 'code_compta_fournisseur='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getrefifauto')
+                                    if (empty($newval)) {
+                                        $arrayrecord[($key-1)]['type']=-1;
+                                    }
+                                    // If we get empty value, we will use "null"
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getrefifauto')
                                 {
                                     $defaultref='';
                                     // TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
@@ -523,12 +557,11 @@ 
                                         $modTask = new $obj;
                                         $defaultref = $modTask->getNextValue(null,null);
                                     }
-                                    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
+                                    if (is_numeric($defaultref) && $defaultref <= 0) {
+                                        $defaultref='';
+                                    }
                                     $newval=$defaultref;
-                                }
-
-
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
                                 {
                                     $newval = price2num($newval);
                                 }
@@ -546,9 +579,11 @@ 
 									$table=$reg[2];
 
 									// Load content of field@table into cache array
-									if (! is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
+									if (! is_array($this->cachefieldtable[$field.'@'.$table])) {
+									    // If content of field@table not already loaded into cache
 									{
 										$sql="SELECT ".$field." as aliasfield FROM ".$table;
+									}
 										$resql=$this->db->query($sql);
 										if ($resql)
 										{
@@ -557,11 +592,12 @@ 
 											while ($i < $num)
 											{
 												$obj=$this->db->fetch_object($resql);
-												if ($obj) $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
+												if ($obj) {
+												    $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
+												}
 												$i++;
 											}
-										}
-										else
+										} else
 										{
 											dol_print_error($this->db);
 										}
@@ -612,13 +648,15 @@ 
     				// Loop on each hidden fields to add them into listfields/listvalues
 				    foreach($objimport->array_import_fieldshidden[0] as $key => $val)
     				{
-    				    if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue;    // Not a field of current table
+    				    if (! preg_match('/^'.preg_quote($alias).'\./', $key)) {
+    				        continue;
+    				    }
+    				    // Not a field of current table
     				    if ($val == 'user->id')
     				    {
     				        $listfields[] = preg_replace('/^'.preg_quote($alias).'\./','',$key);
     				        $listvalues[] = $user->id;
-    				    }
-    				    elseif (preg_match('/^lastrowid-/',$val))
+    				    } elseif (preg_match('/^lastrowid-/',$val))
     				    {
     				        $tmp=explode('-',$val);
     				        $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
@@ -671,8 +709,7 @@ 
 									} else {
 										// No record found with filters, insert will be tried below
 									}
-								}
-								else
+								} else
 								{
 									//print 'E';
 									$this->errors[$error]['lib']=$this->db->lasterror();
@@ -687,7 +724,9 @@ 
 								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
 								$sqlSelect = 'SELECT rowid FROM '.$tablename;
 
-								if(empty($keyfield)) $keyfield = 'rowid';
+								if(empty($keyfield)) {
+								    $keyfield = 'rowid';
+								}
 								$sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
 
 								$resql=$this->db->query($sqlSelect);
@@ -700,8 +739,7 @@ 
 										// force $lastinsertid to 0 so we INSERT below.
 										$lastinsertid = 0;
 									}
-								}
-								else
+								} else
 								{
 									//print 'E';
 									$this->errors[$error]['lib']=$this->db->lasterror();
@@ -721,7 +759,9 @@ 
 								}
 								$sqlstart.= ' SET '.implode(', ', $set);
 
-								if(empty($keyfield)) $keyfield = 'rowid';
+								if(empty($keyfield)) {
+								    $keyfield = 'rowid';
+								}
 								$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
 
 								$sql = $sqlstart.$sqlend;
@@ -731,8 +771,7 @@ 
 								if($resql) {
 									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
 									$updatedone = true;
-								}
-								else
+								} else
 								{
 									//print 'E';
 									$this->errors[$error]['lib']=$this->db->lasterror();
@@ -766,8 +805,7 @@ 
 								{
 								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
 								    $insertdone = true;
-								}
-								else
+								} else
 								{
 									//print 'E';
 									$this->errors[$error]['lib']=$this->db->lasterror();
@@ -783,11 +821,17 @@ 
 					}*/
 				}
 
-			    if ($error) break;
+			    if ($error) {
+			        break;
+			    }
 			}
 
-			if($updatedone) $this->nbupdate++;
-			if($insertdone) $this->nbinsert++;
+			if($updatedone) {
+			    $this->nbupdate++;
+			}
+			if($insertdone) {
+			    $this->nbinsert++;
+			}
 		}
 
 		return 1;

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

Indentation +31 added lines, -31 removed lines

@@ -33,44 +33,44 @@
 class modClickToDial extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-		$this->numero = 58;
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->numero = 58;
 
-		$this->family = "interface";
-		// 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 du Click To Dial";
+        $this->family = "interface";
+        // 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 du Click To Dial";
 
-		$this->version = 'dolibarr';		// 'development' or 'experimental' or 'dolibarr' or version
+        $this->version = 'dolibarr';		// 'development' or 'experimental' or 'dolibarr' or version
 
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='phoning';
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='phoning';
 
-		// Data directories to create when module is enabled
-		$this->dirs = array();
+        // Data directories to create when module is enabled
+        $this->dirs = array();
 
-		// Dependencies
-		$this->depends = array();
-		$this->requiredby = array();
+        // Dependencies
+        $this->depends = array();
+        $this->requiredby = array();
 
-		// Config pages
-		$this->config_page_url = array("clicktodial.php");
+        // Config pages
+        $this->config_page_url = array("clicktodial.php");
 
-		// Constants
-		$this->const = array();
+        // Constants
+        $this->const = array();
 
-		// Boxes
-		$this->boxes = array();
+        // Boxes
+        $this->boxes = array();
 
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'clicktodial';
-	}
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'clicktodial';
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
  *	\brief      Fichier de description et activation du module de click to Dial
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -45,13 +45,13 @@ 
 
 		$this->family = "interface";
 		// 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 du Click To Dial";
 
-		$this->version = 'dolibarr';		// 'development' or 'experimental' or 'dolibarr' or version
+		$this->version = 'dolibarr'; // 'development' or 'experimental' or 'dolibarr' or version
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='phoning';
+		$this->picto = 'phoning';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array();

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

Indentation +219 added lines, -219 removed lines

@@ -32,161 +32,161 @@ 
  */
 class modAccounting extends DolibarrModules
 {
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf;
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf;
 
-		$this->db = $db;
-		$this->numero = 50400;
+        $this->db = $db;
+        $this->numero = 50400;
 
-		$this->family = "financial";
-		$this->module_position = '61';
-		// 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 = "Advanced accounting management";
+        $this->family = "financial";
+        $this->module_position = '61';
+        // 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 = "Advanced accounting management";
 
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
-		$this->version = 'dolibarr';
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
+        $this->version = 'dolibarr';
 
-		$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
-		$this->picto = 'accounting';
+        $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+        $this->picto = 'accounting';
 
-		// Data directories to create when module is enabled
-		$this->dirs = array('/accounting/temp');
+        // Data directories to create when module is enabled
+        $this->dirs = array('/accounting/temp');
 
-		// Config pages
-		$this->config_page_url = array();
+        // Config pages
+        $this->config_page_url = array();
 
-		// Dependencies
-		$this->depends = array("modFacture","modBanque","modTax"); // List of modules id that must be enabled if this module is enabled
-		$this->requiredby = array(); // List of modules id to disable if this one is disabled
-		$this->conflictwith = array("modComptabilite"); // List of modules are in conflict with this module
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3, 9); // Minimum version of Dolibarr required by module
-		$this->langfiles = array("accountancy","compta");
+        // Dependencies
+        $this->depends = array("modFacture","modBanque","modTax"); // List of modules id that must be enabled if this module is enabled
+        $this->requiredby = array(); // List of modules id to disable if this one is disabled
+        $this->conflictwith = array("modComptabilite"); // List of modules are in conflict with this module
+        $this->phpmin = array(5, 4); // Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(3, 9); // Minimum version of Dolibarr required by module
+        $this->langfiles = array("accountancy","compta");
 
-		// Constants
-		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-		// );
-		$this->const = array();
-		$this->const[1] = array(
-				"MAIN_COMPANY_CODE_ALWAYS_REQUIRED",
-				"chaine",
-				"1",
-				"With this constants on, third party code is always required whatever is numbering module behaviour", 0, 'current', 1
-		);
-		$this->const[2] = array(
-				"MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED",
-				"chaine",
-				"1",
-				"With this constants on, bank account number is always required", 0, 'current', 1
-		);
-		$this->const[3] = array(
-				"ACCOUNTING_ACCOUNT_SUSPENSE",
-				"chaine",
-				"471",
-				"", 0, 'current', 0
-		);
-		$this->const[4] = array(
-				"ACCOUNTING_ACCOUNT_TRANSFER_CASH",
-				"chaine",
-				"58",
-				"", 0, 'current', 0
-		);
-		$this->const[5] = array(
-				"CHARTOFACCOUNTS",
-				"chaine",
-				"2",
-				"", 0, 'current', 0
-		);
-		$this->const[6] = array(
-				"ACCOUNTING_EXPORT_MODELCSV",
-				"chaine",
-				"1",
-				"", 0, 'current', 0
-		);
-		$this->const[7] = array(
-				"ACCOUNTING_LENGTH_GACCOUNT",
-				"chaine",
-				"",
-				"", 0, 'current', 0
-		);
-		$this->const[8] = array(
-				"ACCOUNTING_LENGTH_AACCOUNT",
-				"chaine",
-				"",
-				"", 0, 'current', 0
-		);
-		$this->const[9] = array(
-				"ACCOUNTING_LIST_SORT_VENTILATION_TODO",
-				"yesno",
-				"1",
-				"", 0, 'current', 0
-		);
-		$this->const[10] = array(
-				"ACCOUNTING_LIST_SORT_VENTILATION_DONE",
-				"yesno",
-				"1",
-				"", 0, 'current', 0
-		);
-		$this->const[11] = array (
-				"ACCOUNTING_EXPORT_DATE",
-				"chaine",
-				"%d%m%Y",
-				"", 0, 'current', 0
-		);
-		$this->const[12] = array(
-				"ACCOUNTING_EXPORT_SEPARATORCSV",
-				"string",
-				",",
-				"", 0, 'current', 0
-		);
-		$this->const[13] = array(
-				"ACCOUNTING_EXPORT_FORMAT",
-				"chaine",
-				"csv",
-				"", 0, 'current', 0
-		);
+        // Constants
+        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+        // Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+        //                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+        // );
+        $this->const = array();
+        $this->const[1] = array(
+                "MAIN_COMPANY_CODE_ALWAYS_REQUIRED",
+                "chaine",
+                "1",
+                "With this constants on, third party code is always required whatever is numbering module behaviour", 0, 'current', 1
+        );
+        $this->const[2] = array(
+                "MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED",
+                "chaine",
+                "1",
+                "With this constants on, bank account number is always required", 0, 'current', 1
+        );
+        $this->const[3] = array(
+                "ACCOUNTING_ACCOUNT_SUSPENSE",
+                "chaine",
+                "471",
+                "", 0, 'current', 0
+        );
+        $this->const[4] = array(
+                "ACCOUNTING_ACCOUNT_TRANSFER_CASH",
+                "chaine",
+                "58",
+                "", 0, 'current', 0
+        );
+        $this->const[5] = array(
+                "CHARTOFACCOUNTS",
+                "chaine",
+                "2",
+                "", 0, 'current', 0
+        );
+        $this->const[6] = array(
+                "ACCOUNTING_EXPORT_MODELCSV",
+                "chaine",
+                "1",
+                "", 0, 'current', 0
+        );
+        $this->const[7] = array(
+                "ACCOUNTING_LENGTH_GACCOUNT",
+                "chaine",
+                "",
+                "", 0, 'current', 0
+        );
+        $this->const[8] = array(
+                "ACCOUNTING_LENGTH_AACCOUNT",
+                "chaine",
+                "",
+                "", 0, 'current', 0
+        );
+        $this->const[9] = array(
+                "ACCOUNTING_LIST_SORT_VENTILATION_TODO",
+                "yesno",
+                "1",
+                "", 0, 'current', 0
+        );
+        $this->const[10] = array(
+                "ACCOUNTING_LIST_SORT_VENTILATION_DONE",
+                "yesno",
+                "1",
+                "", 0, 'current', 0
+        );
+        $this->const[11] = array (
+                "ACCOUNTING_EXPORT_DATE",
+                "chaine",
+                "%d%m%Y",
+                "", 0, 'current', 0
+        );
+        $this->const[12] = array(
+                "ACCOUNTING_EXPORT_SEPARATORCSV",
+                "string",
+                ",",
+                "", 0, 'current', 0
+        );
+        $this->const[13] = array(
+                "ACCOUNTING_EXPORT_FORMAT",
+                "chaine",
+                "csv",
+                "", 0, 'current', 0
+        );
 
-		// Tabs
-		$this->tabs = array();
+        // Tabs
+        $this->tabs = array();
 
-		// Css
-		$this->module_parts = array();
+        // Css
+        $this->module_parts = array();
 
-		// Boxes
-		$this->boxes = array();
+        // Boxes
+        $this->boxes = array();
 
-		// Permissions
-		$this->rights_class = 'accounting';
+        // Permissions
+        $this->rights_class = 'accounting';
 
-		$this->rights = array(); // Permission array used by this module
-		$r = 0;
+        $this->rights = array(); // Permission array used by this module
+        $r = 0;
 
-		$this->rights[$r][0] = 50440;
-		$this->rights[$r][1] = 'Manage chart of accounts, setup of accountancy';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'chartofaccount';
-		$this->rights[$r][5] = '';
-		$r++;
+        $this->rights[$r][0] = 50440;
+        $this->rights[$r][1] = 'Manage chart of accounts, setup of accountancy';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'chartofaccount';
+        $this->rights[$r][5] = '';
+        $r++;
 
-		$this->rights[$r][0] = 50401;
-		$this->rights[$r][1] = 'Bind products and invoices with accounting accounts';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'bind';
-		$this->rights[$r][5] = 'write';
-		$r++;
+        $this->rights[$r][0] = 50401;
+        $this->rights[$r][1] = 'Bind products and invoices with accounting accounts';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'bind';
+        $this->rights[$r][5] = 'write';
+        $r++;
 
-		/*
+        /*
 		$this->rights[$r][0] = 50402;
 		$this->rights[$r][1] = 'Make binding with products and invoices';
 		$this->rights[$r][2] = 'r';
@@ -196,96 +196,96 @@ 
 		$r++;
         */
 
-		$this->rights[$r][0] = 50411;
-		$this->rights[$r][1] = 'Read operations in Ledger';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'mouvements';
-		$this->rights[$r][5] = 'lire';
-		$r++;
+        $this->rights[$r][0] = 50411;
+        $this->rights[$r][1] = 'Read operations in Ledger';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'mouvements';
+        $this->rights[$r][5] = 'lire';
+        $r++;
 
-		$this->rights[$r][0] = 50412;
-		$this->rights[$r][1] = 'Write/Edit operations in Ledger';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'mouvements';
-		$this->rights[$r][5] = 'creer';
-		$r++;
+        $this->rights[$r][0] = 50412;
+        $this->rights[$r][1] = 'Write/Edit operations in Ledger';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'mouvements';
+        $this->rights[$r][5] = 'creer';
+        $r++;
 
-		$this->rights[$r][0] = 50420;
-		$this->rights[$r][1] = 'Report and export reports (turnover, balance, journals, ledger)';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'comptarapport';
-		$this->rights[$r][5] = 'lire';
-		$r++;
+        $this->rights[$r][0] = 50420;
+        $this->rights[$r][1] = 'Report and export reports (turnover, balance, journals, ledger)';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'comptarapport';
+        $this->rights[$r][5] = 'lire';
+        $r++;
 
-		$this->rights[$r][0] = 50430;
-		$this->rights[$r][1] = 'Define and close a fiscal year';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'fiscalyear';
-		$this->rights[$r][5] = '';
-		$r++;
+        $this->rights[$r][0] = 50430;
+        $this->rights[$r][1] = 'Define and close a fiscal year';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'fiscalyear';
+        $this->rights[$r][5] = '';
+        $r++;
 
 
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
 
-		// Exports
-		//--------
-		$r=0;
+        // Exports
+        //--------
+        $r=0;
 
-		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='Chartofaccounts';
-		$this->export_icon[$r]='Accounting';
-		$this->export_permission[$r]=array(array("accounting","chartofaccount"));
-		$this->export_fields_array[$r]=array('ac.rowid'=>'ChartofaccountsId','ac.pcg_version'=>'Chartofaccounts','aa.rowid'=>'Id','aa.account_number'=>"AccountAccounting",'aa.label'=>"Label",'aa.account_parent'=>"Accountparent",'aa.pcg_type'=>"Pcgtype",'aa.pcg_subtype'=>'Pcgsubtype','aa.active'=>'Status');
-		$this->export_TypeFields_array[$r]=array('ac.rowid'=>'List:accounting_system:pcg_version','aa.account_number'=>"Text",'aa.label'=>"Text",'aa.pcg_type'=>'Text','aa.pcg_subtype'=>'Text','aa.active'=>'Status');
-		$this->export_entities_array[$r]=array('ac.rowid'=>"Accounting",'ac.pcg_version'=>"Accounting",'aa.rowid'=>'Accounting','aa.account_number'=>"Accounting",'aa.label'=>"Accounting",'aa.accountparent'=>"Accounting",'aa.pcg_type'=>"Accounting",'aa.pcgsubtype'=>"Accounting",'aa_active'=>"Accounting");
+        $r++;
+        $this->export_code[$r]=$this->rights_class.'_'.$r;
+        $this->export_label[$r]='Chartofaccounts';
+        $this->export_icon[$r]='Accounting';
+        $this->export_permission[$r]=array(array("accounting","chartofaccount"));
+        $this->export_fields_array[$r]=array('ac.rowid'=>'ChartofaccountsId','ac.pcg_version'=>'Chartofaccounts','aa.rowid'=>'Id','aa.account_number'=>"AccountAccounting",'aa.label'=>"Label",'aa.account_parent'=>"Accountparent",'aa.pcg_type'=>"Pcgtype",'aa.pcg_subtype'=>'Pcgsubtype','aa.active'=>'Status');
+        $this->export_TypeFields_array[$r]=array('ac.rowid'=>'List:accounting_system:pcg_version','aa.account_number'=>"Text",'aa.label'=>"Text",'aa.pcg_type'=>'Text','aa.pcg_subtype'=>'Text','aa.active'=>'Status');
+        $this->export_entities_array[$r]=array('ac.rowid'=>"Accounting",'ac.pcg_version'=>"Accounting",'aa.rowid'=>'Accounting','aa.account_number'=>"Accounting",'aa.label'=>"Accounting",'aa.accountparent'=>"Accounting",'aa.pcg_type'=>"Accounting",'aa.pcgsubtype'=>"Accounting",'aa_active'=>"Accounting");
 
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'accounting_account as aa, '.MAIN_DB_PREFIX.'accounting_system as ac';
-		$this->export_sql_end[$r] .=' WHERE ac.pcg_version = aa.fk_pcg_version AND aa.entity IN ('.getEntity('accounting').') ';
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'accounting_account as aa, '.MAIN_DB_PREFIX.'accounting_system as ac';
+        $this->export_sql_end[$r] .=' WHERE ac.pcg_version = aa.fk_pcg_version AND aa.entity IN ('.getEntity('accounting').') ';
 
 
-		// Imports
-		//--------
-		$r=0;
+        // Imports
+        //--------
+        $r=0;
 
-		// General ledger
-		$r++;
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
-		$this->import_label[$r]='ImportAccountingEntries';
-		$this->import_icon[$r]=$this->picto;
-		$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('b'=>MAIN_DB_PREFIX.'accounting_bookkeeping');	// List of tables to insert into (insert done in same order)
-		$this->import_fields_array[$r]=array('b.doc_date'=>"Docdate",'b.code_journal'=>'Codejournal','b.numero_compte'=>'AccountAccountingShort','b.label_operation'=>'LabelOperation','b.debit'=>"Debit",'b.credit'=>"Credit",'b.date_creation'=>"DateCreation");
-		$this->import_fieldshidden_array[$r]=array('b.fk_user'=>'user->id');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
-		$this->import_convertvalue_array[$r]=array(
-				't.fk_projet'=>array('rule'=>'fetchidfromref','classfile'=>'/projet/class/project.class.php','class'=>'Project','method'=>'fetch','element'=>'Project'),
-				't.ref'=>array('rule'=>'getrefifauto')
-		);
-		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
-		$this->import_regex_array[$r]=array('b.doc_date'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
-		//$this->import_examplevalues_array[$r]=array('t.fk_projet'=>'MyProjectRef','t.ref'=>"auto or TK2010-1234",'t.label'=>"My task",'t.progress'=>"0 (not started) to 100 (finished)",'t.datec'=>'1972-10-10','t.note_private'=>"My private note",'t.note_public'=>"My public note");
+        // General ledger
+        $r++;
+        $this->import_code[$r]=$this->rights_class.'_'.$r;
+        $this->import_label[$r]='ImportAccountingEntries';
+        $this->import_icon[$r]=$this->picto;
+        $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('b'=>MAIN_DB_PREFIX.'accounting_bookkeeping');	// List of tables to insert into (insert done in same order)
+        $this->import_fields_array[$r]=array('b.doc_date'=>"Docdate",'b.code_journal'=>'Codejournal','b.numero_compte'=>'AccountAccountingShort','b.label_operation'=>'LabelOperation','b.debit'=>"Debit",'b.credit'=>"Credit",'b.date_creation'=>"DateCreation");
+        $this->import_fieldshidden_array[$r]=array('b.fk_user'=>'user->id');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+        $this->import_convertvalue_array[$r]=array(
+                't.fk_projet'=>array('rule'=>'fetchidfromref','classfile'=>'/projet/class/project.class.php','class'=>'Project','method'=>'fetch','element'=>'Project'),
+                't.ref'=>array('rule'=>'getrefifauto')
+        );
+        //$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
+        $this->import_regex_array[$r]=array('b.doc_date'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
+        //$this->import_examplevalues_array[$r]=array('t.fk_projet'=>'MyProjectRef','t.ref'=>"auto or TK2010-1234",'t.label'=>"My task",'t.progress'=>"0 (not started) to 100 (finished)",'t.datec'=>'1972-10-10','t.note_private'=>"My private note",'t.note_public'=>"My public note");
 
-		// Chart of accounts
-		$r++;
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
-		$this->import_label[$r]="Chartofaccounts"; // Translation key
-		$this->import_icon[$r]=$this->picto;
-		$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('aa'=>MAIN_DB_PREFIX.'accounting_account');
-		$this->import_tables_creator_array[$r]=array('aa'=>'fk_user_author');    // Fields to store import user id
-		$this->import_fields_array[$r]=array('aa.fk_pcg_version'=>"Chartofaccounts*",'aa.account_number'=>"AccountAccounting*",'aa.label'=>"Label*",'aa.account_parent'=>"Accountparent","aa.fk_accounting_category"=>"AccountingCategory","aa.pcg_type"=>"Pcgtype*",'aa.pcg_subtype'=>'Pcgsubtype*','aa.active'=>'Status*','aa.datec'=>"DateCreation");
-		$this->import_regex_array[$r]=array('aa.fk_pcg_version'=>'pcg_version@'.MAIN_DB_PREFIX.'accounting_system','aa.account_number'=>'^\d{1,32}$','aa.label'=>'^.{1,255}$','aa.account_parent'=>'^\d{0,32}$','aa.fk_accounting_category'=>'rowid@'.MAIN_DB_PREFIX.'c_accounting_category','aa.pcg_type'=>'^.{1,20}$','aa.pcg_subtype'=>'^.{1,20}$','aa.active'=>'^0|1$','aa.datec'=>'^\d{4}-\d{2}-\d{2}$');
-		$this->import_convertvalue_array[$r]=array(
-			'aa.fk_accounting_category'=>array('rule'=>'fetchidfromcodeorlabel','classfile'=>'/accountancy/class/accountancycategory.class.php','class'=>'AccountancyCategory','method'=>'fetch','dict'=>'DictionaryAccountancyCategory'),
-			'aa.account_parent'=>array('rule'=>'zeroifnull'),
-		);
-		$this->import_examplevalues_array[$r]=array('aa.fk_pcg_version'=>"PCG99-ABREGE",'aa.account_number'=>"707",'aa.label'=>"Product sales",'aa.account_parent'=>"1407","aa.fk_accounting_category"=>"","aa.pcg_type"=>"PROD",'aa.pcg_subtype'=>'PRODUCT','aa.active'=>'1','aa.datec'=>"2017-04-28");
-	}
+        // Chart of accounts
+        $r++;
+        $this->import_code[$r]=$this->rights_class.'_'.$r;
+        $this->import_label[$r]="Chartofaccounts"; // Translation key
+        $this->import_icon[$r]=$this->picto;
+        $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('aa'=>MAIN_DB_PREFIX.'accounting_account');
+        $this->import_tables_creator_array[$r]=array('aa'=>'fk_user_author');    // Fields to store import user id
+        $this->import_fields_array[$r]=array('aa.fk_pcg_version'=>"Chartofaccounts*",'aa.account_number'=>"AccountAccounting*",'aa.label'=>"Label*",'aa.account_parent'=>"Accountparent","aa.fk_accounting_category"=>"AccountingCategory","aa.pcg_type"=>"Pcgtype*",'aa.pcg_subtype'=>'Pcgsubtype*','aa.active'=>'Status*','aa.datec'=>"DateCreation");
+        $this->import_regex_array[$r]=array('aa.fk_pcg_version'=>'pcg_version@'.MAIN_DB_PREFIX.'accounting_system','aa.account_number'=>'^\d{1,32}$','aa.label'=>'^.{1,255}$','aa.account_parent'=>'^\d{0,32}$','aa.fk_accounting_category'=>'rowid@'.MAIN_DB_PREFIX.'c_accounting_category','aa.pcg_type'=>'^.{1,20}$','aa.pcg_subtype'=>'^.{1,20}$','aa.active'=>'^0|1$','aa.datec'=>'^\d{4}-\d{2}-\d{2}$');
+        $this->import_convertvalue_array[$r]=array(
+            'aa.fk_accounting_category'=>array('rule'=>'fetchidfromcodeorlabel','classfile'=>'/accountancy/class/accountancycategory.class.php','class'=>'AccountancyCategory','method'=>'fetch','dict'=>'DictionaryAccountancyCategory'),
+            'aa.account_parent'=>array('rule'=>'zeroifnull'),
+        );
+        $this->import_examplevalues_array[$r]=array('aa.fk_pcg_version'=>"PCG99-ABREGE",'aa.account_number'=>"707",'aa.label'=>"Product sales",'aa.account_parent'=>"1407","aa.fk_accounting_category"=>"","aa.pcg_type"=>"PROD",'aa.pcg_subtype'=>'PRODUCT','aa.active'=>'1','aa.datec'=>"2017-04-28");
+    }
 }

Spacing +39 added lines, -39 removed lines

@@ -25,7 +25,7 @@ 
  * \ingroup		Advanced accountancy
  * \brief		Module to activate Accounting Expert module
  */
-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 accounting expert
@@ -53,7 +53,7 @@ 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
 		$this->version = 'dolibarr';
 
-		$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->picto = 'accounting';
 
 		// Data directories to create when module is enabled
@@ -63,12 +63,12 @@ 
 		$this->config_page_url = array();
 
 		// Dependencies
-		$this->depends = array("modFacture","modBanque","modTax"); // List of modules id that must be enabled if this module is enabled
+		$this->depends = array("modFacture", "modBanque", "modTax"); // List of modules id that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of modules id to disable if this one is disabled
 		$this->conflictwith = array("modComptabilite"); // List of modules are in conflict with this module
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3, 9); // Minimum version of Dolibarr required by module
-		$this->langfiles = array("accountancy","compta");
+		$this->langfiles = array("accountancy", "compta");
 
 		// Constants
 		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
@@ -136,7 +136,7 @@ 
 				"1",
 				"", 0, 'current', 0
 		);
-		$this->const[11] = array (
+		$this->const[11] = array(
 				"ACCOUNTING_EXPORT_DATE",
 				"chaine",
 				"%d%m%Y",
@@ -231,61 +231,61 @@ 
 
 		// 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]='Chartofaccounts';
-		$this->export_icon[$r]='Accounting';
-		$this->export_permission[$r]=array(array("accounting","chartofaccount"));
-		$this->export_fields_array[$r]=array('ac.rowid'=>'ChartofaccountsId','ac.pcg_version'=>'Chartofaccounts','aa.rowid'=>'Id','aa.account_number'=>"AccountAccounting",'aa.label'=>"Label",'aa.account_parent'=>"Accountparent",'aa.pcg_type'=>"Pcgtype",'aa.pcg_subtype'=>'Pcgsubtype','aa.active'=>'Status');
-		$this->export_TypeFields_array[$r]=array('ac.rowid'=>'List:accounting_system:pcg_version','aa.account_number'=>"Text",'aa.label'=>"Text",'aa.pcg_type'=>'Text','aa.pcg_subtype'=>'Text','aa.active'=>'Status');
-		$this->export_entities_array[$r]=array('ac.rowid'=>"Accounting",'ac.pcg_version'=>"Accounting",'aa.rowid'=>'Accounting','aa.account_number'=>"Accounting",'aa.label'=>"Accounting",'aa.accountparent'=>"Accounting",'aa.pcg_type'=>"Accounting",'aa.pcgsubtype'=>"Accounting",'aa_active'=>"Accounting");
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'Chartofaccounts';
+		$this->export_icon[$r] = 'Accounting';
+		$this->export_permission[$r] = array(array("accounting", "chartofaccount"));
+		$this->export_fields_array[$r] = array('ac.rowid'=>'ChartofaccountsId', 'ac.pcg_version'=>'Chartofaccounts', 'aa.rowid'=>'Id', 'aa.account_number'=>"AccountAccounting", 'aa.label'=>"Label", 'aa.account_parent'=>"Accountparent", 'aa.pcg_type'=>"Pcgtype", 'aa.pcg_subtype'=>'Pcgsubtype', 'aa.active'=>'Status');
+		$this->export_TypeFields_array[$r] = array('ac.rowid'=>'List:accounting_system:pcg_version', 'aa.account_number'=>"Text", 'aa.label'=>"Text", 'aa.pcg_type'=>'Text', 'aa.pcg_subtype'=>'Text', 'aa.active'=>'Status');
+		$this->export_entities_array[$r] = array('ac.rowid'=>"Accounting", 'ac.pcg_version'=>"Accounting", 'aa.rowid'=>'Accounting', 'aa.account_number'=>"Accounting", 'aa.label'=>"Accounting", 'aa.accountparent'=>"Accounting", 'aa.pcg_type'=>"Accounting", 'aa.pcgsubtype'=>"Accounting", 'aa_active'=>"Accounting");
 
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'accounting_account as aa, '.MAIN_DB_PREFIX.'accounting_system as ac';
-		$this->export_sql_end[$r] .=' WHERE ac.pcg_version = aa.fk_pcg_version AND aa.entity IN ('.getEntity('accounting').') ';
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'accounting_account as aa, '.MAIN_DB_PREFIX.'accounting_system as ac';
+		$this->export_sql_end[$r] .= ' WHERE ac.pcg_version = aa.fk_pcg_version AND aa.entity IN ('.getEntity('accounting').') ';
 
 
 		// Imports
 		//--------
-		$r=0;
+		$r = 0;
 
 		// General ledger
 		$r++;
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
-		$this->import_label[$r]='ImportAccountingEntries';
-		$this->import_icon[$r]=$this->picto;
-		$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('b'=>MAIN_DB_PREFIX.'accounting_bookkeeping');	// List of tables to insert into (insert done in same order)
-		$this->import_fields_array[$r]=array('b.doc_date'=>"Docdate",'b.code_journal'=>'Codejournal','b.numero_compte'=>'AccountAccountingShort','b.label_operation'=>'LabelOperation','b.debit'=>"Debit",'b.credit'=>"Credit",'b.date_creation'=>"DateCreation");
-		$this->import_fieldshidden_array[$r]=array('b.fk_user'=>'user->id');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
-		$this->import_convertvalue_array[$r]=array(
-				't.fk_projet'=>array('rule'=>'fetchidfromref','classfile'=>'/projet/class/project.class.php','class'=>'Project','method'=>'fetch','element'=>'Project'),
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = 'ImportAccountingEntries';
+		$this->import_icon[$r] = $this->picto;
+		$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('b'=>MAIN_DB_PREFIX.'accounting_bookkeeping'); // List of tables to insert into (insert done in same order)
+		$this->import_fields_array[$r] = array('b.doc_date'=>"Docdate", 'b.code_journal'=>'Codejournal', 'b.numero_compte'=>'AccountAccountingShort', 'b.label_operation'=>'LabelOperation', 'b.debit'=>"Debit", 'b.credit'=>"Credit", 'b.date_creation'=>"DateCreation");
+		$this->import_fieldshidden_array[$r] = array('b.fk_user'=>'user->id'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+		$this->import_convertvalue_array[$r] = array(
+				't.fk_projet'=>array('rule'=>'fetchidfromref', 'classfile'=>'/projet/class/project.class.php', 'class'=>'Project', 'method'=>'fetch', 'element'=>'Project'),
 				't.ref'=>array('rule'=>'getrefifauto')
 		);
 		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
-		$this->import_regex_array[$r]=array('b.doc_date'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
+		$this->import_regex_array[$r] = array('b.doc_date'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
 		//$this->import_examplevalues_array[$r]=array('t.fk_projet'=>'MyProjectRef','t.ref'=>"auto or TK2010-1234",'t.label'=>"My task",'t.progress'=>"0 (not started) to 100 (finished)",'t.datec'=>'1972-10-10','t.note_private'=>"My private note",'t.note_public'=>"My public note");
 
 		// Chart of accounts
 		$r++;
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
-		$this->import_label[$r]="Chartofaccounts"; // Translation key
-		$this->import_icon[$r]=$this->picto;
-		$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('aa'=>MAIN_DB_PREFIX.'accounting_account');
-		$this->import_tables_creator_array[$r]=array('aa'=>'fk_user_author');    // Fields to store import user id
-		$this->import_fields_array[$r]=array('aa.fk_pcg_version'=>"Chartofaccounts*",'aa.account_number'=>"AccountAccounting*",'aa.label'=>"Label*",'aa.account_parent'=>"Accountparent","aa.fk_accounting_category"=>"AccountingCategory","aa.pcg_type"=>"Pcgtype*",'aa.pcg_subtype'=>'Pcgsubtype*','aa.active'=>'Status*','aa.datec'=>"DateCreation");
-		$this->import_regex_array[$r]=array('aa.fk_pcg_version'=>'pcg_version@'.MAIN_DB_PREFIX.'accounting_system','aa.account_number'=>'^\d{1,32}$','aa.label'=>'^.{1,255}$','aa.account_parent'=>'^\d{0,32}$','aa.fk_accounting_category'=>'rowid@'.MAIN_DB_PREFIX.'c_accounting_category','aa.pcg_type'=>'^.{1,20}$','aa.pcg_subtype'=>'^.{1,20}$','aa.active'=>'^0|1$','aa.datec'=>'^\d{4}-\d{2}-\d{2}$');
-		$this->import_convertvalue_array[$r]=array(
-			'aa.fk_accounting_category'=>array('rule'=>'fetchidfromcodeorlabel','classfile'=>'/accountancy/class/accountancycategory.class.php','class'=>'AccountancyCategory','method'=>'fetch','dict'=>'DictionaryAccountancyCategory'),
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = "Chartofaccounts"; // Translation key
+		$this->import_icon[$r] = $this->picto;
+		$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('aa'=>MAIN_DB_PREFIX.'accounting_account');
+		$this->import_tables_creator_array[$r] = array('aa'=>'fk_user_author'); // Fields to store import user id
+		$this->import_fields_array[$r] = array('aa.fk_pcg_version'=>"Chartofaccounts*", 'aa.account_number'=>"AccountAccounting*", 'aa.label'=>"Label*", 'aa.account_parent'=>"Accountparent", "aa.fk_accounting_category"=>"AccountingCategory", "aa.pcg_type"=>"Pcgtype*", 'aa.pcg_subtype'=>'Pcgsubtype*', 'aa.active'=>'Status*', 'aa.datec'=>"DateCreation");
+		$this->import_regex_array[$r] = array('aa.fk_pcg_version'=>'pcg_version@'.MAIN_DB_PREFIX.'accounting_system', 'aa.account_number'=>'^\d{1,32}$', 'aa.label'=>'^.{1,255}$', 'aa.account_parent'=>'^\d{0,32}$', 'aa.fk_accounting_category'=>'rowid@'.MAIN_DB_PREFIX.'c_accounting_category', 'aa.pcg_type'=>'^.{1,20}$', 'aa.pcg_subtype'=>'^.{1,20}$', 'aa.active'=>'^0|1$', 'aa.datec'=>'^\d{4}-\d{2}-\d{2}$');
+		$this->import_convertvalue_array[$r] = array(
+			'aa.fk_accounting_category'=>array('rule'=>'fetchidfromcodeorlabel', 'classfile'=>'/accountancy/class/accountancycategory.class.php', 'class'=>'AccountancyCategory', 'method'=>'fetch', 'dict'=>'DictionaryAccountancyCategory'),
 			'aa.account_parent'=>array('rule'=>'zeroifnull'),
 		);
-		$this->import_examplevalues_array[$r]=array('aa.fk_pcg_version'=>"PCG99-ABREGE",'aa.account_number'=>"707",'aa.label'=>"Product sales",'aa.account_parent'=>"1407","aa.fk_accounting_category"=>"","aa.pcg_type"=>"PROD",'aa.pcg_subtype'=>'PRODUCT','aa.active'=>'1','aa.datec'=>"2017-04-28");
+		$this->import_examplevalues_array[$r] = array('aa.fk_pcg_version'=>"PCG99-ABREGE", 'aa.account_number'=>"707", 'aa.label'=>"Product sales", 'aa.account_parent'=>"1407", "aa.fk_accounting_category"=>"", "aa.pcg_type"=>"PROD", 'aa.pcg_subtype'=>'PRODUCT', 'aa.active'=>'1', 'aa.datec'=>"2017-04-28");
 	}
 }