alxarafe / alixar

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

Indentation +11 added lines, -11 removed lines

@@ -32,26 +32,26 @@ 
 {
 
     /**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
      */
     function __construct($db)
     {
-    	global $langs,$conf;
+        global $langs,$conf;
 
         $this->db = $db;
         $this->numero = 3400;
 
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		// It is used to group modules in module setup page
+        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+        // It is used to group modules in module setup page
         $this->family = "interface";
         // Module position in the family on 2 digits ('01', '10', '20', ...)
         $this->module_position = '20';
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
         $this->name = preg_replace('/^mod/i','',get_class($this));
         $this->description = "Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...)";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
@@ -66,10 +66,10 @@ 
 
         // Dependencies
         $this->hidden = ! empty($conf->global->MODULE_SOCIALNETWORKS_DISABLED);	// A condition to hide module
-		$this->depends = array('modSociete');	// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $this->depends = array('modSociete');	// 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();
 
         // Constants

Spacing +9 added lines, -9 removed lines

@@ -23,7 +23,7 @@ 
  *  \ingroup    socialnetworks
  *  \brief      Description and activation file for module SocialNetworks
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 /**
  *	Class to describe a SocialNetworks module
@@ -38,7 +38,7 @@ 
      */
     function __construct($db)
     {
-    	global $langs,$conf;
+    	global $langs, $conf;
 
         $this->db = $db;
         $this->numero = 3400;
@@ -49,14 +49,14 @@ 
         // Module position in the family on 2 digits ('01', '10', '20', ...)
         $this->module_position = '20';
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->name = preg_replace('/^mod/i', '', get_class($this));
         $this->description = "Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...)";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         // Name of image file used for this module.
-        $this->picto='generic';
+        $this->picto = 'generic';
 
         // Data directories to create when module is enabled
         $this->dirs = array();
@@ -65,11 +65,11 @@ 
         $this->config_page_url = array("socialnetworks.php");
 
         // Dependencies
-        $this->hidden = ! empty($conf->global->MODULE_SOCIALNETWORKS_DISABLED);	// A condition to hide module
-		$this->depends = array('modSociete');	// 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 = !empty($conf->global->MODULE_SOCIALNETWORKS_DISABLED); // A condition to hide module
+		$this->depends = array('modSociete'); // 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();
 
         // Constants

dolibarr/htdocs/core/modules/member/doc/pdf_standard.class.php

Indentation +394 added lines, -394 removed lines

@@ -34,288 +34,288 @@ 
 class pdf_standard extends CommonStickerGenerator
 {
 
-	/**
-	 * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
-	 *
-	 * @param	PDF			$pdf			PDF reference
-	 * @param	Translate	$outputlangs	Output langs
-	 * @param	array		$param			Associative array containing label content and optional parameters
-	 * @return	void
-	 */
+    /**
+     * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
+     *
+     * @param	PDF			$pdf			PDF reference
+     * @param	Translate	$outputlangs	Output langs
+     * @param	array		$param			Associative array containing label content and optional parameters
+     * @return	void
+     */
     function addSticker(&$pdf,$outputlangs,$param)
     {
-		// use this method in future refactoring
-	}
+        // use this method in future refactoring
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
-	 * - __LOGO__ is replace with company logo
-	 * - __PHOTO__ is replace with photo provided as parameter
-	 *
-	 * @param	 PDF		$pdf			PDF
-	 * @param	 string		$textleft		Text left
-	 * @param	 string		$header			Header
-	 * @param	 string		$footer			Footer
-	 * @param	 Translate	$outputlangs	Output langs
-	 * @param	 string		$textright		Text right
-	 * @param	 int		$idmember		Id member
-	 * @param	 string		$photo			Photo (full path to image file used as replacement for key __PHOTOS__ into left, right, header or footer text)
-	 * @return	 void
-	 */
-	function Add_PDF_card(&$pdf,$textleft,$header,$footer,$outputlangs,$textright='',$idmember=0,$photo='')
-	{
+    /**
+     * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
+     * - __LOGO__ is replace with company logo
+     * - __PHOTO__ is replace with photo provided as parameter
+     *
+     * @param	 PDF		$pdf			PDF
+     * @param	 string		$textleft		Text left
+     * @param	 string		$header			Header
+     * @param	 string		$footer			Footer
+     * @param	 Translate	$outputlangs	Output langs
+     * @param	 string		$textright		Text right
+     * @param	 int		$idmember		Id member
+     * @param	 string		$photo			Photo (full path to image file used as replacement for key __PHOTOS__ into left, right, header or footer text)
+     * @return	 void
+     */
+    function Add_PDF_card(&$pdf,$textleft,$header,$footer,$outputlangs,$textright='',$idmember=0,$photo='')
+    {
         // phpcs:enable
-		global $db,$mysoc,$conf,$langs;
-		global $forceimgscalewidth,$forceimgscaleheight;
-
-		$imgscalewidth=(empty($forceimgscalewidth)?0.3:$forceimgscalewidth);	// Scale of image for width (1=Full width of sticker)
-		$imgscaleheight=(empty($forceimgscalewidth)?0.5:$forceimgscalewidth);	// Scale of image for height (1=Full height of sticker)
-
-		// We are in a new page, then we must add a page
-		if (($this->_COUNTX ==0) && ($this->_COUNTY==0) and (!$this->_First==1)) {
-			$pdf->AddPage();
-		}
-		$this->_First=0;
-		$_PosX = $this->_Margin_Left+($this->_COUNTX*($this->_Width+$this->_X_Space));
-		$_PosY = $this->_Margin_Top+($this->_COUNTY*($this->_Height+$this->_Y_Space));
-
-		// Define logo
-		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-		if (! is_readable($logo))
-		{
-			$logo='';
-			if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
-			{
-				$logo=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-			}
-			elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
-			{
-				$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-			}
-		}
-
-		$member=new Adherent($db);
-		$member->id = $idmember;
-		$member->ref = $idmember;
-
-		// Define photo
-		$dir=$conf->adherent->dir_output;
-		if (! empty($photo))
-		{
-			$file=get_exdir(0,0,0,0,$member,'member').'photos/'.$photo;
-			$photo=$dir.'/'.$file;
-			if (! is_readable($photo)) $photo='';
-		}
-
-		// Define background image
-		$backgroundimage='';
-		if(! empty($conf->global->ADHERENT_CARD_BACKGROUND) && file_exists($conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND))
-		{
-			$backgroundimage=$conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND;
-		}
-
-		// Print lines
-		if ($this->code == "CARD")
-		{
-			$this->Tformat=$this->_Avery_Labels["CARD"];
-			//$this->_Pointille($pdf,$_PosX,$_PosY,$_PosX+$this->_Width,$_PosY+$this->_Height,0.3,25);
-			$this->_Croix($pdf,$_PosX,$_PosY,$_PosX+$this->_Width,$_PosY+$this->_Height,0.1,10);
-		}
-
-		// Background
-		if ($backgroundimage)
-		{
-			$pdf->image($backgroundimage,$_PosX,$_PosY,$this->_Width,$this->_Height);
-		}
-
-		$xleft=2; $ytop=2;
-
-		// Top
-		if ($header!='')
-		{
-			if ($this->code == "CARD")
-			{
-				$pdf->SetDrawColor(128,128,128);
-				$pdf->Line($_PosX, $_PosY+$this->_Line_Height+1, $_PosX+$this->_Width, $_PosY+$this->_Line_Height+1); // Only 1 mm and not ytop for top text
-				$pdf->SetDrawColor(0,0,0);
-			}
-			$pdf->SetXY($_PosX+$xleft, $_PosY+1); // Only 1 mm and not ytop for top text
-			$pdf->Cell($this->_Width-2*$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($header),0,1,'C');
-		}
-
-
-		$ytop+=(empty($header)?0:(1+$this->_Line_Height));
-
-		// Define widthtouse and heighttouse
-		$maxwidthtouse=round(($this->_Width - 2*$xleft)*$imgscalewidth); $maxheighttouse=round(($this->_Height - 2*$ytop)*$imgscaleheight);
-		$defaultratio=($maxwidthtouse/$maxheighttouse);
-		$widthtouse=$maxwidthtouse; $heighttouse=0;		// old value for image
-		$tmp=dol_getImageSize($photo, false);
-		if ($tmp['height'])
-		{
-			$imgratio=$tmp['width']/$tmp['height'];
-			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); }
-			else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
-		}
-		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
-
-		// Center
-		if ($textright=='')	// Only a left part
-		{
-			// Output left area
-			if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else
-			{
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
-			}
-		}
-		else if ($textleft!='' && $textright!='')	//
-		{
-			if ($textleft == '__LOGO__' || $textleft == '__PHOTO__')
-			{
-				if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				$pdf->SetXY($_PosX+$xleft+$widthtouse+1, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width-$xleft-$xleft-$widthtouse-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
-			}
-			else if ($textright == '__LOGO__' || $textright == '__PHOTO__')
-			{
-				if ($textright == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width-$widthtouse-$xleft-$xleft-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
-			}
-			else	// text on halft left and text on half right
-			{
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell(round($this->_Width/2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
-				$pdf->SetXY($_PosX+round($this->_Width/2), $_PosY+$ytop);
-				$pdf->MultiCell(round($this->_Width/2)-2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
-			}
-		}
-		else	// Only a right part
-		{
-			// Output right area
-			if ($textright == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else
-			{
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width-$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
-			}
-		}
-
-		// Bottom
-		if ($footer!='')
-		{
-			if ($this->code == "CARD")
-			{
-				$pdf->SetDrawColor(128,128,128);
-				$pdf->Line($_PosX, $_PosY+$this->_Height-$this->_Line_Height-2, $_PosX+$this->_Width, $_PosY+$this->_Height-$this->_Line_Height-2);
-				$pdf->SetDrawColor(0,0,0);
-			}
-			$pdf->SetXY($_PosX, $_PosY+$this->_Height-$this->_Line_Height-1);
-			$pdf->Cell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($footer),0,1,'C');
-		}
-		//print "$_PosY+$this->_Height-$this->_Line_Height-1<br>\n";
-
-		$this->_COUNTY++;
-
-		if ($this->_COUNTY == $this->_Y_Number) {
-			// Si on est en bas de page, on remonte le 'curseur' de position
-			$this->_COUNTX++;
-			$this->_COUNTY=0;
-		}
-
-		if ($this->_COUNTX == $this->_X_Number) {
-			// Si on est en bout de page, alors on repart sur une nouvelle page
-			$this->_COUNTX=0;
-			$this->_COUNTY=0;
-		}
-	}
+        global $db,$mysoc,$conf,$langs;
+        global $forceimgscalewidth,$forceimgscaleheight;
+
+        $imgscalewidth=(empty($forceimgscalewidth)?0.3:$forceimgscalewidth);	// Scale of image for width (1=Full width of sticker)
+        $imgscaleheight=(empty($forceimgscalewidth)?0.5:$forceimgscalewidth);	// Scale of image for height (1=Full height of sticker)
+
+        // We are in a new page, then we must add a page
+        if (($this->_COUNTX ==0) && ($this->_COUNTY==0) and (!$this->_First==1)) {
+            $pdf->AddPage();
+        }
+        $this->_First=0;
+        $_PosX = $this->_Margin_Left+($this->_COUNTX*($this->_Width+$this->_X_Space));
+        $_PosY = $this->_Margin_Top+($this->_COUNTY*($this->_Height+$this->_Y_Space));
+
+        // Define logo
+        $logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+        if (! is_readable($logo))
+        {
+            $logo='';
+            if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
+            {
+                $logo=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
+            }
+            elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+            {
+                $logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+            }
+        }
+
+        $member=new Adherent($db);
+        $member->id = $idmember;
+        $member->ref = $idmember;
+
+        // Define photo
+        $dir=$conf->adherent->dir_output;
+        if (! empty($photo))
+        {
+            $file=get_exdir(0,0,0,0,$member,'member').'photos/'.$photo;
+            $photo=$dir.'/'.$file;
+            if (! is_readable($photo)) $photo='';
+        }
+
+        // Define background image
+        $backgroundimage='';
+        if(! empty($conf->global->ADHERENT_CARD_BACKGROUND) && file_exists($conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND))
+        {
+            $backgroundimage=$conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND;
+        }
+
+        // Print lines
+        if ($this->code == "CARD")
+        {
+            $this->Tformat=$this->_Avery_Labels["CARD"];
+            //$this->_Pointille($pdf,$_PosX,$_PosY,$_PosX+$this->_Width,$_PosY+$this->_Height,0.3,25);
+            $this->_Croix($pdf,$_PosX,$_PosY,$_PosX+$this->_Width,$_PosY+$this->_Height,0.1,10);
+        }
+
+        // Background
+        if ($backgroundimage)
+        {
+            $pdf->image($backgroundimage,$_PosX,$_PosY,$this->_Width,$this->_Height);
+        }
+
+        $xleft=2; $ytop=2;
+
+        // Top
+        if ($header!='')
+        {
+            if ($this->code == "CARD")
+            {
+                $pdf->SetDrawColor(128,128,128);
+                $pdf->Line($_PosX, $_PosY+$this->_Line_Height+1, $_PosX+$this->_Width, $_PosY+$this->_Line_Height+1); // Only 1 mm and not ytop for top text
+                $pdf->SetDrawColor(0,0,0);
+            }
+            $pdf->SetXY($_PosX+$xleft, $_PosY+1); // Only 1 mm and not ytop for top text
+            $pdf->Cell($this->_Width-2*$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($header),0,1,'C');
+        }
+
+
+        $ytop+=(empty($header)?0:(1+$this->_Line_Height));
+
+        // Define widthtouse and heighttouse
+        $maxwidthtouse=round(($this->_Width - 2*$xleft)*$imgscalewidth); $maxheighttouse=round(($this->_Height - 2*$ytop)*$imgscaleheight);
+        $defaultratio=($maxwidthtouse/$maxheighttouse);
+        $widthtouse=$maxwidthtouse; $heighttouse=0;		// old value for image
+        $tmp=dol_getImageSize($photo, false);
+        if ($tmp['height'])
+        {
+            $imgratio=$tmp['width']/$tmp['height'];
+            if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); }
+            else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
+        }
+        //var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
+
+        // Center
+        if ($textright=='')	// Only a left part
+        {
+            // Output left area
+            if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+            else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+            else
+            {
+                $pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
+                $pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
+            }
+        }
+        else if ($textleft!='' && $textright!='')	//
+        {
+            if ($textleft == '__LOGO__' || $textleft == '__PHOTO__')
+            {
+                if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+                else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+                $pdf->SetXY($_PosX+$xleft+$widthtouse+1, $_PosY+$ytop);
+                $pdf->MultiCell($this->_Width-$xleft-$xleft-$widthtouse-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
+            }
+            else if ($textright == '__LOGO__' || $textright == '__PHOTO__')
+            {
+                if ($textright == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+                else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+                $pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
+                $pdf->MultiCell($this->_Width-$widthtouse-$xleft-$xleft-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
+            }
+            else	// text on halft left and text on half right
+            {
+                $pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
+                $pdf->MultiCell(round($this->_Width/2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
+                $pdf->SetXY($_PosX+round($this->_Width/2), $_PosY+$ytop);
+                $pdf->MultiCell(round($this->_Width/2)-2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
+            }
+        }
+        else	// Only a right part
+        {
+            // Output right area
+            if ($textright == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+            else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+            else
+            {
+                $pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
+                $pdf->MultiCell($this->_Width-$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
+            }
+        }
+
+        // Bottom
+        if ($footer!='')
+        {
+            if ($this->code == "CARD")
+            {
+                $pdf->SetDrawColor(128,128,128);
+                $pdf->Line($_PosX, $_PosY+$this->_Height-$this->_Line_Height-2, $_PosX+$this->_Width, $_PosY+$this->_Height-$this->_Line_Height-2);
+                $pdf->SetDrawColor(0,0,0);
+            }
+            $pdf->SetXY($_PosX, $_PosY+$this->_Height-$this->_Line_Height-1);
+            $pdf->Cell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($footer),0,1,'C');
+        }
+        //print "$_PosY+$this->_Height-$this->_Line_Height-1<br>\n";
+
+        $this->_COUNTY++;
+
+        if ($this->_COUNTY == $this->_Y_Number) {
+            // Si on est en bas de page, on remonte le 'curseur' de position
+            $this->_COUNTX++;
+            $this->_COUNTY=0;
+        }
+
+        if ($this->_COUNTX == $this->_X_Number) {
+            // Si on est en bout de page, alors on repart sur une nouvelle page
+            $this->_COUNTX=0;
+            $this->_COUNTY=0;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Function to build PDF on disk, then output on HTTP stream.
-	 *
-	 *	@param	Adherent	$object		        Member object. Old usage: Array of record informations (array('textleft'=>,'textheader'=>, ...'id'=>,'photo'=>)
-	 *	@param	Translate	$outputlangs		Lang object for output language
-	 *	@param	string		$srctemplatepath	Full path of source filename for generator using a template file. Example: '5161', 'AVERYC32010', 'CARD', ...
-	 *	@param	string		$mode				Tell if doc module is called for 'member', ...
-	 *  @param  int         $nooutput           1=Generate only file on disk and do not return it on response
-	 *	@return	int								1=OK, 0=KO
-	 */
-	function write_file($object, $outputlangs, $srctemplatepath, $mode='member', $nooutput=0)
-	{
+    /**
+     *	Function to build PDF on disk, then output on HTTP stream.
+     *
+     *	@param	Adherent	$object		        Member object. Old usage: Array of record informations (array('textleft'=>,'textheader'=>, ...'id'=>,'photo'=>)
+     *	@param	Translate	$outputlangs		Lang object for output language
+     *	@param	string		$srctemplatepath	Full path of source filename for generator using a template file. Example: '5161', 'AVERYC32010', 'CARD', ...
+     *	@param	string		$mode				Tell if doc module is called for 'member', ...
+     *  @param  int         $nooutput           1=Generate only file on disk and do not return it on response
+     *	@return	int								1=OK, 0=KO
+     */
+    function write_file($object, $outputlangs, $srctemplatepath, $mode='member', $nooutput=0)
+    {
         // phpcs:enable
-		global $user,$conf,$langs,$mysoc,$_Avery_Labels;
-
-		$this->code=$srctemplatepath;
-
-		if (is_object($object))
-		{
-		    if ($object->country == '-') $object->country='';
-
-    		// List of values to scan for a replacement
-    		$substitutionarray = array (
-    		    '__ID__'=>$object->rowid,
-    		    '__LOGIN__'=>$object->login,
-    		    '__FIRSTNAME__'=>$object->firstname,
-    		    '__LASTNAME__'=>$object->lastname,
-    		    '__FULLNAME__'=>$object->getFullName($langs),
-    		    '__COMPANY__'=>$object->company,
-    		    '__ADDRESS__'=>$object->address,
-    		    '__ZIP__'=>$object->zip,
-    		    '__TOWN__'=>$object->town,
-    		    '__COUNTRY__'=>$object->country,
-    		    '__COUNTRY_CODE__'=>$object->country_code,
-    		    '__EMAIL__'=>$object->email,
-    		    '__BIRTH__'=>dol_print_date($object->birth,'day'),
-    		    '__TYPE__'=>$object->type,
-    		    '__YEAR__'=>$year,
-    		    '__MONTH__'=>$month,
-    		    '__DAY__'=>$day,
-    		    '__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
-    		    '__SERVER__'=>"http://".$_SERVER["SERVER_NAME"]."/"
-    		);
-    		complete_substitutions_array($substitutionarray, $langs);
-
-    		// For business cards
-		    $textleft=make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
-		    $textheader=make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
-		    $textfooter=make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
-		    $textright=make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
-
-		    $nb = $_Avery_Labels[$this->code]['NX'] * $_Avery_Labels[$this->code]['NY'];
-		    if ($nb <= 0) $nb=1;  // Protection to avoid empty page
-
-		    for($j=0;$j<$nb;$j++)
-	        {
-	            $arrayofmembers[]=array(
-	                'textleft'=>$textleft,
-	                'textheader'=>$textheader,
-	                'textfooter'=>$textfooter,
-	                'textright'=>$textright,
-	                'id'=>$object->rowid,
-	                'photo'=>$object->photo
-	            );
-	        }
-
-    		$arrayofrecords = $arrayofmembers;
-		}
-		else
-		{
-		    $arrayofrecords = $object;
-		}
-
-		//var_dump($arrayofrecords);exit;
-
-		$this->Tformat = $_Avery_Labels[$this->code];
-		if (empty($this->Tformat)) { dol_print_error('','ErrorBadTypeForCard'.$this->code); exit; }
-		$this->type = 'pdf';
+        global $user,$conf,$langs,$mysoc,$_Avery_Labels;
+
+        $this->code=$srctemplatepath;
+
+        if (is_object($object))
+        {
+            if ($object->country == '-') $object->country='';
+
+            // List of values to scan for a replacement
+            $substitutionarray = array (
+                '__ID__'=>$object->rowid,
+                '__LOGIN__'=>$object->login,
+                '__FIRSTNAME__'=>$object->firstname,
+                '__LASTNAME__'=>$object->lastname,
+                '__FULLNAME__'=>$object->getFullName($langs),
+                '__COMPANY__'=>$object->company,
+                '__ADDRESS__'=>$object->address,
+                '__ZIP__'=>$object->zip,
+                '__TOWN__'=>$object->town,
+                '__COUNTRY__'=>$object->country,
+                '__COUNTRY_CODE__'=>$object->country_code,
+                '__EMAIL__'=>$object->email,
+                '__BIRTH__'=>dol_print_date($object->birth,'day'),
+                '__TYPE__'=>$object->type,
+                '__YEAR__'=>$year,
+                '__MONTH__'=>$month,
+                '__DAY__'=>$day,
+                '__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
+                '__SERVER__'=>"http://".$_SERVER["SERVER_NAME"]."/"
+            );
+            complete_substitutions_array($substitutionarray, $langs);
+
+            // For business cards
+            $textleft=make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
+            $textheader=make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
+            $textfooter=make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
+            $textright=make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
+
+            $nb = $_Avery_Labels[$this->code]['NX'] * $_Avery_Labels[$this->code]['NY'];
+            if ($nb <= 0) $nb=1;  // Protection to avoid empty page
+
+            for($j=0;$j<$nb;$j++)
+            {
+                $arrayofmembers[]=array(
+                    'textleft'=>$textleft,
+                    'textheader'=>$textheader,
+                    'textfooter'=>$textfooter,
+                    'textright'=>$textright,
+                    'id'=>$object->rowid,
+                    'photo'=>$object->photo
+                );
+            }
+
+            $arrayofrecords = $arrayofmembers;
+        }
+        else
+        {
+            $arrayofrecords = $object;
+        }
+
+        //var_dump($arrayofrecords);exit;
+
+        $this->Tformat = $_Avery_Labels[$this->code];
+        if (empty($this->Tformat)) { dol_print_error('','ErrorBadTypeForCard'.$this->code); exit; }
+        $this->type = 'pdf';
         // standard format or custom
         if ($this->Tformat['paper-size']!='custom') {
             $this->format = $this->Tformat['paper-size'];
@@ -325,124 +325,124 @@ 
             $this->format = $resolution;
         }
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-
-		// Load traductions files requiredby by page
-		$outputlangs->loadLangs(array("main", "dict", "companies", "admin", "members"));
-
-		if (empty($mode) || $mode == 'member')
-		{
-			$title=$outputlangs->transnoentities('MembersCards');
-			$keywords=$outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name);
-		}
-		else
-		{
-			dol_print_error('','Bad value for $mode');
-			return -1;
-		}
-
-		$filename = 'tmp_cards.pdf';
-		if (is_object($object))
-		{
-		    $outputdir = $conf->adherent->dir_output;
-		    $dir = $outputdir."/".get_exdir(0, 0, 0, 0, $object, 'member');
-		    $file = $dir.'/'.$filename;
-		}
-		else
-		{
-		    $outputdir = $conf->adherent->dir_temp;
-		    $dir = $outputdir;
-		    $file = $dir.'/'.$filename;
-		}
-
-		//var_dump($file);exit;
-
-		if (! file_exists($dir))
-		{
-			if (dol_mkdir($dir) < 0)
-			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
-				return 0;
-			}
-		}
-
-		$pdf=pdf_getInstance($this->format,$this->Tformat['metric'], $this->Tformat['orientation']);
-
-		if (class_exists('TCPDF'))
-		{
-			$pdf->setPrintHeader(false);
-			$pdf->setPrintFooter(false);
-		}
-		$pdf->SetFont(pdf_getPDFFont($outputlangs));
-
-		$pdf->SetTitle($title);
-		$pdf->SetSubject($title);
-		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
-		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-		$pdf->SetKeyWords($keywords);
-		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
-
-		$pdf->SetMargins(0,0);
-		$pdf->SetAutoPageBreak(false);
-
-		$this->_Metric_Doc = $this->Tformat['metric'];
-		// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie
-		$posX=1;
-		$posY=1;
-		if ($posX > 0) $posX--; else $posX=0;
-		if ($posY > 0) $posY--; else $posY=0;
-		$this->_COUNTX = $posX;
-		$this->_COUNTY = $posY;
-		$this->_Set_Format($pdf, $this->Tformat);
-
-
-		$pdf->Open();
-		$pdf->AddPage();
-
-
-		// Add each record
-		foreach($arrayofrecords as $val)
-		{
-			// imprime le texte specifique sur la carte
-			$this->Add_PDF_card($pdf,$val['textleft'],$val['textheader'],$val['textfooter'],$langs,$val['textright'],$val['id'],$val['photo']);
-		}
-
-		//$pdf->SetXY(10, 295);
-		//$pdf->Cell($this->_Width, $this->_Line_Height, 'XXX',0,1,'C');
-
-
-		// Output to file
-		$pdf->Output($file,'F');
-
-		if (! empty($conf->global->MAIN_UMASK))
-			@chmod($file, octdec($conf->global->MAIN_UMASK));
-
-
-		$this->result = array('fullpath'=>$file);
-
-		// Output to http stream
-		if (empty($nooutput))
-		{
-    		clearstatcache();
-
-    		$attachment=true;
-    		if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false;
-    		$type=dol_mimetype($filename);
-
-    		//if ($encoding)   header('Content-Encoding: '.$encoding);
-    		if ($type)		 header('Content-Type: '.$type);
-    		if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
-    		else header('Content-Disposition: inline; filename="'.$filename.'"');
-
-    		// Ajout directives pour resoudre bug IE
-    		header('Cache-Control: Public, must-revalidate');
-    		header('Pragma: public');
-
-    		readfile($file);
-		}
-
-		return 1;
-	}
+        if (! is_object($outputlangs)) $outputlangs=$langs;
+        // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+        if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+
+        // Load traductions files requiredby by page
+        $outputlangs->loadLangs(array("main", "dict", "companies", "admin", "members"));
+
+        if (empty($mode) || $mode == 'member')
+        {
+            $title=$outputlangs->transnoentities('MembersCards');
+            $keywords=$outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name);
+        }
+        else
+        {
+            dol_print_error('','Bad value for $mode');
+            return -1;
+        }
+
+        $filename = 'tmp_cards.pdf';
+        if (is_object($object))
+        {
+            $outputdir = $conf->adherent->dir_output;
+            $dir = $outputdir."/".get_exdir(0, 0, 0, 0, $object, 'member');
+            $file = $dir.'/'.$filename;
+        }
+        else
+        {
+            $outputdir = $conf->adherent->dir_temp;
+            $dir = $outputdir;
+            $file = $dir.'/'.$filename;
+        }
+
+        //var_dump($file);exit;
+
+        if (! file_exists($dir))
+        {
+            if (dol_mkdir($dir) < 0)
+            {
+                $this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+                return 0;
+            }
+        }
+
+        $pdf=pdf_getInstance($this->format,$this->Tformat['metric'], $this->Tformat['orientation']);
+
+        if (class_exists('TCPDF'))
+        {
+            $pdf->setPrintHeader(false);
+            $pdf->setPrintFooter(false);
+        }
+        $pdf->SetFont(pdf_getPDFFont($outputlangs));
+
+        $pdf->SetTitle($title);
+        $pdf->SetSubject($title);
+        $pdf->SetCreator("Dolibarr ".DOL_VERSION);
+        $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+        $pdf->SetKeyWords($keywords);
+        if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+
+        $pdf->SetMargins(0,0);
+        $pdf->SetAutoPageBreak(false);
+
+        $this->_Metric_Doc = $this->Tformat['metric'];
+        // Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie
+        $posX=1;
+        $posY=1;
+        if ($posX > 0) $posX--; else $posX=0;
+        if ($posY > 0) $posY--; else $posY=0;
+        $this->_COUNTX = $posX;
+        $this->_COUNTY = $posY;
+        $this->_Set_Format($pdf, $this->Tformat);
+
+
+        $pdf->Open();
+        $pdf->AddPage();
+
+
+        // Add each record
+        foreach($arrayofrecords as $val)
+        {
+            // imprime le texte specifique sur la carte
+            $this->Add_PDF_card($pdf,$val['textleft'],$val['textheader'],$val['textfooter'],$langs,$val['textright'],$val['id'],$val['photo']);
+        }
+
+        //$pdf->SetXY(10, 295);
+        //$pdf->Cell($this->_Width, $this->_Line_Height, 'XXX',0,1,'C');
+
+
+        // Output to file
+        $pdf->Output($file,'F');
+
+        if (! empty($conf->global->MAIN_UMASK))
+            @chmod($file, octdec($conf->global->MAIN_UMASK));
+
+
+        $this->result = array('fullpath'=>$file);
+
+        // Output to http stream
+        if (empty($nooutput))
+        {
+            clearstatcache();
+
+            $attachment=true;
+            if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false;
+            $type=dol_mimetype($filename);
+
+            //if ($encoding)   header('Content-Encoding: '.$encoding);
+            if ($type)		 header('Content-Type: '.$type);
+            if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
+            else header('Content-Disposition: inline; filename="'.$filename.'"');
+
+            // Ajout directives pour resoudre bug IE
+            header('Cache-Control: Public, must-revalidate');
+            header('Pragma: public');
+
+            readfile($file);
+        }
+
+        return 1;
+    }
 }

Spacing +110 added lines, -110 removed lines

@@ -42,7 +42,7 @@ 
 	 * @param	array		$param			Associative array containing label content and optional parameters
 	 * @return	void
 	 */
-    function addSticker(&$pdf,$outputlangs,$param)
+    function addSticker(&$pdf, $outputlangs, $param)
     {
 		// use this method in future refactoring
 	}
@@ -63,162 +63,162 @@ 
 	 * @param	 string		$photo			Photo (full path to image file used as replacement for key __PHOTOS__ into left, right, header or footer text)
 	 * @return	 void
 	 */
-	function Add_PDF_card(&$pdf,$textleft,$header,$footer,$outputlangs,$textright='',$idmember=0,$photo='')
+	function Add_PDF_card(&$pdf, $textleft, $header, $footer, $outputlangs, $textright = '', $idmember = 0, $photo = '')
 	{
         // phpcs:enable
-		global $db,$mysoc,$conf,$langs;
-		global $forceimgscalewidth,$forceimgscaleheight;
+		global $db, $mysoc, $conf, $langs;
+		global $forceimgscalewidth, $forceimgscaleheight;
 
-		$imgscalewidth=(empty($forceimgscalewidth)?0.3:$forceimgscalewidth);	// Scale of image for width (1=Full width of sticker)
-		$imgscaleheight=(empty($forceimgscalewidth)?0.5:$forceimgscalewidth);	// Scale of image for height (1=Full height of sticker)
+		$imgscalewidth = (empty($forceimgscalewidth) ? 0.3 : $forceimgscalewidth); // Scale of image for width (1=Full width of sticker)
+		$imgscaleheight = (empty($forceimgscalewidth) ? 0.5 : $forceimgscalewidth); // Scale of image for height (1=Full height of sticker)
 
 		// We are in a new page, then we must add a page
-		if (($this->_COUNTX ==0) && ($this->_COUNTY==0) and (!$this->_First==1)) {
+		if (($this->_COUNTX == 0) && ($this->_COUNTY == 0) and (!$this->_First == 1)) {
 			$pdf->AddPage();
 		}
-		$this->_First=0;
-		$_PosX = $this->_Margin_Left+($this->_COUNTX*($this->_Width+$this->_X_Space));
-		$_PosY = $this->_Margin_Top+($this->_COUNTY*($this->_Height+$this->_Y_Space));
+		$this->_First = 0;
+		$_PosX = $this->_Margin_Left + ($this->_COUNTX * ($this->_Width + $this->_X_Space));
+		$_PosY = $this->_Margin_Top + ($this->_COUNTY * ($this->_Height + $this->_Y_Space));
 
 		// Define logo
-		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-		if (! is_readable($logo))
+		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+		if (!is_readable($logo))
 		{
-			$logo='';
-			if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
+			$logo = '';
+			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 			{
-				$logo=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
+				$logo = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
 			}
-			elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+			elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 			{
-				$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+				$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 			}
 		}
 
-		$member=new Adherent($db);
+		$member = new Adherent($db);
 		$member->id = $idmember;
 		$member->ref = $idmember;
 
 		// Define photo
-		$dir=$conf->adherent->dir_output;
-		if (! empty($photo))
+		$dir = $conf->adherent->dir_output;
+		if (!empty($photo))
 		{
-			$file=get_exdir(0,0,0,0,$member,'member').'photos/'.$photo;
-			$photo=$dir.'/'.$file;
-			if (! is_readable($photo)) $photo='';
+			$file = get_exdir(0, 0, 0, 0, $member, 'member').'photos/'.$photo;
+			$photo = $dir.'/'.$file;
+			if (!is_readable($photo)) $photo = '';
 		}
 
 		// Define background image
-		$backgroundimage='';
-		if(! empty($conf->global->ADHERENT_CARD_BACKGROUND) && file_exists($conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND))
+		$backgroundimage = '';
+		if (!empty($conf->global->ADHERENT_CARD_BACKGROUND) && file_exists($conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND))
 		{
-			$backgroundimage=$conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND;
+			$backgroundimage = $conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND;
 		}
 
 		// Print lines
 		if ($this->code == "CARD")
 		{
-			$this->Tformat=$this->_Avery_Labels["CARD"];
+			$this->Tformat = $this->_Avery_Labels["CARD"];
 			//$this->_Pointille($pdf,$_PosX,$_PosY,$_PosX+$this->_Width,$_PosY+$this->_Height,0.3,25);
-			$this->_Croix($pdf,$_PosX,$_PosY,$_PosX+$this->_Width,$_PosY+$this->_Height,0.1,10);
+			$this->_Croix($pdf, $_PosX, $_PosY, $_PosX + $this->_Width, $_PosY + $this->_Height, 0.1, 10);
 		}
 
 		// Background
 		if ($backgroundimage)
 		{
-			$pdf->image($backgroundimage,$_PosX,$_PosY,$this->_Width,$this->_Height);
+			$pdf->image($backgroundimage, $_PosX, $_PosY, $this->_Width, $this->_Height);
 		}
 
-		$xleft=2; $ytop=2;
+		$xleft = 2; $ytop = 2;
 
 		// Top
-		if ($header!='')
+		if ($header != '')
 		{
 			if ($this->code == "CARD")
 			{
-				$pdf->SetDrawColor(128,128,128);
-				$pdf->Line($_PosX, $_PosY+$this->_Line_Height+1, $_PosX+$this->_Width, $_PosY+$this->_Line_Height+1); // Only 1 mm and not ytop for top text
-				$pdf->SetDrawColor(0,0,0);
+				$pdf->SetDrawColor(128, 128, 128);
+				$pdf->Line($_PosX, $_PosY + $this->_Line_Height + 1, $_PosX + $this->_Width, $_PosY + $this->_Line_Height + 1); // Only 1 mm and not ytop for top text
+				$pdf->SetDrawColor(0, 0, 0);
 			}
-			$pdf->SetXY($_PosX+$xleft, $_PosY+1); // Only 1 mm and not ytop for top text
-			$pdf->Cell($this->_Width-2*$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($header),0,1,'C');
+			$pdf->SetXY($_PosX + $xleft, $_PosY + 1); // Only 1 mm and not ytop for top text
+			$pdf->Cell($this->_Width - 2 * $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($header), 0, 1, 'C');
 		}
 
 
-		$ytop+=(empty($header)?0:(1+$this->_Line_Height));
+		$ytop += (empty($header) ? 0 : (1 + $this->_Line_Height));
 
 		// Define widthtouse and heighttouse
-		$maxwidthtouse=round(($this->_Width - 2*$xleft)*$imgscalewidth); $maxheighttouse=round(($this->_Height - 2*$ytop)*$imgscaleheight);
-		$defaultratio=($maxwidthtouse/$maxheighttouse);
-		$widthtouse=$maxwidthtouse; $heighttouse=0;		// old value for image
-		$tmp=dol_getImageSize($photo, false);
+		$maxwidthtouse = round(($this->_Width - 2 * $xleft) * $imgscalewidth); $maxheighttouse = round(($this->_Height - 2 * $ytop) * $imgscaleheight);
+		$defaultratio = ($maxwidthtouse / $maxheighttouse);
+		$widthtouse = $maxwidthtouse; $heighttouse = 0; // old value for image
+		$tmp = dol_getImageSize($photo, false);
 		if ($tmp['height'])
 		{
-			$imgratio=$tmp['width']/$tmp['height'];
+			$imgratio = $tmp['width'] / $tmp['height'];
 			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); }
 			else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
 		}
 		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
 
 		// Center
-		if ($textright=='')	// Only a left part
+		if ($textright == '')	// Only a left part
 		{
 			// Output left area
-			if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+			if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+			else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			else
 			{
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
+				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
+				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
 		}
-		else if ($textleft!='' && $textright!='')	//
+		else if ($textleft != '' && $textright != '')	//
 		{
 			if ($textleft == '__LOGO__' || $textleft == '__PHOTO__')
 			{
-				if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				$pdf->SetXY($_PosX+$xleft+$widthtouse+1, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width-$xleft-$xleft-$widthtouse-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
+				if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				$pdf->SetXY($_PosX + $xleft + $widthtouse + 1, $_PosY + $ytop);
+				$pdf->MultiCell($this->_Width - $xleft - $xleft - $widthtouse - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
 			else if ($textright == '__LOGO__' || $textright == '__PHOTO__')
 			{
-				if ($textright == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width-$widthtouse-$xleft-$xleft-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
+				if ($textright == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
+				$pdf->MultiCell($this->_Width - $widthtouse - $xleft - $xleft - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
 			else	// text on halft left and text on half right
 			{
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell(round($this->_Width/2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
-				$pdf->SetXY($_PosX+round($this->_Width/2), $_PosY+$ytop);
-				$pdf->MultiCell(round($this->_Width/2)-2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
+				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
+				$pdf->MultiCell(round($this->_Width / 2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
+				$pdf->SetXY($_PosX + round($this->_Width / 2), $_PosY + $ytop);
+				$pdf->MultiCell(round($this->_Width / 2) - 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
 		}
 		else	// Only a right part
 		{
 			// Output right area
-			if ($textright == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+			if ($textright == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+			else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			else
 			{
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width-$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
+				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
+				$pdf->MultiCell($this->_Width - $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
 		}
 
 		// Bottom
-		if ($footer!='')
+		if ($footer != '')
 		{
 			if ($this->code == "CARD")
 			{
-				$pdf->SetDrawColor(128,128,128);
-				$pdf->Line($_PosX, $_PosY+$this->_Height-$this->_Line_Height-2, $_PosX+$this->_Width, $_PosY+$this->_Height-$this->_Line_Height-2);
-				$pdf->SetDrawColor(0,0,0);
+				$pdf->SetDrawColor(128, 128, 128);
+				$pdf->Line($_PosX, $_PosY + $this->_Height - $this->_Line_Height - 2, $_PosX + $this->_Width, $_PosY + $this->_Height - $this->_Line_Height - 2);
+				$pdf->SetDrawColor(0, 0, 0);
 			}
-			$pdf->SetXY($_PosX, $_PosY+$this->_Height-$this->_Line_Height-1);
-			$pdf->Cell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($footer),0,1,'C');
+			$pdf->SetXY($_PosX, $_PosY + $this->_Height - $this->_Line_Height - 1);
+			$pdf->Cell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($footer), 0, 1, 'C');
 		}
 		//print "$_PosY+$this->_Height-$this->_Line_Height-1<br>\n";
 
@@ -227,13 +227,13 @@ 
 		if ($this->_COUNTY == $this->_Y_Number) {
 			// Si on est en bas de page, on remonte le 'curseur' de position
 			$this->_COUNTX++;
-			$this->_COUNTY=0;
+			$this->_COUNTY = 0;
 		}
 
 		if ($this->_COUNTX == $this->_X_Number) {
 			// Si on est en bout de page, alors on repart sur une nouvelle page
-			$this->_COUNTX=0;
-			$this->_COUNTY=0;
+			$this->_COUNTX = 0;
+			$this->_COUNTY = 0;
 		}
 	}
 
@@ -248,19 +248,19 @@ 
 	 *  @param  int         $nooutput           1=Generate only file on disk and do not return it on response
 	 *	@return	int								1=OK, 0=KO
 	 */
-	function write_file($object, $outputlangs, $srctemplatepath, $mode='member', $nooutput=0)
+	function write_file($object, $outputlangs, $srctemplatepath, $mode = 'member', $nooutput = 0)
 	{
         // phpcs:enable
-		global $user,$conf,$langs,$mysoc,$_Avery_Labels;
+		global $user, $conf, $langs, $mysoc, $_Avery_Labels;
 
-		$this->code=$srctemplatepath;
+		$this->code = $srctemplatepath;
 
 		if (is_object($object))
 		{
-		    if ($object->country == '-') $object->country='';
+		    if ($object->country == '-') $object->country = '';
 
     		// List of values to scan for a replacement
-    		$substitutionarray = array (
+    		$substitutionarray = array(
     		    '__ID__'=>$object->rowid,
     		    '__LOGIN__'=>$object->login,
     		    '__FIRSTNAME__'=>$object->firstname,
@@ -273,7 +273,7 @@ 
     		    '__COUNTRY__'=>$object->country,
     		    '__COUNTRY_CODE__'=>$object->country_code,
     		    '__EMAIL__'=>$object->email,
-    		    '__BIRTH__'=>dol_print_date($object->birth,'day'),
+    		    '__BIRTH__'=>dol_print_date($object->birth, 'day'),
     		    '__TYPE__'=>$object->type,
     		    '__YEAR__'=>$year,
     		    '__MONTH__'=>$month,
@@ -284,17 +284,17 @@ 
     		complete_substitutions_array($substitutionarray, $langs);
 
     		// For business cards
-		    $textleft=make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
-		    $textheader=make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
-		    $textfooter=make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
-		    $textright=make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
+		    $textleft = make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
+		    $textheader = make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
+		    $textfooter = make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
+		    $textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
 
 		    $nb = $_Avery_Labels[$this->code]['NX'] * $_Avery_Labels[$this->code]['NY'];
-		    if ($nb <= 0) $nb=1;  // Protection to avoid empty page
+		    if ($nb <= 0) $nb = 1; // Protection to avoid empty page
 
-		    for($j=0;$j<$nb;$j++)
+		    for ($j = 0; $j < $nb; $j++)
 	        {
-	            $arrayofmembers[]=array(
+	            $arrayofmembers[] = array(
 	                'textleft'=>$textleft,
 	                'textheader'=>$textheader,
 	                'textfooter'=>$textfooter,
@@ -314,32 +314,32 @@ 
 		//var_dump($arrayofrecords);exit;
 
 		$this->Tformat = $_Avery_Labels[$this->code];
-		if (empty($this->Tformat)) { dol_print_error('','ErrorBadTypeForCard'.$this->code); exit; }
+		if (empty($this->Tformat)) { dol_print_error('', 'ErrorBadTypeForCard'.$this->code); exit; }
 		$this->type = 'pdf';
         // standard format or custom
-        if ($this->Tformat['paper-size']!='custom') {
+        if ($this->Tformat['paper-size'] != 'custom') {
             $this->format = $this->Tformat['paper-size'];
         } else {
             //custom
-            $resolution= array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
+            $resolution = array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
             $this->format = $resolution;
         }
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "admin", "members"));
 
 		if (empty($mode) || $mode == 'member')
 		{
-			$title=$outputlangs->transnoentities('MembersCards');
-			$keywords=$outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name);
+			$title = $outputlangs->transnoentities('MembersCards');
+			$keywords = $outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name);
 		}
 		else
 		{
-			dol_print_error('','Bad value for $mode');
+			dol_print_error('', 'Bad value for $mode');
 			return -1;
 		}
 
@@ -359,16 +359,16 @@ 
 
 		//var_dump($file);exit;
 
-		if (! file_exists($dir))
+		if (!file_exists($dir))
 		{
 			if (dol_mkdir($dir) < 0)
 			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
 
-		$pdf=pdf_getInstance($this->format,$this->Tformat['metric'], $this->Tformat['orientation']);
+		$pdf = pdf_getInstance($this->format, $this->Tformat['metric'], $this->Tformat['orientation']);
 
 		if (class_exists('TCPDF'))
 		{
@@ -382,17 +382,17 @@ 
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($keywords);
-		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-		$pdf->SetMargins(0,0);
+		$pdf->SetMargins(0, 0);
 		$pdf->SetAutoPageBreak(false);
 
 		$this->_Metric_Doc = $this->Tformat['metric'];
 		// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie
-		$posX=1;
-		$posY=1;
-		if ($posX > 0) $posX--; else $posX=0;
-		if ($posY > 0) $posY--; else $posY=0;
+		$posX = 1;
+		$posY = 1;
+		if ($posX > 0) $posX--; else $posX = 0;
+		if ($posY > 0) $posY--; else $posY = 0;
 		$this->_COUNTX = $posX;
 		$this->_COUNTY = $posY;
 		$this->_Set_Format($pdf, $this->Tformat);
@@ -403,10 +403,10 @@ 
 
 
 		// Add each record
-		foreach($arrayofrecords as $val)
+		foreach ($arrayofrecords as $val)
 		{
 			// imprime le texte specifique sur la carte
-			$this->Add_PDF_card($pdf,$val['textleft'],$val['textheader'],$val['textfooter'],$langs,$val['textright'],$val['id'],$val['photo']);
+			$this->Add_PDF_card($pdf, $val['textleft'], $val['textheader'], $val['textfooter'], $langs, $val['textright'], $val['id'], $val['photo']);
 		}
 
 		//$pdf->SetXY(10, 295);
@@ -414,9 +414,9 @@ 
 
 
 		// Output to file
-		$pdf->Output($file,'F');
+		$pdf->Output($file, 'F');
 
-		if (! empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK))
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 
@@ -427,9 +427,9 @@ 
 		{
     		clearstatcache();
 
-    		$attachment=true;
-    		if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false;
-    		$type=dol_mimetype($filename);
+    		$attachment = true;
+    		if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment = false;
+    		$type = dol_mimetype($filename);
 
     		//if ($encoding)   header('Content-Encoding: '.$encoding);
     		if ($type)		 header('Content-Type: '.$type);

Braces +71 added lines, -41 removed lines

@@ -88,8 +88,7 @@ 
 			if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 			{
 				$logo=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-			}
-			elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+			} elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 			{
 				$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 			}
@@ -105,7 +104,9 @@ 
 		{
 			$file=get_exdir(0,0,0,0,$member,'member').'photos/'.$photo;
 			$photo=$dir.'/'.$file;
-			if (! is_readable($photo)) $photo='';
+			if (! is_readable($photo)) {
+			    $photo='';
+			}
 		}
 
 		// Define background image
@@ -155,53 +156,58 @@ 
 		if ($tmp['height'])
 		{
 			$imgratio=$tmp['width']/$tmp['height'];
-			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); }
-			else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
+			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); } else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
 		}
 		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
 
 		// Center
-		if ($textright=='')	// Only a left part
+		if ($textright=='') {
+		    // Only a left part
 		{
 			// Output left area
 			if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else
+		} else if ($textleft == '__PHOTO__' && $photo) {
+			    $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+			} else
 			{
 				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
 			}
-		}
-		else if ($textleft!='' && $textright!='')	//
+		} else if ($textleft!='' && $textright!='') {
+		    //
 		{
 			if ($textleft == '__LOGO__' || $textleft == '__PHOTO__')
 			{
 				if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+		} else if ($textleft == '__PHOTO__' && $photo) {
+				    $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+				}
 				$pdf->SetXY($_PosX+$xleft+$widthtouse+1, $_PosY+$ytop);
 				$pdf->MultiCell($this->_Width-$xleft-$xleft-$widthtouse-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
-			}
-			else if ($textright == '__LOGO__' || $textright == '__PHOTO__')
+			} else if ($textright == '__LOGO__' || $textright == '__PHOTO__')
 			{
-				if ($textright == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+				if ($textright == '__LOGO__' && $logo) {
+				    $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+				} else if ($textright == '__PHOTO__' && $photo) {
+				    $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+				}
 				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
 				$pdf->MultiCell($this->_Width-$widthtouse-$xleft-$xleft-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
-			}
-			else	// text on halft left and text on half right
+			} else	// text on halft left and text on half right
 			{
 				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
 				$pdf->MultiCell(round($this->_Width/2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
 				$pdf->SetXY($_PosX+round($this->_Width/2), $_PosY+$ytop);
 				$pdf->MultiCell(round($this->_Width/2)-2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
 			}
-		}
-		else	// Only a right part
+		} else	// Only a right part
 		{
 			// Output right area
-			if ($textright == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else
+			if ($textright == '__LOGO__' && $logo) {
+			    $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+			} else if ($textright == '__PHOTO__' && $photo) {
+			    $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+			} else
 			{
 				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
 				$pdf->MultiCell($this->_Width-$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
@@ -257,7 +263,9 @@ 
 
 		if (is_object($object))
 		{
-		    if ($object->country == '-') $object->country='';
+		    if ($object->country == '-') {
+		        $object->country='';
+		    }
 
     		// List of values to scan for a replacement
     		$substitutionarray = array (
@@ -290,7 +298,10 @@ 
 		    $textright=make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
 
 		    $nb = $_Avery_Labels[$this->code]['NX'] * $_Avery_Labels[$this->code]['NY'];
-		    if ($nb <= 0) $nb=1;  // Protection to avoid empty page
+		    if ($nb <= 0) {
+		        $nb=1;
+		    }
+		    // Protection to avoid empty page
 
 		    for($j=0;$j<$nb;$j++)
 	        {
@@ -305,8 +316,7 @@ 
 	        }
 
     		$arrayofrecords = $arrayofmembers;
-		}
-		else
+		} else
 		{
 		    $arrayofrecords = $object;
 		}
@@ -325,9 +335,13 @@ 
             $this->format = $resolution;
         }
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (! empty($conf->global->MAIN_USE_FPDF)) {
+		    $outputlangs->charset_output='ISO-8859-1';
+		}
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "admin", "members"));
@@ -336,8 +350,7 @@ 
 		{
 			$title=$outputlangs->transnoentities('MembersCards');
 			$keywords=$outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name);
-		}
-		else
+		} else
 		{
 			dol_print_error('','Bad value for $mode');
 			return -1;
@@ -349,8 +362,7 @@ 
 		    $outputdir = $conf->adherent->dir_output;
 		    $dir = $outputdir."/".get_exdir(0, 0, 0, 0, $object, 'member');
 		    $file = $dir.'/'.$filename;
-		}
-		else
+		} else
 		{
 		    $outputdir = $conf->adherent->dir_temp;
 		    $dir = $outputdir;
@@ -382,7 +394,9 @@ 
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($keywords);
-		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+		    $pdf->SetCompression(false);
+		}
 
 		$pdf->SetMargins(0,0);
 		$pdf->SetAutoPageBreak(false);
@@ -391,8 +405,16 @@ 
 		// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie
 		$posX=1;
 		$posY=1;
-		if ($posX > 0) $posX--; else $posX=0;
-		if ($posY > 0) $posY--; else $posY=0;
+		if ($posX > 0) {
+		    $posX--;
+		} else {
+		    $posX=0;
+		}
+		if ($posY > 0) {
+		    $posY--;
+		} else {
+		    $posY=0;
+		}
 		$this->_COUNTX = $posX;
 		$this->_COUNTY = $posY;
 		$this->_Set_Format($pdf, $this->Tformat);
@@ -416,8 +438,9 @@ 
 		// Output to file
 		$pdf->Output($file,'F');
 
-		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));
+		}
 
 
 		$this->result = array('fullpath'=>$file);
@@ -428,13 +451,20 @@ 
     		clearstatcache();
 
     		$attachment=true;
-    		if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false;
+    		if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) {
+    		    $attachment=false;
+    		}
     		$type=dol_mimetype($filename);
 
     		//if ($encoding)   header('Content-Encoding: '.$encoding);
-    		if ($type)		 header('Content-Type: '.$type);
-    		if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
-    		else header('Content-Disposition: inline; filename="'.$filename.'"');
+    		if ($type) {
+    		    header('Content-Type: '.$type);
+    		}
+    		if ($attachment) {
+    		    header('Content-Disposition: attachment; filename="'.$filename.'"');
+    		} else {
+    		    header('Content-Disposition: inline; filename="'.$filename.'"');
+    		}
 
     		// Ajout directives pour resoudre bug IE
     		header('Cache-Control: Public, must-revalidate');

dolibarr/htdocs/core/modules/member/modules_cards.php

Indentation +108 added lines, -108 removed lines

@@ -34,33 +34,33 @@ 
  */
 class ModelePDFCards
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return list of active generation modules
-	 *
-	 *	@param	DoliDB	$db					Database handler
-	 *	@param	integer	$maxfilenamelength	Max length of value to show
-	 *	@return	array						List of templates
-	 */
-	function liste_modeles($db,$maxfilenamelength=0)
-	{
+    /**
+     *	Return list of active generation modules
+     *
+     *	@param	DoliDB	$db					Database handler
+     *	@param	integer	$maxfilenamelength	Max length of value to show
+     *	@return	array						List of templates
+     */
+    function liste_modeles($db,$maxfilenamelength=0)
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		$type='member';
-		$liste=array();
+        $type='member';
+        $liste=array();
 
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+        $liste=getListOfModels($db,$type,$maxfilenamelength);
 
-		return $liste;
-	}
+        return $liste;
+    }
 }
 
 
@@ -79,92 +79,92 @@ 
 function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $outputdir='', $template='standard')
 {
     // phpcs:enable
-	global $conf,$langs;
-	$langs->load("members");
-
-	$error=0;
-
-	// Increase limit for PDF build
-	$err=error_reporting();
-	error_reporting(0);
-	@set_time_limit(120);
-	error_reporting($err);
-
-	$code='';
-	$srctemplatepath='';
-
-	// Positionne le modele sur le nom du modele a utiliser
-	if (! dol_strlen($modele))
-	{
-		if (! empty($conf->global->ADHERENT_CARDS_ADDON_PDF))
-		{
-			$code = $conf->global->ADHERENT_CARDS_ADDON_PDF;
-		}
-		else
-		{
-			$code = $modele;
-		}
-	}
-	else $code=$modele;
-
-	// If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$template,2);
-	if (! empty($tmp[1]))
-	{
-		$template=$tmp[0];
-		$srctemplatepath=$tmp[1];
-	}
-	else $srctemplatepath=$code;
-
-	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
-	{
-		foreach(array('doc','pdf') as $prefix)
-		{
-			$file = $prefix."_".$template.".class.php";
-
-			// On verifie l'emplacement du modele
-			$file=dol_buildpath($reldir."core/modules/member/doc/".$file,0);
-			if (file_exists($file))
-			{
-				$filefound=1;
-				$classname=$prefix.'_'.$template;
-				break;
-			}
-		}
-		if ($filefound) break;
-	}
-
-
-	// Charge le modele
-	if ($filefound)
-	{
-		require_once $file;
-
-		$obj = new $classname($db);
-
-		// We save charset_output to restore it because write_file can change it if needed for
-		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($arrayofmembers, $outputlangs, $srctemplatepath) > 0)
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-			return 1;
-		}
-		else
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"members_card_pdf_create Error: ".$obj->error);
-			return -1;
-		}
-	}
-
-	else
-	{
-		dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file));
-		return -1;
-	}
+    global $conf,$langs;
+    $langs->load("members");
+
+    $error=0;
+
+    // Increase limit for PDF build
+    $err=error_reporting();
+    error_reporting(0);
+    @set_time_limit(120);
+    error_reporting($err);
+
+    $code='';
+    $srctemplatepath='';
+
+    // Positionne le modele sur le nom du modele a utiliser
+    if (! dol_strlen($modele))
+    {
+        if (! empty($conf->global->ADHERENT_CARDS_ADDON_PDF))
+        {
+            $code = $conf->global->ADHERENT_CARDS_ADDON_PDF;
+        }
+        else
+        {
+            $code = $modele;
+        }
+    }
+    else $code=$modele;
+
+    // If selected modele is a filename template (then $modele="modelname:filename")
+    $tmp=explode(':',$template,2);
+    if (! empty($tmp[1]))
+    {
+        $template=$tmp[0];
+        $srctemplatepath=$tmp[1];
+    }
+    else $srctemplatepath=$code;
+
+    // Search template files
+    $file=''; $classname=''; $filefound=0;
+    $dirmodels=array('/');
+    if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+    foreach($dirmodels as $reldir)
+    {
+        foreach(array('doc','pdf') as $prefix)
+        {
+            $file = $prefix."_".$template.".class.php";
+
+            // On verifie l'emplacement du modele
+            $file=dol_buildpath($reldir."core/modules/member/doc/".$file,0);
+            if (file_exists($file))
+            {
+                $filefound=1;
+                $classname=$prefix.'_'.$template;
+                break;
+            }
+        }
+        if ($filefound) break;
+    }
+
+
+    // Charge le modele
+    if ($filefound)
+    {
+        require_once $file;
+
+        $obj = new $classname($db);
+
+        // We save charset_output to restore it because write_file can change it if needed for
+        // output format that does not support UTF8.
+        $sav_charset_output=$outputlangs->charset_output;
+        if ($obj->write_file($arrayofmembers, $outputlangs, $srctemplatepath) > 0)
+        {
+            $outputlangs->charset_output=$sav_charset_output;
+            return 1;
+        }
+        else
+        {
+            $outputlangs->charset_output=$sav_charset_output;
+            dol_print_error($db,"members_card_pdf_create Error: ".$obj->error);
+            return -1;
+        }
+    }
+
+    else
+    {
+        dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file));
+        return -1;
+    }
 }

Spacing +32 added lines, -32 removed lines

@@ -37,7 +37,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -48,16 +48,16 @@ 
 	 *	@param	integer	$maxfilenamelength	Max length of value to show
 	 *	@return	array						List of templates
 	 */
-	function liste_modeles($db,$maxfilenamelength=0)
+	function liste_modeles($db, $maxfilenamelength = 0)
 	{
         // phpcs:enable
 		global $conf;
 
-		$type='member';
-		$liste=array();
+		$type = 'member';
+		$liste = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		$liste = getListOfModels($db, $type, $maxfilenamelength);
 
 		return $liste;
 	}
@@ -76,27 +76,27 @@ 
  *	@param	string		$template		pdf generenate document class to use default 'standard'
  *	@return int							<0 if KO, >0 if OK
  */
-function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $outputdir='', $template='standard')
+function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $outputdir = '', $template = 'standard')
 {
     // phpcs:enable
-	global $conf,$langs;
+	global $conf, $langs;
 	$langs->load("members");
 
-	$error=0;
+	$error = 0;
 
 	// Increase limit for PDF build
-	$err=error_reporting();
+	$err = error_reporting();
 	error_reporting(0);
 	@set_time_limit(120);
 	error_reporting($err);
 
-	$code='';
-	$srctemplatepath='';
+	$code = '';
+	$srctemplatepath = '';
 
 	// Positionne le modele sur le nom du modele a utiliser
-	if (! dol_strlen($modele))
+	if (!dol_strlen($modele))
 	{
-		if (! empty($conf->global->ADHERENT_CARDS_ADDON_PDF))
+		if (!empty($conf->global->ADHERENT_CARDS_ADDON_PDF))
 		{
 			$code = $conf->global->ADHERENT_CARDS_ADDON_PDF;
 		}
@@ -105,33 +105,33 @@ 
 			$code = $modele;
 		}
 	}
-	else $code=$modele;
+	else $code = $modele;
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$template,2);
-	if (! empty($tmp[1]))
+	$tmp = explode(':', $template, 2);
+	if (!empty($tmp[1]))
 	{
-		$template=$tmp[0];
-		$srctemplatepath=$tmp[1];
+		$template = $tmp[0];
+		$srctemplatepath = $tmp[1];
 	}
-	else $srctemplatepath=$code;
+	else $srctemplatepath = $code;
 
 	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array('/');
+	if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir)
 	{
-		foreach(array('doc','pdf') as $prefix)
+		foreach (array('doc', 'pdf') as $prefix)
 		{
 			$file = $prefix."_".$template.".class.php";
 
 			// On verifie l'emplacement du modele
-			$file=dol_buildpath($reldir."core/modules/member/doc/".$file,0);
+			$file = dol_buildpath($reldir."core/modules/member/doc/".$file, 0);
 			if (file_exists($file))
 			{
-				$filefound=1;
-				$classname=$prefix.'_'.$template;
+				$filefound = 1;
+				$classname = $prefix.'_'.$template;
 				break;
 			}
 		}
@@ -148,23 +148,23 @@ 
 
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
+		$sav_charset_output = $outputlangs->charset_output;
 		if ($obj->write_file($arrayofmembers, $outputlangs, $srctemplatepath) > 0)
 		{
-			$outputlangs->charset_output=$sav_charset_output;
+			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
 		}
 		else
 		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"members_card_pdf_create Error: ".$obj->error);
+			$outputlangs->charset_output = $sav_charset_output;
+			dol_print_error($db, "members_card_pdf_create Error: ".$obj->error);
 			return -1;
 		}
 	}
 
 	else
 	{
-		dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file));
+		dol_print_error('', $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file));
 		return -1;
 	}
 }

Braces +13 added lines, -11 removed lines

@@ -99,13 +99,13 @@ 
 		if (! empty($conf->global->ADHERENT_CARDS_ADDON_PDF))
 		{
 			$code = $conf->global->ADHERENT_CARDS_ADDON_PDF;
-		}
-		else
+		} else
 		{
 			$code = $modele;
 		}
+	} else {
+	    $code=$modele;
 	}
-	else $code=$modele;
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
 	$tmp=explode(':',$template,2);
@@ -113,13 +113,16 @@ 
 	{
 		$template=$tmp[0];
 		$srctemplatepath=$tmp[1];
+	} else {
+	    $srctemplatepath=$code;
 	}
-	else $srctemplatepath=$code;
 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
 	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+	if (is_array($conf->modules_parts['models'])) {
+	    $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+	}
 	foreach($dirmodels as $reldir)
 	{
 		foreach(array('doc','pdf') as $prefix)
@@ -135,7 +138,9 @@ 
 				break;
 			}
 		}
-		if ($filefound) break;
+		if ($filefound) {
+		    break;
+		}
 	}
 
 
@@ -153,16 +158,13 @@ 
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 			return 1;
-		}
-		else
+		} else
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 			dol_print_error($db,"members_card_pdf_create Error: ".$obj->error);
 			return -1;
 		}
-	}
-
-	else
+	} else
 	{
 		dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file));
 		return -1;

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

Indentation +33 added lines, -33 removed lines

@@ -38,9 +38,9 @@ 
 {
 
     /**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
      */
     function __construct($db)
     {
@@ -161,32 +161,32 @@ 
         $this->export_label[$r]='InterventionCardsAndInterventionLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
         $this->export_permission[$r]=array(array("ficheinter","export"));
         $this->export_fields_array[$r]=array(
-			's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
-			's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode',
-			's.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InterId",'f.ref'=>"InterRef",'f.datec'=>"InterDateCreation",
-			'f.duree'=>"InterDuration",'f.fk_statut'=>'InterStatus','f.description'=>"InterNote", 'pj.ref'=>'ProjectRef', 'fd.rowid'=>'InterLineId',
-			'fd.date'=>"InterLineDate",'fd.duree'=>"InterLineDuration",'fd.description'=>"InterLineDesc"
-		);
+            's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
+            's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode',
+            's.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InterId",'f.ref'=>"InterRef",'f.datec'=>"InterDateCreation",
+            'f.duree'=>"InterDuration",'f.fk_statut'=>'InterStatus','f.description'=>"InterNote", 'pj.ref'=>'ProjectRef', 'fd.rowid'=>'InterLineId',
+            'fd.date'=>"InterLineDate",'fd.duree'=>"InterLineDuration",'fd.description'=>"InterLineDesc"
+        );
         //$this->export_TypeFields_array[$r]=array(
-		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_country:label',
-		//	's.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text',
-		//	's.code_compta_fournisseur'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.duree'=>"Duree",'f.fk_statut'=>'Statut','f.description'=>"Text",
-		//	'f.datee'=>"Date",'f.dateo'=>"Date",'f.fulldayevent'=>"Boolean",'fd.date'=>"Date",'fd.duree'=>"Duree",'fd.description'=>"Text",
-		//	'fd.total_ht'=>"Numeric"
-		//);
+        //	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_country:label',
+        //	's.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text',
+        //	's.code_compta_fournisseur'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.duree'=>"Duree",'f.fk_statut'=>'Statut','f.description'=>"Text",
+        //	'f.datee'=>"Date",'f.dateo'=>"Date",'f.fulldayevent'=>"Boolean",'fd.date'=>"Date",'fd.duree'=>"Duree",'fd.description'=>"Text",
+        //	'fd.total_ht'=>"Numeric"
+        //);
         $this->export_TypeFields_array[$r]=array(
-			's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_country:label','s.phone'=>'Text','s.siren'=>'Text',
-			's.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",
-			'f.duree'=>"Duree",'f.fk_statut'=>'Statut','f.description'=>"Text",'f.datee'=>"Date",'f.dateo'=>"Date",'f.fulldayevent'=>"Boolean", 'pj.ref'=>'Text',
-			 'fd.date'=>"Date",'fd.duree'=>"Duree",'fd.description'=>"Text",'fd.total_ht'=>"Numeric"
-		);
+            's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_country:label','s.phone'=>'Text','s.siren'=>'Text',
+            's.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",
+            'f.duree'=>"Duree",'f.fk_statut'=>'Statut','f.description'=>"Text",'f.datee'=>"Date",'f.dateo'=>"Date",'f.fulldayevent'=>"Boolean", 'pj.ref'=>'Text',
+                'fd.date'=>"Date",'fd.duree'=>"Duree",'fd.description'=>"Text",'fd.total_ht'=>"Numeric"
+        );
         $this->export_entities_array[$r]=array(
-			's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company',
-			's.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company',
-			's.code_compta_fournisseur'=>'company','f.rowid'=>"intervention",'f.ref'=>"intervention",'f.datec'=>"intervention",'f.duree'=>"intervention",
-			'f.fk_statut'=>"intervention",'f.description'=>"intervention", 'pj.ref'=>'project', 'fd.rowid'=>"inter_line",'fd.date'=>"inter_line",
-			'fd.duree'=>'inter_line','fd.description'=>'inter_line'
-		);
+            's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company',
+            's.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company',
+            's.code_compta_fournisseur'=>'company','f.rowid'=>"intervention",'f.ref'=>"intervention",'f.datec'=>"intervention",'f.duree'=>"intervention",
+            'f.fk_statut'=>"intervention",'f.description'=>"intervention", 'pj.ref'=>'project', 'fd.rowid'=>"inter_line",'fd.date'=>"inter_line",
+            'fd.duree'=>'inter_line','fd.description'=>'inter_line'
+        );
         $this->export_dependencies_array[$r]=array('inter_line'=>'fd.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 ';
@@ -201,12 +201,12 @@ 
 
 
     /**
-	 *		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
-	 *
+     *		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
+     *      @return     int             	1 if OK, 0 if KO
      */
     function init($options='')
     {
@@ -216,8 +216,8 @@ 
         $this->remove($options);
 
         $sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'ficheinter' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','ficheinter',".$conf->entity.")",
+                "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'ficheinter' AND entity = ".$conf->entity,
+                "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','ficheinter',".$conf->entity.")",
         );
 
         return $this->_init($sql,$options);

Spacing +43 added lines, -43 removed lines

@@ -28,7 +28,7 @@ 
  *	\brief      Fichier de description et activation du module Ficheinter
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -52,7 +52,7 @@ 
         $this->family = "crm";
         $this->module_position = '45';
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->name = preg_replace('/^mod/i', '', get_class($this));
         $this->description = "Gestion des fiches d'intervention";
 
         // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
@@ -68,14 +68,14 @@ 
         $this->depends = array("modSociete");
         $this->requiredby = array();
         $this->conflictwith = array();
-        $this->langfiles = array("bills","companies","interventions");
+        $this->langfiles = array("bills", "companies", "interventions");
 
         // Config pages
         $this->config_page_url = array("fichinter.php");
 
         // Constants
         $this->const = array();
-        $r=0;
+        $r = 0;
 
         $this->const[$r][0] = "FICHEINTER_ADDON_PDF";
         $this->const[$r][1] = "chaine";
@@ -88,12 +88,12 @@ 
         $r++;
 
         // Boxes
-        $this->boxes = array(0=>array('file'=>'box_ficheinter.php','enabledbydefaulton'=>'Home'));
+        $this->boxes = array(0=>array('file'=>'box_ficheinter.php', 'enabledbydefaulton'=>'Home'));
 
         // Permissions
         $this->rights = array();
         $this->rights_class = 'ficheinter';
-        $r=0;
+        $r = 0;
 
         $r++;
         $this->rights[$r][0] = 61;
@@ -128,7 +128,7 @@ 
         $this->rights[$r][1] = 'Envoyer les fiches d\'intervention par courriel';
         $this->rights[$r][2] = 'r';
         $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'ficheinter_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
+        $this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
         $this->rights[$r][5] = 'send';
 
         $r++;
@@ -136,7 +136,7 @@ 
         $this->rights[$r][1] = 'Valider les fiches d\'intervention ';
         $this->rights[$r][2] = 'a';
         $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'ficheinter_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
+        $this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
         $this->rights[$r][5] = 'validate';
 
         $r++;
@@ -144,28 +144,28 @@ 
         $this->rights[$r][1] = 'Dévalider les fiches d\'intervention';
         $this->rights[$r][2] = 'a';
         $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'ficheinter_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
+        $this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
         $this->rights[$r][5] = 'unvalidate';
 
 
         // 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=1;
-
-        $this->export_code[$r]=$this->rights_class.'_'.$r;
-        $this->export_label[$r]='InterventionCardsAndInterventionLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        $this->export_permission[$r]=array(array("ficheinter","export"));
-        $this->export_fields_array[$r]=array(
-			's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
-			's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode',
-			's.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InterId",'f.ref'=>"InterRef",'f.datec'=>"InterDateCreation",
-			'f.duree'=>"InterDuration",'f.fk_statut'=>'InterStatus','f.description'=>"InterNote", 'pj.ref'=>'ProjectRef', 'fd.rowid'=>'InterLineId',
-			'fd.date'=>"InterLineDate",'fd.duree'=>"InterLineDuration",'fd.description'=>"InterLineDesc"
+        $r = 1;
+
+        $this->export_code[$r] = $this->rights_class.'_'.$r;
+        $this->export_label[$r] = 'InterventionCardsAndInterventionLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
+        $this->export_permission[$r] = array(array("ficheinter", "export"));
+        $this->export_fields_array[$r] = array(
+			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 's.fk_pays'=>'Country', 's.phone'=>'Phone',
+			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.code_compta'=>'CustomerAccountancyCode',
+			's.code_compta_fournisseur'=>'SupplierAccountancyCode', 'f.rowid'=>"InterId", 'f.ref'=>"InterRef", 'f.datec'=>"InterDateCreation",
+			'f.duree'=>"InterDuration", 'f.fk_statut'=>'InterStatus', 'f.description'=>"InterNote", 'pj.ref'=>'ProjectRef', 'fd.rowid'=>'InterLineId',
+			'fd.date'=>"InterLineDate", 'fd.duree'=>"InterLineDuration", 'fd.description'=>"InterLineDesc"
 		);
         //$this->export_TypeFields_array[$r]=array(
 		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_country:label',
@@ -174,28 +174,28 @@ 
 		//	'f.datee'=>"Date",'f.dateo'=>"Date",'f.fulldayevent'=>"Boolean",'fd.date'=>"Date",'fd.duree'=>"Duree",'fd.description'=>"Text",
 		//	'fd.total_ht'=>"Numeric"
 		//);
-        $this->export_TypeFields_array[$r]=array(
-			's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_country:label','s.phone'=>'Text','s.siren'=>'Text',
-			's.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",
-			'f.duree'=>"Duree",'f.fk_statut'=>'Statut','f.description'=>"Text",'f.datee'=>"Date",'f.dateo'=>"Date",'f.fulldayevent'=>"Boolean", 'pj.ref'=>'Text',
-			 'fd.date'=>"Date",'fd.duree'=>"Duree",'fd.description'=>"Text",'fd.total_ht'=>"Numeric"
+        $this->export_TypeFields_array[$r] = array(
+			's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 's.fk_pays'=>'List:c_country:label', 's.phone'=>'Text', 's.siren'=>'Text',
+			's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 'f.ref'=>"Text", 'f.datec'=>"Date",
+			'f.duree'=>"Duree", 'f.fk_statut'=>'Statut', 'f.description'=>"Text", 'f.datee'=>"Date", 'f.dateo'=>"Date", 'f.fulldayevent'=>"Boolean", 'pj.ref'=>'Text',
+			 'fd.date'=>"Date", 'fd.duree'=>"Duree", 'fd.description'=>"Text", 'fd.total_ht'=>"Numeric"
 		);
-        $this->export_entities_array[$r]=array(
-			's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company',
-			's.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company',
-			's.code_compta_fournisseur'=>'company','f.rowid'=>"intervention",'f.ref'=>"intervention",'f.datec'=>"intervention",'f.duree'=>"intervention",
-			'f.fk_statut'=>"intervention",'f.description'=>"intervention", 'pj.ref'=>'project', 'fd.rowid'=>"inter_line",'fd.date'=>"inter_line",
-			'fd.duree'=>'inter_line','fd.description'=>'inter_line'
+        $this->export_entities_array[$r] = array(
+			's.rowid'=>"company", 's.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 's.fk_pays'=>'company', 's.phone'=>'company',
+			's.siren'=>'company', 's.siret'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.code_compta'=>'company',
+			's.code_compta_fournisseur'=>'company', 'f.rowid'=>"intervention", 'f.ref'=>"intervention", 'f.datec'=>"intervention", 'f.duree'=>"intervention",
+			'f.fk_statut'=>"intervention", 'f.description'=>"intervention", 'pj.ref'=>'project', 'fd.rowid'=>"inter_line", 'fd.date'=>"inter_line",
+			'fd.duree'=>'inter_line', 'fd.description'=>'inter_line'
 		);
-        $this->export_dependencies_array[$r]=array('inter_line'=>'fd.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.'fichinter as f';
-        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON f.fk_projet = pj.rowid';
-        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'fichinterdet as fd ON f.rowid = fd.fk_fichinter,';
-        $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'societe as s';
-        $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
-        $this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('intervention').')';
+        $this->export_dependencies_array[$r] = array('inter_line'=>'fd.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.'fichinter as f';
+        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON f.fk_projet = pj.rowid';
+        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinterdet as fd ON f.rowid = fd.fk_fichinter,';
+        $this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'societe as s';
+        $this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid';
+        $this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('intervention').')';
         $r++;
     }
 
@@ -208,7 +208,7 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
      */
-    function init($options='')
+    function init($options = '')
     {
         global $conf;
 
@@ -220,6 +220,6 @@ 
 			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','ficheinter',".$conf->entity.")",
         );
 
-        return $this->_init($sql,$options);
+        return $this->_init($sql, $options);
     }
 }

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

Indentation +312 added lines, -312 removed lines

@@ -36,319 +36,319 @@
 class modExpedition extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $user;
-
-		$this->db = $db;
-		$this->numero = 80;
-
-		$this->family = "crm";
-		$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->description = "Gestion des expeditions";
-
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto = "sending";
-
-		// Data directories to create when module is enabled
-		$this->dirs = array("/expedition/temp",
-							"/expedition/sending",
-		                    "/expedition/sending/temp",
-		                    "/expedition/receipt",
-		                    "/expedition/receipt/temp",
-							"/doctemplates/shipment",
-							"/doctemplates/delivery"
-		                    );
-
-		// Config pages
-		$this->config_page_url = array("confexped.php");
-
-		// Dependencies
-		$this->depends = array("modCommande");
-		$this->requiredby = array();
-		$this->conflictwith = array();
-		$this->langfiles = array('deliveries','sendings');
-
-		// Constants
-		$this->const = array();
-		$r=0;
-
-		$this->const[$r][0] = "EXPEDITION_ADDON_PDF";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "rouget";
-		$this->const[$r][3] = 'Nom du gestionnaire de generation des bons expeditions en PDF';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "EXPEDITION_ADDON_NUMBER";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "mod_expedition_safor";
-		$this->const[$r][3] = 'Name for numbering manager for shipments';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "EXPEDITION_ADDON_PDF_ODT_PATH";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/shipment";
-		$this->const[$r][3] = "";
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "LIVRAISON_ADDON_PDF";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "typhon";
-		$this->const[$r][3] = 'Nom du gestionnaire de generation des bons de reception en PDF';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "LIVRAISON_ADDON_NUMBER";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "mod_livraison_jade";
-		$this->const[$r][3] = 'Nom du gestionnaire de numerotation des bons de reception';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "LIVRAISON_ADDON_PDF_ODT_PATH";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/delivery";
-		$this->const[$r][3] = "";
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "MAIN_SUBMODULE_EXPEDITION";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "1";
-		$this->const[$r][3] = "Enable shipments";
-		$this->const[$r][4] = 0;
-		$r++;
-
-		// Boxes
-		$this->boxes = array();
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'expedition';
-		$r=0;
-
-		$r++;
-		$this->rights[$r][0] = 101;
-		$this->rights[$r][1] = 'Lire les expeditions';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'lire';
-
-		$r++;
-		$this->rights[$r][0] = 102;
-		$this->rights[$r][1] = 'Creer modifier les expeditions';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'creer';
-
-		$r++;
-		$this->rights[$r][0] = 104;
-		$this->rights[$r][1] = 'Valider les expeditions';
-		$this->rights[$r][2] = 'd';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'shipping_advance';
-		$this->rights[$r][5] = 'validate';
-
-		$r++;
-		$this->rights[$r][0] = 105; // id de la permission
-		$this->rights[$r][1] = 'Envoyer les expeditions aux clients'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'shipping_advance';
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $user;
+
+        $this->db = $db;
+        $this->numero = 80;
+
+        $this->family = "crm";
+        $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->description = "Gestion des expeditions";
+
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto = "sending";
+
+        // Data directories to create when module is enabled
+        $this->dirs = array("/expedition/temp",
+                            "/expedition/sending",
+                            "/expedition/sending/temp",
+                            "/expedition/receipt",
+                            "/expedition/receipt/temp",
+                            "/doctemplates/shipment",
+                            "/doctemplates/delivery"
+                            );
+
+        // Config pages
+        $this->config_page_url = array("confexped.php");
+
+        // Dependencies
+        $this->depends = array("modCommande");
+        $this->requiredby = array();
+        $this->conflictwith = array();
+        $this->langfiles = array('deliveries','sendings');
+
+        // Constants
+        $this->const = array();
+        $r=0;
+
+        $this->const[$r][0] = "EXPEDITION_ADDON_PDF";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "rouget";
+        $this->const[$r][3] = 'Nom du gestionnaire de generation des bons expeditions en PDF';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "EXPEDITION_ADDON_NUMBER";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "mod_expedition_safor";
+        $this->const[$r][3] = 'Name for numbering manager for shipments';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "EXPEDITION_ADDON_PDF_ODT_PATH";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/shipment";
+        $this->const[$r][3] = "";
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "LIVRAISON_ADDON_PDF";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "typhon";
+        $this->const[$r][3] = 'Nom du gestionnaire de generation des bons de reception en PDF';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "LIVRAISON_ADDON_NUMBER";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "mod_livraison_jade";
+        $this->const[$r][3] = 'Nom du gestionnaire de numerotation des bons de reception';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "LIVRAISON_ADDON_PDF_ODT_PATH";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/delivery";
+        $this->const[$r][3] = "";
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "MAIN_SUBMODULE_EXPEDITION";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "1";
+        $this->const[$r][3] = "Enable shipments";
+        $this->const[$r][4] = 0;
+        $r++;
+
+        // Boxes
+        $this->boxes = array();
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'expedition';
+        $r=0;
+
+        $r++;
+        $this->rights[$r][0] = 101;
+        $this->rights[$r][1] = 'Lire les expeditions';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'lire';
+
+        $r++;
+        $this->rights[$r][0] = 102;
+        $this->rights[$r][1] = 'Creer modifier les expeditions';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'creer';
+
+        $r++;
+        $this->rights[$r][0] = 104;
+        $this->rights[$r][1] = 'Valider les expeditions';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'shipping_advance';
+        $this->rights[$r][5] = 'validate';
+
+        $r++;
+        $this->rights[$r][0] = 105; // id de la permission
+        $this->rights[$r][1] = 'Envoyer les expeditions aux clients'; // libelle de la permission
+        $this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'shipping_advance';
         $this->rights[$r][5] = 'send';
 
-		$r++;
-		$this->rights[$r][0] = 106;
-		$this->rights[$r][1] = 'Exporter les expeditions';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'shipment';
-		$this->rights[$r][5] = 'export';
-
-		$r++;
-		$this->rights[$r][0] = 109;
-		$this->rights[$r][1] = 'Supprimer les expeditions';
-		$this->rights[$r][2] = 'd';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'supprimer';
-
-		$r++;
-		$this->rights[$r][0] = 1101;
-		$this->rights[$r][1] = 'Lire les bons de livraison';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'livraison';
-		$this->rights[$r][5] = 'lire';
-
-		$r++;
-		$this->rights[$r][0] = 1102;
-		$this->rights[$r][1] = 'Creer modifier les bons de livraison';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'livraison';
-		$this->rights[$r][5] = 'creer';
-
-		$r++;
-		$this->rights[$r][0] = 1104;
-		$this->rights[$r][1] = 'Valider les bons de livraison';
-		$this->rights[$r][2] = 'd';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'livraison_advance';
-		$this->rights[$r][5] = 'validate';
-
-		$r++;
-		$this->rights[$r][0] = 1109;
-		$this->rights[$r][1] = 'Supprimer les bons de livraison';
-		$this->rights[$r][2] = 'd';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'livraison';
-		$this->rights[$r][5] = 'supprimer';
-
-
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
-
-		// Exports
-		//--------
-		$r=0;
-
-		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-		$shipment=new Commande($this->db);
-		$contact_arrays=$shipment->liste_type_contact('external','',0,0,'');
-		if (is_array($contact_arrays) && count($contact_arrays)>0){
-			$idcontacts=join(',',array_keys($shipment->liste_type_contact('external','',0,0,'')));
-		} else {
-			$idcontacts=0;
-		}
-
-
-		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='Shipments';	// Translation key (used only if key ExportDataset_xxx_z not found)
-		$this->export_permission[$r]=array(array("expedition","shipment","export"));
-		$this->export_fields_array[$r]=array(
-			's.rowid'=>"IdCompany",'s.nom'=>'ThirdParty','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','d.nom'=>'State','co.label'=>'Country',
-			'co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5',
-			's.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",
-			'c.date_delivery'=>"DateDeliveryPlanned",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",
-			'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",
-			'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel',
-			'p.weight'=>'ProductWeight','p.weight_units'=>'WeightUnits','p.volume'=>'ProductVolume','p.volume_units'=>'VolumeUnits'
-		);
-		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_fields_array[$r]+=array('sp.rowid'=>'IdContact','sp.lastname'=>'Lastname','sp.firstname'=>'Firstname','sp.note_public'=>'NotePublic');
-		//$this->export_TypeFields_array[$r]=array(
-		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label',
-		//	'co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",
-		//	'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",
-		//	'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','ed.qty'=>"Text"
-		//);
-		$this->export_TypeFields_array[$r]=array(
-			's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text',
-			's.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_customer'=>"Text",'c.date_creation'=>"Date",
-			'c.date_delivery'=>"Date",'c.tracking_number'=>"Numeric",'c.height'=>"Numeric",'c.width'=>"Numeric",'c.weight'=>"Numeric",'c.fk_statut'=>'Status',
-			'c.note_public'=>"Text",'ed.qty'=>"Numeric",'d.nom'=>'Text'
-		);
-		$this->export_entities_array[$r]=array(
-			's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','d.nom'=>'company','co.label'=>'company',
-			'co.code'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.siret'=>'company','s.idprof4'=>'company',
-			's.idprof5'=>'company','s.idprof6'=>'company','c.rowid'=>"shipment",'c.ref'=>"shipment",'c.ref_customer'=>"shipment",'c.fk_soc'=>"shipment",
-			'c.date_creation'=>"shipment",'c.date_delivery'=>"shipment",'c.tracking_number'=>'shipment','c.height'=>"shipment",'c.width'=>"shipment",
-			'c.size'=>'shipment','c.size_units'=>'shipment','c.weight'=>"shipment",'c.weight_units'=>'shipment','c.fk_statut'=>"shipment",'c.note_public'=>"shipment",
-			'ed.rowid'=>'shipment_line','cd.description'=>'shipment_line','ed.qty'=>"shipment_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product',
-			'p.weight'=>'product','p.weight_units'=>'product','p.volume'=>'product','p.volume_units'=>'product'
-		);
-		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_entities_array[$r]+=array('sp.rowid'=>'contact','sp.lastname'=>'contact','sp.firstname'=>'contact','sp.note_public'=>'contact');
-		$this->export_dependencies_array[$r]=array('shipment_line'=>'ed.rowid','product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT))
-		{
-		    $keyforselect='socpeople'; $keyforelement='contact'; $keyforaliasextra='extra3';
-		    include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		}
-		$keyforselect='expedition'; $keyforelement='shipment'; $keyforaliasextra='extra';
-		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect='expeditiondet'; $keyforelement='shipment_line'; $keyforaliasextra='extra2';
-		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'expedition as c';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'expedition_extrafields as extra ON c.rowid = extra.fk_object,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'societe as s';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expeditiondet as ed';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'expeditiondet_extrafields as extra2 ON ed.rowid = extra2.fk_object';
-		$this->export_sql_end[$r] .=' , '.MAIN_DB_PREFIX.'commandedet as cd';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
-		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT))
-		{
-		  $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact as ee ON ee.element_id = cd.fk_commande AND ee.fk_c_type_contact IN ('.$idcontacts.')';
-		  $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp ON sp.rowid = ee.fk_socpeople';
-		  $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
-		}
-		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid';
-		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('expedition').')';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
-	}
-
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
+        $r++;
+        $this->rights[$r][0] = 106;
+        $this->rights[$r][1] = 'Exporter les expeditions';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'shipment';
+        $this->rights[$r][5] = 'export';
+
+        $r++;
+        $this->rights[$r][0] = 109;
+        $this->rights[$r][1] = 'Supprimer les expeditions';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'supprimer';
+
+        $r++;
+        $this->rights[$r][0] = 1101;
+        $this->rights[$r][1] = 'Lire les bons de livraison';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'livraison';
+        $this->rights[$r][5] = 'lire';
+
+        $r++;
+        $this->rights[$r][0] = 1102;
+        $this->rights[$r][1] = 'Creer modifier les bons de livraison';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'livraison';
+        $this->rights[$r][5] = 'creer';
+
+        $r++;
+        $this->rights[$r][0] = 1104;
+        $this->rights[$r][1] = 'Valider les bons de livraison';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'livraison_advance';
+        $this->rights[$r][5] = 'validate';
+
+        $r++;
+        $this->rights[$r][0] = 1109;
+        $this->rights[$r][1] = 'Supprimer les bons de livraison';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'livraison';
+        $this->rights[$r][5] = 'supprimer';
+
+
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+
+
+        // Exports
+        //--------
+        $r=0;
+
+        include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+        $shipment=new Commande($this->db);
+        $contact_arrays=$shipment->liste_type_contact('external','',0,0,'');
+        if (is_array($contact_arrays) && count($contact_arrays)>0){
+            $idcontacts=join(',',array_keys($shipment->liste_type_contact('external','',0,0,'')));
+        } else {
+            $idcontacts=0;
+        }
+
+
+        $r++;
+        $this->export_code[$r]=$this->rights_class.'_'.$r;
+        $this->export_label[$r]='Shipments';	// Translation key (used only if key ExportDataset_xxx_z not found)
+        $this->export_permission[$r]=array(array("expedition","shipment","export"));
+        $this->export_fields_array[$r]=array(
+            's.rowid'=>"IdCompany",'s.nom'=>'ThirdParty','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','d.nom'=>'State','co.label'=>'Country',
+            'co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5',
+            's.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",
+            'c.date_delivery'=>"DateDeliveryPlanned",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",
+            'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",
+            'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel',
+            'p.weight'=>'ProductWeight','p.weight_units'=>'WeightUnits','p.volume'=>'ProductVolume','p.volume_units'=>'VolumeUnits'
+        );
+        if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_fields_array[$r]+=array('sp.rowid'=>'IdContact','sp.lastname'=>'Lastname','sp.firstname'=>'Firstname','sp.note_public'=>'NotePublic');
+        //$this->export_TypeFields_array[$r]=array(
+        //	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label',
+        //	'co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",
+        //	'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",
+        //	'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','ed.qty'=>"Text"
+        //);
+        $this->export_TypeFields_array[$r]=array(
+            's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text',
+            's.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_customer'=>"Text",'c.date_creation'=>"Date",
+            'c.date_delivery'=>"Date",'c.tracking_number'=>"Numeric",'c.height'=>"Numeric",'c.width'=>"Numeric",'c.weight'=>"Numeric",'c.fk_statut'=>'Status',
+            'c.note_public'=>"Text",'ed.qty'=>"Numeric",'d.nom'=>'Text'
+        );
+        $this->export_entities_array[$r]=array(
+            's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','d.nom'=>'company','co.label'=>'company',
+            'co.code'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.siret'=>'company','s.idprof4'=>'company',
+            's.idprof5'=>'company','s.idprof6'=>'company','c.rowid'=>"shipment",'c.ref'=>"shipment",'c.ref_customer'=>"shipment",'c.fk_soc'=>"shipment",
+            'c.date_creation'=>"shipment",'c.date_delivery'=>"shipment",'c.tracking_number'=>'shipment','c.height'=>"shipment",'c.width'=>"shipment",
+            'c.size'=>'shipment','c.size_units'=>'shipment','c.weight'=>"shipment",'c.weight_units'=>'shipment','c.fk_statut'=>"shipment",'c.note_public'=>"shipment",
+            'ed.rowid'=>'shipment_line','cd.description'=>'shipment_line','ed.qty'=>"shipment_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product',
+            'p.weight'=>'product','p.weight_units'=>'product','p.volume'=>'product','p.volume_units'=>'product'
+        );
+        if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_entities_array[$r]+=array('sp.rowid'=>'contact','sp.lastname'=>'contact','sp.firstname'=>'contact','sp.note_public'=>'contact');
+        $this->export_dependencies_array[$r]=array('shipment_line'=>'ed.rowid','product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+        if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT))
+        {
+            $keyforselect='socpeople'; $keyforelement='contact'; $keyforaliasextra='extra3';
+            include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+        }
+        $keyforselect='expedition'; $keyforelement='shipment'; $keyforaliasextra='extra';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+        $keyforselect='expeditiondet'; $keyforelement='shipment_line'; $keyforaliasextra='extra2';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'expedition as c';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'expedition_extrafields as extra ON c.rowid = extra.fk_object,';
+        $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'societe as s';
+        if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
+        $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expeditiondet as ed';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'expeditiondet_extrafields as extra2 ON ed.rowid = extra2.fk_object';
+        $this->export_sql_end[$r] .=' , '.MAIN_DB_PREFIX.'commandedet as cd';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
+        if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT))
+        {
+            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact as ee ON ee.element_id = cd.fk_commande AND ee.fk_c_type_contact IN ('.$idcontacts.')';
+            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp ON sp.rowid = ee.fk_socpeople';
+            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
+        }
+        $this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid';
+        $this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('expedition').')';
+        if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+    }
+
+
+    /**
+     *		Function called when module is enabled.
+     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *		It also creates data directories
+     *
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		global $conf,$langs;
-
-		// Permissions
-		$this->remove($options);
-
-		//ODT template
-		$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/shipment/template_shipment.odt';
-		$dirodt=DOL_DATA_ROOT.'/doctemplates/shipment';
-		$dest=$dirodt.'/template_shipment.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();
-
-		$sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'shipping' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','shipping',".$conf->entity.")",
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[3][2])."' AND type = 'delivery' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[3][2])."','delivery',".$conf->entity.")",
-		);
-
-		return $this->_init($sql,$options);
-	}
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        global $conf,$langs;
+
+        // Permissions
+        $this->remove($options);
+
+        //ODT template
+        $src=DOL_DOCUMENT_ROOT.'/install/doctemplates/shipment/template_shipment.odt';
+        $dirodt=DOL_DATA_ROOT.'/doctemplates/shipment';
+        $dest=$dirodt.'/template_shipment.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();
+
+        $sql = array(
+                "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'shipping' AND entity = ".$conf->entity,
+                "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','shipping',".$conf->entity.")",
+                "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[3][2])."' AND type = 'delivery' AND entity = ".$conf->entity,
+                "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[3][2])."','delivery',".$conf->entity.")",
+        );
+
+        return $this->_init($sql,$options);
+    }
 }

Spacing +70 added lines, -70 removed lines

@@ -27,7 +27,7 @@ 
  *	\brief      Fichier de description et activation du module Expedition
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -51,7 +51,7 @@ 
 		$this->family = "crm";
 		$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));
 		$this->description = "Gestion des expeditions";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
@@ -77,11 +77,11 @@ 
 		$this->depends = array("modCommande");
 		$this->requiredby = array();
 		$this->conflictwith = array();
-		$this->langfiles = array('deliveries','sendings');
+		$this->langfiles = array('deliveries', 'sendings');
 
 		// Constants
 		$this->const = array();
-		$r=0;
+		$r = 0;
 
 		$this->const[$r][0] = "EXPEDITION_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
@@ -138,7 +138,7 @@ 
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'expedition';
-		$r=0;
+		$r = 0;
 
 		$r++;
 		$this->rights[$r][0] = 101;
@@ -220,90 +220,90 @@ 
 
 		// 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;
 
 		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-		$shipment=new Commande($this->db);
-		$contact_arrays=$shipment->liste_type_contact('external','',0,0,'');
-		if (is_array($contact_arrays) && count($contact_arrays)>0){
-			$idcontacts=join(',',array_keys($shipment->liste_type_contact('external','',0,0,'')));
+		$shipment = new Commande($this->db);
+		$contact_arrays = $shipment->liste_type_contact('external', '', 0, 0, '');
+		if (is_array($contact_arrays) && count($contact_arrays) > 0) {
+			$idcontacts = join(',', array_keys($shipment->liste_type_contact('external', '', 0, 0, '')));
 		} else {
-			$idcontacts=0;
+			$idcontacts = 0;
 		}
 
 
 		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='Shipments';	// Translation key (used only if key ExportDataset_xxx_z not found)
-		$this->export_permission[$r]=array(array("expedition","shipment","export"));
-		$this->export_fields_array[$r]=array(
-			's.rowid'=>"IdCompany",'s.nom'=>'ThirdParty','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','d.nom'=>'State','co.label'=>'Country',
-			'co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5',
-			's.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",
-			'c.date_delivery'=>"DateDeliveryPlanned",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",
-			'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",
-			'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel',
-			'p.weight'=>'ProductWeight','p.weight_units'=>'WeightUnits','p.volume'=>'ProductVolume','p.volume_units'=>'VolumeUnits'
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'Shipments'; // Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_permission[$r] = array(array("expedition", "shipment", "export"));
+		$this->export_fields_array[$r] = array(
+			's.rowid'=>"IdCompany", 's.nom'=>'ThirdParty', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'd.nom'=>'State', 'co.label'=>'Country',
+			'co.code'=>'CountryCode', 's.phone'=>'Phone', 's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.idprof5'=>'ProfId5',
+			's.idprof6'=>'ProfId6', 'c.rowid'=>"Id", 'c.ref'=>"Ref", 'c.ref_customer'=>"RefCustomer", 'c.fk_soc'=>"IdCompany", 'c.date_creation'=>"DateCreation",
+			'c.date_delivery'=>"DateDeliveryPlanned", 'c.tracking_number'=>"TrackingNumber", 'c.height'=>"Height", 'c.width'=>"Width", 'c.size'=>"Depth",
+			'c.size_units'=>'SizeUnits', 'c.weight'=>"Weight", 'c.weight_units'=>"WeightUnits", 'c.fk_statut'=>'Status', 'c.note_public'=>"NotePublic",
+			'ed.rowid'=>'LineId', 'cd.description'=>'Description', 'ed.qty'=>"Qty", 'p.rowid'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel',
+			'p.weight'=>'ProductWeight', 'p.weight_units'=>'WeightUnits', 'p.volume'=>'ProductVolume', 'p.volume_units'=>'VolumeUnits'
 		);
-		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_fields_array[$r]+=array('sp.rowid'=>'IdContact','sp.lastname'=>'Lastname','sp.firstname'=>'Firstname','sp.note_public'=>'NotePublic');
+		if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_fields_array[$r] += array('sp.rowid'=>'IdContact', 'sp.lastname'=>'Lastname', 'sp.firstname'=>'Firstname', 'sp.note_public'=>'NotePublic');
 		//$this->export_TypeFields_array[$r]=array(
 		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label',
 		//	'co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",
 		//	'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",
 		//	'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','ed.qty'=>"Text"
 		//);
-		$this->export_TypeFields_array[$r]=array(
-			's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text',
-			's.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_customer'=>"Text",'c.date_creation'=>"Date",
-			'c.date_delivery'=>"Date",'c.tracking_number'=>"Numeric",'c.height'=>"Numeric",'c.width'=>"Numeric",'c.weight'=>"Numeric",'c.fk_statut'=>'Status',
-			'c.note_public'=>"Text",'ed.qty'=>"Numeric",'d.nom'=>'Text'
+		$this->export_TypeFields_array[$r] = array(
+			's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'co.label'=>'List:c_country:label:label', 'co.code'=>'Text', 's.phone'=>'Text',
+			's.siren'=>'Text', 's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 'c.ref'=>"Text", 'c.ref_customer'=>"Text", 'c.date_creation'=>"Date",
+			'c.date_delivery'=>"Date", 'c.tracking_number'=>"Numeric", 'c.height'=>"Numeric", 'c.width'=>"Numeric", 'c.weight'=>"Numeric", 'c.fk_statut'=>'Status',
+			'c.note_public'=>"Text", 'ed.qty'=>"Numeric", 'd.nom'=>'Text'
 		);
-		$this->export_entities_array[$r]=array(
-			's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','d.nom'=>'company','co.label'=>'company',
-			'co.code'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.siret'=>'company','s.idprof4'=>'company',
-			's.idprof5'=>'company','s.idprof6'=>'company','c.rowid'=>"shipment",'c.ref'=>"shipment",'c.ref_customer'=>"shipment",'c.fk_soc'=>"shipment",
-			'c.date_creation'=>"shipment",'c.date_delivery'=>"shipment",'c.tracking_number'=>'shipment','c.height'=>"shipment",'c.width'=>"shipment",
-			'c.size'=>'shipment','c.size_units'=>'shipment','c.weight'=>"shipment",'c.weight_units'=>'shipment','c.fk_statut'=>"shipment",'c.note_public'=>"shipment",
-			'ed.rowid'=>'shipment_line','cd.description'=>'shipment_line','ed.qty'=>"shipment_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product',
-			'p.weight'=>'product','p.weight_units'=>'product','p.volume'=>'product','p.volume_units'=>'product'
+		$this->export_entities_array[$r] = array(
+			's.rowid'=>"company", 's.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'd.nom'=>'company', 'co.label'=>'company',
+			'co.code'=>'company', 's.fk_pays'=>'company', 's.phone'=>'company', 's.siren'=>'company', 's.ape'=>'company', 's.siret'=>'company', 's.idprof4'=>'company',
+			's.idprof5'=>'company', 's.idprof6'=>'company', 'c.rowid'=>"shipment", 'c.ref'=>"shipment", 'c.ref_customer'=>"shipment", 'c.fk_soc'=>"shipment",
+			'c.date_creation'=>"shipment", 'c.date_delivery'=>"shipment", 'c.tracking_number'=>'shipment', 'c.height'=>"shipment", 'c.width'=>"shipment",
+			'c.size'=>'shipment', 'c.size_units'=>'shipment', 'c.weight'=>"shipment", 'c.weight_units'=>'shipment', 'c.fk_statut'=>"shipment", 'c.note_public'=>"shipment",
+			'ed.rowid'=>'shipment_line', 'cd.description'=>'shipment_line', 'ed.qty'=>"shipment_line", 'p.rowid'=>'product', 'p.ref'=>'product', 'p.label'=>'product',
+			'p.weight'=>'product', 'p.weight_units'=>'product', 'p.volume'=>'product', 'p.volume_units'=>'product'
 		);
-		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_entities_array[$r]+=array('sp.rowid'=>'contact','sp.lastname'=>'contact','sp.firstname'=>'contact','sp.note_public'=>'contact');
-		$this->export_dependencies_array[$r]=array('shipment_line'=>'ed.rowid','product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT))
+		if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_entities_array[$r] += array('sp.rowid'=>'contact', 'sp.lastname'=>'contact', 'sp.firstname'=>'contact', 'sp.note_public'=>'contact');
+		$this->export_dependencies_array[$r] = array('shipment_line'=>'ed.rowid', 'product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT))
 		{
-		    $keyforselect='socpeople'; $keyforelement='contact'; $keyforaliasextra='extra3';
+		    $keyforselect = 'socpeople'; $keyforelement = 'contact'; $keyforaliasextra = 'extra3';
 		    include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		}
-		$keyforselect='expedition'; $keyforelement='shipment'; $keyforaliasextra='extra';
+		$keyforselect = 'expedition'; $keyforelement = 'shipment'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect='expeditiondet'; $keyforelement='shipment_line'; $keyforaliasextra='extra2';
+		$keyforselect = 'expeditiondet'; $keyforelement = 'shipment_line'; $keyforaliasextra = 'extra2';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'expedition as c';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'expedition_extrafields as extra ON c.rowid = extra.fk_object,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'societe as s';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expeditiondet as ed';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'expeditiondet_extrafields as extra2 ON ed.rowid = extra2.fk_object';
-		$this->export_sql_end[$r] .=' , '.MAIN_DB_PREFIX.'commandedet as cd';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
-		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT))
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'expedition as c';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'expedition_extrafields as extra ON c.rowid = extra.fk_object,';
+		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'societe as s';
+		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
+		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'expeditiondet as ed';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'expeditiondet_extrafields as extra2 ON ed.rowid = extra2.fk_object';
+		$this->export_sql_end[$r] .= ' , '.MAIN_DB_PREFIX.'commandedet as cd';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
+		if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT))
 		{
-		  $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact as ee ON ee.element_id = cd.fk_commande AND ee.fk_c_type_contact IN ('.$idcontacts.')';
-		  $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp ON sp.rowid = ee.fk_socpeople';
-		  $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
+		  $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact as ee ON ee.element_id = cd.fk_commande AND ee.fk_c_type_contact IN ('.$idcontacts.')';
+		  $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp ON sp.rowid = ee.fk_socpeople';
+		  $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
 		}
-		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid';
-		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('expedition').')';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid';
+		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('expedition').')';
+		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
 	}
 
 
@@ -315,27 +315,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;
 
 		// Permissions
 		$this->remove($options);
 
 		//ODT template
-		$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/shipment/template_shipment.odt';
-		$dirodt=DOL_DATA_ROOT.'/doctemplates/shipment';
-		$dest=$dirodt.'/template_shipment.odt';
+		$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/shipment/template_shipment.odt';
+		$dirodt = DOL_DATA_ROOT.'/doctemplates/shipment';
+		$dest = $dirodt.'/template_shipment.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;
 			}
 		}
@@ -349,6 +349,6 @@ 
 			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[3][2])."','delivery',".$conf->entity.")",
 		);
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

Braces +12 added lines, -4 removed lines

@@ -250,7 +250,9 @@ 
 			'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel',
 			'p.weight'=>'ProductWeight','p.weight_units'=>'WeightUnits','p.volume'=>'ProductVolume','p.volume_units'=>'VolumeUnits'
 		);
-		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_fields_array[$r]+=array('sp.rowid'=>'IdContact','sp.lastname'=>'Lastname','sp.firstname'=>'Firstname','sp.note_public'=>'NotePublic');
+		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) {
+		    $this->export_fields_array[$r]+=array('sp.rowid'=>'IdContact','sp.lastname'=>'Lastname','sp.firstname'=>'Firstname','sp.note_public'=>'NotePublic');
+		}
 		//$this->export_TypeFields_array[$r]=array(
 		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label',
 		//	'co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",
@@ -272,7 +274,9 @@ 
 			'ed.rowid'=>'shipment_line','cd.description'=>'shipment_line','ed.qty'=>"shipment_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product',
 			'p.weight'=>'product','p.weight_units'=>'product','p.volume'=>'product','p.volume_units'=>'product'
 		);
-		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_entities_array[$r]+=array('sp.rowid'=>'contact','sp.lastname'=>'contact','sp.firstname'=>'contact','sp.note_public'=>'contact');
+		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) {
+		    $this->export_entities_array[$r]+=array('sp.rowid'=>'contact','sp.lastname'=>'contact','sp.firstname'=>'contact','sp.note_public'=>'contact');
+		}
 		$this->export_dependencies_array[$r]=array('shipment_line'=>'ed.rowid','product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT))
 		{
@@ -288,7 +292,9 @@ 
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'expedition as c';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'expedition_extrafields as extra ON c.rowid = extra.fk_object,';
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'societe as s';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if(!$user->rights->societe->client->voir) {
+		    $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expeditiondet as ed';
@@ -303,7 +309,9 @@ 
 		}
 		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid';
 		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('expedition').')';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+		if(!$user->rights->societe->client->voir) {
+		    $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+		}
 	}
 
 

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

Indentation +16 added lines, -16 removed lines

@@ -33,9 +33,9 @@ 
 {
 
     /**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
      */
     function __construct($db)
     {
@@ -68,11 +68,11 @@ 
         $this->config_page_url = array('workflow.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->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of module ids to disable if this one is disabled
+        $this->conflictwith = array();	// List of module class names as string this module is in conflict with
+        $this->phpmin = array(5,4);		// Minimum version of PHP required by module
         $this->need_dolibarr_version = array(2,8);  // Minimum version of Dolibarr required by module
         $this->langfiles = array("@workflow");
 
@@ -132,19 +132,19 @@ 
 
 
     /**
-	 *		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
-	 *
+     *		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
+     *      @return     int             	1 if OK, 0 if KO
      */
     function init($options='')
     {
-		// Permissions
-		$this->remove($options);
+        // Permissions
+        $this->remove($options);
 
-		$sql = array();
+        $sql = array();
 
         return $this->_init($sql,$options);
     }

Spacing +16 added lines, -16 removed lines

@@ -23,7 +23,7 @@ 
  *      \ingroup    workflow
  *      \brief      File to describe and activate module Workflow
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -43,13 +43,13 @@ 
 
         // Id for module (must be unique).
         // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-        $this->numero = 6000 ;
+        $this->numero = 6000;
         // Key text used to identify module (for permissions, menus, etc...)
         $this->rights_class = 'workflow';
 
         $this->family = "technic";
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->name = preg_replace('/^mod/i', '', get_class($this));
         // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
         $this->description = "Workflow management";
         // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
@@ -59,7 +59,7 @@ 
         // Name of png file (without png) used for this module.
         // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
         // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-        $this->picto='technic';
+        $this->picto = 'technic';
 
         // Data directories to create when module is enabled
         $this->dirs = array("/workflow/temp");
@@ -68,26 +68,26 @@ 
         $this->config_page_url = array('workflow.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->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(2,8);  // Minimum version of Dolibarr required by module
+       $this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(2, 8); // Minimum version of Dolibarr required by module
         $this->langfiles = array("@workflow");
 
         // Constants
         // List of particular constants to add when module is enabled
         //Example: $this->const=array(0=>array('MODULE_MY_NEW_CONST1','chaine','myvalue','This is a constant to add',0),
         //                            1=>array('MODULE_MY_NEW_CONST2','chaine','myvalue','This is another constant to add',0) );
-        $this->const=array();
+        $this->const = array();
 
         // Boxes
         $this->boxes = array();
 
         // Permissions
         $this->rights = array();
-        $r=0;
+        $r = 0;
 
         /*
         $r++;
@@ -99,8 +99,8 @@ 
         */
 
         // Main menu entries
-        $this->menus = array();         // List of menus to add
-        $r=0;
+        $this->menus = array(); // List of menus to add
+        $r = 0;
         /*
         $this->menu[$r]=array('fk_menu'=>0,
                                 'type'=>'top',
@@ -139,13 +139,13 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
      */
-    function init($options='')
+    function init($options = '')
     {
 		// Permissions
 		$this->remove($options);
 
 		$sql = array();
 
-        return $this->_init($sql,$options);
+        return $this->_init($sql, $options);
     }
 }

dolibarr/htdocs/core/modules/cheque/doc/pdf_blochet.class.php

Indentation +246 added lines, -246 removed lines

@@ -34,39 +34,39 @@ 
  */
 class BordereauChequeBlochet extends ModeleChequeReceipts
 {
-	/**
-	 * Issuer
-	 * @var Societe
-	 */
-	public $emetteur;
-
-	/**
-	 *	Constructor
-	 *
-	 *	@param	DoliDB	$db		Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf,$langs,$mysoc;
-
-		// Load traductions files requiredby by page
-		$langs->loadLangs(array("main", "bills"));
-
-		$this->db = $db;
-		$this->name = "blochet";
-
-		$this->tab_top = 60;
-
-		// Dimension page pour format A4
-		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
-		$this->page_largeur = $formatarray['width'];
-		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+    /**
+     * Issuer
+     * @var Societe
+     */
+    public $emetteur;
+
+    /**
+     *	Constructor
+     *
+     *	@param	DoliDB	$db		Database handler
+     */
+    function __construct($db)
+    {
+        global $conf,$langs,$mysoc;
+
+        // Load traductions files requiredby by page
+        $langs->loadLangs(array("main", "bills"));
+
+        $this->db = $db;
+        $this->name = "blochet";
+
+        $this->tab_top = 60;
+
+        // Dimension page pour format A4
+        $this->type = 'pdf';
+        $formatarray=pdf_getFormat();
+        $this->page_largeur = $formatarray['width'];
+        $this->page_hauteur = $formatarray['height'];
+        $this->format = array($this->page_largeur,$this->page_hauteur);
+        $this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
+        $this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
+        $this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
+        $this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
 
         // Recupere emmetteur
         $this->emetteur=$mysoc;
@@ -74,24 +74,24 @@ 
 
         // Defini position des colonnes
         $this->line_height = 5;
-		$this->line_per_page = 40;
-		$this->tab_height = 200;	//$this->line_height * $this->line_per_page;
-	}
+        $this->line_per_page = 40;
+        $this->tab_height = 200;	//$this->line_height * $this->line_per_page;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Fonction to generate document on disk
-	 *
-	 *	@param	RemiseCheque	$object			Object RemiseCheque
-	 *	@param	string			$_dir			Directory
-	 *	@param	string			$number			Number
-	 *	@param	Translate		$outputlangs	Lang output object
+    /**
+     *	Fonction to generate document on disk
+     *
+     *	@param	RemiseCheque	$object			Object RemiseCheque
+     *	@param	string			$_dir			Directory
+     *	@param	string			$number			Number
+     *	@param	Translate		$outputlangs	Lang output object
      *	@return	int     						1=ok, 0=ko
-	 */
-	function write_file($object, $_dir, $number, $outputlangs)
-	{
+     */
+    function write_file($object, $_dir, $number, $outputlangs)
+    {
         // phpcs:enable
-		global $user,$conf,$langs,$hookmanager;
+        global $user,$conf,$langs,$hookmanager;
 
         if (! is_object($outputlangs)) $outputlangs=$langs;
         // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -99,35 +99,35 @@ 
         if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
 
         // Load traductions files requiredby by page
-		$outputlangs->loadLangs(array("main", "companies", "bills", "products", "compta"));
-
-		$dir = $_dir . "/".get_exdir($number,0,1,0,$object,'cheque').$number;
-
-		if (! is_dir($dir))
-		{
-			$result=dol_mkdir($dir);
-
-			if ($result < 0)
-			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-				return -1;
-			}
-		}
-
-		$file = $dir . "/bordereau-".$number.".pdf";
-
-		// Add pdfgeneration hook
-		if (! is_object($hookmanager))
-		{
-			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
-		}
-		$hookmanager->initHooks(array('pdfgeneration'));
-		$parameters=array('file'=>$file, 'outputlangs'=>$outputlangs);
-		global $action;
-		$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		// Create PDF instance
+        $outputlangs->loadLangs(array("main", "companies", "bills", "products", "compta"));
+
+        $dir = $_dir . "/".get_exdir($number,0,1,0,$object,'cheque').$number;
+
+        if (! is_dir($dir))
+        {
+            $result=dol_mkdir($dir);
+
+            if ($result < 0)
+            {
+                $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                return -1;
+            }
+        }
+
+        $file = $dir . "/bordereau-".$number.".pdf";
+
+        // Add pdfgeneration hook
+        if (! is_object($hookmanager))
+        {
+            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+            $hookmanager=new HookManager($this->db);
+        }
+        $hookmanager->initHooks(array('pdfgeneration'));
+        $parameters=array('file'=>$file, 'outputlangs'=>$outputlangs);
+        global $action;
+        $reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        // Create PDF instance
         $pdf=pdf_getInstance($this->format);
         $heightforinfotot = 50;	// Height reserved to output the info and total part
         $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
@@ -142,121 +142,121 @@ 
         }
         $pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-		$pdf->Open();
-		$pagenb=0;
-		$pdf->SetDrawColor(128,128,128);
-
-		$pdf->SetTitle($outputlangs->transnoentities("CheckReceipt")." ".$number);
-		$pdf->SetSubject($outputlangs->transnoentities("CheckReceipt"));
-		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
-		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-		$pdf->SetKeyWords($outputlangs->transnoentities("CheckReceipt")." ".$number);
-		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
-
-		$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
-
-		$nboflines=count($this->lines);
-
-		// Define nb of page
-		$pages = intval($nboflines / $this->line_per_page);
-		if (($nboflines % $this->line_per_page)>0)
-		{
-			$pages++;
-		}
-		if ($pages == 0)
-		{
-			// force to build at least one page if report has no lines
-			$pages = 1;
-		}
-
-		$pdf->AddPage();
+        $pdf->Open();
+        $pagenb=0;
+        $pdf->SetDrawColor(128,128,128);
+
+        $pdf->SetTitle($outputlangs->transnoentities("CheckReceipt")." ".$number);
+        $pdf->SetSubject($outputlangs->transnoentities("CheckReceipt"));
+        $pdf->SetCreator("Dolibarr ".DOL_VERSION);
+        $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+        $pdf->SetKeyWords($outputlangs->transnoentities("CheckReceipt")." ".$number);
+        if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+
+        $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+
+        $nboflines=count($this->lines);
+
+        // Define nb of page
+        $pages = intval($nboflines / $this->line_per_page);
+        if (($nboflines % $this->line_per_page)>0)
+        {
+            $pages++;
+        }
+        if ($pages == 0)
+        {
+            // force to build at least one page if report has no lines
+            $pages = 1;
+        }
+
+        $pdf->AddPage();
         $pagenb++;
-		$this->Header($pdf, $pagenb, $pages, $outputlangs);
+        $this->Header($pdf, $pagenb, $pages, $outputlangs);
 
-		$this->Body($pdf, $pagenb, $pages, $outputlangs);
+        $this->Body($pdf, $pagenb, $pages, $outputlangs);
 
-		// Pied de page
-		$this->_pagefoot($pdf,'',$outputlangs);
-		if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+        // Pied de page
+        $this->_pagefoot($pdf,'',$outputlangs);
+        if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
 
-		$pdf->Close();
+        $pdf->Close();
 
-		$pdf->Output($file,'F');
+        $pdf->Output($file,'F');
 
-		// Add pdfgeneration hook
-		if (! is_object($hookmanager))
-		{
-			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
-		}
-		$hookmanager->initHooks(array('pdfgeneration'));
-		$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-		global $action;
-		$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+        // Add pdfgeneration hook
+        if (! is_object($hookmanager))
+        {
+            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+            $hookmanager=new HookManager($this->db);
+        }
+        $hookmanager->initHooks(array('pdfgeneration'));
+        $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+        global $action;
+        $reshook=$hookmanager->executeHooks('afterPDFCreation',$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));
 
-		$this->result = array('fullpath'=>$file);
+        $this->result = array('fullpath'=>$file);
 
         $outputlangs->charset_output=$sav_charset_output;
-	    return 1;   // Pas d'erreur
-	}
+        return 1;   // Pas d'erreur
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Generate Header
-	 *
-	 *	@param  PDF			$pdf        	Pdf object
-	 *	@param  int			$page        	Current page number
-	 *	@param  int			$pages       	Total number of pages
-	 *	@param	Translate	$outputlangs	Object language for output
-	 *	@return	void
-	 */
-	function Header(&$pdf, $page, $pages, $outputlangs)
-	{
+    /**
+     *	Generate Header
+     *
+     *	@param  PDF			$pdf        	Pdf object
+     *	@param  int			$page        	Current page number
+     *	@param  int			$pages       	Total number of pages
+     *	@param	Translate	$outputlangs	Object language for output
+     *	@return	void
+     */
+    function Header(&$pdf, $page, $pages, $outputlangs)
+    {
         // phpcs:enable
-		global $langs;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
+        global $langs;
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		// Load traductions files requiredby by page
-		$outputlangs->loadLangs(array("compta", "banks"));
+        // Load traductions files requiredby by page
+        $outputlangs->loadLangs(array("compta", "banks"));
 
-		$title = $outputlangs->transnoentities("CheckReceipt");
-		$pdf->SetFont('','B', $default_font_size);
+        $title = $outputlangs->transnoentities("CheckReceipt");
+        $pdf->SetFont('','B', $default_font_size);
         $pdf->SetXY(10,8);
         $pdf->MultiCell(0,2,$title,0,'L');
 
-		$pdf->SetFont('','', $default_font_size);
+        $pdf->SetFont('','', $default_font_size);
         $pdf->SetXY(10,15);
-		$pdf->MultiCell(22,2,$outputlangs->transnoentities("Ref"),0,'L');
+        $pdf->MultiCell(22,2,$outputlangs->transnoentities("Ref"),0,'L');
         $pdf->SetXY(32,15);
-		$pdf->SetFont('','', $default_font_size);
+        $pdf->SetFont('','', $default_font_size);
         $pdf->MultiCell(60, 2, $outputlangs->convToOutputCharset($this->ref.($this->ref_ext?" - ".$this->ref_ext:'')), 0, 'L');
 
-		$pdf->SetFont('','', $default_font_size);
+        $pdf->SetFont('','', $default_font_size);
         $pdf->SetXY(10,20);
         $pdf->MultiCell(22,2,$outputlangs->transnoentities("Date"),0,'L');
         $pdf->SetXY(32,20);
         $pdf->SetFont('','', $default_font_size);
         $pdf->MultiCell(60, 2, dol_print_date($this->date,"day",false,$outputlangs));
 
-		$pdf->SetFont('','', $default_font_size);
+        $pdf->SetFont('','', $default_font_size);
         $pdf->SetXY(10,26);
         $pdf->MultiCell(22,2,$outputlangs->transnoentities("Owner"),0,'L');
-		$pdf->SetFont('','', $default_font_size);
+        $pdf->SetFont('','', $default_font_size);
         $pdf->SetXY(32,26);
         $pdf->MultiCell(60,2,$outputlangs->convToOutputCharset($this->account->proprio),0,'L');
 
-		$pdf->SetFont('','', $default_font_size);
+        $pdf->SetFont('','', $default_font_size);
         $pdf->SetXY(10,32);
         $pdf->MultiCell(0,2,$outputlangs->transnoentities("Account"),0,'L');
         pdf_bank($pdf,$outputlangs,32,32,$this->account,1);
 
-		$pdf->SetFont('','', $default_font_size);
+        $pdf->SetFont('','', $default_font_size);
         $pdf->SetXY(114,15);
-		$pdf->MultiCell(40, 2, $outputlangs->transnoentities("Signature"), 0, 'L');
+        $pdf->MultiCell(40, 2, $outputlangs->transnoentities("Signature"), 0, 'L');
 
         $pdf->Rect(9, 14, 192, 35);
         $pdf->line(9, 19, 112, 19);
@@ -267,98 +267,98 @@ 
         $pdf->line(30, 14, 30, 49);
         $pdf->line(112, 14, 112, 49);
 
-		// Number of cheques
-		$posy=51;
-		$pdf->Rect(9, $posy, 192, 6);
-		$pdf->line(55, $posy, 55, $posy+6);
-		$pdf->line(140, $posy, 140, $posy+6);
-		$pdf->line(170, $posy, 170, $posy+6);
+        // Number of cheques
+        $posy=51;
+        $pdf->Rect(9, $posy, 192, 6);
+        $pdf->line(55, $posy, 55, $posy+6);
+        $pdf->line(140, $posy, 140, $posy+6);
+        $pdf->line(170, $posy, 170, $posy+6);
 
-		$pdf->SetFont('','', $default_font_size);
-		$pdf->SetXY(10,$posy+1);
-		$pdf->MultiCell(40, 2, $outputlangs->transnoentities("NumberOfCheques"), 0, 'L');
+        $pdf->SetFont('','', $default_font_size);
+        $pdf->SetXY(10,$posy+1);
+        $pdf->MultiCell(40, 2, $outputlangs->transnoentities("NumberOfCheques"), 0, 'L');
 
-		$pdf->SetFont('','B', $default_font_size);
+        $pdf->SetFont('','B', $default_font_size);
         $pdf->SetXY(57,$posy+1);
         $pdf->MultiCell(40, 2, $this->nbcheque, 0, 'L');
 
-		$pdf->SetFont('','', $default_font_size);
+        $pdf->SetFont('','', $default_font_size);
         $pdf->SetXY(148,$posy+1);
-		$pdf->MultiCell(40, 2, $langs->trans("Total"));
+        $pdf->MultiCell(40, 2, $langs->trans("Total"));
 
-		$pdf->SetFont('','B', $default_font_size);
-		$pdf->SetXY(170, $posy+1);
-		$pdf->MultiCell(31, 2, price($this->amount), 0, 'C', 0);
+        $pdf->SetFont('','B', $default_font_size);
+        $pdf->SetXY(170, $posy+1);
+        $pdf->MultiCell(31, 2, price($this->amount), 0, 'C', 0);
 
-		// Tableau
-		$pdf->SetFont('','', $default_font_size - 2);
-		$pdf->SetXY(11, $this->tab_top+2);
-		$pdf->MultiCell(40,2,$outputlangs->transnoentities("Num"), 0, 'L');
-		$pdf->line(40, $this->tab_top, 40, $this->tab_top + $this->tab_height + 10);
+        // Tableau
+        $pdf->SetFont('','', $default_font_size - 2);
+        $pdf->SetXY(11, $this->tab_top+2);
+        $pdf->MultiCell(40,2,$outputlangs->transnoentities("Num"), 0, 'L');
+        $pdf->line(40, $this->tab_top, 40, $this->tab_top + $this->tab_height + 10);
 
-		$pdf->SetXY(41, $this->tab_top+2);
+        $pdf->SetXY(41, $this->tab_top+2);
         $pdf->MultiCell(40,2,$outputlangs->transnoentities("Bank"), 0, 'L');
-		$pdf->line(100, $this->tab_top, 100, $this->tab_top + $this->tab_height + 10);
+        $pdf->line(100, $this->tab_top, 100, $this->tab_top + $this->tab_height + 10);
 
         $pdf->SetXY(101, $this->tab_top+2);
         $pdf->MultiCell(40,2,$outputlangs->transnoentities("CheckTransmitter"), 0, 'L');
-		$pdf->line(180, $this->tab_top, 180, $this->tab_top + $this->tab_height + 10);
+        $pdf->line(180, $this->tab_top, 180, $this->tab_top + $this->tab_height + 10);
 
-		$pdf->SetXY(180, $this->tab_top+2);
-		$pdf->MultiCell(20,2,$outputlangs->transnoentities("Amount"), 0, 'R');
-		$pdf->line(9, $this->tab_top + 8, 201, $this->tab_top + 8);
+        $pdf->SetXY(180, $this->tab_top+2);
+        $pdf->MultiCell(20,2,$outputlangs->transnoentities("Amount"), 0, 'R');
+        $pdf->line(9, $this->tab_top + 8, 201, $this->tab_top + 8);
 
-		$pdf->Rect(9, $this->tab_top, 192, $this->tab_height + 10);
-	}
+        $pdf->Rect(9, $this->tab_top, 192, $this->tab_height + 10);
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Output array
-	 *
-	 *	@param	PDF			$pdf			PDF object
-	 *	@param	int			$pagenb			Page nb
-	 *	@param	int			$pages			Pages
-	 *	@param	Translate	$outputlangs	Object lang
-	 *	@return	void
-	 */
-	function Body(&$pdf, $pagenb, $pages, $outputlangs)
-	{
+    /**
+     *	Output array
+     *
+     *	@param	PDF			$pdf			PDF object
+     *	@param	int			$pagenb			Page nb
+     *	@param	int			$pages			Pages
+     *	@param	Translate	$outputlangs	Object lang
+     *	@return	void
+     */
+    function Body(&$pdf, $pagenb, $pages, $outputlangs)
+    {
         // phpcs:enable
-		// x=10 - Num
-		// x=30 - Banque
-		// x=100 - Emetteur
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-		$pdf->SetFont('','', $default_font_size - 1);
-		$oldprowid = 0;
-		$pdf->SetFillColor(220,220,220);
-		$yp = 0;
-		$lineinpage=0;
-		$num=count($this->lines);
-		for ($j = 0; $j < $num; $j++)
-		{
-		    $lineinpage++;
+        // x=10 - Num
+        // x=30 - Banque
+        // x=100 - Emetteur
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+        $pdf->SetFont('','', $default_font_size - 1);
+        $oldprowid = 0;
+        $pdf->SetFillColor(220,220,220);
+        $yp = 0;
+        $lineinpage=0;
+        $num=count($this->lines);
+        for ($j = 0; $j < $num; $j++)
+        {
+            $lineinpage++;
 
-			$pdf->SetXY(1, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(8, $this->line_height, $j+1, 0, 'R', 0);
+            $pdf->SetXY(1, $this->tab_top + 10 + $yp);
+            $pdf->MultiCell(8, $this->line_height, $j+1, 0, 'R', 0);
 
-			$pdf->SetXY(10, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(30, $this->line_height, $this->lines[$j]->num_chq?$this->lines[$j]->num_chq:'', 0, 'L', 0);
+            $pdf->SetXY(10, $this->tab_top + 10 + $yp);
+            $pdf->MultiCell(30, $this->line_height, $this->lines[$j]->num_chq?$this->lines[$j]->num_chq:'', 0, 'L', 0);
 
-			$pdf->SetXY(40, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(70, $this->line_height, dol_trunc($outputlangs->convToOutputCharset($this->lines[$j]->bank_chq),44), 0, 'L', 0);
+            $pdf->SetXY(40, $this->tab_top + 10 + $yp);
+            $pdf->MultiCell(70, $this->line_height, dol_trunc($outputlangs->convToOutputCharset($this->lines[$j]->bank_chq),44), 0, 'L', 0);
 
-			$pdf->SetXY(100, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(80, $this->line_height, dol_trunc($outputlangs->convToOutputCharset($this->lines[$j]->emetteur_chq),50), 0, 'L', 0);
+            $pdf->SetXY(100, $this->tab_top + 10 + $yp);
+            $pdf->MultiCell(80, $this->line_height, dol_trunc($outputlangs->convToOutputCharset($this->lines[$j]->emetteur_chq),50), 0, 'L', 0);
 
-			$pdf->SetXY(180, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(20, $this->line_height, price($this->lines[$j]->amount_chq), 0, 'R', 0);
+            $pdf->SetXY(180, $this->tab_top + 10 + $yp);
+            $pdf->MultiCell(20, $this->line_height, price($this->lines[$j]->amount_chq), 0, 'R', 0);
 
-			$yp = $yp + $this->line_height;
+            $yp = $yp + $this->line_height;
 
-			if ($lineinpage >= $this->line_per_page && $j < (count($this->lines)-1))
-			{
-			    $lineinpage=0; $yp=0;
+            if ($lineinpage >= $this->line_per_page && $j < (count($this->lines)-1))
+            {
+                $lineinpage=0; $yp=0;
 
                 // New page
                 $pdf->AddPage();
@@ -367,35 +367,35 @@ 
                 $pdf->SetFont('','', $default_font_size - 1);
                 $pdf->MultiCell(0, 3, '');      // Set interline to 3
                 $pdf->SetTextColor(0,0,0);
-			}
-		}
-	}
+            }
+        }
+    }
 
 
-	/**
-	 *   	Show footer of page. Need this->emetteur object
+    /**
+     *   	Show footer of page. Need this->emetteur object
      *
-	 *   	@param	PDF			$pdf     			PDF
-	 * 		@param	Object		$object				Object to show
-	 *      @param	Translate	$outputlangs		Object lang for output
-	 *      @param	int			$hidefreetext		1=Hide free text
-	 *      @return	void
-	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
-	{
-		global $conf;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-
-		// Line of free text
-		$newfreetext='';
-		$paramfreetext='BANK_CHEQUERECEIPT_FREE_TEXT';
-		if (! empty($conf->global->$paramfreetext))
-		{
-		    $newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
-		}
-
-		return pdf_pagefoot($pdf,$outputlangs,$newfreetext,$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
-	}
+     *   	@param	PDF			$pdf     			PDF
+     * 		@param	Object		$object				Object to show
+     *      @param	Translate	$outputlangs		Object lang for output
+     *      @param	int			$hidefreetext		1=Hide free text
+     *      @return	void
+     */
+    function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+    {
+        global $conf;
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+        $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+
+        // Line of free text
+        $newfreetext='';
+        $paramfreetext='BANK_CHEQUERECEIPT_FREE_TEXT';
+        if (! empty($conf->global->$paramfreetext))
+        {
+            $newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
+        }
+
+        return pdf_pagefoot($pdf,$outputlangs,$newfreetext,$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+    }
 }

Spacing +118 added lines, -118 removed lines

@@ -47,7 +47,7 @@ 
 	 */
 	function __construct($db)
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		// Load traductions files requiredby by page
 		$langs->loadLangs(array("main", "bills"));
@@ -59,23 +59,23 @@ 
 
 		// Dimension page pour format A4
 		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
+		$formatarray = pdf_getFormat();
 		$this->page_largeur = $formatarray['width'];
 		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
         // Recupere emmetteur
-        $this->emetteur=$mysoc;
-        if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+        $this->emetteur = $mysoc;
+        if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 
         // Defini position des colonnes
         $this->line_height = 5;
 		$this->line_per_page = 40;
-		$this->tab_height = 200;	//$this->line_height * $this->line_per_page;
+		$this->tab_height = 200; //$this->line_height * $this->line_per_page;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -91,49 +91,49 @@ 
 	function write_file($object, $_dir, $number, $outputlangs)
 	{
         // phpcs:enable
-		global $user,$conf,$langs,$hookmanager;
+		global $user, $conf, $langs, $hookmanager;
 
-        if (! is_object($outputlangs)) $outputlangs=$langs;
+        if (!is_object($outputlangs)) $outputlangs = $langs;
         // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-        $sav_charset_output=$outputlangs->charset_output;
-        if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+        $sav_charset_output = $outputlangs->charset_output;
+        if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
         // Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "companies", "bills", "products", "compta"));
 
-		$dir = $_dir . "/".get_exdir($number,0,1,0,$object,'cheque').$number;
+		$dir = $_dir."/".get_exdir($number, 0, 1, 0, $object, 'cheque').$number;
 
-		if (! is_dir($dir))
+		if (!is_dir($dir))
 		{
-			$result=dol_mkdir($dir);
+			$result = dol_mkdir($dir);
 
 			if ($result < 0)
 			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
 		}
 
-		$file = $dir . "/bordereau-".$number.".pdf";
+		$file = $dir."/bordereau-".$number.".pdf";
 
 		// Add pdfgeneration 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('pdfgeneration'));
-		$parameters=array('file'=>$file, 'outputlangs'=>$outputlangs);
+		$parameters = array('file'=>$file, 'outputlangs'=>$outputlangs);
 		global $action;
-		$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
 		// Create PDF instance
-        $pdf=pdf_getInstance($this->format);
-        $heightforinfotot = 50;	// Height reserved to output the info and total part
-        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-        $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-        if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
-        $pdf->SetAutoPageBreak(1,0);
+        $pdf = pdf_getInstance($this->format);
+        $heightforinfotot = 50; // Height reserved to output the info and total part
+        $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+        $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+        if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+        $pdf->SetAutoPageBreak(1, 0);
 
         if (class_exists('TCPDF'))
         {
@@ -143,23 +143,23 @@ 
         $pdf->SetFont(pdf_getPDFFont($outputlangs));
 
 		$pdf->Open();
-		$pagenb=0;
-		$pdf->SetDrawColor(128,128,128);
+		$pagenb = 0;
+		$pdf->SetDrawColor(128, 128, 128);
 
 		$pdf->SetTitle($outputlangs->transnoentities("CheckReceipt")." ".$number);
 		$pdf->SetSubject($outputlangs->transnoentities("CheckReceipt"));
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($outputlangs->transnoentities("CheckReceipt")." ".$number);
-		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-		$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+		$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
-		$nboflines=count($this->lines);
+		$nboflines = count($this->lines);
 
 		// Define nb of page
 		$pages = intval($nboflines / $this->line_per_page);
-		if (($nboflines % $this->line_per_page)>0)
+		if (($nboflines % $this->line_per_page) > 0)
 		{
 			$pages++;
 		}
@@ -176,31 +176,31 @@ 
 		$this->Body($pdf, $pagenb, $pages, $outputlangs);
 
 		// Pied de page
-		$this->_pagefoot($pdf,'',$outputlangs);
-		if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+		$this->_pagefoot($pdf, '', $outputlangs);
+		if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
 		$pdf->Close();
 
-		$pdf->Output($file,'F');
+		$pdf->Output($file, 'F');
 
 		// Add pdfgeneration 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('pdfgeneration'));
-		$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+		$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 		global $action;
-		$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+		$reshook = $hookmanager->executeHooks('afterPDFCreation', $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));
 
 		$this->result = array('fullpath'=>$file);
 
-        $outputlangs->charset_output=$sav_charset_output;
-	    return 1;   // Pas d'erreur
+        $outputlangs->charset_output = $sav_charset_output;
+	    return 1; // Pas d'erreur
 	}
 
 
@@ -224,38 +224,38 @@ 
 		$outputlangs->loadLangs(array("compta", "banks"));
 
 		$title = $outputlangs->transnoentities("CheckReceipt");
-		$pdf->SetFont('','B', $default_font_size);
-        $pdf->SetXY(10,8);
-        $pdf->MultiCell(0,2,$title,0,'L');
-
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(10,15);
-		$pdf->MultiCell(22,2,$outputlangs->transnoentities("Ref"),0,'L');
-        $pdf->SetXY(32,15);
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->MultiCell(60, 2, $outputlangs->convToOutputCharset($this->ref.($this->ref_ext?" - ".$this->ref_ext:'')), 0, 'L');
-
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(10,20);
-        $pdf->MultiCell(22,2,$outputlangs->transnoentities("Date"),0,'L');
-        $pdf->SetXY(32,20);
-        $pdf->SetFont('','', $default_font_size);
-        $pdf->MultiCell(60, 2, dol_print_date($this->date,"day",false,$outputlangs));
-
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(10,26);
-        $pdf->MultiCell(22,2,$outputlangs->transnoentities("Owner"),0,'L');
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(32,26);
-        $pdf->MultiCell(60,2,$outputlangs->convToOutputCharset($this->account->proprio),0,'L');
-
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(10,32);
-        $pdf->MultiCell(0,2,$outputlangs->transnoentities("Account"),0,'L');
-        pdf_bank($pdf,$outputlangs,32,32,$this->account,1);
-
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(114,15);
+		$pdf->SetFont('', 'B', $default_font_size);
+        $pdf->SetXY(10, 8);
+        $pdf->MultiCell(0, 2, $title, 0, 'L');
+
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(10, 15);
+		$pdf->MultiCell(22, 2, $outputlangs->transnoentities("Ref"), 0, 'L');
+        $pdf->SetXY(32, 15);
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->MultiCell(60, 2, $outputlangs->convToOutputCharset($this->ref.($this->ref_ext ? " - ".$this->ref_ext : '')), 0, 'L');
+
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(10, 20);
+        $pdf->MultiCell(22, 2, $outputlangs->transnoentities("Date"), 0, 'L');
+        $pdf->SetXY(32, 20);
+        $pdf->SetFont('', '', $default_font_size);
+        $pdf->MultiCell(60, 2, dol_print_date($this->date, "day", false, $outputlangs));
+
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(10, 26);
+        $pdf->MultiCell(22, 2, $outputlangs->transnoentities("Owner"), 0, 'L');
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(32, 26);
+        $pdf->MultiCell(60, 2, $outputlangs->convToOutputCharset($this->account->proprio), 0, 'L');
+
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(10, 32);
+        $pdf->MultiCell(0, 2, $outputlangs->transnoentities("Account"), 0, 'L');
+        pdf_bank($pdf, $outputlangs, 32, 32, $this->account, 1);
+
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(114, 15);
 		$pdf->MultiCell(40, 2, $outputlangs->transnoentities("Signature"), 0, 'L');
 
         $pdf->Rect(9, 14, 192, 35);
@@ -268,44 +268,44 @@ 
         $pdf->line(112, 14, 112, 49);
 
 		// Number of cheques
-		$posy=51;
+		$posy = 51;
 		$pdf->Rect(9, $posy, 192, 6);
-		$pdf->line(55, $posy, 55, $posy+6);
-		$pdf->line(140, $posy, 140, $posy+6);
-		$pdf->line(170, $posy, 170, $posy+6);
+		$pdf->line(55, $posy, 55, $posy + 6);
+		$pdf->line(140, $posy, 140, $posy + 6);
+		$pdf->line(170, $posy, 170, $posy + 6);
 
-		$pdf->SetFont('','', $default_font_size);
-		$pdf->SetXY(10,$posy+1);
+		$pdf->SetFont('', '', $default_font_size);
+		$pdf->SetXY(10, $posy + 1);
 		$pdf->MultiCell(40, 2, $outputlangs->transnoentities("NumberOfCheques"), 0, 'L');
 
-		$pdf->SetFont('','B', $default_font_size);
-        $pdf->SetXY(57,$posy+1);
+		$pdf->SetFont('', 'B', $default_font_size);
+        $pdf->SetXY(57, $posy + 1);
         $pdf->MultiCell(40, 2, $this->nbcheque, 0, 'L');
 
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(148,$posy+1);
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(148, $posy + 1);
 		$pdf->MultiCell(40, 2, $langs->trans("Total"));
 
-		$pdf->SetFont('','B', $default_font_size);
-		$pdf->SetXY(170, $posy+1);
+		$pdf->SetFont('', 'B', $default_font_size);
+		$pdf->SetXY(170, $posy + 1);
 		$pdf->MultiCell(31, 2, price($this->amount), 0, 'C', 0);
 
 		// Tableau
-		$pdf->SetFont('','', $default_font_size - 2);
-		$pdf->SetXY(11, $this->tab_top+2);
-		$pdf->MultiCell(40,2,$outputlangs->transnoentities("Num"), 0, 'L');
+		$pdf->SetFont('', '', $default_font_size - 2);
+		$pdf->SetXY(11, $this->tab_top + 2);
+		$pdf->MultiCell(40, 2, $outputlangs->transnoentities("Num"), 0, 'L');
 		$pdf->line(40, $this->tab_top, 40, $this->tab_top + $this->tab_height + 10);
 
-		$pdf->SetXY(41, $this->tab_top+2);
-        $pdf->MultiCell(40,2,$outputlangs->transnoentities("Bank"), 0, 'L');
+		$pdf->SetXY(41, $this->tab_top + 2);
+        $pdf->MultiCell(40, 2, $outputlangs->transnoentities("Bank"), 0, 'L');
 		$pdf->line(100, $this->tab_top, 100, $this->tab_top + $this->tab_height + 10);
 
-        $pdf->SetXY(101, $this->tab_top+2);
-        $pdf->MultiCell(40,2,$outputlangs->transnoentities("CheckTransmitter"), 0, 'L');
+        $pdf->SetXY(101, $this->tab_top + 2);
+        $pdf->MultiCell(40, 2, $outputlangs->transnoentities("CheckTransmitter"), 0, 'L');
 		$pdf->line(180, $this->tab_top, 180, $this->tab_top + $this->tab_height + 10);
 
-		$pdf->SetXY(180, $this->tab_top+2);
-		$pdf->MultiCell(20,2,$outputlangs->transnoentities("Amount"), 0, 'R');
+		$pdf->SetXY(180, $this->tab_top + 2);
+		$pdf->MultiCell(20, 2, $outputlangs->transnoentities("Amount"), 0, 'R');
 		$pdf->line(9, $this->tab_top + 8, 201, $this->tab_top + 8);
 
 		$pdf->Rect(9, $this->tab_top, 192, $this->tab_height + 10);
@@ -329,44 +329,44 @@ 
 		// x=30 - Banque
 		// x=100 - Emetteur
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
-		$pdf->SetFont('','', $default_font_size - 1);
+		$pdf->SetFont('', '', $default_font_size - 1);
 		$oldprowid = 0;
-		$pdf->SetFillColor(220,220,220);
+		$pdf->SetFillColor(220, 220, 220);
 		$yp = 0;
-		$lineinpage=0;
-		$num=count($this->lines);
+		$lineinpage = 0;
+		$num = count($this->lines);
 		for ($j = 0; $j < $num; $j++)
 		{
 		    $lineinpage++;
 
 			$pdf->SetXY(1, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(8, $this->line_height, $j+1, 0, 'R', 0);
+			$pdf->MultiCell(8, $this->line_height, $j + 1, 0, 'R', 0);
 
 			$pdf->SetXY(10, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(30, $this->line_height, $this->lines[$j]->num_chq?$this->lines[$j]->num_chq:'', 0, 'L', 0);
+			$pdf->MultiCell(30, $this->line_height, $this->lines[$j]->num_chq ? $this->lines[$j]->num_chq : '', 0, 'L', 0);
 
 			$pdf->SetXY(40, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(70, $this->line_height, dol_trunc($outputlangs->convToOutputCharset($this->lines[$j]->bank_chq),44), 0, 'L', 0);
+			$pdf->MultiCell(70, $this->line_height, dol_trunc($outputlangs->convToOutputCharset($this->lines[$j]->bank_chq), 44), 0, 'L', 0);
 
 			$pdf->SetXY(100, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(80, $this->line_height, dol_trunc($outputlangs->convToOutputCharset($this->lines[$j]->emetteur_chq),50), 0, 'L', 0);
+			$pdf->MultiCell(80, $this->line_height, dol_trunc($outputlangs->convToOutputCharset($this->lines[$j]->emetteur_chq), 50), 0, 'L', 0);
 
 			$pdf->SetXY(180, $this->tab_top + 10 + $yp);
 			$pdf->MultiCell(20, $this->line_height, price($this->lines[$j]->amount_chq), 0, 'R', 0);
 
 			$yp = $yp + $this->line_height;
 
-			if ($lineinpage >= $this->line_per_page && $j < (count($this->lines)-1))
+			if ($lineinpage >= $this->line_per_page && $j < (count($this->lines) - 1))
 			{
-			    $lineinpage=0; $yp=0;
+			    $lineinpage = 0; $yp = 0;
 
                 // New page
                 $pdf->AddPage();
                 $pagenb++;
                 $this->Header($pdf, $pagenb, $pages, $outputlangs);
-                $pdf->SetFont('','', $default_font_size - 1);
-                $pdf->MultiCell(0, 3, '');      // Set interline to 3
-                $pdf->SetTextColor(0,0,0);
+                $pdf->SetFont('', '', $default_font_size - 1);
+                $pdf->MultiCell(0, 3, ''); // Set interline to 3
+                $pdf->SetTextColor(0, 0, 0);
 			}
 		}
 	}
@@ -381,21 +381,21 @@ 
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	void
 	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+	function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 
 		// Line of free text
-		$newfreetext='';
-		$paramfreetext='BANK_CHEQUERECEIPT_FREE_TEXT';
-		if (! empty($conf->global->$paramfreetext))
+		$newfreetext = '';
+		$paramfreetext = 'BANK_CHEQUERECEIPT_FREE_TEXT';
+		if (!empty($conf->global->$paramfreetext))
 		{
-		    $newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
+		    $newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 		}
 
-		return pdf_pagefoot($pdf,$outputlangs,$newfreetext,$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+		return pdf_pagefoot($pdf, $outputlangs, $newfreetext, $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }

Braces +22 added lines, -8 removed lines

@@ -70,7 +70,10 @@ 
 
         // Recupere emmetteur
         $this->emetteur=$mysoc;
-        if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+        if (! $this->emetteur->country_code) {
+            $this->emetteur->country_code=substr($langs->defaultlang,-2);
+        }
+        // By default if not defined
 
         // Defini position des colonnes
         $this->line_height = 5;
@@ -93,10 +96,14 @@ 
         // phpcs:enable
 		global $user,$conf,$langs,$hookmanager;
 
-        if (! is_object($outputlangs)) $outputlangs=$langs;
+        if (! is_object($outputlangs)) {
+            $outputlangs=$langs;
+        }
         // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
         $sav_charset_output=$outputlangs->charset_output;
-        if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+        if (! empty($conf->global->MAIN_USE_FPDF)) {
+            $outputlangs->charset_output='ISO-8859-1';
+        }
 
         // Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "companies", "bills", "products", "compta"));
@@ -132,7 +139,9 @@ 
         $heightforinfotot = 50;	// Height reserved to output the info and total part
         $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
         $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-        if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
+        if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) {
+            $heightforfooter+= 6;
+        }
         $pdf->SetAutoPageBreak(1,0);
 
         if (class_exists('TCPDF'))
@@ -151,7 +160,9 @@ 
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($outputlangs->transnoentities("CheckReceipt")." ".$number);
-		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+		    $pdf->SetCompression(false);
+		}
 
 		$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 
@@ -177,7 +188,9 @@ 
 
 		// Pied de page
 		$this->_pagefoot($pdf,'',$outputlangs);
-		if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+		if (method_exists($pdf,'AliasNbPages')) {
+		    $pdf->AliasNbPages();
+		}
 
 		$pdf->Close();
 
@@ -194,8 +207,9 @@ 
 		global $action;
 		$reshook=$hookmanager->executeHooks('afterPDFCreation',$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));
+		}
 
 		$this->result = array('fullpath'=>$file);
 

dolibarr/htdocs/core/modules/cheque/mod_chequereceipt_mint.php

Indentation +107 added lines, -107 removed lines

@@ -29,20 +29,20 @@ 
  */
 class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
 
-	public $prefix='CHK';
+    public $prefix='CHK';
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	public $name='Mint';
+    public $name='Mint';
 
 
     /**
@@ -52,110 +52,110 @@ 
      */
     function info()
     {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+        global $langs;
+            return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
     }
 
 
-	/**
-	 *  Renvoi un exemple de numerotation
-	 *
-	 *  @return     string      Example
-	 */
-	function getExample()
-	{
-		return $this->prefix."0501-0001";
-	}
-
-
-	/**
-	 *  Test si les numeros deje en vigueur dans la base ne provoquent pas de
-	 *  de conflits qui empechera cette numerotation de fonctionner.
-	 *
-	 *  @return     boolean     false si conflit, true si ok
-	 */
-	function canBeActivated()
-	{
-		global $conf,$langs,$db;
-
-		$payyymm=''; $max='';
-
-		$posindice=9;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$row = $db->fetch_row($resql);
-			if ($row) { $payyymm = substr($row[0],0,6); $max=$row[0]; }
-		}
-		if ($payyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$payyymm))
-		{
-			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel', $max);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * 	Return next free value
-	 *
-	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Object		$object		Object we need next value for
-	 *  @return string      			Value if KO, <0 if KO
-	 */
-	function getNextValue($objsoc,$object)
-	{
-		global $db,$conf;
-
-		// D'abord on recupere la valeur max
-		$posindice=9;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
-		$sql.= " WHERE ref like '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
-		{
-			dol_syslog(__METHOD__, LOG_DEBUG);
-			return -1;
-		}
-
-		//$date=time();
-		$date=$object->date_bordereau;
-		$yymm = strftime("%y%m",$date);
-
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
-
-		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
-		return $this->prefix.$yymm."-".$num;
-	}
+    /**
+     *  Renvoi un exemple de numerotation
+     *
+     *  @return     string      Example
+     */
+    function getExample()
+    {
+        return $this->prefix."0501-0001";
+    }
+
+
+    /**
+     *  Test si les numeros deje en vigueur dans la base ne provoquent pas de
+     *  de conflits qui empechera cette numerotation de fonctionner.
+     *
+     *  @return     boolean     false si conflit, true si ok
+     */
+    function canBeActivated()
+    {
+        global $conf,$langs,$db;
+
+        $payyymm=''; $max='';
+
+        $posindice=9;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+        $sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+        $sql.= " AND entity = ".$conf->entity;
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $row = $db->fetch_row($resql);
+            if ($row) { $payyymm = substr($row[0],0,6); $max=$row[0]; }
+        }
+        if ($payyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$payyymm))
+        {
+            $langs->load("errors");
+            $this->error=$langs->trans('ErrorNumRefModel', $max);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * 	Return next free value
+     *
+     *  @param	Societe		$objsoc     Object thirdparty
+     *  @param  Object		$object		Object we need next value for
+     *  @return string      			Value if KO, <0 if KO
+     */
+    function getNextValue($objsoc,$object)
+    {
+        global $db,$conf;
+
+        // D'abord on recupere la valeur max
+        $posindice=9;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+        $sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
+        $sql.= " WHERE ref like '".$db->escape($this->prefix)."____-%'";
+        $sql.= " AND entity = ".$conf->entity;
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj) $max = intval($obj->max);
+            else $max=0;
+        }
+        else
+        {
+            dol_syslog(__METHOD__, LOG_DEBUG);
+            return -1;
+        }
+
+        //$date=time();
+        $date=$object->date_bordereau;
+        $yymm = strftime("%y%m",$date);
+
+        if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
+        else $num = sprintf("%04s",$max+1);
+
+        dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
+        return $this->prefix.$yymm."-".$num;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return next free value
-	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 * 	@param	string		$objforref	Object for number to search
-	 *  @return string      			Next free value
-	 */
-	function chequereceipt_get_num($objsoc,$objforref)
-	{
+    /**
+     *  Return next free value
+     *
+     *  @param	Societe		$objsoc     Object third party
+     * 	@param	string		$objforref	Object for number to search
+     *  @return string      			Next free value
+     */
+    function chequereceipt_get_num($objsoc,$objforref)
+    {
         // phpcs:enable
-		return $this->getNextValue($objsoc,$objforref);
-	}
+        return $this->getNextValue($objsoc,$objforref);
+    }
 }

Spacing +30 added lines, -30 removed lines

@@ -22,7 +22,7 @@ 
  * \brief      File containing class for numbering module Mint
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/cheque/modules_chequereceipts.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
 
 /**
  *	Class to manage cheque receipts numbering rules Mint
@@ -33,16 +33,16 @@ 
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	public $prefix='CHK';
+	public $prefix = 'CHK';
 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
-	public $name='Mint';
+	public $name = 'Mint';
 
 
     /**
@@ -53,7 +53,7 @@ 
     function info()
     {
     	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
     }
 
 
@@ -76,26 +76,26 @@ 
 	 */
 	function canBeActivated()
 	{
-		global $conf,$langs,$db;
+		global $conf, $langs, $db;
 
-		$payyymm=''; $max='';
+		$payyymm = ''; $max = '';
 
-		$posindice=9;
+		$posindice = 9;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$row = $db->fetch_row($resql);
-			if ($row) { $payyymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $payyymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
-		if ($payyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$payyymm))
+		if ($payyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $payyymm))
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel', $max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
 
@@ -109,23 +109,23 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-	function getNextValue($objsoc,$object)
+	function getNextValue($objsoc, $object)
 	{
-		global $db,$conf;
+		global $db, $conf;
 
 		// D'abord on recupere la valeur max
-		$posindice=9;
+		$posindice = 9;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
-		$sql.= " WHERE ref like '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
+		$sql .= " WHERE ref like '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
-			else $max=0;
+			else $max = 0;
 		}
 		else
 		{
@@ -134,11 +134,11 @@ 
 		}
 
 		//$date=time();
-		$date=$object->date_bordereau;
-		$yymm = strftime("%y%m",$date);
+		$date = $object->date_bordereau;
+		$yymm = strftime("%y%m", $date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
+    	if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+    	else $num = sprintf("%04s", $max + 1);
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
@@ -153,9 +153,9 @@ 
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
 	 */
-	function chequereceipt_get_num($objsoc,$objforref)
+	function chequereceipt_get_num($objsoc, $objforref)
 	{
         // phpcs:enable
-		return $this->getNextValue($objsoc,$objforref);
+		return $this->getNextValue($objsoc, $objforref);
 	}
 }

Braces +13 added lines, -6 removed lines

@@ -124,10 +124,12 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
+			if ($obj) {
+			    $max = intval($obj->max);
+			} else {
+			    $max=0;
+			}
+		} else
 		{
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
@@ -137,8 +139,13 @@ 
 		$date=$object->date_bordereau;
 		$yymm = strftime("%y%m",$date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
+    	if ($max >= (pow(10, 4) - 1)) {
+    	    $num=$max+1;
+    	}
+    	// If counter > 9999, we do not format on 4 chars, we take number as it is
+    	else {
+    	    $num = sprintf("%04s",$max+1);
+    	}
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

dolibarr/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php

Indentation +67 added lines, -67 removed lines

@@ -30,18 +30,18 @@ 
  */
 class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
 
-	/**
-	 * @var string Error message
-	 */
-	public $error = '';
+    /**
+     * @var string Error message
+     */
+    public $error = '';
 
-	public $name = 'Thyme';
+    public $name = 'Thyme';
 
 
     /**
@@ -49,39 +49,39 @@ 
      *
      *  @return     string      Texte descripif
      */
-	function info()
+    function info()
     {
-    	global $conf, $langs;
+        global $conf, $langs;
 
-		$langs->load("bills");
+        $langs->load("bills");
 
-		$form = new Form($this->db);
+        $form = new Form($this->db);
 
-		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstchequereceipts" value="CHEQUERECEIPTS_THYME_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
+        $texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+        $texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        $texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        $texte.= '<input type="hidden" name="action" value="updateMask">';
+        $texte.= '<input type="hidden" name="maskconstchequereceipts" value="CHEQUERECEIPTS_THYME_MASK">';
+        $texte.= '<table class="nobordernopadding" width="100%">';
 
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("CheckReceiptShort"),$langs->transnoentities("CheckReceiptShort"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("CheckReceiptShort"),$langs->transnoentities("CheckReceiptShort"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+        $tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("CheckReceiptShort"),$langs->transnoentities("CheckReceiptShort"));
+        $tooltip.=$langs->trans("GenericMaskCodes2");
+        $tooltip.=$langs->trans("GenericMaskCodes3");
+        $tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("CheckReceiptShort"),$langs->transnoentities("CheckReceiptShort"));
+        $tooltip.=$langs->trans("GenericMaskCodes5");
 
-		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskchequereceipts" value="'.$conf->global->CHEQUERECEIPTS_THYME_MASK.'">',$tooltip,1,1).'</td>';
+        // Parametrage du prefix
+        $texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
+        $texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskchequereceipts" value="'.$conf->global->CHEQUERECEIPTS_THYME_MASK.'">',$tooltip,1,1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+        $texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+        $texte.= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+        $texte.= '</table>';
+        $texte.= '</form>';
 
-		return $texte;
+        return $texte;
     }
 
     /**
@@ -91,55 +91,55 @@ 
      */
     function getExample()
     {
-     	global $conf,$langs,$mysoc;
-
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
-
-		if (! $numExample)
-		{
-			$numExample = $langs->trans('NotConfigured');
-		}
-		return $numExample;
+            global $conf,$langs,$mysoc;
+
+        $old_code_client=$mysoc->code_client;
+        $mysoc->code_client='CCCCCCCCCC';
+            $numExample = $this->getNextValue($mysoc,'');
+        $mysoc->code_client=$old_code_client;
+
+        if (! $numExample)
+        {
+            $numExample = $langs->trans('NotConfigured');
+        }
+        return $numExample;
     }
 
-	/**
-	 * 	Return next free value
-	 *
-	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Object		$object		Object we need next value for
-	 *  @return string      			Value if KO, <0 if KO
-	 */
+    /**
+     * 	Return next free value
+     *
+     *  @param	Societe		$objsoc     Object thirdparty
+     *  @param  Object		$object		Object we need next value for
+     *  @return string      			Value if KO, <0 if KO
+     */
     function getNextValue($objsoc,$object)
     {
-		global $db,$conf;
+        global $db,$conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+        require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
 
-		// We get cursor rule
-		$mask=$conf->global->CHEQUERECEIPTS_THYME_MASK;
+        // We get cursor rule
+        $mask=$conf->global->CHEQUERECEIPTS_THYME_MASK;
 
-		if (! $mask)
-		{
-			$this->error='NotConfigured';
-			return 0;
-		}
+        if (! $mask)
+        {
+            $this->error='NotConfigured';
+            return 0;
+        }
 
-		$numFinal=get_next_value($db,$mask,'bordereau_cheque','ref','',$objsoc,$object->date_bordereau);
+        $numFinal=get_next_value($db,$mask,'bordereau_cheque','ref','',$objsoc,$object->date_bordereau);
 
-		return  $numFinal;
-	}
+        return  $numFinal;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return next free value
-	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 * 	@param	string		$objforref	Object for number to search
-	 *  @return string      			Next free value
+    /**
+     *  Return next free value
+     *
+     *  @param	Societe		$objsoc     Object third party
+     * 	@param	string		$objforref	Object for number to search
+     *  @return string      			Next free value
      */
     function chequereceipt_get_num($objsoc,$objforref)
     {

Spacing +34 added lines, -34 removed lines

@@ -22,7 +22,7 @@ 
  * \brief      File containing class for numbering module Thyme
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/cheque/modules_chequereceipts.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
 
 
 /**
@@ -34,7 +34,7 @@ 
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
 	 * @var string Error message
@@ -58,28 +58,28 @@ 
 		$form = new Form($this->db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstchequereceipts" value="CHEQUERECEIPTS_THYME_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("CheckReceiptShort"),$langs->transnoentities("CheckReceiptShort"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("CheckReceiptShort"),$langs->transnoentities("CheckReceiptShort"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstchequereceipts" value="CHEQUERECEIPTS_THYME_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("CheckReceiptShort"), $langs->transnoentities("CheckReceiptShort"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("CheckReceiptShort"), $langs->transnoentities("CheckReceiptShort"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskchequereceipts" value="'.$conf->global->CHEQUERECEIPTS_THYME_MASK.'">',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskchequereceipts" value="'.$conf->global->CHEQUERECEIPTS_THYME_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -91,14 +91,14 @@ 
      */
     function getExample()
     {
-     	global $conf,$langs,$mysoc;
+     	global $conf, $langs, $mysoc;
 
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
+    	$old_code_client = $mysoc->code_client;
+    	$mysoc->code_client = 'CCCCCCCCCC';
+     	$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -112,22 +112,22 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    function getNextValue($objsoc,$object)
+    function getNextValue($objsoc, $object)
     {
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask=$conf->global->CHEQUERECEIPTS_THYME_MASK;
+		$mask = $conf->global->CHEQUERECEIPTS_THYME_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$numFinal=get_next_value($db,$mask,'bordereau_cheque','ref','',$objsoc,$object->date_bordereau);
+		$numFinal = get_next_value($db, $mask, 'bordereau_cheque', 'ref', '', $objsoc, $object->date_bordereau);
 
 		return  $numFinal;
 	}
@@ -141,9 +141,9 @@ 
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
      */
-    function chequereceipt_get_num($objsoc,$objforref)
+    function chequereceipt_get_num($objsoc, $objforref)
     {
         // phpcs:enable
-        return $this->getNextValue($objsoc,$objforref);
+        return $this->getNextValue($objsoc, $objforref);
     }
 }