alxarafe / alixar

dolibarr/htdocs/core/modules/societe/modules_societe.class.php

Indentation +14 added lines, -14 removed lines

@@ -34,9 +34,9 @@ 
 abstract class ModeleThirdPartyDoc extends CommonDocGenerator
 {
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -69,8 +69,8 @@ 
 {
     /**
      * @var string Error code (or message)
-	 */
-	public $error='';
+     */
+    public $error='';
 
     /**     Renvoi la description par defaut du modele de numerotation
      *
@@ -246,10 +246,10 @@ 
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *   Check if mask/numbering use prefix
-	 *
-	 *   @return    int	    0=no, 1=yes
+    /**
+     *   Check if mask/numbering use prefix
+     *
+     *   @return    int	    0=no, 1=yes
      */
     function verif_prefixIsUsed()
     {
@@ -266,9 +266,9 @@ 
 abstract class ModeleAccountancyCode
 {
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     /**		Return description of module
@@ -397,7 +397,7 @@ 
 function thirdparty_doc_create(DoliDB $db, Societe $object, $message, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
     // phpcs:enable
-	dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
+    dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
 
-	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+    return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 }

dolibarr/htdocs/core/modules/societe/mod_codeclient_elephant.php

Indentation +298 added lines, -298 removed lines

@@ -34,319 +34,319 @@
  */
 class mod_codeclient_elephant extends ModeleThirdPartyCode
 {
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Elephant';
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see name
+     */
+    public $nom='Elephant';
 
-	/**
-	 * @var string model name
-	 */
-	public $name='Elephant';
+    /**
+     * @var string model name
+     */
+    public $name='Elephant';
 
-	public $code_modifiable;				// Code modifiable
+    public $code_modifiable;				// Code modifiable
 
-	public $code_modifiable_invalide;		// Code modifiable si il est invalide
+    public $code_modifiable_invalide;		// Code modifiable si il est invalide
 
-	public $code_modifiable_null;			// Code modifiables si il est null
+    public $code_modifiable_null;			// Code modifiables si il est null
 
-	public $code_null;						// Code facultatif
+    public $code_null;						// Code facultatif
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';    		// 'development', 'experimental', 'dolibarr'
-
-	public $code_auto;                     // Numerotation automatique
-
-	public $searchcode; // String de recherche
-
-	public $numbitcounter; // Nombre de chiffres du compteur
-
-	public $prefixIsRequired; // Le champ prefix du tiers doit etre renseigne quand on utilise {pre}
-
-
-	/**
-	 *	Constructor
-	 */
-	function __construct()
-	{
-		$this->code_null = 0;
-		$this->code_modifiable = 1;
-		$this->code_modifiable_invalide = 1;
-		$this->code_modifiable_null = 1;
-		$this->code_auto = 1;
-		$this->prefixIsRequired = 0;
-	}
-
-
-	/**		Return description of module
-	 *
-	 * 		@param	Translate	$langs		Object langs
-	 * 		@return string      			Description of module
-	 */
-	function info($langs)
-	{
-		global $conf, $mc;
-		global $form;
-
-		$langs->load("companies");
-
-		$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"));
-		//$tooltip.=$langs->trans("GenericMaskCodes2");	Not required for third party numbering
-		$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.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></td>';
-
-		$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.= '</table>';
-		$texte.= '</form>';
-
-		return $texte;
-	}
-
-
-	/**
-	 * Return an example of result returned by getNextValue
-	 *
-	 * @param	Translate	$langs		Object langs
-	 * @param	societe		$objsoc		Object thirdparty
-	 * @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)
-	{
-		if ($type == 0 || $type == -1)
-		{
-			$examplecust = $this->getNextValue($objsoc,0);
-			if (! $examplecust)
-			{
-				$examplecust = $langs->trans('NotConfigured');
-			}
-			if($examplecust=="ErrorBadMask")
-			{
-				$langs->load("errors");
-				$examplecust=$langs->trans($examplecust);
-			}
-			if($examplecust=="ErrorCantUseRazIfNoYearInMask")
-			{
-				$langs->load("errors");
-				$examplecust=$langs->trans($examplecust);
-			}
-			if($examplecust=="ErrorCantUseRazInStartedYearIfNoYearMonthInMask")
-			{
-				$langs->load("errors");
-				$examplecust=$langs->trans($examplecust);
-			}
-		}
-		if ($type == 1 || $type == -1)
-		{
-			$examplesup = $this->getNextValue($objsoc,1);
-			if (! $examplesup)
-			{
-				$examplesup = $langs->trans('NotConfigured');
-			}
-			if($examplesup=="ErrorBadMask")
-			{
-				$langs->load("errors");
-				$examplesup=$langs->trans($examplesup);
-			}
-			if($examplesup=="ErrorCantUseRazIfNoYearInMask")
-			{
-				$langs->load("errors");
-				$examplesup=$langs->trans($examplesup);
-			}
-			if($examplesup=="ErrorCantUseRazInStartedYearIfNoYearMonthInMask")
-			{
-				$langs->load("errors");
-				$examplesup=$langs->trans($examplesup);
-			}
-		}
-
-		if ($type == 0) return $examplecust;
-		if ($type == 1) return $examplesup;
-		return $examplecust.'<br>'.$examplesup;
-	}
-
-	/**
-	 * Return next value
-	 *
-	 * @param	Societe		$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
-	 */
-	function getNextValue($objsoc=0,$type=-1)
-	{
-		global $db,$conf;
-
-		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)
-		{
-			$this->error='NotConfigured';
-			return '';
-		}
-
-		$field='';$where='';
-		if ($type == 0)
-		{
-			$field = 'code_client';
-			//$where = ' AND client in (1,2)';
-		}
-		else if ($type == 1)
-		{
-			$field = 'code_fournisseur';
-			//$where = ' AND fournisseur = 1';
-		}
-		else return -1;
-
-		$now=dol_now();
-
-		$numFinal=get_next_value($db,$mask,'societe',$field,$where,'',$now);
-
-		return  $numFinal;
-	}
+    public $version = 'dolibarr';    		// 'development', 'experimental', 'dolibarr'
+
+    public $code_auto;                     // Numerotation automatique
+
+    public $searchcode; // String de recherche
+
+    public $numbitcounter; // Nombre de chiffres du compteur
+
+    public $prefixIsRequired; // Le champ prefix du tiers doit etre renseigne quand on utilise {pre}
+
+
+    /**
+     *	Constructor
+     */
+    function __construct()
+    {
+        $this->code_null = 0;
+        $this->code_modifiable = 1;
+        $this->code_modifiable_invalide = 1;
+        $this->code_modifiable_null = 1;
+        $this->code_auto = 1;
+        $this->prefixIsRequired = 0;
+    }
+
+
+    /**		Return description of module
+     *
+     * 		@param	Translate	$langs		Object langs
+     * 		@return string      			Description of module
+     */
+    function info($langs)
+    {
+        global $conf, $mc;
+        global $form;
+
+        $langs->load("companies");
+
+        $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"));
+        //$tooltip.=$langs->trans("GenericMaskCodes2");	Not required for third party numbering
+        $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.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></td>';
+
+        $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.= '</table>';
+        $texte.= '</form>';
+
+        return $texte;
+    }
+
+
+    /**
+     * Return an example of result returned by getNextValue
+     *
+     * @param	Translate	$langs		Object langs
+     * @param	societe		$objsoc		Object thirdparty
+     * @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)
+    {
+        if ($type == 0 || $type == -1)
+        {
+            $examplecust = $this->getNextValue($objsoc,0);
+            if (! $examplecust)
+            {
+                $examplecust = $langs->trans('NotConfigured');
+            }
+            if($examplecust=="ErrorBadMask")
+            {
+                $langs->load("errors");
+                $examplecust=$langs->trans($examplecust);
+            }
+            if($examplecust=="ErrorCantUseRazIfNoYearInMask")
+            {
+                $langs->load("errors");
+                $examplecust=$langs->trans($examplecust);
+            }
+            if($examplecust=="ErrorCantUseRazInStartedYearIfNoYearMonthInMask")
+            {
+                $langs->load("errors");
+                $examplecust=$langs->trans($examplecust);
+            }
+        }
+        if ($type == 1 || $type == -1)
+        {
+            $examplesup = $this->getNextValue($objsoc,1);
+            if (! $examplesup)
+            {
+                $examplesup = $langs->trans('NotConfigured');
+            }
+            if($examplesup=="ErrorBadMask")
+            {
+                $langs->load("errors");
+                $examplesup=$langs->trans($examplesup);
+            }
+            if($examplesup=="ErrorCantUseRazIfNoYearInMask")
+            {
+                $langs->load("errors");
+                $examplesup=$langs->trans($examplesup);
+            }
+            if($examplesup=="ErrorCantUseRazInStartedYearIfNoYearMonthInMask")
+            {
+                $langs->load("errors");
+                $examplesup=$langs->trans($examplesup);
+            }
+        }
+
+        if ($type == 0) return $examplecust;
+        if ($type == 1) return $examplesup;
+        return $examplecust.'<br>'.$examplesup;
+    }
+
+    /**
+     * Return next value
+     *
+     * @param	Societe		$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
+     */
+    function getNextValue($objsoc=0,$type=-1)
+    {
+        global $db,$conf;
+
+        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)
+        {
+            $this->error='NotConfigured';
+            return '';
+        }
+
+        $field='';$where='';
+        if ($type == 0)
+        {
+            $field = 'code_client';
+            //$where = ' AND client in (1,2)';
+        }
+        else if ($type == 1)
+        {
+            $field = 'code_fournisseur';
+            //$where = ' AND fournisseur = 1';
+        }
+        else return -1;
+
+        $now=dol_now();
+
+        $numFinal=get_next_value($db,$mask,'societe',$field,$where,'',$now);
+
+        return  $numFinal;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *   Check if mask/numbering use prefix
-	 *
-	 *   @return	int			0 or 1
-	 */
-	function verif_prefixIsUsed()
-	{
+    /**
+     *   Check if mask/numbering use prefix
+     *
+     *   @return	int			0 or 1
+     */
+    function verif_prefixIsUsed()
+    {
         // phpcs:enable
-		global $conf;
-
-		$mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
-		if (preg_match('/\{pre\}/i',$mask)) return 1;
-
-		$mask = $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
-		if (preg_match('/\{pre\}/i',$mask)) return 1;
-
-		return 0;
-	}
-
-
-	/**
-	 * 	Check validity of code according to its rules
-	 *
-	 *	@param	DoliDB		$db		Database handler
-	 *	@param	string		$code	Code to check/correct
-	 *	@param	Societe		$soc	Object third party
-	 *  @param  int		  	$type   0 = customer/prospect , 1 = supplier
-	 *  @return int					0 if OK
-	 * 								-1 ErrorBadCustomerCodeSyntax
-	 * 								-2 ErrorCustomerCodeRequired
-	 * 								-3 ErrorCustomerCodeAlreadyUsed
-	 * 								-4 ErrorPrefixRequired
-	 * 								-5 Other (see this->error)
-	 */
-	function verif($db, &$code, $soc, $type)
-	{
-		global $conf;
-
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
-
-		$result=0;
-		$code = strtoupper(trim($code));
-
-		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
-		{
-			$result=0;
-		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
-		{
-			$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)
-			{
-				$this->error='NotConfigured';
-				return -5;
-			}
-
-			$result=check_value($mask,$code);
-			if (is_string($result))
-			{
-				$this->error = $result;
-				return -5;
-			}
-		}
-
-		dol_syslog("mod_codeclient_elephant::verif type=".$type." result=".$result);
-		return $result;
-	}
+        global $conf;
+
+        $mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
+        if (preg_match('/\{pre\}/i',$mask)) return 1;
+
+        $mask = $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+        if (preg_match('/\{pre\}/i',$mask)) return 1;
+
+        return 0;
+    }
+
+
+    /**
+     * 	Check validity of code according to its rules
+     *
+     *	@param	DoliDB		$db		Database handler
+     *	@param	string		$code	Code to check/correct
+     *	@param	Societe		$soc	Object third party
+     *  @param  int		  	$type   0 = customer/prospect , 1 = supplier
+     *  @return int					0 if OK
+     * 								-1 ErrorBadCustomerCodeSyntax
+     * 								-2 ErrorCustomerCodeRequired
+     * 								-3 ErrorCustomerCodeAlreadyUsed
+     * 								-4 ErrorPrefixRequired
+     * 								-5 Other (see this->error)
+     */
+    function verif($db, &$code, $soc, $type)
+    {
+        global $conf;
+
+        require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+
+        $result=0;
+        $code = strtoupper(trim($code));
+
+        if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
+        {
+            $result=0;
+        }
+        else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
+        {
+            $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)
+            {
+                $this->error='NotConfigured';
+                return -5;
+            }
+
+            $result=check_value($mask,$code);
+            if (is_string($result))
+            {
+                $this->error = $result;
+                return -5;
+            }
+        }
+
+        dol_syslog("mod_codeclient_elephant::verif type=".$type." result=".$result);
+        return $result;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *		Renvoi si un code est pris ou non (par autre tiers)
-	 *
-	 *		@param	DoliDB		$db			Handler acces base
-	 *		@param	string		$code		Code a verifier
-	 *		@param	Societe		$soc		Objet societe
-	 *		@param  int		  	$type   	0 = customer/prospect , 1 = supplier
-	 *		@return	int						0 if available, <0 if KO
-	 */
-	function verif_dispo($db, $code, $soc, $type=0)
-	{
+    /**
+     *		Renvoi si un code est pris ou non (par autre tiers)
+     *
+     *		@param	DoliDB		$db			Handler acces base
+     *		@param	string		$code		Code a verifier
+     *		@param	Societe		$soc		Objet societe
+     *		@param  int		  	$type   	0 = customer/prospect , 1 = supplier
+     *		@return	int						0 if available, <0 if KO
+     */
+    function verif_dispo($db, $code, $soc, $type=0)
+    {
         // phpcs:enable
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
-		if ($type == 1) $sql.= " WHERE code_fournisseur = '".$code."'";
-		else $sql.= " WHERE code_client = '".$code."'";
-		if ($soc->id > 0) $sql.= " AND rowid <> ".$soc->id;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			if ($db->num_rows($resql) == 0)
-			{
-				return 0;
-			}
-			else
-			{
-				return -1;
-			}
-		}
-		else
-		{
-			return -2;
-		}
-	}
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
+        if ($type == 1) $sql.= " WHERE code_fournisseur = '".$code."'";
+        else $sql.= " WHERE code_client = '".$code."'";
+        if ($soc->id > 0) $sql.= " AND rowid <> ".$soc->id;
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            if ($db->num_rows($resql) == 0)
+            {
+                return 0;
+            }
+            else
+            {
+                return -1;
+            }
+        }
+        else
+        {
+            return -2;
+        }
+    }
 }

dolibarr/htdocs/core/modules/societe/mod_codeclient_monkey.php

Indentation +230 added lines, -230 removed lines

@@ -32,259 +32,259 @@
  */
 class mod_codeclient_monkey extends ModeleThirdPartyCode
 {
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Monkey';
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see name
+     */
+    public $nom='Monkey';
 
-	/**
-	 * @var string model name
-	 */
-	public $name='Monkey';
+    /**
+     * @var string model name
+     */
+    public $name='Monkey';
 
-	public $code_modifiable;				// Code modifiable
+    public $code_modifiable;				// Code modifiable
 
-	public $code_modifiable_invalide;		// Code modifiable si il est invalide
+    public $code_modifiable_invalide;		// Code modifiable si il est invalide
 
-	public $code_modifiable_null;			// Code modifiables si il est null
+    public $code_modifiable_null;			// Code modifiables si il est null
 
-	public $code_null;						// Code facultatif
+    public $code_null;						// Code facultatif
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';	    	// 'development', 'experimental', 'dolibarr'
-
-	public $code_auto;                     // Numerotation automatique
-
-	public $prefixcustomer='CU';
-
-	public $prefixsupplier='SU';
-
-	public $prefixIsRequired; // Le champ prefix du tiers doit etre renseigne quand on utilise {pre}
-
-
-	/**
-	 * 	Constructor
-	 */
-	function __construct()
-	{
-		$this->nom = "Monkey";
-		$this->name = "Monkey";
-		$this->version = "dolibarr";
-		$this->code_null = 1;
-		$this->code_modifiable = 1;
-		$this->code_modifiable_invalide = 1;
-		$this->code_modifiable_null = 1;
-		$this->code_auto = 1;
-		$this->prefixIsRequired = 0;
-	}
-
-
-	/**		Return description of module
-	 *
-	 * 		@param	Translate	$langs	Object langs
-	 * 		@return string      		Description of module
-	 */
-	function info($langs)
-	{
-		return $langs->trans("MonkeyNumRefModelDesc",$this->prefixcustomer,$this->prefixsupplier);
-	}
-
-
-	/**
-	 * Return an example of result returned by getNextValue
-	 *
-	 * @param	Translate	$langs		Object langs
-	 * @param	societe		$objsoc		Object thirdparty
-	 * @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)
-	{
-		return $this->prefixcustomer.'0901-00001<br>'.$this->prefixsupplier.'0901-00001';
-	}
-
-
-	/**
-	 *  Return next value
-	 *
-	 * 	@param	Societe		$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
-	 */
-	function getNextValue($objsoc=0,$type=-1)
-	{
-		global $db, $conf, $mc;
-
-		$field='';
+    public $version = 'dolibarr';	    	// 'development', 'experimental', 'dolibarr'
+
+    public $code_auto;                     // Numerotation automatique
+
+    public $prefixcustomer='CU';
+
+    public $prefixsupplier='SU';
+
+    public $prefixIsRequired; // Le champ prefix du tiers doit etre renseigne quand on utilise {pre}
+
+
+    /**
+     * 	Constructor
+     */
+    function __construct()
+    {
+        $this->nom = "Monkey";
+        $this->name = "Monkey";
+        $this->version = "dolibarr";
+        $this->code_null = 1;
+        $this->code_modifiable = 1;
+        $this->code_modifiable_invalide = 1;
+        $this->code_modifiable_null = 1;
+        $this->code_auto = 1;
+        $this->prefixIsRequired = 0;
+    }
+
+
+    /**		Return description of module
+     *
+     * 		@param	Translate	$langs	Object langs
+     * 		@return string      		Description of module
+     */
+    function info($langs)
+    {
+        return $langs->trans("MonkeyNumRefModelDesc",$this->prefixcustomer,$this->prefixsupplier);
+    }
+
+
+    /**
+     * Return an example of result returned by getNextValue
+     *
+     * @param	Translate	$langs		Object langs
+     * @param	societe		$objsoc		Object thirdparty
+     * @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)
+    {
+        return $this->prefixcustomer.'0901-00001<br>'.$this->prefixsupplier.'0901-00001';
+    }
+
+
+    /**
+     *  Return next value
+     *
+     * 	@param	Societe		$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
+     */
+    function getNextValue($objsoc=0,$type=-1)
+    {
+        global $db, $conf, $mc;
+
+        $field='';
         $prefix = '';
-		if ($type == 0) {
-			$field = 'code_client';
+        if ($type == 0) {
+            $field = 'code_client';
             $prefix = $this->prefixcustomer;
-		} elseif ($type == 1) {
-			$field = 'code_fournisseur';
+        } elseif ($type == 1) {
+            $field = 'code_fournisseur';
             $prefix = $this->prefixsupplier;
-		} else {
+        } else {
             return -1;
         }
 
         // D'abord on recupere la valeur max (reponse immediate car champ indexe)
-		$posindice=8;
+        $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);
-		if ($resql)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
-		{
-			return -1;
-		}
-
-		$date	= dol_now();
-		$yymm	= strftime("%y%m",$date);
-
-		if ($max >= (pow(10, 5) - 1)) $num=$max+1;	// If counter > 99999, we do not format on 5 chars, we take number as it is
-		else $num = sprintf("%05s",$max+1);
-
-		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
-		return $prefix.$yymm."-".$num;
-	}
-
-
-	/**
-	 * 	Check validity of code according to its rules
-	 *
-	 *	@param	DoliDB		$db		Database handler
-	 *	@param	string		$code	Code to check/correct
-	 *	@param	Societe		$soc	Object third party
-	 *  @param  int		  	$type   0 = customer/prospect , 1 = supplier
-	 *  @return int					0 if OK
-	 * 								-1 ErrorBadCustomerCodeSyntax
-	 * 								-2 ErrorCustomerCodeRequired
-	 * 								-3 ErrorCustomerCodeAlreadyUsed
-	 * 								-4 ErrorPrefixRequired
-	 */
-	function verif($db, &$code, $soc, $type)
-	{
-		global $conf;
-
-		$result=0;
-		$code = strtoupper(trim($code));
-
-		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)) )
-		{
-			$result=-2;
-		}
-		else
-		{
-			if ($this->verif_syntax($code) >= 0)
-			{
-				$is_dispo = $this->verif_dispo($db, $code, $soc, $type);
-				if ($is_dispo <> 0)
-				{
-					$result=-3;
-				}
-				else
-				{
-					$result=0;
-				}
-			}
-			else
-			{
-				if (dol_strlen($code) == 0)
-				{
-					$result=-2;
-				}
-				else
-				{
-					$result=-1;
-				}
-			}
-		}
-
-		dol_syslog(get_class($this)."::verif code=".$code." type=".$type." result=".$result);
-		return $result;
-	}
+        $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);
+        if ($resql)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj) $max = intval($obj->max);
+            else $max=0;
+        }
+        else
+        {
+            return -1;
+        }
+
+        $date	= dol_now();
+        $yymm	= strftime("%y%m",$date);
+
+        if ($max >= (pow(10, 5) - 1)) $num=$max+1;	// If counter > 99999, we do not format on 5 chars, we take number as it is
+        else $num = sprintf("%05s",$max+1);
+
+        dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
+        return $prefix.$yymm."-".$num;
+    }
+
+
+    /**
+     * 	Check validity of code according to its rules
+     *
+     *	@param	DoliDB		$db		Database handler
+     *	@param	string		$code	Code to check/correct
+     *	@param	Societe		$soc	Object third party
+     *  @param  int		  	$type   0 = customer/prospect , 1 = supplier
+     *  @return int					0 if OK
+     * 								-1 ErrorBadCustomerCodeSyntax
+     * 								-2 ErrorCustomerCodeRequired
+     * 								-3 ErrorCustomerCodeAlreadyUsed
+     * 								-4 ErrorPrefixRequired
+     */
+    function verif($db, &$code, $soc, $type)
+    {
+        global $conf;
+
+        $result=0;
+        $code = strtoupper(trim($code));
+
+        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)) )
+        {
+            $result=-2;
+        }
+        else
+        {
+            if ($this->verif_syntax($code) >= 0)
+            {
+                $is_dispo = $this->verif_dispo($db, $code, $soc, $type);
+                if ($is_dispo <> 0)
+                {
+                    $result=-3;
+                }
+                else
+                {
+                    $result=0;
+                }
+            }
+            else
+            {
+                if (dol_strlen($code) == 0)
+                {
+                    $result=-2;
+                }
+                else
+                {
+                    $result=-1;
+                }
+            }
+        }
+
+        dol_syslog(get_class($this)."::verif code=".$code." type=".$type." result=".$result);
+        return $result;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *		Renvoi si un code est pris ou non (par autre tiers)
-	 *
-	 *		@param	DoliDB		$db			Handler acces base
-	 *		@param	string		$code		Code a verifier
-	 *		@param	Societe		$soc		Objet societe
-	 *		@param  int		  	$type   	0 = customer/prospect , 1 = supplier
-	 *		@return	int						0 if available, <0 if KO
-	 */
-	function verif_dispo($db, $code, $soc, $type=0)
-	{
+    /**
+     *		Renvoi si un code est pris ou non (par autre tiers)
+     *
+     *		@param	DoliDB		$db			Handler acces base
+     *		@param	string		$code		Code a verifier
+     *		@param	Societe		$soc		Objet societe
+     *		@param  int		  	$type   	0 = customer/prospect , 1 = supplier
+     *		@return	int						0 if available, <0 if KO
+     */
+    function verif_dispo($db, $code, $soc, $type=0)
+    {
         // phpcs:enable
-		global $conf, $mc;
-
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
-		if ($type == 1) $sql.= " WHERE code_fournisseur = '".$code."'";
-		else $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);
-		if ($resql)
-		{
-			if ($db->num_rows($resql) == 0)
-			{
-				return 0;
-			}
-			else
-			{
-				return -1;
-			}
-		}
-		else
-		{
-			return -2;
-		}
-	}
+        global $conf, $mc;
+
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
+        if ($type == 1) $sql.= " WHERE code_fournisseur = '".$code."'";
+        else $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);
+        if ($resql)
+        {
+            if ($db->num_rows($resql) == 0)
+            {
+                return 0;
+            }
+            else
+            {
+                return -1;
+            }
+        }
+        else
+        {
+            return -2;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Renvoi si un code respecte la syntaxe
-	 *
-	 *	@param	string		$code		Code a verifier
-	 *	@return	int						0 si OK, <0 si KO
-	 */
-	function verif_syntax($code)
-	{
+    /**
+     *	Renvoi si un code respecte la syntaxe
+     *
+     *	@param	string		$code		Code a verifier
+     *	@return	int						0 si OK, <0 si KO
+     */
+    function verif_syntax($code)
+    {
         // phpcs:enable
-		$res = 0;
-
-		if (dol_strlen($code) < 11)
-		{
-			$res = -1;
-		}
-		else
-		{
-			$res = 0;
-		}
-		return $res;
-	}
+        $res = 0;
+
+        if (dol_strlen($code) < 11)
+        {
+            $res = -1;
+        }
+        else
+        {
+            $res = 0;
+        }
+        return $res;
+    }
 }

dolibarr/htdocs/core/modules/societe/mod_codecompta_panicum.php

Indentation +57 added lines, -57 removed lines

@@ -30,76 +30,76 @@
  */
 class mod_codecompta_panicum extends ModeleAccountancyCode
 {
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Panicum';
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see name
+     */
+    public $nom='Panicum';
 
-	/**
-	 * @var string model name
-	 */
-	public $name='Panicum';
+    /**
+     * @var string model name
+     */
+    public $name='Panicum';
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';        // 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr';        // 'development', 'experimental', 'dolibarr'
 
 
-	/**
-	 * 	Constructor
-	 */
-	function __construct()
-	{
-	}
+    /**
+     * 	Constructor
+     */
+    function __construct()
+    {
+    }
 
 
-	/**
-	 * Return description of module
-	 *
-	 * @param	Translate	$langs	Object langs
-	 * @return 	string      		Description of module
-	 */
-	function info($langs)
-	{
-		return $langs->trans("ModuleCompanyCode".$this->name);
-	}
+    /**
+     * Return description of module
+     *
+     * @param	Translate	$langs	Object langs
+     * @return 	string      		Description of module
+     */
+    function info($langs)
+    {
+        return $langs->trans("ModuleCompanyCode".$this->name);
+    }
 
-	/**
-	 *  Return an example of result returned by getNextValue
-	 *
-	 *  @param	Translate	$langs		Object langs
-	 *  @param	Societe		$objsoc		Object thirdparty
-	 *  @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
-	 *  @return	string					Example
-	 */
-	function getExample($langs,$objsoc=0,$type=-1)
-	{
-		return '';
-	}
+    /**
+     *  Return an example of result returned by getNextValue
+     *
+     *  @param	Translate	$langs		Object langs
+     *  @param	Societe		$objsoc		Object thirdparty
+     *  @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+     *  @return	string					Example
+     */
+    function getExample($langs,$objsoc=0,$type=-1)
+    {
+        return '';
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Set accountancy account code for a third party into this->code
-	 *
-	 *  @param	DoliDB	$db              Database handler
-	 *  @param  Societe	$societe         Third party object
-	 *  @param  int		$type			'customer' or 'supplier'
-	 *  @return	int						>=0 if OK, <0 if KO
-	 */
-	function get_code($db, $societe, $type='')
-	{
+    /**
+     *  Set accountancy account code for a third party into this->code
+     *
+     *  @param	DoliDB	$db              Database handler
+     *  @param  Societe	$societe         Third party object
+     *  @param  int		$type			'customer' or 'supplier'
+     *  @return	int						>=0 if OK, <0 if KO
+     */
+    function get_code($db, $societe, $type='')
+    {
         // phpcs:enable
-		$this->code='';
+        $this->code='';
 
-		if (is_object($societe)) {
-			if ($type == 'supplier') $this->code = (! empty($societe->code_compta_fournisseur)?$societe->code_compta_fournisseur:'');
-			else $this->code = (! empty($societe->code_compta)?$societe->code_compta:'');
-		}
+        if (is_object($societe)) {
+            if ($type == 'supplier') $this->code = (! empty($societe->code_compta_fournisseur)?$societe->code_compta_fournisseur:'');
+            else $this->code = (! empty($societe->code_compta)?$societe->code_compta:'');
+        }
 
-		return 0; // return ok
-	}
+        return 0; // return ok
+    }
 }

dolibarr/htdocs/core/modules/societe/mod_codeclient_leopard.php

Indentation +89 added lines, -89 removed lines

@@ -31,112 +31,112 @@
  */
 class mod_codeclient_leopard extends ModeleThirdPartyCode
 {
-	/*
+    /*
 	 * Attention ce module est utilise par defaut si aucun module n'a
 	 * ete definit dans la configuration
 	 *
 	 * Le fonctionnement de celui-ci doit donc rester le plus ouvert possible
 	 */
 
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Leopard';
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see name
+     */
+    public $nom='Leopard';
 
-	/**
-	 * @var string model name
-	 */
-	public $name='Leopard';
+    /**
+     * @var string model name
+     */
+    public $name='Leopard';
 
-	public $code_modifiable;				// Code modifiable
+    public $code_modifiable;				// Code modifiable
 
-	public $code_modifiable_invalide;		// Code modifiable si il est invalide
+    public $code_modifiable_invalide;		// Code modifiable si il est invalide
 
-	public $code_modifiable_null;			// Code modifiables si il est null
+    public $code_modifiable_null;			// Code modifiables si il est null
 
-	public $code_null;						// Code facultatif
+    public $code_null;						// Code facultatif
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';    		// 'development', 'experimental', 'dolibarr'
-
-	public $code_auto; 	                // Numerotation automatique
-
+    public $version = 'dolibarr';    		// 'development', 'experimental', 'dolibarr'
 
-	/**
-	 *	Constructor
-	 */
-	function __construct()
-	{
-		$this->code_null = 1;
-		$this->code_modifiable = 1;
-		$this->code_modifiable_invalide = 1;
-		$this->code_modifiable_null = 1;
-		$this->code_auto = 0;
-	}
-
-
-	/**		Return description of module
-	 *
-	 * 		@param	Translate	$langs	Object langs
-	 * 		@return string      		Description of module
-	 */
-	function info($langs)
-	{
-		$langs->load("companies");
-		return $langs->trans("LeopardNumRefModelDesc");
-	}
+    public $code_auto; 	                // Numerotation automatique
 
 
-	/**
-	 * Return an example of result returned by getNextValue
-	 *
-	 * @param	societe		$objsoc		Object thirdparty
-	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
-	 * @return	string					Return next value
-	 */
-	function getNextValue($objsoc=0,$type=-1)
-	{
-		global $langs;
-		return '';
-	}
-
-
-	/**
-	 * 	Check validity of code according to its rules
-	 *
-	 *	@param	DoliDB		$db		Database handler
-	 *	@param	string		$code	Code to check/correct
-	 *	@param	Societe		$soc	Object third party
-	 *  @param  int		  	$type   0 = customer/prospect , 1 = supplier
-	 *  @return int					0 if OK
-	 * 								-1 ErrorBadCustomerCodeSyntax
-	 * 								-2 ErrorCustomerCodeRequired
-	 * 								-3 ErrorCustomerCodeAlreadyUsed
-	 * 								-4 ErrorPrefixRequired
-	 */
-	function verif($db, &$code, $soc, $type)
-	{
-		global $conf;
-
-		$result=0;
-		$code = trim($code);
-
-		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)) )
-		{
-			$result=-2;
-		}
-
-		dol_syslog(get_class($this)."::verif type=".$type." result=".$result);
-		return $result;
-	}
+    /**
+     *	Constructor
+     */
+    function __construct()
+    {
+        $this->code_null = 1;
+        $this->code_modifiable = 1;
+        $this->code_modifiable_invalide = 1;
+        $this->code_modifiable_null = 1;
+        $this->code_auto = 0;
+    }
+
+
+    /**		Return description of module
+     *
+     * 		@param	Translate	$langs	Object langs
+     * 		@return string      		Description of module
+     */
+    function info($langs)
+    {
+        $langs->load("companies");
+        return $langs->trans("LeopardNumRefModelDesc");
+    }
+
+
+    /**
+     * Return an example of result returned by getNextValue
+     *
+     * @param	societe		$objsoc		Object thirdparty
+     * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+     * @return	string					Return next value
+     */
+    function getNextValue($objsoc=0,$type=-1)
+    {
+        global $langs;
+        return '';
+    }
+
+
+    /**
+     * 	Check validity of code according to its rules
+     *
+     *	@param	DoliDB		$db		Database handler
+     *	@param	string		$code	Code to check/correct
+     *	@param	Societe		$soc	Object third party
+     *  @param  int		  	$type   0 = customer/prospect , 1 = supplier
+     *  @return int					0 if OK
+     * 								-1 ErrorBadCustomerCodeSyntax
+     * 								-2 ErrorCustomerCodeRequired
+     * 								-3 ErrorCustomerCodeAlreadyUsed
+     * 								-4 ErrorPrefixRequired
+     */
+    function verif($db, &$code, $soc, $type)
+    {
+        global $conf;
+
+        $result=0;
+        $code = trim($code);
+
+        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)) )
+        {
+            $result=-2;
+        }
+
+        dol_syslog(get_class($this)."::verif type=".$type." result=".$result);
+        return $result;
+    }
 }
 

dolibarr/htdocs/core/modules/societe/mod_codecompta_aquarium.php

Indentation +177 added lines, -177 removed lines

@@ -31,201 +31,201 @@
  */
 class mod_codecompta_aquarium extends ModeleAccountancyCode
 {
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Aquarium';
-
-	/**
-	 * @var string model name
-	 */
-	public $name='Aquarium';
-
-	/**
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see name
+     */
+    public $nom='Aquarium';
+
+    /**
+     * @var string model name
+     */
+    public $name='Aquarium';
+
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';        // 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr';        // 'development', 'experimental', 'dolibarr'
 
-	public	$prefixcustomeraccountancycode;
+    public	$prefixcustomeraccountancycode;
 
-	public	$prefixsupplieraccountancycode;
+    public	$prefixsupplieraccountancycode;
 
 
-	/**
-	 * 	Constructor
-	 */
-	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';
+    /**
+     * 	Constructor
+     */
+    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;
-	}
+        $this->prefixcustomeraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
+        $this->prefixsupplieraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
+    }
 
 
-	/**
-	 * Return description of module
-	 *
-	 * @param	Translate	$langs		Object langs
-	 * @return	string   		   		Description of module
-	 */
-	function info($langs)
-	{
-	    global $conf;
-	    global $form;
+    /**
+     * Return description of module
+     *
+     * @param	Translate	$langs		Object langs
+     * @return	string   		   		Description of module
+     */
+    function info($langs)
+    {
+        global $conf;
+        global $form;
 
-		$langs->load("companies");
+        $langs->load("companies");
 
         $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>';
-		$texte.=$langs->trans("ModuleCompanyCodeCustomer".$this->name,$s2)."<br>\n";
-		$texte.=$langs->trans("ModuleCompanyCodeSupplier".$this->name,$s1)."<br>\n";
-		$texte.="<br>\n";
-		if (! isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || ! empty($conf->global->$conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_SPECIAL').' = '.yn(1)."<br>\n";
-		//if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."<br>\n";
-		if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))  $texte.=$langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX."<br>\n";
-		$texte.= '</td>';
-		$texte.= '<td align="left">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+        $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>';
+        $texte.=$langs->trans("ModuleCompanyCodeCustomer".$this->name,$s2)."<br>\n";
+        $texte.=$langs->trans("ModuleCompanyCodeSupplier".$this->name,$s1)."<br>\n";
+        $texte.="<br>\n";
+        if (! isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || ! empty($conf->global->$conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_SPECIAL').' = '.yn(1)."<br>\n";
+        //if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."<br>\n";
+        if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))  $texte.=$langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX."<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;
-	}
-
-	/**
-	 * Return an example of result returned by getNextValue
-	 *
-	 * @param	Translate	$langs		Object langs
-	 * @param	societe		$objsoc		Object thirdparty
-	 * @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)
-	{
-		$s='';
-		$s.=$this->prefixcustomeraccountancycode.'CUSTCODE';
-	    $s.="<br>\n";
-	    $s.=$this->prefixsupplieraccountancycode.'SUPPCODE';
-	    return $s;
-	}
+        return $texte;
+    }
+
+    /**
+     * Return an example of result returned by getNextValue
+     *
+     * @param	Translate	$langs		Object langs
+     * @param	societe		$objsoc		Object thirdparty
+     * @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)
+    {
+        $s='';
+        $s.=$this->prefixcustomeraccountancycode.'CUSTCODE';
+        $s.="<br>\n";
+        $s.=$this->prefixsupplieraccountancycode.'SUPPCODE';
+        return $s;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Set accountancy account code for a third party into this->code
-	 *
-	 *  @param	DoliDB		$db             Database handler
-	 *  @param  Societe		$societe        Third party object
-	 *  @param  string		$type			'customer' or 'supplier'
-	 *  @return	int							>=0 if OK, <0 if KO
-	 */
-	function get_code($db, $societe, $type='')
-	{
+    /**
+     *  Set accountancy account code for a third party into this->code
+     *
+     *  @param	DoliDB		$db             Database handler
+     *  @param  Societe		$societe        Third party object
+     *  @param  string		$type			'customer' or 'supplier'
+     *  @return	int							>=0 if OK, <0 if KO
+     */
+    function get_code($db, $societe, $type='')
+    {
         // phpcs:enable
-		global $conf;
-
-		$i = 0;
-		$this->db = $db;
-
-		dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(! empty($societe->name)?$societe->name:''));
-
-		// Regle gestion compte compta
-		if ($type == 'customer')
-		{
-			$codetouse=(! empty($societe->code_client)?$societe->code_client:'CUSTCODE');
-			$prefix = $this->prefixcustomeraccountancycode;
-		}
-		else if ($type == 'supplier')
-		{
-			$codetouse=(! empty($societe->code_fournisseur)?$societe->code_fournisseur:'SUPPCODE');
-			$prefix = $this->prefixsupplieraccountancycode;
-		}
-		else
-		{
-			$this->error = 'Bad value for parameter type';
-			return -1;
-		}
-
-		//$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
-
-		// Remove special char if COMPANY_AQUARIUM_REMOVE_SPECIAL is set to 1 or not set (default)
-		if (! isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || ! empty($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $codetouse=preg_replace('/([^a-z0-9])/i','',$codetouse);
-		// Remove special alpha if COMPANY_AQUARIUM_REMOVE_ALPHA is set to 1
-		if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA))   $codetouse=preg_replace('/([a-z])/i','',$codetouse);
-		// Apply a regex replacement pattern on code if COMPANY_AQUARIUM_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
-		if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))	// Example: $conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
-		{
-			$codetouse=preg_replace('/'.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX.'/','\1\2\3',$codetouse);
-		}
-
-		$codetouse=$prefix.strtoupper($codetouse);
-
-		$is_dispo = $this->verif($db, $codetouse, $societe, $type);
-		if (! $is_dispo)
-		{
-			$this->code=$codetouse;
-		}
-		else
-		{
-			// Pour retour
-			$this->code=$codetouse;
-		}
-		dol_syslog("mod_codecompta_aquarium::get_code found code=".$this->code);
-		return $is_dispo;
-	}
-
-
-	/**
-	 *  Return if a code is available
-	 *
-	 *	@param	DoliDB		$db			Database handler
-	 * 	@param	string		$code		Code of third party
-	 * 	@param	Societe		$societe	Object third party
-	 * 	@param	string		$type		'supplier' or 'customer'
-	 *	@return	int						0 if OK but not available, >0 if OK and available, <0 if KO
-	 */
-	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 ($resql)
-		{
-			if ($db->num_rows($resql) == 0)
-			{
-				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' available");
-				return 1;	// Dispo
-			}
-			else
-			{
-				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' not available");
-				return 0;	// Non dispo
-			}
-		}
-		else
-		{
-			$this->error=$db->error()." sql=".$sql;
-			return -1;		// Erreur
-		}
-	}
+        global $conf;
+
+        $i = 0;
+        $this->db = $db;
+
+        dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(! empty($societe->name)?$societe->name:''));
+
+        // Regle gestion compte compta
+        if ($type == 'customer')
+        {
+            $codetouse=(! empty($societe->code_client)?$societe->code_client:'CUSTCODE');
+            $prefix = $this->prefixcustomeraccountancycode;
+        }
+        else if ($type == 'supplier')
+        {
+            $codetouse=(! empty($societe->code_fournisseur)?$societe->code_fournisseur:'SUPPCODE');
+            $prefix = $this->prefixsupplieraccountancycode;
+        }
+        else
+        {
+            $this->error = 'Bad value for parameter type';
+            return -1;
+        }
+
+        //$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
+
+        // Remove special char if COMPANY_AQUARIUM_REMOVE_SPECIAL is set to 1 or not set (default)
+        if (! isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || ! empty($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $codetouse=preg_replace('/([^a-z0-9])/i','',$codetouse);
+        // Remove special alpha if COMPANY_AQUARIUM_REMOVE_ALPHA is set to 1
+        if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA))   $codetouse=preg_replace('/([a-z])/i','',$codetouse);
+        // Apply a regex replacement pattern on code if COMPANY_AQUARIUM_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
+        if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))	// Example: $conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
+        {
+            $codetouse=preg_replace('/'.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX.'/','\1\2\3',$codetouse);
+        }
+
+        $codetouse=$prefix.strtoupper($codetouse);
+
+        $is_dispo = $this->verif($db, $codetouse, $societe, $type);
+        if (! $is_dispo)
+        {
+            $this->code=$codetouse;
+        }
+        else
+        {
+            // Pour retour
+            $this->code=$codetouse;
+        }
+        dol_syslog("mod_codecompta_aquarium::get_code found code=".$this->code);
+        return $is_dispo;
+    }
+
+
+    /**
+     *  Return if a code is available
+     *
+     *	@param	DoliDB		$db			Database handler
+     * 	@param	string		$code		Code of third party
+     * 	@param	Societe		$societe	Object third party
+     * 	@param	string		$type		'supplier' or 'customer'
+     *	@return	int						0 if OK but not available, >0 if OK and available, <0 if KO
+     */
+    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 ($resql)
+        {
+            if ($db->num_rows($resql) == 0)
+            {
+                dol_syslog("mod_codecompta_aquarium::verif code '".$code."' available");
+                return 1;	// Dispo
+            }
+            else
+            {
+                dol_syslog("mod_codecompta_aquarium::verif code '".$code."' not available");
+                return 0;	// Non dispo
+            }
+        }
+        else
+        {
+            $this->error=$db->error()." sql=".$sql;
+            return -1;		// Erreur
+        }
+    }
 }

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

Indentation +210 added lines, -210 removed lines

@@ -37,224 +37,224 @@
 class modSupplierProposal extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf;
-
-		$this->db = $db;
-		$this->numero = 1120;
-
-		$this->family = "srm";
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "supplier_proposalDESC";
-
-		$this->version = 'dolibarr';
-
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='supplier_proposal';
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf;
+
+        $this->db = $db;
+        $this->numero = 1120;
+
+        $this->family = "srm";
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "supplier_proposalDESC";
+
+        $this->version = 'dolibarr';
+
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='supplier_proposal';
         
-		// Data directories to create when module is enabled.
-		$this->dirs = array();
+        // Data directories to create when module is enabled.
+        $this->dirs = array();
 		
-		 // Config pages. Put here list of php page names stored in admin directory used to setup module.
+            // Config pages. Put here list of php page names stored in admin directory used to setup module.
         $this->config_page_url = array("supplier_proposal.php");
 
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array('modFournisseur');		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-		$this->langfiles = array("supplier_proposal");
-
-		// Constants
-		$this->const = array();
-		$r=0;
-
-		$this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON_PDF";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "aurore";
-		$this->const[$r][3] = 'Name of submodule to generate PDF for supplier quotation request';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "mod_supplier_proposal_marbre";
-		$this->const[$r][3] = 'Name of submodule to number supplier quotation request';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/supplier_proposal";
-		$this->const[$r][3] = "";
-		$this->const[$r][4] = 0;
-
-		// Boxes
-		$this->boxes = array();
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'supplier_proposal';
-		$r=0;
-
-		$r++;
-		$this->rights[$r][0] = $this->numero + $r; // id de la permission
-		$this->rights[$r][1] = 'Read supplier proposals'; // libelle de la permission
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'lire';
-
-		$r++;
-		$this->rights[$r][0] = $this->numero + $r; // id de la permission
-		$this->rights[$r][1] = 'Create/modify supplier proposals'; // libelle de la permission
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'creer';
-
-		$r++;
-		$this->rights[$r][0] = $this->numero + $r; // id de la permission
-		$this->rights[$r][1] = 'Validate supplier proposals'; // libelle de la permission
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'validate_advance';
-
-		$r++;
-		$this->rights[$r][0] = $this->numero + $r; // id de la permission
-		$this->rights[$r][1] = 'Envoyer les demandes fournisseurs'; // libelle de la permission
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array('modFournisseur');		// List of module class names as string that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of module ids to disable if this one is disabled
+        $this->conflictwith = array();	// List of module class names as string this module is in conflict with
+        $this->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $this->langfiles = array("supplier_proposal");
+
+        // Constants
+        $this->const = array();
+        $r=0;
+
+        $this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON_PDF";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "aurore";
+        $this->const[$r][3] = 'Name of submodule to generate PDF for supplier quotation request';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "mod_supplier_proposal_marbre";
+        $this->const[$r][3] = 'Name of submodule to number supplier quotation request';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/supplier_proposal";
+        $this->const[$r][3] = "";
+        $this->const[$r][4] = 0;
+
+        // Boxes
+        $this->boxes = array();
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'supplier_proposal';
+        $r=0;
+
+        $r++;
+        $this->rights[$r][0] = $this->numero + $r; // id de la permission
+        $this->rights[$r][1] = 'Read supplier proposals'; // libelle de la permission
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'lire';
+
+        $r++;
+        $this->rights[$r][0] = $this->numero + $r; // id de la permission
+        $this->rights[$r][1] = 'Create/modify supplier proposals'; // libelle de la permission
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'creer';
+
+        $r++;
+        $this->rights[$r][0] = $this->numero + $r; // id de la permission
+        $this->rights[$r][1] = 'Validate supplier proposals'; // libelle de la permission
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'validate_advance';
+
+        $r++;
+        $this->rights[$r][0] = $this->numero + $r; // id de la permission
+        $this->rights[$r][1] = 'Envoyer les demandes fournisseurs'; // libelle de la permission
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
         $this->rights[$r][4] = 'send_advance';
 
-		$r++;
-		$this->rights[$r][0] = $this->numero + $r; // id de la permission
-		$this->rights[$r][1] = 'Delete supplier proposals'; // libelle de la permission
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'supprimer';
-
-		$r++;
-		$this->rights[$r][0] = $this->numero + $r; // id de la permission
-		$this->rights[$r][1] = 'Close supplier price requests'; // libelle de la permission
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'cloturer';
-
- 		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
-		$this->menu[$r]=array(
-			'fk_menu'=>'fk_mainmenu=commercial',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',			                // This is a Left menu entry
-			'titre'=>'SupplierProposalsShort',
-			'leftmenu'=>'supplier_proposalsubmenu',
-			'url'=>'/supplier_proposal/index.php',
-			'langs'=>'supplier_proposal',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'enabled'=>'$conf->supplier_proposal->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->supplier_proposal->lire',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+        $r++;
+        $this->rights[$r][0] = $this->numero + $r; // id de la permission
+        $this->rights[$r][1] = 'Delete supplier proposals'; // libelle de la permission
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'supprimer';
+
+        $r++;
+        $this->rights[$r][0] = $this->numero + $r; // id de la permission
+        $this->rights[$r][1] = 'Close supplier price requests'; // libelle de la permission
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'cloturer';
+
+            // Main menu entries
+        $this->menu = array();			// List of menus to add
+        $r=0;
+        $this->menu[$r]=array(
+            'fk_menu'=>'fk_mainmenu=commercial',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+            'type'=>'left',			                // This is a Left menu entry
+            'titre'=>'SupplierProposalsShort',
+            'leftmenu'=>'supplier_proposalsubmenu',
+            'url'=>'/supplier_proposal/index.php',
+            'langs'=>'supplier_proposal',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'enabled'=>'$conf->supplier_proposal->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+            'perms'=>'$user->rights->supplier_proposal->lire',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+            'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
             'position'=>300
-		);
-		$r++;
-
-		$this->menu[$r]=array(
-			'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
-			'type'=>'left',
-			'titre'=>'SupplierProposalNew',
-			'url'=>'/supplier_proposal/card.php?action=create&leftmenu=supplier_proposals',
-			'langs'=>'supplier_proposal',
-			'enabled'=>'$conf->supplier_proposal->enabled',
-			'perms'=>'$user->rights->supplier_proposal->creer',
-			'user'=>2,
+        );
+        $r++;
+
+        $this->menu[$r]=array(
+            'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
+            'type'=>'left',
+            'titre'=>'SupplierProposalNew',
+            'url'=>'/supplier_proposal/card.php?action=create&leftmenu=supplier_proposals',
+            'langs'=>'supplier_proposal',
+            'enabled'=>'$conf->supplier_proposal->enabled',
+            'perms'=>'$user->rights->supplier_proposal->creer',
+            'user'=>2,
             'position'=>301
-		);
-		$r++;
-
-		$this->menu[$r]=array(
-			'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
-			'type'=>'left',
-			'titre'=>'List',
-			'url'=>'/supplier_proposal/list.php?leftmenu=supplier_proposals',
-			'langs'=>'supplier_proposal',
-			'enabled'=>'$conf->supplier_proposal->enabled',
-			'perms'=>'$user->rights->supplier_proposal->lire',
-			'user'=>2,
+        );
+        $r++;
+
+        $this->menu[$r]=array(
+            'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
+            'type'=>'left',
+            'titre'=>'List',
+            'url'=>'/supplier_proposal/list.php?leftmenu=supplier_proposals',
+            'langs'=>'supplier_proposal',
+            'enabled'=>'$conf->supplier_proposal->enabled',
+            'perms'=>'$user->rights->supplier_proposal->lire',
+            'user'=>2,
             'position'=>302
-		);
-		$r++;
-
-		$this->menu[$r]=array(
-		    'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
-		    'type'=>'left',
-		    'titre'=>'Statistics',
-		    'url'=>'/comm/propal/stats/index.php?leftmenu=supplier_proposals&mode=supplier',
-		    'langs'=>'supplier_proposal',
-		    'enabled'=>'$conf->supplier_proposal->enabled',
-		    'perms'=>'$user->rights->supplier_proposal->lire',
-		    'user'=>2,
-		    'position'=>303
-		);
-		$r++;
-	}
-
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
+        );
+        $r++;
+
+        $this->menu[$r]=array(
+            'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
+            'type'=>'left',
+            'titre'=>'Statistics',
+            'url'=>'/comm/propal/stats/index.php?leftmenu=supplier_proposals&mode=supplier',
+            'langs'=>'supplier_proposal',
+            'enabled'=>'$conf->supplier_proposal->enabled',
+            'perms'=>'$user->rights->supplier_proposal->lire',
+            'user'=>2,
+            'position'=>303
+        );
+        $r++;
+    }
+
+
+    /**
+     *		Function called when module is enabled.
+     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *		It also creates data directories
+     *
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		global $conf,$langs;
-
-		// Remove permissions and default values
-		$this->remove($options);
-
-		//ODT template
-		$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/supplier_proposal/template_supplier_proposal.odt';
-		$dirodt=DOL_DATA_ROOT.'/doctemplates/supplier_proposal';
-		$dest=$dirodt.'/template_supplier_proposal.odt';
-
-		if (file_exists($src) && ! file_exists($dest))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			dol_mkdir($dirodt);
-			$result=dol_copy($src,$dest,0,0);
-			if ($result < 0)
-			{
-				$langs->load("errors");
-				$this->error=$langs->trans('ErrorFailToCopyFile',$src,$dest);
-				return 0;
-			}
-		}
-
-		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'supplier_proposal' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','supplier_proposal',".$conf->entity.")",
-		);
-
-		return $this->_init($sql, $options);
-	}
-
-
-
-	/**
-	 * Function called when module is disabled.
-	 * Remove from database constants, boxes and permissions from Dolibarr database.
-	 * Data directories are not deleted
-	 *
-	 * @param      string	$options    Options when enabling module ('', 'noboxes')
-	 * @return     int             	1 if OK, 0 if KO
-	 */
-	public function remove($options = '')
-	{
-	    $sql = array(
-	        "DELETE FROM ".MAIN_DB_PREFIX."rights_def WHERE module = 'askpricesupplier'"		// To delete/clean deprecated entries
-	    );
-
-	    return $this->_remove($sql, $options);
-	}
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        global $conf,$langs;
+
+        // Remove permissions and default values
+        $this->remove($options);
+
+        //ODT template
+        $src=DOL_DOCUMENT_ROOT.'/install/doctemplates/supplier_proposal/template_supplier_proposal.odt';
+        $dirodt=DOL_DATA_ROOT.'/doctemplates/supplier_proposal';
+        $dest=$dirodt.'/template_supplier_proposal.odt';
+
+        if (file_exists($src) && ! file_exists($dest))
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+            dol_mkdir($dirodt);
+            $result=dol_copy($src,$dest,0,0);
+            if ($result < 0)
+            {
+                $langs->load("errors");
+                $this->error=$langs->trans('ErrorFailToCopyFile',$src,$dest);
+                return 0;
+            }
+        }
+
+        $sql = array(
+                "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'supplier_proposal' AND entity = ".$conf->entity,
+                "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','supplier_proposal',".$conf->entity.")",
+        );
+
+        return $this->_init($sql, $options);
+    }
+
+
+
+    /**
+     * Function called when module is disabled.
+     * Remove from database constants, boxes and permissions from Dolibarr database.
+     * Data directories are not deleted
+     *
+     * @param      string	$options    Options when enabling module ('', 'noboxes')
+     * @return     int             	1 if OK, 0 if KO
+     */
+    public function remove($options = '')
+    {
+        $sql = array(
+            "DELETE FROM ".MAIN_DB_PREFIX."rights_def WHERE module = 'askpricesupplier'"		// To delete/clean deprecated entries
+        );
+
+        return $this->_remove($sql, $options);
+    }
 }
\ No newline at end of file

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

Indentation +191 added lines, -191 removed lines

@@ -31,197 +31,197 @@
  */
 class modExpenseReport extends DolibarrModules
 {
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param		Database	$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf;
-
-		$this->db = $db;
-		$this->numero = 770;
-
-		$this->family = "hr";
-		$this->module_position = '40';
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Manage and claim expense reports (transportation, meal, ...)";
-		$this->version = 'dolibarr';
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='trip';
-
-		// Data directories to create when module is enabled.
-		$this->dirs = array("/expensereport/temp");
-		$r=0;
-
-		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
-		$this->config_page_url = array('expensereport.php');
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		// $this->conflictwith = array("modDeplacement"); // Deactivate for access on old information
-		$this->requiredby = array();	// List of modules id to disable if this one is disabled
-		$this->phpmin = array(5,4);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,7);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("companies","trips");
-
-		// Constants
-		$this->const = array();			// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
-		$r=0;
-
-		$this->const[$r][0] = "EXPENSEREPORT_ADDON_PDF";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "standard";
-		$this->const[$r][3] = 'Name of manager to build PDF expense reports documents';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "EXPENSEREPORT_ADDON";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "mod_expensereport_jade";
-		$this->const[$r][3] = 'Name of manager to generate expense report ref number';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "MAIN_DELAY_EXPENSEREPORTS";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "15";
-		$this->const[$r][3] = 'Tolerance delay (in days) before alert for expense reports to approve';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "MAIN_DELAY_EXPENSEREPORTS_TO_PAY";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "15";
-		$this->const[$r][3] = 'Tolerance delay (in days) before alert for expense reports to pay';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		// Array to add new pages in new tabs
-		$this->tabs[] = array('data'=>'user:+expensereport:ExpenseReport:expensereport:$user->rights->expensereport->lire:/expensereport/list.php?mainmenu=hrm&id=__ID__');
-
-		// Boxes
-		$this->boxes = array();			// List of boxes
-		$r=0;
-
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$this->rights_class = 'expensereport';
-
-		$this->rights[$r][0] = 771;
-		$this->rights[$r][1] = 'Read expense reports (yours and your subordinates)';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'lire';
-		$r++;
-
-		$this->rights[$r][0] = 772;
-		$this->rights[$r][1] = 'Create/modify expense reports';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'creer';
-		$r++;
-
-		$this->rights[$r][0] = 773;
-		$this->rights[$r][1] = 'Delete expense reports';
-		$this->rights[$r][2] = 'd';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'supprimer';
-		$r++;
-
-		$this->rights[$r][0] = 775;
-		$this->rights[$r][1] = 'Approve expense reports';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'approve';
-		$r++;
-
-		$this->rights[$r][0] = 776;
-		$this->rights[$r][1] = 'Pay expense reports';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'to_paid';
-		$r++;
-
-		$this->rights[$r][0] = 777;
-		$this->rights[$r][1] = 'Read expense reports of everybody';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 1;
-		$this->rights[$r][4] = 'readall';
-		$r++;
-
-		$this->rights[$r][0] = 778;
-		$this->rights[$r][1] = 'Create expense reports for everybody';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'writeall_advance';
-		$r++;
-
-		$this->rights[$r][0] = 779;
-		$this->rights[$r][1] = 'Export expense reports';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'export';
-		$r++;
-
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
-		// Exports
-		$r=0;
-
-		$r++;
-		$this->export_code[$r]='expensereport_'.$r;
-		$this->export_label[$r]='ListTripsAndExpenses';
-		$this->export_icon[$r]='trip';
-		$this->export_permission[$r]=array(array("expensereport","export"));
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param		Database	$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf;
+
+        $this->db = $db;
+        $this->numero = 770;
+
+        $this->family = "hr";
+        $this->module_position = '40';
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+        $this->description = "Manage and claim expense reports (transportation, meal, ...)";
+        $this->version = 'dolibarr';
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='trip';
+
+        // Data directories to create when module is enabled.
+        $this->dirs = array("/expensereport/temp");
+        $r=0;
+
+        // Config pages. Put here list of php page names stored in admmin directory used to setup module.
+        $this->config_page_url = array('expensereport.php');
+
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
+        // $this->conflictwith = array("modDeplacement"); // Deactivate for access on old information
+        $this->requiredby = array();	// List of modules id to disable if this one is disabled
+        $this->phpmin = array(5,4);					// Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(3,7);	// Minimum version of Dolibarr required by module
+        $this->langfiles = array("companies","trips");
+
+        // Constants
+        $this->const = array();			// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
+        $r=0;
+
+        $this->const[$r][0] = "EXPENSEREPORT_ADDON_PDF";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "standard";
+        $this->const[$r][3] = 'Name of manager to build PDF expense reports documents';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "EXPENSEREPORT_ADDON";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "mod_expensereport_jade";
+        $this->const[$r][3] = 'Name of manager to generate expense report ref number';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "MAIN_DELAY_EXPENSEREPORTS";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "15";
+        $this->const[$r][3] = 'Tolerance delay (in days) before alert for expense reports to approve';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "MAIN_DELAY_EXPENSEREPORTS_TO_PAY";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "15";
+        $this->const[$r][3] = 'Tolerance delay (in days) before alert for expense reports to pay';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        // Array to add new pages in new tabs
+        $this->tabs[] = array('data'=>'user:+expensereport:ExpenseReport:expensereport:$user->rights->expensereport->lire:/expensereport/list.php?mainmenu=hrm&id=__ID__');
+
+        // Boxes
+        $this->boxes = array();			// List of boxes
+        $r=0;
+
+        // Permissions
+        $this->rights = array();		// Permission array used by this module
+        $this->rights_class = 'expensereport';
+
+        $this->rights[$r][0] = 771;
+        $this->rights[$r][1] = 'Read expense reports (yours and your subordinates)';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'lire';
+        $r++;
+
+        $this->rights[$r][0] = 772;
+        $this->rights[$r][1] = 'Create/modify expense reports';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'creer';
+        $r++;
+
+        $this->rights[$r][0] = 773;
+        $this->rights[$r][1] = 'Delete expense reports';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'supprimer';
+        $r++;
+
+        $this->rights[$r][0] = 775;
+        $this->rights[$r][1] = 'Approve expense reports';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'approve';
+        $r++;
+
+        $this->rights[$r][0] = 776;
+        $this->rights[$r][1] = 'Pay expense reports';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'to_paid';
+        $r++;
+
+        $this->rights[$r][0] = 777;
+        $this->rights[$r][1] = 'Read expense reports of everybody';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 1;
+        $this->rights[$r][4] = 'readall';
+        $r++;
+
+        $this->rights[$r][0] = 778;
+        $this->rights[$r][1] = 'Create expense reports for everybody';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'writeall_advance';
+        $r++;
+
+        $this->rights[$r][0] = 779;
+        $this->rights[$r][1] = 'Export expense reports';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'export';
+        $r++;
+
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+
+        // Exports
+        $r=0;
+
+        $r++;
+        $this->export_code[$r]='expensereport_'.$r;
+        $this->export_label[$r]='ListTripsAndExpenses';
+        $this->export_icon[$r]='trip';
+        $this->export_permission[$r]=array(array("expensereport","export"));
         $this->export_fields_array[$r]=array(
-			'd.rowid'=>"TripId",'d.ref'=>'Ref','d.date_debut'=>'DateStart','d.date_fin'=>'DateEnd','d.date_create'=>'DateCreation','d.date_approve'=>'DateApprove',
-			'd.total_ht'=>"TotalHT",'d.total_tva'=>'TotalVAT','d.total_ttc'=>'TotalTTC','d.note_private'=>'NotePrivate','d.note_public'=>'NotePublic',
-			'u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>"Login",'ed.rowid'=>'LineId','tf.code'=>'Type','ed.date'=>'Date','ed.tva_tx'=>'VATRate',
-			'ed.total_ht'=>'TotalHT','ed.total_tva'=>'TotalVAT','ed.total_ttc'=>'TotalTTC','ed.comments'=>'Comment','p.rowid'=>'ProjectId','p.ref'=>'Ref'
-		);
-		$this->export_entities_array[$r]=array(
-			'u.lastname'=>'user','u.firstname'=>'user','u.login'=>'user','ed.rowid'=>'expensereport_line','ed.date'=>'expensereport_line',
-			'ed.tva_tx'=>'expensereport_line','ed.total_ht'=>'expensereport_line','ed.total_tva'=>'expensereport_line','ed.total_ttc'=>'expensereport_line',
-			'ed.comments'=>'expensereport_line','tf.code'=>'expensereport_line','p.project_ref'=>'expensereport_line','p.rowid'=>'project','p.ref'=>'project'
-		);
+            'd.rowid'=>"TripId",'d.ref'=>'Ref','d.date_debut'=>'DateStart','d.date_fin'=>'DateEnd','d.date_create'=>'DateCreation','d.date_approve'=>'DateApprove',
+            'd.total_ht'=>"TotalHT",'d.total_tva'=>'TotalVAT','d.total_ttc'=>'TotalTTC','d.note_private'=>'NotePrivate','d.note_public'=>'NotePublic',
+            'u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>"Login",'ed.rowid'=>'LineId','tf.code'=>'Type','ed.date'=>'Date','ed.tva_tx'=>'VATRate',
+            'ed.total_ht'=>'TotalHT','ed.total_tva'=>'TotalVAT','ed.total_ttc'=>'TotalTTC','ed.comments'=>'Comment','p.rowid'=>'ProjectId','p.ref'=>'Ref'
+        );
+        $this->export_entities_array[$r]=array(
+            'u.lastname'=>'user','u.firstname'=>'user','u.login'=>'user','ed.rowid'=>'expensereport_line','ed.date'=>'expensereport_line',
+            'ed.tva_tx'=>'expensereport_line','ed.total_ht'=>'expensereport_line','ed.total_tva'=>'expensereport_line','ed.total_ttc'=>'expensereport_line',
+            'ed.comments'=>'expensereport_line','tf.code'=>'expensereport_line','p.project_ref'=>'expensereport_line','p.rowid'=>'project','p.ref'=>'project'
+        );
         $this->export_alias_array[$r]=array('d.rowid'=>"idtrip",'d.type'=>"type",'d.note_private'=>'note_private','d.note_public'=>'note_public','u.lastname'=>'name','u.firstname'=>'firstname','u.login'=>'login');
-		$this->export_dependencies_array[$r]=array('expensereport_line'=>'ed.rowid','type_fees'=>'tf.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'expensereport as d, '.MAIN_DB_PREFIX.'user as u,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expensereport_det as ed LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as tf ON ed.fk_c_type_fees = tf.id';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON ed.fk_projet = p.rowid';
-		$this->export_sql_end[$r] .=' WHERE ed.fk_expensereport = d.rowid AND d.fk_user_author = u.rowid';
-		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('expensereport').')';
-	}
-
-	/**
-	 *	Function called when module is enabled.
-	 *	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *	It also creates data directories.
-	 *
-	 *	@param		string	$options	Options
-	 *	@return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		global $conf;
-
-		// Remove permissions and default values
-		$this->remove($options);
-
-		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard' AND type='expensereport' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard','expensereport',".$conf->entity.")"
-		);
-
-		return $this->_init($sql,$options);
-	}
+        $this->export_dependencies_array[$r]=array('expensereport_line'=>'ed.rowid','type_fees'=>'tf.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'expensereport as d, '.MAIN_DB_PREFIX.'user as u,';
+        $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expensereport_det as ed LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as tf ON ed.fk_c_type_fees = tf.id';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON ed.fk_projet = p.rowid';
+        $this->export_sql_end[$r] .=' WHERE ed.fk_expensereport = d.rowid AND d.fk_user_author = u.rowid';
+        $this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('expensereport').')';
+    }
+
+    /**
+     *	Function called when module is enabled.
+     *	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *	It also creates data directories.
+     *
+     *	@param		string	$options	Options
+     *	@return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        global $conf;
+
+        // Remove permissions and default values
+        $this->remove($options);
+
+        $sql = array(
+                "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard' AND type='expensereport' AND entity = ".$conf->entity,
+                "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard','expensereport',".$conf->entity.")"
+        );
+
+        return $this->_init($sql,$options);
+    }
 }

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

Indentation +4 added lines, -4 removed lines

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