alxarafe / alixar

dolibarr/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php

Indentation +334 added lines, -334 removed lines

@@ -36,103 +36,103 @@ 
  */
 class doc_generic_odt extends ModeleThirdPartyDoc
 {
-	/**
-	 * Issuer
-	 * @var Societe
-	 */
-	public $emetteur;
+    /**
+     * Issuer
+     * @var Societe
+     */
+    public $emetteur;
 
-	/**
+    /**
      * @var array() Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.4 = array(5, 4)
+     * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 4);
+    public $phpmin = array(5, 4);
 
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $langs, $mysoc;
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $langs, $mysoc;
 
-		// Load translation files required by the page
+        // Load translation files required by the page
         $langs->loadLangs(array("main","companies"));
 
-		$this->db = $db;
-		$this->name = "ODT templates";
-		$this->description = $langs->trans("DocumentModelOdt");
-		$this->scandir = 'COMPANY_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
-
-		// Dimension page pour format A4
-		$this->type = 'odt';
-		$this->page_largeur = 0;
-		$this->page_hauteur = 0;
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=0;
-		$this->marge_droite=0;
-		$this->marge_haute=0;
-		$this->marge_basse=0;
-
-		$this->option_logo = 1;                    // Affiche logo
-
-		// Recupere emmetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // Par defaut, si n'etait pas defini
-	}
-
-
-	/**
-	 * Return description of a module
-	 *
-	 * @param	Translate	$langs		Object language
-	 * @return	string      			Description
-	 */
-	function info($langs)
-	{
-		global $conf,$langs;
-
-		// Load traductions files requiredby by page
-		$langs->loadLangs(array("companies", "errors"));
-
-		$form = new Form($this->db);
-
-		$texte = $this->description.".<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_ADDON_PDF_ODT_PATH">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		// List of directories area
-		$texte.= '<tr><td>';
-		$texttitle=$langs->trans("ListOfDirectories");
-		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->COMPANY_ADDON_PDF_ODT_PATH)));
-		$listoffiles=array();
-		foreach($listofdir as $key=>$tmpdir)
-		{
-			$tmpdir=trim($tmpdir);
-			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-			if (! $tmpdir) { unset($listofdir[$key]); continue; }
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
-			else
-			{
-				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0,true); // Disable hook for the moment
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
-			}
-		}
-		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
-		// Add list of substitution keys
-		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
-		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
-
-		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
+        $this->db = $db;
+        $this->name = "ODT templates";
+        $this->description = $langs->trans("DocumentModelOdt");
+        $this->scandir = 'COMPANY_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+
+        // Dimension page pour format A4
+        $this->type = 'odt';
+        $this->page_largeur = 0;
+        $this->page_hauteur = 0;
+        $this->format = array($this->page_largeur,$this->page_hauteur);
+        $this->marge_gauche=0;
+        $this->marge_droite=0;
+        $this->marge_haute=0;
+        $this->marge_basse=0;
+
+        $this->option_logo = 1;                    // Affiche logo
+
+        // Recupere emmetteur
+        $this->emetteur=$mysoc;
+        if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // Par defaut, si n'etait pas defini
+    }
+
+
+    /**
+     * Return description of a module
+     *
+     * @param	Translate	$langs		Object language
+     * @return	string      			Description
+     */
+    function info($langs)
+    {
+        global $conf,$langs;
+
+        // Load traductions files requiredby by page
+        $langs->loadLangs(array("companies", "errors"));
+
+        $form = new Form($this->db);
+
+        $texte = $this->description.".<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_ADDON_PDF_ODT_PATH">';
+        $texte.= '<table class="nobordernopadding" width="100%">';
+
+        // List of directories area
+        $texte.= '<tr><td>';
+        $texttitle=$langs->trans("ListOfDirectories");
+        $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->COMPANY_ADDON_PDF_ODT_PATH)));
+        $listoffiles=array();
+        foreach($listofdir as $key=>$tmpdir)
+        {
+            $tmpdir=trim($tmpdir);
+            $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+            if (! $tmpdir) { unset($listofdir[$key]); continue; }
+            if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+            else
+            {
+                $tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0,true); // Disable hook for the moment
+                if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+            }
+        }
+        $texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+        // Add list of substitution keys
+        $texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+        $texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
+
+        $texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
         $texte.= '<table><tr><td>';
-		$texte.= '<textarea class="flat" cols="60" name="value1">';
-		$texte.=$conf->global->COMPANY_ADDON_PDF_ODT_PATH;
-		$texte.= '</textarea>';
+        $texte.= '<textarea class="flat" cols="60" name="value1">';
+        $texte.=$conf->global->COMPANY_ADDON_PDF_ODT_PATH;
+        $texte.= '</textarea>';
         $texte.= '</td>';
         $texte.= '<td align="center">&nbsp; ';
         $texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
@@ -140,62 +140,62 @@ 
         $texte.= '</tr>';
         $texte.= '</table>';
 
-		// Scan directories
-		$nbofiles=count($listoffiles);
-		if (! empty($conf->global->COMPANY_ADDON_PDF_ODT_PATH))
-		{
-			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>';
-			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
-			$texte.=$nbofiles;
-			//$texte.=$nbofiles?'</a>':'';
-			$texte.='</b>';
-		}
-
-		if ($nbofiles)
-		{
-   			$texte.='<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach($listoffiles as $file)
-   			{
+        // Scan directories
+        $nbofiles=count($listoffiles);
+        if (! empty($conf->global->COMPANY_ADDON_PDF_ODT_PATH))
+        {
+            $texte.=$langs->trans("NumberOfModelFilesFound").': <b>';
+            //$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
+            $texte.=$nbofiles;
+            //$texte.=$nbofiles?'</a>':'';
+            $texte.='</b>';
+        }
+
+        if ($nbofiles)
+        {
+                $texte.='<div id="div_'.get_class($this).'" class="hidden">';
+                foreach($listoffiles as $file)
+                {
                 $texte.=$file['name'].'<br>';
-   			}
-   			$texte.='<div id="div_'.get_class($this).'">';
-		}
+                }
+                $texte.='<div id="div_'.get_class($this).'">';
+        }
 
-		$texte.= '</td>';
+        $texte.= '</td>';
 
-		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
-		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
-		$texte.= '</td>';
-		$texte.= '</tr>';
+        $texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+        $texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
+        $texte.= '</td>';
+        $texte.= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+        $texte.= '</table>';
+        $texte.= '</form>';
 
-		return $texte;
-	}
+        return $texte;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Function to build a document on disk using the generic odt module.
-	 *
-	 *	@param		Societe		$object				Object source to build document
-	 *	@param		Translate	$outputlangs		Lang output object
-	 * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
+    /**
+     *	Function to build a document on disk using the generic odt module.
+     *
+     *	@param		Societe		$object				Object source to build document
+     *	@param		Translate	$outputlangs		Lang output object
+     * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
      *  @param		int			$hidedetails		Do not show line details
      *  @param		int			$hidedesc			Do not show desc
      *  @param		int			$hideref			Do not show ref
-	 *	@return		int         					1 if OK, <=0 if KO
-	 */
-	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
-	{
+     *	@return		int         					1 if OK, <=0 if KO
+     */
+    function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+    {
         // phpcs:enable
-		global $user,$langs,$conf,$mysoc,$hookmanager;
+        global $user,$langs,$conf,$mysoc,$hookmanager;
 
-		if (empty($srctemplatepath))
-		{
-			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
-			return -1;
-		}
+        if (empty($srctemplatepath))
+        {
+            dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
+            return -1;
+        }
 
                 // Add odtgeneration hook
                 if (! is_object($hookmanager))
@@ -206,82 +206,82 @@ 
                 $hookmanager->initHooks(array('odtgeneration'));
                 global $action;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='UTF-8';
-
-		// Load translation files required by the page
-		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
-
-		if ($conf->societe->multidir_output[$object->entity])
-		{
-			$dir = $conf->societe->multidir_output[$object->entity];
-			$objectref = dol_sanitizeFileName($object->id);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
-
-			if (! file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-					return -1;
-				}
-			}
-
-			if (file_exists($dir))
-			{
-				//print "srctemplatepath=".$srctemplatepath;	// Src filename
-				$newfile=basename($srctemplatepath);
-				$newfiletmp=preg_replace('/\.od(s|t)/i','',$newfile);
-				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
-				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
-				// Get extension (ods or odt)
-				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
-				if ( ! empty($conf->global->MAIN_DOC_USE_OBJECT_THIRDPARTY_NAME))
-				{
-				    $newfiletmp = dol_sanitizeFileName(dol_string_nospecial($object->name)).'-'.$newfiletmp;
-				}
-				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
-				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
-					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
-				}
-				else
-				{
-					$filename=$newfiletmp.'.'.$newfileformat;
-				}
-				$file=$dir.'/'.$filename;
-				$object->builddoc_filename=$filename; // For triggers
-				//print "newfileformat=".$newfileformat;
-				//print "newdir=".$dir;
-				//print "newfile=".$newfile;
-				//print "file=".$file;
-				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
-				//exit;
-
-				dol_mkdir($conf->societe->multidir_temp[$object->entity]);
-
-				// Open and load template
-				require_once ODTPHP_PATH.'odf.php';
-				try {
-					$odfHandler = new odf(
-					    $srctemplatepath,
-					    array(
-	    					'PATH_TO_TMP'	  => $conf->societe->multidir_temp[$object->entity],
-	    					'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
-	    					'DELIMITER_LEFT'  => '{',
-	    					'DELIMITER_RIGHT' => '}'
-						)
-					);
-				}
-				catch(Exception $e)
-				{
-					$this->error=$e->getMessage();
-					dol_syslog($e->getMessage(), LOG_INFO);
-					return -1;
-				}
-				//print $odfHandler->__toString()."\n";
+        if (! is_object($outputlangs)) $outputlangs=$langs;
+        $sav_charset_output=$outputlangs->charset_output;
+        $outputlangs->charset_output='UTF-8';
+
+        // Load translation files required by the page
+        $outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
+
+        if ($conf->societe->multidir_output[$object->entity])
+        {
+            $dir = $conf->societe->multidir_output[$object->entity];
+            $objectref = dol_sanitizeFileName($object->id);
+            if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+
+            if (! file_exists($dir))
+            {
+                if (dol_mkdir($dir) < 0)
+                {
+                    $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                    return -1;
+                }
+            }
+
+            if (file_exists($dir))
+            {
+                //print "srctemplatepath=".$srctemplatepath;	// Src filename
+                $newfile=basename($srctemplatepath);
+                $newfiletmp=preg_replace('/\.od(s|t)/i','',$newfile);
+                $newfiletmp=preg_replace('/template_/i','',$newfiletmp);
+                $newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
+                // Get extension (ods or odt)
+                $newfileformat=substr($newfile, strrpos($newfile, '.')+1);
+                if ( ! empty($conf->global->MAIN_DOC_USE_OBJECT_THIRDPARTY_NAME))
+                {
+                    $newfiletmp = dol_sanitizeFileName(dol_string_nospecial($object->name)).'-'.$newfiletmp;
+                }
+                if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
+                {
+                    $format=$conf->global->MAIN_DOC_USE_TIMING;
+                    if ($format == '1') $format='%Y%m%d%H%M%S';
+                    $filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
+                }
+                else
+                {
+                    $filename=$newfiletmp.'.'.$newfileformat;
+                }
+                $file=$dir.'/'.$filename;
+                $object->builddoc_filename=$filename; // For triggers
+                //print "newfileformat=".$newfileformat;
+                //print "newdir=".$dir;
+                //print "newfile=".$newfile;
+                //print "file=".$file;
+                //print "conf->societe->dir_temp=".$conf->societe->dir_temp;
+                //exit;
+
+                dol_mkdir($conf->societe->multidir_temp[$object->entity]);
+
+                // Open and load template
+                require_once ODTPHP_PATH.'odf.php';
+                try {
+                    $odfHandler = new odf(
+                        $srctemplatepath,
+                        array(
+                            'PATH_TO_TMP'	  => $conf->societe->multidir_temp[$object->entity],
+                            'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+                            'DELIMITER_LEFT'  => '{',
+                            'DELIMITER_RIGHT' => '}'
+                        )
+                    );
+                }
+                catch(Exception $e)
+                {
+                    $this->error=$e->getMessage();
+                    dol_syslog($e->getMessage(), LOG_INFO);
+                    return -1;
+                }
+                //print $odfHandler->__toString()."\n";
 
                 // Replace tags of lines for contacts
                 $contact_arrray=array();
@@ -297,52 +297,52 @@ 
                 {
                     require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
-                	$i=0;
-                	$contactstatic = new Contact($this->db);
+                    $i=0;
+                    $contactstatic = new Contact($this->db);
 
-                	while($i < $num)
-                	{
-                		$obj = $this->db->fetch_object($result);
+                    while($i < $num)
+                    {
+                        $obj = $this->db->fetch_object($result);
 
-                		$contact_arrray[$i] = $obj->rowid;
-                		$i++;
-                	}
+                        $contact_arrray[$i] = $obj->rowid;
+                        $i++;
+                    }
                 }
                 if((is_array($contact_arrray) && count($contact_arrray) > 0))
                 {
-                	try
-                	{
-                		$listlines = $odfHandler->setSegment('companycontacts');
-
-                		foreach($contact_arrray as $array_key => $contact_id)
-                		{
-                			$res_contact = $contactstatic->fetch($contact_id);
-                			$tmparray=$this->get_substitutionarray_contact($contactstatic,$outputlangs,'contact');
-                			foreach($tmparray as $key => $val)
-                			{
-                				try
-                				{
-                					$listlines->setVars($key, $val, true, 'UTF-8');
-                				}
-                				catch(OdfException $e)
-                				{
-									dol_syslog($e->getMessage(), LOG_INFO);
-                				}
-                				catch(SegmentException $e)
-                				{
-									dol_syslog($e->getMessage(), LOG_INFO);
-                				}
-                			}
-                			$listlines->merge();
-                		}
-                		$odfHandler->mergeSegment($listlines);
-                	}
-                	catch(OdfException $e)
-                	{
-                		$this->error=$e->getMessage();
-                		dol_syslog($this->error, LOG_WARNING);
-                		//return -1;
-                	}
+                    try
+                    {
+                        $listlines = $odfHandler->setSegment('companycontacts');
+
+                        foreach($contact_arrray as $array_key => $contact_id)
+                        {
+                            $res_contact = $contactstatic->fetch($contact_id);
+                            $tmparray=$this->get_substitutionarray_contact($contactstatic,$outputlangs,'contact');
+                            foreach($tmparray as $key => $val)
+                            {
+                                try
+                                {
+                                    $listlines->setVars($key, $val, true, 'UTF-8');
+                                }
+                                catch(OdfException $e)
+                                {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                                catch(SegmentException $e)
+                                {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                            }
+                            $listlines->merge();
+                        }
+                        $odfHandler->mergeSegment($listlines);
+                    }
+                    catch(OdfException $e)
+                    {
+                        $this->error=$e->getMessage();
+                        dol_syslog($this->error, LOG_WARNING);
+                        //return -1;
+                    }
                 }
 
                 // Make substitutions into odt
@@ -356,95 +356,95 @@ 
 
                 // Call the ODTSubstitution hook
                 $parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+                $reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
                 // Replace variables into document
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						if (preg_match('/logo$/',$key))	// Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
-						{
-							$odfHandler->setVars($key, $value, true, 'UTF-8');
-						}
-					}
-					catch (OdfException $e)
-					{
-						// setVars failed, probably because key not found
+                foreach($tmparray as $key=>$value)
+                {
+                    try {
+                        if (preg_match('/logo$/',$key))	// Image
+                        {
+                            if (file_exists($value)) $odfHandler->setImage($key, $value);
+                            else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+                        }
+                        else	// Text
+                        {
+                            $odfHandler->setVars($key, $value, true, 'UTF-8');
+                        }
+                    }
+                    catch (OdfException $e)
+                    {
+                        // setVars failed, probably because key not found
                         dol_syslog($e->getMessage(), LOG_INFO);
-					}
-				}
-
-				// Replace labels translated
-				$tmparray=$outputlangs->get_translations_for_substitutions();
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
-					{
+                    }
+                }
+
+                // Replace labels translated
+                $tmparray=$outputlangs->get_translations_for_substitutions();
+                foreach($tmparray as $key=>$value)
+                {
+                    try {
+                        $odfHandler->setVars($key, $value, true, 'UTF-8');
+                    }
+                    catch (OdfException $e)
+                    {
                         dol_syslog($e->getMessage(), LOG_INFO);
-					}
-				}
-
-				// Call the beforeODTSave hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-				// Write new file
-				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
-					try {
-						$odfHandler->exportAsAttachedPDF($file);
-					} catch (Exception $e) {
-						$this->error=$e->getMessage();
+                    }
+                }
+
+                // Call the beforeODTSave hook
+                $parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+                $reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+                // Write new file
+                if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
+                    try {
+                        $odfHandler->exportAsAttachedPDF($file);
+                    } catch (Exception $e) {
+                        $this->error=$e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
-						return -1;
-					}
-				}
-				else {
-				    try {
-					   $odfHandler->creator = $user->getFullName($outputlangs);
-					   $odfHandler->title = $object->builddoc_filename;
-					   $odfHandler->subject = $object->builddoc_filename;
-
-					   if (! empty($conf->global->ODT_ADD_DOLIBARR_ID))
-					   {
-    					  $odfHandler->userdefined['dol_id'] = $object->id;
-	   		  		      $odfHandler->userdefined['dol_element'] = $object->element;
-					   }
-
-					   $odfHandler->saveToDisk($file);
-					}catch (Exception $e){
-						$this->error=$e->getMessage();
+                        return -1;
+                    }
+                }
+                else {
+                    try {
+                        $odfHandler->creator = $user->getFullName($outputlangs);
+                        $odfHandler->title = $object->builddoc_filename;
+                        $odfHandler->subject = $object->builddoc_filename;
+
+                        if (! empty($conf->global->ODT_ADD_DOLIBARR_ID))
+                        {
+                            $odfHandler->userdefined['dol_id'] = $object->id;
+                                $odfHandler->userdefined['dol_element'] = $object->element;
+                        }
+
+                        $odfHandler->saveToDisk($file);
+                    }catch (Exception $e){
+                        $this->error=$e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
-						return -1;
-					}
-				}
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-				if (! empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
-
-				$odfHandler=null;	// Destroy object
-
-				$this->result = array('fullpath'=>$file);
-
-				return 1;   // Success
-			}
-			else
-			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-				return -1;
-			}
-		}
-
-		$this->error='UnknownError';
-		return -1;
-	}
+                        return -1;
+                    }
+                }
+                $parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+                $reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+                if (! empty($conf->global->MAIN_UMASK))
+                @chmod($file, octdec($conf->global->MAIN_UMASK));
+
+                $odfHandler=null;	// Destroy object
+
+                $this->result = array('fullpath'=>$file);
+
+                return 1;   // Success
+            }
+            else
+            {
+                $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                return -1;
+            }
+        }
+
+        $this->error='UnknownError';
+        return -1;
+    }
 }

Spacing +119 added lines, -119 removed lines

@@ -59,28 +59,28 @@ 
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main","companies"));
+        $langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
 		$this->description = $langs->trans("DocumentModelOdt");
-		$this->scandir = 'COMPANY_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+		$this->scandir = 'COMPANY_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
 
 		// Dimension page pour format A4
 		$this->type = 'odt';
 		$this->page_largeur = 0;
 		$this->page_hauteur = 0;
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=0;
-		$this->marge_droite=0;
-		$this->marge_haute=0;
-		$this->marge_basse=0;
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = 0;
+		$this->marge_droite = 0;
+		$this->marge_haute = 0;
+		$this->marge_basse = 0;
 
-		$this->option_logo = 1;                    // Affiche logo
+		$this->option_logo = 1; // Affiche logo
 
 		// Recupere emmetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // Par defaut, si n'etait pas defini
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
 	}
 
 
@@ -92,7 +92,7 @@ 
 	 */
 	function info($langs)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		// Load traductions files requiredby by page
 		$langs->loadLangs(array("companies", "errors"));
@@ -100,76 +100,76 @@ 
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<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_ADDON_PDF_ODT_PATH">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="COMPANY_ADDON_PDF_ODT_PATH">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		// List of directories area
-		$texte.= '<tr><td>';
-		$texttitle=$langs->trans("ListOfDirectories");
-		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->COMPANY_ADDON_PDF_ODT_PATH)));
-		$listoffiles=array();
-		foreach($listofdir as $key=>$tmpdir)
+		$texte .= '<tr><td>';
+		$texttitle = $langs->trans("ListOfDirectories");
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->COMPANY_ADDON_PDF_ODT_PATH)));
+		$listoffiles = array();
+		foreach ($listofdir as $key=>$tmpdir)
 		{
-			$tmpdir=trim($tmpdir);
-			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-			if (! $tmpdir) { unset($listofdir[$key]); continue; }
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			$tmpdir = trim($tmpdir);
+			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+			if (!$tmpdir) { unset($listofdir[$key]); continue; }
+			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
 			else
 			{
-				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0,true); // Disable hook for the moment
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0, true); // Disable hook for the moment
+				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
 		}
-		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
 		// Add list of substitution keys
-		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
-		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
-
-		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
-        $texte.= '<table><tr><td>';
-		$texte.= '<textarea class="flat" cols="60" name="value1">';
-		$texte.=$conf->global->COMPANY_ADDON_PDF_ODT_PATH;
-		$texte.= '</textarea>';
-        $texte.= '</td>';
-        $texte.= '<td align="center">&nbsp; ';
-        $texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
-        $texte.= '</td>';
-        $texte.= '</tr>';
-        $texte.= '</table>';
+		$texthelp .= '<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp .= $langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
+
+		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
+        $texte .= '<table><tr><td>';
+		$texte .= '<textarea class="flat" cols="60" name="value1">';
+		$texte .= $conf->global->COMPANY_ADDON_PDF_ODT_PATH;
+		$texte .= '</textarea>';
+        $texte .= '</td>';
+        $texte .= '<td align="center">&nbsp; ';
+        $texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+        $texte .= '</td>';
+        $texte .= '</tr>';
+        $texte .= '</table>';
 
 		// Scan directories
-		$nbofiles=count($listoffiles);
-		if (! empty($conf->global->COMPANY_ADDON_PDF_ODT_PATH))
+		$nbofiles = count($listoffiles);
+		if (!empty($conf->global->COMPANY_ADDON_PDF_ODT_PATH))
 		{
-			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>';
+			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
-			$texte.=$nbofiles;
+			$texte .= $nbofiles;
 			//$texte.=$nbofiles?'</a>':'';
-			$texte.='</b>';
+			$texte .= '</b>';
 		}
 
 		if ($nbofiles)
 		{
-   			$texte.='<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach($listoffiles as $file)
+   			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
+   			foreach ($listoffiles as $file)
    			{
-                $texte.=$file['name'].'<br>';
+                $texte .= $file['name'].'<br>';
    			}
-   			$texte.='<div id="div_'.get_class($this).'">';
+   			$texte .= '<div id="div_'.get_class($this).'">';
 		}
 
-		$texte.= '</td>';
+		$texte .= '</td>';
 
-		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
-		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
-		$texte.= '</td>';
-		$texte.= '</tr>';
+		$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</td>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
 	}
@@ -186,10 +186,10 @@ 
      *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+	function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
         // phpcs:enable
-		global $user,$langs,$conf,$mysoc,$hookmanager;
+		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
 		{
@@ -198,17 +198,17 @@ 
 		}
 
                 // Add odtgeneration hook
-                if (! is_object($hookmanager))
+                if (!is_object($hookmanager))
                 {
                         include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-                        $hookmanager=new HookManager($this->db);
+                        $hookmanager = new HookManager($this->db);
                 }
                 $hookmanager->initHooks(array('odtgeneration'));
                 global $action;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='UTF-8';
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		$sav_charset_output = $outputlangs->charset_output;
+		$outputlangs->charset_output = 'UTF-8';
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
@@ -217,13 +217,13 @@ 
 		{
 			$dir = $conf->societe->multidir_output[$object->entity];
 			$objectref = dol_sanitizeFileName($object->id);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
@@ -231,28 +231,28 @@ 
 			if (file_exists($dir))
 			{
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
-				$newfile=basename($srctemplatepath);
-				$newfiletmp=preg_replace('/\.od(s|t)/i','',$newfile);
-				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
-				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
+				$newfile = basename($srctemplatepath);
+				$newfiletmp = preg_replace('/\.od(s|t)/i', '', $newfile);
+				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
+				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 				// Get extension (ods or odt)
-				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
-				if ( ! empty($conf->global->MAIN_DOC_USE_OBJECT_THIRDPARTY_NAME))
+				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
+				if (!empty($conf->global->MAIN_DOC_USE_OBJECT_THIRDPARTY_NAME))
 				{
 				    $newfiletmp = dol_sanitizeFileName(dol_string_nospecial($object->name)).'-'.$newfiletmp;
 				}
-				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
-					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
+				    $format = $conf->global->MAIN_DOC_USE_TIMING;
+				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
 				else
 				{
-					$filename=$newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp.'.'.$newfileformat;
 				}
-				$file=$dir.'/'.$filename;
-				$object->builddoc_filename=$filename; // For triggers
+				$file = $dir.'/'.$filename;
+				$object->builddoc_filename = $filename; // For triggers
 				//print "newfileformat=".$newfileformat;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
@@ -269,22 +269,22 @@ 
 					    $srctemplatepath,
 					    array(
 	    					'PATH_TO_TMP'	  => $conf->societe->multidir_temp[$object->entity],
-	    					'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+	    					'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
 	    					'DELIMITER_LEFT'  => '{',
 	    					'DELIMITER_RIGHT' => '}'
 						)
 					);
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
 				}
 				//print $odfHandler->__toString()."\n";
 
                 // Replace tags of lines for contacts
-                $contact_arrray=array();
+                $contact_arrray = array();
 
                 $sql = "SELECT p.rowid";
                 $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
@@ -297,10 +297,10 @@ 
                 {
                     require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
-                	$i=0;
+                	$i = 0;
                 	$contactstatic = new Contact($this->db);
 
-                	while($i < $num)
+                	while ($i < $num)
                 	{
                 		$obj = $this->db->fetch_object($result);
 
@@ -308,27 +308,27 @@ 
                 		$i++;
                 	}
                 }
-                if((is_array($contact_arrray) && count($contact_arrray) > 0))
+                if ((is_array($contact_arrray) && count($contact_arrray) > 0))
                 {
                 	try
                 	{
                 		$listlines = $odfHandler->setSegment('companycontacts');
 
-                		foreach($contact_arrray as $array_key => $contact_id)
+                		foreach ($contact_arrray as $array_key => $contact_id)
                 		{
                 			$res_contact = $contactstatic->fetch($contact_id);
-                			$tmparray=$this->get_substitutionarray_contact($contactstatic,$outputlangs,'contact');
-                			foreach($tmparray as $key => $val)
+                			$tmparray = $this->get_substitutionarray_contact($contactstatic, $outputlangs, 'contact');
+                			foreach ($tmparray as $key => $val)
                 			{
                 				try
                 				{
                 					$listlines->setVars($key, $val, true, 'UTF-8');
                 				}
-                				catch(OdfException $e)
+                				catch (OdfException $e)
                 				{
 									dol_syslog($e->getMessage(), LOG_INFO);
                 				}
-                				catch(SegmentException $e)
+                				catch (SegmentException $e)
                 				{
 									dol_syslog($e->getMessage(), LOG_INFO);
                 				}
@@ -337,32 +337,32 @@ 
                 		}
                 		$odfHandler->mergeSegment($listlines);
                 	}
-                	catch(OdfException $e)
+                	catch (OdfException $e)
                 	{
-                		$this->error=$e->getMessage();
+                		$this->error = $e->getMessage();
                 		dol_syslog($this->error, LOG_WARNING);
                 		//return -1;
                 	}
                 }
 
                 // Make substitutions into odt
-                $array_user=$this->get_substitutionarray_user($user,$outputlangs);
-                $array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
-                $array_thirdparty=$this->get_substitutionarray_thirdparty($object,$outputlangs);
-                $array_other=$this->get_substitutionarray_other($outputlangs);
+                $array_user = $this->get_substitutionarray_user($user, $outputlangs);
+                $array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
+                $array_thirdparty = $this->get_substitutionarray_thirdparty($object, $outputlangs);
+                $array_other = $this->get_substitutionarray_other($outputlangs);
 
-                $tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_other);
+                $tmparray = array_merge($array_user, $array_soc, $array_thirdparty, $array_other);
                 complete_substitutions_array($tmparray, $outputlangs, $object);
 
                 // Call the ODTSubstitution hook
-                $parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+                $parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
                 // Replace variables into document
-				foreach($tmparray as $key=>$value)
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key))	// Image
+						if (preg_match('/logo$/', $key))	// Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
@@ -380,8 +380,8 @@ 
 				}
 
 				// Replace labels translated
-				$tmparray=$outputlangs->get_translations_for_substitutions();
-				foreach($tmparray as $key=>$value)
+				$tmparray = $outputlangs->get_translations_for_substitutions();
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
@@ -393,15 +393,15 @@ 
 				}
 
 				// Call the beforeODTSave hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Write new file
 				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
-						$this->error=$e->getMessage();
+						$this->error = $e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
@@ -412,39 +412,39 @@ 
 					   $odfHandler->title = $object->builddoc_filename;
 					   $odfHandler->subject = $object->builddoc_filename;
 
-					   if (! empty($conf->global->ODT_ADD_DOLIBARR_ID))
+					   if (!empty($conf->global->ODT_ADD_DOLIBARR_ID))
 					   {
     					  $odfHandler->userdefined['dol_id'] = $object->id;
 	   		  		      $odfHandler->userdefined['dol_element'] = $object->element;
 					   }
 
 					   $odfHandler->saveToDisk($file);
-					}catch (Exception $e){
-						$this->error=$e->getMessage();
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-				$odfHandler=null;	// Destroy object
+				$odfHandler = null; // Destroy object
 
 				$this->result = array('fullpath'=>$file);
 
-				return 1;   // Success
+				return 1; // Success
 			}
 			else
 			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
 		}
 
-		$this->error='UnknownError';
+		$this->error = 'UnknownError';
 		return -1;
 	}
 }

Braces +38 added lines, -32 removed lines

@@ -80,7 +80,10 @@ 
 
 		// Recupere emmetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // Par defaut, si n'etait pas defini
+		if (! $this->emetteur->country_code) {
+		    $this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// Par defaut, si n'etait pas defini
 	}
 
 
@@ -116,11 +119,14 @@ 
 			$tmpdir=trim($tmpdir);
 			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
 			if (! $tmpdir) { unset($listofdir[$key]); continue; }
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
-			else
+			if (! is_dir($tmpdir)) {
+			    $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			} else
 			{
 				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0,true); // Disable hook for the moment
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+				if (count($tmpfiles)) {
+				    $listoffiles=array_merge($listoffiles,$tmpfiles);
+				}
 			}
 		}
 		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
@@ -206,7 +212,9 @@ 
                 $hookmanager->initHooks(array('odtgeneration'));
                 global $action;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		$sav_charset_output=$outputlangs->charset_output;
 		$outputlangs->charset_output='UTF-8';
 
@@ -217,7 +225,9 @@ 
 		{
 			$dir = $conf->societe->multidir_output[$object->entity];
 			$objectref = dol_sanitizeFileName($object->id);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+			if (! preg_match('/specimen/i',$objectref)) {
+			    $dir.= "/" . $objectref;
+			}
 
 			if (! file_exists($dir))
 			{
@@ -244,10 +254,11 @@ 
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
 				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
+				    if ($format == '1') {
+				        $format='%Y%m%d%H%M%S';
+				    }
 					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
-				}
-				else
+				} else
 				{
 					$filename=$newfiletmp.'.'.$newfileformat;
 				}
@@ -274,8 +285,7 @@ 
 	    					'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -323,12 +333,10 @@ 
                 				try
                 				{
                 					$listlines->setVars($key, $val, true, 'UTF-8');
-                				}
-                				catch(OdfException $e)
+                				} catch(OdfException $e)
                 				{
 									dol_syslog($e->getMessage(), LOG_INFO);
-                				}
-                				catch(SegmentException $e)
+                				} catch(SegmentException $e)
                 				{
 									dol_syslog($e->getMessage(), LOG_INFO);
                 				}
@@ -336,8 +344,7 @@ 
                 			$listlines->merge();
                 		}
                 		$odfHandler->mergeSegment($listlines);
-                	}
-                	catch(OdfException $e)
+                	} catch(OdfException $e)
                 	{
                 		$this->error=$e->getMessage();
                 		dol_syslog($this->error, LOG_WARNING);
@@ -362,17 +369,18 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key))	// Image
+						if (preg_match('/logo$/',$key)) {
+						    // Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
+						} else {
+							    $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else	// Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// setVars failed, probably because key not found
                         dol_syslog($e->getMessage(), LOG_INFO);
@@ -385,8 +393,7 @@ 
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -405,8 +412,7 @@ 
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 				    try {
 					   $odfHandler->creator = $user->getFullName($outputlangs);
 					   $odfHandler->title = $object->builddoc_filename;
@@ -419,7 +425,7 @@ 
 					   }
 
 					   $odfHandler->saveToDisk($file);
-					}catch (Exception $e){
+					} catch (Exception $e){
 						$this->error=$e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
@@ -428,16 +434,16 @@ 
 				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
 				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+								@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler=null;	// Destroy object
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;   // Success
-			}
-			else
+			} else
 			{
 				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return -1;

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);
 }

Spacing +66 added lines, -66 removed lines

@@ -36,7 +36,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -46,16 +46,16 @@ 
      *  @param	integer		$maxfilenamelength  Max length of value to show
      * 	@return	array							List of templates
      */
-    static function liste_modeles($db,$maxfilenamelength=0)
+    static function liste_modeles($db, $maxfilenamelength = 0)
     {
         // phpcs:enable
         global $conf;
 
-        $type='company';
-        $liste=array();
+        $type = 'company';
+        $liste = array();
 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $liste = getListOfModels($db,$type,$maxfilenamelength);
+        $liste = getListOfModels($db, $type, $maxfilenamelength);
 
         return $liste;
     }
@@ -70,7 +70,7 @@ 
     /**
      * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
     /**     Renvoi la description par defaut du modele de numerotation
      *
@@ -122,7 +122,7 @@ 
      *	@param	int			$type		Type
      *  @return string      			Value
      */
-    function getNextValue($objsoc=0,$type=-1)
+    function getNextValue($objsoc = 0, $type = -1)
     {
         global $langs;
         return $langs->trans("Function_getNextValue_InModuleNotWorking");
@@ -153,11 +153,11 @@ 
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of numbers
      */
-    static function liste_modeles($db,$maxfilenamelength=0)
+    static function liste_modeles($db, $maxfilenamelength = 0)
     {
         // phpcs:enable
-        $liste=array();
-        $sql ="";
+        $liste = array();
+        $sql = "";
 
         $resql = $db->query($sql);
         if ($resql)
@@ -167,7 +167,7 @@ 
             while ($i < $num)
             {
                 $row = $db->fetch_row($resql);
-                $liste[$row[0]]=$row[1];
+                $liste[$row[0]] = $row[1];
                 $i++;
             }
         }
@@ -186,61 +186,61 @@ 
      *  @param	int			$type		-1=Nothing, 0=Customer, 1=Supplier
      *  @return	string					HTML translated description
      */
-    function getToolTip($langs,$soc,$type)
+    function getToolTip($langs, $soc, $type)
     {
         global $conf;
 
         $langs->load("admin");
 
-        $s='';
-        if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
-        if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
-        if ($type == 0)  $s.=$langs->trans("CustomerCodeDesc").'<br>';
-        if ($type == 1)  $s.=$langs->trans("SupplierCodeDesc").'<br>';
-        if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
-        $s.='<br>';
-        $s.='<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
+        $s = '';
+        if ($type == -1) $s .= $langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
+        if ($type == -1) $s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+        if ($type == 0)  $s .= $langs->trans("CustomerCodeDesc").'<br>';
+        if ($type == 1)  $s .= $langs->trans("SupplierCodeDesc").'<br>';
+        if ($type != -1) $s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+        $s .= '<br>';
+        $s .= '<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
         if ($type == 0)
         {
-            $s.=$langs->trans("RequiredIfCustomer").': ';
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
-            $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
-            $s.='<br>';
+            $s .= $langs->trans("RequiredIfCustomer").': ';
+            if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+            $s .= yn(!$this->code_null, 1, 2);
+            if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+            $s .= '<br>';
         }
         if ($type == 1)
         {
-            $s.=$langs->trans("RequiredIfSupplier").': ';
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
-            $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
-            $s.='<br>';
+            $s .= $langs->trans("RequiredIfSupplier").': ';
+            if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+            $s .= yn(!$this->code_null, 1, 2);
+            if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+            $s .= '<br>';
         }
         if ($type == -1)
         {
-            $s.=$langs->trans("Required").': ';
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
-            $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
-            $s.='<br>';
+            $s .= $langs->trans("Required").': ';
+            if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+            $s .= yn(!$this->code_null, 1, 2);
+            if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+            $s .= '<br>';
         }
-        $s.=$langs->trans("CanBeModifiedIfOk").': ';
-        $s.=yn($this->code_modifiable,1,2);
-        $s.='<br>';
-        $s.=$langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide,1,2).'<br>';
-        $s.=$langs->trans("AutomaticCode").': '.yn($this->code_auto,1,2).'<br>';
-        $s.='<br>';
+        $s .= $langs->trans("CanBeModifiedIfOk").': ';
+        $s .= yn($this->code_modifiable, 1, 2);
+        $s .= '<br>';
+        $s .= $langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide, 1, 2).'<br>';
+        $s .= $langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'<br>';
+        $s .= '<br>';
         if ($type == 0 || $type == -1)
         {
-            $nextval=$this->getNextValue($soc,0);
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
-            $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': <b>'.$nextval.'</b><br>';
+            $nextval = $this->getNextValue($soc, 0);
+            if (empty($nextval)) $nextval = $langs->trans("Undefined");
+            $s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Customer").')' : '').': <b>'.$nextval.'</b><br>';
         }
         if ($type == 1 || $type == -1)
         {
-            $nextval=$this->getNextValue($soc,1);
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
-            $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': <b>'.$nextval.'</b>';
+            $nextval = $this->getNextValue($soc, 1);
+            if (empty($nextval)) $nextval = $langs->trans("Undefined");
+            $s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Supplier").')' : '').': <b>'.$nextval.'</b>';
         }
         return $s;
     }
@@ -268,7 +268,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     /**		Return description of module
@@ -289,7 +289,7 @@ 
      *      @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
      *      @return	string					Example
      */
-    function getExample($langs,$objsoc=0,$type=-1)
+    function getExample($langs, $objsoc = 0, $type = -1)
     {
         $langs->load("bills");
         return $langs->trans("NoExample");
@@ -329,31 +329,31 @@ 
      *		@param	int			$type		-1=Nothing, 0=Customer, 1=Supplier
      *		@return	string					HTML translated description
      */
-    function getToolTip($langs,$soc,$type)
+    function getToolTip($langs, $soc, $type)
     {
-        global $conf,$db;
+        global $conf, $db;
 
         $langs->load("admin");
 
-        $s='';
-        if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->nom.'</b><br>';
-        if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+        $s = '';
+        if ($type == -1) $s .= $langs->trans("Name").': <b>'.$this->nom.'</b><br>';
+        if ($type == -1) $s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
         //$s.='<br>';
         //$s.='<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
-        $s.='<br>';
+        $s .= '<br>';
         if ($type == 0 || $type == -1)
         {
-            $result=$this->get_code($db,$soc,'customer');
-            $nextval=$this->code;
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
-            $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': <b>'.$nextval.'</b><br>';
+            $result = $this->get_code($db, $soc, 'customer');
+            $nextval = $this->code;
+            if (empty($nextval)) $nextval = $langs->trans("Undefined");
+            $s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Customer").')' : '').': <b>'.$nextval.'</b><br>';
         }
         if ($type == 1 || $type == -1)
         {
-            $result=$this->get_code($db,$soc,'supplier');
-            $nextval=$this->code;
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
-            $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': <b>'.$nextval.'</b>';
+            $result = $this->get_code($db, $soc, 'supplier');
+            $nextval = $this->code;
+            if (empty($nextval)) $nextval = $langs->trans("Undefined");
+            $s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Supplier").')' : '').': <b>'.$nextval.'</b>';
         }
         return $s;
     }
@@ -367,7 +367,7 @@ 
      *  @param  int		$type			'customer' or 'supplier'
      *  @return	int						>=0 if OK, <0 if KO
      */
-    function get_code($db, $societe, $type='')
+    function get_code($db, $societe, $type = '')
     {
         // phpcs:enable
         global $langs;
@@ -394,10 +394,10 @@ 
  *  @deprecated Use the new function generateDocument of Facture class
  *  @see Societe::generateDocument()
  */
-function thirdparty_doc_create(DoliDB $db, Societe $object, $message, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+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);
 }

Braces +76 added lines, -27 removed lines

@@ -138,10 +138,18 @@ 
         global $langs;
         $langs->load("admin");
 
-        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-        if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-        if ($this->version == 'dolibarr') return DOL_VERSION;
-        if ($this->version) return $this->version;
+        if ($this->version == 'development') {
+            return $langs->trans("VersionDevelopment");
+        }
+        if ($this->version == 'experimental') {
+            return $langs->trans("VersionExperimental");
+        }
+        if ($this->version == 'dolibarr') {
+            return DOL_VERSION;
+        }
+        if ($this->version) {
+            return $this->version;
+        }
         return $langs->trans("NotAvailable");
     }
 
@@ -170,8 +178,7 @@ 
                 $liste[$row[0]]=$row[1];
                 $i++;
             }
-        }
-        else
+        } else
         {
             return -1;
         }
@@ -193,35 +200,57 @@ 
         $langs->load("admin");
 
         $s='';
-        if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
-        if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
-        if ($type == 0)  $s.=$langs->trans("CustomerCodeDesc").'<br>';
-        if ($type == 1)  $s.=$langs->trans("SupplierCodeDesc").'<br>';
-        if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+        if ($type == -1) {
+            $s.=$langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
+        }
+        if ($type == -1) {
+            $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+        }
+        if ($type == 0) {
+            $s.=$langs->trans("CustomerCodeDesc").'<br>';
+        }
+        if ($type == 1) {
+            $s.=$langs->trans("SupplierCodeDesc").'<br>';
+        }
+        if ($type != -1) {
+            $s.=$langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+        }
         $s.='<br>';
         $s.='<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
         if ($type == 0)
         {
             $s.=$langs->trans("RequiredIfCustomer").': ';
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+                $s.='<strike>';
+            }
             $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+                $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            }
             $s.='<br>';
         }
         if ($type == 1)
         {
             $s.=$langs->trans("RequiredIfSupplier").': ';
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+                $s.='<strike>';
+            }
             $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+                $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            }
             $s.='<br>';
         }
         if ($type == -1)
         {
             $s.=$langs->trans("Required").': ';
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+                $s.='<strike>';
+            }
             $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+                $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            }
             $s.='<br>';
         }
         $s.=$langs->trans("CanBeModifiedIfOk").': ';
@@ -233,13 +262,17 @@ 
         if ($type == 0 || $type == -1)
         {
             $nextval=$this->getNextValue($soc,0);
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
+            if (empty($nextval)) {
+                $nextval=$langs->trans("Undefined");
+            }
             $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': <b>'.$nextval.'</b><br>';
         }
         if ($type == 1 || $type == -1)
         {
             $nextval=$this->getNextValue($soc,1);
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
+            if (empty($nextval)) {
+                $nextval=$langs->trans("Undefined");
+            }
             $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': <b>'.$nextval.'</b>';
         }
         return $s;
@@ -314,10 +347,18 @@ 
         global $langs;
         $langs->load("admin");
 
-        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-        if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-        if ($this->version == 'dolibarr') return DOL_VERSION;
-        if ($this->version) return $this->version;
+        if ($this->version == 'development') {
+            return $langs->trans("VersionDevelopment");
+        }
+        if ($this->version == 'experimental') {
+            return $langs->trans("VersionExperimental");
+        }
+        if ($this->version == 'dolibarr') {
+            return DOL_VERSION;
+        }
+        if ($this->version) {
+            return $this->version;
+        }
         return $langs->trans("NotAvailable");
     }
 
@@ -336,8 +377,12 @@ 
         $langs->load("admin");
 
         $s='';
-        if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->nom.'</b><br>';
-        if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+        if ($type == -1) {
+            $s.=$langs->trans("Name").': <b>'.$this->nom.'</b><br>';
+        }
+        if ($type == -1) {
+            $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+        }
         //$s.='<br>';
         //$s.='<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
         $s.='<br>';
@@ -345,14 +390,18 @@ 
         {
             $result=$this->get_code($db,$soc,'customer');
             $nextval=$this->code;
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
+            if (empty($nextval)) {
+                $nextval=$langs->trans("Undefined");
+            }
             $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': <b>'.$nextval.'</b><br>';
         }
         if ($type == 1 || $type == -1)
         {
             $result=$this->get_code($db,$soc,'supplier');
             $nextval=$this->code;
-            if (empty($nextval)) $nextval=$langs->trans("Undefined");
+            if (empty($nextval)) {
+                $nextval=$langs->trans("Undefined");
+            }
             $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': <b>'.$nextval.'</b>';
         }
         return $s;

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;
+        }
+    }
 }

Spacing +73 added lines, -73 removed lines

@@ -39,28 +39,28 @@ 
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Elephant';
+	public $nom = 'Elephant';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Elephant';
+	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 $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	public $code_auto;                     // Numerotation automatique
+	public $code_auto; // Numerotation automatique
 
 	public $searchcode; // String de recherche
 
@@ -95,37 +95,37 @@ 
 
 		$langs->load("companies");
 
-		$disabled = ((! empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? ' disabled' : '');
+		$disabled = ((!empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? ' disabled' : '');
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="COMPANY_ELEPHANT_MASK_CUSTOMER">';
-		$texte.= '<input type="hidden" name="param2" value="COMPANY_ELEPHANT_MASK_SUPPLIER">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("ThirdParty"),$langs->transnoentities("ThirdParty"));
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="COMPANY_ELEPHANT_MASK_CUSTOMER">';
+		$texte .= '<input type="hidden" name="param2" value="COMPANY_ELEPHANT_MASK_SUPPLIER">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("ThirdParty"), $langs->transnoentities("ThirdParty"));
 		//$tooltip.=$langs->trans("GenericMaskCodes2");	Not required for third party numbering
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4b");
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4b");
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix customers
-		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("CustomerCodeModel").'):</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value1" value="'.$conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER.'"'.$disabled.'>',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("CustomerCodeModel").'):</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value1" value="'.$conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER.'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
 		// Parametrage du prefix suppliers
-		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("SupplierCodeModel").'):</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value2" value="'.$conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER.'"'.$disabled.'>',$tooltip,1,1).'</td>';
-		$texte.= '</tr>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("SupplierCodeModel").'):</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="value2" value="'.$conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER.'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
 	}
@@ -139,52 +139,52 @@ 
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */
-	function getExample($langs,$objsoc=0,$type=-1)
+	function getExample($langs, $objsoc = 0, $type = -1)
 	{
 		if ($type == 0 || $type == -1)
 		{
-			$examplecust = $this->getNextValue($objsoc,0);
-			if (! $examplecust)
+			$examplecust = $this->getNextValue($objsoc, 0);
+			if (!$examplecust)
 			{
 				$examplecust = $langs->trans('NotConfigured');
 			}
-			if($examplecust=="ErrorBadMask")
+			if ($examplecust == "ErrorBadMask")
 			{
 				$langs->load("errors");
-				$examplecust=$langs->trans($examplecust);
+				$examplecust = $langs->trans($examplecust);
 			}
-			if($examplecust=="ErrorCantUseRazIfNoYearInMask")
+			if ($examplecust == "ErrorCantUseRazIfNoYearInMask")
 			{
 				$langs->load("errors");
-				$examplecust=$langs->trans($examplecust);
+				$examplecust = $langs->trans($examplecust);
 			}
-			if($examplecust=="ErrorCantUseRazInStartedYearIfNoYearMonthInMask")
+			if ($examplecust == "ErrorCantUseRazInStartedYearIfNoYearMonthInMask")
 			{
 				$langs->load("errors");
-				$examplecust=$langs->trans($examplecust);
+				$examplecust = $langs->trans($examplecust);
 			}
 		}
 		if ($type == 1 || $type == -1)
 		{
-			$examplesup = $this->getNextValue($objsoc,1);
-			if (! $examplesup)
+			$examplesup = $this->getNextValue($objsoc, 1);
+			if (!$examplesup)
 			{
 				$examplesup = $langs->trans('NotConfigured');
 			}
-			if($examplesup=="ErrorBadMask")
+			if ($examplesup == "ErrorBadMask")
 			{
 				$langs->load("errors");
-				$examplesup=$langs->trans($examplesup);
+				$examplesup = $langs->trans($examplesup);
 			}
-			if($examplesup=="ErrorCantUseRazIfNoYearInMask")
+			if ($examplesup == "ErrorCantUseRazIfNoYearInMask")
 			{
 				$langs->load("errors");
-				$examplesup=$langs->trans($examplesup);
+				$examplesup = $langs->trans($examplesup);
 			}
-			if($examplesup=="ErrorCantUseRazInStartedYearIfNoYearMonthInMask")
+			if ($examplesup == "ErrorCantUseRazInStartedYearIfNoYearMonthInMask")
 			{
 				$langs->load("errors");
-				$examplesup=$langs->trans($examplesup);
+				$examplesup = $langs->trans($examplesup);
 			}
 		}
 
@@ -200,23 +200,23 @@ 
 	 * @param  	int		    $type       Client ou fournisseur (0:customer, 1:supplier)
 	 * @return 	string      			Value if OK, '' if module not configured, <0 if KO
 	 */
-	function getNextValue($objsoc=0,$type=-1)
+	function getNextValue($objsoc = 0, $type = -1)
 	{
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// Get Mask value
 		$mask = '';
-		if ($type==0) $mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
-		if ($type==1) $mask = $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
-		if (! $mask)
+		if ($type == 0) $mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
+		if ($type == 1) $mask = $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return '';
 		}
 
-		$field='';$where='';
+		$field = ''; $where = '';
 		if ($type == 0)
 		{
 			$field = 'code_client';
@@ -229,9 +229,9 @@ 
 		}
 		else return -1;
 
-		$now=dol_now();
+		$now = dol_now();
 
-		$numFinal=get_next_value($db,$mask,'societe',$field,$where,'',$now);
+		$numFinal = get_next_value($db, $mask, 'societe', $field, $where, '', $now);
 
 		return  $numFinal;
 	}
@@ -249,10 +249,10 @@ 
 		global $conf;
 
 		$mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
-		if (preg_match('/\{pre\}/i',$mask)) return 1;
+		if (preg_match('/\{pre\}/i', $mask)) return 1;
 
 		$mask = $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
-		if (preg_match('/\{pre\}/i',$mask)) return 1;
+		if (preg_match('/\{pre\}/i', $mask)) return 1;
 
 		return 0;
 	}
@@ -276,32 +276,32 @@ 
 	{
 		global $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		$result=0;
+		$result = 0;
 		$code = strtoupper(trim($code));
 
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
-			$result=0;
+			$result = 0;
 		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
+		else if (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
-			$result=-2;
+			$result = -2;
 		}
 		else
 		{
 			// Get Mask value
 			$mask = '';
-			if ($type==0) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER)?'':$conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
-			if ($type==1) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER)?'':$conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
-			if (! $mask)
+			if ($type == 0) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
+			if ($type == 1) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+			if (!$mask)
 			{
-				$this->error='NotConfigured';
+				$this->error = 'NotConfigured';
 				return -5;
 			}
 
-			$result=check_value($mask,$code);
+			$result = check_value($mask, $code);
 			if (is_string($result))
 			{
 				$this->error = $result;
@@ -324,15 +324,15 @@ 
 	 *		@param  int		  	$type   	0 = customer/prospect , 1 = supplier
 	 *		@return	int						0 if available, <0 if KO
 	 */
-	function verif_dispo($db, $code, $soc, $type=0)
+	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;
+		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);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			if ($db->num_rows($resql) == 0)

Braces +39 added lines, -22 removed lines

@@ -188,8 +188,12 @@ 
 			}
 		}
 
-		if ($type == 0) return $examplecust;
-		if ($type == 1) return $examplesup;
+		if ($type == 0) {
+		    return $examplecust;
+		}
+		if ($type == 1) {
+		    return $examplesup;
+		}
 		return $examplecust.'<br>'.$examplesup;
 	}
 
@@ -208,8 +212,12 @@ 
 
 		// Get Mask value
 		$mask = '';
-		if ($type==0) $mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
-		if ($type==1) $mask = $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+		if ($type==0) {
+		    $mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
+		}
+		if ($type==1) {
+		    $mask = $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+		}
 		if (! $mask)
 		{
 			$this->error='NotConfigured';
@@ -221,13 +229,13 @@ 
 		{
 			$field = 'code_client';
 			//$where = ' AND client in (1,2)';
-		}
-		else if ($type == 1)
+		} else if ($type == 1)
 		{
 			$field = 'code_fournisseur';
 			//$where = ' AND fournisseur = 1';
+		} else {
+		    return -1;
 		}
-		else return -1;
 
 		$now=dol_now();
 
@@ -249,10 +257,14 @@ 
 		global $conf;
 
 		$mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
-		if (preg_match('/\{pre\}/i',$mask)) return 1;
+		if (preg_match('/\{pre\}/i',$mask)) {
+		    return 1;
+		}
 
 		$mask = $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
-		if (preg_match('/\{pre\}/i',$mask)) return 1;
+		if (preg_match('/\{pre\}/i',$mask)) {
+		    return 1;
+		}
 
 		return 0;
 	}
@@ -284,17 +296,19 @@ 
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result=0;
-		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
+		} else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
 		{
 			$result=-2;
-		}
-		else
+		} else
 		{
 			// Get Mask value
 			$mask = '';
-			if ($type==0) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER)?'':$conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
-			if ($type==1) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER)?'':$conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+			if ($type==0) {
+			    $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER)?'':$conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
+			}
+			if ($type==1) {
+			    $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER)?'':$conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+			}
 			if (! $mask)
 			{
 				$this->error='NotConfigured';
@@ -328,9 +342,14 @@ 
 	{
         // 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;
+		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)
@@ -338,13 +357,11 @@ 
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else
+			} else
 			{
 				return -1;
 			}
-		}
-		else
+		} 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;
+    }
 }

Spacing +38 added lines, -38 removed lines

@@ -37,32 +37,32 @@ 
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Monkey';
+	public $nom = 'Monkey';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Monkey';
+	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 $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	public $code_auto;                     // Numerotation automatique
+	public $code_auto; // Numerotation automatique
 
-	public $prefixcustomer='CU';
+	public $prefixcustomer = 'CU';
 
-	public $prefixsupplier='SU';
+	public $prefixsupplier = 'SU';
 
 	public $prefixIsRequired; // Le champ prefix du tiers doit etre renseigne quand on utilise {pre}
 
@@ -91,7 +91,7 @@ 
 	 */
 	function info($langs)
 	{
-		return $langs->trans("MonkeyNumRefModelDesc",$this->prefixcustomer,$this->prefixsupplier);
+		return $langs->trans("MonkeyNumRefModelDesc", $this->prefixcustomer, $this->prefixsupplier);
 	}
 
 
@@ -103,7 +103,7 @@ 
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */
-	function getExample($langs,$objsoc=0,$type=-1)
+	function getExample($langs, $objsoc = 0, $type = -1)
 	{
 		return $this->prefixcustomer.'0901-00001<br>'.$this->prefixsupplier.'0901-00001';
 	}
@@ -116,11 +116,11 @@ 
 	 *	@param  int			$type       Client ou fournisseur (1:client, 2:fournisseur)
 	 *  @return string      			Value if OK, '' if module not configured, <0 if KO
 	 */
-	function getNextValue($objsoc=0,$type=-1)
+	function getNextValue($objsoc = 0, $type = -1)
 	{
 		global $db, $conf, $mc;
 
-		$field='';
+		$field = '';
         $prefix = '';
 		if ($type == 0) {
 			$field = 'code_client';
@@ -133,20 +133,20 @@ 
         }
 
         // D'abord on recupere la valeur max (reponse immediate car champ indexe)
-		$posindice=8;
-        $sql = "SELECT MAX(CAST(SUBSTRING(".$field." FROM ".$posindice.") AS SIGNED)) as max";   // This is standard SQL
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql.= " WHERE ".$field." LIKE '".$prefix."____-%'";
-		$sql.= " AND entity IN (".getEntity('societe').")";
+		$posindice = 8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(".$field." FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
+		$sql .= " WHERE ".$field." LIKE '".$prefix."____-%'";
+		$sql .= " AND entity IN (".getEntity('societe').")";
 
 		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
-			else $max=0;
+			else $max = 0;
 		}
 		else
 		{
@@ -154,10 +154,10 @@ 
 		}
 
 		$date	= dol_now();
-		$yymm	= strftime("%y%m",$date);
+		$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);
+		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;
@@ -181,16 +181,16 @@ 
 	{
 		global $conf;
 
-		$result=0;
+		$result = 0;
 		$code = strtoupper(trim($code));
 
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
-			$result=0;
+			$result = 0;
 		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
+		else if (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
-			$result=-2;
+			$result = -2;
 		}
 		else
 		{
@@ -199,22 +199,22 @@ 
 				$is_dispo = $this->verif_dispo($db, $code, $soc, $type);
 				if ($is_dispo <> 0)
 				{
-					$result=-3;
+					$result = -3;
 				}
 				else
 				{
-					$result=0;
+					$result = 0;
 				}
 			}
 			else
 			{
 				if (dol_strlen($code) == 0)
 				{
-					$result=-2;
+					$result = -2;
 				}
 				else
 				{
-					$result=-1;
+					$result = -1;
 				}
 			}
 		}
@@ -234,19 +234,19 @@ 
 	 *		@param  int		  	$type   	0 = customer/prospect , 1 = supplier
 	 *		@return	int						0 if available, <0 if KO
 	 */
-	function verif_dispo($db, $code, $soc, $type=0)
+	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;
+		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);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			if ($db->num_rows($resql) == 0)

Braces +29 added lines, -25 removed lines

@@ -145,10 +145,12 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
+			if ($obj) {
+			    $max = intval($obj->max);
+			} else {
+			    $max=0;
+			}
+		} else
 		{
 			return -1;
 		}
@@ -156,8 +158,13 @@ 
 		$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);
+		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;
@@ -187,12 +194,10 @@ 
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result=0;
-		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
+		} else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
 		{
 			$result=-2;
-		}
-		else
+		} else
 		{
 			if ($this->verif_syntax($code) >= 0)
 			{
@@ -200,19 +205,16 @@ 
 				if ($is_dispo <> 0)
 				{
 					$result=-3;
-				}
-				else
+				} else
 				{
 					$result=0;
 				}
-			}
-			else
+			} else
 			{
 				if (dol_strlen($code) == 0)
 				{
 					$result=-2;
-				}
-				else
+				} else
 				{
 					$result=-1;
 				}
@@ -240,10 +242,15 @@ 
 		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."'";
+		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;
+		if ($soc->id > 0) {
+		    $sql.= " AND rowid <> ".$soc->id;
+		}
 
 		dol_syslog(get_class($this)."::verif_dispo", LOG_DEBUG);
 		$resql=$db->query($sql);
@@ -252,13 +259,11 @@ 
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else
+			} else
 			{
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return -2;
 		}
@@ -280,8 +285,7 @@ 
 		if (dol_strlen($code) < 11)
 		{
 			$res = -1;
-		}
-		else
+		} else
 		{
 			$res = 0;
 		}

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
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -35,18 +35,18 @@ 
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Panicum';
+	public $nom = 'Panicum';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Panicum';
+	public $name = 'Panicum';
 
 	/**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';        // 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 
 	/**
@@ -76,7 +76,7 @@ 
 	 *  @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 *  @return	string					Example
 	 */
-	function getExample($langs,$objsoc=0,$type=-1)
+	function getExample($langs, $objsoc = 0, $type = -1)
 	{
 		return '';
 	}
@@ -90,14 +90,14 @@ 
 	 *  @param  int		$type			'customer' or 'supplier'
 	 *  @return	int						>=0 if OK, <0 if KO
 	 */
-	function get_code($db, $societe, $type='')
+	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 ($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

Braces +5 added lines, -2 removed lines

@@ -96,8 +96,11 @@
 		$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 ($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

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;
+    }
 }
 

Spacing +13 added lines, -13 removed lines

@@ -43,28 +43,28 @@ 
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Leopard';
+	public $nom = 'Leopard';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Leopard';
+	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 $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	public $code_auto; 	                // Numerotation automatique
+	public $code_auto; // Numerotation automatique
 
 
 	/**
@@ -99,7 +99,7 @@ 
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return next value
 	 */
-	function getNextValue($objsoc=0,$type=-1)
+	function getNextValue($objsoc = 0, $type = -1)
 	{
 		global $langs;
 		return '';
@@ -123,16 +123,16 @@ 
 	{
 		global $conf;
 
-		$result=0;
+		$result = 0;
 		$code = trim($code);
 
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
-			$result=0;
+			$result = 0;
 		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
+		else if (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
-			$result=-2;
+			$result = -2;
 		}
 
 		dol_syslog(get_class($this)."::verif type=".$type." result=".$result);

Braces +1 added lines, -2 removed lines

@@ -129,8 +129,7 @@
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result=0;
-		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
+		} else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
 		{
 			$result=-2;
 		}

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
+        }
+    }
 }

Spacing +56 added lines, -56 removed lines

@@ -36,18 +36,18 @@ 
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Aquarium';
+	public $nom = 'Aquarium';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Aquarium';
+	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;
 
@@ -60,10 +60,10 @@ 
 	function __construct()
 	{
 	    global $conf;
-		if (! isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411';
-        if (! isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401';
-		$this->prefixcustomeraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
-	    $this->prefixsupplieraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
+		if (!isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER = '411';
+        if (!isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER = '401';
+		$this->prefixcustomeraccountancycode = $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
+	    $this->prefixsupplieraccountancycode = $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
 	}
 
 
@@ -80,26 +80,26 @@ 
 
 		$langs->load("companies");
 
-        $tooltip='';
+        $tooltip = '';
 		$texte = '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="COMPANY_AQUARIUM_MASK_SUPPLIER">';
-		$texte.= '<input type="hidden" name="param2" value="COMPANY_AQUARIUM_MASK_CUSTOMER">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-		$s1= $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="'.$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER.'">',$tooltip,1,1);
-		$s2= $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="'.$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER.'">',$tooltip,1,1);
-		$texte.= '<tr><td>';
-		$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";
+		$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>';
+		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;
 	}
@@ -112,12 +112,12 @@ 
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */
-	function getExample($langs,$objsoc=0,$type=-1)
+	function getExample($langs, $objsoc = 0, $type = -1)
 	{
-		$s='';
-		$s.=$this->prefixcustomeraccountancycode.'CUSTCODE';
-	    $s.="<br>\n";
-	    $s.=$this->prefixsupplieraccountancycode.'SUPPCODE';
+		$s = '';
+		$s .= $this->prefixcustomeraccountancycode.'CUSTCODE';
+	    $s .= "<br>\n";
+	    $s .= $this->prefixsupplieraccountancycode.'SUPPCODE';
 	    return $s;
 	}
 
@@ -131,7 +131,7 @@ 
 	 *  @param  string		$type			'customer' or 'supplier'
 	 *  @return	int							>=0 if OK, <0 if KO
 	 */
-	function get_code($db, $societe, $type='')
+	function get_code($db, $societe, $type = '')
 	{
         // phpcs:enable
 		global $conf;
@@ -139,17 +139,17 @@ 
 		$i = 0;
 		$this->db = $db;
 
-		dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(! empty($societe->name)?$societe->name:''));
+		dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(!empty($societe->name) ? $societe->name : ''));
 
 		// Regle gestion compte compta
 		if ($type == 'customer')
 		{
-			$codetouse=(! empty($societe->code_client)?$societe->code_client:'CUSTCODE');
+			$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');
+			$codetouse = (!empty($societe->code_fournisseur) ? $societe->code_fournisseur : 'SUPPCODE');
 			$prefix = $this->prefixsupplieraccountancycode;
 		}
 		else
@@ -161,26 +161,26 @@ 
 		//$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);
+		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);
+		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='^..(..)..';
+		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 = preg_replace('/'.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX.'/', '\1\2\3', $codetouse);
 		}
 
-		$codetouse=$prefix.strtoupper($codetouse);
+		$codetouse = $prefix.strtoupper($codetouse);
 
 		$is_dispo = $this->verif($db, $codetouse, $societe, $type);
-		if (! $is_dispo)
+		if (!$is_dispo)
 		{
-			$this->code=$codetouse;
+			$this->code = $codetouse;
 		}
 		else
 		{
 			// Pour retour
-			$this->code=$codetouse;
+			$this->code = $codetouse;
 		}
 		dol_syslog("mod_codecompta_aquarium::get_code found code=".$this->code);
 		return $is_dispo;
@@ -199,33 +199,33 @@ 
 	function verif($db, $code, $societe, $type)
 	{
 		$sql = "SELECT ";
-		if ($type == 'customer') $sql.= "code_compta";
-		else if ($type == 'supplier') $sql.= "code_compta_fournisseur";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql.= " WHERE ";
-		if ($type == 'customer') $sql.= "code_compta";
-		else if ($type == 'supplier') $sql.= "code_compta_fournisseur";
-		$sql.= " = '".$db->escape($code)."'";
-		if (! empty($societe->id)) $sql.= " AND rowid <> ".$societe->id;
-
-		$resql=$db->query($sql);
+		if ($type == 'customer') $sql .= "code_compta";
+		else if ($type == 'supplier') $sql .= "code_compta_fournisseur";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
+		$sql .= " WHERE ";
+		if ($type == 'customer') $sql .= "code_compta";
+		else if ($type == 'supplier') $sql .= "code_compta_fournisseur";
+		$sql .= " = '".$db->escape($code)."'";
+		if (!empty($societe->id)) $sql .= " AND rowid <> ".$societe->id;
+
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			if ($db->num_rows($resql) == 0)
 			{
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' available");
-				return 1;	// Dispo
+				return 1; // Dispo
 			}
 			else
 			{
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' not available");
-				return 0;	// Non dispo
+				return 0; // Non dispo
 			}
 		}
 		else
 		{
-			$this->error=$db->error()." sql=".$sql;
-			return -1;		// Erreur
+			$this->error = $db->error()." sql=".$sql;
+			return -1; // Erreur
 		}
 	}
 }

Braces +39 added lines, -22 removed lines

@@ -60,8 +60,12 @@ 
 	function __construct()
 	{
 	    global $conf;
-		if (! isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411';
-        if (! isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401';
+		if (! isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') {
+		    $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411';
+		}
+        if (! isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') {
+            $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401';
+        }
 		$this->prefixcustomeraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
 	    $this->prefixsupplieraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
 	}
@@ -93,9 +97,13 @@ 
 		$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 (! 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";
+		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>';
@@ -146,13 +154,11 @@ 
 		{
 			$codetouse=(! empty($societe->code_client)?$societe->code_client:'CUSTCODE');
 			$prefix = $this->prefixcustomeraccountancycode;
-		}
-		else if ($type == 'supplier')
+		} else if ($type == 'supplier')
 		{
 			$codetouse=(! empty($societe->code_fournisseur)?$societe->code_fournisseur:'SUPPCODE');
 			$prefix = $this->prefixsupplieraccountancycode;
-		}
-		else
+		} else
 		{
 			$this->error = 'Bad value for parameter type';
 			return -1;
@@ -161,14 +167,20 @@ 
 		//$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);
+		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);
+		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='^..(..)..';
+		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);
 
@@ -176,8 +188,7 @@ 
 		if (! $is_dispo)
 		{
 			$this->code=$codetouse;
-		}
-		else
+		} else
 		{
 			// Pour retour
 			$this->code=$codetouse;
@@ -199,14 +210,22 @@ 
 	function verif($db, $code, $societe, $type)
 	{
 		$sql = "SELECT ";
-		if ($type == 'customer') $sql.= "code_compta";
-		else if ($type == 'supplier') $sql.= "code_compta_fournisseur";
+		if ($type == 'customer') {
+		    $sql.= "code_compta";
+		} else if ($type == 'supplier') {
+		    $sql.= "code_compta_fournisseur";
+		}
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
 		$sql.= " WHERE ";
-		if ($type == 'customer') $sql.= "code_compta";
-		else if ($type == 'supplier') $sql.= "code_compta_fournisseur";
+		if ($type == 'customer') {
+		    $sql.= "code_compta";
+		} else if ($type == 'supplier') {
+		    $sql.= "code_compta_fournisseur";
+		}
 		$sql.= " = '".$db->escape($code)."'";
-		if (! empty($societe->id)) $sql.= " AND rowid <> ".$societe->id;
+		if (! empty($societe->id)) {
+		    $sql.= " AND rowid <> ".$societe->id;
+		}
 
 		$resql=$db->query($sql);
 		if ($resql)
@@ -215,14 +234,12 @@ 
 			{
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' available");
 				return 1;	// Dispo
-			}
-			else
+			} else
 			{
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' not available");
 				return 0;	// Non dispo
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$db->error()." sql=".$sql;
 			return -1;		// Erreur

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

Spacing +29 added lines, -29 removed lines

@@ -28,7 +28,7 @@ 
  *	\ingroup    supplier_proposal
  *	\brief      File to describe and activate module SupplierProposal
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -50,13 +50,13 @@ 
 		$this->numero = 1120;
 
 		$this->family = "srm";
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$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';
+		$this->picto = 'supplier_proposal';
         
 		// Data directories to create when module is enabled.
 		$this->dirs = array();
@@ -65,16 +65,16 @@ 
         $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->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;
+		$r = 0;
 
 		$this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
@@ -102,7 +102,7 @@ 
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'supplier_proposal';
-		$r=0;
+		$r = 0;
 
 		$r++;
 		$this->rights[$r][0] = $this->numero + $r; // id de la permission
@@ -141,23 +141,23 @@ 
 		$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
+		$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
+			'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(
+		$this->menu[$r] = array(
 			'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
 			'type'=>'left',
 			'titre'=>'SupplierProposalNew',
@@ -170,7 +170,7 @@ 
 		);
 		$r++;
 
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 			'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
 			'type'=>'left',
 			'titre'=>'List',
@@ -183,7 +183,7 @@ 
 		);
 		$r++;
 
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 		    'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
 		    'type'=>'left',
 		    'titre'=>'Statistics',
@@ -206,27 +206,27 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
-		global $conf,$langs;
+		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';
+		$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))
+		if (file_exists($src) && !file_exists($dest))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
-			$result=dol_copy($src,$dest,0,0);
+			$result = dol_copy($src, $dest, 0, 0);
 			if ($result < 0)
 			{
 				$langs->load("errors");
-				$this->error=$langs->trans('ErrorFailToCopyFile',$src,$dest);
+				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
 			}
 		}

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);
+    }
 }

Spacing +41 added lines, -41 removed lines

@@ -23,7 +23,7 @@ 
  *      \ingroup    expensereport
  *      \brief      Description and activation file for module ExpenseReport
  */
-include_once DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php";
+include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
 
 
 /**
@@ -46,32 +46,32 @@ 
 		$this->family = "hr";
 		$this->module_position = '40';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
 		$this->description = "Manage and claim expense reports (transportation, meal, ...)";
 		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='trip';
+		$this->picto = 'trip';
 
 		// Data directories to create when module is enabled.
 		$this->dirs = array("/expensereport/temp");
-		$r=0;
+		$r = 0;
 
 		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
 		$this->config_page_url = array('expensereport.php');
 
 		// Dependencies
-		$this->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->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");
+		$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 = 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";
@@ -105,11 +105,11 @@ 
 		$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;
+		$this->boxes = array(); // List of boxes
+		$r = 0;
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
+		$this->rights = array(); // Permission array used by this module
 		$this->rights_class = 'expensereport';
 
 		$this->rights[$r][0] = 771;
@@ -170,36 +170,36 @@ 
 
 		// Menus
 		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 		// Exports
-		$r=0;
+		$r = 0;
 
 		$r++;
-		$this->export_code[$r]='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_code[$r] = 'expensereport_'.$r;
+		$this->export_label[$r] = 'ListTripsAndExpenses';
+		$this->export_icon[$r] = 'trip';
+		$this->export_permission[$r] = array(array("expensereport", "export"));
+        $this->export_fields_array[$r] = array(
+			'd.rowid'=>"TripId", 'd.ref'=>'Ref', 'd.date_debut'=>'DateStart', 'd.date_fin'=>'DateEnd', 'd.date_create'=>'DateCreation', 'd.date_approve'=>'DateApprove',
+			'd.total_ht'=>"TotalHT", 'd.total_tva'=>'TotalVAT', 'd.total_ttc'=>'TotalTTC', 'd.note_private'=>'NotePrivate', 'd.note_public'=>'NotePublic',
+			'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>"Login", 'ed.rowid'=>'LineId', 'tf.code'=>'Type', 'ed.date'=>'Date', 'ed.tva_tx'=>'VATRate',
+			'ed.total_ht'=>'TotalHT', 'ed.total_tva'=>'TotalVAT', 'ed.total_ttc'=>'TotalTTC', 'ed.comments'=>'Comment', 'p.rowid'=>'ProjectId', 'p.ref'=>'Ref'
 		);
-		$this->export_entities_array[$r]=array(
-			'u.lastname'=>'user','u.firstname'=>'user','u.login'=>'user','ed.rowid'=>'expensereport_line','ed.date'=>'expensereport_line',
-			'ed.tva_tx'=>'expensereport_line','ed.total_ht'=>'expensereport_line','ed.total_tva'=>'expensereport_line','ed.total_ttc'=>'expensereport_line',
-			'ed.comments'=>'expensereport_line','tf.code'=>'expensereport_line','p.project_ref'=>'expensereport_line','p.rowid'=>'project','p.ref'=>'project'
+		$this->export_entities_array[$r] = array(
+			'u.lastname'=>'user', 'u.firstname'=>'user', 'u.login'=>'user', 'ed.rowid'=>'expensereport_line', 'ed.date'=>'expensereport_line',
+			'ed.tva_tx'=>'expensereport_line', 'ed.total_ht'=>'expensereport_line', 'ed.total_tva'=>'expensereport_line', 'ed.total_ttc'=>'expensereport_line',
+			'ed.comments'=>'expensereport_line', 'tf.code'=>'expensereport_line', 'p.project_ref'=>'expensereport_line', 'p.rowid'=>'project', 'p.ref'=>'project'
 		);
-        $this->export_alias_array[$r]=array('d.rowid'=>"idtrip",'d.type'=>"type",'d.note_private'=>'note_private','d.note_public'=>'note_public','u.lastname'=>'name','u.firstname'=>'firstname','u.login'=>'login');
-		$this->export_dependencies_array[$r]=array('expensereport_line'=>'ed.rowid','type_fees'=>'tf.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'expensereport as d, '.MAIN_DB_PREFIX.'user as u,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expensereport_det as ed LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as tf ON ed.fk_c_type_fees = tf.id';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON ed.fk_projet = p.rowid';
-		$this->export_sql_end[$r] .=' WHERE ed.fk_expensereport = d.rowid AND d.fk_user_author = u.rowid';
-		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('expensereport').')';
+        $this->export_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').')';
 	}
 
 	/**
@@ -210,7 +210,7 @@ 
 	 *	@param		string	$options	Options
 	 *	@return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
 		global $conf;
 
@@ -222,6 +222,6 @@ 
 				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard','expensereport',".$conf->entity.")"
 		);
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }