Dolibarr / dolibarr

htdocs/core/modules/import/modules_import.php

Indentation +44 added lines, -44 removed lines

@@ -30,12 +30,12 @@ 
  */
 class ModeleImports
 {
-    public $db;
-    public $datatoimport;
+	public $db;
+	public $datatoimport;
 
-    public $error='';
+	public $error='';
 
-    public $id;           // Id of driver
+	public $id;           // Id of driver
 	public $label;        // Label of driver
 	public $extension;    // Extension of files imported by driver
 	public $version;      // Version of driver
@@ -53,7 +53,7 @@ 
 
 
 	/**
-     *  Constructor
+	 *  Constructor
 	 */
 	function __construct()
 	{
@@ -67,7 +67,7 @@ 
 	 */
 	function getDriverId()
 	{
-	    return $this->id;
+		return $this->id;
 	}
 	
 	/**
@@ -77,7 +77,7 @@ 
 	 */
 	function getDriverLabel()
 	{
-	    return $this->label;
+		return $this->label;
 	}
 	
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	function getDriverDesc()
 	{
-	    return $this->desc;
+		return $this->desc;
 	}
 	
 	/**
@@ -97,7 +97,7 @@ 
 	 */
 	function getDriverExtension()
 	{
-	    return $this->extension;
+		return $this->extension;
 	}
 	
 	/**
@@ -107,7 +107,7 @@ 
 	 */
 	function getDriverVersion()
 	{
-	    return $this->version;
+		return $this->version;
 	}
 	
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	function getLibLabel()
 	{
-	    return $this->label_lib;
+		return $this->label_lib;
 	}
 	
 	/**
@@ -127,16 +127,16 @@ 
 	 */
 	function getLibVersion()
 	{
-	    return $this->version_lib;
+		return $this->version_lib;
 	}
 	
 	
 	/**
 	 *  Charge en memoire et renvoie la liste des modeles actifs
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	 *  @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)
 	{
@@ -148,35 +148,35 @@ 
 		// Recherche des fichiers drivers imports disponibles
 		$var=True;
 		$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++;
-    			}
-    		}
-        }
+		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++;
+				}
+			}
+		}
 
 		return array_keys($this->driverlabel);
 	}

Spacing +27 added lines, -27 removed lines

@@ -33,23 +33,23 @@ 
     public $db;
     public $datatoimport;
 
-    public $error='';
+    public $error = '';
 
-    public $id;           // Id of driver
-	public $label;        // Label of driver
-	public $extension;    // Extension of files imported by driver
-	public $version;      // Version of driver
+    public $id; // Id of driver
+	public $label; // Label of driver
+	public $extension; // Extension of files imported by driver
+	public $version; // Version of driver
 
-	public $label_lib;    // Label of external lib used by driver
-	public $version_lib;  // Version 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
 
 	// Array of all drivers
-	public $driverlabel=array();
-	public $driverdesc=array();
-	public $driverversion=array();
+	public $driverlabel = array();
+	public $driverdesc = array();
+	public $driverversion = array();
 
-	public $liblabel=array();
-	public $libversion=array();
+	public $liblabel = array();
+	public $libversion = array();
 
 
 	/**
@@ -138,40 +138,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)
 	{
 		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
-		$var=True;
-		$i=0;
+		$var = True;
+		$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++;
     			}

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

Indentation +153 added lines, -153 removed lines

@@ -33,13 +33,13 @@ 
  */
 class ImportCsv extends ModeleImports
 {
-    var $db;
-    var $datatoimport;
+	var $db;
+	var $datatoimport;
 
 	var $error='';
 	var $errors=array();
 
-    var $id;           // Id of driver
+	var $id;           // Id of driver
 	var $label;        // Label of driver
 	var $extension;    // Extension of files imported by driver
 	var $version;      // Version of driver
@@ -180,7 +180,7 @@ 
 	function import_get_nb_of_lines($file)
 	{
 	   return dol_count_nb_of_line($file);
-    }
+	}
     
 
 	/**
@@ -275,7 +275,7 @@ 
 	function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$maxfields,$importid,$updatekeys)
 	{
 		global $langs,$conf,$user;
-        global $thirdparty_static;    	// Specific to thirdparty import
+		global $thirdparty_static;    	// Specific to thirdparty import
 		global $tablewithentity_cache;	// Cache to avoid to call  desc at each rows on tables
 
 		$error=0;
@@ -337,10 +337,10 @@ 
 				// 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);
+					$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)
 					{
@@ -361,135 +361,135 @@ 
 						// 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'
-                                	)
-                                {
-                                    // 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
-                                    //print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
+							// 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'
+									)
+								{
+									// 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
+									//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'];
-                                        if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
-                                        {
-                                        	$newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
-                                        }
-                                        else
+									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
 										{
-                                            $resultload = dol_include_once($file);
-                                            if (empty($resultload))
-                                            {
-                                                dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
-                                                break;
-                                            }
-                                            $classinstance=new $class($this->db);
-                                            // Try the fetch from code or ref
-                                            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')
-                                            {
+											$resultload = dol_include_once($file);
+											if (empty($resultload))
+											{
+												dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
+												break;
+											}
+											$classinstance=new $class($this->db);
+											// Try the fetch from code or ref
+											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')
+											{
 												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.'. ';
-                                            if ($classinstance->id != '')	// id may be 0, it is a found value
-                                            {
-                                                $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';
-                                                $errorforthistable++;
-                                                $error++;
-                                            }
-                                        }
-                                    }
-
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='zeroifnull')
-                                {
-                                    if (empty($newval)) $newval='0';
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifauto')
-                                {
-                                    if (strtolower($newval) == 'auto')
-                                    {
-                                        $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"
-                                }
-                                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;
-                                        //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 (strtolower($newval) == 'auto')
-                                    {
-                                        $this->thirpartyobject->get_codecompta('customer');
-                                        $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 (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"
-                                        //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')
-                                {
-                                    $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"))
-                                    {
-                                        require_once DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
-                                        $modTask = new $obj;
-                                        $defaultref = $modTask->getNextValue(null,null);
-                                    }
-                                    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
-                                    $newval=$defaultref;
-                                }                                
+											}
+											$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;
+											}
+											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';
+												$errorforthistable++;
+												$error++;
+											}
+										}
+									}
+
+								}
+								elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='zeroifnull')
+								{
+									if (empty($newval)) $newval='0';
+								}
+								elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifauto')
+								{
+									if (strtolower($newval) == 'auto')
+									{
+										$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"
+								}
+								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;
+										//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 (strtolower($newval) == 'auto')
+									{
+										$this->thirpartyobject->get_codecompta('customer');
+										$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 (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"
+										//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')
+								{
+									$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"))
+									{
+										require_once DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
+										$modTask = new $obj;
+										$defaultref = $modTask->getNextValue(null,null);
+									}
+									if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
+									$newval=$defaultref;
+								}                                
                                 
                                 
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
-                                {
-                                    $newval = price2num($newval);
-                                }
+								elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
+								{
+									$newval = price2num($newval);
+								}
 
-                                //print 'Val to use as insert is '.$newval.'<br>';
-						    }
+								//print 'Val to use as insert is '.$newval.'<br>';
+							}
 
-						    // Test regexp
+							// Test regexp
 							if (! empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
 							{
 								// If test is "Must exist in a field@table"
@@ -525,14 +525,14 @@ 
 									{
 										$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorFieldValueNotIn',$key,$newval,$field,$table);
 										$this->errors[$error]['type']='FOREIGNKEY';
-									    $errorforthistable++;
+										$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>";
+									//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++;
@@ -558,25 +558,25 @@ 
 				// 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;
+					// 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;
-    				    }
-    				}
+							$listfields[] = $keyfield;
+							$listvalues[] = $lastinsertid;
+							//print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
+						}
+					}
 				}
 				//print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
 
@@ -681,8 +681,8 @@ 
 								$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;
+									$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
 								{
@@ -700,7 +700,7 @@ 
 					}*/
 				}
 
-			    if ($error) break;
+				if ($error) break;
 			}
 
 			if($updatedone) $this->nbupdate++;

Braces +120 added lines, -73 removed lines

@@ -86,7 +86,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);
+		}
 	}
 
 
@@ -161,8 +163,7 @@ 
 			$langs->load("errors");
 			$this->error=$langs->trans("ErrorFailToOpenFile",$file);
 			$ret=-1;
-		}
-		else
+		} else
 		{
 			$this->file=$file;
 		}
@@ -206,7 +207,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;
@@ -215,27 +218,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
@@ -299,8 +301,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;
@@ -316,19 +317,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]);
 				}
@@ -340,13 +349,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
 
@@ -372,20 +387,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))
@@ -403,15 +421,20 @@ 
                                             }
                                             $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++;
@@ -419,12 +442,12 @@ 
                                         }
                                     }
 
-                                }
-                                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')
                                     {
@@ -432,9 +455,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')
                                     {
@@ -442,9 +467,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')
                                     {
@@ -452,20 +479,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
@@ -476,12 +510,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);
                                 }
@@ -499,9 +532,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)
 										{
@@ -510,11 +545,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);
 										}
@@ -548,9 +584,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++;
 				}
@@ -561,13 +601,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;
@@ -617,8 +659,7 @@ 
 									} else {
 										// No record found with filters, insert will be tried below
 									}
-								}
-								else
+								} else
 								{
 									//print 'E';
 									$this->errors[$error]['lib']=$this->db->lasterror();
@@ -638,7 +679,9 @@ 
 								}
 								$sqlstart.= ' SET '.implode(', ', $set);
 								
-								if(empty($keyfield)) $keyfield = 'rowid';
+								if(empty($keyfield)) {
+									$keyfield = 'rowid';
+								}
 								$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
 								
 								$sql = $sqlstart.$sqlend;
@@ -648,8 +691,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();
@@ -683,8 +725,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();
@@ -700,11 +741,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;

Spacing +185 added lines, -185 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';
 
 
 /**
@@ -36,24 +36,24 @@ 
     var $db;
     var $datatoimport;
 
-	var $error='';
-	var $errors=array();
+	var $error = '';
+	var $errors = array();
 
-    var $id;           // Id of driver
-	var $label;        // Label of driver
-	var $extension;    // Extension of files imported by driver
-	var $version;      // Version of driver
+    var $id; // Id of driver
+	var $label; // Label of driver
+	var $extension; // Extension of files imported by driver
+	var $version; // Version of driver
 
-	var $label_lib;    // Label of external lib used by driver
-	var $version_lib;  // Version of external lib used by driver
+	var $label_lib; // Label of external lib used by driver
+	var $version_lib; // Version of external lib used by driver
 
 	var $separator;
 
-	var $file;      // Path of file
-	var $handle;    // Handle fichier
+	var $file; // Path of file
+	var $handle; // Handle fichier
 
-	var $cacheconvert=array();      // Array to cache list of value found after a convertion
-	var $cachefieldtable=array();   // Array to cache list of value found into fields@tables
+	var $cacheconvert = array(); // Array to cache list of value found after a convertion
+	var $cachefieldtable = array(); // Array to cache list of value found into fields@tables
 	
 	var $nbinsert = 0; // # of insert done during the import
 	var $nbupdate = 0; // # of update done during the import
@@ -65,28 +65,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;
+		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);
 	}
 
 
@@ -108,9 +108,9 @@ 
 	 *  @param	array		$headerlinefields	Array of fields name
 	 * 	@return	string
 	 */
-	function write_title_example($outputlangs,$headerlinefields)
+	function write_title_example($outputlangs, $headerlinefields)
 	{
-		$s=join($this->separator,array_map('cleansep',$headerlinefields));
+		$s = join($this->separator, array_map('cleansep', $headerlinefields));
 		return $s."\n";
 	}
 
@@ -121,9 +121,9 @@ 
 	 * 	@param	array		$contentlinevalues	Array of lines
 	 * 	@return	string
 	 */
-	function write_record_example($outputlangs,$contentlinevalues)
+	function write_record_example($outputlangs, $contentlinevalues)
 	{
-		$s=join($this->separator,array_map('cleansep',$contentlinevalues));
+		$s = join($this->separator, array_map('cleansep', $contentlinevalues));
 		return $s."\n";
 	}
 
@@ -149,22 +149,22 @@ 
 	function import_open_file($file)
 	{
 		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;
@@ -203,47 +203,47 @@ 
 	{
 		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;
@@ -272,23 +272,23 @@ 
 	 * @param	array	$updatekeys						Array of keys to use to try to do update
 	 * @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)
 	{
-		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);
@@ -296,8 +296,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
@@ -306,25 +306,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);
 				}
@@ -335,26 +335,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++;
 						}
@@ -362,28 +362,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
 										{
@@ -393,26 +393,26 @@ 
                                                 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++;
                                             }
@@ -420,68 +420,68 @@ 
                                     }
 
                                 }
-                                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);
                                 }
@@ -490,27 +490,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++;
 											}
 										}
@@ -521,20 +521,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++;
 								}
@@ -548,8 +548,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++;
@@ -559,19 +559,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;
@@ -581,7 +581,7 @@ 
 				//print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
 
 				// If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
-				if (! $errorforthistable)
+				if (!$errorforthistable)
 				{
 					//print "$alias/$tablename/$listfields/$listvalues<br>";
 					if (!empty($listfields))
@@ -598,21 +598,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
@@ -621,8 +621,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++;
 								}
 							}
@@ -636,24 +636,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++;
 								}
 							}
@@ -664,13 +664,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);
@@ -678,7 +678,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).
@@ -687,8 +687,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++;
 								}
 							}
@@ -703,8 +703,8 @@ 
 			    if ($error) break;
 			}
 
-			if($updatedone) $this->nbupdate++;
-			if($insertdone) $this->nbinsert++;
+			if ($updatedone) $this->nbupdate++;
+			if ($insertdone) $this->nbinsert++;
 		}
 
 		return 1;
@@ -720,7 +720,7 @@ 
  */
 function cleansep($value)
 {
-	return str_replace(array(',',';'),'/',$value);
+	return str_replace(array(',', ';'), '/', $value);
 };
 
 

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

Indentation +212 added lines, -212 removed lines

@@ -33,13 +33,13 @@ 
  */
 class ImportXlsx extends ModeleImports
 {
-    var $db;
-    var $datatoimport;
+	var $db;
+	var $datatoimport;
 
 	var $error='';
 	var $errors=array();
 
-    var $id;           // Id of driver
+	var $id;           // Id of driver
 	var $label;        // Label of driver
 	var $extension;    // Extension of files imported by driver
 	var $version;      // Version of driver
@@ -49,7 +49,7 @@ 
 
 	var $separator;
 
-    var $file;      // Path of file
+	var $file;      // Path of file
 	var $handle;    // Handle fichier
 
 	var $cacheconvert=array();      // Array to cache list of value found after a convertion
@@ -80,16 +80,16 @@ 
 		$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.php';
 		require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-        if (! class_exists('ZipArchive')) // For Excel2007, PHPExcel need ZipArchive
-        {
-                $langs->load("errors");
-                $this->error=$langs->trans('ErrorPHPNeedModule','zip');
-                return -1;
-        }
-        $this->label_lib='PhpExcel';
-        $this->version_lib='1.8.0';
+		if (! class_exists('ZipArchive')) // For Excel2007, PHPExcel need ZipArchive
+		{
+				$langs->load("errors");
+				$this->error=$langs->trans('ErrorPHPNeedModule','zip');
+				return -1;
+		}
+		$this->label_lib='PhpExcel';
+		$this->version_lib='1.8.0';
 
 		$this->datatoimport=$datatoimport;
 		if (preg_match('/^societe_/',$datatoimport)) $this->thirpartyobject=new Societe($this->db);
@@ -106,25 +106,25 @@ 
 	{
 	  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 (
-              'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
-          );
-          PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
-        }
-
-            $this->workbook = new PHPExcel();
-            $this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION);
-            $this->workbook->getProperties()->setTitle($outputlangs->trans("Import").' - '.$file);
-            $this->workbook->getProperties()->setSubject($outputlangs->trans("Import").' - '.$file);
-            $this->workbook->getProperties()->setDescription($outputlangs->trans("Import").' - '.$file);
-
-            $this->workbook->setActiveSheetIndex(0);
-            $this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
-            $this->workbook->getActiveSheet()->getDefaultRowDimension()->setRowHeight(16);
-
-	    return '';
+		  if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
+			$cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
+			$cacheSettings = array (
+			  'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
+		  );
+		  PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
+		}
+
+			$this->workbook = new PHPExcel();
+			$this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION);
+			$this->workbook->getProperties()->setTitle($outputlangs->trans("Import").' - '.$file);
+			$this->workbook->getProperties()->setSubject($outputlangs->trans("Import").' - '.$file);
+			$this->workbook->getProperties()->setDescription($outputlangs->trans("Import").' - '.$file);
+
+			$this->workbook->setActiveSheetIndex(0);
+			$this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
+			$this->workbook->getActiveSheet()->getDefaultRowDimension()->setRowHeight(16);
+
+		return '';
 	}
 
 	/**
@@ -136,17 +136,17 @@ 
 	 */
 	function write_title_example($outputlangs,$headerlinefields)
 	{
-    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
 	}
 
@@ -159,13 +159,13 @@ 
 	 */
 	function write_record_example($outputlangs,$contentlinevalues)
 	{
-    $col = 0;
-    $row = 2;
-    foreach($contentlinevalues as $cell) {
-        $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($col, $row, $cell);
-        $col++;
-    }
-    return ''; // final output will be generated in footer
+	$col = 0;
+	$row = 2;
+	foreach($contentlinevalues as $cell) {
+		$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($col, $row, $cell);
+		$col++;
+	}
+	return ''; // final output will be generated in footer
 	}
 
 	/**
@@ -177,15 +177,15 @@ 
 	function write_footer_example($outputlangs)
 	{
 		// return te 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;
+	$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;
 	}
 
 
@@ -223,13 +223,13 @@ 
 		$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;
-    }
+	}
     
 
 	/**
@@ -299,7 +299,7 @@ 
 	function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$maxfields,$importid,$updatekeys)
 	{
 		global $langs,$conf,$user;
-        global $thirdparty_static;    	// Specific to thirdparty import
+		global $thirdparty_static;    	// Specific to thirdparty import
 		global $tablewithentity_cache;	// Cache to avoid to call  desc at each rows on tables
 
 		$error=0;
@@ -361,10 +361,10 @@ 
 				// 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);
+					$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)
 					{
@@ -385,135 +385,135 @@ 
 						// 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'
-                                	)
-                                {
-                                    // 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
-                                    //print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
+							// 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'
+									)
+								{
+									// 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
+									//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'];
-                                        if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
-                                        {
-                                        	$newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
-                                        }
-                                        else
+									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] != '')
 										{
-                                            $resultload = dol_include_once($file);
-                                            if (empty($resultload))
-                                            {
-                                                dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
-                                                break;
-                                            }
-                                            $classinstance=new $class($this->db);
-                                            // Try the fetch from code or ref
-                                            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')
-                                            {
+											$newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
+										}
+										else
+										{
+											$resultload = dol_include_once($file);
+											if (empty($resultload))
+											{
+												dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
+												break;
+											}
+											$classinstance=new $class($this->db);
+											// Try the fetch from code or ref
+											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')
+											{
 												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.'. ';
-                                            if ($classinstance->id != '')	// id may be 0, it is a found value
-                                            {
-                                                $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';
-                                                $errorforthistable++;
-                                                $error++;
-                                            }
-                                        }
-                                    }
-
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='zeroifnull')
-                                {
-                                    if (empty($newval)) $newval='0';
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifauto')
-                                {
-                                    if (strtolower($newval) == 'auto')
-                                    {
-                                        $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"
-                                }
-                                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;
-                                        //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 (strtolower($newval) == 'auto')
-                                    {
-                                        $this->thirpartyobject->get_codecompta('customer');
-                                        $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 (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"
-                                        //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')
-                                {
-                                    $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"))
-                                    {
-                                        require_once DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
-                                        $modTask = new $obj;
-                                        $defaultref = $modTask->getNextValue(null,null);
-                                    }
-                                    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
-                                    $newval=$defaultref;
-                                }                                
+											}
+											$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;
+											}
+											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';
+												$errorforthistable++;
+												$error++;
+											}
+										}
+									}
+
+								}
+								elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='zeroifnull')
+								{
+									if (empty($newval)) $newval='0';
+								}
+								elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifauto')
+								{
+									if (strtolower($newval) == 'auto')
+									{
+										$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"
+								}
+								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;
+										//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 (strtolower($newval) == 'auto')
+									{
+										$this->thirpartyobject->get_codecompta('customer');
+										$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 (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"
+										//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')
+								{
+									$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"))
+									{
+										require_once DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
+										$modTask = new $obj;
+										$defaultref = $modTask->getNextValue(null,null);
+									}
+									if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
+									$newval=$defaultref;
+								}                                
                                 
                                 
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
-                                {
-                                    $newval = price2num($newval);
-                                }
+								elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
+								{
+									$newval = price2num($newval);
+								}
 
-                                //print 'Val to use as insert is '.$newval.'<br>';
-						    }
+								//print 'Val to use as insert is '.$newval.'<br>';
+							}
 
-						    // Test regexp
+							// Test regexp
 							if (! empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
 							{
 								// If test is "Must exist in a field@table"
@@ -549,14 +549,14 @@ 
 									{
 										$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorFieldValueNotIn',$key,$newval,$field,$table);
 										$this->errors[$error]['type']='FOREIGNKEY';
-									    $errorforthistable++;
+										$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>";
+									//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++;
@@ -582,25 +582,25 @@ 
 				// 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;
+					// 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;
-    				    }
-    				}
+							$listfields[] = $keyfield;
+							$listvalues[] = $lastinsertid;
+							//print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
+						}
+					}
 				}
 				//print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
 
@@ -705,8 +705,8 @@ 
 								$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;
+									$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
 								{
@@ -724,7 +724,7 @@ 
 					}*/
 				}
 
-			    if ($error) break;
+				if ($error) break;
 			}
 
 			if($updatedone) $this->nbupdate++;

Spacing +171 added lines, -171 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';
 
 
 /**
@@ -36,24 +36,24 @@ 
     var $db;
     var $datatoimport;
 
-	var $error='';
-	var $errors=array();
+	var $error = '';
+	var $errors = array();
 
-    var $id;           // Id of driver
-	var $label;        // Label of driver
-	var $extension;    // Extension of files imported by driver
-	var $version;      // Version of driver
+    var $id; // Id of driver
+	var $label; // Label of driver
+	var $extension; // Extension of files imported by driver
+	var $version; // Version of driver
 
-	var $label_lib;    // Label of external lib used by driver
-	var $version_lib;  // Version of external lib used by driver
+	var $label_lib; // Label of external lib used by driver
+	var $version_lib; // Version of external lib used by driver
 
 	var $separator;
 
-    var $file;      // Path of file
-	var $handle;    // Handle fichier
+    var $file; // Path of file
+	var $handle; // Handle fichier
 
-	var $cacheconvert=array();      // Array to cache list of value found after a convertion
-	var $cachefieldtable=array();   // Array to cache list of value found into fields@tables
+	var $cacheconvert = array(); // Array to cache list of value found after a convertion
+	var $cachefieldtable = array(); // Array to cache list of value found into fields@tables
   
 	var $workbook; // temporary import file
 	var $record; // current record
@@ -66,33 +66,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);
 	}
 
 	
@@ -104,11 +104,11 @@ 
 	 */
 	function write_header_example($outputlangs)
 	{
-	  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);
@@ -134,14 +134,14 @@ 
 	 *  @param	array		$headerlinefields	Array of fields name
 	 * 	@return	string
 	 */
-	function write_title_example($outputlangs,$headerlinefields)
+	function write_title_example($outputlangs, $headerlinefields)
 	{
     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) {
+    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); 
@@ -157,11 +157,11 @@ 
 	 * 	@param	array		$contentlinevalues	Array of lines
 	 * 	@return	string
 	 */
-	function write_record_example($outputlangs,$contentlinevalues)
+	function write_record_example($outputlangs, $contentlinevalues)
 	{
     $col = 0;
     $row = 2;
-    foreach($contentlinevalues as $cell) {
+    foreach ($contentlinevalues as $cell) {
         $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($col, $row, $cell);
         $col++;
     }
@@ -199,7 +199,7 @@ 
 	function import_open_file($file)
 	{
 		global $langs;
-		$ret=1;
+		$ret = 1;
 
 		dol_syslog(get_class($this)."::open_file file=".$file);
 
@@ -242,7 +242,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;
@@ -259,14 +259,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;
@@ -296,23 +296,23 @@ 
 	 * @return	int										<0 if KO, >0 if OK
 	 */
 	// What is this doing here ? it is common to all imports, is should be in the parent class
-	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)
 	{
-		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);
@@ -320,8 +320,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
@@ -330,25 +330,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);
 				}
@@ -359,26 +359,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++;
 						}
@@ -386,28 +386,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
 										{
@@ -417,26 +417,26 @@ 
                                                 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++;
                                             }
@@ -444,68 +444,68 @@ 
                                     }
 
                                 }
-                                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);
                                 }
@@ -514,27 +514,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++;
 											}
 										}
@@ -545,20 +545,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++;
 								}
@@ -572,8 +572,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++;
@@ -583,19 +583,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;
@@ -605,7 +605,7 @@ 
 				//print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
 
 				// If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
-				if (! $errorforthistable)
+				if (!$errorforthistable)
 				{
 					//print "$alias/$tablename/$listfields/$listvalues<br>";
 					if (!empty($listfields))
@@ -622,21 +622,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
@@ -645,8 +645,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++;
 								}
 							}
@@ -660,24 +660,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++;
 								}
 							}
@@ -688,13 +688,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);
@@ -702,7 +702,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).
@@ -711,8 +711,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++;
 								}
 							}
@@ -727,8 +727,8 @@ 
 			    if ($error) break;
 			}
 
-			if($updatedone) $this->nbupdate++;
-			if($insertdone) $this->nbinsert++;
+			if ($updatedone) $this->nbupdate++;
+			if ($insertdone) $this->nbinsert++;
 		}
 
 		return 1;

Braces +116 added lines, -66 removed lines

@@ -82,9 +82,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;
         }
@@ -92,7 +94,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);
+		}
 	}
 
 	
@@ -259,8 +263,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++) {
@@ -323,8 +328,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;
@@ -340,19 +344,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]);
 				}
@@ -364,13 +376,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
 
@@ -396,20 +414,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))
@@ -427,15 +448,20 @@ 
                                             }
                                             $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++;
@@ -443,12 +469,12 @@ 
                                         }
                                     }
 
-                                }
-                                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')
                                     {
@@ -456,9 +482,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')
                                     {
@@ -466,9 +494,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')
                                     {
@@ -476,20 +506,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
@@ -500,12 +537,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);
                                 }
@@ -523,9 +559,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)
 										{
@@ -534,11 +572,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);
 										}
@@ -572,9 +611,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++;
 				}
@@ -585,13 +628,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;
@@ -641,8 +686,7 @@ 
 									} else {
 										// No record found with filters, insert will be tried below
 									}
-								}
-								else
+								} else
 								{
 									//print 'E';
 									$this->errors[$error]['lib']=$this->db->lasterror();
@@ -662,7 +706,9 @@ 
 								}
 								$sqlstart.= ' SET '.implode(', ', $set);
 								
-								if(empty($keyfield)) $keyfield = 'rowid';
+								if(empty($keyfield)) {
+									$keyfield = 'rowid';
+								}
 								$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
 								
 								$sql = $sqlstart.$sqlend;
@@ -672,8 +718,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();
@@ -707,8 +752,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();
@@ -724,11 +768,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;

htdocs/core/modules/modProductBatch.class.php

Indentation +17 added lines, -17 removed lines

@@ -40,9 +40,9 @@ 
 	 */
 	function __construct($db)
 	{
-        global $langs,$conf;
+		global $langs,$conf;
 
-        $this->db = $db;
+		$this->db = $db;
 		$this->numero = 39000;
 
 		$this->family = "products";
@@ -78,18 +78,18 @@ 
 		// Constants
 		$this->const = array();
 
-        $this->tabs = array();
+		$this->tabs = array();
 
-        // Dictionaries
-	    if (! isset($conf->productbatch->enabled))
-        {
-        	$conf->productbatch=new stdClass();
-        	$conf->productbatch->enabled=0;
-        }
+		// Dictionaries
+		if (! isset($conf->productbatch->enabled))
+		{
+			$conf->productbatch=new stdClass();
+			$conf->productbatch->enabled=0;
+		}
 		$this->dictionaries=array();
 
-        // Boxes
-        $this->boxes = array();			// List of boxes
+		// Boxes
+		$this->boxes = array();			// List of boxes
 
 		// Permissions
 		$this->rights = array();		// Permission array used by this module
@@ -111,20 +111,20 @@ 
 	 *		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')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	function init($options='')
 	{
-	    global $db,$conf;
+		global $db,$conf;
 
 		$sql = array();
 
 		if (! empty($conf->cashdesk->enabled)) {
-    		if (empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
-    		    include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-    		    $res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",1,'chaine',0,'',$conf->entity);
-    		}
+			if (empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+				$res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",1,'chaine',0,'',$conf->entity);
+			}
 		}
 
 		return $this->_init($sql, $options);

Spacing +21 added lines, -21 removed lines

@@ -25,7 +25,7 @@ 
  *  \ingroup    productbatch
  *  \brief      Description and activation file for module productbatch
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -40,7 +40,7 @@ 
 	 */
 	function __construct($db)
 	{
-        global $langs,$conf;
+        global $langs, $conf;
 
         $this->db = $db;
 		$this->numero = 39000;
@@ -48,7 +48,7 @@ 
 		$this->family = "products";
 		$this->module_position = 45;
 		
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Batch number, eat-by and sell-by date management module";
 
 		$this->rights_class = 'productbatch';
@@ -58,7 +58,7 @@ 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->special = 0;
 
-		$this->picto='stock';
+		$this->picto = 'stock';
 
 		$this->module_parts = array();
 
@@ -69,10 +69,10 @@ 
 		$this->config_page_url = array("product_lot_extrafields.php@product");
 
 		// Dependencies
-		$this->depends = array("modProduct","modStock","modExpedition","modFournisseur");		// List of modules id that must be enabled if this module is enabled. modExpedition is required to manage batch exit (by manual stock decrease on shipment), modSupplier to manage batch entry (after supplier order).
-		$this->requiredby = array();	// List of modules id to disable if this one is disabled
-		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+		$this->depends = array("modProduct", "modStock", "modExpedition", "modFournisseur"); // List of modules id that must be enabled if this module is enabled. modExpedition is required to manage batch exit (by manual stock decrease on shipment), modSupplier to manage batch entry (after supplier order).
+		$this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->phpmin = array(5, 0); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("productbatch");
 
 		// Constants
@@ -81,28 +81,28 @@ 
         $this->tabs = array();
 
         // Dictionaries
-	    if (! isset($conf->productbatch->enabled))
+	    if (!isset($conf->productbatch->enabled))
         {
-        	$conf->productbatch=new stdClass();
-        	$conf->productbatch->enabled=0;
+        	$conf->productbatch = new stdClass();
+        	$conf->productbatch->enabled = 0;
         }
-		$this->dictionaries=array();
+		$this->dictionaries = array();
 
         // Boxes
-        $this->boxes = array();			// List of boxes
+        $this->boxes = array(); // List of boxes
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
 		
 		// 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;
 
 	}
 
@@ -114,16 +114,16 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
-	    global $db,$conf;
+	    global $db, $conf;
 
 		$sql = array();
 
-		if (! empty($conf->cashdesk->enabled)) {
+		if (!empty($conf->cashdesk->enabled)) {
     		if (empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
     		    include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-    		    $res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",1,'chaine',0,'',$conf->entity);
+    		    $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
     		}
 		}
 

htdocs/core/modules/dons/modules_don.php

Indentation +181 added lines, -181 removed lines

@@ -34,27 +34,27 @@ 
  */
 abstract class ModeleDon extends CommonDocGenerator
 {
-    var $error='';
-
-    /**
-     *  Return list of active generation modules
-     *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
-     */
-    static function liste_modeles($db,$maxfilenamelength=0)
-    {
-        global $conf;
-
-        $type='donation';
-        $liste=array();
-
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $liste=getListOfModels($db,$type,$maxfilenamelength);
-
-        return $liste;
-    }
+	var $error='';
+
+	/**
+	 *  Return list of active generation modules
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
+	static function liste_modeles($db,$maxfilenamelength=0)
+	{
+		global $conf;
+
+		$type='donation';
+		$liste=array();
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$liste=getListOfModels($db,$type,$maxfilenamelength);
+
+		return $liste;
+	}
 }
 
 
@@ -63,80 +63,80 @@ 
  */
 abstract class ModeleNumRefDons
 {
-    var $error='';
-
-    /**
-     * 	Return if a module can be used or not
-     *
-     *  @return		boolean     true if module can be used
-     */
-    function isEnabled()
-    {
-        return true;
-    }
-
-    /**
-     * 	Renvoi la description par defaut du modele de numerotation
-     *
-     *  @return     string      Texte descripif
-     */
-    function info()
-    {
-        global $langs;
-        $langs->load("bills");
-        return $langs->trans("NoDescription");
-    }
-
-    /**
-     *  Renvoi un exemple de numerotation
-     *
-     *  @return     string      Example
-     */
-    function getExample()
-    {
-        global $langs;
-        $langs->load("bills");
-        return $langs->trans("NoExample");
-    }
-
-    /**
-     * 	Test si les numeros deja en vigueur dans la base ne provoquent pas d
-     *  de conflits qui empechera cette numerotation de fonctionner.
-     *
-     *  @return     boolean     false si conflit, true si ok
-     */
-    function canBeActivated()
-    {
-        return true;
-    }
-
-    /**
-     *  Renvoi prochaine valeur attribuee
-     *
-     *  @return     string      Valeur
-     */
-    function getNextValue()
-    {
-        global $langs;
-        return $langs->trans("NotAvailable");
-    }
-
-    /**
-     *  Renvoi version du module numerotation
-     *
-     *  @return     string      Valeur
-     */
-    function getVersion()
-    {
-        global $langs;
-        $langs->load("admin");
-
-        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-        if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-        if ($this->version == 'dolibarr') return DOL_VERSION;
-        if ($this->version) return $this->version;
-        return $langs->trans("NotAvailable");
-    }
+	var $error='';
+
+	/**
+	 * 	Return if a module can be used or not
+	 *
+	 *  @return		boolean     true if module can be used
+	 */
+	function isEnabled()
+	{
+		return true;
+	}
+
+	/**
+	 * 	Renvoi la description par defaut du modele de numerotation
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	function info()
+	{
+		global $langs;
+		$langs->load("bills");
+		return $langs->trans("NoDescription");
+	}
+
+	/**
+	 *  Renvoi un exemple de numerotation
+	 *
+	 *  @return     string      Example
+	 */
+	function getExample()
+	{
+		global $langs;
+		$langs->load("bills");
+		return $langs->trans("NoExample");
+	}
+
+	/**
+	 * 	Test si les numeros deja en vigueur dans la base ne provoquent pas d
+	 *  de conflits qui empechera cette numerotation de fonctionner.
+	 *
+	 *  @return     boolean     false si conflit, true si ok
+	 */
+	function canBeActivated()
+	{
+		return true;
+	}
+
+	/**
+	 *  Renvoi prochaine valeur attribuee
+	 *
+	 *  @return     string      Valeur
+	 */
+	function getNextValue()
+	{
+		global $langs;
+		return $langs->trans("NotAvailable");
+	}
+
+	/**
+	 *  Renvoi version du module numerotation
+	 *
+	 *  @return     string      Valeur
+	 */
+	function getVersion()
+	{
+		global $langs;
+		$langs->load("admin");
+
+		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
+		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
+		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
+		return $langs->trans("NotAvailable");
+	}
 }
 
 
@@ -155,98 +155,98 @@ 
  */
 function don_create($db, $id, $message, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
-    global $conf, $langs;
-    $langs->load("bills");
-
-    $eror=0;
-
-    // Increase limit for PDF build
-    $err=error_reporting();
-    error_reporting(0);
-    @set_time_limit(120);
-    error_reporting($err);
-
-    $srctemplatepath='';
-
-    // Set template to use
-    if (! dol_strlen($modele))
-    {
-        if (! empty($conf->global->DON_ADDON_MODEL))
-        {
-            $modele = $conf->global->DON_ADDON_MODEL;
-        }
-        else
-        {
-            print $langs->trans("Error")." ".$langs->trans("Error_DON_ADDON_MODEL_NotDefined");
-            return 0;
-        }
-    }
-
-    // If selected modele is a filename template (then $modele="modelname:filename")
-    $tmp=explode(':',$modele,2);
-    if (! empty($tmp[1]))
-    {
-    	$modele=$tmp[0];
-    	$srctemplatepath=$tmp[1];
-    }
-
-    // Search template files
-    $file=''; $classname=''; $filefound=0;
-    $dirmodels=array('/');
-    if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-    foreach($dirmodels as $reldir)
-    {
-    	foreach(array('html','doc','pdf') as $prefix)
-    	{
-    		$file = $prefix."_".preg_replace('/^html_/','',$modele).".modules.php";
-
-    		// On verifie l'emplacement du modele
-    		$file=dol_buildpath($reldir."core/modules/dons/".$file,0);
-    		if (file_exists($file))
-    		{
-    			$filefound=1;
-    			$classname=$prefix.'_'.$modele;
-    			break;
-    		}
-    	}
-    	if ($filefound) break;
-    }
-
-    // Charge le modele
+	global $conf, $langs;
+	$langs->load("bills");
+
+	$eror=0;
+
+	// Increase limit for PDF build
+	$err=error_reporting();
+	error_reporting(0);
+	@set_time_limit(120);
+	error_reporting($err);
+
+	$srctemplatepath='';
+
+	// Set template to use
+	if (! dol_strlen($modele))
+	{
+		if (! empty($conf->global->DON_ADDON_MODEL))
+		{
+			$modele = $conf->global->DON_ADDON_MODEL;
+		}
+		else
+		{
+			print $langs->trans("Error")." ".$langs->trans("Error_DON_ADDON_MODEL_NotDefined");
+			return 0;
+		}
+	}
+
+	// If selected modele is a filename template (then $modele="modelname:filename")
+	$tmp=explode(':',$modele,2);
+	if (! empty($tmp[1]))
+	{
+		$modele=$tmp[0];
+		$srctemplatepath=$tmp[1];
+	}
+
+	// Search template files
+	$file=''; $classname=''; $filefound=0;
+	$dirmodels=array('/');
+	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+	foreach($dirmodels as $reldir)
+	{
+		foreach(array('html','doc','pdf') as $prefix)
+		{
+			$file = $prefix."_".preg_replace('/^html_/','',$modele).".modules.php";
+
+			// On verifie l'emplacement du modele
+			$file=dol_buildpath($reldir."core/modules/dons/".$file,0);
+			if (file_exists($file))
+			{
+				$filefound=1;
+				$classname=$prefix.'_'.$modele;
+				break;
+			}
+		}
+		if ($filefound) break;
+	}
+
+	// Charge le modele
 	if ($filefound)
 	{
-        require_once $file;
+		require_once $file;
 
-        $object=new Don($db);
-        $object->fetch($id);
+		$object=new Don($db);
+		$object->fetch($id);
 
-        $classname = $modele;
-        $obj = new $classname($db);
+		$classname = $modele;
+		$obj = new $classname($db);
 
-        // We save charset_output to restore it because write_file can change it if needed for
-        // output format that does not support UTF8.
-        $sav_charset_output=$outputlangs->charset_output;
-        if ($obj->write_file($object,$outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
-        {
-            $outputlangs->charset_output=$sav_charset_output;
+		// We save charset_output to restore it because write_file can change it if needed for
+		// output format that does not support UTF8.
+		$sav_charset_output=$outputlangs->charset_output;
+		if ($obj->write_file($object,$outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
+		{
+			$outputlangs->charset_output=$sav_charset_output;
 
 			// we delete preview files
-        	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-            dol_delete_preview($object);
-            return 1;
-        }
-        else
-        {
-            $outputlangs->charset_output=$sav_charset_output;
-            dol_syslog("Erreur dans don_create");
-            dol_print_error($db,$obj->error);
-            return 0;
-        }
-    }
-    else
-    {
-        print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
-        return 0;
-    }
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			dol_delete_preview($object);
+			return 1;
+		}
+		else
+		{
+			$outputlangs->charset_output=$sav_charset_output;
+			dol_syslog("Erreur dans don_create");
+			dol_print_error($db,$obj->error);
+			return 0;
+		}
+	}
+	else
+	{
+		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
+		return 0;
+	}
 }
 

Spacing +32 added lines, -32 removed lines

@@ -34,7 +34,7 @@ 
  */
 abstract class ModeleDon extends CommonDocGenerator
 {
-    var $error='';
+    var $error = '';
 
     /**
      *  Return list of active generation modules
@@ -43,15 +43,15 @@ 
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
      */
-    static function liste_modeles($db,$maxfilenamelength=0)
+    static function liste_modeles($db, $maxfilenamelength = 0)
     {
         global $conf;
 
-        $type='donation';
-        $liste=array();
+        $type = 'donation';
+        $liste = array();
 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $liste=getListOfModels($db,$type,$maxfilenamelength);
+        $liste = getListOfModels($db, $type, $maxfilenamelength);
 
         return $liste;
     }
@@ -63,7 +63,7 @@ 
  */
 abstract class ModeleNumRefDons
 {
-    var $error='';
+    var $error = '';
 
     /**
      * 	Return if a module can be used or not
@@ -153,25 +153,25 @@ 
  *  @param  int			$hideref        Hide ref
  *	@return int         				0 if KO, 1 if OK
  */
-function don_create($db, $id, $message, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+function don_create($db, $id, $message, $modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 {
     global $conf, $langs;
     $langs->load("bills");
 
-    $eror=0;
+    $eror = 0;
 
     // Increase limit for PDF build
-    $err=error_reporting();
+    $err = error_reporting();
     error_reporting(0);
     @set_time_limit(120);
     error_reporting($err);
 
-    $srctemplatepath='';
+    $srctemplatepath = '';
 
     // Set template to use
-    if (! dol_strlen($modele))
+    if (!dol_strlen($modele))
     {
-        if (! empty($conf->global->DON_ADDON_MODEL))
+        if (!empty($conf->global->DON_ADDON_MODEL))
         {
             $modele = $conf->global->DON_ADDON_MODEL;
         }
@@ -183,29 +183,29 @@ 
     }
 
     // If selected modele is a filename template (then $modele="modelname:filename")
-    $tmp=explode(':',$modele,2);
-    if (! empty($tmp[1]))
+    $tmp = explode(':', $modele, 2);
+    if (!empty($tmp[1]))
     {
-    	$modele=$tmp[0];
-    	$srctemplatepath=$tmp[1];
+    	$modele = $tmp[0];
+    	$srctemplatepath = $tmp[1];
     }
 
     // Search template files
-    $file=''; $classname=''; $filefound=0;
-    $dirmodels=array('/');
-    if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-    foreach($dirmodels as $reldir)
+    $file = ''; $classname = ''; $filefound = 0;
+    $dirmodels = array('/');
+    if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+    foreach ($dirmodels as $reldir)
     {
-    	foreach(array('html','doc','pdf') as $prefix)
+    	foreach (array('html', 'doc', 'pdf') as $prefix)
     	{
-    		$file = $prefix."_".preg_replace('/^html_/','',$modele).".modules.php";
+    		$file = $prefix."_".preg_replace('/^html_/', '', $modele).".modules.php";
 
     		// On verifie l'emplacement du modele
-    		$file=dol_buildpath($reldir."core/modules/dons/".$file,0);
+    		$file = dol_buildpath($reldir."core/modules/dons/".$file, 0);
     		if (file_exists($file))
     		{
-    			$filefound=1;
-    			$classname=$prefix.'_'.$modele;
+    			$filefound = 1;
+    			$classname = $prefix.'_'.$modele;
     			break;
     		}
     	}
@@ -217,7 +217,7 @@ 
 	{
         require_once $file;
 
-        $object=new Don($db);
+        $object = new Don($db);
         $object->fetch($id);
 
         $classname = $modele;
@@ -225,10 +225,10 @@ 
 
         // We save charset_output to restore it because write_file can change it if needed for
         // output format that does not support UTF8.
-        $sav_charset_output=$outputlangs->charset_output;
-        if ($obj->write_file($object,$outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
+        $sav_charset_output = $outputlangs->charset_output;
+        if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
         {
-            $outputlangs->charset_output=$sav_charset_output;
+            $outputlangs->charset_output = $sav_charset_output;
 
 			// we delete preview files
         	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -237,15 +237,15 @@ 
         }
         else
         {
-            $outputlangs->charset_output=$sav_charset_output;
+            $outputlangs->charset_output = $sav_charset_output;
             dol_syslog("Erreur dans don_create");
-            dol_print_error($db,$obj->error);
+            dol_print_error($db, $obj->error);
             return 0;
         }
     }
     else
     {
-        print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
+        print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
         return 0;
     }
 }

Braces +21 added lines, -12 removed lines

@@ -131,10 +131,18 @@ 
         global $langs;
         $langs->load("admin");
 
-        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-        if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-        if ($this->version == 'dolibarr') return DOL_VERSION;
-        if ($this->version) return $this->version;
+        if ($this->version == 'development') {
+        	return $langs->trans("VersionDevelopment");
+        }
+        if ($this->version == 'experimental') {
+        	return $langs->trans("VersionExperimental");
+        }
+        if ($this->version == 'dolibarr') {
+        	return DOL_VERSION;
+        }
+        if ($this->version) {
+        	return $this->version;
+        }
         return $langs->trans("NotAvailable");
     }
 }
@@ -174,8 +182,7 @@ 
         if (! empty($conf->global->DON_ADDON_MODEL))
         {
             $modele = $conf->global->DON_ADDON_MODEL;
-        }
-        else
+        } else
         {
             print $langs->trans("Error")." ".$langs->trans("Error_DON_ADDON_MODEL_NotDefined");
             return 0;
@@ -193,7 +200,9 @@ 
     // Search template files
     $file=''; $classname=''; $filefound=0;
     $dirmodels=array('/');
-    if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+    if (is_array($conf->modules_parts['models'])) {
+    	$dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+    }
     foreach($dirmodels as $reldir)
     {
     	foreach(array('html','doc','pdf') as $prefix)
@@ -209,7 +218,9 @@ 
     			break;
     		}
     	}
-    	if ($filefound) break;
+    	if ($filefound) {
+    		break;
+    	}
     }
 
     // Charge le modele
@@ -234,16 +245,14 @@ 
         	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
             dol_delete_preview($object);
             return 1;
-        }
-        else
+        } else
         {
             $outputlangs->charset_output=$sav_charset_output;
             dol_syslog("Erreur dans don_create");
             dol_print_error($db,$obj->error);
             return 0;
         }
-    }
-    else
+    } else
     {
         print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
         return 0;

htdocs/core/modules/modDocumentGeneration.class.php

Indentation +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 	 *		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')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	function init($options='')

Spacing +7 added lines, -7 removed lines

@@ -25,7 +25,7 @@ 
  *	\brief      	Fichier de description et activation du module Generation document
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -47,14 +47,14 @@ 
 		$this->family = "technic";
 		$this->module_position = 80;
 		// 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 = "Direct mail document generation";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'development';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->special = 0;
-		$this->picto='email';
+		$this->picto = 'email';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/documentgeneration/temp");
@@ -66,7 +66,7 @@ 
 		$this->depends = array();
 		$this->requiredby = array();
 		$this->conflictwith = array();
-		$this->langfiles = array("orders","bills","companies","mails");
+		$this->langfiles = array("orders", "bills", "companies", "mails");
 
 		// Constants
 
@@ -79,7 +79,7 @@ 
 		$this->rights = array();
 		$this->rights_class = 'document';
 
-		$r=0;
+		$r = 0;
 
 		$this->rights[$r][0] = 1521;
 		$this->rights[$r][1] = 'Lire les documents';
@@ -104,7 +104,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;
 
@@ -113,6 +113,6 @@ 
 
 		$sql = array();
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

htdocs/core/modules/modCommande.class.php

Indentation +2 added lines, -2 removed lines

@@ -145,7 +145,7 @@ 
 		$this->rights[$r][2] = 'd';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'order_advance';
-        $this->rights[$r][5] = 'send';
+		$this->rights[$r][5] = 'send';
 
 		$r++;
 		$this->rights[$r][0] = 87;
@@ -227,7 +227,7 @@ 
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	function init($options='')

Spacing +46 added lines, -46 removed lines

@@ -29,7 +29,7 @@ 
  *		\brief      Fichier de description et activation du module Commande
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -53,14 +53,14 @@ 
 		$this->family = "crm";
 		$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));
 		$this->description = "Gestion des commandes clients";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->special = 0;
-		$this->picto='order';
+		$this->picto = 'order';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/commande/temp");
@@ -72,11 +72,11 @@ 
 		$this->depends = array("modSociete");
 		$this->requiredby = array("modExpedition");
 		$this->conflictwith = array();
-		$this->langfiles = array('orders', 'bills', 'companies','products', 'deliveries');
+		$this->langfiles = array('orders', 'bills', 'companies', 'products', 'deliveries');
 
 		// Constants
 		$this->const = array();
-		$r=0;
+		$r = 0;
 
 		$this->const[$r][0] = "COMMANDE_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
@@ -107,15 +107,15 @@ 
 		
 		// Boxes
 		$this->boxes = array(
-			0=>array('file'=>'box_commandes.php','enabledbydefaulton'=>'Home'),
-			2=>array('file'=>'box_graph_orders_permonth.php','enabledbydefaulton'=>'Home')
+			0=>array('file'=>'box_commandes.php', 'enabledbydefaulton'=>'Home'),
+			2=>array('file'=>'box_graph_orders_permonth.php', 'enabledbydefaulton'=>'Home')
 		);
 
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'commande';
 
-		$r=0;
+		$r = 0;
 
 		$r++;
 		$this->rights[$r][0] = 81;
@@ -180,45 +180,45 @@ 
 		
 		// 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]='CustomersOrdersAndOrdersLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-		$this->export_permission[$r]=array(array("commande","commande","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','d.nom'=>'State','co.label'=>'Country','co.code'=>"CountryCode",'s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_commande'=>"OrderDate",'c.amount_ht'=>"Amount",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total_ttc'=>"TotalTTC",'c.facture'=>"Billed",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','c.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','c.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin','pj.ref'=>'ProjectRef','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'CustomersOrdersAndOrdersLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_permission[$r] = array(array("commande", "commande", "export"));
+		$this->export_fields_array[$r] = array('s.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'd.nom'=>'State', 'co.label'=>'Country', 'co.code'=>"CountryCode", 's.phone'=>'Phone', 's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 'c.rowid'=>"Id", 'c.ref'=>"Ref", 'c.ref_client'=>"RefCustomer", 'c.fk_soc'=>"IdCompany", 'c.date_creation'=>"DateCreation", 'c.date_commande'=>"OrderDate", 'c.amount_ht'=>"Amount", 'c.remise_percent'=>"GlobalDiscount", 'c.total_ht'=>"TotalHT", 'c.total_ttc'=>"TotalTTC", 'c.facture'=>"Billed", 'c.fk_statut'=>'Status', 'c.note_public'=>"Note", 'c.date_livraison'=>'DeliveryDate', 'c.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin', 'c.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin', 'pj.ref'=>'ProjectRef', 'cd.rowid'=>'LineId', 'cd.label'=>"Label", 'cd.description'=>"LineDescription", 'cd.product_type'=>'TypeOfLineServiceOrProduct', 'cd.tva_tx'=>"LineVATRate", 'cd.qty'=>"LineQty", 'cd.total_ht'=>"LineTotalHT", 'cd.total_tva'=>"LineTotalVAT", 'cd.total_ttc'=>"LineTotalTTC", 'p.rowid'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel');
 		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:ref','p.ref'=>'Text','p.label'=>'Text');
-		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','pj.ref'=>'Text','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:ref','p.ref'=>'Text','p.label'=>'Text','d.nom'=>'Text');
-		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','d.nom'=>'company','co.label'=>'company','co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"order",'c.ref'=>"order",'c.ref_client'=>"order",'c.fk_soc'=>"order",'c.date_creation'=>"order",'c.date_commande'=>"order",'c.amount_ht'=>"order",'c.remise_percent'=>"order",'c.total_ht'=>"order",'c.total_ttc'=>"order",'c.facture'=>"order",'c.fk_statut'=>"order",'c.note'=>"order",'c.date_livraison'=>"order",'pj.ref'=>'project','cd.rowid'=>'order_line','cd.label'=>"order_line",'cd.description'=>"order_line",'cd.product_type'=>'order_line','cd.tva_tx'=>"order_line",'cd.qty'=>"order_line",'cd.total_ht'=>"order_line",'cd.total_tva'=>"order_line",'cd.total_ttc'=>"order_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product');
-		$this->export_dependencies_array[$r]=array('order_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		$keyforselect='commande'; $keyforelement='order'; $keyforaliasextra='extra';
+		$this->export_TypeFields_array[$r] = array('s.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'co.label'=>'List:c_country:label:label', 'co.code'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text', 's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 'c.ref'=>"Text", 'c.ref_client'=>"Text", 'c.date_creation'=>"Date", 'c.date_commande'=>"Date", 'c.amount_ht'=>"Numeric", 'c.remise_percent'=>"Numeric", 'c.total_ht'=>"Numeric", 'c.total_ttc'=>"Numeric", 'c.facture'=>"Boolean", 'c.fk_statut'=>'Status', 'c.note_public'=>"Text", 'c.date_livraison'=>'Date', 'pj.ref'=>'Text', 'cd.description'=>"Text", 'cd.product_type'=>'Boolean', 'cd.tva_tx'=>"Numeric", 'cd.qty'=>"Numeric", 'cd.total_ht'=>"Numeric", 'cd.total_tva'=>"Numeric", 'cd.total_ttc'=>"Numeric", 'p.rowid'=>'List:product:ref', 'p.ref'=>'Text', 'p.label'=>'Text', 'd.nom'=>'Text');
+		$this->export_entities_array[$r] = array('s.rowid'=>"company", 's.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'd.nom'=>'company', 'co.label'=>'company', 'co.code'=>'company', 's.phone'=>'company', 's.siren'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.siret'=>'company', 'c.rowid'=>"order", 'c.ref'=>"order", 'c.ref_client'=>"order", 'c.fk_soc'=>"order", 'c.date_creation'=>"order", 'c.date_commande'=>"order", 'c.amount_ht'=>"order", 'c.remise_percent'=>"order", 'c.total_ht'=>"order", 'c.total_ttc'=>"order", 'c.facture'=>"order", 'c.fk_statut'=>"order", 'c.note'=>"order", 'c.date_livraison'=>"order", 'pj.ref'=>'project', 'cd.rowid'=>'order_line', 'cd.label'=>"order_line", 'cd.description'=>"order_line", 'cd.product_type'=>'order_line', 'cd.tva_tx'=>"order_line", 'cd.qty'=>"order_line", 'cd.total_ht'=>"order_line", 'cd.total_tva'=>"order_line", 'cd.total_ttc'=>"order_line", 'p.rowid'=>'product', 'p.ref'=>'product', 'p.label'=>'product');
+		$this->export_dependencies_array[$r] = array('order_line'=>'cd.rowid', 'product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		$keyforselect = 'commande'; $keyforelement = 'order'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect='commandedet'; $keyforelement='order_line'; $keyforaliasextra='extra2';
+		$keyforselect = 'commandedet'; $keyforelement = 'order_line'; $keyforaliasextra = 'extra2';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect='product'; $keyforelement='product'; $keyforaliasextra='extra3';
+		$keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra3';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande as c';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON c.fk_projet = pj.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON c.fk_user_author = uc.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON c.fk_user_valid = uv.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'commande_extrafields as extra ON c.rowid = extra.fk_object';
-		$this->export_sql_end[$r] .=' , '.MAIN_DB_PREFIX.'commandedet as cd';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'commandedet_extrafields as extra2 on cd.rowid = extra2.fk_object';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
-		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_commande';
-		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('commande').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.(empty($user)?0:$user->id);
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
+		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'commande as c';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON c.fk_projet = pj.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON c.fk_user_author = uc.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON c.fk_user_valid = uv.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande_extrafields as extra ON c.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .= ' , '.MAIN_DB_PREFIX.'commandedet as cd';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commandedet_extrafields as extra2 on cd.rowid = extra2.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
+		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_commande';
+		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('commande').')';
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
 	}
 
 
@@ -230,27 +230,27 @@ 
      *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		// Permissions
 		$this->remove($options);
 
 		//ODT template
-		$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/orders/template_order.odt';
-		$dirodt=DOL_DATA_ROOT.'/doctemplates/orders';
-		$dest=$dirodt.'/template_order.odt';
+		$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/orders/template_order.odt';
+		$dirodt = DOL_DATA_ROOT.'/doctemplates/orders';
+		$dest = $dirodt.'/template_order.odt';
 
-		if (file_exists($src) && ! file_exists($dest))
+		if (file_exists($src) && !file_exists($dest))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
-			$result=dol_copy($src,$dest,0,0);
+			$result = dol_copy($src, $dest, 0, 0);
 			if ($result < 0)
 			{
 				$langs->load("errors");
-				$this->error=$langs->trans('ErrorFailToCopyFile',$src,$dest);
+				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
 			}
 		}
@@ -260,6 +260,6 @@ 
 				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','order',".$conf->entity.")"
 		);
 
-		 return $this->_init($sql,$options);
+		 return $this->_init($sql, $options);
 	}
 }

Braces +6 added lines, -2 removed lines

@@ -204,7 +204,9 @@ 
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande as c';
@@ -218,7 +220,9 @@ 
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_commande';
 		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('commande').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.(empty($user)?0:$user->id);
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .=' AND sc.fk_user = '.(empty($user)?0:$user->id);
+		}
 	}
 
 

htdocs/core/modules/modVariants.class.php

Spacing +17 added lines, -17 removed lines

@@ -26,7 +26,7 @@ 
  *  \ingroup    produit
  *  \brief      File to describe module to manage catalog of predefined products
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -41,7 +41,7 @@ 
 	 */
 	public function __construct($db)
 	{
-		global $langs,$conf;
+		global $langs, $conf;
 
 		$this->db = $db;
 
@@ -55,7 +55,7 @@ 
 		// It is used to group modules in module setup page
 		$this->family = "products";
 		// 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 = 'Allows creating products variant based on new attributes';
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
@@ -67,7 +67,7 @@ 
 		// Name of image file used for this module.
 		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
 		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='product';
+		$this->picto = 'product';
 
 		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
 		$this->module_parts = array();
@@ -82,14 +82,14 @@ 
 		);
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array(
 			'modProduct'
-		);		// 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->phpmin = array(5,0);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+		); // 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->phpmin = array(5, 0); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("products");
 
 		// Constants
@@ -101,19 +101,19 @@ 
 		);
 
 		// Dictionaries
-		if (! isset($conf->mymodule->enabled))
+		if (!isset($conf->mymodule->enabled))
 		{
-			$conf->mymodule=new stdClass();
-			$conf->mymodule->enabled=0;
+			$conf->mymodule = new stdClass();
+			$conf->mymodule->enabled = 0;
 		}
-		$this->dictionaries=array();
+		$this->dictionaries = array();
 
 		// Boxes
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
-		$this->boxes = array();			// List of boxes
+		$this->boxes = array(); // List of boxes
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
+		$this->rights = array(); // Permission array used by this module
 
 		// Main menu entries
 		$this->menu = array(
@@ -131,7 +131,7 @@ 
 				'target' => '',
 				'user' => 0
 			)
-		);			// List of menus to add
+		); // List of menus to add
 	}
 }
 

htdocs/core/modules/bank/doc/pdf_ban.modules.php

Indentation +30 added lines, -30 removed lines

@@ -109,18 +109,18 @@ 
 		{
 			//$nblignes = count($object->lines);  // This is set later with array of tasks
 
-		    // Definition of $dir and $file
-		    if ($object->specimen)
-		    {
-		        $dir = $conf->bank->dir_output;
-		        $file = $dir . "/SPECIMEN.pdf";
-		    }
-		    else
-		    {
-		        $objectref = dol_sanitizeFileName($object->ref);
-		        $dir = $conf->bank->dir_output . "/" . $objectref;
-		        $file = $dir . "/" . $objectref . ".pdf";
-		    }
+			// Definition of $dir and $file
+			if ($object->specimen)
+			{
+				$dir = $conf->bank->dir_output;
+				$file = $dir . "/SPECIMEN.pdf";
+			}
+			else
+			{
+				$objectref = dol_sanitizeFileName($object->ref);
+				$dir = $conf->bank->dir_output . "/" . $objectref;
+				$file = $dir . "/" . $objectref . ".pdf";
+			}
 		    
 			if (! file_exists($dir))
 			{
@@ -144,19 +144,19 @@ 
 				global $action;
 				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-                $pdf=pdf_getInstance($this->format);
-                $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
-                $heightforinfotot = 50;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-                $pdf->SetAutoPageBreak(1,0);
+				$pdf=pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
+				$heightforinfotot = 50;	// Height reserved to output the info and total part
+				$heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
+				$pdf->SetAutoPageBreak(1,0);
 
-                if (class_exists('TCPDF'))
-                {
-                    $pdf->setPrintHeader(false);
-                    $pdf->setPrintFooter(false);
-                }
-                $pdf->SetFont(pdf_getPDFFont($outputlangs));
+				if (class_exists('TCPDF'))
+				{
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
 				$pdf->Open();
 				$pagenb=0;
@@ -182,7 +182,7 @@ 
 				$tab_top = 50;
 				$tab_height = 200;
 				$tab_top_newpage = 40;
-                $tab_height_newpage = 210;
+				$tab_height_newpage = 210;
 
 				// Affiche notes
 				if (! empty($object->note_public))
@@ -279,7 +279,7 @@ 
 	{
 		global $conf,$mysoc;
 
-        $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 
 	}
@@ -304,7 +304,7 @@ 
 		$pdf->SetTextColor(0,0,60);
 		$pdf->SetFont('','B', $default_font_size + 3);
 
-        $posx=$this->page_largeur-$this->marge_droite-100;
+		$posx=$this->page_largeur-$this->marge_droite-100;
 		$posy=$this->marge_haute;
 
 		$pdf->SetXY($this->marge_gauche,$posy);
@@ -315,8 +315,8 @@ 
 		{
 			if (is_readable($logo))
 			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+				$height=pdf_getHeightForLogo($logo);
+				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
 			}
 			else
 			{
@@ -373,7 +373,7 @@ 
 
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
+	 *
 	 *   	@param	PDF			$pdf     			PDF
 	 * 		@param	Project		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output

Spacing +91 added lines, -91 removed lines

@@ -35,7 +35,7 @@ 
 
 class pdf_ban extends ModeleBankAccountDoc
 {
-	var $emetteur;	// Objet societe qui emet
+	var $emetteur; // Objet societe qui emet
 	var $version = 'development';
 	
 	/**
@@ -45,7 +45,7 @@ 
 	 */
 	function __construct($db)
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		$langs->load("main");
 		$langs->load("bank");
@@ -58,30 +58,30 @@ 
 		
 		// Dimension page pour format A4
 		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
+		$formatarray = pdf_getFormat();
 		$this->page_largeur = $formatarray['width'];
 		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1;                    // Affiche logo FAC_PDF_LOGO
-		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_codeproduitservice = 1;      // Affiche code produit-service
+		$this->option_logo = 1; // Affiche logo FAC_PDF_LOGO
+		$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
+		$this->option_codeproduitservice = 1; // Affiche code produit-service
 
 		// Recupere emmetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 
 		// Defini position des colonnes
-		$this->posxref=$this->marge_gauche+1;
-		$this->posxlabel=$this->marge_gauche+25;
-		$this->posxworkload=$this->marge_gauche+100;
-		$this->posxprogress=$this->marge_gauche+130;
-		$this->posxdatestart=$this->marge_gauche+150;
-		$this->posxdateend=$this->marge_gauche+170;
+		$this->posxref = $this->marge_gauche + 1;
+		$this->posxlabel = $this->marge_gauche + 25;
+		$this->posxworkload = $this->marge_gauche + 100;
+		$this->posxprogress = $this->marge_gauche + 130;
+		$this->posxdatestart = $this->marge_gauche + 150;
+		$this->posxdateend = $this->marge_gauche + 170;
 	}
 
 
@@ -92,13 +92,13 @@ 
 	 *	@param	Translate	$outputlangs	Lang output object
 	 *	@return	int         				1 if OK, <=0 if KO
 	 */
-	function write_file($object,$outputlangs)
+	function write_file($object, $outputlangs)
 	{
 		global $conf, $hookmanager, $langs, $user;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -113,20 +113,20 @@ 
 		    if ($object->specimen)
 		    {
 		        $dir = $conf->bank->dir_output;
-		        $file = $dir . "/SPECIMEN.pdf";
+		        $file = $dir."/SPECIMEN.pdf";
 		    }
 		    else
 		    {
 		        $objectref = dol_sanitizeFileName($object->ref);
-		        $dir = $conf->bank->dir_output . "/" . $objectref;
-		        $file = $dir . "/" . $objectref . ".pdf";
+		        $dir = $conf->bank->dir_output."/".$objectref;
+		        $file = $dir."/".$objectref.".pdf";
 		    }
 		    
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
@@ -134,22 +134,22 @@ 
 			if (file_exists($dir))
 			{
 				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
+				if (!is_object($hookmanager))
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
+					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
-				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-                $pdf=pdf_getInstance($this->format);
-                $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
-                $heightforinfotot = 50;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-                $pdf->SetAutoPageBreak(1,0);
+                $pdf = pdf_getInstance($this->format);
+                $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+                $heightforinfotot = 50; // Height reserved to output the info and total part
+		        $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+	            $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+                $pdf->SetAutoPageBreak(1, 0);
 
                 if (class_exists('TCPDF'))
                 {
@@ -159,25 +159,25 @@ 
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
 
 				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("BAN"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("BAN"));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
 				$pdf->AddPage();
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', $default_font_size - 1);
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
-				$pdf->SetTextColor(0,0,0);
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
 
 				$tab_top = 50;
 				$tab_height = 200;
@@ -185,23 +185,23 @@ 
                 $tab_height_newpage = 210;
 
 				// Affiche notes
-				if (! empty($object->note_public))
+				if (!empty($object->note_public))
 				{
-					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxref-1, $tab_top-2, dol_htmlentitiesbr($object->note_public), 0, 1);
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxref - 1, $tab_top - 2, dol_htmlentitiesbr($object->note_public), 0, 1);
 					$nexY = $pdf->GetY();
-					$height_note=$nexY-($tab_top-2);
+					$height_note = $nexY - ($tab_top - 2);
 
 					// Rect prend une longueur en 3eme param
-					$pdf->SetDrawColor(192,192,192);
-					$pdf->Rect($this->marge_gauche, $tab_top-3, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+					$pdf->SetDrawColor(192, 192, 192);
+					$pdf->Rect($this->marge_gauche, $tab_top - 3, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_note + 1);
 
 					$tab_height = $tab_height - $height_note;
-					$tab_top = $nexY+6;
+					$tab_top = $nexY + 6;
 				}
 				else
 				{
-					$height_note=0;
+					$height_note = 0;
 				}
 
 				$iniY = $tab_top + 7;
@@ -217,50 +217,50 @@ 
 				if ($pagenb == 1)
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 				else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 
 				/*
 				 * Pied de page
 				 */
-				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				$this->_pagefoot($pdf, $object, $outputlangs);
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->Close();
 
-				$pdf->Output($file,'F');
+				$pdf->Output($file, 'F');
 
 				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
+				if (!is_object($hookmanager))
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
+					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
-				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 				$this->result = array('fullpath'=>$file);
 				
-				return 1;   // Pas d'erreur
+				return 1; // Pas d'erreur
 			}
 			else
 			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
 
-		$this->error=$langs->transnoentities("ErrorConstantNotDefined","LIVRAISON_OUTPUTDIR");
+		$this->error = $langs->transnoentities("ErrorConstantNotDefined", "LIVRAISON_OUTPUTDIR");
 		return 0;
 	}
 
@@ -277,9 +277,9 @@ 
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
-		global $conf,$mysoc;
+		global $conf, $mysoc;
 
         $default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -297,55 +297,55 @@ 
 	 */
 	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
-		global $langs,$conf,$mysoc;
+		global $langs, $conf, $mysoc;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-        $posx=$this->page_largeur-$this->marge_droite-100;
-		$posy=$this->marge_haute;
+        $posx = $this->page_largeur - $this->marge_droite - 100;
+		$posy = $this->marge_haute;
 
-		$pdf->SetXY($this->marge_gauche,$posy);
+		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
-		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 		if ($mysoc->logo)
 		{
 			if (is_readable($logo))
 			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+			    $height = pdf_getHeightForLogo($logo);
+			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
 			else
 			{
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B', $default_font_size - 2);
-				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+				$pdf->SetTextColor(200, 0, 0);
+				$pdf->SetFont('', 'B', $default_font_size - 2);
+				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
 		}
 		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
-		$pdf->SetFont('','B', $default_font_size + 3);
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("BAN")." ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
-		$pdf->SetFont('','', $default_font_size + 2);
+		$pdf->SetFont('', '', $default_font_size + 2);
 
-		$posy+=6;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dol_print_date(dol_now(),'day',false,$outputlangs,true), '', 'R');
+		$posy += 6;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".dol_print_date(dol_now(), 'day', false, $outputlangs, true), '', 'R');
 		/*$posy+=6;
 		$pdf->SetXY($posx,$posy);
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateEnd")." : " . dol_print_date($object->date_end,'day',false,$outputlangs,true), '', 'R');
 		*/
 
-		$pdf->SetTextColor(0,0,60);
+		$pdf->SetTextColor(0, 0, 60);
 
 		// Add list of linked objects
 		/* Removed: A project can have more than thousands linked objects (orders, invoices, proposals, etc....
@@ -382,10 +382,10 @@ 
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	integer
 	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+	function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		//return pdf_pagefoot($pdf,$outputlangs,'BANK_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
 

Braces +26 added lines, -18 removed lines

@@ -73,7 +73,10 @@ 
 
 		// Recupere emmetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		if (! $this->emetteur->country_code) {
+			$this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default if not defined
 
 		// Defini position des colonnes
 		$this->posxref=$this->marge_gauche+1;
@@ -96,9 +99,13 @@ 
 	{
 		global $conf, $hookmanager, $langs, $user;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+			$outputlangs=$langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (! empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output='ISO-8859-1';
+		}
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -114,8 +121,7 @@ 
 		    {
 		        $dir = $conf->bank->dir_output;
 		        $file = $dir . "/SPECIMEN.pdf";
-		    }
-		    else
+		    } else
 		    {
 		        $objectref = dol_sanitizeFileName($object->ref);
 		        $dir = $conf->bank->dir_output . "/" . $objectref;
@@ -167,7 +173,9 @@ 
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("BAN"));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 
@@ -198,8 +206,7 @@ 
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY+6;
-				}
-				else
+				} else
 				{
 					$height_note=0;
 				}
@@ -218,8 +225,7 @@ 
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
+				} else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
@@ -229,7 +235,9 @@ 
 				 * Pied de page
 				 */
 				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -246,14 +254,14 @@ 
 				global $action;
 				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+								@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 				
 				return 1;   // Pas d'erreur
-			}
-			else
+			} else
 			{
 				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return 0;
@@ -319,16 +327,16 @@ 
 			{
 			    $height=pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-			}
-			else
+			} else
 			{
 				$pdf->SetTextColor(200,0,0);
 				$pdf->SetFont('','B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
+		} else {
+			$pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('','B', $default_font_size + 3);
 		$pdf->SetXY($posx,$posy);