Dolibarr / dolibarr

htdocs/core/modules/livraison/mod_livraison_saphir.php

Doc Comments +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
 	/**
 	 *  Return next free ref
 	 *
-     *  @param	Societe		$objsoc      	Object thirdparty
+     *  @param	integer		$objsoc      	Object thirdparty
      *  @param  Object		$object			Objet livraison
      *  @return string      				Texte descripif
      */

Indentation +39 added lines, -39 removed lines

@@ -36,14 +36,14 @@ 
 	var $nom = 'Saphir';
 
 
-    /**
-     *  Renvoi la description du modele de numerotation
-     *
-     *  @return     string      Texte descripif
-     */
+	/**
+	 *  Renvoi la description du modele de numerotation
+	 *
+	 *  @return     string      Texte descripif
+	 */
 	function info()
 	{
-    	global $conf,$langs;
+		global $conf,$langs;
 
 		$langs->load("bills");
 
@@ -74,28 +74,28 @@ 
 		$texte.= '</form>';
 
 		return $texte;
-    }
-
-    /**
-     *  Return an example of number
-     *
-     *  @return     string      Example
-     */
-    function getExample()
-    {
-     	global $conf,$langs,$mysoc;
-
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
+	}
+
+	/**
+	 *  Return an example of number
+	 *
+	 *  @return     string      Example
+	 */
+	function getExample()
+	{
+	 	global $conf,$langs,$mysoc;
+
+		$old_code_client=$mysoc->code_client;
+		$mysoc->code_client='CCCCCCCCCC';
 		$numExample = $this->getNextValue($mysoc,'');
-    	$mysoc->code_client=$old_code_client;
+		$mysoc->code_client=$old_code_client;
 
 		if (! $numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 
 	/**
@@ -105,8 +105,8 @@ 
 	 *  @param  Object		$object			Object delivery
 	 *  @return string      				Value if OK, 0 if KO
 	 */
-    function getNextValue($objsoc,$object)
-    {
+	function getNextValue($objsoc,$object)
+	{
 		global $db,$conf;
 
 		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
@@ -123,33 +123,33 @@ 
 		$numFinal=get_next_value($db,$mask,'livraison','ref','',$objsoc,$object->date_livraison);
 
 		return  $numFinal;
-    }
+	}
 
 
 	/**
 	 *  Return next free value
 	 *
-     *  @param	Societe		$objsoc     Object third party
+	 *  @param	Societe		$objsoc     Object third party
 	 * 	@param	string		$objforref	Object for number to search
-     *  @return string      			Next free value
-     */
-    function getNumRef($objsoc,$objforref)
-    {
-        return $this->getNextValue($objsoc,$objforref);
-    }
+	 *  @return string      			Next free value
+	 */
+	function getNumRef($objsoc,$objforref)
+	{
+		return $this->getNextValue($objsoc,$objforref);
+	}
 
 
 	/**
 	 *  Return next free ref
 	 *
-     *  @param	Societe		$objsoc      	Object thirdparty
-     *  @param  Object		$object			Objet livraison
-     *  @return string      				Texte descripif
-     */
-    function livraison_get_num($objsoc=0,$object='')
-    {
-        return $this->getNextValue($objsoc,$object);
-    }
+	 *  @param	Societe		$objsoc      	Object thirdparty
+	 *  @param  Object		$object			Objet livraison
+	 *  @return string      				Texte descripif
+	 */
+	function livraison_get_num($objsoc=0,$object='')
+	{
+		return $this->getNextValue($objsoc,$object);
+	}
 
 }
 

Spacing +37 added lines, -37 removed lines

@@ -23,7 +23,7 @@ 
  *	\ingroup    expedition
  *	\brief      Fichier contenant la classe du modele de numerotation de reference de livraison Saphir
  */
-require_once DOL_DOCUMENT_ROOT .'/core/modules/livraison/modules_livraison.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
 
 /**
  *	\class      mod_livraison_saphir
@@ -31,7 +31,7 @@ 
  */
 class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 	var $error = '';
 	var $nom = 'Saphir';
 
@@ -43,35 +43,35 @@ 
      */
 	function info()
 	{
-    	global $conf,$langs;
+    	global $conf, $langs;
 
 		$langs->load("bills");
 
 		$form = new Form($this->db);
 
 		$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="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstdelivery" value="LIVRAISON_SAPHIR_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Delivery"),$langs->transnoentities("Delivery"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Delivery"),$langs->transnoentities("Delivery"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstdelivery" value="LIVRAISON_SAPHIR_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Delivery"), $langs->transnoentities("Delivery"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Delivery"), $langs->transnoentities("Delivery"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdelivery" value="'.$conf->global->LIVRAISON_SAPHIR_MASK.'">',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdelivery" value="'.$conf->global->LIVRAISON_SAPHIR_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -83,14 +83,14 @@ 
      */
     function getExample()
     {
-     	global $conf,$langs,$mysoc;
+     	global $conf, $langs, $mysoc;
 
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-		$numExample = $this->getNextValue($mysoc,'');
-    	$mysoc->code_client=$old_code_client;
+    	$old_code_client = $mysoc->code_client;
+    	$mysoc->code_client = 'CCCCCCCCCC';
+		$numExample = $this->getNextValue($mysoc, '');
+    	$mysoc->code_client = $old_code_client;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -105,22 +105,22 @@ 
 	 *  @param  Object		$object			Object delivery
 	 *  @return string      				Value if OK, 0 if KO
 	 */
-    function getNextValue($objsoc,$object)
+    function getNextValue($objsoc, $object)
     {
-		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';
 
 		// On defini critere recherche compteur
-		$mask=$conf->global->LIVRAISON_SAPHIR_MASK;
+		$mask = $conf->global->LIVRAISON_SAPHIR_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$numFinal=get_next_value($db,$mask,'livraison','ref','',$objsoc,$object->date_livraison);
+		$numFinal = get_next_value($db, $mask, 'livraison', 'ref', '', $objsoc, $object->date_livraison);
 
 		return  $numFinal;
     }
@@ -133,9 +133,9 @@ 
 	 * 	@param	string		$objforref	Object for number to search
      *  @return string      			Next free value
      */
-    function getNumRef($objsoc,$objforref)
+    function getNumRef($objsoc, $objforref)
     {
-        return $this->getNextValue($objsoc,$objforref);
+        return $this->getNextValue($objsoc, $objforref);
     }
 
 
@@ -146,9 +146,9 @@ 
      *  @param  Object		$object			Objet livraison
      *  @return string      				Texte descripif
      */
-    function livraison_get_num($objsoc=0,$object='')
+    function livraison_get_num($objsoc = 0, $object = '')
     {
-        return $this->getNextValue($objsoc,$object);
+        return $this->getNextValue($objsoc, $object);
     }
 
 }

htdocs/core/modules/printing/printipp.modules.php

Doc Comments +1 added lines, -1 removed lines

@@ -217,7 +217,7 @@
      *  Get printer detail
      *
      *  @param  string  $uri    URI
-     *  @return array           List of attributes
+     *  @return stdClass           List of attributes
      */
     function get_printer_detail($uri)
     {

Indentation +255 added lines, -255 removed lines

@@ -30,280 +30,280 @@
  */
 class printing_printipp extends PrintingDriver
 {
-    var $name='printipp';
-    var $desc='PrintIPPDesc';
-    var $picto='printer';
-    var $active='PRINTING_PRINTIPP';
-    var $conf=array();
-    var $host;
-    var $port;
-    var $userid;    /* user login */
-    var $user;
-    var $password;
-    var $error;
-    var $errors = array();
-    var $db;
+	var $name='printipp';
+	var $desc='PrintIPPDesc';
+	var $picto='printer';
+	var $active='PRINTING_PRINTIPP';
+	var $conf=array();
+	var $host;
+	var $port;
+	var $userid;    /* user login */
+	var $user;
+	var $password;
+	var $error;
+	var $errors = array();
+	var $db;
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    function __construct($db)
-    {
-        global $conf;
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	function __construct($db)
+	{
+		global $conf;
 
-        $this->db=$db;
-        $this->host=$conf->global->PRINTIPP_HOST;
-        $this->port=$conf->global->PRINTIPP_PORT;
-        $this->user=$conf->global->PRINTIPP_USER;
-        $this->password=$conf->global->PRINTIPP_PASSWORD;
-        $this->conf[] = array('varname'=>'PRINTIPP_HOST', 'required'=>1, 'example'=>'localhost', 'type'=>'text');
-        $this->conf[] = array('varname'=>'PRINTIPP_PORT', 'required'=>1, 'example'=>'631', 'type'=>'text');
-        $this->conf[] = array('varname'=>'PRINTIPP_USER', 'required'=>0, 'example'=>'', 'type'=>'text', 'moreattributes'=>'autocomplete="off"');
-        $this->conf[] = array('varname'=>'PRINTIPP_PASSWORD', 'required'=>0, 'example'=>'', 'type'=>'password', 'moreattributes'=>'autocomplete="off"');
-        $this->conf[] = array('enabled'=>1, 'type'=>'submit');
-    }
+		$this->db=$db;
+		$this->host=$conf->global->PRINTIPP_HOST;
+		$this->port=$conf->global->PRINTIPP_PORT;
+		$this->user=$conf->global->PRINTIPP_USER;
+		$this->password=$conf->global->PRINTIPP_PASSWORD;
+		$this->conf[] = array('varname'=>'PRINTIPP_HOST', 'required'=>1, 'example'=>'localhost', 'type'=>'text');
+		$this->conf[] = array('varname'=>'PRINTIPP_PORT', 'required'=>1, 'example'=>'631', 'type'=>'text');
+		$this->conf[] = array('varname'=>'PRINTIPP_USER', 'required'=>0, 'example'=>'', 'type'=>'text', 'moreattributes'=>'autocomplete="off"');
+		$this->conf[] = array('varname'=>'PRINTIPP_PASSWORD', 'required'=>0, 'example'=>'', 'type'=>'password', 'moreattributes'=>'autocomplete="off"');
+		$this->conf[] = array('enabled'=>1, 'type'=>'submit');
+	}
 
-    /**
-     *  Print selected file
-     *
-     * @param   string      $file       file
-     * @param   string      $module     module
-     * @param   string      $subdir     subdirectory of document like for expedition subdir is sendings
-     *
-     * @return  int                     0 if OK, >0 if KO
-     */
-    function print_file($file, $module, $subdir='')
-    {
-        global $conf, $user;
-        $error = 0;
+	/**
+	 *  Print selected file
+	 *
+	 * @param   string      $file       file
+	 * @param   string      $module     module
+	 * @param   string      $subdir     subdirectory of document like for expedition subdir is sendings
+	 *
+	 * @return  int                     0 if OK, >0 if KO
+	 */
+	function print_file($file, $module, $subdir='')
+	{
+		global $conf, $user;
+		$error = 0;
 
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
+		include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
 
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log','file',3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setJobName($file,true);
-        $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
+		$ipp = new CupsPrintIPP();
+		$ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log','file',3); // logging very verbose
+		$ipp->setHost($this->host);
+		$ipp->setPort($this->port);
+		$ipp->setJobName($file,true);
+		$ipp->setUserName($this->userid);
+		if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
 
-        // select printer uri for module order, propal,...
-        $sql = "SELECT rowid,printer_id,copy FROM ".MAIN_DB_PREFIX."printing WHERE module = '".$module."' AND driver = 'printipp' AND userid = ".$user->id;
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $obj = $this->db->fetch_object($result);
-            if ($obj)
-            {
-            	dol_syslog("Found a default printer for user ".$user->id." = ".$obj->printer_id);
-                $ipp->setPrinterURI($obj->printer_id);
-            }
-            else
-            {
-                if (! empty($conf->global->PRINTIPP_URI_DEFAULT))
-                {
+		// select printer uri for module order, propal,...
+		$sql = "SELECT rowid,printer_id,copy FROM ".MAIN_DB_PREFIX."printing WHERE module = '".$module."' AND driver = 'printipp' AND userid = ".$user->id;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$obj = $this->db->fetch_object($result);
+			if ($obj)
+			{
+				dol_syslog("Found a default printer for user ".$user->id." = ".$obj->printer_id);
+				$ipp->setPrinterURI($obj->printer_id);
+			}
+			else
+			{
+				if (! empty($conf->global->PRINTIPP_URI_DEFAULT))
+				{
 					dol_syslog("Will use default printer conf->global->PRINTIPP_URI_DEFAULT = ".$conf->global->PRINTIPP_URI_DEFAULT);
-                    $ipp->setPrinterURI($conf->global->PRINTIPP_URI_DEFAULT);
-                }
-                else
+					$ipp->setPrinterURI($conf->global->PRINTIPP_URI_DEFAULT);
+				}
+				else
 				{
-                    $this->errors[] = 'NoDefaultPrinterDefined';
-                    $error++;
-                    return $error;
-                }
-            }
-        }
-        else dol_print_error($this->db);
+					$this->errors[] = 'NoDefaultPrinterDefined';
+					$error++;
+					return $error;
+				}
+			}
+		}
+		else dol_print_error($this->db);
 
-        // Set number of copy
-        $ipp->setCopies($obj->copy);
-        $fileprint=$conf->{$module}->dir_output;
-        if ($subdir!='') $fileprint.='/'.$subdir;
-        $fileprint.='/'.$file;
-        $ipp->setData($fileprint);
-        try {
-            $ipp->printJob();
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            $error++;
-        }
-        if ($error==0) $this->errors[] = 'PRINTIPP: Job added';
+		// Set number of copy
+		$ipp->setCopies($obj->copy);
+		$fileprint=$conf->{$module}->dir_output;
+		if ($subdir!='') $fileprint.='/'.$subdir;
+		$fileprint.='/'.$file;
+		$ipp->setData($fileprint);
+		try {
+			$ipp->printJob();
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			$error++;
+		}
+		if ($error==0) $this->errors[] = 'PRINTIPP: Job added';
 
-        return $error;
-    }
+		return $error;
+	}
 
-    /**
-     *  Return list of available printers
-     *
-     *  @return  int                     0 if OK, >0 if KO
-     */
-    function listAvailablePrinters()
-    {
-        global $bc, $conf, $langs;
-        $error = 0;
-        $var=true;
+	/**
+	 *  Return list of available printers
+	 *
+	 *  @return  int                     0 if OK, >0 if KO
+	 */
+	function listAvailablePrinters()
+	{
+		global $bc, $conf, $langs;
+		$error = 0;
+		$var=true;
 
-        $html = '<tr class="liste_titre">';
-        $html.= '<td>'.$langs->trans('IPP_Uri').'</td>';
-        $html.= '<td>'.$langs->trans('IPP_Name').'</td>';
-        $html.= '<td>'.$langs->trans('IPP_State').'</td>';
-        $html.= '<td>'.$langs->trans('IPP_State_reason').'</td>';
-        $html.= '<td>'.$langs->trans('IPP_State_reason1').'</td>';
-        $html.= '<td>'.$langs->trans('IPP_BW').'</td>';
-        $html.= '<td>'.$langs->trans('IPP_Color').'</td>';
-        //$html.= '<td>'.$langs->trans('IPP_Device').'</td>';
-        $html.= '<td>'.$langs->trans('IPP_Media').'</td>';
-        $html.= '<td>'.$langs->trans('IPP_Supported').'</td>';
-        $html.= '<td align="center">'.$langs->trans("Select").'</td>';
-        $html.= "</tr>\n";
-        $list = $this->getlist_available_printers();
-        $var = true;
-        foreach ($list as $value)
-        {
+		$html = '<tr class="liste_titre">';
+		$html.= '<td>'.$langs->trans('IPP_Uri').'</td>';
+		$html.= '<td>'.$langs->trans('IPP_Name').'</td>';
+		$html.= '<td>'.$langs->trans('IPP_State').'</td>';
+		$html.= '<td>'.$langs->trans('IPP_State_reason').'</td>';
+		$html.= '<td>'.$langs->trans('IPP_State_reason1').'</td>';
+		$html.= '<td>'.$langs->trans('IPP_BW').'</td>';
+		$html.= '<td>'.$langs->trans('IPP_Color').'</td>';
+		//$html.= '<td>'.$langs->trans('IPP_Device').'</td>';
+		$html.= '<td>'.$langs->trans('IPP_Media').'</td>';
+		$html.= '<td>'.$langs->trans('IPP_Supported').'</td>';
+		$html.= '<td align="center">'.$langs->trans("Select").'</td>';
+		$html.= "</tr>\n";
+		$list = $this->getlist_available_printers();
+		$var = true;
+		foreach ($list as $value)
+		{
 
-            $printer_det = $this->get_printer_detail($value);
-            $html.= "<tr ".$bc[$var].">";
-            $html.= '<td>'.$value.'</td>';
-            //$html.= '<td><pre>'.print_r($printer_det,true).'</pre></td>';
-            $html.= '<td>'.$printer_det->printer_name->_value0.'</td>';
-            $html.= '<td>'.$langs->trans('STATE_IPP_'.$printer_det->printer_state->_value0).'</td>';
-            $html.= '<td>'.$langs->trans('STATE_IPP_'.$printer_det->printer_state_reasons->_value0).'</td>';
-            $html.= '<td>'.(! empty($printer_det->printer_state_reasons->_value1)?$langs->trans('STATE_IPP_'.$printer_det->printer_state_reasons->_value1):'').'</td>';
-            $html.= '<td>'.$langs->trans('IPP_COLOR_'.$printer_det->printer_type->_value2).'</td>';
-            $html.= '<td>'.$langs->trans('IPP_COLOR_'.$printer_det->printer_type->_value3).'</td>';
-            //$html.= '<td>'.$printer_det->device_uri->_value0.'</td>';
-            $html.= '<td>'.$printer_det->media_default->_value0.'</td>';
-            $html.= '<td>'.$langs->trans('MEDIA_IPP_'.$printer_det->media_type_supported->_value1).'</td>';
-            // Defaut
-            $html.= '<td align="center">';
-            if ($conf->global->PRINTIPP_URI_DEFAULT == $value)
-            {
-                $html.= img_picto($langs->trans("Default"),'on');
-            }
-            else
+			$printer_det = $this->get_printer_detail($value);
+			$html.= "<tr ".$bc[$var].">";
+			$html.= '<td>'.$value.'</td>';
+			//$html.= '<td><pre>'.print_r($printer_det,true).'</pre></td>';
+			$html.= '<td>'.$printer_det->printer_name->_value0.'</td>';
+			$html.= '<td>'.$langs->trans('STATE_IPP_'.$printer_det->printer_state->_value0).'</td>';
+			$html.= '<td>'.$langs->trans('STATE_IPP_'.$printer_det->printer_state_reasons->_value0).'</td>';
+			$html.= '<td>'.(! empty($printer_det->printer_state_reasons->_value1)?$langs->trans('STATE_IPP_'.$printer_det->printer_state_reasons->_value1):'').'</td>';
+			$html.= '<td>'.$langs->trans('IPP_COLOR_'.$printer_det->printer_type->_value2).'</td>';
+			$html.= '<td>'.$langs->trans('IPP_COLOR_'.$printer_det->printer_type->_value3).'</td>';
+			//$html.= '<td>'.$printer_det->device_uri->_value0.'</td>';
+			$html.= '<td>'.$printer_det->media_default->_value0.'</td>';
+			$html.= '<td>'.$langs->trans('MEDIA_IPP_'.$printer_det->media_type_supported->_value1).'</td>';
+			// Defaut
+			$html.= '<td align="center">';
+			if ($conf->global->PRINTIPP_URI_DEFAULT == $value)
 			{
-            	$html.= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;mode=test&amp;varname=PRINTIPP_URI_DEFAULT&amp;driver=printipp&amp;value='.urlencode($value).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
-          	}
+				$html.= img_picto($langs->trans("Default"),'on');
+			}
+			else
+			{
+				$html.= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;mode=test&amp;varname=PRINTIPP_URI_DEFAULT&amp;driver=printipp&amp;value='.urlencode($value).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+		  	}
 			$html.= '</td>';
-            $html.= '</tr>'."\n";
-        }
-        $this->resprint = $html;
-        return $error;
-    }
+			$html.= '</tr>'."\n";
+		}
+		$this->resprint = $html;
+		return $error;
+	}
 
-    /**
-     *  Return list of available printers
-     *
-     *  @return array                list of printers
-     */
-    function getlist_available_printers()
-    {
-        global $conf,$db;
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log','file',3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
-        $ipp->getPrinters();
-        return $ipp->available_printers;
-    }
+	/**
+	 *  Return list of available printers
+	 *
+	 *  @return array                list of printers
+	 */
+	function getlist_available_printers()
+	{
+		global $conf,$db;
+		include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
+		$ipp = new CupsPrintIPP();
+		$ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log','file',3); // logging very verbose
+		$ipp->setHost($this->host);
+		$ipp->setPort($this->port);
+		$ipp->setUserName($this->userid);
+		if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
+		$ipp->getPrinters();
+		return $ipp->available_printers;
+	}
 
-    /**
-     *  Get printer detail
-     *
-     *  @param  string  $uri    URI
-     *  @return array           List of attributes
-     */
-    function get_printer_detail($uri)
-    {
-        global $conf,$db;
+	/**
+	 *  Get printer detail
+	 *
+	 *  @param  string  $uri    URI
+	 *  @return array           List of attributes
+	 */
+	function get_printer_detail($uri)
+	{
+		global $conf,$db;
 
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log','file',3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
-        $ipp->setPrinterURI($uri);
-        $ipp->getPrinterAttributes();
-        return $ipp->printer_attributes;
-    }
+		include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
+		$ipp = new CupsPrintIPP();
+		$ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log','file',3); // logging very verbose
+		$ipp->setHost($this->host);
+		$ipp->setPort($this->port);
+		$ipp->setUserName($this->userid);
+		if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
+		$ipp->setPrinterURI($uri);
+		$ipp->getPrinterAttributes();
+		return $ipp->printer_attributes;
+	}
 
-    /**
-     *  List jobs print
-     *
-     *  @param   string      $module     module
-     *
-     *  @return  int                     0 if OK, >0 if KO
-     */
-    function list_jobs($module)
-    {
-        global $conf, $db, $bc;
-        $error = 0;
-        $html = '';
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log','file',3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
-        // select printer uri for module order, propal,...
-        $sql = 'SELECT rowid,printer_uri,printer_name FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"';
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $obj = $this->db->fetch_object($result);
-            if ($obj)
-            {
-                $ipp->setPrinterURI($obj->printer_uri);
-            }
-            else
-            {
-                // All printers
-                $ipp->setPrinterURI("ipp://localhost:631/printers/");
-            }
-        }
-        // Getting Jobs
-        try {
-            $ipp->getJobs(false,0,'completed',false);
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            $error++;
-        }
-        $html .= '<table width="100%" class="noborder">';
-        $html .= '<tr class="liste_titre">';
-        $html .= '<td>Id</td>';
-        $html .= '<td>Owner</td>';
-        $html .= '<td>Printer</td>';
-        $html .= '<td>File</td>';
-        $html .= '<td>Status</td>';
-        $html .= '<td>Cancel</td>';
-        $html .= '</tr>'."\n";
-        $jobs = $ipp->jobs_attributes;
-        $var = True;
-        //$html .= '<pre>'.print_r($jobs,true).'</pre>';
-        foreach ($jobs as $value )
-        {
-            $var = !$var;
-            $html .= '<tr '.$bc[$var].'>';
-            $html .= '<td>'.$value->job_id->_value0.'</td>';
-            $html .= '<td>'.$value->job_originating_user_name->_value0.'</td>';
-            $html .= '<td>'.$value->printer_uri->_value0.'</td>';
-            $html .= '<td>'.$value->job_name->_value0.'</td>';
-            $html .= '<td>'.$value->job_state->_value0.'</td>';
-            $html .= '<td>'.$value->job_uri->_value0.'</td>';
-            $html .= '</tr>';
-        }
-        $html .= "</table>";
-        $this->resprint = $html;
-        return $error;
-    }
+	/**
+	 *  List jobs print
+	 *
+	 *  @param   string      $module     module
+	 *
+	 *  @return  int                     0 if OK, >0 if KO
+	 */
+	function list_jobs($module)
+	{
+		global $conf, $db, $bc;
+		$error = 0;
+		$html = '';
+		include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
+		$ipp = new CupsPrintIPP();
+		$ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log','file',3); // logging very verbose
+		$ipp->setHost($this->host);
+		$ipp->setPort($this->port);
+		$ipp->setUserName($this->userid);
+		if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
+		// select printer uri for module order, propal,...
+		$sql = 'SELECT rowid,printer_uri,printer_name FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"';
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$obj = $this->db->fetch_object($result);
+			if ($obj)
+			{
+				$ipp->setPrinterURI($obj->printer_uri);
+			}
+			else
+			{
+				// All printers
+				$ipp->setPrinterURI("ipp://localhost:631/printers/");
+			}
+		}
+		// Getting Jobs
+		try {
+			$ipp->getJobs(false,0,'completed',false);
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			$error++;
+		}
+		$html .= '<table width="100%" class="noborder">';
+		$html .= '<tr class="liste_titre">';
+		$html .= '<td>Id</td>';
+		$html .= '<td>Owner</td>';
+		$html .= '<td>Printer</td>';
+		$html .= '<td>File</td>';
+		$html .= '<td>Status</td>';
+		$html .= '<td>Cancel</td>';
+		$html .= '</tr>'."\n";
+		$jobs = $ipp->jobs_attributes;
+		$var = True;
+		//$html .= '<pre>'.print_r($jobs,true).'</pre>';
+		foreach ($jobs as $value )
+		{
+			$var = !$var;
+			$html .= '<tr '.$bc[$var].'>';
+			$html .= '<td>'.$value->job_id->_value0.'</td>';
+			$html .= '<td>'.$value->job_originating_user_name->_value0.'</td>';
+			$html .= '<td>'.$value->printer_uri->_value0.'</td>';
+			$html .= '<td>'.$value->job_name->_value0.'</td>';
+			$html .= '<td>'.$value->job_state->_value0.'</td>';
+			$html .= '<td>'.$value->job_uri->_value0.'</td>';
+			$html .= '</tr>';
+		}
+		$html .= "</table>";
+		$this->resprint = $html;
+		return $error;
+	}
 
 }

Spacing +57 added lines, -57 removed lines

@@ -30,14 +30,14 @@ 
  */
 class printing_printipp extends PrintingDriver
 {
-    var $name='printipp';
-    var $desc='PrintIPPDesc';
-    var $picto='printer';
-    var $active='PRINTING_PRINTIPP';
-    var $conf=array();
+    var $name = 'printipp';
+    var $desc = 'PrintIPPDesc';
+    var $picto = 'printer';
+    var $active = 'PRINTING_PRINTIPP';
+    var $conf = array();
     var $host;
     var $port;
-    var $userid;    /* user login */
+    var $userid; /* user login */
     var $user;
     var $password;
     var $error;
@@ -54,11 +54,11 @@ 
     {
         global $conf;
 
-        $this->db=$db;
-        $this->host=$conf->global->PRINTIPP_HOST;
-        $this->port=$conf->global->PRINTIPP_PORT;
-        $this->user=$conf->global->PRINTIPP_USER;
-        $this->password=$conf->global->PRINTIPP_PASSWORD;
+        $this->db = $db;
+        $this->host = $conf->global->PRINTIPP_HOST;
+        $this->port = $conf->global->PRINTIPP_PORT;
+        $this->user = $conf->global->PRINTIPP_USER;
+        $this->password = $conf->global->PRINTIPP_PASSWORD;
         $this->conf[] = array('varname'=>'PRINTIPP_HOST', 'required'=>1, 'example'=>'localhost', 'type'=>'text');
         $this->conf[] = array('varname'=>'PRINTIPP_PORT', 'required'=>1, 'example'=>'631', 'type'=>'text');
         $this->conf[] = array('varname'=>'PRINTIPP_USER', 'required'=>0, 'example'=>'', 'type'=>'text', 'moreattributes'=>'autocomplete="off"');
@@ -75,7 +75,7 @@ 
      *
      * @return  int                     0 if OK, >0 if KO
      */
-    function print_file($file, $module, $subdir='')
+    function print_file($file, $module, $subdir = '')
     {
         global $conf, $user;
         $error = 0;
@@ -83,12 +83,12 @@ 
         include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
 
         $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log','file',3); // logging very verbose
+        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
         $ipp->setHost($this->host);
         $ipp->setPort($this->port);
-        $ipp->setJobName($file,true);
+        $ipp->setJobName($file, true);
         $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
+        if (!empty($this->user)) $ipp->setAuthentication($this->user, $this->password);
 
         // select printer uri for module order, propal,...
         $sql = "SELECT rowid,printer_id,copy FROM ".MAIN_DB_PREFIX."printing WHERE module = '".$module."' AND driver = 'printipp' AND userid = ".$user->id;
@@ -103,7 +103,7 @@ 
             }
             else
             {
-                if (! empty($conf->global->PRINTIPP_URI_DEFAULT))
+                if (!empty($conf->global->PRINTIPP_URI_DEFAULT))
                 {
 					dol_syslog("Will use default printer conf->global->PRINTIPP_URI_DEFAULT = ".$conf->global->PRINTIPP_URI_DEFAULT);
                     $ipp->setPrinterURI($conf->global->PRINTIPP_URI_DEFAULT);
@@ -120,9 +120,9 @@ 
 
         // Set number of copy
         $ipp->setCopies($obj->copy);
-        $fileprint=$conf->{$module}->dir_output;
-        if ($subdir!='') $fileprint.='/'.$subdir;
-        $fileprint.='/'.$file;
+        $fileprint = $conf->{$module}->dir_output;
+        if ($subdir != '') $fileprint .= '/'.$subdir;
+        $fileprint .= '/'.$file;
         $ipp->setData($fileprint);
         try {
             $ipp->printJob();
@@ -130,7 +130,7 @@ 
             $this->errors[] = $e->getMessage();
             $error++;
         }
-        if ($error==0) $this->errors[] = 'PRINTIPP: Job added';
+        if ($error == 0) $this->errors[] = 'PRINTIPP: Job added';
 
         return $error;
     }
@@ -144,51 +144,51 @@ 
     {
         global $bc, $conf, $langs;
         $error = 0;
-        $var=true;
+        $var = true;
 
         $html = '<tr class="liste_titre">';
-        $html.= '<td>'.$langs->trans('IPP_Uri').'</td>';
-        $html.= '<td>'.$langs->trans('IPP_Name').'</td>';
-        $html.= '<td>'.$langs->trans('IPP_State').'</td>';
-        $html.= '<td>'.$langs->trans('IPP_State_reason').'</td>';
-        $html.= '<td>'.$langs->trans('IPP_State_reason1').'</td>';
-        $html.= '<td>'.$langs->trans('IPP_BW').'</td>';
-        $html.= '<td>'.$langs->trans('IPP_Color').'</td>';
+        $html .= '<td>'.$langs->trans('IPP_Uri').'</td>';
+        $html .= '<td>'.$langs->trans('IPP_Name').'</td>';
+        $html .= '<td>'.$langs->trans('IPP_State').'</td>';
+        $html .= '<td>'.$langs->trans('IPP_State_reason').'</td>';
+        $html .= '<td>'.$langs->trans('IPP_State_reason1').'</td>';
+        $html .= '<td>'.$langs->trans('IPP_BW').'</td>';
+        $html .= '<td>'.$langs->trans('IPP_Color').'</td>';
         //$html.= '<td>'.$langs->trans('IPP_Device').'</td>';
-        $html.= '<td>'.$langs->trans('IPP_Media').'</td>';
-        $html.= '<td>'.$langs->trans('IPP_Supported').'</td>';
-        $html.= '<td align="center">'.$langs->trans("Select").'</td>';
-        $html.= "</tr>\n";
+        $html .= '<td>'.$langs->trans('IPP_Media').'</td>';
+        $html .= '<td>'.$langs->trans('IPP_Supported').'</td>';
+        $html .= '<td align="center">'.$langs->trans("Select").'</td>';
+        $html .= "</tr>\n";
         $list = $this->getlist_available_printers();
         $var = true;
         foreach ($list as $value)
         {
 
             $printer_det = $this->get_printer_detail($value);
-            $html.= "<tr ".$bc[$var].">";
-            $html.= '<td>'.$value.'</td>';
+            $html .= "<tr ".$bc[$var].">";
+            $html .= '<td>'.$value.'</td>';
             //$html.= '<td><pre>'.print_r($printer_det,true).'</pre></td>';
-            $html.= '<td>'.$printer_det->printer_name->_value0.'</td>';
-            $html.= '<td>'.$langs->trans('STATE_IPP_'.$printer_det->printer_state->_value0).'</td>';
-            $html.= '<td>'.$langs->trans('STATE_IPP_'.$printer_det->printer_state_reasons->_value0).'</td>';
-            $html.= '<td>'.(! empty($printer_det->printer_state_reasons->_value1)?$langs->trans('STATE_IPP_'.$printer_det->printer_state_reasons->_value1):'').'</td>';
-            $html.= '<td>'.$langs->trans('IPP_COLOR_'.$printer_det->printer_type->_value2).'</td>';
-            $html.= '<td>'.$langs->trans('IPP_COLOR_'.$printer_det->printer_type->_value3).'</td>';
+            $html .= '<td>'.$printer_det->printer_name->_value0.'</td>';
+            $html .= '<td>'.$langs->trans('STATE_IPP_'.$printer_det->printer_state->_value0).'</td>';
+            $html .= '<td>'.$langs->trans('STATE_IPP_'.$printer_det->printer_state_reasons->_value0).'</td>';
+            $html .= '<td>'.(!empty($printer_det->printer_state_reasons->_value1) ? $langs->trans('STATE_IPP_'.$printer_det->printer_state_reasons->_value1) : '').'</td>';
+            $html .= '<td>'.$langs->trans('IPP_COLOR_'.$printer_det->printer_type->_value2).'</td>';
+            $html .= '<td>'.$langs->trans('IPP_COLOR_'.$printer_det->printer_type->_value3).'</td>';
             //$html.= '<td>'.$printer_det->device_uri->_value0.'</td>';
-            $html.= '<td>'.$printer_det->media_default->_value0.'</td>';
-            $html.= '<td>'.$langs->trans('MEDIA_IPP_'.$printer_det->media_type_supported->_value1).'</td>';
+            $html .= '<td>'.$printer_det->media_default->_value0.'</td>';
+            $html .= '<td>'.$langs->trans('MEDIA_IPP_'.$printer_det->media_type_supported->_value1).'</td>';
             // Defaut
-            $html.= '<td align="center">';
+            $html .= '<td align="center">';
             if ($conf->global->PRINTIPP_URI_DEFAULT == $value)
             {
-                $html.= img_picto($langs->trans("Default"),'on');
+                $html .= img_picto($langs->trans("Default"), 'on');
             }
             else
 			{
-            	$html.= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;mode=test&amp;varname=PRINTIPP_URI_DEFAULT&amp;driver=printipp&amp;value='.urlencode($value).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+            	$html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;mode=test&amp;varname=PRINTIPP_URI_DEFAULT&amp;driver=printipp&amp;value='.urlencode($value).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
           	}
-			$html.= '</td>';
-            $html.= '</tr>'."\n";
+			$html .= '</td>';
+            $html .= '</tr>'."\n";
         }
         $this->resprint = $html;
         return $error;
@@ -201,14 +201,14 @@ 
      */
     function getlist_available_printers()
     {
-        global $conf,$db;
+        global $conf, $db;
         include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
         $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log','file',3); // logging very verbose
+        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
         $ipp->setHost($this->host);
         $ipp->setPort($this->port);
         $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
+        if (!empty($this->user)) $ipp->setAuthentication($this->user, $this->password);
         $ipp->getPrinters();
         return $ipp->available_printers;
     }
@@ -221,15 +221,15 @@ 
      */
     function get_printer_detail($uri)
     {
-        global $conf,$db;
+        global $conf, $db;
 
         include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
         $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log','file',3); // logging very verbose
+        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
         $ipp->setHost($this->host);
         $ipp->setPort($this->port);
         $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
+        if (!empty($this->user)) $ipp->setAuthentication($this->user, $this->password);
         $ipp->setPrinterURI($uri);
         $ipp->getPrinterAttributes();
         return $ipp->printer_attributes;
@@ -249,11 +249,11 @@ 
         $html = '';
         include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
         $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log','file',3); // logging very verbose
+        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
         $ipp->setHost($this->host);
         $ipp->setPort($this->port);
         $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
+        if (!empty($this->user)) $ipp->setAuthentication($this->user, $this->password);
         // select printer uri for module order, propal,...
         $sql = 'SELECT rowid,printer_uri,printer_name FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"';
         $result = $this->db->query($sql);
@@ -272,7 +272,7 @@ 
         }
         // Getting Jobs
         try {
-            $ipp->getJobs(false,0,'completed',false);
+            $ipp->getJobs(false, 0, 'completed', false);
         } catch (Exception $e) {
             $this->errors[] = $e->getMessage();
             $error++;
@@ -289,7 +289,7 @@ 
         $jobs = $ipp->jobs_attributes;
         $var = True;
         //$html .= '<pre>'.print_r($jobs,true).'</pre>';
-        foreach ($jobs as $value )
+        foreach ($jobs as $value)
         {
             $var = !$var;
             $html .= '<tr '.$bc[$var].'>';

Braces +24 added lines, -15 removed lines

@@ -88,7 +88,9 @@ 
         $ipp->setPort($this->port);
         $ipp->setJobName($file,true);
         $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
+        if (! empty($this->user)) {
+        	$ipp->setAuthentication($this->user,$this->password);
+        }
 
         // select printer uri for module order, propal,...
         $sql = "SELECT rowid,printer_id,copy FROM ".MAIN_DB_PREFIX."printing WHERE module = '".$module."' AND driver = 'printipp' AND userid = ".$user->id;
@@ -100,28 +102,29 @@ 
             {
             	dol_syslog("Found a default printer for user ".$user->id." = ".$obj->printer_id);
                 $ipp->setPrinterURI($obj->printer_id);
-            }
-            else
+            } else
             {
                 if (! empty($conf->global->PRINTIPP_URI_DEFAULT))
                 {
 					dol_syslog("Will use default printer conf->global->PRINTIPP_URI_DEFAULT = ".$conf->global->PRINTIPP_URI_DEFAULT);
                     $ipp->setPrinterURI($conf->global->PRINTIPP_URI_DEFAULT);
-                }
-                else
+                } else
 				{
                     $this->errors[] = 'NoDefaultPrinterDefined';
                     $error++;
                     return $error;
                 }
             }
+        } else {
+        	dol_print_error($this->db);
         }
-        else dol_print_error($this->db);
 
         // Set number of copy
         $ipp->setCopies($obj->copy);
         $fileprint=$conf->{$module}->dir_output;
-        if ($subdir!='') $fileprint.='/'.$subdir;
+        if ($subdir!='') {
+        	$fileprint.='/'.$subdir;
+        }
         $fileprint.='/'.$file;
         $ipp->setData($fileprint);
         try {
@@ -130,7 +133,9 @@ 
             $this->errors[] = $e->getMessage();
             $error++;
         }
-        if ($error==0) $this->errors[] = 'PRINTIPP: Job added';
+        if ($error==0) {
+        	$this->errors[] = 'PRINTIPP: Job added';
+        }
 
         return $error;
     }
@@ -182,8 +187,7 @@ 
             if ($conf->global->PRINTIPP_URI_DEFAULT == $value)
             {
                 $html.= img_picto($langs->trans("Default"),'on');
-            }
-            else
+            } else
 			{
             	$html.= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;mode=test&amp;varname=PRINTIPP_URI_DEFAULT&amp;driver=printipp&amp;value='.urlencode($value).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
           	}
@@ -208,7 +212,9 @@ 
         $ipp->setHost($this->host);
         $ipp->setPort($this->port);
         $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
+        if (! empty($this->user)) {
+        	$ipp->setAuthentication($this->user,$this->password);
+        }
         $ipp->getPrinters();
         return $ipp->available_printers;
     }
@@ -229,7 +235,9 @@ 
         $ipp->setHost($this->host);
         $ipp->setPort($this->port);
         $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
+        if (! empty($this->user)) {
+        	$ipp->setAuthentication($this->user,$this->password);
+        }
         $ipp->setPrinterURI($uri);
         $ipp->getPrinterAttributes();
         return $ipp->printer_attributes;
@@ -253,7 +261,9 @@ 
         $ipp->setHost($this->host);
         $ipp->setPort($this->port);
         $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
+        if (! empty($this->user)) {
+        	$ipp->setAuthentication($this->user,$this->password);
+        }
         // select printer uri for module order, propal,...
         $sql = 'SELECT rowid,printer_uri,printer_name FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"';
         $result = $this->db->query($sql);
@@ -263,8 +273,7 @@ 
             if ($obj)
             {
                 $ipp->setPrinterURI($obj->printer_uri);
-            }
-            else
+            } else
             {
                 // All printers
                 $ipp->setPrinterURI("ipp://localhost:631/printers/");

htdocs/core/modules/product/mod_codeproduct_elephant.php

Doc Comments +2 added lines, -2 removed lines

@@ -113,7 +113,7 @@ 
 	 * Return an example of result returned by getNextValue
 	 *
 	 * @param	Translate	$langs		Object langs
-	 * @param	product		$objproduct		Object product
+	 * @param	integer		$objproduct		Object product
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */
@@ -154,7 +154,7 @@ 
 	/**
 	 * Return next value
 	 *
-	 * @param	Product		$objproduct     Object product
+	 * @param	integer		$objproduct     Object product
 	 * @param  	int		    $type       Produit ou service (0:product, 1:service)
 	 * @return 	string      			Value if OK, '' if module not configured, <0 if KO
 	 */

Spacing +62 added lines, -62 removed lines

@@ -34,14 +34,14 @@ 
  */
 class mod_codeproduct_elephant extends ModeleProductCode
 {
-	var $nom='Elephant';				// Nom du modele
-	var $name='Elephant';				// Nom du modele
-	var $code_modifiable;				// Code modifiable
-	var $code_modifiable_invalide;		// Code modifiable si il est invalide
-	var $code_modifiable_null;			// Code modifiables si il est null
-	var $code_null;						// Code facultatif
-	var $version='dolibarr';    		// 'development', 'experimental', 'dolibarr'
-	var $code_auto;                     // Numerotation automatique
+	var $nom = 'Elephant'; // Nom du modele
+	var $name = 'Elephant'; // Nom du modele
+	var $code_modifiable; // Code modifiable
+	var $code_modifiable_invalide; // Code modifiable si il est invalide
+	var $code_modifiable_null; // Code modifiables si il est null
+	var $code_null; // Code facultatif
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+	var $code_auto; // Numerotation automatique
 
 	var $searchcode; // String de recherche
 	var $numbitcounter; // Nombre de chiffres du compteur
@@ -74,36 +74,36 @@ 
 
 		$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="PRODUCT_ELEPHANT_MASK_PRODUCT">';
-		$texte.= '<input type="hidden" name="param2" value="PRODUCT_ELEPHANT_MASK_SERVICE">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Product"),$langs->transnoentities("Product"));
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4c");
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$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="PRODUCT_ELEPHANT_MASK_PRODUCT">';
+		$texte .= '<input type="hidden" name="param2" value="PRODUCT_ELEPHANT_MASK_SERVICE">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Product"), $langs->transnoentities("Product"));
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4c");
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix customers
-		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("ProductCodeModel").'):</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value1" value="'.(! empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT)?$conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT:'').'"'.$disabled.'>',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("ProductCodeModel").'):</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value1" value="'.(!empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT) ? $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT : '').'"'.$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 .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
 		// Parametrage du prefix suppliers
-		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("ServiceCodeModel").'):</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value2" value="'.(! empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE)?$conf->global->PRODUCT_ELEPHANT_MASK_SERVICE:'').'"'.$disabled.'>',$tooltip,1,1).'</td>';
-		$texte.= '</tr>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("ServiceCodeModel").'):</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value2" value="'.(!empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE) ? $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE : '').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
 	}
@@ -117,32 +117,32 @@ 
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */
-	function getExample($langs,$objproduct=0,$type=-1)
+	function getExample($langs, $objproduct = 0, $type = -1)
 	{
 		if ($type == 0 || $type == -1)
 		{
-			$exampleproduct = $this->getNextValue($objproduct,0);
-			if (! $exampleproduct)
+			$exampleproduct = $this->getNextValue($objproduct, 0);
+			if (!$exampleproduct)
 			{
 				$exampleproduct = $langs->trans('NotConfigured');
 			}
-			if($exampleproduct=="ErrorBadMask")
+			if ($exampleproduct == "ErrorBadMask")
 			{
 				$langs->load("errors");
-				$exampleproduct=$langs->trans($exampleproduct);
+				$exampleproduct = $langs->trans($exampleproduct);
 			}
 		}
 		if ($type == 1 || $type == -1)
 		{
-			$exampleservice = $this->getNextValue($objproduct,1);
-			if (! $exampleservice)
+			$exampleservice = $this->getNextValue($objproduct, 1);
+			if (!$exampleservice)
 			{
 				$exampleservice = $langs->trans('NotConfigured');
 			}
-			if($exampleservice=="ErrorBadMask")
+			if ($exampleservice == "ErrorBadMask")
 			{
 				$langs->load("errors");
-				$exampleservice=$langs->trans($exampleservice);
+				$exampleservice = $langs->trans($exampleservice);
 			}
 		}
 
@@ -158,26 +158,26 @@ 
 	 * @param  	int		    $type       Produit ou service (0:product, 1:service)
 	 * @return 	string      			Value if OK, '' if module not configured, <0 if KO
 	 */
-	function getNextValue($objproduct=0,$type=-1)
+	function getNextValue($objproduct = 0, $type = -1)
 	{
-		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';
 
 		// Get Mask value
 		$mask = '';
-		if ($type == 0 && ! empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT))
+		if ($type == 0 && !empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT))
 			$mask = $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
-		else if ($type == 1 && ! empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE))
+		else if ($type == 1 && !empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE))
 			$mask = $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE;
 
 		if (empty($mask))
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return '';
 		}
 
-		$field='';$where='';
+		$field = ''; $where = '';
 		if ($type == 0)
 		{
 			$field = 'ref';
@@ -190,9 +190,9 @@ 
 		}
 		else return -1;
 
-		$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;
 	}
@@ -208,10 +208,10 @@ 
 		global $conf;
 
 		$mask = $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
-		if (preg_match('/\{pre\}/i',$mask)) return 1;
+		if (preg_match('/\{pre\}/i', $mask)) return 1;
 
 		$mask = $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE;
-		if (preg_match('/\{pre\}/i',$mask)) return 1;
+		if (preg_match('/\{pre\}/i', $mask)) return 1;
 
 		return 0;
 	}
@@ -234,32 +234,32 @@ 
 	{
 		global $conf;
 
-		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->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
-			$result=0;
+			$result = 0;
 		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
+		else if (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
-			$result=-2;
+			$result = -2;
 		}
 		else
 		{
 			// Get Mask value
 			$mask = '';
-			if ($type==0) $mask = empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT)?'':$conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
-			if ($type==1) $mask = empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE)?'':$conf->global->PRODUCT_ELEPHANT_MASK_SERVICE;
-			if (! $mask)
+			if ($type == 0) $mask = empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT) ? '' : $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
+			if ($type == 1) $mask = empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE) ? '' : $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE;
+			if (!$mask)
 			{
-				$this->error='NotConfigured';
+				$this->error = 'NotConfigured';
 				return '';
 			}
 
-			$result=check_value($mask,$code);
+			$result = check_value($mask, $code);
 		}
 
 		dol_syslog("mod_codeclient_elephant::verif type=".$type." result=".$result);
@@ -278,10 +278,10 @@ 
 	function verif_dispo($db, $code, $product)
 	{
 		$sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE ref = '".$code."'";
-		if ($product->id > 0) $sql.= " AND rowid <> ".$product->id;
+		$sql .= " WHERE ref = '".$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)

Braces +33 added lines, -22 removed lines

@@ -146,8 +146,12 @@ 
 			}
 		}
 
-		if ($type == 0) return $exampleproduct;
-		if ($type == 1) return $exampleservice;
+		if ($type == 0) {
+			return $exampleproduct;
+		}
+		if ($type == 1) {
+			return $exampleservice;
+		}
 		return $exampleproduct.'<br>'.$exampleservice;
 	}
 
@@ -166,10 +170,11 @@ 
 
 		// Get Mask value
 		$mask = '';
-		if ($type == 0 && ! empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT))
-			$mask = $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
-		else if ($type == 1 && ! empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE))
-			$mask = $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE;
+		if ($type == 0 && ! empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT)) {
+					$mask = $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
+		} else if ($type == 1 && ! empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE)) {
+					$mask = $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE;
+		}
 
 		if (empty($mask))
 		{
@@ -182,13 +187,13 @@ 
 		{
 			$field = 'ref';
 			//$where = ' AND client in (1,2)';
-		}
-		else if ($type == 1)
+		} else if ($type == 1)
 		{
 			$field = 'ref';
 			//$where = ' AND fournisseur = 1';
+		} else {
+			return -1;
 		}
-		else return -1;
 
 		$now=dol_now();
 
@@ -208,10 +213,14 @@ 
 		global $conf;
 
 		$mask = $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
-		if (preg_match('/\{pre\}/i',$mask)) return 1;
+		if (preg_match('/\{pre\}/i',$mask)) {
+			return 1;
+		}
 
 		$mask = $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE;
-		if (preg_match('/\{pre\}/i',$mask)) return 1;
+		if (preg_match('/\{pre\}/i',$mask)) {
+			return 1;
+		}
 
 		return 0;
 	}
@@ -242,17 +251,19 @@ 
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result=0;
-		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
+		} else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
 		{
 			$result=-2;
-		}
-		else
+		} else
 		{
 			// Get Mask value
 			$mask = '';
-			if ($type==0) $mask = empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT)?'':$conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
-			if ($type==1) $mask = empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE)?'':$conf->global->PRODUCT_ELEPHANT_MASK_SERVICE;
+			if ($type==0) {
+				$mask = empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT)?'':$conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
+			}
+			if ($type==1) {
+				$mask = empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE)?'':$conf->global->PRODUCT_ELEPHANT_MASK_SERVICE;
+			}
 			if (! $mask)
 			{
 				$this->error='NotConfigured';
@@ -279,7 +290,9 @@ 
 	{
 		$sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
 		$sql.= " WHERE ref = '".$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)
@@ -287,13 +300,11 @@ 
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else
+			} else
 			{
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return -2;
 		}

htdocs/core/modules/product/modules_product.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
     /**
      *  Return next value available
      *
-     *	@param	Product		$objproduct		Object product
+     *	@param	integer		$objproduct		Object product
      *	@param	int			$type		Type
      *  @return string      			Value
      */

Indentation +179 added lines, -179 removed lines

@@ -44,9 +44,9 @@ 
 	/**
 	 *	Return list of active generation modules
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	static function liste_modeles($db,$maxfilenamelength=0)
 	{
@@ -63,188 +63,188 @@ 
 
 abstract class ModeleProductCode
 {
-    var $error='';
-
-    /**     Renvoi la description par defaut du modele de numerotation
-     *
-     *		@param	Translate	$langs		Object langs
-     *      @return string      			Texte descripif
-     */
-    function info($langs)
-    {
-        $langs->load("bills");
-        return $langs->trans("NoDescription");
-    }
-
-    /**     Renvoi nom module
-     *
-     *		@param	Translate	$langs		Object langs
-     *      @return string      			Nom du module
-     */
-    function getNom($langs)
-    {
-        return empty($this->name)?$this->nom:$this->name;
-    }
-
-
-    /**     Renvoi un exemple de numerotation
-     *
-     *		@param	Translate	$langs		Object langs
-     *      @return string      			Example
-     */
-    function getExample($langs)
-    {
-        $langs->load("bills");
-        return $langs->trans("NoExample");
-    }
-
-    /**     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()
-    {
-        return true;
-    }
-
-    /**
-     *  Return next value available
-     *
-     *	@param	Product		$objproduct		Object product
-     *	@param	int			$type		Type
-     *  @return string      			Value
-     */
-    function getNextValue($objproduct=0,$type=-1)
-    {
-        global $langs;
-        return $langs->trans("Function_getNextValue_InModuleNotWorking");
-    }
-
-
-    /**     Return version of module
-     *
-     *      @return     string      Version
-     */
-    function getVersion()
-    {
-        global $langs;
-        $langs->load("admin");
-
-        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-        if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-        if ($this->version == 'dolibarr') return DOL_VERSION;
-        if ($this->version) return $this->version;
-        return $langs->trans("NotAvailable");
-    }
-
-    /**
-     *  Renvoi la liste des modeles de numérotation
-     *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of numbers
-     */
-    static function liste_modeles($db,$maxfilenamelength=0)
-    {
-        $liste=array();
-        $sql ="";
-
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $num = $db->num_rows($resql);
-            $i = 0;
-            while ($i < $num)
-            {
-                $row = $db->fetch_row($resql);
-                $liste[$row[0]]=$row[1];
-                $i++;
-            }
-        }
-        else
-        {
-            return -1;
-        }
-        return $liste;
-    }
-
-    /**
-     *      Return description of module parameters
-     *
-     *      @param	Translate	$langs      Output language
-     *		@param	Product		$product	Product object
-     *		@param	int			$type		-1=Nothing, 0=Customer, 1=Supplier
-     *		@return	string					HTML translated description
-     */
-    function getToolTip($langs,$product,$type)
-    {
-        global $conf;
-
-        $langs->load("admin");
-
-        $s='';
-        if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
-        if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
-        if ($type == 0)  $s.=$langs->trans("ProductCodeDesc").'<br>';
-        if ($type == 1)  $s.=$langs->trans("ServiceCodeDesc").'<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_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
-            $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_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_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
-            $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_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_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
-            $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_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>';
-        if ($type == 0 || $type == -1)
-        {
-            $nextval=$this->getNextValue($product,0);
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
-            $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Product").')':'').': <b>'.$nextval.'</b><br>';
-        }
-        if ($type == 1 || $type == -1)
-        {
-            $nextval=$this->getNextValue($product,1);
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
-            $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Service").')':'').': <b>'.$nextval.'</b>';
-        }
-        return $s;
-    }
+	var $error='';
+
+	/**     Renvoi la description par defaut du modele de numerotation
+	 *
+	 *		@param	Translate	$langs		Object langs
+	 *      @return string      			Texte descripif
+	 */
+	function info($langs)
+	{
+		$langs->load("bills");
+		return $langs->trans("NoDescription");
+	}
+
+	/**     Renvoi nom module
+	 *
+	 *		@param	Translate	$langs		Object langs
+	 *      @return string      			Nom du module
+	 */
+	function getNom($langs)
+	{
+		return empty($this->name)?$this->nom:$this->name;
+	}
+
+
+	/**     Renvoi un exemple de numerotation
+	 *
+	 *		@param	Translate	$langs		Object langs
+	 *      @return string      			Example
+	 */
+	function getExample($langs)
+	{
+		$langs->load("bills");
+		return $langs->trans("NoExample");
+	}
+
+	/**     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()
+	{
+		return true;
+	}
+
+	/**
+	 *  Return next value available
+	 *
+	 *	@param	Product		$objproduct		Object product
+	 *	@param	int			$type		Type
+	 *  @return string      			Value
+	 */
+	function getNextValue($objproduct=0,$type=-1)
+	{
+		global $langs;
+		return $langs->trans("Function_getNextValue_InModuleNotWorking");
+	}
+
+
+	/**     Return version of module
+	 *
+	 *      @return     string      Version
+	 */
+	function getVersion()
+	{
+		global $langs;
+		$langs->load("admin");
+
+		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
+		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
+		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
+		return $langs->trans("NotAvailable");
+	}
+
+	/**
+	 *  Renvoi la liste des modeles de numérotation
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of numbers
+	 */
+	static function liste_modeles($db,$maxfilenamelength=0)
+	{
+		$liste=array();
+		$sql ="";
+
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$row = $db->fetch_row($resql);
+				$liste[$row[0]]=$row[1];
+				$i++;
+			}
+		}
+		else
+		{
+			return -1;
+		}
+		return $liste;
+	}
+
+	/**
+	 *      Return description of module parameters
+	 *
+	 *      @param	Translate	$langs      Output language
+	 *		@param	Product		$product	Product object
+	 *		@param	int			$type		-1=Nothing, 0=Customer, 1=Supplier
+	 *		@return	string					HTML translated description
+	 */
+	function getToolTip($langs,$product,$type)
+	{
+		global $conf;
+
+		$langs->load("admin");
+
+		$s='';
+		if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
+		if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+		if ($type == 0)  $s.=$langs->trans("ProductCodeDesc").'<br>';
+		if ($type == 1)  $s.=$langs->trans("ServiceCodeDesc").'<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_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+			$s.=yn(!$this->code_null,1,2);
+			if (! empty($conf->global->MAIN_COMPANY_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_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+			$s.=yn(!$this->code_null,1,2);
+			if (! empty($conf->global->MAIN_COMPANY_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_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+			$s.=yn(!$this->code_null,1,2);
+			if (! empty($conf->global->MAIN_COMPANY_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>';
+		if ($type == 0 || $type == -1)
+		{
+			$nextval=$this->getNextValue($product,0);
+			if (empty($nextval)) $nextval=$langs->trans("Undefined");
+			$s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Product").')':'').': <b>'.$nextval.'</b><br>';
+		}
+		if ($type == 1 || $type == -1)
+		{
+			$nextval=$this->getNextValue($product,1);
+			if (empty($nextval)) $nextval=$langs->trans("Undefined");
+			$s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Service").')':'').': <b>'.$nextval.'</b>';
+		}
+		return $s;
+	}
 
 	/**
 	 *   Check if mask/numbering use prefix
 	 *
 	 *   @return	int		0=no, 1=yes
 	 */
-    function verif_prefixIsUsed()
-    {
-        return 0;
-    }
+	function verif_prefixIsUsed()
+	{
+		return 0;
+	}
 
 }
 

Spacing +48 added lines, -48 removed lines

@@ -38,7 +38,7 @@ 
  */
 abstract class ModelePDFProduct extends CommonDocGenerator
 {
-	var $error='';
+	var $error = '';
 
 
 	/**
@@ -48,22 +48,22 @@ 
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
 	 */
-	static function liste_modeles($db,$maxfilenamelength=0)
+	static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		global $conf;
 
-		$type='product';
-		$liste=array();
+		$type = 'product';
+		$liste = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		$liste = getListOfModels($db, $type, $maxfilenamelength);
 		return $liste;
 	}
 }
 
 abstract class ModeleProductCode
 {
-    var $error='';
+    var $error = '';
 
     /**     Renvoi la description par defaut du modele de numerotation
      *
@@ -83,7 +83,7 @@ 
      */
     function getNom($langs)
     {
-        return empty($this->name)?$this->nom:$this->name;
+        return empty($this->name) ? $this->nom : $this->name;
     }
 
 
@@ -115,7 +115,7 @@ 
      *	@param	int			$type		Type
      *  @return string      			Value
      */
-    function getNextValue($objproduct=0,$type=-1)
+    function getNextValue($objproduct = 0, $type = -1)
     {
         global $langs;
         return $langs->trans("Function_getNextValue_InModuleNotWorking");
@@ -145,10 +145,10 @@ 
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of numbers
      */
-    static function liste_modeles($db,$maxfilenamelength=0)
+    static function liste_modeles($db, $maxfilenamelength = 0)
     {
-        $liste=array();
-        $sql ="";
+        $liste = array();
+        $sql = "";
 
         $resql = $db->query($sql);
         if ($resql)
@@ -158,7 +158,7 @@ 
             while ($i < $num)
             {
                 $row = $db->fetch_row($resql);
-                $liste[$row[0]]=$row[1];
+                $liste[$row[0]] = $row[1];
                 $i++;
             }
         }
@@ -177,61 +177,61 @@ 
      *		@param	int			$type		-1=Nothing, 0=Customer, 1=Supplier
      *		@return	string					HTML translated description
      */
-    function getToolTip($langs,$product,$type)
+    function getToolTip($langs, $product, $type)
     {
         global $conf;
 
         $langs->load("admin");
 
-        $s='';
-        if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
-        if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
-        if ($type == 0)  $s.=$langs->trans("ProductCodeDesc").'<br>';
-        if ($type == 1)  $s.=$langs->trans("ServiceCodeDesc").'<br>';
-        if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
-        $s.='<br>';
-        $s.='<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
+        $s = '';
+        if ($type == -1) $s .= $langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
+        if ($type == -1) $s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+        if ($type == 0)  $s .= $langs->trans("ProductCodeDesc").'<br>';
+        if ($type == 1)  $s .= $langs->trans("ServiceCodeDesc").'<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_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
-            $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_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_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+            $s .= yn(!$this->code_null, 1, 2);
+            if (!empty($conf->global->MAIN_COMPANY_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_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
-            $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_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_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+            $s .= yn(!$this->code_null, 1, 2);
+            if (!empty($conf->global->MAIN_COMPANY_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_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
-            $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_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_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+            $s .= yn(!$this->code_null, 1, 2);
+            if (!empty($conf->global->MAIN_COMPANY_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("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>';
         if ($type == 0 || $type == -1)
         {
-            $nextval=$this->getNextValue($product,0);
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
-            $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Product").')':'').': <b>'.$nextval.'</b><br>';
+            $nextval = $this->getNextValue($product, 0);
+            if (empty($nextval)) $nextval = $langs->trans("Undefined");
+            $s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Product").')' : '').': <b>'.$nextval.'</b><br>';
         }
         if ($type == 1 || $type == -1)
         {
-            $nextval=$this->getNextValue($product,1);
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
-            $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Service").')':'').': <b>'.$nextval.'</b>';
+            $nextval = $this->getNextValue($product, 1);
+            if (empty($nextval)) $nextval = $langs->trans("Undefined");
+            $s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Service").')' : '').': <b>'.$nextval.'</b>';
         }
         return $s;
     }

Braces +52 added lines, -19 removed lines

@@ -131,10 +131,18 @@ 
         global $langs;
         $langs->load("admin");
 
-        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-        if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-        if ($this->version == 'dolibarr') return DOL_VERSION;
-        if ($this->version) return $this->version;
+        if ($this->version == 'development') {
+        	return $langs->trans("VersionDevelopment");
+        }
+        if ($this->version == 'experimental') {
+        	return $langs->trans("VersionExperimental");
+        }
+        if ($this->version == 'dolibarr') {
+        	return DOL_VERSION;
+        }
+        if ($this->version) {
+        	return $this->version;
+        }
         return $langs->trans("NotAvailable");
     }
 
@@ -161,8 +169,7 @@ 
                 $liste[$row[0]]=$row[1];
                 $i++;
             }
-        }
-        else
+        } else
         {
             return -1;
         }
@@ -184,35 +191,57 @@ 
         $langs->load("admin");
 
         $s='';
-        if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
-        if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
-        if ($type == 0)  $s.=$langs->trans("ProductCodeDesc").'<br>';
-        if ($type == 1)  $s.=$langs->trans("ServiceCodeDesc").'<br>';
-        if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+        if ($type == -1) {
+        	$s.=$langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
+        }
+        if ($type == -1) {
+        	$s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+        }
+        if ($type == 0) {
+        	$s.=$langs->trans("ProductCodeDesc").'<br>';
+        }
+        if ($type == 1) {
+        	$s.=$langs->trans("ServiceCodeDesc").'<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_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+            	$s.='<strike>';
+            }
             $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            if (! empty($conf->global->MAIN_COMPANY_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_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+            	$s.='<strike>';
+            }
             $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            if (! empty($conf->global->MAIN_COMPANY_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_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+            	$s.='<strike>';
+            }
             $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            if (! empty($conf->global->MAIN_COMPANY_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").': ';
@@ -224,13 +253,17 @@ 
         if ($type == 0 || $type == -1)
         {
             $nextval=$this->getNextValue($product,0);
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
+            if (empty($nextval)) {
+            	$nextval=$langs->trans("Undefined");
+            }
             $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Product").')':'').': <b>'.$nextval.'</b><br>';
         }
         if ($type == 1 || $type == -1)
         {
             $nextval=$this->getNextValue($product,1);
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
+            if (empty($nextval)) {
+            	$nextval=$langs->trans("Undefined");
+            }
             $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Service").')':'').': <b>'.$nextval.'</b>';
         }
         return $s;

htdocs/core/modules/project/mod_project_simple.php

Doc Comments +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
     /**
      * 	Return next reference not yet used as a reference
      *
-     *  @param	Societe	$objsoc     Object third party
+     *  @param	integer	$objsoc     Object third party
      *  @param  Project	$project	Object project
      *  @return string      		Next not used reference
      */

Braces +14 added lines, -8 removed lines

@@ -86,8 +86,7 @@ 
         if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
         {
             return true;
-        }
-        else
+        } else
         {
 			$langs->load("errors");
 			$this->error=$langs->trans('ErrorNumRefModel',$max);
@@ -118,10 +117,12 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max=0;
+			}
+		} else
 		{
 			dol_syslog("mod_project_simple::getNextValue", LOG_DEBUG);
 			return -1;
@@ -132,8 +133,13 @@ 
 		//$yymm = strftime("%y%m",time());
 		$yymm = strftime("%y%m",$date);
 
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num=$max+1;
+		}
+		// If counter > 9999, we do not format on 4 chars, we take number as it is
+		else {
+			$num = sprintf("%04s",$max+1);
+		}
 
 		dol_syslog("mod_project_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

Indentation +73 added lines, -73 removed lines

@@ -33,78 +33,78 @@ 
 {
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
 	var $prefix='PJ';
-    var $error='';
+	var $error='';
 	var $nom = "Simple";
 	var $name = "Simple";
 
 
-    /**
-     *  Return description of numbering module
-     *
-     *  @return     string      Text with description
-     */
-    function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
-    }
-
-
-    /**
-     *  Return an example of numbering module values
-     *
-     * 	@return     string      Example
-     */
-    function getExample()
-    {
-        return $this->prefix."0501-0001";
-    }
-
-
-    /**  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 $conf,$langs,$db;
-
-        $coyymm=''; $max='';
+	/**
+	 *  Return description of numbering module
+	 *
+	 *  @return     string      Text with description
+	 */
+	function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+	}
+
+
+	/**
+	 *  Return an example of numbering module values
+	 *
+	 * 	@return     string      Example
+	 */
+	function getExample()
+	{
+		return $this->prefix."0501-0001";
+	}
+
+
+	/**  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 $conf,$langs,$db;
+
+		$coyymm=''; $max='';
 
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet";
+		$sql.= " FROM ".MAIN_DB_PREFIX."projet";
 		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-        $sql.= " AND entity = ".$conf->entity;
-        $resql=$db->query($sql);
-        if ($resql)
-        {
-            $row = $db->fetch_row($resql);
-            if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
-        }
-        if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
-        {
-            return true;
-        }
-        else
-        {
+		$sql.= " AND entity = ".$conf->entity;
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$row = $db->fetch_row($resql);
+			if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
+		}
+		if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
+		{
+			return true;
+		}
+		else
+		{
 			$langs->load("errors");
 			$this->error=$langs->trans('ErrorNumRefModel',$max);
-            return false;
-        }
-    }
+			return false;
+		}
+	}
 
 
    /**
-	*  Return next value
-	*
-	*  @param   Societe	$objsoc		Object third party
-	*  @param   Project	$project	Object project
-	*  @return	string				Value if OK, 0 if KO
-	*/
-    function getNextValue($objsoc,$project)
-    {
+    *  Return next value
+    *
+    *  @param   Societe	$objsoc		Object third party
+    *  @param   Project	$project	Object project
+    *  @return	string				Value if OK, 0 if KO
+    */
+	function getNextValue($objsoc,$project)
+	{
 		global $db,$conf;
 
 		// D'abord on recupere la valeur max
@@ -137,19 +137,19 @@ 
 
 		dol_syslog("mod_project_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
-    }
-
-
-    /**
-     * 	Return next reference not yet used as a reference
-     *
-     *  @param	Societe	$objsoc     Object third party
-     *  @param  Project	$project	Object project
-     *  @return string      		Next not used reference
-     */
-    function project_get_num($objsoc=0,$project='')
-    {
-        return $this->getNextValue($objsoc,$project);
-    }
+	}
+
+
+	/**
+	 * 	Return next reference not yet used as a reference
+	 *
+	 *  @param	Societe	$objsoc     Object third party
+	 *  @param  Project	$project	Object project
+	 *  @return string      		Next not used reference
+	 */
+	function project_get_num($objsoc=0,$project='')
+	{
+		return $this->getNextValue($objsoc,$project);
+	}
 }
 

Spacing +29 added lines, -29 removed lines

@@ -23,7 +23,7 @@ 
  *	\brief      File with class to manage the numbering module Simple for project references
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/project/modules_project.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
 
 
 /**
@@ -31,9 +31,9 @@ 
  */
 class mod_project_simple extends ModeleNumRefProjects
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
-	var $prefix='PJ';
-    var $error='';
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+	var $prefix = 'PJ';
+    var $error = '';
 	var $nom = "Simple";
 	var $name = "Simple";
 
@@ -46,7 +46,7 @@ 
     function info()
     {
     	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
     }
 
 
@@ -68,29 +68,29 @@ 
      */
     function canBeActivated()
     {
-    	global $conf,$langs,$db;
+    	global $conf, $langs, $db;
 
-        $coyymm=''; $max='';
+        $coyymm = ''; $max = '';
 
-		$posindice=8;
+		$posindice = 8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-        $sql.= " FROM ".MAIN_DB_PREFIX."projet";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-        $sql.= " AND entity = ".$conf->entity;
-        $resql=$db->query($sql);
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+        $sql .= " AND entity = ".$conf->entity;
+        $resql = $db->query($sql);
         if ($resql)
         {
             $row = $db->fetch_row($resql);
-            if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
+            if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
         }
-        if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
+        if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
         {
             return true;
         }
         else
         {
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
             return false;
         }
     }
@@ -103,23 +103,23 @@ 
 	*  @param   Project	$project	Object project
 	*  @return	string				Value if OK, 0 if KO
 	*/
-    function getNextValue($objsoc,$project)
+    function getNextValue($objsoc, $project)
     {
-		global $db,$conf;
+		global $db, $conf;
 
 		// D'abord on recupere la valeur max
-		$posindice=8;
+		$posindice = 8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."projet";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
-			else $max=0;
+			else $max = 0;
 		}
 		else
 		{
@@ -127,13 +127,13 @@ 
 			return -1;
 		}
 
-		$date=empty($project->date_c)?dol_now():$project->date_c;
+		$date = empty($project->date_c) ?dol_now() : $project->date_c;
 
 		//$yymm = strftime("%y%m",time());
-		$yymm = strftime("%y%m",$date);
+		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		else $num = sprintf("%04s", $max + 1);
 
 		dol_syslog("mod_project_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
@@ -147,9 +147,9 @@ 
      *  @param  Project	$project	Object project
      *  @return string      		Next not used reference
      */
-    function project_get_num($objsoc=0,$project='')
+    function project_get_num($objsoc = 0, $project = '')
     {
-        return $this->getNextValue($objsoc,$project);
+        return $this->getNextValue($objsoc, $project);
     }
 }
 

htdocs/core/modules/project/mod_project_universal.php

Doc Comments +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
     /**
      *  Return next reference not yet used as a reference
      *
-     *  @param	Societe		$objsoc     Object third party
+     *  @param	integer		$objsoc     Object third party
      *  @param  Project		$project	Object project
      *  @return string      			Next not used reference
      */

Indentation +41 added lines, -41 removed lines

@@ -36,14 +36,14 @@ 
 	var $name = 'Universal';
 
 
-    /**
-     *  Renvoi la description du modele de numerotation
-     *
-     *  @return     string      Texte descripif
-     */
+	/**
+	 *  Renvoi la description du modele de numerotation
+	 *
+	 *  @return     string      Texte descripif
+	 */
 	function info()
-    {
-    	global $conf,$langs;
+	{
+		global $conf,$langs;
 
 		$langs->load("projects");
 		$langs->load("admin");
@@ -75,20 +75,20 @@ 
 		$texte.= '</form>';
 
 		return $texte;
-    }
-
-    /**
-     *  Renvoi un exemple de numerotation
-     *
-     *  @return     string      Example
-     */
-    function getExample()
-    {
-    	global $conf,$langs,$mysoc;
-
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc,'');
+	}
+
+	/**
+	 *  Renvoi un exemple de numerotation
+	 *
+	 *  @return     string      Example
+	 */
+	function getExample()
+	{
+		global $conf,$langs,$mysoc;
+
+		$old_code_client=$mysoc->code_client;
+		$mysoc->code_client='CCCCCCCCCC';
+		$numExample = $this->getNextValue($mysoc,'');
 		$mysoc->code_client=$old_code_client;
 
 		if (! $numExample)
@@ -96,17 +96,17 @@ 
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
    /**
-	*  Return next value
-	*
-	*  @param	Societe		$objsoc		Object third party
-	*  @param   Project		$project	Object project
-	*  @return  string					Value if OK, 0 if KO
-	*/
-    function getNextValue($objsoc,$project)
-    {
+    *  Return next value
+    *
+    *  @param	Societe		$objsoc		Object third party
+    *  @param   Project		$project	Object project
+    *  @return  string					Value if OK, 0 if KO
+    */
+	function getNextValue($objsoc,$project)
+	{
 		global $db,$conf;
 
 		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
@@ -127,16 +127,16 @@ 
 	}
 
 
-    /**
-     *  Return next reference not yet used as a reference
-     *
-     *  @param	Societe		$objsoc     Object third party
-     *  @param  Project		$project	Object project
-     *  @return string      			Next not used reference
-     */
-    function project_get_num($objsoc=0,$project='')
-    {
-        return $this->getNextValue($objsoc,$project);
-    }
+	/**
+	 *  Return next reference not yet used as a reference
+	 *
+	 *  @param	Societe		$objsoc     Object third party
+	 *  @param  Project		$project	Object project
+	 *  @return string      			Next not used reference
+	 */
+	function project_get_num($objsoc=0,$project='')
+	{
+		return $this->getNextValue($objsoc,$project);
+	}
 }
 

Spacing +36 added lines, -36 removed lines

@@ -22,7 +22,7 @@ 
  *	\brief      Fichier contenant la classe du modele de numerotation de reference de projet Universal
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/project/modules_project.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
 
 
 /**
@@ -30,7 +30,7 @@ 
  */
 class mod_project_universal extends ModeleNumRefProjects
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 	var $error = '';
 	var $nom = 'Universal';
 	var $name = 'Universal';
@@ -43,7 +43,7 @@ 
      */
 	function info()
     {
-    	global $conf,$langs;
+    	global $conf, $langs;
 
 		$langs->load("projects");
 		$langs->load("admin");
@@ -51,28 +51,28 @@ 
 		$form = new Form($this->db);
 
 		$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="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstproject" value="PROJECT_UNIVERSAL_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Project"),$langs->transnoentities("Project"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Project"),$langs->transnoentities("Project"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstproject" value="PROJECT_UNIVERSAL_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Project"), $langs->transnoentities("Project"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Project"), $langs->transnoentities("Project"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskproject" value="'.$conf->global->PROJECT_UNIVERSAL_MASK.'">',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskproject" value="'.$conf->global->PROJECT_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -84,14 +84,14 @@ 
      */
     function getExample()
     {
-    	global $conf,$langs,$mysoc;
+    	global $conf, $langs, $mysoc;
 
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
+    	$old_code_client = $mysoc->code_client;
+    	$mysoc->code_client = 'CCCCCCCCCC';
+    	$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -105,23 +105,23 @@ 
 	*  @param   Project		$project	Object project
 	*  @return  string					Value if OK, 0 if KO
 	*/
-    function getNextValue($objsoc,$project)
+    function getNextValue($objsoc, $project)
     {
-		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';
 
 		// On defini critere recherche compteur
-		$mask=$conf->global->PROJECT_UNIVERSAL_MASK;
+		$mask = $conf->global->PROJECT_UNIVERSAL_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$date=empty($project->date_c)?dol_now():$project->date_c;
-		$numFinal=get_next_value($db,$mask,'projet','ref','',$objsoc->code_client,$date);
+		$date = empty($project->date_c) ?dol_now() : $project->date_c;
+		$numFinal = get_next_value($db, $mask, 'projet', 'ref', '', $objsoc->code_client, $date);
 
 		return  $numFinal;
 	}
@@ -134,9 +134,9 @@ 
      *  @param  Project		$project	Object project
      *  @return string      			Next not used reference
      */
-    function project_get_num($objsoc=0,$project='')
+    function project_get_num($objsoc = 0, $project = '')
     {
-        return $this->getNextValue($objsoc,$project);
+        return $this->getNextValue($objsoc, $project);
     }
 }
 

htdocs/core/modules/societe/mod_codeclient_elephant.php

Doc Comments +2 added lines, -2 removed lines

@@ -114,7 +114,7 @@ 
 	 * Return an example of result returned by getNextValue
 	 *
 	 * @param	Translate	$langs		Object langs
-	 * @param	societe		$objsoc		Object thirdparty
+	 * @param	integer		$objsoc		Object thirdparty
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */
@@ -175,7 +175,7 @@ 
 	/**
 	 * Return next value
 	 *
-	 * @param	Societe		$objsoc     Object third party
+	 * @param	integer		$objsoc     Object third party
 	 * @param  	int		    $type       Client ou fournisseur (0:customer, 1:supplier)
 	 * @return 	string      			Value if OK, '' if module not configured, <0 if KO
 	 */

Spacing +71 added lines, -71 removed lines

@@ -34,14 +34,14 @@ 
  */
 class mod_codeclient_elephant extends ModeleThirdPartyCode
 {
-	var $nom='Elephant';				// Nom du modele
-	var $name='Elephant';				// Nom du modele
-	var $code_modifiable;				// Code modifiable
-	var $code_modifiable_invalide;		// Code modifiable si il est invalide
-	var $code_modifiable_null;			// Code modifiables si il est null
-	var $code_null;						// Code facultatif
-	var $version='dolibarr';    		// 'development', 'experimental', 'dolibarr'
-	var $code_auto;                     // Numerotation automatique
+	var $nom = 'Elephant'; // Nom du modele
+	var $name = 'Elephant'; // Nom du modele
+	var $code_modifiable; // Code modifiable
+	var $code_modifiable_invalide; // Code modifiable si il est invalide
+	var $code_modifiable_null; // Code modifiables si il est null
+	var $code_null; // Code facultatif
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+	var $code_auto; // Numerotation automatique
 
 	var $searchcode; // String de recherche
 	var $numbitcounter; // Nombre de chiffres du compteur
@@ -74,37 +74,37 @@ 
 
 		$langs->load("companies");
 
-		$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="COMPANY_ELEPHANT_MASK_CUSTOMER">';
-		$texte.= '<input type="hidden" name="param2" value="COMPANY_ELEPHANT_MASK_SUPPLIER">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("ThirdParty"),$langs->transnoentities("ThirdParty"));
+		$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="COMPANY_ELEPHANT_MASK_CUSTOMER">';
+		$texte .= '<input type="hidden" name="param2" value="COMPANY_ELEPHANT_MASK_SUPPLIER">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("ThirdParty"), $langs->transnoentities("ThirdParty"));
 		//$tooltip.=$langs->trans("GenericMaskCodes2");	Not required for third party numbering
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4b");
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4b");
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix customers
-		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("CustomerCodeModel").'):</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value1" value="'.$conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER.'"'.$disabled.'>',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("CustomerCodeModel").'):</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value1" value="'.$conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER.'"'.$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 .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
 		// Parametrage du prefix suppliers
-		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("SupplierCodeModel").'):</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value2" value="'.$conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER.'"'.$disabled.'>',$tooltip,1,1).'</td>';
-		$texte.= '</tr>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("SupplierCodeModel").'):</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value2" value="'.$conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER.'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
 	}
@@ -118,52 +118,52 @@ 
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */
-	function getExample($langs,$objsoc=0,$type=-1)
+	function getExample($langs, $objsoc = 0, $type = -1)
 	{
 		if ($type == 0 || $type == -1)
 		{
-			$examplecust = $this->getNextValue($objsoc,0);
-			if (! $examplecust)
+			$examplecust = $this->getNextValue($objsoc, 0);
+			if (!$examplecust)
 			{
 				$examplecust = $langs->trans('NotConfigured');
 			}
-			if($examplecust=="ErrorBadMask")
+			if ($examplecust == "ErrorBadMask")
 			{
 				$langs->load("errors");
-				$examplecust=$langs->trans($examplecust);
+				$examplecust = $langs->trans($examplecust);
 			}
-			if($examplecust=="ErrorCantUseRazIfNoYearInMask")
+			if ($examplecust == "ErrorCantUseRazIfNoYearInMask")
 			{
 				$langs->load("errors");
-				$examplecust=$langs->trans($examplecust);
+				$examplecust = $langs->trans($examplecust);
 			}
-			if($examplecust=="ErrorCantUseRazInStartedYearIfNoYearMonthInMask")
+			if ($examplecust == "ErrorCantUseRazInStartedYearIfNoYearMonthInMask")
 			{
 				$langs->load("errors");
-				$examplecust=$langs->trans($examplecust);
+				$examplecust = $langs->trans($examplecust);
 			}
 		}
 		if ($type == 1 || $type == -1)
 		{
-			$examplesup = $this->getNextValue($objsoc,1);
-			if (! $examplesup)
+			$examplesup = $this->getNextValue($objsoc, 1);
+			if (!$examplesup)
 			{
 				$examplesup = $langs->trans('NotConfigured');
 			}
-			if($examplesup=="ErrorBadMask")
+			if ($examplesup == "ErrorBadMask")
 			{
 				$langs->load("errors");
-				$examplesup=$langs->trans($examplesup);
+				$examplesup = $langs->trans($examplesup);
 			}
-			if($examplesup=="ErrorCantUseRazIfNoYearInMask")
+			if ($examplesup == "ErrorCantUseRazIfNoYearInMask")
 			{
 				$langs->load("errors");
-				$examplesup=$langs->trans($examplesup);
+				$examplesup = $langs->trans($examplesup);
 			}
-			if($examplesup=="ErrorCantUseRazInStartedYearIfNoYearMonthInMask")
+			if ($examplesup == "ErrorCantUseRazInStartedYearIfNoYearMonthInMask")
 			{
 				$langs->load("errors");
-				$examplesup=$langs->trans($examplesup);
+				$examplesup = $langs->trans($examplesup);
 			}
 		}
 
@@ -179,23 +179,23 @@ 
 	 * @param  	int		    $type       Client ou fournisseur (0:customer, 1:supplier)
 	 * @return 	string      			Value if OK, '' if module not configured, <0 if KO
 	 */
-	function getNextValue($objsoc=0,$type=-1)
+	function getNextValue($objsoc = 0, $type = -1)
 	{
-		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';
 
 		// Get Mask value
 		$mask = '';
-		if ($type==0) $mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
-		if ($type==1) $mask = $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
-		if (! $mask)
+		if ($type == 0) $mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
+		if ($type == 1) $mask = $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return '';
 		}
 
-		$field='';$where='';
+		$field = ''; $where = '';
 		if ($type == 0)
 		{
 			$field = 'code_client';
@@ -208,9 +208,9 @@ 
 		}
 		else return -1;
 
-		$now=dol_now();
+		$now = dol_now();
 
-		$numFinal=get_next_value($db,$mask,'societe',$field,$where,'',$now);
+		$numFinal = get_next_value($db, $mask, 'societe', $field, $where, '', $now);
 
 		return  $numFinal;
 	}
@@ -226,10 +226,10 @@ 
 		global $conf;
 
 		$mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
-		if (preg_match('/\{pre\}/i',$mask)) return 1;
+		if (preg_match('/\{pre\}/i', $mask)) return 1;
 
 		$mask = $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
-		if (preg_match('/\{pre\}/i',$mask)) return 1;
+		if (preg_match('/\{pre\}/i', $mask)) return 1;
 
 		return 0;
 	}
@@ -252,32 +252,32 @@ 
 	{
 		global $conf;
 
-		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->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
-			$result=0;
+			$result = 0;
 		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
+		else if (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
-			$result=-2;
+			$result = -2;
 		}
 		else
 		{
 			// Get Mask value
 			$mask = '';
-			if ($type==0) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER)?'':$conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
-			if ($type==1) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER)?'':$conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
-			if (! $mask)
+			if ($type == 0) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
+			if ($type == 1) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+			if (!$mask)
 			{
-				$this->error='NotConfigured';
+				$this->error = 'NotConfigured';
 				return '';
 			}
 
-			$result=check_value($mask,$code);
+			$result = check_value($mask, $code);
 		}
 
 		dol_syslog("mod_codeclient_elephant::verif type=".$type." result=".$result);
@@ -296,10 +296,10 @@ 
 	function verif_dispo($db, $code, $soc)
 	{
 		$sql = "SELECT code_client FROM ".MAIN_DB_PREFIX."societe";
-		$sql.= " WHERE code_client = '".$code."'";
-		if ($soc->id > 0) $sql.= " AND rowid <> ".$soc->id;
+		$sql .= " WHERE code_client = '".$code."'";
+		if ($soc->id > 0) $sql .= " AND rowid <> ".$soc->id;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			if ($db->num_rows($resql) == 0)

Braces +34 added lines, -20 removed lines

@@ -167,8 +167,12 @@ 
 			}
 		}
 
-		if ($type == 0) return $examplecust;
-		if ($type == 1) return $examplesup;
+		if ($type == 0) {
+			return $examplecust;
+		}
+		if ($type == 1) {
+			return $examplesup;
+		}
 		return $examplecust.'<br>'.$examplesup;
 	}
 
@@ -187,8 +191,12 @@ 
 
 		// Get Mask value
 		$mask = '';
-		if ($type==0) $mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
-		if ($type==1) $mask = $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+		if ($type==0) {
+			$mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
+		}
+		if ($type==1) {
+			$mask = $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+		}
 		if (! $mask)
 		{
 			$this->error='NotConfigured';
@@ -200,13 +208,13 @@ 
 		{
 			$field = 'code_client';
 			//$where = ' AND client in (1,2)';
-		}
-		else if ($type == 1)
+		} else if ($type == 1)
 		{
 			$field = 'code_fournisseur';
 			//$where = ' AND fournisseur = 1';
+		} else {
+			return -1;
 		}
-		else return -1;
 
 		$now=dol_now();
 
@@ -226,10 +234,14 @@ 
 		global $conf;
 
 		$mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
-		if (preg_match('/\{pre\}/i',$mask)) return 1;
+		if (preg_match('/\{pre\}/i',$mask)) {
+			return 1;
+		}
 
 		$mask = $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
-		if (preg_match('/\{pre\}/i',$mask)) return 1;
+		if (preg_match('/\{pre\}/i',$mask)) {
+			return 1;
+		}
 
 		return 0;
 	}
@@ -260,17 +272,19 @@ 
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result=0;
-		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
+		} else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
 		{
 			$result=-2;
-		}
-		else
+		} else
 		{
 			// Get Mask value
 			$mask = '';
-			if ($type==0) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER)?'':$conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
-			if ($type==1) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER)?'':$conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+			if ($type==0) {
+				$mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER)?'':$conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
+			}
+			if ($type==1) {
+				$mask = empty($conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER)?'':$conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+			}
 			if (! $mask)
 			{
 				$this->error='NotConfigured';
@@ -297,7 +311,9 @@ 
 	{
 		$sql = "SELECT code_client FROM ".MAIN_DB_PREFIX."societe";
 		$sql.= " WHERE code_client = '".$code."'";
-		if ($soc->id > 0) $sql.= " AND rowid <> ".$soc->id;
+		if ($soc->id > 0) {
+			$sql.= " AND rowid <> ".$soc->id;
+		}
 
 		$resql=$db->query($sql);
 		if ($resql)
@@ -305,13 +321,11 @@ 
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else
+			} else
 			{
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return -2;
 		}

htdocs/core/modules/societe/mod_codeclient_monkey.php

Doc Comments +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
 	 * Return an example of result returned by getNextValue
 	 *
 	 * @param	Translate	$langs		Object langs
-	 * @param	societe		$objsoc		Object thirdparty
+	 * @param	integer		$objsoc		Object thirdparty
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */
@@ -91,7 +91,7 @@ 
 	/**
 	 *  Return next value
 	 *
-	 * 	@param	Societe		$objsoc     Object third party
+	 * 	@param	integer		$objsoc     Object third party
 	 *	@param  int			$type       Client ou fournisseur (1:client, 2:fournisseur)
 	 *  @return string      			Value if OK, '' if module not configured, <0 if KO
 	 */

Indentation +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
 
 		// D'abord on recupere la valeur max (reponse immediate car champ indexe)
 		$posindice=8;
-        $sql = "SELECT MAX(CAST(SUBSTRING(".$field." FROM ".$posindice.") AS SIGNED)) as max";   // This is standard SQL
+		$sql = "SELECT MAX(CAST(SUBSTRING(".$field." FROM ".$posindice.") AS SIGNED)) as max";   // This is standard SQL
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
 		$sql.= " WHERE ".$field." LIKE '".$prefix."____-%'";
 		$sql.= " AND entity IN (".getEntity('societe').")";

Spacing +40 added lines, -40 removed lines

@@ -32,17 +32,17 @@ 
  */
 class mod_codeclient_monkey extends ModeleThirdPartyCode
 {
-	var $nom='Monkey';					// Nom du modele
-	var $name='Monkey';					// Nom du modele
-	var $code_modifiable;				// Code modifiable
-	var $code_modifiable_invalide;		// Code modifiable si il est invalide
-	var $code_modifiable_null;			// Code modifiables si il est null
-	var $code_null;						// Code facultatif
-	var $version='dolibarr';	    	// 'development', 'experimental', 'dolibarr'
-	var $code_auto;                     // Numerotation automatique
-
-	var $prefixcustomer='CU';
-	var $prefixsupplier='SU';
+	var $nom = 'Monkey'; // Nom du modele
+	var $name = 'Monkey'; // Nom du modele
+	var $code_modifiable; // Code modifiable
+	var $code_modifiable_invalide; // Code modifiable si il est invalide
+	var $code_modifiable_null; // Code modifiables si il est null
+	var $code_null; // Code facultatif
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+	var $code_auto; // Numerotation automatique
+
+	var $prefixcustomer = 'CU';
+	var $prefixsupplier = 'SU';
 	var $prefixIsRequired; // Le champ prefix du tiers doit etre renseigne quand on utilise {pre}
 
 
@@ -70,7 +70,7 @@ 
 	 */
 	function info($langs)
 	{
-		return $langs->trans("MonkeyNumRefModelDesc",$this->prefixcustomer,$this->prefixsupplier);
+		return $langs->trans("MonkeyNumRefModelDesc", $this->prefixcustomer, $this->prefixsupplier);
 	}
 
 
@@ -82,7 +82,7 @@ 
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */
-	function getExample($langs,$objsoc=0,$type=-1)
+	function getExample($langs, $objsoc = 0, $type = -1)
 	{
 		return $this->prefixcustomer.'0901-0001<br>'.$this->prefixsupplier.'0901-0001';
 	}
@@ -95,13 +95,13 @@ 
 	 *	@param  int			$type       Client ou fournisseur (1:client, 2:fournisseur)
 	 *  @return string      			Value if OK, '' if module not configured, <0 if KO
 	 */
-	function getNextValue($objsoc=0,$type=-1)
+	function getNextValue($objsoc = 0, $type = -1)
 	{
 		global $db, $conf, $mc;
 
-		$return='000001';
+		$return = '000001';
 
-		$field='';$where='';
+		$field = ''; $where = '';
 		if ($type == 0)
 		{
 			$field = 'code_client';
@@ -115,24 +115,24 @@ 
 		else return -1;
 
 
-		if ($type == 0) $prefix=$this->prefixcustomer;
-		if ($type == 1) $prefix=$this->prefixsupplier;
+		if ($type == 0) $prefix = $this->prefixcustomer;
+		if ($type == 1) $prefix = $this->prefixsupplier;
 
 		// D'abord on recupere la valeur max (reponse immediate car champ indexe)
-		$posindice=8;
-        $sql = "SELECT MAX(CAST(SUBSTRING(".$field." FROM ".$posindice.") AS SIGNED)) as max";   // This is standard SQL
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql.= " WHERE ".$field." LIKE '".$prefix."____-%'";
-		$sql.= " AND entity IN (".getEntity('societe').")";
+		$posindice = 8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(".$field." FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
+		$sql .= " WHERE ".$field." LIKE '".$prefix."____-%'";
+		$sql .= " AND entity IN (".getEntity('societe').")";
 
 		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
-			else $max=0;
+			else $max = 0;
 		}
 		else
 		{
@@ -140,10 +140,10 @@ 
 		}
 
 		$date	= dol_now();
-		$yymm	= strftime("%y%m",$date);
+		$yymm	= strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		else $num = sprintf("%04s", $max + 1);
 
 		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
 		return $prefix.$yymm."-".$num;
@@ -167,16 +167,16 @@ 
 	{
 		global $conf;
 
-		$result=0;
+		$result = 0;
 		$code = strtoupper(trim($code));
 
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
-			$result=0;
+			$result = 0;
 		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
+		else if (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
-			$result=-2;
+			$result = -2;
 		}
 		else
 		{
@@ -185,22 +185,22 @@ 
 				$is_dispo = $this->verif_dispo($db, $code, $soc);
 				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;
 				}
 			}
 		}
@@ -223,12 +223,12 @@ 
 		global $conf, $mc;
 
 		$sql = "SELECT code_client FROM ".MAIN_DB_PREFIX."societe";
-		$sql.= " WHERE code_client = '".$code."'";
-		$sql.= " AND entity IN (".getEntity('societe').")";
-		if ($soc->id > 0) $sql.= " AND rowid <> ".$soc->id;
+		$sql .= " WHERE code_client = '".$code."'";
+		$sql .= " AND entity IN (".getEntity('societe').")";
+		if ($soc->id > 0) $sql .= " AND rowid <> ".$soc->id;
 
 		dol_syslog(get_class($this)."::verif_dispo", LOG_DEBUG);
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			if ($db->num_rows($resql) == 0)

Braces +33 added lines, -28 removed lines

@@ -106,17 +106,21 @@ 
 		{
 			$field = 'code_client';
 			//$where = ' AND client in (1,2)';
-		}
-		else if ($type == 1)
+		} else if ($type == 1)
 		{
 			$field = 'code_fournisseur';
 			//$where = ' AND fournisseur = 1';
+		} else {
+			return -1;
 		}
-		else return -1;
 
 
-		if ($type == 0) $prefix=$this->prefixcustomer;
-		if ($type == 1) $prefix=$this->prefixsupplier;
+		if ($type == 0) {
+			$prefix=$this->prefixcustomer;
+		}
+		if ($type == 1) {
+			$prefix=$this->prefixsupplier;
+		}
 
 		// D'abord on recupere la valeur max (reponse immediate car champ indexe)
 		$posindice=8;
@@ -131,10 +135,12 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max=0;
+			}
+		} else
 		{
 			return -1;
 		}
@@ -142,8 +148,13 @@ 
 		$date	= dol_now();
 		$yymm	= strftime("%y%m",$date);
 
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num=$max+1;
+		}
+		// If counter > 9999, we do not format on 4 chars, we take number as it is
+		else {
+			$num = sprintf("%04s",$max+1);
+		}
 
 		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
 		return $prefix.$yymm."-".$num;
@@ -173,12 +184,10 @@ 
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result=0;
-		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
+		} else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
 		{
 			$result=-2;
-		}
-		else
+		} else
 		{
 			if ($this->verif_syntax($code) >= 0)
 			{
@@ -186,19 +195,16 @@ 
 				if ($is_dispo <> 0)
 				{
 					$result=-3;
-				}
-				else
+				} else
 				{
 					$result=0;
 				}
-			}
-			else
+			} else
 			{
 				if (dol_strlen($code) == 0)
 				{
 					$result=-2;
-				}
-				else
+				} else
 				{
 					$result=-1;
 				}
@@ -225,7 +231,9 @@ 
 		$sql = "SELECT code_client FROM ".MAIN_DB_PREFIX."societe";
 		$sql.= " WHERE code_client = '".$code."'";
 		$sql.= " AND entity IN (".getEntity('societe').")";
-		if ($soc->id > 0) $sql.= " AND rowid <> ".$soc->id;
+		if ($soc->id > 0) {
+			$sql.= " AND rowid <> ".$soc->id;
+		}
 
 		dol_syslog(get_class($this)."::verif_dispo", LOG_DEBUG);
 		$resql=$db->query($sql);
@@ -234,13 +242,11 @@ 
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else
+			} else
 			{
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return -2;
 		}
@@ -261,8 +267,7 @@ 
 		if (dol_strlen($code) < 11)
 		{
 			$res = -1;
-		}
-		else
+		} else
 		{
 			$res = 0;
 		}

htdocs/core/modules/societe/mod_codecompta_aquarium.php

Doc Comments +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
 	 * Return an example of result returned by getNextValue
 	 *
 	 * @param	Translate	$langs		Object langs
-	 * @param	societe		$objsoc		Object thirdparty
+	 * @param	integer		$objsoc		Object thirdparty
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */

Indentation +9 added lines, -9 removed lines

@@ -44,11 +44,11 @@ 
 	 */
 	function __construct()
 	{
-	    global $conf;
+		global $conf;
 		if (! isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411';
-        if (! isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401';
+		if (! isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401';
 		$this->prefixcustomeraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
-	    $this->prefixsupplieraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
+		$this->prefixsupplieraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
 	}
 
 
@@ -60,12 +60,12 @@ 
 	 */
 	function info($langs)
 	{
-	    global $conf;
-	    global $form;
+		global $conf;
+		global $form;
 
 		$langs->load("companies");
 
-        $tooltip='';
+		$tooltip='';
 		$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">';
@@ -77,8 +77,8 @@ 
 		$texte.= '<tr><td>'.$langs->trans("ModuleCompanyCode".$this->name,$s1,$s2)."<br>\n";
 		$texte.= '</td>';
 		$texte.= '<td align="left">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
-        $texte.= '</tr></table>';
-        $texte.= '</form>';
+		$texte.= '</tr></table>';
+		$texte.= '</form>';
 
 		return $texte;
 	}
@@ -93,7 +93,7 @@ 
 	 */
 	function getExample($langs,$objsoc=0,$type=-1)
 	{
-	    return $this->prefixsupplieraccountancycode.'SUPPCODE'."<br>\n".$this->prefixcustomeraccountancycode.'CUSTCODE';
+		return $this->prefixsupplieraccountancycode.'SUPPCODE'."<br>\n".$this->prefixcustomeraccountancycode.'CUSTCODE';
 	}
 
 

Spacing +44 added lines, -44 removed lines

@@ -31,9 +31,9 @@ 
  */
 class mod_codecompta_aquarium extends ModeleAccountancyCode
 {
-	var $nom='Aquarium';
-	var $name='Aquarium';
-	var $version='dolibarr';        // 'development', 'experimental', 'dolibarr'
+	var $nom = 'Aquarium';
+	var $name = 'Aquarium';
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	var	$prefixcustomeraccountancycode;
 	var	$prefixsupplieraccountancycode;
@@ -45,10 +45,10 @@ 
 	function __construct()
 	{
 	    global $conf;
-		if (! isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411';
-        if (! isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401';
-		$this->prefixcustomeraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
-	    $this->prefixsupplieraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
+		if (!isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER = '411';
+        if (!isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER = '401';
+		$this->prefixcustomeraccountancycode = $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
+	    $this->prefixsupplieraccountancycode = $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
 	}
 
 
@@ -65,20 +65,20 @@ 
 
 		$langs->load("companies");
 
-        $tooltip='';
+        $tooltip = '';
 		$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="COMPANY_AQUARIUM_MASK_SUPPLIER">';
-		$texte.= '<input type="hidden" name="param2" value="COMPANY_AQUARIUM_MASK_CUSTOMER">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-		$s1= $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="'.$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER.'">',$tooltip,1,1);
-		$s2= $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="'.$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER.'">',$tooltip,1,1);
-		$texte.= '<tr><td>'.$langs->trans("ModuleCompanyCode".$this->name,$s1,$s2)."<br>\n";
-		$texte.= '</td>';
-		$texte.= '<td align="left">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
-        $texte.= '</tr></table>';
-        $texte.= '</form>';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="COMPANY_AQUARIUM_MASK_SUPPLIER">';
+		$texte .= '<input type="hidden" name="param2" value="COMPANY_AQUARIUM_MASK_CUSTOMER">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+		$s1 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="'.$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER.'">', $tooltip, 1, 1);
+		$s2 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="'.$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER.'">', $tooltip, 1, 1);
+		$texte .= '<tr><td>'.$langs->trans("ModuleCompanyCode".$this->name, $s1, $s2)."<br>\n";
+		$texte .= '</td>';
+		$texte .= '<td align="left">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+        $texte .= '</tr></table>';
+        $texte .= '</form>';
 
 		return $texte;
 	}
@@ -91,7 +91,7 @@ 
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */
-	function getExample($langs,$objsoc=0,$type=-1)
+	function getExample($langs, $objsoc = 0, $type = -1)
 	{
 	    return $this->prefixsupplieraccountancycode.'SUPPCODE'."<br>\n".$this->prefixcustomeraccountancycode.'CUSTCODE';
 	}
@@ -105,36 +105,36 @@ 
 	 *  @param  string		$type			'customer' or 'supplier'
 	 *  @return	int							>=0 if OK, <0 if KO
 	 */
-	function get_code($db, $societe, $type='')
+	function get_code($db, $societe, $type = '')
 	{
 		$i = 0;
 		$this->db = $db;
 
-		dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(! empty($societe->name)?$societe->name:''));
+		dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(!empty($societe->name) ? $societe->name : ''));
 
 		// Regle gestion compte compta
-		$codetouse='';
+		$codetouse = '';
 		if ($type == 'customer')
 		{
 			$codetouse = $this->prefixcustomeraccountancycode;
-			$codetouse.= (! empty($societe->code_client)?$societe->code_client:'CUSTCODE');
+			$codetouse .= (!empty($societe->code_client) ? $societe->code_client : 'CUSTCODE');
 		}
 		else if ($type == 'supplier')
 		{
 			$codetouse = $this->prefixsupplieraccountancycode;
-			$codetouse.= (! empty($societe->code_fournisseur)?$societe->code_fournisseur:'SUPPCODE');
+			$codetouse .= (!empty($societe->code_fournisseur) ? $societe->code_fournisseur : 'SUPPCODE');
 		}
-		$codetouse=strtoupper(preg_replace('/([^a-z0-9])/i','',$codetouse));
+		$codetouse = strtoupper(preg_replace('/([^a-z0-9])/i', '', $codetouse));
 
 		$is_dispo = $this->verif($db, $codetouse, $societe, $type);
-		if (! $is_dispo)
+		if (!$is_dispo)
 		{
-			$this->code=$codetouse;
+			$this->code = $codetouse;
 		}
 		else
 		{
 			// Pour retour
-			$this->code=$codetouse;
+			$this->code = $codetouse;
 		}
 		dol_syslog("mod_codecompta_aquarium::get_code found code=".$this->code);
 		return $is_dispo;
@@ -153,33 +153,33 @@ 
 	function verif($db, $code, $societe, $type)
 	{
 		$sql = "SELECT ";
-		if ($type == 'customer') $sql.= "code_compta";
-		else if ($type == 'supplier') $sql.= "code_compta_fournisseur";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql.= " WHERE ";
-		if ($type == 'customer') $sql.= "code_compta";
-		else if ($type == 'supplier') $sql.= "code_compta_fournisseur";
-		$sql.= " = '".$db->escape($code)."'";
-		if (! empty($societe->id)) $sql.= " AND rowid <> ".$societe->id;
-
-		$resql=$db->query($sql);
+		if ($type == 'customer') $sql .= "code_compta";
+		else if ($type == 'supplier') $sql .= "code_compta_fournisseur";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
+		$sql .= " WHERE ";
+		if ($type == 'customer') $sql .= "code_compta";
+		else if ($type == 'supplier') $sql .= "code_compta_fournisseur";
+		$sql .= " = '".$db->escape($code)."'";
+		if (!empty($societe->id)) $sql .= " AND rowid <> ".$societe->id;
+
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			if ($db->num_rows($resql) == 0)
 			{
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' available");
-				return 1;	// Dispo
+				return 1; // Dispo
 			}
 			else
 			{
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' not available");
-				return 0;	// Non dispo
+				return 0; // Non dispo
 			}
 		}
 		else
 		{
-			$this->error=$db->error()." sql=".$sql;
-			return -1;		// Erreur
+			$this->error = $db->error()." sql=".$sql;
+			return -1; // Erreur
 		}
 	}
 }

Braces +23 added lines, -15 removed lines

@@ -45,8 +45,12 @@ 
 	function __construct()
 	{
 	    global $conf;
-		if (! isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411';
-        if (! isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401';
+		if (! isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') {
+			$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411';
+		}
+        if (! isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') {
+        	$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401';
+        }
 		$this->prefixcustomeraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
 	    $this->prefixsupplieraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
 	}
@@ -118,8 +122,7 @@ 
 		{
 			$codetouse = $this->prefixcustomeraccountancycode;
 			$codetouse.= (! empty($societe->code_client)?$societe->code_client:'CUSTCODE');
-		}
-		else if ($type == 'supplier')
+		} else if ($type == 'supplier')
 		{
 			$codetouse = $this->prefixsupplieraccountancycode;
 			$codetouse.= (! empty($societe->code_fournisseur)?$societe->code_fournisseur:'SUPPCODE');
@@ -130,8 +133,7 @@ 
 		if (! $is_dispo)
 		{
 			$this->code=$codetouse;
-		}
-		else
+		} else
 		{
 			// Pour retour
 			$this->code=$codetouse;
@@ -153,14 +155,22 @@ 
 	function verif($db, $code, $societe, $type)
 	{
 		$sql = "SELECT ";
-		if ($type == 'customer') $sql.= "code_compta";
-		else if ($type == 'supplier') $sql.= "code_compta_fournisseur";
+		if ($type == 'customer') {
+			$sql.= "code_compta";
+		} else if ($type == 'supplier') {
+			$sql.= "code_compta_fournisseur";
+		}
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
 		$sql.= " WHERE ";
-		if ($type == 'customer') $sql.= "code_compta";
-		else if ($type == 'supplier') $sql.= "code_compta_fournisseur";
+		if ($type == 'customer') {
+			$sql.= "code_compta";
+		} else if ($type == 'supplier') {
+			$sql.= "code_compta_fournisseur";
+		}
 		$sql.= " = '".$db->escape($code)."'";
-		if (! empty($societe->id)) $sql.= " AND rowid <> ".$societe->id;
+		if (! empty($societe->id)) {
+			$sql.= " AND rowid <> ".$societe->id;
+		}
 
 		$resql=$db->query($sql);
 		if ($resql)
@@ -169,14 +179,12 @@ 
 			{
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' available");
 				return 1;	// Dispo
-			}
-			else
+			} else
 			{
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' not available");
 				return 0;	// Non dispo
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$db->error()." sql=".$sql;
 			return -1;		// Erreur