Dolibarr / dolibarr

htdocs/core/modules/commande/modules_commande.php

Spacing +8 added lines, -8 removed lines

@@ -30,7 +30,7 @@ 
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';	// required for use by classes that inherit
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // required for use by classes that inherit
 require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
 
@@ -39,7 +39,7 @@ 
  */
 abstract class ModelePDFCommandes extends CommonDocGenerator
 {
-	var $error='';
+	var $error = '';
 
 	/**
 	 *  Return list of active generation modules
@@ -48,15 +48,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='order';
-		$liste=array();
+		$type = 'order';
+		$liste = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		$liste = getListOfModels($db, $type, $maxfilenamelength);
 
 		return $liste;
 	}
@@ -71,7 +71,7 @@ 
 
 abstract class ModeleNumRefCommandes
 {
-	var $error='';
+	var $error = '';
 
 	/**
 	 *	Return if a module can be used or not
@@ -124,7 +124,7 @@ 
 	 *	@param	Object		$object		Object we need next value for
 	 *	@return	string      Valeur
 	 */
-	function getNextValue($objsoc,$object)
+	function getNextValue($objsoc, $object)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");

Braces +12 added lines, -4 removed lines

@@ -140,10 +140,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");
 	}
 }
\ No newline at end of file

Indentation +3 added lines, -3 removed lines

@@ -37,9 +37,9 @@
 	/**
 	 *  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
+	 *  @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)
 	{

htdocs/core/modules/modIncoterm.class.php

Indentation +18 added lines, -18 removed lines

@@ -40,9 +40,9 @@ 
 	 */
 	function __construct($db)
 	{
-        global $langs,$conf;
+		global $langs,$conf;
 
-        $this->db = $db;
+		$this->db = $db;
 
 		// Id for module (must be unique).
 		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
@@ -77,28 +77,28 @@ 
 			array('INCOTERM_ACTIVATE', 'chaine', 0, 'Description de INCOTERM_ACTIVATE')
 		);
 
-        $this->tabs = array();
+		$this->tabs = array();
 
-        // Dictionaries
+		// Dictionaries
 		if (! isset($conf->incoterm->enabled))
-        {
-        	$conf->incoterm=new stdClass();
-        	$conf->incoterm->enabled=0;
-        }
+		{
+			$conf->incoterm=new stdClass();
+			$conf->incoterm->enabled=0;
+		}
 		$this->dictionaries=array(
 			'langs'=>'incoterm',
-            'tabname'=>array(MAIN_DB_PREFIX."c_incoterms"),		// List of tables we want to see into dictonnary editor
-            'tablib'=>array("Incoterms"),													// Label of tables
-            'tabsql'=>array('SELECT rowid, code, libelle, active FROM '.MAIN_DB_PREFIX.'c_incoterms'),	// Request to select fields
-            'tabsqlsort'=>array("rowid ASC"),															// Sort order
-            'tabfield'=>array("code,libelle"),															// List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array("code,libelle"),														// List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array("code,libelle"),													// List of fields (list of fields for insert)
-            'tabrowid'=>array("rowid"),																	// Name of columns with primary key (try to always name it 'rowid')
-            'tabcond'=>array($conf->incoterm->enabled)
+			'tabname'=>array(MAIN_DB_PREFIX."c_incoterms"),		// List of tables we want to see into dictonnary editor
+			'tablib'=>array("Incoterms"),													// Label of tables
+			'tabsql'=>array('SELECT rowid, code, libelle, active FROM '.MAIN_DB_PREFIX.'c_incoterms'),	// Request to select fields
+			'tabsqlsort'=>array("rowid ASC"),															// Sort order
+			'tabfield'=>array("code,libelle"),															// List of fields (result of select to show dictionary)
+			'tabfieldvalue'=>array("code,libelle"),														// List of fields (list of fields to edit a record)
+			'tabfieldinsert'=>array("code,libelle"),													// List of fields (list of fields for insert)
+			'tabrowid'=>array("rowid"),																	// Name of columns with primary key (try to always name it 'rowid')
+			'tabcond'=>array($conf->incoterm->enabled)
 		);
 
-        $this->boxes = array();			// List of boxes
+		$this->boxes = array();			// List of boxes
 		$r=0;
 
 		// Permissions

Spacing +26 added lines, -26 removed lines

@@ -25,7 +25,7 @@ 
  *  \ingroup    mymodule
  *  \brief      Description and activation file for module MyModule
  */
-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;
 
@@ -52,14 +52,14 @@ 
 
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		$this->family = "srm";
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Incoterm management";
 		$this->version = 'dolibarr';
 		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
 		$this->special = 0;
-		$this->picto='generic';
+		$this->picto = 'generic';
 
 		$this->module_parts = array();
 		$this->dirs = array();
@@ -67,10 +67,10 @@ 
 		$this->config_page_url = array();
 
 		// Dependencies
-		$this->depends = array();		// List of modules id that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of modules id to disable if this one is disabled
-		$this->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(); // 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->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("incoterm");
 
 		$this->const = array(
@@ -80,33 +80,33 @@ 
         $this->tabs = array();
 
         // Dictionaries
-		if (! isset($conf->incoterm->enabled))
+		if (!isset($conf->incoterm->enabled))
         {
-        	$conf->incoterm=new stdClass();
-        	$conf->incoterm->enabled=0;
+        	$conf->incoterm = new stdClass();
+        	$conf->incoterm->enabled = 0;
         }
-		$this->dictionaries=array(
+		$this->dictionaries = array(
 			'langs'=>'incoterm',
-            'tabname'=>array(MAIN_DB_PREFIX."c_incoterms"),		// List of tables we want to see into dictonnary editor
-            'tablib'=>array("Incoterms"),													// Label of tables
-            'tabsql'=>array('SELECT rowid, code, libelle, active FROM '.MAIN_DB_PREFIX.'c_incoterms'),	// Request to select fields
-            'tabsqlsort'=>array("rowid ASC"),															// Sort order
-            'tabfield'=>array("code,libelle"),															// List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array("code,libelle"),														// List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array("code,libelle"),													// List of fields (list of fields for insert)
-            'tabrowid'=>array("rowid"),																	// Name of columns with primary key (try to always name it 'rowid')
+            'tabname'=>array(MAIN_DB_PREFIX."c_incoterms"), // List of tables we want to see into dictonnary editor
+            'tablib'=>array("Incoterms"), // Label of tables
+            'tabsql'=>array('SELECT rowid, code, libelle, active FROM '.MAIN_DB_PREFIX.'c_incoterms'), // Request to select fields
+            'tabsqlsort'=>array("rowid ASC"), // Sort order
+            'tabfield'=>array("code,libelle"), // List of fields (result of select to show dictionary)
+            'tabfieldvalue'=>array("code,libelle"), // List of fields (list of fields to edit a record)
+            'tabfieldinsert'=>array("code,libelle"), // List of fields (list of fields for insert)
+            'tabrowid'=>array("rowid"), // Name of columns with primary key (try to always name it 'rowid')
             'tabcond'=>array($conf->incoterm->enabled)
 		);
 
-        $this->boxes = array();			// List of boxes
-		$r=0;
+        $this->boxes = array(); // List of boxes
+		$r = 0;
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
 		// Main menu entries
-		$this->menus = array();			// List of menus to add
-		$r=0;
+		$this->menus = array(); // List of menus to add
+		$r = 0;
 	}
 }

htdocs/core/modules/fichinter/modules_fichinter.php

Indentation +23 added lines, -23 removed lines

@@ -40,9 +40,9 @@ 
 	/**
 	 *	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
+	 *  @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)
 	{
@@ -178,11 +178,11 @@ 
 
 	// 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];
-    }
+	if (! empty($tmp[1]))
+	{
+		$modele=$tmp[0];
+		$srctemplatepath=$tmp[1];
+	}
 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
@@ -190,21 +190,21 @@ 
 	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
 	foreach($dirmodels as $reldir)
 	{
-    	foreach(array('doc','pdf') as $prefix)
-    	{
-    	    $file = $prefix."_".$modele.".modules.php";
-
-    		// On verifie l'emplacement du modele
-	        $file=dol_buildpath($reldir."core/modules/fichinter/doc/".$file,0);
-    		if (file_exists($file))
-    		{
-    			$filefound=1;
-    			$classname=$prefix.'_'.$modele;
-    			break;
-    		}
-    	}
-    	if ($filefound) break;
-    }
+		foreach(array('doc','pdf') as $prefix)
+		{
+			$file = $prefix."_".$modele.".modules.php";
+
+			// On verifie l'emplacement du modele
+			$file=dol_buildpath($reldir."core/modules/fichinter/doc/".$file,0);
+			if (file_exists($file))
+			{
+				$filefound=1;
+				$classname=$prefix.'_'.$modele;
+				break;
+			}
+		}
+		if ($filefound) break;
+	}
 
 	// Charge le modele
 	if ($filefound)

Spacing +29 added lines, -29 removed lines

@@ -34,7 +34,7 @@ 
  */
 abstract class ModelePDFFicheinter extends CommonDocGenerator
 {
-	var $error='';
+	var $error = '';
 
 
 	/**
@@ -44,15 +44,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='ficheinter';
-		$liste=array();
+		$type = 'ficheinter';
+		$liste = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		$liste = getListOfModels($db, $type, $maxfilenamelength);
 
 		return $liste;
 	}
@@ -65,7 +65,7 @@ 
  */
 abstract class ModeleNumRefFicheinter
 {
-	var $error='';
+	var $error = '';
 
 	/**
 	 * 	Return if a module can be used or not
@@ -154,19 +154,19 @@ 
  *  @param  int			$hideref        Hide ref
  *  @return int         				0 if KO, 1 if OK
  */
-function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 {
-	global $conf,$langs,$user;
+	global $conf, $langs, $user;
 	$langs->load("ficheinter");
 
-	$error=0;
+	$error = 0;
 
-	$srctemplatepath='';
+	$srctemplatepath = '';
 
 	// Positionne modele sur le nom du modele de fichinter a utiliser
-	if (! dol_strlen($modele))
+	if (!dol_strlen($modele))
 	{
-		if (! empty($conf->global->FICHEINTER_ADDON_PDF))
+		if (!empty($conf->global->FICHEINTER_ADDON_PDF))
 		{
 			$modele = $conf->global->FICHEINTER_ADDON_PDF;
 		}
@@ -177,29 +177,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('doc','pdf') as $prefix)
+    	foreach (array('doc', 'pdf') as $prefix)
     	{
     	    $file = $prefix."_".$modele.".modules.php";
 
     		// On verifie l'emplacement du modele
-	        $file=dol_buildpath($reldir."core/modules/fichinter/doc/".$file,0);
+	        $file = dol_buildpath($reldir."core/modules/fichinter/doc/".$file, 0);
     		if (file_exists($file))
     		{
-    			$filefound=1;
-    			$classname=$prefix.'_'.$modele;
+    			$filefound = 1;
+    			$classname = $prefix.'_'.$modele;
     			break;
     		}
     	}
@@ -215,10 +215,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;
+		$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 old preview
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -228,14 +228,14 @@ 
 		}
 		else
 		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"fichinter_pdf_create Error: ".$obj->error);
+			$outputlangs->charset_output = $sav_charset_output;
+			dol_print_error($db, "fichinter_pdf_create Error: ".$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

@@ -133,10 +133,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");
 	}
 }
@@ -169,8 +177,7 @@ 
 		if (! empty($conf->global->FICHEINTER_ADDON_PDF))
 		{
 			$modele = $conf->global->FICHEINTER_ADDON_PDF;
-		}
-		else
+		} else
 		{
 			$modele = 'soleil';
 		}
@@ -187,7 +194,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('doc','pdf') as $prefix)
@@ -203,7 +212,9 @@ 
     			break;
     		}
     	}
-    	if ($filefound) break;
+    	if ($filefound) {
+    		break;
+    	}
     }
 
 	// Charge le modele
@@ -225,15 +236,13 @@ 
 			dol_delete_preview($object);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 			dol_print_error($db,"fichinter_pdf_create Error: ".$obj->error);
 			return 0;
 		}
-	}
-	else
+	} else
 	{
 		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
 		return 0;

htdocs/core/modules/modWorkflow.class.php

Indentation +67 added lines, -67 removed lines

@@ -32,64 +32,64 @@ 
 class modWorkflow extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-
-        // Id for module (must be unique).
-        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-        $this->numero = 6000 ;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'workflow';
-
-        $this->family = "technic";
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i','',get_class($this));
-        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-        $this->description = "Workflow management";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-        $this->special = 2;
-        // Name of png file (without png) 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='technic';
-
-        // Data directories to create when module is enabled
-        $this->dirs = array("/workflow/temp");
-
-        // Config pages. Put here list of php page names stored in admmin directory used to setup module.
-        $this->config_page_url = array('workflow.php');
-
-        // Dependencies
-        $this->depends = array();       // List of modules id that must be enabled if this module is enabled
-        $this->requiredby = array();    // List of modules id to disable if this one is disabled
-        $this->phpmin = array(5,2);                 // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(2,8);  // Minimum version of Dolibarr required by module
-        $this->langfiles = array("@workflow");
-
-        // Constants
-        // List of particular constants to add when module is enabled
-        //Example: $this->const=array(0=>array('MODULE_MY_NEW_CONST1','chaine','myvalue','This is a constant to add',0),
-        //                            1=>array('MODULE_MY_NEW_CONST2','chaine','myvalue','This is another constant to add',0) );
-        $this->const=array();
-
-        // Boxes
-        $this->boxes = array();
-
-        // Permissions
-        $this->rights = array();
-        $r=0;
-
-        /*
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 6000 ;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'workflow';
+
+		$this->family = "technic";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i','',get_class($this));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Workflow management";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
+		$this->special = 2;
+		// Name of png file (without png) 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='technic';
+
+		// Data directories to create when module is enabled
+		$this->dirs = array("/workflow/temp");
+
+		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
+		$this->config_page_url = array('workflow.php');
+
+		// Dependencies
+		$this->depends = array();       // List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array();    // List of modules id to disable if this one is disabled
+		$this->phpmin = array(5,2);                 // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(2,8);  // Minimum version of Dolibarr required by module
+		$this->langfiles = array("@workflow");
+
+		// Constants
+		// List of particular constants to add when module is enabled
+		//Example: $this->const=array(0=>array('MODULE_MY_NEW_CONST1','chaine','myvalue','This is a constant to add',0),
+		//                            1=>array('MODULE_MY_NEW_CONST2','chaine','myvalue','This is another constant to add',0) );
+		$this->const=array();
+
+		// Boxes
+		$this->boxes = array();
+
+		// Permissions
+		$this->rights = array();
+		$r=0;
+
+		/*
         $r++;
         $this->rights[$r][0] = 6001; // id de la permission
         $this->rights[$r][1] = "Lire les workflow"; // libelle de la permission
@@ -98,10 +98,10 @@ 
         $this->rights[$r][4] = 'read';
         */
 
-        // Main menu entries
-        $this->menus = array();         // List of menus to add
-        $r=0;
-        /*
+		// Main menu entries
+		$this->menus = array();         // List of menus to add
+		$r=0;
+		/*
         $this->menu[$r]=array('fk_menu'=>0,
                                 'type'=>'top',
                                 'titre'=>'Workflow',
@@ -128,24 +128,24 @@ 
                                 'user'=>0);
         $r++;
         */
-    }
+	}
 
 
-    /**
+	/**
 	 *		Function called when module is enabled.
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
-     */
-    function init($options='')
-    {
+	 */
+	function init($options='')
+	{
 		// Permissions
 		$this->remove($options);
 
 		$sql = array();
 
-        return $this->_init($sql,$options);
-    }
+		return $this->_init($sql,$options);
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
  *      \ingroup    workflow
  *      \brief      File to describe and activate module Workflow
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -43,13 +43,13 @@ 
 
         // Id for module (must be unique).
         // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-        $this->numero = 6000 ;
+        $this->numero = 6000;
         // Key text used to identify module (for permissions, menus, etc...)
         $this->rights_class = 'workflow';
 
         $this->family = "technic";
         // 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 = "Workflow management";
         // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
@@ -61,7 +61,7 @@ 
         // Name of png file (without png) 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='technic';
+        $this->picto = 'technic';
 
         // Data directories to create when module is enabled
         $this->dirs = array("/workflow/temp");
@@ -70,24 +70,24 @@ 
         $this->config_page_url = array('workflow.php');
 
         // Dependencies
-        $this->depends = array();       // List of modules id that must be enabled if this module is enabled
-        $this->requiredby = array();    // List of modules id to disable if this one is disabled
-        $this->phpmin = array(5,2);                 // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(2,8);  // Minimum version of Dolibarr required by module
+        $this->depends = array(); // List of modules id that must be enabled if this module is enabled
+        $this->requiredby = array(); // List of modules id to disable if this one is disabled
+        $this->phpmin = array(5, 2); // Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(2, 8); // Minimum version of Dolibarr required by module
         $this->langfiles = array("@workflow");
 
         // Constants
         // List of particular constants to add when module is enabled
         //Example: $this->const=array(0=>array('MODULE_MY_NEW_CONST1','chaine','myvalue','This is a constant to add',0),
         //                            1=>array('MODULE_MY_NEW_CONST2','chaine','myvalue','This is another constant to add',0) );
-        $this->const=array();
+        $this->const = array();
 
         // Boxes
         $this->boxes = array();
 
         // Permissions
         $this->rights = array();
-        $r=0;
+        $r = 0;
 
         /*
         $r++;
@@ -99,8 +99,8 @@ 
         */
 
         // Main menu entries
-        $this->menus = array();         // List of menus to add
-        $r=0;
+        $this->menus = array(); // List of menus to add
+        $r = 0;
         /*
         $this->menu[$r]=array('fk_menu'=>0,
                                 'type'=>'top',
@@ -139,13 +139,13 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
      */
-    function init($options='')
+    function init($options = '')
     {
 		// Permissions
 		$this->remove($options);
 
 		$sql = array();
 
-        return $this->_init($sql,$options);
+        return $this->_init($sql, $options);
     }
 }

htdocs/core/modules/modTax.class.php

Indentation +7 added lines, -7 removed lines

@@ -149,14 +149,14 @@ 
 		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r]=array('t'=>MAIN_DB_PREFIX.'chargesociales');
 		$this->import_fields_array[$r]=array('t.libelle'=>"Label*",'t.fk_type'=>"Type",
-		    't.amount'=>"Amount*",'t.date_ech'=>"DateDue*",'t.periode'=>"PeriodEndDate*"
+			't.amount'=>"Amount*",'t.date_ech'=>"DateDue*",'t.periode'=>"PeriodEndDate*"
 		);
 		
 		$this->import_convertvalue_array[$r]=array(
-		    't.fk_type'=>array('rule'=>'fetchidfromref','classfile'=>'/compta/sociales/class/cchargesociales.class.php','class'=>'Cchargesociales','method'=>'fetch','element'=>'Cchargesociales')
+			't.fk_type'=>array('rule'=>'fetchidfromref','classfile'=>'/compta/sociales/class/cchargesociales.class.php','class'=>'Cchargesociales','method'=>'fetch','element'=>'Cchargesociales')
 		);
 		$this->import_examplevalues_array[$r]=array('t.libelle'=>"Social/fiscal contribution",'t.fk_type'=>"TAXPRO (must be id or code found into dictionary)",
-		    't.date_ech'=>"2016-01-01", 't.periode'=>"2016-01-01"
+			't.date_ech'=>"2016-01-01", 't.periode'=>"2016-01-01"
 		);
 		
 		// Import Taxes
@@ -167,14 +167,14 @@ 
 		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r]=array('t'=>MAIN_DB_PREFIX.'tva');
 		$this->import_fields_array[$r]=array('t.datep'=>"DatePayment*",'t.datev'=>"DateValue*",'t.label'=>"Label*",'t.fk_typepayment'=>"PaymentMode*",
-		    't.amount'=>"Amount*",'t.num_payment'=>'Numero'
+			't.amount'=>"Amount*",'t.num_payment'=>'Numero'
 		);
 		
 		$this->import_convertvalue_array[$r]=array(
-		    't.fk_typepayment'=>array('rule'=>'fetchidfromref','classfile'=>'/compta/paiement/class/cpaiement.class.php','class'=>'Cpaiement','method'=>'fetch','element'=>'Cpaiement')
+			't.fk_typepayment'=>array('rule'=>'fetchidfromref','classfile'=>'/compta/paiement/class/cpaiement.class.php','class'=>'Cpaiement','method'=>'fetch','element'=>'Cpaiement')
 		);
 		$this->import_examplevalues_array[$r]=array('t.label'=>"VAT Payment 1st quarter 2016",'t.fk_typepayment'=>"CHQ (must be id or code found into dictionary)",
-		    't.datep'=>"2016-04-02", 't.datev'=>"2016-03-31", 't.amount'=>1000, 't.num_payment'=>'123456'
+			't.datep'=>"2016-04-02", 't.datev'=>"2016-03-31", 't.amount'=>1000, 't.num_payment'=>'123456'
 		);
 		
 	}
@@ -185,7 +185,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 +41 added lines, -41 removed lines

@@ -27,7 +27,7 @@ 
  *      \ingroup    tax
  *      \brief      Fichier de description et activation du module Taxe
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -50,7 +50,7 @@ 
 
 		$this->family = "financial";
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		// Module description used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
 		$this->description = "Gestion des taxes, charges sociales et dividendes";
 
@@ -59,7 +59,7 @@ 
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->special = 0;
-		$this->picto='bill';
+		$this->picto = 'bill';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/tax/temp");
@@ -71,7 +71,7 @@ 
 		$this->depends = array();
 		$this->requiredby = array();
 		$this->conflictwith = array();
-		$this->langfiles = array("compta","bills");
+		$this->langfiles = array("compta", "bills");
 
 		// Constants
 		$this->const = array();
@@ -82,7 +82,7 @@ 
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'tax';
-		$r=0;
+		$r = 0;
 
 		$r++;
 		$this->rights[$r][0] = 91;
@@ -120,60 +120,60 @@ 
 		// 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]='Taxes et charges sociales, et leurs reglements';
-		$this->export_permission[$r]=array(array("tax","charges","export"));
-		$this->export_fields_array[$r]=array('cc.libelle'=>"Type",'c.rowid'=>"IdSocialContribution",'c.libelle'=>"Label",'c.date_ech'=>'DateDue','c.periode'=>'Period','c.amount'=>"AmountExpected","c.paye"=>"Status",'p.rowid'=>'PaymentId','p.datep'=>'DatePayment','p.amount'=>'AmountPayment','p.num_paiement'=>'Numero');
-		$this->export_TypeFields_array[$r]=array('cc.libelle'=>"List:c_chargesociales:libelle:id",'c.libelle'=>"Text",'c.date_ech'=>'Date','c.periode'=>'Period','c.amount'=>"Numeric","c.paye"=>"Boolean",'p.datep'=>'Date','p.amount'=>'Numeric','p.num_paiement'=>'Numeric');
-		$this->export_entities_array[$r]=array('cc.libelle'=>"tax_type",'c.rowid'=>"tax",'c.libelle'=>'tax','c.date_ech'=>'tax','c.periode'=>'tax','c.amount'=>"tax","c.paye"=>"tax",'p.rowid'=>'payment','p.datep'=>'payment','p.amount'=>'payment','p.num_paiement'=>'payment');
-
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'c_chargesociales as cc, '.MAIN_DB_PREFIX.'chargesociales as c';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementcharge as p ON p.fk_charge = c.rowid';
-		$this->export_sql_end[$r] .=' WHERE c.fk_type = cc.id';
-		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('tax').')';
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'Taxes et charges sociales, et leurs reglements';
+		$this->export_permission[$r] = array(array("tax", "charges", "export"));
+		$this->export_fields_array[$r] = array('cc.libelle'=>"Type", 'c.rowid'=>"IdSocialContribution", 'c.libelle'=>"Label", 'c.date_ech'=>'DateDue', 'c.periode'=>'Period', 'c.amount'=>"AmountExpected", "c.paye"=>"Status", 'p.rowid'=>'PaymentId', 'p.datep'=>'DatePayment', 'p.amount'=>'AmountPayment', 'p.num_paiement'=>'Numero');
+		$this->export_TypeFields_array[$r] = array('cc.libelle'=>"List:c_chargesociales:libelle:id", 'c.libelle'=>"Text", 'c.date_ech'=>'Date', 'c.periode'=>'Period', 'c.amount'=>"Numeric", "c.paye"=>"Boolean", 'p.datep'=>'Date', 'p.amount'=>'Numeric', 'p.num_paiement'=>'Numeric');
+		$this->export_entities_array[$r] = array('cc.libelle'=>"tax_type", 'c.rowid'=>"tax", 'c.libelle'=>'tax', 'c.date_ech'=>'tax', 'c.periode'=>'tax', 'c.amount'=>"tax", "c.paye"=>"tax", 'p.rowid'=>'payment', 'p.datep'=>'payment', 'p.amount'=>'payment', 'p.num_paiement'=>'payment');
+
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'c_chargesociales as cc, '.MAIN_DB_PREFIX.'chargesociales as c';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementcharge as p ON p.fk_charge = c.rowid';
+		$this->export_sql_end[$r] .= ' WHERE c.fk_type = cc.id';
+		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('tax').')';
 		
 		// Import social contributions
 		$r++;
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
-		$this->import_label[$r]="ImportDataset_tax_contrib";	// Translation key
-		$this->import_icon[$r]='tax';
-		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r]=array('t'=>MAIN_DB_PREFIX.'chargesociales');
-		$this->import_fields_array[$r]=array('t.libelle'=>"Label*",'t.fk_type'=>"Type",
-		    't.amount'=>"Amount*",'t.date_ech'=>"DateDue*",'t.periode'=>"PeriodEndDate*"
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = "ImportDataset_tax_contrib"; // Translation key
+		$this->import_icon[$r] = 'tax';
+		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = array('t'=>MAIN_DB_PREFIX.'chargesociales');
+		$this->import_fields_array[$r] = array('t.libelle'=>"Label*", 't.fk_type'=>"Type",
+		    't.amount'=>"Amount*", 't.date_ech'=>"DateDue*", 't.periode'=>"PeriodEndDate*"
 		);
 		
-		$this->import_convertvalue_array[$r]=array(
-		    't.fk_type'=>array('rule'=>'fetchidfromref','classfile'=>'/compta/sociales/class/cchargesociales.class.php','class'=>'Cchargesociales','method'=>'fetch','element'=>'Cchargesociales')
+		$this->import_convertvalue_array[$r] = array(
+		    't.fk_type'=>array('rule'=>'fetchidfromref', 'classfile'=>'/compta/sociales/class/cchargesociales.class.php', 'class'=>'Cchargesociales', 'method'=>'fetch', 'element'=>'Cchargesociales')
 		);
-		$this->import_examplevalues_array[$r]=array('t.libelle'=>"Social/fiscal contribution",'t.fk_type'=>"TAXPRO (must be id or code found into dictionary)",
+		$this->import_examplevalues_array[$r] = array('t.libelle'=>"Social/fiscal contribution", 't.fk_type'=>"TAXPRO (must be id or code found into dictionary)",
 		    't.date_ech'=>"2016-01-01", 't.periode'=>"2016-01-01"
 		);
 		
 		// Import Taxes
 		$r++;
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
-		$this->import_label[$r]="ImportDataset_tax_vat";	// Translation key
-		$this->import_icon[$r]='tax';
-		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r]=array('t'=>MAIN_DB_PREFIX.'tva');
-		$this->import_fields_array[$r]=array('t.datep'=>"DatePayment*",'t.datev'=>"DateValue*",'t.label'=>"Label*",'t.fk_typepayment'=>"PaymentMode*",
-		    't.amount'=>"Amount*",'t.num_payment'=>'Numero'
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = "ImportDataset_tax_vat"; // Translation key
+		$this->import_icon[$r] = 'tax';
+		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = array('t'=>MAIN_DB_PREFIX.'tva');
+		$this->import_fields_array[$r] = array('t.datep'=>"DatePayment*", 't.datev'=>"DateValue*", 't.label'=>"Label*", 't.fk_typepayment'=>"PaymentMode*",
+		    't.amount'=>"Amount*", 't.num_payment'=>'Numero'
 		);
 		
-		$this->import_convertvalue_array[$r]=array(
-		    't.fk_typepayment'=>array('rule'=>'fetchidfromref','classfile'=>'/compta/paiement/class/cpaiement.class.php','class'=>'Cpaiement','method'=>'fetch','element'=>'Cpaiement')
+		$this->import_convertvalue_array[$r] = array(
+		    't.fk_typepayment'=>array('rule'=>'fetchidfromref', 'classfile'=>'/compta/paiement/class/cpaiement.class.php', 'class'=>'Cpaiement', 'method'=>'fetch', 'element'=>'Cpaiement')
 		);
-		$this->import_examplevalues_array[$r]=array('t.label'=>"VAT Payment 1st quarter 2016",'t.fk_typepayment'=>"CHQ (must be id or code found into dictionary)",
+		$this->import_examplevalues_array[$r] = array('t.label'=>"VAT Payment 1st quarter 2016", 't.fk_typepayment'=>"CHQ (must be id or code found into dictionary)",
 		    't.datep'=>"2016-04-02", 't.datev'=>"2016-03-31", 't.amount'=>1000, 't.num_payment'=>'123456'
 		);
 		
@@ -188,7 +188,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;
 
@@ -197,6 +197,6 @@ 
 
 		$sql = array();
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

htdocs/core/modules/modPrelevement.class.php

Indentation +3 added lines, -3 removed lines

@@ -142,7 +142,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='')
@@ -153,8 +153,8 @@ 
 		$this->remove($options);
 
 		$sql = array(
-		    "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'bankaccount' AND entity = ".$conf->entity,
-		    "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','bankaccount',".$conf->entity.")",
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'bankaccount' AND entity = ".$conf->entity,
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','bankaccount',".$conf->entity.")",
 		);		
 
 		return $this->_init($sql,$options);

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
  *	\brief      	Fichier de description et activation du module Prelevement
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -50,7 +50,7 @@ 
 		$this->family = "financial";
 		$this->module_position = 520;
 		// 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 Prelevements";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
@@ -59,13 +59,13 @@ 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->special = 0;
 		// Name of png file (without png) used for this module
-		$this->picto='payment';
+		$this->picto = 'payment';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array("/prelevement/temp","/prelevement/receipts");
+		$this->dirs = array("/prelevement/temp", "/prelevement/receipts");
 
 		// Dependancies
-		$this->depends = array("modFacture","modBanque");
+		$this->depends = array("modFacture", "modBanque");
 		$this->requiredby = array();
 
 		// Config pages
@@ -73,7 +73,7 @@ 
 
 		// Constants
 		$this->const = array();
-		$r=0;
+		$r = 0;
 		
 		$this->const[$r][0] = "BANK_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
@@ -89,7 +89,7 @@ 
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'prelevement';
-		$r=0;
+		$r = 0;
 		$r++;
 		$this->rights[$r][0] = 151;
 		$this->rights[$r][1] = 'Read direct debit payment orders';
@@ -132,7 +132,7 @@ 
 		
 		// Menus
 		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 		
 	}
 
@@ -145,7 +145,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;
 
@@ -157,6 +157,6 @@ 
 		    "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','bankaccount',".$conf->entity.")",
 		);		
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

htdocs/core/modules/member/modules_cards.php

Spacing +32 added lines, -32 removed lines

@@ -34,7 +34,7 @@ 
  */
 class ModelePDFCards
 {
-	var $error='';
+	var $error = '';
 
 
 	/**
@@ -44,15 +44,15 @@ 
 	 *	@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)
 	{
 		global $conf;
 
-		$type='member';
-		$liste=array();
+		$type = 'member';
+		$liste = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		$liste = getListOfModels($db, $type, $maxfilenamelength);
 
 		return $liste;
 	}
@@ -70,26 +70,26 @@ 
  *	@param	string		$template		pdf generenate document class to use default 'standard'
  *	@return int							<0 if KO, >0 if OK
  */
-function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $outputdir='', $template='standard')
+function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $outputdir = '', $template = 'standard')
 {
-	global $conf,$langs;
+	global $conf, $langs;
 	$langs->load("members");
 
-	$error=0;
+	$error = 0;
 	
 	// Increase limit for PDF build
-	$err=error_reporting();
+	$err = error_reporting();
 	error_reporting(0);
 	@set_time_limit(120);
 	error_reporting($err);
 	
-	$code='';
-	$srctemplatepath='';
+	$code = '';
+	$srctemplatepath = '';
 	
 	// Positionne le modele sur le nom du modele a utiliser
-	if (! dol_strlen($modele))
+	if (!dol_strlen($modele))
 	{
-		if (! empty($conf->global->ADHERENT_CARDS_ADDON_PDF))
+		if (!empty($conf->global->ADHERENT_CARDS_ADDON_PDF))
 		{
 			$code = $conf->global->ADHERENT_CARDS_ADDON_PDF;
 		}
@@ -98,33 +98,33 @@ 
 			$code = $modele;
 		}
 	}
-	else $code=$modele;
+	else $code = $modele;
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$template,2);
-	if (! empty($tmp[1]))
+	$tmp = explode(':', $template, 2);
+	if (!empty($tmp[1]))
 	{
-		$template=$tmp[0];
-		$srctemplatepath=$tmp[1];
+		$template = $tmp[0];
+		$srctemplatepath = $tmp[1];
 	}
-	else $srctemplatepath=$code;
+	else $srctemplatepath = $code;
 	
 	// 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('doc','pdf') as $prefix)
+		foreach (array('doc', 'pdf') as $prefix)
 		{
 			$file = $prefix."_".$template.".class.php";
 			
 			// On verifie l'emplacement du modele
-			$file=dol_buildpath($reldir."core/modules/member/doc/".$file,0);
+			$file = dol_buildpath($reldir."core/modules/member/doc/".$file, 0);
 			if (file_exists($file))
 			{
-				$filefound=1;
-				$classname=$prefix.'_'.$template;
+				$filefound = 1;
+				$classname = $prefix.'_'.$template;
 				break;
 			}
 		}
@@ -141,23 +141,23 @@ 
 
 		// 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;
+		$sav_charset_output = $outputlangs->charset_output;
 		if ($obj->write_file($arrayofmembers, $outputlangs, $srctemplatepath) > 0)
 		{
-			$outputlangs->charset_output=$sav_charset_output;
+			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
 		}
 		else
 		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"members_card_pdf_create Error: ".$obj->error);
+			$outputlangs->charset_output = $sav_charset_output;
+			dol_print_error($db, "members_card_pdf_create Error: ".$obj->error);
 			return -1;
 		}
 	}
 
 	else
 	{
-		dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file));
+		dol_print_error('', $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file));
 		return -1;
 	}
 

Braces +13 added lines, -11 removed lines

@@ -92,13 +92,13 @@ 
 		if (! empty($conf->global->ADHERENT_CARDS_ADDON_PDF))
 		{
 			$code = $conf->global->ADHERENT_CARDS_ADDON_PDF;
-		}
-		else
+		} else
 		{
 			$code = $modele;
 		}
+	} else {
+		$code=$modele;
 	}
-	else $code=$modele;
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
 	$tmp=explode(':',$template,2);
@@ -106,13 +106,16 @@ 
 	{
 		$template=$tmp[0];
 		$srctemplatepath=$tmp[1];
+	} else {
+		$srctemplatepath=$code;
 	}
-	else $srctemplatepath=$code;
 	
 	// 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('doc','pdf') as $prefix)
@@ -128,7 +131,9 @@ 
 				break;
 			}
 		}
-		if ($filefound) break;
+		if ($filefound) {
+			break;
+		}
 	}
 	
 	
@@ -146,16 +151,13 @@ 
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 			return 1;
-		}
-		else
+		} else
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 			dol_print_error($db,"members_card_pdf_create Error: ".$obj->error);
 			return -1;
 		}
-	}
-
-	else
+	} else
 	{
 		dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file));
 		return -1;

htdocs/core/modules/modExpenseReport.class.php

Indentation +3 added lines, -3 removed lines

@@ -176,9 +176,9 @@
 		$this->export_label[$r]='ListTripsAndExpenses';
 		$this->export_icon[$r]='trip';
 		$this->export_permission[$r]=array(array("expensereport","export"));
-        $this->export_fields_array[$r]=array('d.rowid'=>"TripId",'d.ref'=>'Ref','d.date_debut'=>'DateStart','d.date_fin'=>'DateEnd','d.date_create'=>'DateCreation','d.date_approve'=>'DateApprove','d.total_ht'=>"TotalHT",'d.total_tva'=>'TotalVAT','d.total_ttc'=>'TotalTTC','d.note_private'=>'NotePrivate','d.note_public'=>'NotePublic','u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>"Login",'ed.rowid'=>'LineId','tf.code'=>'Type','ed.date'=>'Date','ed.tva_tx'=>'VATRate','ed.total_ht'=>'TotalHT','ed.total_tva'=>'TotalVAT','ed.total_ttc'=>'TotalTTC','ed.comments'=>'Comment','p.rowid'=>'ProjectId','p.ref'=>'Ref');
-        $this->export_entities_array[$r]=array('u.lastname'=>'user','u.firstname'=>'user','u.login'=>'user','ed.rowid'=>'expensereport_line','ed.date'=>'expensereport_line','ed.tva_tx'=>'expensereport_line','ed.total_ht'=>'expensereport_line','ed.total_tva'=>'expensereport_line','ed.total_ttc'=>'expensereport_line','ed.comments'=>'expensereport_line','tf.code'=>'expensereport_line','p.project_ref'=>'expensereport_line','p.rowid'=>'project','p.ref'=>'project');
-        $this->export_alias_array[$r]=array('d.rowid'=>"idtrip",'d.type'=>"type",'d.note_private'=>'note_private','d.note_public'=>'note_public','u.lastname'=>'name','u.firstname'=>'firstname','u.login'=>'login');
+		$this->export_fields_array[$r]=array('d.rowid'=>"TripId",'d.ref'=>'Ref','d.date_debut'=>'DateStart','d.date_fin'=>'DateEnd','d.date_create'=>'DateCreation','d.date_approve'=>'DateApprove','d.total_ht'=>"TotalHT",'d.total_tva'=>'TotalVAT','d.total_ttc'=>'TotalTTC','d.note_private'=>'NotePrivate','d.note_public'=>'NotePublic','u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>"Login",'ed.rowid'=>'LineId','tf.code'=>'Type','ed.date'=>'Date','ed.tva_tx'=>'VATRate','ed.total_ht'=>'TotalHT','ed.total_tva'=>'TotalVAT','ed.total_ttc'=>'TotalTTC','ed.comments'=>'Comment','p.rowid'=>'ProjectId','p.ref'=>'Ref');
+		$this->export_entities_array[$r]=array('u.lastname'=>'user','u.firstname'=>'user','u.login'=>'user','ed.rowid'=>'expensereport_line','ed.date'=>'expensereport_line','ed.tva_tx'=>'expensereport_line','ed.total_ht'=>'expensereport_line','ed.total_tva'=>'expensereport_line','ed.total_ttc'=>'expensereport_line','ed.comments'=>'expensereport_line','tf.code'=>'expensereport_line','p.project_ref'=>'expensereport_line','p.rowid'=>'project','p.ref'=>'project');
+		$this->export_alias_array[$r]=array('d.rowid'=>"idtrip",'d.type'=>"type",'d.note_private'=>'note_private','d.note_public'=>'note_public','u.lastname'=>'name','u.firstname'=>'firstname','u.login'=>'login');
 		$this->export_dependencies_array[$r]=array('expensereport_line'=>'ed.rowid','type_fees'=>'tf.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
 		$this->export_sql_start[$r]='SELECT DISTINCT ';

Spacing +33 added lines, -33 removed lines

@@ -23,7 +23,7 @@ 
  *      \ingroup    expensereport
  *      \brief      Description and activation file for module ExpenseReport
  */
-include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php");
+include_once(DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php");
 
 
 /**
@@ -46,32 +46,32 @@ 
 		$this->family = "hr";
 		$this->module_position = 40;
 		// 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 = "Manage and claim expense reports (transportation, meal, ...)";
 		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->special = 0;
-		$this->picto='trip';
+		$this->picto = 'trip';
 
 		// Data directories to create when module is enabled.
 		$this->dirs = array("/expensereport/temp");
-		$r=0;
+		$r = 0;
 
 		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
 		$this->config_page_url = array('expensereport.php');
 
 		// Dependencies
-		$this->depends = array();		// List of modules id that must be enabled if this module is enabled
+		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
 		// $this->conflictwith = array("modDeplacement"); // Deactivate for access on old information
-		$this->requiredby = array();	// List of modules id to disable if this one is disabled
-		$this->phpmin = array(4,3);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,7);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("companies","trips");
+		$this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->phpmin = array(4, 3); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(3, 7); // Minimum version of Dolibarr required by module
+		$this->langfiles = array("companies", "trips");
 
 		// Constants
-		$this->const = array();			// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
-		$r=0;
+		$this->const = array(); // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
+		$r = 0;
 
 		$this->const[$r][0] = "EXPENSEREPORT_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
@@ -98,11 +98,11 @@ 
 		$this->tabs = array();
 
 		// Boxes
-		$this->boxes = array();			// List of boxes
-		$r=0;
+		$this->boxes = array(); // List of boxes
+		$r = 0;
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
+		$this->rights = array(); // Permission array used by this module
 		$this->rights_class = 'expensereport';
 
 		$this->rights[$r][0] = 771;
@@ -163,27 +163,27 @@ 
 
 		// 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]='expensereport_'.$r;
-		$this->export_label[$r]='ListTripsAndExpenses';
-		$this->export_icon[$r]='trip';
-		$this->export_permission[$r]=array(array("expensereport","export"));
-        $this->export_fields_array[$r]=array('d.rowid'=>"TripId",'d.ref'=>'Ref','d.date_debut'=>'DateStart','d.date_fin'=>'DateEnd','d.date_create'=>'DateCreation','d.date_approve'=>'DateApprove','d.total_ht'=>"TotalHT",'d.total_tva'=>'TotalVAT','d.total_ttc'=>'TotalTTC','d.note_private'=>'NotePrivate','d.note_public'=>'NotePublic','u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>"Login",'ed.rowid'=>'LineId','tf.code'=>'Type','ed.date'=>'Date','ed.tva_tx'=>'VATRate','ed.total_ht'=>'TotalHT','ed.total_tva'=>'TotalVAT','ed.total_ttc'=>'TotalTTC','ed.comments'=>'Comment','p.rowid'=>'ProjectId','p.ref'=>'Ref');
-        $this->export_entities_array[$r]=array('u.lastname'=>'user','u.firstname'=>'user','u.login'=>'user','ed.rowid'=>'expensereport_line','ed.date'=>'expensereport_line','ed.tva_tx'=>'expensereport_line','ed.total_ht'=>'expensereport_line','ed.total_tva'=>'expensereport_line','ed.total_ttc'=>'expensereport_line','ed.comments'=>'expensereport_line','tf.code'=>'expensereport_line','p.project_ref'=>'expensereport_line','p.rowid'=>'project','p.ref'=>'project');
-        $this->export_alias_array[$r]=array('d.rowid'=>"idtrip",'d.type'=>"type",'d.note_private'=>'note_private','d.note_public'=>'note_public','u.lastname'=>'name','u.firstname'=>'firstname','u.login'=>'login');
-		$this->export_dependencies_array[$r]=array('expensereport_line'=>'ed.rowid','type_fees'=>'tf.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'expensereport as d, '.MAIN_DB_PREFIX.'user as u,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expensereport_det as ed LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as tf ON ed.fk_c_type_fees = tf.id';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON ed.fk_projet = p.rowid';
-		$this->export_sql_end[$r] .=' WHERE ed.fk_expensereport = d.rowid AND d.fk_user_author = u.rowid';
-		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('expensereport').')';
+		$this->export_code[$r] = 'expensereport_'.$r;
+		$this->export_label[$r] = 'ListTripsAndExpenses';
+		$this->export_icon[$r] = 'trip';
+		$this->export_permission[$r] = array(array("expensereport", "export"));
+        $this->export_fields_array[$r] = array('d.rowid'=>"TripId", 'd.ref'=>'Ref', 'd.date_debut'=>'DateStart', 'd.date_fin'=>'DateEnd', 'd.date_create'=>'DateCreation', 'd.date_approve'=>'DateApprove', 'd.total_ht'=>"TotalHT", 'd.total_tva'=>'TotalVAT', 'd.total_ttc'=>'TotalTTC', 'd.note_private'=>'NotePrivate', 'd.note_public'=>'NotePublic', 'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>"Login", 'ed.rowid'=>'LineId', 'tf.code'=>'Type', 'ed.date'=>'Date', 'ed.tva_tx'=>'VATRate', 'ed.total_ht'=>'TotalHT', 'ed.total_tva'=>'TotalVAT', 'ed.total_ttc'=>'TotalTTC', 'ed.comments'=>'Comment', 'p.rowid'=>'ProjectId', 'p.ref'=>'Ref');
+        $this->export_entities_array[$r] = array('u.lastname'=>'user', 'u.firstname'=>'user', 'u.login'=>'user', 'ed.rowid'=>'expensereport_line', 'ed.date'=>'expensereport_line', 'ed.tva_tx'=>'expensereport_line', 'ed.total_ht'=>'expensereport_line', 'ed.total_tva'=>'expensereport_line', 'ed.total_ttc'=>'expensereport_line', 'ed.comments'=>'expensereport_line', 'tf.code'=>'expensereport_line', 'p.project_ref'=>'expensereport_line', 'p.rowid'=>'project', 'p.ref'=>'project');
+        $this->export_alias_array[$r] = array('d.rowid'=>"idtrip", 'd.type'=>"type", 'd.note_private'=>'note_private', 'd.note_public'=>'note_public', 'u.lastname'=>'name', 'u.firstname'=>'firstname', 'u.login'=>'login');
+		$this->export_dependencies_array[$r] = array('expensereport_line'=>'ed.rowid', 'type_fees'=>'tf.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'expensereport as d, '.MAIN_DB_PREFIX.'user as u,';
+		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'expensereport_det as ed LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as tf ON ed.fk_c_type_fees = tf.id';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON ed.fk_projet = p.rowid';
+		$this->export_sql_end[$r] .= ' WHERE ed.fk_expensereport = d.rowid AND d.fk_user_author = u.rowid';
+		$this->export_sql_end[$r] .= ' AND d.entity IN ('.getEntity('expensereport').')';
 	}
 
 	/**
@@ -194,7 +194,7 @@ 
 	 *	@param		string	$options	Options
 	 *	@return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
 		global $conf;
 
@@ -206,6 +206,6 @@ 
 				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard','expensereport',".$conf->entity.")"
 		);
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

htdocs/core/modules/printsheet/modules_labels.php

Indentation +3 added lines, -3 removed lines

@@ -40,9 +40,9 @@
 	/**
 	 *  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
+	 *  @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)
 	{

Spacing +32 added lines, -32 removed lines

@@ -34,7 +34,7 @@ 
  */
 class ModelePDFLabels
 {
-	var $error='';
+	var $error = '';
 
 
 	/**
@@ -44,15 +44,15 @@ 
      *  @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)
 	{
 		global $conf;
 
-		$type='members_labels';
-		$liste=array();
+		$type = 'members_labels';
+		$liste = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		$liste = getListOfModels($db, $type, $maxfilenamelength);
 
 		return $liste;
 	}
@@ -71,26 +71,26 @@ 
  *  @param  string      $filename           Short file name of PDF output file
  *	@return int        						<0 if KO, >0 if OK
  */
-function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outputdir='', $template='standardlabel', $filename='tmp_address_sheet.pdf')
+function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outputdir = '', $template = 'standardlabel', $filename = 'tmp_address_sheet.pdf')
 {
-	global $conf,$langs;
+	global $conf, $langs;
 	$langs->load("members");
 
-	$error=0;
+	$error = 0;
 
 	// Increase limit for PDF build
-	$err=error_reporting();
+	$err = error_reporting();
 	error_reporting(0);
 	@set_time_limit(120);
 	error_reporting($err);
 
-	$code='';
-	$srctemplatepath='';
+	$code = '';
+	$srctemplatepath = '';
 
 	// Positionne le modele sur le nom du modele a utiliser
-	if (! dol_strlen($modele))
+	if (!dol_strlen($modele))
 	{
-		if (! empty($conf->global->ADHERENT_ETIQUETTE_TYPE))
+		if (!empty($conf->global->ADHERENT_ETIQUETTE_TYPE))
 		{
 			$code = $conf->global->ADHERENT_ETIQUETTE_TYPE;
 		}
@@ -99,35 +99,35 @@ 
 			$code = $modele;
 		}
 	}
-	else $code=$modele;
+	else $code = $modele;
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$template,2);
-	if (! empty($tmp[1]))
+	$tmp = explode(':', $template, 2);
+	if (!empty($tmp[1]))
 	{
-		$template=$tmp[0];
-		$srctemplatepath=$tmp[1];
+		$template = $tmp[0];
+		$srctemplatepath = $tmp[1];
 	}
-	else $srctemplatepath=$code;
+	else $srctemplatepath = $code;
 
 	dol_syslog("modele=".$modele." outputdir=".$outputdir." template=".$template." code=".$code." srctemplatepath=".$srctemplatepath." filename=".$filename, LOG_DEBUG);
 	
 	// 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('doc','pdf') as $prefix)
+		foreach (array('doc', 'pdf') as $prefix)
 		{
 			$file = $prefix."_".$template.".class.php";
 
 			// On verifie l'emplacement du modele
-			$file=dol_buildpath($reldir."core/modules/printsheet/doc/".$file,0);
+			$file = dol_buildpath($reldir."core/modules/printsheet/doc/".$file, 0);
 			if (file_exists($file))
 			{
-				$filefound=1;
-				$classname=$prefix.'_'.$template;
+				$filefound = 1;
+				$classname = $prefix.'_'.$template;
 				break;
 			}
 		}
@@ -143,22 +143,22 @@ 
 
 		// 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;
+		$sav_charset_output = $outputlangs->charset_output;
 		if ($obj->write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir, $filename) > 0)
 		{
-			$outputlangs->charset_output=$sav_charset_output;
+			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
 		}
 		else
 		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"doc_label_pdf_create Error: ".$obj->error);
+			$outputlangs->charset_output = $sav_charset_output;
+			dol_print_error($db, "doc_label_pdf_create Error: ".$obj->error);
 			return -1;
 		}
 	}
 	else
 	{
-		dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file));
+		dol_print_error('', $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file));
 		return -1;
 	}
 

Braces +13 added lines, -10 removed lines

@@ -93,13 +93,13 @@ 
 		if (! empty($conf->global->ADHERENT_ETIQUETTE_TYPE))
 		{
 			$code = $conf->global->ADHERENT_ETIQUETTE_TYPE;
-		}
-		else
+		} else
 		{
 			$code = $modele;
 		}
+	} else {
+		$code=$modele;
 	}
-	else $code=$modele;
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
 	$tmp=explode(':',$template,2);
@@ -107,15 +107,18 @@ 
 	{
 		$template=$tmp[0];
 		$srctemplatepath=$tmp[1];
+	} else {
+		$srctemplatepath=$code;
 	}
-	else $srctemplatepath=$code;
 
 	dol_syslog("modele=".$modele." outputdir=".$outputdir." template=".$template." code=".$code." srctemplatepath=".$srctemplatepath." filename=".$filename, LOG_DEBUG);
 	
 	// 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('doc','pdf') as $prefix)
@@ -131,7 +134,9 @@ 
 				break;
 			}
 		}
-		if ($filefound) break;
+		if ($filefound) {
+			break;
+		}
 	}
 
 	// Charge le modele
@@ -148,15 +153,13 @@ 
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 			return 1;
-		}
-		else
+		} else
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 			dol_print_error($db,"doc_label_pdf_create Error: ".$obj->error);
 			return -1;
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file));
 		return -1;