alxarafe / alixar

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

Indentation +4 added lines, -4 removed lines

@@ -67,10 +67,10 @@
 
         // Dependencies
         $this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of module ids to disable if this one is disabled
+        $this->conflictwith = array();	// List of module class names as string this module is in conflict with
+        $this->phpmin = array(5,4);		// Minimum version of PHP required by module
         $this->need_dolibarr_version = array(3,7,-2);   // Minimum version of Dolibarr required by module
         $this->conflictwith = array();
         $this->langfiles = array("printing");

Spacing +18 added lines, -18 removed lines

@@ -25,7 +25,7 @@ 
  *  \ingroup    printing
  *  \brief      File of class to describe and activate module Direct Printing
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 
@@ -42,17 +42,17 @@ 
      */
     function __construct($db)
     {
-        $this->db = $db ;
+        $this->db = $db;
         $this->numero = 64000;
         // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
         // It is used to group modules in module setup page
         $this->family = "interface";
         $this->module_position = '52';
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->name = preg_replace('/^mod/i', '', get_class($this));
         // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
         $this->description = "Enable Direct Printing System.";
-        $this->version = 'dolibarr';    // 'development' or 'experimental' or 'dolibarr' or version
+        $this->version = 'dolibarr'; // 'development' or 'experimental' or 'dolibarr' or version
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         // 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'
@@ -66,12 +66,12 @@ 
         $this->config_page_url = array("printing.php@printing");
 
         // Dependencies
-        $this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(3,7,-2);   // Minimum version of Dolibarr required by module
+        $this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(3, 7, -2); // Minimum version of Dolibarr required by module
         $this->conflictwith = array();
         $this->langfiles = array("printing");
 
@@ -85,7 +85,7 @@ 
         $this->rights = array();
         $this->rights_class = 'printing';
 
-        $r=0;
+        $r = 0;
         // $this->rights[$r][0]     Id permission (unique tous modules confondus)
         // $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
         // $this->rights[$r][2]     Non utilise
@@ -101,20 +101,20 @@ 
         $this->rights[$r][4] = 'read';
 
         // Main menu entries
-        $this->menus = array();         // List of menus to add
-        $r=0;
+        $this->menus = array(); // List of menus to add
+        $r = 0;
 
         // This is to declare the Top Menu entry:
-        $this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',               // Put 0 if this is a top menu
-                                'type'=>'left',                 // This is a Top menu entry
+        $this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Put 0 if this is a top menu
+                                'type'=>'left', // This is a Top menu entry
                                 'titre'=>'MenuDirectPrinting',
                                 'url'=>'/printing/index.php?mainmenu=home&leftmenu=admintools',
-                                'langs'=>'printing',            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+                                'langs'=>'printing', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
                                 'position'=>300,
                                 'enabled'=>'$conf->printing->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',
-                                'perms'=>'$user->rights->printing->read',    // Use 'perms'=>'1' if you want your menu with no permission rules
+                                'perms'=>'$user->rights->printing->read', // Use 'perms'=>'1' if you want your menu with no permission rules
                                 'target'=>'',
-                                'user'=>0);                     // 0=Menu for internal users, 1=external users, 2=both
+                                'user'=>0); // 0=Menu for internal users, 1=external users, 2=both
 
         $r++;
     }

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

Indentation +121 added lines, -121 removed lines

@@ -34,128 +34,128 @@
 class modMailing extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-		$this->numero = 22;
-
-		// Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
-		// It is used to group modules by family in module setup page
-		$this->family = "interface";
-		// Module position in the family on 2 digits ('01', '10', '20', ...)
-		$this->module_position = '11';
-
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Gestion des EMailings";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='email';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array("/mailing/temp");
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-		$this->langfiles = array("mails");
-
-		// Config pages
-		$this->config_page_url = array("mailing.php");
-
-		// Constants
-		$this->const = array();
-
-		// Boxes
-		$this->boxes = array();
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'mailing';
-		$r=0;
-
-		$r++;
-		$this->rights[$r][0] = 221; // id de la permission
-		$this->rights[$r][1] = 'Consulter les mailings'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'lire';
-
-		$r++;
-		$this->rights[$r][0] = 222;
-		$this->rights[$r][1] = 'Creer/modifier les mailings (sujet, destinataires...)';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'creer';
-
-		$r++;
-		$this->rights[$r][0] = 223;
-		$this->rights[$r][1] = 'Valider les mailings (permet leur envoi)';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'valider';
-
-		$r++;
-		$this->rights[$r][0] = 229;
-		$this->rights[$r][1] = 'Supprimer les mailings';
-		$this->rights[$r][2] = 'd';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'supprimer';
-
-		$r++;
-		$this->rights[$r][0] = 237;
-		$this->rights[$r][1] = 'View recipients and info';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'mailing_advance';		// Visible if option MAIN_USE_ADVANCED_PERMS is on
-		$this->rights[$r][5] = 'recipient';
-
-		$r++;
-		$this->rights[$r][0] = 238;
-		$this->rights[$r][1] = 'Manually send mailings';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'mailing_advance';		// Visible if option MAIN_USE_ADVANCED_PERMS is on
-		$this->rights[$r][5] = 'send';
-
-		$r++;
-		$this->rights[$r][0] = 239;
-		$this->rights[$r][1] = 'Delete mailings after validation and/or sent';
-		$this->rights[$r][2] = 'd';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'mailing_advance';		// Visible if option MAIN_USE_ADVANCED_PERMS is on
-		$this->rights[$r][5] = 'delete';
-
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-	}
-
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->numero = 22;
+
+        // Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
+        // It is used to group modules by family in module setup page
+        $this->family = "interface";
+        // Module position in the family on 2 digits ('01', '10', '20', ...)
+        $this->module_position = '11';
+
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Gestion des EMailings";
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='email';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array("/mailing/temp");
+
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of module ids to disable if this one is disabled
+        $this->conflictwith = array();	// List of module class names as string this module is in conflict with
+        $this->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $this->langfiles = array("mails");
+
+        // Config pages
+        $this->config_page_url = array("mailing.php");
+
+        // Constants
+        $this->const = array();
+
+        // Boxes
+        $this->boxes = array();
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'mailing';
+        $r=0;
+
+        $r++;
+        $this->rights[$r][0] = 221; // id de la permission
+        $this->rights[$r][1] = 'Consulter les mailings'; // libelle de la permission
+        $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'lire';
+
+        $r++;
+        $this->rights[$r][0] = 222;
+        $this->rights[$r][1] = 'Creer/modifier les mailings (sujet, destinataires...)';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'creer';
+
+        $r++;
+        $this->rights[$r][0] = 223;
+        $this->rights[$r][1] = 'Valider les mailings (permet leur envoi)';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'valider';
+
+        $r++;
+        $this->rights[$r][0] = 229;
+        $this->rights[$r][1] = 'Supprimer les mailings';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'supprimer';
+
+        $r++;
+        $this->rights[$r][0] = 237;
+        $this->rights[$r][1] = 'View recipients and info';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'mailing_advance';		// Visible if option MAIN_USE_ADVANCED_PERMS is on
+        $this->rights[$r][5] = 'recipient';
+
+        $r++;
+        $this->rights[$r][0] = 238;
+        $this->rights[$r][1] = 'Manually send mailings';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'mailing_advance';		// Visible if option MAIN_USE_ADVANCED_PERMS is on
+        $this->rights[$r][5] = 'send';
+
+        $r++;
+        $this->rights[$r][0] = 239;
+        $this->rights[$r][1] = 'Delete mailings after validation and/or sent';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'mailing_advance';		// Visible if option MAIN_USE_ADVANCED_PERMS is on
+        $this->rights[$r][5] = 'delete';
+
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+    }
+
+
+    /**
+     *		Function called when module is enabled.
+     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *		It also creates data directories
+     *
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		// Permissions
-		$this->remove($options);
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        // Permissions
+        $this->remove($options);
 
-		$sql = array();
+        $sql = array();
 
-		return $this->_init($sql,$options);
-	}
+        return $this->_init($sql,$options);
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -25,7 +25,7 @@ 
  *	\brief      Fichier de description et activation du module Mailing
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -51,22 +51,22 @@ 
 		$this->module_position = '11';
 
 		// 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 EMailings";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='email';
+		$this->picto = 'email';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/mailing/temp");
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
 		$this->langfiles = array("mails");
 
 		// Config pages
@@ -81,7 +81,7 @@ 
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'mailing';
-		$r=0;
+		$r = 0;
 
 		$r++;
 		$this->rights[$r][0] = 221; // id de la permission
@@ -116,7 +116,7 @@ 
 		$this->rights[$r][1] = 'View recipients and info';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'mailing_advance';		// Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][4] = 'mailing_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'recipient';
 
 		$r++;
@@ -124,7 +124,7 @@ 
 		$this->rights[$r][1] = 'Manually send mailings';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'mailing_advance';		// Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][4] = 'mailing_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'send';
 
 		$r++;
@@ -132,12 +132,12 @@ 
 		$this->rights[$r][1] = 'Delete mailings after validation and/or sent';
 		$this->rights[$r][2] = 'd';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'mailing_advance';		// Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][4] = 'mailing_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'delete';
 
 		// 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.
 	}
 
 
@@ -149,13 +149,13 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
 		// Permissions
 		$this->remove($options);
 
 		$sql = array();
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

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

Indentation +121 added lines, -121 removed lines

@@ -32,133 +32,133 @@
 class modDeplacement extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $user;
-
-		$this->db = $db;
-		$this->numero = 75 ;
-
-		$this->family = "hr";
-		$this->module_position = '41';
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Gestion des notes de frais et deplacements";		// Si traduction Module75Desc non trouvee
-
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
-		$this->version = 'dolibarr_deprecated';
-
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto = "trip";
-
-		// Data directories to create when module is enabled
-		$this->dirs = array();
-
-		// Config pages
-		$this->config_page_url = array();
-		$this->langfiles = array("companies","trips");
-
-		// Dependancies
-		$this->depends = array();
-		$this->requiredby = array();
-
-		// Constants
-		$this->const = array();
-
-		// Boxes
-		$this->boxes = array();
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'deplacement';
-
-		$this->rights[1][0] = 171;
-		$this->rights[1][1] = 'Lire ses notes de frais et deplacements et celles de sa hierarchy';
-		$this->rights[1][2] = 'r';
-		$this->rights[1][3] = 1;
-		$this->rights[1][4] = 'lire';
-
-		$this->rights[2][0] = 172;
-		$this->rights[2][1] = 'Creer/modifier une note de frais et deplacements';
-		$this->rights[2][2] = 'w';
-		$this->rights[2][3] = 0;
-		$this->rights[2][4] = 'creer';
-
-    	$this->rights[3][0] = 173;
-		$this->rights[3][1] = 'Supprimer les notes de frais et deplacements';
-		$this->rights[3][2] = 'd';
-		$this->rights[3][3] = 0;
-		$this->rights[3][4] = 'supprimer';
-
-    	$this->rights[4][0] = 174;
-		$this->rights[4][1] = 'Lire toutes les notes de frais';
-		$this->rights[4][2] = 'd';
-		$this->rights[4][3] = 0;
-		$this->rights[4][4] = 'readall';
-
-		$this->rights[5][0] = 178;
-		$this->rights[5][1] = 'Exporter les notes de frais et deplacements';
-		$this->rights[5][2] = 'd';
-		$this->rights[5][3] = 0;
-		$this->rights[5][4] = 'export';
-
-
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
-
-		// Exports
-		$r=0;
-
-		$r++;
-		$this->export_code[$r]='trips_'.$r;
-		$this->export_label[$r]='ListTripsAndExpenses';
-		$this->export_permission[$r]=array(array("deplacement","export"));
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $user;
+
+        $this->db = $db;
+        $this->numero = 75 ;
+
+        $this->family = "hr";
+        $this->module_position = '41';
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Gestion des notes de frais et deplacements";		// Si traduction Module75Desc non trouvee
+
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
+        $this->version = 'dolibarr_deprecated';
+
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto = "trip";
+
+        // Data directories to create when module is enabled
+        $this->dirs = array();
+
+        // Config pages
+        $this->config_page_url = array();
+        $this->langfiles = array("companies","trips");
+
+        // Dependancies
+        $this->depends = array();
+        $this->requiredby = array();
+
+        // Constants
+        $this->const = array();
+
+        // Boxes
+        $this->boxes = array();
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'deplacement';
+
+        $this->rights[1][0] = 171;
+        $this->rights[1][1] = 'Lire ses notes de frais et deplacements et celles de sa hierarchy';
+        $this->rights[1][2] = 'r';
+        $this->rights[1][3] = 1;
+        $this->rights[1][4] = 'lire';
+
+        $this->rights[2][0] = 172;
+        $this->rights[2][1] = 'Creer/modifier une note de frais et deplacements';
+        $this->rights[2][2] = 'w';
+        $this->rights[2][3] = 0;
+        $this->rights[2][4] = 'creer';
+
+        $this->rights[3][0] = 173;
+        $this->rights[3][1] = 'Supprimer les notes de frais et deplacements';
+        $this->rights[3][2] = 'd';
+        $this->rights[3][3] = 0;
+        $this->rights[3][4] = 'supprimer';
+
+        $this->rights[4][0] = 174;
+        $this->rights[4][1] = 'Lire toutes les notes de frais';
+        $this->rights[4][2] = 'd';
+        $this->rights[4][3] = 0;
+        $this->rights[4][4] = 'readall';
+
+        $this->rights[5][0] = 178;
+        $this->rights[5][1] = 'Exporter les notes de frais et deplacements';
+        $this->rights[5][2] = 'd';
+        $this->rights[5][3] = 0;
+        $this->rights[5][4] = 'export';
+
+
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+
+
+        // Exports
+        $r=0;
+
+        $r++;
+        $this->export_code[$r]='trips_'.$r;
+        $this->export_label[$r]='ListTripsAndExpenses';
+        $this->export_permission[$r]=array(array("deplacement","export"));
         $this->export_fields_array[$r]=array('u.login'=>'Login','u.lastname'=>'Lastname','u.firstname'=>'Firstname','d.rowid'=>"TripId",'d.type'=>"Type",'d.km'=>"FeesKilometersOrAmout",'d.dated'=>"Date",'d.note_private'=>'NotePrivate','d.note_public'=>'NotePublic','s.nom'=>'ThirdParty');
         $this->export_TypeFields_array[$r]=array('u.rowid'=>'List:user:name','u.login'=>'Text','u.lastname'=>'Text','u.firstname'=>'Text','d.type'=>"Text",'d.km'=>"Numeric",'d.dated'=>"Date",'d.note_private'=>'Text','d.note_public'=>'Text','s.rowid'=>"List:societe:CompanyName",'s.nom'=>'Text');
         $this->export_entities_array[$r]=array('u.login'=>'user','u.lastname'=>'user','u.firstname'=>'user','d.rowid'=>"trip",'d.type'=>"trip",'d.km'=>"trip",'d.dated'=>"trip",'d.note_private'=>'trip','d.note_public'=>'trip','s.nom'=>'company');
         $this->export_dependencies_array[$r]=array('trip'=>'d.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.'user as u';
-		$this->export_sql_end[$r] .=', '.MAIN_DB_PREFIX.'deplacement as d';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON d.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] .=' WHERE d.fk_user = u.rowid';
-		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('deplacement').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR d.fk_soc IS NULL)';
-
-		if (! empty($user))   // Not defined during migration process
-		{
-    		$childids = $user->getAllChildIds();
-    		$childids[]=$user->id;
-
-    		if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')';
-		}
-	}
-
-
-	/**
-	 *		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
-	 *
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'user as u';
+        $this->export_sql_end[$r] .=', '.MAIN_DB_PREFIX.'deplacement as d';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON d.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] .=' WHERE d.fk_user = u.rowid';
+        $this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('deplacement').')';
+        if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR d.fk_soc IS NULL)';
+
+        if (! empty($user))   // Not defined during migration process
+        {
+            $childids = $user->getAllChildIds();
+            $childids[]=$user->id;
+
+            if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')';
+        }
+    }
+
+
+    /**
+     *		Function called when module is enabled.
+     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *		It also creates data directories
+     *
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		// Permissions
-		$this->remove($options);
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        // Permissions
+        $this->remove($options);
 
-		$sql = array();
+        $sql = array();
 
-		return $this->_init($sql,$options);
-	}
+        return $this->_init($sql,$options);
+    }
 }

Spacing +29 added lines, -29 removed lines

@@ -23,7 +23,7 @@ 
  *	\ingroup    deplacement
  *	\brief      Fichier de description et activation du module Deplacement et notes de frais
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -42,13 +42,13 @@ 
 		global $conf, $user;
 
 		$this->db = $db;
-		$this->numero = 75 ;
+		$this->numero = 75;
 
 		$this->family = "hr";
 		$this->module_position = '41';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Gestion des notes de frais et deplacements";		// Si traduction Module75Desc non trouvee
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Gestion des notes de frais et deplacements"; // Si traduction Module75Desc non trouvee
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
 		$this->version = 'dolibarr_deprecated';
@@ -61,7 +61,7 @@ 
 
 		// Config pages
 		$this->config_page_url = array();
-		$this->langfiles = array("companies","trips");
+		$this->langfiles = array("companies", "trips");
 
 		// Dependancies
 		$this->depends = array();
@@ -110,36 +110,36 @@ 
 
 		// 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]='trips_'.$r;
-		$this->export_label[$r]='ListTripsAndExpenses';
-		$this->export_permission[$r]=array(array("deplacement","export"));
-        $this->export_fields_array[$r]=array('u.login'=>'Login','u.lastname'=>'Lastname','u.firstname'=>'Firstname','d.rowid'=>"TripId",'d.type'=>"Type",'d.km'=>"FeesKilometersOrAmout",'d.dated'=>"Date",'d.note_private'=>'NotePrivate','d.note_public'=>'NotePublic','s.nom'=>'ThirdParty');
-        $this->export_TypeFields_array[$r]=array('u.rowid'=>'List:user:name','u.login'=>'Text','u.lastname'=>'Text','u.firstname'=>'Text','d.type'=>"Text",'d.km'=>"Numeric",'d.dated'=>"Date",'d.note_private'=>'Text','d.note_public'=>'Text','s.rowid'=>"List:societe:CompanyName",'s.nom'=>'Text');
-        $this->export_entities_array[$r]=array('u.login'=>'user','u.lastname'=>'user','u.firstname'=>'user','d.rowid'=>"trip",'d.type'=>"trip",'d.km'=>"trip",'d.dated'=>"trip",'d.note_private'=>'trip','d.note_public'=>'trip','s.nom'=>'company');
-        $this->export_dependencies_array[$r]=array('trip'=>'d.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.'user as u';
-		$this->export_sql_end[$r] .=', '.MAIN_DB_PREFIX.'deplacement as d';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON d.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] .=' WHERE d.fk_user = u.rowid';
-		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('deplacement').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR d.fk_soc IS NULL)';
-
-		if (! empty($user))   // Not defined during migration process
+		$this->export_code[$r] = 'trips_'.$r;
+		$this->export_label[$r] = 'ListTripsAndExpenses';
+		$this->export_permission[$r] = array(array("deplacement", "export"));
+        $this->export_fields_array[$r] = array('u.login'=>'Login', 'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'd.rowid'=>"TripId", 'd.type'=>"Type", 'd.km'=>"FeesKilometersOrAmout", 'd.dated'=>"Date", 'd.note_private'=>'NotePrivate', 'd.note_public'=>'NotePublic', 's.nom'=>'ThirdParty');
+        $this->export_TypeFields_array[$r] = array('u.rowid'=>'List:user:name', 'u.login'=>'Text', 'u.lastname'=>'Text', 'u.firstname'=>'Text', 'd.type'=>"Text", 'd.km'=>"Numeric", 'd.dated'=>"Date", 'd.note_private'=>'Text', 'd.note_public'=>'Text', 's.rowid'=>"List:societe:CompanyName", 's.nom'=>'Text');
+        $this->export_entities_array[$r] = array('u.login'=>'user', 'u.lastname'=>'user', 'u.firstname'=>'user', 'd.rowid'=>"trip", 'd.type'=>"trip", 'd.km'=>"trip", 'd.dated'=>"trip", 'd.note_private'=>'trip', 'd.note_public'=>'trip', 's.nom'=>'company');
+        $this->export_dependencies_array[$r] = array('trip'=>'d.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.'user as u';
+		$this->export_sql_end[$r] .= ', '.MAIN_DB_PREFIX.'deplacement as d';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON d.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] .= ' WHERE d.fk_user = u.rowid';
+		$this->export_sql_end[$r] .= ' AND d.entity IN ('.getEntity('deplacement').')';
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND (sc.fk_user = '.(empty($user) ? 0 : $user->id).' OR d.fk_soc IS NULL)';
+
+		if (!empty($user))   // Not defined during migration process
 		{
     		$childids = $user->getAllChildIds();
-    		$childids[]=$user->id;
+    		$childids[] = $user->id;
 
-    		if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')';
+    		if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql .= ' AND d.fk_user IN ('.join(',', $childids).')';
 		}
 	}
 
@@ -152,13 +152,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);
 	}
 }

Braces +12 added lines, -4 removed lines

@@ -129,17 +129,25 @@
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'user as u';
 		$this->export_sql_end[$r] .=', '.MAIN_DB_PREFIX.'deplacement as d';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON d.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';
+		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] .=' WHERE d.fk_user = u.rowid';
 		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('deplacement').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR d.fk_soc IS NULL)';
+		if (empty($user->rights->societe->client->voir)) {
+		    $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR d.fk_soc IS NULL)';
+		}
 
-		if (! empty($user))   // Not defined during migration process
+		if (! empty($user)) {
+		    // Not defined during migration process
 		{
     		$childids = $user->getAllChildIds();
+		}
     		$childids[]=$user->id;
 
-    		if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')';
+    		if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) {
+    		    $sql.=' AND d.fk_user IN ('.join(',',$childids).')';
+    		}
 		}
 	}
 

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

Indentation +144 added lines, -144 removed lines

@@ -32,155 +32,155 @@
 class modOpenSurvey extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param		DoliDB		$db		Database handler
-	 */
-	function __construct($db)
-	{
-		global $langs,$conf;
-
-		$this->db = $db;
-
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used module id).
-		$this->numero = 55000;
-		// Key text used to identify module (for permission, menus, etc...)
-		$this->rights_class = 'opensurvey';
-
-		// Family can be 'crm','financial','hr','projects','product','technic','other'
-		// It is used to group modules in module setup page
-		$this->family = "portal";
-		$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));
-		// Module description used if translation string 'ModuleXXXDesc' not found (XXX is value MyModule)
-		$this->description = "Module to make online surveys (like Doodle, Studs, Rdvz, ...)";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Name of image file used for this module.
-		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='opensurvey.png@opensurvey';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array();
-		//$this->dirs[0] = DOL_DATA_ROOT.'/mymodule;
-		//$this->dirs[1] = DOL_DATA_ROOT.'/mymodule/temp;
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,4,0);	// Minimum version of Dolibarr required by module
-
-		// Constants
-		$this->const = array();			// List of parameters
-
-		// Dictionaries
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param		DoliDB		$db		Database handler
+     */
+    function __construct($db)
+    {
+        global $langs,$conf;
+
+        $this->db = $db;
+
+        // Id for module (must be unique).
+        // Use here a free id (See in Home -> System information -> Dolibarr for list of used module id).
+        $this->numero = 55000;
+        // Key text used to identify module (for permission, menus, etc...)
+        $this->rights_class = 'opensurvey';
+
+        // Family can be 'crm','financial','hr','projects','product','technic','other'
+        // It is used to group modules in module setup page
+        $this->family = "portal";
+        $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));
+        // Module description used if translation string 'ModuleXXXDesc' not found (XXX is value MyModule)
+        $this->description = "Module to make online surveys (like Doodle, Studs, Rdvz, ...)";
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // Name of image file used for this module.
+        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+        $this->picto='opensurvey.png@opensurvey';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array();
+        //$this->dirs[0] = DOL_DATA_ROOT.'/mymodule;
+        //$this->dirs[1] = DOL_DATA_ROOT.'/mymodule/temp;
+
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of module ids to disable if this one is disabled
+        $this->conflictwith = array();	// List of module class names as string this module is in conflict with
+        $this->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(3,4,0);	// Minimum version of Dolibarr required by module
+
+        // Constants
+        $this->const = array();			// List of parameters
+
+        // Dictionaries
         $this->dictionaries=array();
 
-		// Boxes
-		$this->boxes = array();			// List of boxes
-		$r=0;
-
-		// Add here list of php file(s) stored in includes/boxes that contains class to show a box.
-		// Example:
-		//$this->boxes[$r][1] = "myboxa.php";
-		//$r++;
-		//$this->boxes[$r][1] = "myboxb.php";
-		//$r++;
-
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
-
-		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
-		// Example:
-		$this->rights[$r][0] = 55001; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read surveys';	// Permission label
-		$this->rights[$r][2] = 'r'; 					// Permission by default for new user (0/1)
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-
-		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
-		// Example:
-		$this->rights[$r][0] = 55002; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/modify surveys';	// Permission label
-		$this->rights[$r][2] = 'w'; 					// Permission by default for new user (0/1)
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-
-
-		// Menus
-		//-------
+        // Boxes
+        $this->boxes = array();			// List of boxes
         $r=0;
-		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=tools',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-								'type'=>'left',
-								'titre'=>'Survey',
-								'mainmenu'=>'tools',
-								'leftmenu'=>'opensurvey',
-								'url'=>'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey',
-								'langs'=>'opensurvey',
-								'position'=>200,
-                				'enabled'=>'$conf->opensurvey->enabled',         // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
-								'perms'=>'$user->rights->opensurvey->read',
-								'target'=>'',
-								'user'=>0);
-		$r++;
-
-		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-								'type'=>'left',
-								'titre'=>'NewSurvey',
-								'mainmenu'=>'tools',
-								'leftmenu'=>'opensurvey_new',
-								'url'=>'/opensurvey/wizard/index.php',
-								'langs'=>'opensurvey',
-								'position'=>210,
-                				'enabled'=>'$conf->opensurvey->enabled',         // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
-								'perms'=>'$user->rights->opensurvey->write',
-								'target'=>'',
-								'user'=>0);
-		$r++;
-
-		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-								'type'=>'left',
-								'titre'=>'List',
-								'mainmenu'=>'tools',
-								'leftmenu'=>'opensurvey_list',
-								'url'=>'/opensurvey/list.php',
-								'langs'=>'opensurvey',
-								'position'=>220,
-                				'enabled'=>'$conf->opensurvey->enabled',         // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
-								'perms'=>'$user->rights->opensurvey->read',
-								'target'=>'',
-								'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
-	 *
+
+        // Add here list of php file(s) stored in includes/boxes that contains class to show a box.
+        // Example:
+        //$this->boxes[$r][1] = "myboxa.php";
+        //$r++;
+        //$this->boxes[$r][1] = "myboxb.php";
+        //$r++;
+
+        // Permissions
+        $this->rights = array();		// Permission array used by this module
+        $r=0;
+
+        // Add here list of permission defined by an id, a label, a boolean and two constant strings.
+        // Example:
+        $this->rights[$r][0] = 55001; 				// Permission id (must not be already used)
+        $this->rights[$r][1] = 'Read surveys';	// Permission label
+        $this->rights[$r][2] = 'r'; 					// Permission by default for new user (0/1)
+        $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+        $this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $r++;
+
+        // Add here list of permission defined by an id, a label, a boolean and two constant strings.
+        // Example:
+        $this->rights[$r][0] = 55002; 				// Permission id (must not be already used)
+        $this->rights[$r][1] = 'Create/modify surveys';	// Permission label
+        $this->rights[$r][2] = 'w'; 					// Permission by default for new user (0/1)
+        $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+        $this->rights[$r][4] = 'write';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $r++;
+
+
+        // Menus
+        //-------
+        $r=0;
+        $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=tools',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+                                'type'=>'left',
+                                'titre'=>'Survey',
+                                'mainmenu'=>'tools',
+                                'leftmenu'=>'opensurvey',
+                                'url'=>'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey',
+                                'langs'=>'opensurvey',
+                                'position'=>200,
+                                'enabled'=>'$conf->opensurvey->enabled',         // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
+                                'perms'=>'$user->rights->opensurvey->read',
+                                'target'=>'',
+                                'user'=>0);
+        $r++;
+
+        $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+                                'type'=>'left',
+                                'titre'=>'NewSurvey',
+                                'mainmenu'=>'tools',
+                                'leftmenu'=>'opensurvey_new',
+                                'url'=>'/opensurvey/wizard/index.php',
+                                'langs'=>'opensurvey',
+                                'position'=>210,
+                                'enabled'=>'$conf->opensurvey->enabled',         // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
+                                'perms'=>'$user->rights->opensurvey->write',
+                                'target'=>'',
+                                'user'=>0);
+        $r++;
+
+        $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+                                'type'=>'left',
+                                'titre'=>'List',
+                                'mainmenu'=>'tools',
+                                'leftmenu'=>'opensurvey_list',
+                                'url'=>'/opensurvey/list.php',
+                                'langs'=>'opensurvey',
+                                'position'=>220,
+                                'enabled'=>'$conf->opensurvey->enabled',         // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
+                                'perms'=>'$user->rights->opensurvey->read',
+                                'target'=>'',
+                                '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')
-	 *  @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		// Permissions
-		$this->remove($options);
+     *  @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        // Permissions
+        $this->remove($options);
 
-		$sql = array();
+        $sql = array();
 
-		return $this->_init($sql,$options);
-	}
+        return $this->_init($sql,$options);
+    }
 }
 

Spacing +35 added lines, -35 removed lines

@@ -23,7 +23,7 @@ 
  *      \ingroup    opensurvey
  *      \brief      Description and activation file for module OpenSurvey
  */
-include_once DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php";
+include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
 
 
 /**
@@ -39,7 +39,7 @@ 
 	 */
 	function __construct($db)
 	{
-		global $langs,$conf;
+		global $langs, $conf;
 
 		$this->db = $db;
 
@@ -54,7 +54,7 @@ 
 		$this->family = "portal";
 		$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 (XXX is value MyModule)
 		$this->description = "Module to make online surveys (like Doodle, Studs, Rdvz, ...)";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
@@ -64,7 +64,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='opensurvey.png@opensurvey';
+		$this->picto = 'opensurvey.png@opensurvey';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array();
@@ -72,22 +72,22 @@ 
 		//$this->dirs[1] = DOL_DATA_ROOT.'/mymodule/temp;
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,4,0);	// Minimum version of Dolibarr required by module
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(3, 4, 0); // Minimum version of Dolibarr required by module
 
 		// Constants
-		$this->const = array();			// List of parameters
+		$this->const = array(); // List of parameters
 
 		// Dictionaries
-        $this->dictionaries=array();
+        $this->dictionaries = array();
 
 		// Boxes
-		$this->boxes = array();			// List of boxes
-		$r=0;
+		$this->boxes = array(); // List of boxes
+		$r = 0;
 
 		// Add here list of php file(s) stored in includes/boxes that contains class to show a box.
 		// Example:
@@ -97,32 +97,32 @@ 
 		//$r++;
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
 		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
 		// Example:
-		$this->rights[$r][0] = 55001; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read surveys';	// Permission label
-		$this->rights[$r][2] = 'r'; 					// Permission by default for new user (0/1)
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][0] = 55001; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read surveys'; // Permission label
+		$this->rights[$r][2] = 'r'; // Permission by default for new user (0/1)
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
 		// Example:
-		$this->rights[$r][0] = 55002; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/modify surveys';	// Permission label
-		$this->rights[$r][2] = 'w'; 					// Permission by default for new user (0/1)
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][0] = 55002; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/modify surveys'; // Permission label
+		$this->rights[$r][2] = 'w'; // Permission by default for new user (0/1)
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 
 		// Menus
 		//-------
-        $r=0;
-		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=tools',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+        $r = 0;
+		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 								'type'=>'left',
 								'titre'=>'Survey',
 								'mainmenu'=>'tools',
@@ -130,13 +130,13 @@ 
 								'url'=>'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey',
 								'langs'=>'opensurvey',
 								'position'=>200,
-                				'enabled'=>'$conf->opensurvey->enabled',         // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
+                				'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
 								'perms'=>'$user->rights->opensurvey->read',
 								'target'=>'',
 								'user'=>0);
 		$r++;
 
-		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 								'type'=>'left',
 								'titre'=>'NewSurvey',
 								'mainmenu'=>'tools',
@@ -144,13 +144,13 @@ 
 								'url'=>'/opensurvey/wizard/index.php',
 								'langs'=>'opensurvey',
 								'position'=>210,
-                				'enabled'=>'$conf->opensurvey->enabled',         // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
+                				'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
 								'perms'=>'$user->rights->opensurvey->write',
 								'target'=>'',
 								'user'=>0);
 		$r++;
 
-		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 								'type'=>'left',
 								'titre'=>'List',
 								'mainmenu'=>'tools',
@@ -158,7 +158,7 @@ 
 								'url'=>'/opensurvey/list.php',
 								'langs'=>'opensurvey',
 								'position'=>220,
-                				'enabled'=>'$conf->opensurvey->enabled',         // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
+                				'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
 								'perms'=>'$user->rights->opensurvey->read',
 								'target'=>'',
 								'user'=>0);
@@ -173,14 +173,14 @@ 
      *  @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *  @return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
 		// Permissions
 		$this->remove($options);
 
 		$sql = array();
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }
 

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

Indentation +246 added lines, -246 removed lines

@@ -38,259 +38,259 @@
 class modCommande extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $user;
-
-		$this->db = $db;
-		$this->numero = 25;
-
-		$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->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->picto='order';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array("/commande/temp");
-
-		// Config pages
-		$this->config_page_url = array("commande.php");
-
-		// Dependancies
-		$this->depends = array("modSociete");
-		$this->requiredby = array("modExpedition");
-		$this->conflictwith = array();
-		$this->langfiles = array('orders', 'bills', 'companies','products', 'deliveries', 'sendings');
-
-		// Constants
-		$this->const = array();
-		$r=0;
-
-		$this->const[$r][0] = "COMMANDE_ADDON_PDF";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "einstein";
-		$this->const[$r][3] = 'Name of PDF model of order';
-		$this->const[$r][4] = 0;
-
-		$r++;
-		$this->const[$r][0] = "COMMANDE_ADDON";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "mod_commande_marbre";
-		$this->const[$r][3] = 'Name of numbering numerotation rules of order';
-		$this->const[$r][4] = 0;
-
-		$r++;
-		$this->const[$r][0] = "COMMANDE_ADDON_PDF_ODT_PATH";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/orders";
-		$this->const[$r][3] = "";
-		$this->const[$r][4] = 0;
-
-		/*$r++;
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $user;
+
+        $this->db = $db;
+        $this->numero = 25;
+
+        $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->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->picto='order';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array("/commande/temp");
+
+        // Config pages
+        $this->config_page_url = array("commande.php");
+
+        // Dependancies
+        $this->depends = array("modSociete");
+        $this->requiredby = array("modExpedition");
+        $this->conflictwith = array();
+        $this->langfiles = array('orders', 'bills', 'companies','products', 'deliveries', 'sendings');
+
+        // Constants
+        $this->const = array();
+        $r=0;
+
+        $this->const[$r][0] = "COMMANDE_ADDON_PDF";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "einstein";
+        $this->const[$r][3] = 'Name of PDF model of order';
+        $this->const[$r][4] = 0;
+
+        $r++;
+        $this->const[$r][0] = "COMMANDE_ADDON";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "mod_commande_marbre";
+        $this->const[$r][3] = 'Name of numbering numerotation rules of order';
+        $this->const[$r][4] = 0;
+
+        $r++;
+        $this->const[$r][0] = "COMMANDE_ADDON_PDF_ODT_PATH";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/orders";
+        $this->const[$r][3] = "";
+        $this->const[$r][4] = 0;
+
+        /*$r++;
 		$this->const[$r][0] = "COMMANDE_DRAFT_WATERMARK";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "__(Draft)__";
 		$this->const[$r][3] = 'Watermark to show on draft orders';
 		$this->const[$r][4] = 0;*/
 
-		// Boxes
-		$this->boxes = array(
-			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++;
-		$this->rights[$r][0] = 81;
-		$this->rights[$r][1] = 'Lire les commandes clients';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'lire';
-
-		$r++;
-		$this->rights[$r][0] = 82;
-		$this->rights[$r][1] = 'Creer/modifier les commandes clients';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'creer';
-
-		$r++;
-		$this->rights[$r][0] = 84;
-		$this->rights[$r][1] = 'Valider les commandes clients';
-		$this->rights[$r][2] = 'd';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'order_advance';
-		$this->rights[$r][5] = 'validate';
-
-		$r++;
-		$this->rights[$r][0] = 86;
-		$this->rights[$r][1] = 'Envoyer les commandes clients';
-		$this->rights[$r][2] = 'd';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'order_advance';
+        // Boxes
+        $this->boxes = array(
+            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++;
+        $this->rights[$r][0] = 81;
+        $this->rights[$r][1] = 'Lire les commandes clients';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'lire';
+
+        $r++;
+        $this->rights[$r][0] = 82;
+        $this->rights[$r][1] = 'Creer/modifier les commandes clients';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'creer';
+
+        $r++;
+        $this->rights[$r][0] = 84;
+        $this->rights[$r][1] = 'Valider les commandes clients';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'order_advance';
+        $this->rights[$r][5] = 'validate';
+
+        $r++;
+        $this->rights[$r][0] = 86;
+        $this->rights[$r][1] = 'Envoyer les commandes clients';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'order_advance';
         $this->rights[$r][5] = 'send';
 
-		$r++;
-		$this->rights[$r][0] = 87;
-		$this->rights[$r][1] = 'Cloturer les commandes clients';
-		$this->rights[$r][2] = 'd';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'cloturer';
-
-		$r++;
-		$this->rights[$r][0] = 88;
-		$this->rights[$r][1] = 'Annuler les commandes clients';
-		$this->rights[$r][2] = 'd';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'order_advance';
-		$this->rights[$r][5] = 'annuler';
-
-		$r++;
-		$this->rights[$r][0] = 89;
-		$this->rights[$r][1] = 'Supprimer les commandes clients';
-		$this->rights[$r][2] = 'd';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'supprimer';
-
-		$r++;
-		$this->rights[$r][0] = 1421;
-		$this->rights[$r][1] = 'Exporter les commandes clients et attributs';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'commande';
-		$this->rights[$r][5] = 'export';
-
-
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
-
-		// Exports
-		//--------
-		$r=0;
-
-		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='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.date_livraison'=>"DateDeliveryPlanned",'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.date_livraison'=>"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';
-		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect='product'; $keyforelement='product'; $keyforaliasextra='extra3';
-		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_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);
-	}
-
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
+        $r++;
+        $this->rights[$r][0] = 87;
+        $this->rights[$r][1] = 'Cloturer les commandes clients';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'cloturer';
+
+        $r++;
+        $this->rights[$r][0] = 88;
+        $this->rights[$r][1] = 'Annuler les commandes clients';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'order_advance';
+        $this->rights[$r][5] = 'annuler';
+
+        $r++;
+        $this->rights[$r][0] = 89;
+        $this->rights[$r][1] = 'Supprimer les commandes clients';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'supprimer';
+
+        $r++;
+        $this->rights[$r][0] = 1421;
+        $this->rights[$r][1] = 'Exporter les commandes clients et attributs';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'commande';
+        $this->rights[$r][5] = 'export';
+
+
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+
+
+        // Exports
+        //--------
+        $r=0;
+
+        $r++;
+        $this->export_code[$r]=$this->rights_class.'_'.$r;
+        $this->export_label[$r]='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.date_livraison'=>"DateDeliveryPlanned",'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.date_livraison'=>"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';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+        $keyforselect='product'; $keyforelement='product'; $keyforaliasextra='extra3';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
+        if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_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);
+    }
+
+
+    /**
+     *		Function called when module is enabled.
+     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *		It also creates data directories
+     *
      *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		global $conf,$langs;
-
-		// 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';
-
-		if (file_exists($src) && ! file_exists($dest))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			dol_mkdir($dirodt);
-			$result=dol_copy($src,$dest,0,0);
-			if ($result < 0)
-			{
-				$langs->load("errors");
-				$this->error=$langs->trans('ErrorFailToCopyFile',$src,$dest);
-				return 0;
-			}
-		}
-
-		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'order' AND entity = ".$conf->entity,
-				"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     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        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';
+
+        if (file_exists($src) && ! file_exists($dest))
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+            dol_mkdir($dirodt);
+            $result=dol_copy($src,$dest,0,0);
+            if ($result < 0)
+            {
+                $langs->load("errors");
+                $this->error=$langs->trans('ErrorFailToCopyFile',$src,$dest);
+                return 0;
+            }
+        }
+
+        $sql = array(
+                "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'order' AND entity = ".$conf->entity,
+                "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);
+    }
 }

Spacing +68 added lines, -68 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,13 +53,13 @@ 
 		$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->picto='order';
+		$this->picto = 'order';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/commande/temp");
@@ -71,11 +71,11 @@ 
 		$this->depends = array("modSociete");
 		$this->requiredby = array("modExpedition");
 		$this->conflictwith = array();
-		$this->langfiles = array('orders', 'bills', 'companies','products', 'deliveries', 'sendings');
+		$this->langfiles = array('orders', 'bills', 'companies', 'products', 'deliveries', 'sendings');
 
 		// Constants
 		$this->const = array();
-		$r=0;
+		$r = 0;
 
 		$this->const[$r][0] = "COMMANDE_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
@@ -106,15 +106,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;
@@ -179,27 +179,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]=$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.date_livraison'=>"DateDeliveryPlanned",'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.date_livraison'=>"DateDeliveryPlanned", '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',
@@ -209,47 +209,47 @@ 
 		//	'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.date_livraison'=>"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_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.date_livraison'=>"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_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_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);
 	}
 
 
@@ -261,27 +261,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;
 			}
 		}
@@ -291,6 +291,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

@@ -235,7 +235,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';
@@ -249,7 +251,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);
+		}
 	}
 
 

dolibarr/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php

Indentation +203 added lines, -203 removed lines

@@ -31,235 +31,235 @@
  */
 class modTcpdfbarcode extends ModeleBarCode
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	public $is2d = false;
+    public $is2d = false;
 
-	/**
-	 *	Return description of numbering model
-	 *
-	 *	@return		string		Text with description
-	 */
-	function info()
-	{
-		global $langs;
+    /**
+     *	Return description of numbering model
+     *
+     *	@return		string		Text with description
+     */
+    function info()
+    {
+        global $langs;
 
-		return 'TCPDF-barcode';
-	}
+        return 'TCPDF-barcode';
+    }
 
-	/**
-	 *	Return if a module can be used or not
-	 *
-	 *	@return		boolean		true if module can be used
-	 */
-	function isEnabled()
-	{
-		return true;
-	}
+    /**
+     *	Return if a module can be used or not
+     *
+     *	@return		boolean		true if module can be used
+     */
+    function isEnabled()
+    {
+        return true;
+    }
 
-	/**
-	 *	Test si les numeros deja en vigueur dans la base ne provoquent pas de
-	 *	de conflits qui empechera cette numerotation de fonctionner.
-	 *
-	 *	@return		boolean		false si conflit, true si ok
-	 */
-	function canBeActivated()
-	{
-		global $langs;
+    /**
+     *	Test si les numeros deja en vigueur dans la base ne provoquent pas de
+     *	de conflits qui empechera cette numerotation de fonctionner.
+     *
+     *	@return		boolean		false si conflit, true si ok
+     */
+    function canBeActivated()
+    {
+        global $langs;
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 *	Return true if encoding is supported
-	 *
-	 *	@param	string	$encoding		Encoding norm
-	 *	@return	int						>0 if supported, 0 if not
-	 */
-	function encodingIsSupported($encoding)
-	{
-		$tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
-		if (empty($tcpdfEncoding)) {
-			return 0;
-		} else {
-			return 1;
-		}
-	}
+    /**
+     *	Return true if encoding is supported
+     *
+     *	@param	string	$encoding		Encoding norm
+     *	@return	int						>0 if supported, 0 if not
+     */
+    function encodingIsSupported($encoding)
+    {
+        $tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
+        if (empty($tcpdfEncoding)) {
+            return 0;
+        } else {
+            return 1;
+        }
+    }
 
-	/**
-	 *	Return an image file on the fly (no need to write on disk)
-	 *
-	 *	@param	   string	    $code		      Value to encode
-	 *	@param	   string	    $encoding	      Mode of encoding
-	 *	@param	   string	    $readable	      Code can be read
-	 *	@param	   integer		$scale			  Scale (not used with this engine)
-	 *  @param     integer      $nooutputiferror  No output if error (not used with this engine)
-	 *	@return	   int			                  <0 if KO, >0 if OK
-	 */
-	function buildBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
-	{
-		global $_GET;
+    /**
+     *	Return an image file on the fly (no need to write on disk)
+     *
+     *	@param	   string	    $code		      Value to encode
+     *	@param	   string	    $encoding	      Mode of encoding
+     *	@param	   string	    $readable	      Code can be read
+     *	@param	   integer		$scale			  Scale (not used with this engine)
+     *  @param     integer      $nooutputiferror  No output if error (not used with this engine)
+     *	@return	   int			                  <0 if KO, >0 if OK
+     */
+    function buildBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
+    {
+        global $_GET;
 
-		$tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
-		if (empty($tcpdfEncoding)) return -1;
+        $tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
+        if (empty($tcpdfEncoding)) return -1;
 
-		$color = array(0,0,0);
+        $color = array(0,0,0);
 
-		$_GET["code"]=$code;
-		$_GET["type"]=$encoding;
-		$_GET["height"]=$height;
-		$_GET["readable"]=$readable;
+        $_GET["code"]=$code;
+        $_GET["type"]=$encoding;
+        $_GET["height"]=$height;
+        $_GET["readable"]=$readable;
 
-		if ($code) {
-			// Load the tcpdf barcode class
-			if ($this->is2d) {
-				$height = 3;
-				$width = 3;
-				require_once TCPDF_PATH.'tcpdf_barcodes_2d.php';
-				$barcodeobj = new TCPDF2DBarcode($code, $tcpdfEncoding);
-			} else {
-				$height = 50;
-				$width = 1;
-				require_once TCPDF_PATH.'tcpdf_barcodes_1d.php';
-				$barcodeobj = new TCPDFBarcode($code, $tcpdfEncoding);
-			}
+        if ($code) {
+            // Load the tcpdf barcode class
+            if ($this->is2d) {
+                $height = 3;
+                $width = 3;
+                require_once TCPDF_PATH.'tcpdf_barcodes_2d.php';
+                $barcodeobj = new TCPDF2DBarcode($code, $tcpdfEncoding);
+            } else {
+                $height = 50;
+                $width = 1;
+                require_once TCPDF_PATH.'tcpdf_barcodes_1d.php';
+                $barcodeobj = new TCPDFBarcode($code, $tcpdfEncoding);
+            }
 
-			dol_syslog("buildBarCode::TCPDF.getBarcodePNG");
-			$barcodeobj->getBarcodePNG($width, $height, $color);
+            dol_syslog("buildBarCode::TCPDF.getBarcodePNG");
+            $barcodeobj->getBarcodePNG($width, $height, $color);
 
-			return 1;
-		} else {
-			return -2;
-		}
-	}
+            return 1;
+        } else {
+            return -2;
+        }
+    }
 
-	/**
-	 *	Save an image file on disk (with no output)
-	 *
-	 *	@param	   string	    $code		      Value to encode
-	 *	@param	   string	    $encoding	      Mode of encoding
-	 *	@param	   string	    $readable	      Code can be read
-	 *	@param	   integer		$scale			  Scale (not used with this engine)
-	 *  @param     integer      $nooutputiferror  No output if error (not used with this engine)
-	 *	@return	   int			                  <0 if KO, >0 if OK
-	 */
-	function writeBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
-	{
-		global $conf,$_GET;
+    /**
+     *	Save an image file on disk (with no output)
+     *
+     *	@param	   string	    $code		      Value to encode
+     *	@param	   string	    $encoding	      Mode of encoding
+     *	@param	   string	    $readable	      Code can be read
+     *	@param	   integer		$scale			  Scale (not used with this engine)
+     *  @param     integer      $nooutputiferror  No output if error (not used with this engine)
+     *	@return	   int			                  <0 if KO, >0 if OK
+     */
+    function writeBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
+    {
+        global $conf,$_GET;
 
-		dol_mkdir($conf->barcode->dir_temp);
-		$file=$conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
+        dol_mkdir($conf->barcode->dir_temp);
+        $file=$conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
 
-		$tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
-		if (empty($tcpdfEncoding)) return -1;
+        $tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
+        if (empty($tcpdfEncoding)) return -1;
 
-		$color = array(0,0,0);
+        $color = array(0,0,0);
 
-		$_GET["code"]=$code;
-		$_GET["type"]=$encoding;
-		$_GET["height"]=$height;
-		$_GET["readable"]=$readable;
+        $_GET["code"]=$code;
+        $_GET["type"]=$encoding;
+        $_GET["height"]=$height;
+        $_GET["readable"]=$readable;
 
-		if ($code) {
-			// Load the tcpdf barcode class
-			if ($this->is2d) {
-				$height = 1;
-				$width = 1;
-				require_once TCPDF_PATH.'tcpdf_barcodes_2d.php';
-				$barcodeobj = new TCPDF2DBarcode($code, $tcpdfEncoding);
-			} else {
-				$height = 50;
-				$width = 1;
-				require_once TCPDF_PATH.'tcpdf_barcodes_1d.php';
-				$barcodeobj = new TCPDFBarcode($code, $tcpdfEncoding);
-			}
+        if ($code) {
+            // Load the tcpdf barcode class
+            if ($this->is2d) {
+                $height = 1;
+                $width = 1;
+                require_once TCPDF_PATH.'tcpdf_barcodes_2d.php';
+                $barcodeobj = new TCPDF2DBarcode($code, $tcpdfEncoding);
+            } else {
+                $height = 50;
+                $width = 1;
+                require_once TCPDF_PATH.'tcpdf_barcodes_1d.php';
+                $barcodeobj = new TCPDFBarcode($code, $tcpdfEncoding);
+            }
 
-			dol_syslog("writeBarCode::TCPDF.getBarcodePngData");
-			if ($imageData = $barcodeobj->getBarcodePngData($width, $height, $color)) {
-				if (function_exists('imagecreate')) {
-					$imageData = imagecreatefromstring($imageData);
-				}
-				if (imagepng($imageData, $file)) {
-					return 1;
-				} else {
-					return -3;
-				}
-			} else {
-				return -4;
-			}
-		} else {
-			return -2;
-		}
-	}
+            dol_syslog("writeBarCode::TCPDF.getBarcodePngData");
+            if ($imageData = $barcodeobj->getBarcodePngData($width, $height, $color)) {
+                if (function_exists('imagecreate')) {
+                    $imageData = imagecreatefromstring($imageData);
+                }
+                if (imagepng($imageData, $file)) {
+                    return 1;
+                } else {
+                    return -3;
+                }
+            } else {
+                return -4;
+            }
+        } else {
+            return -2;
+        }
+    }
 
-	/**
-	 *	get available output_modes for tcpdf class wth its translated description
-	 *
-	 * @param	string $dolEncodingType dolibarr barcode encoding type
-	 * @return	string tcpdf encoding type
-	 */
-	public function getTcpdfEncodingType($dolEncodingType)
-	{
-		$tcpdf1dEncodingTypes = array(
-						'C39' => 'C39',
-						'C39+' => 'C39+',
-						'C39E' => 'C39E',
-						'C39E+' => 'C39E+',
-						'S25' => 'S25',
-						'S25+' => 'S25+',
-						'I25' => 'I25',
-						'I25+' => 'I25+',
-						'C128' => 'C128',
-						'C128A' => 'C128A',
-						'C128B' => 'C128B',
-						'C128C' => 'C128C',
-						'EAN2' => 'EAN2',
-						'EAN5' => 'EAN5',
-						'EAN8' => 'EAN8',
-						'EAN13' => 'EAN13',
-						'ISBN' => 'EAN13',
-						'UPC' => 'UPCA',
-						'UPCE' => 'UPCE',
-						'MSI' => 'MSI',
-						'MSI+' => 'MSI+',
-						'POSTNET' => 'POSTNET',
-						'PLANET' => 'PLANET',
-						'RMS4CC' => 'RMS4CC',
-						'KIX' => 'KIX',
-						'IMB' => 'IMB',
-						'CODABAR' => 'CODABAR',
-						'CODE11' => 'CODE11',
-						'PHARMA' => 'PHARMA',
-						'PHARMA2T' => 'PHARMA2T'
-		);
+    /**
+     *	get available output_modes for tcpdf class wth its translated description
+     *
+     * @param	string $dolEncodingType dolibarr barcode encoding type
+     * @return	string tcpdf encoding type
+     */
+    public function getTcpdfEncodingType($dolEncodingType)
+    {
+        $tcpdf1dEncodingTypes = array(
+                        'C39' => 'C39',
+                        'C39+' => 'C39+',
+                        'C39E' => 'C39E',
+                        'C39E+' => 'C39E+',
+                        'S25' => 'S25',
+                        'S25+' => 'S25+',
+                        'I25' => 'I25',
+                        'I25+' => 'I25+',
+                        'C128' => 'C128',
+                        'C128A' => 'C128A',
+                        'C128B' => 'C128B',
+                        'C128C' => 'C128C',
+                        'EAN2' => 'EAN2',
+                        'EAN5' => 'EAN5',
+                        'EAN8' => 'EAN8',
+                        'EAN13' => 'EAN13',
+                        'ISBN' => 'EAN13',
+                        'UPC' => 'UPCA',
+                        'UPCE' => 'UPCE',
+                        'MSI' => 'MSI',
+                        'MSI+' => 'MSI+',
+                        'POSTNET' => 'POSTNET',
+                        'PLANET' => 'PLANET',
+                        'RMS4CC' => 'RMS4CC',
+                        'KIX' => 'KIX',
+                        'IMB' => 'IMB',
+                        'CODABAR' => 'CODABAR',
+                        'CODE11' => 'CODE11',
+                        'PHARMA' => 'PHARMA',
+                        'PHARMA2T' => 'PHARMA2T'
+        );
 
-		$tcpdf2dEncodingTypes = array(
-						'DATAMATRIX' => 'DATAMATRIX',
-						'PDF417' => 'PDF417',
-						'QRCODE' => 'QRCODE,L',
-						'QRCODE,L' => 'QRCODE,L',
-						'QRCODE,M' => 'QRCODE,M',
-						'QRCODE,Q' => 'QRCODE,Q',
-						'QRCODE,H' => 'QRCODE,H'
-		);
+        $tcpdf2dEncodingTypes = array(
+                        'DATAMATRIX' => 'DATAMATRIX',
+                        'PDF417' => 'PDF417',
+                        'QRCODE' => 'QRCODE,L',
+                        'QRCODE,L' => 'QRCODE,L',
+                        'QRCODE,M' => 'QRCODE,M',
+                        'QRCODE,Q' => 'QRCODE,Q',
+                        'QRCODE,H' => 'QRCODE,H'
+        );
 
-		if (array_key_exists($dolEncodingType, $tcpdf1dEncodingTypes)) {
-			$this->is2d = false;
-			return $tcpdf1dEncodingTypes[$dolEncodingType];
-		} else if (array_key_exists($dolEncodingType, $tcpdf2dEncodingTypes)) {
-			$this->is2d = true;
-			return $tcpdf2dEncodingTypes[$dolEncodingType];
-		} else {
-			return '';
-		}
-	}
+        if (array_key_exists($dolEncodingType, $tcpdf1dEncodingTypes)) {
+            $this->is2d = false;
+            return $tcpdf1dEncodingTypes[$dolEncodingType];
+        } else if (array_key_exists($dolEncodingType, $tcpdf2dEncodingTypes)) {
+            $this->is2d = true;
+            return $tcpdf2dEncodingTypes[$dolEncodingType];
+        } else {
+            return '';
+        }
+    }
 }

Spacing +17 added lines, -17 removed lines

@@ -24,7 +24,7 @@ 
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/barcode/modules_barcode.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php';	   // This is to include def like $genbarcode_loc and $font_loc
+require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php'; // This is to include def like $genbarcode_loc and $font_loc
 
 /**
  *	Class to generate barcode images using tcpdf barcode generator
@@ -35,12 +35,12 @@ 
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	public $is2d = false;
 
@@ -105,19 +105,19 @@ 
 	 *  @param     integer      $nooutputiferror  No output if error (not used with this engine)
 	 *	@return	   int			                  <0 if KO, >0 if OK
 	 */
-	function buildBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
+	function buildBarCode($code, $encoding, $readable = 'Y', $scale = 1, $nooutputiferror = 0)
 	{
 		global $_GET;
 
 		$tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
 		if (empty($tcpdfEncoding)) return -1;
 
-		$color = array(0,0,0);
+		$color = array(0, 0, 0);
 
-		$_GET["code"]=$code;
-		$_GET["type"]=$encoding;
-		$_GET["height"]=$height;
-		$_GET["readable"]=$readable;
+		$_GET["code"] = $code;
+		$_GET["type"] = $encoding;
+		$_GET["height"] = $height;
+		$_GET["readable"] = $readable;
 
 		if ($code) {
 			// Load the tcpdf barcode class
@@ -152,22 +152,22 @@ 
 	 *  @param     integer      $nooutputiferror  No output if error (not used with this engine)
 	 *	@return	   int			                  <0 if KO, >0 if OK
 	 */
-	function writeBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
+	function writeBarCode($code, $encoding, $readable = 'Y', $scale = 1, $nooutputiferror = 0)
 	{
-		global $conf,$_GET;
+		global $conf, $_GET;
 
 		dol_mkdir($conf->barcode->dir_temp);
-		$file=$conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
+		$file = $conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
 
 		$tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
 		if (empty($tcpdfEncoding)) return -1;
 
-		$color = array(0,0,0);
+		$color = array(0, 0, 0);
 
-		$_GET["code"]=$code;
-		$_GET["type"]=$encoding;
-		$_GET["height"]=$height;
-		$_GET["readable"]=$readable;
+		$_GET["code"] = $code;
+		$_GET["type"] = $encoding;
+		$_GET["height"] = $height;
+		$_GET["readable"] = $readable;
 
 		if ($code) {
 			// Load the tcpdf barcode class

Braces +6 added lines, -2 removed lines

@@ -110,7 +110,9 @@ 
 		global $_GET;
 
 		$tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
-		if (empty($tcpdfEncoding)) return -1;
+		if (empty($tcpdfEncoding)) {
+		    return -1;
+		}
 
 		$color = array(0,0,0);
 
@@ -160,7 +162,9 @@ 
 		$file=$conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
 
 		$tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
-		if (empty($tcpdfEncoding)) return -1;
+		if (empty($tcpdfEncoding)) {
+		    return -1;
+		}
 
 		$color = array(0,0,0);
 

dolibarr/htdocs/core/modules/barcode/doc/phpbarcode.modules.php

Indentation +122 added lines, -122 removed lines

@@ -32,147 +32,147 @@
  */
 class modPhpbarcode extends ModeleBarCode
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
-
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-
-	/**
-	 * 	Return if a module can be used or not
-	 *
-	 *  @return		boolean     true if module can be used
-	 */
-	function isEnabled()
-	{
-		return true;
-	}
-
-
-	/**
-	 * 	Return description
-	 *
-	 * 	@return     string      Texte descripif
-	 */
-	function info()
-	{
-		global $langs;
-
-		$key = 'BarcodeInternalEngine';
-		$trans = $langs->trans('BarcodeInternalEngine');
-
-		return ($trans != $key) ? $trans : 'Internal engine';
-	}
-
-	/**
-	 *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
-	 *  de conflits qui empechera cette numerotation de fonctionner.
-	 *
-	 *	@return     boolean     false si conflit, true si ok
-	 */
-	function canBeActivated()
-	{
-		global $langs;
-
-		return true;
-	}
-
-
-	/**
-	 *	Return true if encoding is supported
-	 *
-	 *	@param	string	$encoding		Encoding norm
-	 *	@return	int						>0 if supported, 0 if not
-	 */
-	function encodingIsSupported($encoding)
-	{
-		global $genbarcode_loc;
+    public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+
+    /**
+     * 	Return if a module can be used or not
+     *
+     *  @return		boolean     true if module can be used
+     */
+    function isEnabled()
+    {
+        return true;
+    }
+
+
+    /**
+     * 	Return description
+     *
+     * 	@return     string      Texte descripif
+     */
+    function info()
+    {
+        global $langs;
+
+        $key = 'BarcodeInternalEngine';
+        $trans = $langs->trans('BarcodeInternalEngine');
+
+        return ($trans != $key) ? $trans : 'Internal engine';
+    }
+
+    /**
+     *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
+     *  de conflits qui empechera cette numerotation de fonctionner.
+     *
+     *	@return     boolean     false si conflit, true si ok
+     */
+    function canBeActivated()
+    {
+        global $langs;
+
+        return true;
+    }
+
+
+    /**
+     *	Return true if encoding is supported
+     *
+     *	@param	string	$encoding		Encoding norm
+     *	@return	int						>0 if supported, 0 if not
+     */
+    function encodingIsSupported($encoding)
+    {
+        global $genbarcode_loc;
         //print 'genbarcode_loc='.$genbarcode_loc.' encoding='.$encoding;exit;
 
-		$supported=0;
-		if ($encoding == 'EAN13') $supported=1;
-		if ($encoding == 'ISBN')  $supported=1;
-		// Formats that hangs on Windows (when genbarcode.exe for Windows is called, so they are not
-		// activated on Windows)
-		if (file_exists($genbarcode_loc) && empty($_SERVER["WINDIR"]))
-		{
-			if ($encoding == 'EAN8')  $supported=1;
-			if ($encoding == 'UPC')   $supported=1;
-			if ($encoding == 'C39')   $supported=1;
-			if ($encoding == 'C128')  $supported=1;
-		}
-		return $supported;
-	}
+        $supported=0;
+        if ($encoding == 'EAN13') $supported=1;
+        if ($encoding == 'ISBN')  $supported=1;
+        // Formats that hangs on Windows (when genbarcode.exe for Windows is called, so they are not
+        // activated on Windows)
+        if (file_exists($genbarcode_loc) && empty($_SERVER["WINDIR"]))
+        {
+            if ($encoding == 'EAN8')  $supported=1;
+            if ($encoding == 'UPC')   $supported=1;
+            if ($encoding == 'C39')   $supported=1;
+            if ($encoding == 'C128')  $supported=1;
+        }
+        return $supported;
+    }
 
     /**
-	 *	Return an image file on the fly (no need to write on disk)
-	 *
-	 *	@param	string   	$code			  Value to encode
-	 *	@param  string	 	$encoding		  Mode of encoding
-	 *	@param  string	 	$readable		  Code can be read
-	 *	@param	integer		$scale			  Scale
-	 *  @param  integer     $nooutputiferror  No output if error
-	 *	@return	int							  <0 if KO, >0 if OK
+     *	Return an image file on the fly (no need to write on disk)
+     *
+     *	@param	string   	$code			  Value to encode
+     *	@param  string	 	$encoding		  Mode of encoding
+     *	@param  string	 	$readable		  Code can be read
+     *	@param	integer		$scale			  Scale
+     *  @param  integer     $nooutputiferror  No output if error
+     *	@return	int							  <0 if KO, >0 if OK
      */
-	function buildBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
-	{
-		global $_GET,$_SERVER;
-		global $conf;
-		global $genbarcode_loc, $bar_color, $bg_color, $text_color, $font_loc;
+    function buildBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
+    {
+        global $_GET,$_SERVER;
+        global $conf;
+        global $genbarcode_loc, $bar_color, $bg_color, $text_color, $font_loc;
 
-		if (! $this->encodingIsSupported($encoding)) return -1;
+        if (! $this->encodingIsSupported($encoding)) return -1;
 
-		if ($encoding == 'EAN8' || $encoding == 'EAN13') $encoding = 'EAN';
-		if ($encoding == 'C39' || $encoding == 'C128')   $encoding = substr($encoding,1);
+        if ($encoding == 'EAN8' || $encoding == 'EAN13') $encoding = 'EAN';
+        if ($encoding == 'C39' || $encoding == 'C128')   $encoding = substr($encoding,1);
 
-		$mode='png';
+        $mode='png';
 
-		$_GET["code"]=$code;
-		$_GET["encoding"]=$encoding;
-		$_GET["scale"]=$scale;
-		$_GET["mode"]=$mode;
+        $_GET["code"]=$code;
+        $_GET["encoding"]=$encoding;
+        $_GET["scale"]=$scale;
+        $_GET["mode"]=$mode;
 
-		dol_syslog(get_class($this)."::buildBarCode $code,$encoding,$scale,$mode");
-		if ($code) $result=barcode_print($code,$encoding,$scale,$mode);
+        dol_syslog(get_class($this)."::buildBarCode $code,$encoding,$scale,$mode");
+        if ($code) $result=barcode_print($code,$encoding,$scale,$mode);
 
-		if (! is_array($result))
-		{
-			$this->error=$result;
-			if (empty($nooutputiferror)) print $this->error;
-			return -1;
-		}
+        if (! is_array($result))
+        {
+            $this->error=$result;
+            if (empty($nooutputiferror)) print $this->error;
+            return -1;
+        }
 
-		return 1;
-	}
+        return 1;
+    }
 
-	/**
-	 *	Save an image file on disk (with no output)
-	 *
-	 *	@param	string   	$code			  Value to encode
-	 *	@param	string   	$encoding		  Mode of encoding
-	 *	@param  string	 	$readable		  Code can be read
-	 *	@param	integer		$scale			  Scale
-	 *  @param  integer     $nooutputiferror  No output if error
-	 *	@return	int							  <0 if KO, >0 if OK
-	 */
-	function writeBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
-	{
-		global $conf,$filebarcode;
+    /**
+     *	Save an image file on disk (with no output)
+     *
+     *	@param	string   	$code			  Value to encode
+     *	@param	string   	$encoding		  Mode of encoding
+     *	@param  string	 	$readable		  Code can be read
+     *	@param	integer		$scale			  Scale
+     *  @param  integer     $nooutputiferror  No output if error
+     *	@return	int							  <0 if KO, >0 if OK
+     */
+    function writeBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
+    {
+        global $conf,$filebarcode;
 
-		dol_mkdir($conf->barcode->dir_temp);
+        dol_mkdir($conf->barcode->dir_temp);
 
-		$file=$conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
+        $file=$conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
 
-		$filebarcode=$file;	// global var to be used in barcode_outimage called by barcode_print in buildBarCode
+        $filebarcode=$file;	// global var to be used in barcode_outimage called by barcode_print in buildBarCode
 
-		$result=$this->buildBarCode($code,$encoding,$readable,$scale,$nooutputiferror);
+        $result=$this->buildBarCode($code,$encoding,$readable,$scale,$nooutputiferror);
 
-		return $result;
-	}
+        return $result;
+    }
 }

Spacing +27 added lines, -27 removed lines

@@ -24,7 +24,7 @@ 
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/barcode/modules_barcode.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php';    // This is to include def like $genbarcode_loc and $font_loc
+require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php'; // This is to include def like $genbarcode_loc and $font_loc
 
 
 /**
@@ -36,12 +36,12 @@ 
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
 	/**
@@ -95,17 +95,17 @@ 
 		global $genbarcode_loc;
         //print 'genbarcode_loc='.$genbarcode_loc.' encoding='.$encoding;exit;
 
-		$supported=0;
-		if ($encoding == 'EAN13') $supported=1;
-		if ($encoding == 'ISBN')  $supported=1;
+		$supported = 0;
+		if ($encoding == 'EAN13') $supported = 1;
+		if ($encoding == 'ISBN')  $supported = 1;
 		// Formats that hangs on Windows (when genbarcode.exe for Windows is called, so they are not
 		// activated on Windows)
 		if (file_exists($genbarcode_loc) && empty($_SERVER["WINDIR"]))
 		{
-			if ($encoding == 'EAN8')  $supported=1;
-			if ($encoding == 'UPC')   $supported=1;
-			if ($encoding == 'C39')   $supported=1;
-			if ($encoding == 'C128')  $supported=1;
+			if ($encoding == 'EAN8')  $supported = 1;
+			if ($encoding == 'UPC')   $supported = 1;
+			if ($encoding == 'C39')   $supported = 1;
+			if ($encoding == 'C128')  $supported = 1;
 		}
 		return $supported;
 	}
@@ -120,30 +120,30 @@ 
 	 *  @param  integer     $nooutputiferror  No output if error
 	 *	@return	int							  <0 if KO, >0 if OK
      */
-	function buildBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
+	function buildBarCode($code, $encoding, $readable = 'Y', $scale = 1, $nooutputiferror = 0)
 	{
-		global $_GET,$_SERVER;
+		global $_GET, $_SERVER;
 		global $conf;
 		global $genbarcode_loc, $bar_color, $bg_color, $text_color, $font_loc;
 
-		if (! $this->encodingIsSupported($encoding)) return -1;
+		if (!$this->encodingIsSupported($encoding)) return -1;
 
 		if ($encoding == 'EAN8' || $encoding == 'EAN13') $encoding = 'EAN';
-		if ($encoding == 'C39' || $encoding == 'C128')   $encoding = substr($encoding,1);
+		if ($encoding == 'C39' || $encoding == 'C128')   $encoding = substr($encoding, 1);
 
-		$mode='png';
+		$mode = 'png';
 
-		$_GET["code"]=$code;
-		$_GET["encoding"]=$encoding;
-		$_GET["scale"]=$scale;
-		$_GET["mode"]=$mode;
+		$_GET["code"] = $code;
+		$_GET["encoding"] = $encoding;
+		$_GET["scale"] = $scale;
+		$_GET["mode"] = $mode;
 
 		dol_syslog(get_class($this)."::buildBarCode $code,$encoding,$scale,$mode");
-		if ($code) $result=barcode_print($code,$encoding,$scale,$mode);
+		if ($code) $result = barcode_print($code, $encoding, $scale, $mode);
 
-		if (! is_array($result))
+		if (!is_array($result))
 		{
-			$this->error=$result;
+			$this->error = $result;
 			if (empty($nooutputiferror)) print $this->error;
 			return -1;
 		}
@@ -161,17 +161,17 @@ 
 	 *  @param  integer     $nooutputiferror  No output if error
 	 *	@return	int							  <0 if KO, >0 if OK
 	 */
-	function writeBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
+	function writeBarCode($code, $encoding, $readable = 'Y', $scale = 1, $nooutputiferror = 0)
 	{
-		global $conf,$filebarcode;
+		global $conf, $filebarcode;
 
 		dol_mkdir($conf->barcode->dir_temp);
 
-		$file=$conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
+		$file = $conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
 
-		$filebarcode=$file;	// global var to be used in barcode_outimage called by barcode_print in buildBarCode
+		$filebarcode = $file; // global var to be used in barcode_outimage called by barcode_print in buildBarCode
 
-		$result=$this->buildBarCode($code,$encoding,$readable,$scale,$nooutputiferror);
+		$result = $this->buildBarCode($code, $encoding, $readable, $scale, $nooutputiferror);
 
 		return $result;
 	}

Braces +33 added lines, -11 removed lines

@@ -96,16 +96,28 @@ 
         //print 'genbarcode_loc='.$genbarcode_loc.' encoding='.$encoding;exit;
 
 		$supported=0;
-		if ($encoding == 'EAN13') $supported=1;
-		if ($encoding == 'ISBN')  $supported=1;
+		if ($encoding == 'EAN13') {
+		    $supported=1;
+		}
+		if ($encoding == 'ISBN') {
+		    $supported=1;
+		}
 		// Formats that hangs on Windows (when genbarcode.exe for Windows is called, so they are not
 		// activated on Windows)
 		if (file_exists($genbarcode_loc) && empty($_SERVER["WINDIR"]))
 		{
-			if ($encoding == 'EAN8')  $supported=1;
-			if ($encoding == 'UPC')   $supported=1;
-			if ($encoding == 'C39')   $supported=1;
-			if ($encoding == 'C128')  $supported=1;
+			if ($encoding == 'EAN8') {
+			    $supported=1;
+			}
+			if ($encoding == 'UPC') {
+			    $supported=1;
+			}
+			if ($encoding == 'C39') {
+			    $supported=1;
+			}
+			if ($encoding == 'C128') {
+			    $supported=1;
+			}
 		}
 		return $supported;
 	}
@@ -126,10 +138,16 @@ 
 		global $conf;
 		global $genbarcode_loc, $bar_color, $bg_color, $text_color, $font_loc;
 
-		if (! $this->encodingIsSupported($encoding)) return -1;
+		if (! $this->encodingIsSupported($encoding)) {
+		    return -1;
+		}
 
-		if ($encoding == 'EAN8' || $encoding == 'EAN13') $encoding = 'EAN';
-		if ($encoding == 'C39' || $encoding == 'C128')   $encoding = substr($encoding,1);
+		if ($encoding == 'EAN8' || $encoding == 'EAN13') {
+		    $encoding = 'EAN';
+		}
+		if ($encoding == 'C39' || $encoding == 'C128') {
+		    $encoding = substr($encoding,1);
+		}
 
 		$mode='png';
 
@@ -139,12 +157,16 @@ 
 		$_GET["mode"]=$mode;
 
 		dol_syslog(get_class($this)."::buildBarCode $code,$encoding,$scale,$mode");
-		if ($code) $result=barcode_print($code,$encoding,$scale,$mode);
+		if ($code) {
+		    $result=barcode_print($code,$encoding,$scale,$mode);
+		}
 
 		if (! is_array($result))
 		{
 			$this->error=$result;
-			if (empty($nooutputiferror)) print $this->error;
+			if (empty($nooutputiferror)) {
+			    print $this->error;
+			}
 			return -1;
 		}
 

dolibarr/htdocs/core/modules/barcode/mod_barcode_product_standard.php

Indentation +266 added lines, -266 removed lines

@@ -33,286 +33,286 @@
  */
 class mod_barcode_product_standard extends ModeleNumRefBarCode
 {
-	public $name='Standard';				// Model Name
+    public $name='Standard';				// Model Name
 
-	public $code_modifiable;				// Editable code
+    public $code_modifiable;				// Editable code
 
-	public $code_modifiable_invalide;		// Modified code if it is invalid
+    public $code_modifiable_invalide;		// Modified code if it is invalid
 
-	public $code_modifiable_null;			// Modified code if it is null
+    public $code_modifiable_null;			// Modified code if it is null
 
-	public $code_null;						// Optional code
+    public $code_null;						// Optional code
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';    		// 'development', 'experimental', 'dolibarr'
-
-	public $code_auto;                     // Automatic Numbering
-
-	public $searchcode; // Search string
-
-	public $numbitcounter; // Number of digits the counter
-
-	public $prefixIsRequired; // The prefix field of third party must be filled when using {pre}
-
-
-	/**
-	 *	Constructor
-	 */
-	function __construct()
-	{
-		$this->code_null = 0;
-		$this->code_modifiable = 1;
-		$this->code_modifiable_invalide = 1;
-		$this->code_modifiable_null = 1;
-		$this->code_auto = 1;
-		$this->prefixIsRequired = 0;
-	}
-
-
-	/**		Return description of module
-	 *
-	 * 		@param	Translate 		$langs		Object langs
-	 * 		@return string      			Description of module
-	 */
-	function info($langs)
-	{
-		global $conf, $mc;
-		global $form;
-
-		$langs->load("products");
-
-		$disabled = ((! empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? ' disabled' : '');
-
-		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="BARCODE_STANDARD_PRODUCT_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("BarCode"),$langs->transnoentities("BarCode"));
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4c");
-		$tooltip.=$langs->trans("GenericMaskCodes5");
-
-		// Mask parameter
-		//$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("BarCodeModel").'):</td>';
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value1" value="'.(! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)?$conf->global->BARCODE_STANDARD_PRODUCT_MASK:'').'"'.$disabled.'>',$tooltip,1,1).'</td>';
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></td>';
-		$texte.= '</tr>';
-
-		$texte.= '</table>';
-		$texte.= '</form>';
-
-		return $texte;
-	}
-
-
-	/**
-	 * Return an example of result returned by getNextValue
-	 *
-	 * @param	Translate	$langs			Object langs
-	 * @param	Product		$objproduct		Object product
-	 * @return	string						Return string example
-	 */
-	function getExample($langs,$objproduct=0)
-	{
-		$examplebarcode = $this->getNextValue($objproduct,'');
-		if (! $examplebarcode)
-		{
-			$examplebarcode = $langs->trans('NotConfigured');
-		}
-		if($examplebarcode=="ErrorBadMask")
-		{
-			$langs->load("errors");
-			$examplebarcode=$langs->trans($examplebarcode);
-		}
-
-		return $examplebarcode;
-	}
-
-	/**
-	 * Return next value
-	 *
-	 * @param	Product		$objproduct     Object product
-	 * @param	string		$type       	Type of barcode (EAN, ISBN, ...)
-	 * @return 	string      				Value if OK, '' if module not configured, <0 if KO
-	 */
-	function getNextValue($objproduct=null,$type='')
-	{
-		global $db,$conf;
-
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
-
-		// TODO
-
-		// Get Mask value
-		$mask = '';
-		if (! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) $mask = $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
-
-		if (empty($mask))
-		{
-			$this->error='NotConfigured';
-			return '';
-		}
-
-		$field='barcode';$where='';
-
-		$now=dol_now();
-
-		$numFinal=get_next_value($db,$mask,'product',$field,$where,'',$now);
-
-		return  $numFinal;
-	}
-
-
-	/**
-	 * 	Check validity of code according to its rules
-	 *
-	 *	@param	DoliDB		$db					Database handler
-	 *	@param	string		$code				Code to check/correct
-	 *	@param	Product		$product			Object product
-	 *  @param  int		  	$thirdparty_type   	0 = customer/prospect , 1 = supplier
-	 *  @param	string		$type       	    type of barcode (EAN, ISBN, ...)
-	 *  @return int								0 if OK
-	 * 											-1 ErrorBadCustomerCodeSyntax
-	 * 											-2 ErrorCustomerCodeRequired
-	 * 											-3 ErrorCustomerCodeAlreadyUsed
-	 * 											-4 ErrorPrefixRequired
-	 */
-	function verif($db, &$code, $product, $thirdparty_type, $type)
-	{
-		global $conf;
-
-		//var_dump($code.' '.$product->ref.' '.$thirdparty_type);exit;
-
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
-
-		$result=0;
-		$code = strtoupper(trim($code));
-
-		if (empty($code) && $this->code_null && empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK))
-		{
-			$result=0;
-		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) )
-		{
-			$result=-2;
-		}
-		else
-		{
-			if ($this->verif_syntax($code, $type) >= 0)
-			{
-				$is_dispo = $this->verif_dispo($db, $code, $product);
-				if ($is_dispo <> 0)
-				{
-					$result=-3;
-				}
-				else
-				{
-					$result=0;
-				}
-			}
-			else
-			{
-				if (dol_strlen($code) == 0)
-				{
-					$result=-2;
-				}
-				else
-				{
-					$result=-1;
-				}
-			}
-		}
-
-		dol_syslog(get_class($this)."::verif type=".$thirdparty_type." result=".$result);
-		return $result;
-	}
+    public $version = 'dolibarr';    		// 'development', 'experimental', 'dolibarr'
+
+    public $code_auto;                     // Automatic Numbering
+
+    public $searchcode; // Search string
+
+    public $numbitcounter; // Number of digits the counter
+
+    public $prefixIsRequired; // The prefix field of third party must be filled when using {pre}
+
+
+    /**
+     *	Constructor
+     */
+    function __construct()
+    {
+        $this->code_null = 0;
+        $this->code_modifiable = 1;
+        $this->code_modifiable_invalide = 1;
+        $this->code_modifiable_null = 1;
+        $this->code_auto = 1;
+        $this->prefixIsRequired = 0;
+    }
+
+
+    /**		Return description of module
+     *
+     * 		@param	Translate 		$langs		Object langs
+     * 		@return string      			Description of module
+     */
+    function info($langs)
+    {
+        global $conf, $mc;
+        global $form;
+
+        $langs->load("products");
+
+        $disabled = ((! empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? ' disabled' : '');
+
+        $texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+        $texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        $texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        $texte.= '<input type="hidden" name="action" value="setModuleOptions">';
+        $texte.= '<input type="hidden" name="param1" value="BARCODE_STANDARD_PRODUCT_MASK">';
+        $texte.= '<table class="nobordernopadding" width="100%">';
+
+        $tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("BarCode"),$langs->transnoentities("BarCode"));
+        $tooltip.=$langs->trans("GenericMaskCodes3");
+        $tooltip.=$langs->trans("GenericMaskCodes4c");
+        $tooltip.=$langs->trans("GenericMaskCodes5");
+
+        // Mask parameter
+        //$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("BarCodeModel").'):</td>';
+        $texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
+        $texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value1" value="'.(! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)?$conf->global->BARCODE_STANDARD_PRODUCT_MASK:'').'"'.$disabled.'>',$tooltip,1,1).'</td>';
+        $texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></td>';
+        $texte.= '</tr>';
+
+        $texte.= '</table>';
+        $texte.= '</form>';
+
+        return $texte;
+    }
+
+
+    /**
+     * Return an example of result returned by getNextValue
+     *
+     * @param	Translate	$langs			Object langs
+     * @param	Product		$objproduct		Object product
+     * @return	string						Return string example
+     */
+    function getExample($langs,$objproduct=0)
+    {
+        $examplebarcode = $this->getNextValue($objproduct,'');
+        if (! $examplebarcode)
+        {
+            $examplebarcode = $langs->trans('NotConfigured');
+        }
+        if($examplebarcode=="ErrorBadMask")
+        {
+            $langs->load("errors");
+            $examplebarcode=$langs->trans($examplebarcode);
+        }
+
+        return $examplebarcode;
+    }
+
+    /**
+     * Return next value
+     *
+     * @param	Product		$objproduct     Object product
+     * @param	string		$type       	Type of barcode (EAN, ISBN, ...)
+     * @return 	string      				Value if OK, '' if module not configured, <0 if KO
+     */
+    function getNextValue($objproduct=null,$type='')
+    {
+        global $db,$conf;
+
+        require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+
+        // TODO
+
+        // Get Mask value
+        $mask = '';
+        if (! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) $mask = $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
+
+        if (empty($mask))
+        {
+            $this->error='NotConfigured';
+            return '';
+        }
+
+        $field='barcode';$where='';
+
+        $now=dol_now();
+
+        $numFinal=get_next_value($db,$mask,'product',$field,$where,'',$now);
+
+        return  $numFinal;
+    }
+
+
+    /**
+     * 	Check validity of code according to its rules
+     *
+     *	@param	DoliDB		$db					Database handler
+     *	@param	string		$code				Code to check/correct
+     *	@param	Product		$product			Object product
+     *  @param  int		  	$thirdparty_type   	0 = customer/prospect , 1 = supplier
+     *  @param	string		$type       	    type of barcode (EAN, ISBN, ...)
+     *  @return int								0 if OK
+     * 											-1 ErrorBadCustomerCodeSyntax
+     * 											-2 ErrorCustomerCodeRequired
+     * 											-3 ErrorCustomerCodeAlreadyUsed
+     * 											-4 ErrorPrefixRequired
+     */
+    function verif($db, &$code, $product, $thirdparty_type, $type)
+    {
+        global $conf;
+
+        //var_dump($code.' '.$product->ref.' '.$thirdparty_type);exit;
+
+        require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+
+        $result=0;
+        $code = strtoupper(trim($code));
+
+        if (empty($code) && $this->code_null && empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK))
+        {
+            $result=0;
+        }
+        else if (empty($code) && (! $this->code_null || ! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) )
+        {
+            $result=-2;
+        }
+        else
+        {
+            if ($this->verif_syntax($code, $type) >= 0)
+            {
+                $is_dispo = $this->verif_dispo($db, $code, $product);
+                if ($is_dispo <> 0)
+                {
+                    $result=-3;
+                }
+                else
+                {
+                    $result=0;
+                }
+            }
+            else
+            {
+                if (dol_strlen($code) == 0)
+                {
+                    $result=-2;
+                }
+                else
+                {
+                    $result=-1;
+                }
+            }
+        }
+
+        dol_syslog(get_class($this)."::verif type=".$thirdparty_type." result=".$result);
+        return $result;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return if a code is used (by other element)
-	 *
-	 *	@param	DoliDB		$db			Handler acces base
-	 *	@param	string		$code		Code to check
-	 *	@param	Product		$product	Objet product
-	 *	@return	int						0 if available, <0 if KO
-	 */
-	function verif_dispo($db, $code, $product)
-	{
+    /**
+     *	Return if a code is used (by other element)
+     *
+     *	@param	DoliDB		$db			Handler acces base
+     *	@param	string		$code		Code to check
+     *	@param	Product		$product	Objet product
+     *	@return	int						0 if available, <0 if KO
+     */
+    function verif_dispo($db, $code, $product)
+    {
         // phpcs:enable
-		$sql = "SELECT barcode FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE barcode = '".$code."'";
-		if ($product->id > 0) $sql.= " AND rowid <> ".$product->id;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			if ($db->num_rows($resql) == 0)
-			{
-				return 0;
-			}
-			else
-			{
-				return -1;
-			}
-		}
-		else
-		{
-			return -2;
-		}
-	}
+        $sql = "SELECT barcode FROM ".MAIN_DB_PREFIX."product";
+        $sql.= " WHERE barcode = '".$code."'";
+        if ($product->id > 0) $sql.= " AND rowid <> ".$product->id;
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            if ($db->num_rows($resql) == 0)
+            {
+                return 0;
+            }
+            else
+            {
+                return -1;
+            }
+        }
+        else
+        {
+            return -2;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return if a barcode value match syntax
-	 *
-	 *	@param	string	$codefortest	Code to check syntax
+    /**
+     *	Return if a barcode value match syntax
+     *
+     *	@param	string	$codefortest	Code to check syntax
      *  @param	string	$typefortest	Type of barcode (ISBN, EAN, ...)
-	 *	@return	int						0 if OK, <0 if KO
-	 */
-	function verif_syntax($codefortest, $typefortest)
-	{
+     *	@return	int						0 if OK, <0 if KO
+     */
+    function verif_syntax($codefortest, $typefortest)
+    {
         // phpcs:enable
-		global $conf;
-
-		$result = 0;
-
-		// Get Mask value
-		$mask = empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)?'':$conf->global->BARCODE_STANDARD_PRODUCT_MASK;
-		if (! $mask)
-		{
-			$this->error='NotConfigured';
-			return -1;
-		}
-
-		dol_syslog(get_class($this).'::verif_syntax codefortest='.$codefortest." typefortest=".$typefortest);
-
-		$newcodefortest=$codefortest;
-
-		// Special case, if mask is on 12 digits instead of 13, we remove last char into code to test
-		if (in_array($typefortest,array('EAN13','ISBN')))	// We remove the CRC char not included into mask
-		{
-    		if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$mask,$reg))
-    	    {
-    	        if (strlen($reg[1]) == 12) $newcodefortest=substr($newcodefortest,0,12);
-    	        dol_syslog(get_class($this).'::verif_syntax newcodefortest='.$newcodefortest);
-    	    }
-		}
-
-		$result=check_value($mask,$newcodefortest);
-		if (is_string($result))
-		{
-			$this->error = $result;
-			return -1;
-		}
-
-		return $result;
-	}
+        global $conf;
+
+        $result = 0;
+
+        // Get Mask value
+        $mask = empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)?'':$conf->global->BARCODE_STANDARD_PRODUCT_MASK;
+        if (! $mask)
+        {
+            $this->error='NotConfigured';
+            return -1;
+        }
+
+        dol_syslog(get_class($this).'::verif_syntax codefortest='.$codefortest." typefortest=".$typefortest);
+
+        $newcodefortest=$codefortest;
+
+        // Special case, if mask is on 12 digits instead of 13, we remove last char into code to test
+        if (in_array($typefortest,array('EAN13','ISBN')))	// We remove the CRC char not included into mask
+        {
+            if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$mask,$reg))
+            {
+                if (strlen($reg[1]) == 12) $newcodefortest=substr($newcodefortest,0,12);
+                dol_syslog(get_class($this).'::verif_syntax newcodefortest='.$newcodefortest);
+            }
+        }
+
+        $result=check_value($mask,$newcodefortest);
+        if (is_string($result))
+        {
+            $this->error = $result;
+            return -1;
+        }
+
+        return $result;
+    }
 }

Spacing +56 added lines, -56 removed lines

@@ -33,23 +33,23 @@ 
  */
 class mod_barcode_product_standard extends ModeleNumRefBarCode
 {
-	public $name='Standard';				// Model Name
+	public $name = 'Standard'; // Model Name
 
-	public $code_modifiable;				// Editable code
+	public $code_modifiable; // Editable code
 
-	public $code_modifiable_invalide;		// Modified code if it is invalid
+	public $code_modifiable_invalide; // Modified code if it is invalid
 
-	public $code_modifiable_null;			// Modified code if it is null
+	public $code_modifiable_null; // Modified code if it is null
 
-	public $code_null;						// Optional code
+	public $code_null; // Optional code
 
 	/**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';    		// 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	public $code_auto;                     // Automatic Numbering
+	public $code_auto; // Automatic Numbering
 
 	public $searchcode; // Search string
 
@@ -84,29 +84,29 @@ 
 
 		$langs->load("products");
 
-		$disabled = ((! empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? ' disabled' : '');
+		$disabled = ((!empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? ' disabled' : '');
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="BARCODE_STANDARD_PRODUCT_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="BARCODE_STANDARD_PRODUCT_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("BarCode"),$langs->transnoentities("BarCode"));
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4c");
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("BarCode"), $langs->transnoentities("BarCode"));
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4c");
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Mask parameter
 		//$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("BarCodeModel").'):</td>';
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value1" value="'.(! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)?$conf->global->BARCODE_STANDARD_PRODUCT_MASK:'').'"'.$disabled.'>',$tooltip,1,1).'</td>';
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></td>';
-		$texte.= '</tr>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value1" value="'.(!empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK) ? $conf->global->BARCODE_STANDARD_PRODUCT_MASK : '').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></td>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
 	}
@@ -119,17 +119,17 @@ 
 	 * @param	Product		$objproduct		Object product
 	 * @return	string						Return string example
 	 */
-	function getExample($langs,$objproduct=0)
+	function getExample($langs, $objproduct = 0)
 	{
-		$examplebarcode = $this->getNextValue($objproduct,'');
-		if (! $examplebarcode)
+		$examplebarcode = $this->getNextValue($objproduct, '');
+		if (!$examplebarcode)
 		{
 			$examplebarcode = $langs->trans('NotConfigured');
 		}
-		if($examplebarcode=="ErrorBadMask")
+		if ($examplebarcode == "ErrorBadMask")
 		{
 			$langs->load("errors");
-			$examplebarcode=$langs->trans($examplebarcode);
+			$examplebarcode = $langs->trans($examplebarcode);
 		}
 
 		return $examplebarcode;
@@ -142,29 +142,29 @@ 
 	 * @param	string		$type       	Type of barcode (EAN, ISBN, ...)
 	 * @return 	string      				Value if OK, '' if module not configured, <0 if KO
 	 */
-	function getNextValue($objproduct=null,$type='')
+	function getNextValue($objproduct = null, $type = '')
 	{
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// TODO
 
 		// Get Mask value
 		$mask = '';
-		if (! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) $mask = $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
+		if (!empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) $mask = $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
 
 		if (empty($mask))
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return '';
 		}
 
-		$field='barcode';$where='';
+		$field = 'barcode'; $where = '';
 
-		$now=dol_now();
+		$now = dol_now();
 
-		$numFinal=get_next_value($db,$mask,'product',$field,$where,'',$now);
+		$numFinal = get_next_value($db, $mask, 'product', $field, $where, '', $now);
 
 		return  $numFinal;
 	}
@@ -190,18 +190,18 @@ 
 
 		//var_dump($code.' '.$product->ref.' '.$thirdparty_type);exit;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		$result=0;
+		$result = 0;
 		$code = strtoupper(trim($code));
 
 		if (empty($code) && $this->code_null && empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK))
 		{
-			$result=0;
+			$result = 0;
 		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) )
+		else if (empty($code) && (!$this->code_null || !empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)))
 		{
-			$result=-2;
+			$result = -2;
 		}
 		else
 		{
@@ -210,22 +210,22 @@ 
 				$is_dispo = $this->verif_dispo($db, $code, $product);
 				if ($is_dispo <> 0)
 				{
-					$result=-3;
+					$result = -3;
 				}
 				else
 				{
-					$result=0;
+					$result = 0;
 				}
 			}
 			else
 			{
 				if (dol_strlen($code) == 0)
 				{
-					$result=-2;
+					$result = -2;
 				}
 				else
 				{
-					$result=-1;
+					$result = -1;
 				}
 			}
 		}
@@ -248,10 +248,10 @@ 
 	{
         // phpcs:enable
 		$sql = "SELECT barcode FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE barcode = '".$code."'";
-		if ($product->id > 0) $sql.= " AND rowid <> ".$product->id;
+		$sql .= " WHERE barcode = '".$code."'";
+		if ($product->id > 0) $sql .= " AND rowid <> ".$product->id;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			if ($db->num_rows($resql) == 0)
@@ -285,28 +285,28 @@ 
 		$result = 0;
 
 		// Get Mask value
-		$mask = empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)?'':$conf->global->BARCODE_STANDARD_PRODUCT_MASK;
-		if (! $mask)
+		$mask = empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK) ? '' : $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return -1;
 		}
 
 		dol_syslog(get_class($this).'::verif_syntax codefortest='.$codefortest." typefortest=".$typefortest);
 
-		$newcodefortest=$codefortest;
+		$newcodefortest = $codefortest;
 
 		// Special case, if mask is on 12 digits instead of 13, we remove last char into code to test
-		if (in_array($typefortest,array('EAN13','ISBN')))	// We remove the CRC char not included into mask
+		if (in_array($typefortest, array('EAN13', 'ISBN')))	// We remove the CRC char not included into mask
 		{
-    		if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$mask,$reg))
+    		if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg))
     	    {
-    	        if (strlen($reg[1]) == 12) $newcodefortest=substr($newcodefortest,0,12);
+    	        if (strlen($reg[1]) == 12) $newcodefortest = substr($newcodefortest, 0, 12);
     	        dol_syslog(get_class($this).'::verif_syntax newcodefortest='.$newcodefortest);
     	    }
 		}
 
-		$result=check_value($mask,$newcodefortest);
+		$result = check_value($mask, $newcodefortest);
 		if (is_string($result))
 		{
 			$this->error = $result;

Braces +16 added lines, -17 removed lines

@@ -152,7 +152,9 @@ 
 
 		// Get Mask value
 		$mask = '';
-		if (! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) $mask = $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
+		if (! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) {
+		    $mask = $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
+		}
 
 		if (empty($mask))
 		{
@@ -198,12 +200,10 @@ 
 		if (empty($code) && $this->code_null && empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK))
 		{
 			$result=0;
-		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) )
+		} else if (empty($code) && (! $this->code_null || ! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) )
 		{
 			$result=-2;
-		}
-		else
+		} else
 		{
 			if ($this->verif_syntax($code, $type) >= 0)
 			{
@@ -211,19 +211,16 @@ 
 				if ($is_dispo <> 0)
 				{
 					$result=-3;
-				}
-				else
+				} else
 				{
 					$result=0;
 				}
-			}
-			else
+			} else
 			{
 				if (dol_strlen($code) == 0)
 				{
 					$result=-2;
-				}
-				else
+				} else
 				{
 					$result=-1;
 				}
@@ -249,7 +246,9 @@ 
         // phpcs:enable
 		$sql = "SELECT barcode FROM ".MAIN_DB_PREFIX."product";
 		$sql.= " WHERE barcode = '".$code."'";
-		if ($product->id > 0) $sql.= " AND rowid <> ".$product->id;
+		if ($product->id > 0) {
+		    $sql.= " AND rowid <> ".$product->id;
+		}
 
 		$resql=$db->query($sql);
 		if ($resql)
@@ -257,13 +256,11 @@ 
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else
+			} else
 			{
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return -2;
 		}
@@ -297,11 +294,13 @@ 
 		$newcodefortest=$codefortest;
 
 		// Special case, if mask is on 12 digits instead of 13, we remove last char into code to test
-		if (in_array($typefortest,array('EAN13','ISBN')))	// We remove the CRC char not included into mask
+		if (in_array($typefortest,array('EAN13','ISBN'))) {
+		    // We remove the CRC char not included into mask
 		{
     		if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$mask,$reg))
     	    {
     	        if (strlen($reg[1]) == 12) $newcodefortest=substr($newcodefortest,0,12);
+		}
     	        dol_syslog(get_class($this).'::verif_syntax newcodefortest='.$newcodefortest);
     	    }
 		}

dolibarr/htdocs/core/modules/barcode/modules_barcode.class.php

Indentation +20 added lines, -20 removed lines

@@ -29,21 +29,21 @@ 
  */
 abstract class ModeleBarCode
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-
-	/**
-	 * Return if a model can be used or not
-	 *
-	 * @return		boolean     true if model can be used
-	 */
-	function isEnabled()
-	{
-		return true;
-	}
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+
+    /**
+     * Return if a model can be used or not
+     *
+     * @return		boolean     true if model can be used
+     */
+    function isEnabled()
+    {
+        return true;
+    }
 }
 
 
@@ -52,10 +52,10 @@ 
  */
 abstract class ModeleNumRefBarCode
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
     /**     Return default description of numbering model
      *
@@ -102,7 +102,7 @@ 
         return $langs->trans("Function_getNextValue_InModuleNotWorking");
     }
 
-	/**     Return version of module
+    /**     Return version of module
      *
      *      @return     string      Version
      */

Spacing +31 added lines, -31 removed lines

@@ -32,7 +32,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
 	/**
@@ -55,7 +55,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
     /**     Return default description of numbering model
      *
@@ -75,7 +75,7 @@ 
      */
     function getNom($langs)
     {
-        return empty($this->name)?$this->nom:$this->name;
+        return empty($this->name) ? $this->nom : $this->name;
     }
 
     /**     Return a numbering example
@@ -96,7 +96,7 @@ 
      *	@param	string		$type		Type of barcode (EAN, ISBN, ...)
      *  @return string      			Value
      */
-    function getNextValue($objproduct,$type='')
+    function getNextValue($objproduct, $type = '')
     {
         global $langs;
         return $langs->trans("Function_getNextValue_InModuleNotWorking");
@@ -126,53 +126,53 @@ 
      *		@param	int			$type		-1=Nothing, 0=Product, 1=Service
      *		@return	string					HTML translated description
      */
-    function getToolTip($langs,$soc,$type)
+    function getToolTip($langs, $soc, $type)
     {
         global $conf;
 
         $langs->load("admin");
 
-        $s='';
-        $s.=$langs->trans("Name").': <b>'.$this->name.'</b><br>';
-        $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
-        if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
-        $s.='<br>';
-        $s.='<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
+        $s = '';
+        $s .= $langs->trans("Name").': <b>'.$this->name.'</b><br>';
+        $s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+        if ($type != -1) $s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+        $s .= '<br>';
+        $s .= '<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
         if ($type == 0)
         {
-            $s.=$langs->trans("RequiredIfProduct").': ';
-            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
-            $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
-            $s.='<br>';
+            $s .= $langs->trans("RequiredIfProduct").': ';
+            if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+            $s .= yn(!$this->code_null, 1, 2);
+            if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+            $s .= '<br>';
         }
         if ($type == 1)
         {
-            $s.=$langs->trans("RequiredIfService").': ';
-            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
-            $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
-            $s.='<br>';
+            $s .= $langs->trans("RequiredIfService").': ';
+            if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+            $s .= yn(!$this->code_null, 1, 2);
+            if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+            $s .= '<br>';
         }
         if ($type == -1)
         {
-            $s.=$langs->trans("Required").': ';
-            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
-            $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
-            $s.='<br>';
+            $s .= $langs->trans("Required").': ';
+            if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+            $s .= yn(!$this->code_null, 1, 2);
+            if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+            $s .= '<br>';
         }
         /*$s.=$langs->trans("CanBeModifiedIfOk").': ';
         $s.=yn($this->code_modifiable,1,2);
         $s.='<br>';
         $s.=$langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide,1,2).'<br>';
         */
-        $s.=$langs->trans("AutomaticCode").': '.yn($this->code_auto,1,2).'<br>';
-        $s.='<br>';
+        $s .= $langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'<br>';
+        $s .= '<br>';
 
-        $nextval=$this->getNextValue($soc,'');
-        if (empty($nextval)) $nextval=$langs->trans("Undefined");
-        $s.=$langs->trans("NextValue").': <b>'.$nextval.'</b><br>';
+        $nextval = $this->getNextValue($soc, '');
+        if (empty($nextval)) $nextval = $langs->trans("Undefined");
+        $s .= $langs->trans("NextValue").': <b>'.$nextval.'</b><br>';
 
         return $s;
     }

Braces +36 added lines, -12 removed lines

@@ -111,10 +111,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");
     }
 
@@ -135,31 +143,45 @@ 
         $s='';
         $s.=$langs->trans("Name").': <b>'.$this->name.'</b><br>';
         $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
-        if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+        if ($type != -1) {
+            $s.=$langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+        }
         $s.='<br>';
         $s.='<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
         if ($type == 0)
         {
             $s.=$langs->trans("RequiredIfProduct").': ';
-            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+                $s.='<strike>';
+            }
             $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+                $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            }
             $s.='<br>';
         }
         if ($type == 1)
         {
             $s.=$langs->trans("RequiredIfService").': ';
-            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+                $s.='<strike>';
+            }
             $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+                $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            }
             $s.='<br>';
         }
         if ($type == -1)
         {
             $s.=$langs->trans("Required").': ';
-            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+                $s.='<strike>';
+            }
             $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+                $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            }
             $s.='<br>';
         }
         /*$s.=$langs->trans("CanBeModifiedIfOk").': ';
@@ -171,7 +193,9 @@ 
         $s.='<br>';
 
         $nextval=$this->getNextValue($soc,'');
-        if (empty($nextval)) $nextval=$langs->trans("Undefined");
+        if (empty($nextval)) {
+            $nextval=$langs->trans("Undefined");
+        }
         $s.=$langs->trans("NextValue").': <b>'.$nextval.'</b><br>';
 
         return $s;