alxarafe / alixar

dolibarr/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php

Indentation +821 added lines, -821 removed lines

@@ -40,156 +40,156 @@ 
  */
 class pdf_standard extends ModeleExpenseReport
 {
-     /**
-     * @var DoliDb Database handler
-     */
+        /**
+         * @var DoliDb Database handler
+         */
     public $db;
 
-	/**
+    /**
      * @var string model name
      */
     public $name;
 
-	/**
+    /**
      * @var string model description (short text)
      */
     public $description;
 
-	/**
+    /**
      * @var string document type
      */
     public $type;
 
     /**
      * @var array() Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.4 = array(5, 4)
+     * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 4);
+    public $phpmin = array(5, 4);
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
-	/**
+    /**
      * @var int page_largeur
      */
     public $page_largeur;
 
-	/**
+    /**
      * @var int page_hauteur
      */
     public $page_hauteur;
 
-	/**
+    /**
      * @var array format
      */
     public $format;
 
-	/**
+    /**
      * @var int marge_gauche
      */
-	public $marge_gauche;
+    public $marge_gauche;
 
-	/**
+    /**
      * @var int marge_droite
      */
-	public $marge_droite;
+    public $marge_droite;
 
-	/**
+    /**
      * @var int marge_haute
      */
-	public $marge_haute;
+    public $marge_haute;
 
-	/**
+    /**
      * @var int marge_basse
      */
-	public $marge_basse;
-
-	/**
-	 * Issuer
-	 * @var Company object that emits
-	 */
-	public $emetteur;
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $langs, $mysoc;
-
-		// Translations
-		$langs->loadLangs(array("main", "trips", "projects"));
-
-		$this->db = $db;
-		$this->name = "";
-		$this->description = $langs->trans('PDFStandardExpenseReports');
-
-		// 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;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1;                 // Affiche mode reglement
-		$this->option_condreg = 1;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 1;      // Affiche code produit-service
-		$this->option_multilang = 1;               // Dispo en plusieurs langues
-		$this->option_escompte = 0;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 0;             // Support credit notes
-		$this->option_freetext = 1;				   // Support add of a personalised text
-		$this->option_draft_watermark = 1;		   // Support add of a watermark on drafts
-
-		$this->franchise = !$mysoc->tva_assuj;
-
-		// Get source company
-		$this->emetteur=$mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
-
-		// Define position of columns
-		$this->posxpiece=$this->marge_gauche+1;
-		$this->posxcomment=$this->marge_gauche+10;
-		//$this->posxdate=88;
-		//$this->posxtype=107;
-		//$this->posxprojet=120;
-		$this->posxtva=130;
-		$this->posxup=145;
-		$this->posxqty=168;
-		$this->postotalttc=178;
+    public $marge_basse;
+
+    /**
+     * Issuer
+     * @var Company object that emits
+     */
+    public $emetteur;
+
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $langs, $mysoc;
+
+        // Translations
+        $langs->loadLangs(array("main", "trips", "projects"));
+
+        $this->db = $db;
+        $this->name = "";
+        $this->description = $langs->trans('PDFStandardExpenseReports');
+
+        // 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;
+
+        $this->option_logo = 1;                    // Affiche logo
+        $this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
+        $this->option_modereg = 1;                 // Affiche mode reglement
+        $this->option_condreg = 1;                 // Affiche conditions reglement
+        $this->option_codeproduitservice = 1;      // Affiche code produit-service
+        $this->option_multilang = 1;               // Dispo en plusieurs langues
+        $this->option_escompte = 0;                // Affiche si il y a eu escompte
+        $this->option_credit_note = 0;             // Support credit notes
+        $this->option_freetext = 1;				   // Support add of a personalised text
+        $this->option_draft_watermark = 1;		   // Support add of a watermark on drafts
+
+        $this->franchise = !$mysoc->tva_assuj;
+
+        // Get source company
+        $this->emetteur=$mysoc;
+        if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
+
+        // Define position of columns
+        $this->posxpiece=$this->marge_gauche+1;
+        $this->posxcomment=$this->marge_gauche+10;
+        //$this->posxdate=88;
+        //$this->posxtype=107;
+        //$this->posxprojet=120;
+        $this->posxtva=130;
+        $this->posxup=145;
+        $this->posxqty=168;
+        $this->postotalttc=178;
         // if (empty($conf->projet->enabled)) {
         //     $this->posxtva-=20;
         //     $this->posxup-=20;
         //     $this->posxqty-=20;
         //     $this->postotalttc-=20;
         // }
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
-			$this->posxdate-=20;
-			$this->posxtype-=20;
-			$this->posxprojet-=20;
-			$this->posxtva-=20;
-			$this->posxup-=20;
-			$this->posxqty-=20;
-			$this->postotalttc-=20;
-		}
-
-		$this->tva=array();
-		$this->localtax1=array();
-		$this->localtax2=array();
-		$this->atleastoneratenotnull=0;
-	}
+        if ($this->page_largeur < 210) // To work with US executive format
+        {
+            $this->posxdate-=20;
+            $this->posxtype-=20;
+            $this->posxprojet-=20;
+            $this->posxtva-=20;
+            $this->posxup-=20;
+            $this->posxqty-=20;
+            $this->postotalttc-=20;
+        }
+
+        $this->tva=array();
+        $this->localtax1=array();
+        $this->localtax2=array();
+        $this->atleastoneratenotnull=0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -203,65 +203,65 @@ 
      *  @param		int			$hidedesc			Do not show desc
      *  @param		int			$hideref			Do not show ref
      *  @return     int             				1=OK, 0=KO
-	 */
-	function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-	{
+     */
+    function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+    {
         // phpcs:enable
-		global $user, $langs, $conf, $mysoc, $db, $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
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-
-		// Load traductions files requiredby by page
-		$outputlangs->loadLangs(array("main", "trips", "projects", "dict", "bills", "banks"));
-
-		$nblignes = count($object->lines);
-
-		if ($conf->expensereport->dir_output) {
-			// Definition of $dir and $file
-			if ($object->specimen) {
-				$dir = $conf->expensereport->dir_output;
-				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
-			{
-				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->expensereport->dir_output . "/" . $objectref;
-				$file = $dir . "/" . $objectref . ".pdf";
-			}
-
-			if (! file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-					return 0;
-				}
-			}
-
-			if (file_exists($dir))
-			{
-				// 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('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-				// Create pdf instance
-				$pdf=pdf_getInstance($this->format);
-				$default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
-				$heightforinfotot = 40;	// 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 + 12;	// 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);
+        global $user, $langs, $conf, $mysoc, $db, $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
+        if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+
+        // Load traductions files requiredby by page
+        $outputlangs->loadLangs(array("main", "trips", "projects", "dict", "bills", "banks"));
+
+        $nblignes = count($object->lines);
+
+        if ($conf->expensereport->dir_output) {
+            // Definition of $dir and $file
+            if ($object->specimen) {
+                $dir = $conf->expensereport->dir_output;
+                $file = $dir . "/SPECIMEN.pdf";
+            }
+            else
+            {
+                $objectref = dol_sanitizeFileName($object->ref);
+                $dir = $conf->expensereport->dir_output . "/" . $objectref;
+                $file = $dir . "/" . $objectref . ".pdf";
+            }
+
+            if (! file_exists($dir))
+            {
+                if (dol_mkdir($dir) < 0)
+                {
+                    $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                    return 0;
+                }
+            }
+
+            if (file_exists($dir))
+            {
+                // 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('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+                // Create pdf instance
+                $pdf=pdf_getInstance($this->format);
+                $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
+                $heightforinfotot = 40;	// 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 + 12;	// 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'))
                 {
@@ -269,124 +269,124 @@ 
                     $pdf->setPrintFooter(false);
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
-			    // Set path to the background PDF File
+                // Set path to the background PDF File
                 if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
                 }
 
-				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
-
-				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-				$pdf->SetSubject($outputlangs->transnoentities("Trips"));
-				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
-				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Trips"));
-				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
-
-				// New page
-				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-				$pagenb++;
-				$this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', $default_font_size - 1);
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
-				$pdf->SetTextColor(0,0,0);
-
-				$tab_top = 95;
-				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?65:10);
-				$tab_height = 130;
-				$tab_height_newpage = 150;
-
-				// Show notes
-				$notetoshow=empty($object->note_public)?'':$object->note_public;
-				if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
-				{
-					// Get first sale rep
-					if (is_object($object->thirdparty))
-					{
-						$salereparray=$object->thirdparty->getSalesRepresentatives($user);
-						$salerepobj=new User($this->db);
-						$salerepobj->fetch($salereparray[0]['id']);
-						if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
-					}
-				}
-				if ($notetoshow)
-				{
-					$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
-					complete_substitutions_array($substitutionarray, $outputlangs, $object);
-					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
-
-					$tab_top = 95;
-
-					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxpiece-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
-					$nexY = $pdf->GetY();
-					$height_note=$nexY-$tab_top;
-
-					// Rect prend une longueur en 3eme param
-					$pdf->SetDrawColor(192,192,192);
-					$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
-
-					$tab_height = $tab_height - $height_note;
-					$tab_top = $nexY+6;
-				}
-				else
-				{
-					$height_note=0;
-				}
-
-				$iniY = $tab_top + 7;
-				$initialY = $tab_top + 7;
-				$nexY = $tab_top + 7;
-
-				// Loop on each lines
-				for ($i = 0 ; $i < $nblignes ; $i++) {
-					$pdf->SetFont('','', $default_font_size - 2);   // Into loop to work with multipage
-					$pdf->SetTextColor(0,0,0);
-
-					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
-					$pageposbefore = $pdf->getPage();
+                $pdf->Open();
+                $pagenb=0;
+                $pdf->SetDrawColor(128,128,128);
+
+                $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+                $pdf->SetSubject($outputlangs->transnoentities("Trips"));
+                $pdf->SetCreator("Dolibarr ".DOL_VERSION);
+                $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+                $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Trips"));
+                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
+
+                // New page
+                $pdf->AddPage();
+                if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                $pagenb++;
+                $this->_pagehead($pdf, $object, 1, $outputlangs);
+                $pdf->SetFont('','', $default_font_size - 1);
+                $pdf->MultiCell(0, 3, '');		// Set interline to 3
+                $pdf->SetTextColor(0,0,0);
+
+                $tab_top = 95;
+                $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?65:10);
+                $tab_height = 130;
+                $tab_height_newpage = 150;
+
+                // Show notes
+                $notetoshow=empty($object->note_public)?'':$object->note_public;
+                if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
+                {
+                    // Get first sale rep
+                    if (is_object($object->thirdparty))
+                    {
+                        $salereparray=$object->thirdparty->getSalesRepresentatives($user);
+                        $salerepobj=new User($this->db);
+                        $salerepobj->fetch($salereparray[0]['id']);
+                        if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+                    }
+                }
+                if ($notetoshow)
+                {
+                    $substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
+                    complete_substitutions_array($substitutionarray, $outputlangs, $object);
+                    $notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+
+                    $tab_top = 95;
+
+                    $pdf->SetFont('','', $default_font_size - 1);
+                    $pdf->writeHTMLCell(190, 3, $this->posxpiece-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+                    $nexY = $pdf->GetY();
+                    $height_note=$nexY-$tab_top;
+
+                    // Rect prend une longueur en 3eme param
+                    $pdf->SetDrawColor(192,192,192);
+                    $pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+
+                    $tab_height = $tab_height - $height_note;
+                    $tab_top = $nexY+6;
+                }
+                else
+                {
+                    $height_note=0;
+                }
+
+                $iniY = $tab_top + 7;
+                $initialY = $tab_top + 7;
+                $nexY = $tab_top + 7;
+
+                // Loop on each lines
+                for ($i = 0 ; $i < $nblignes ; $i++) {
+                    $pdf->SetFont('','', $default_font_size - 2);   // Into loop to work with multipage
+                    $pdf->SetTextColor(0,0,0);
+
+                    $pdf->setTopMargin($tab_top_newpage);
+                    $pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
+                    $pageposbefore = $pdf->getPage();
                     $curY = $nexY;
                     $pdf->startTransaction();
                     $this->printLine($pdf, $object, $i, $curY, $default_font_size, $outputlangs, $hidedetails);
                     $pageposafter=$pdf->getPage();
-					if ($pageposafter > $pageposbefore) {
+                    if ($pageposafter > $pageposbefore) {
                         // There is a pagebreak
-						$pdf->rollbackTransaction(true);
-						$pageposafter = $pageposbefore;
-						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-						$this->printLine($pdf, $object, $i, $curY, $default_font_size, $outputlangs, $hidedetails);
-						$pageposafter = $pdf->getPage();
-						$posyafter = $pdf->GetY();
-						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) {
+                        $pdf->rollbackTransaction(true);
+                        $pageposafter = $pageposbefore;
+                        //print $pageposafter.'-'.$pageposbefore;exit;
+                        $pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+                        $this->printLine($pdf, $object, $i, $curY, $default_font_size, $outputlangs, $hidedetails);
+                        $pageposafter = $pdf->getPage();
+                        $posyafter = $pdf->GetY();
+                        //var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
+                        if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) {
                             // There is no space left for total+free text
-							if ($i == ($nblignes-1)) {
+                            if ($i == ($nblignes-1)) {
                                 // No more lines, and no space left to show total, so we create a new page
-								$pdf->AddPage('', '', true);
-								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-								$pdf->setPage($pageposafter+1);
-							}
-						}
-						else
-						{
-							// We found a page break
-							$showpricebeforepagebreak=0;
-						}
-					}
-					else	// No pagebreak
-					{
-						$pdf->commitTransaction();
-					}
+                                $pdf->AddPage('', '', true);
+                                if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                                if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+                                $pdf->setPage($pageposafter+1);
+                            }
+                        }
+                        else
+                        {
+                            // We found a page break
+                            $showpricebeforepagebreak=0;
+                        }
+                    }
+                    else	// No pagebreak
+                    {
+                        $pdf->commitTransaction();
+                    }
                     //nexY
                     $nexY = $pdf->GetY();
                     $pageposafter=$pdf->getPage();
@@ -396,140 +396,140 @@ 
 
                     //$nblineFollowComment = 1;
                     // Cherche nombre de lignes a venir pour savoir si place suffisante
-					// if ($i < ($nblignes - 1))	// If it's not last line
-					// {
-					//     //Fetch current description to know on which line the next one should be placed
-					// 	$follow_comment = $object->lines[$i]->comments;
-					// 	$follow_type = $object->lines[$i]->type_fees_code;
+                    // if ($i < ($nblignes - 1))	// If it's not last line
+                    // {
+                    //     //Fetch current description to know on which line the next one should be placed
+                    // 	$follow_comment = $object->lines[$i]->comments;
+                    // 	$follow_type = $object->lines[$i]->type_fees_code;
 
-					// 	//on compte le nombre de ligne afin de verifier la place disponible (largeur de ligne 52 caracteres)
-					// 	$nbLineCommentNeed = dol_nboflines_bis($follow_comment,52,$outputlangs->charset_output);
-					// 	$nbLineTypeNeed = dol_nboflines_bis($follow_type,4,$outputlangs->charset_output);
+                    // 	//on compte le nombre de ligne afin de verifier la place disponible (largeur de ligne 52 caracteres)
+                    // 	$nbLineCommentNeed = dol_nboflines_bis($follow_comment,52,$outputlangs->charset_output);
+                    // 	$nbLineTypeNeed = dol_nboflines_bis($follow_type,4,$outputlangs->charset_output);
 
                     //     $nblineFollowComment = max($nbLineCommentNeed, $nbLineTypeNeed);
-					// }
+                    // }
 
                     //$nexY+=$nblineFollowComment*($pdf->getFontSize()*1.3);    // Passe espace entre les lignes
                     $nexY += ($pdf->getFontSize()*1.3);    // Passe espace entre les lignes
 
-					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
-						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
-						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
-						$pagenb++;
-						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-					}
-					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
-						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
-						// New page
-						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-					}
-				}
-
-				// Show square
-				if ($pagenb == 1)
-				{
-					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-
-				$pdf->SetFont('','', 10);
-
-            	// Show total area box
-				$posy=$bottomlasttab+5;
-				$posy_start_of_totals = $posy;
-				$pdf->SetXY(130, $posy);
-				$pdf->MultiCell(70, 5, $outputlangs->transnoentities("TotalHT"), 1, 'L');
-				$pdf->SetXY(180, $posy);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 180, 5, price($object->total_ht), 1, 'R');
-				$pdf->SetFillColor(248,248,248);
-
-				if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-				{
-				    // TODO Show vat amout per tax level
-					$posy+=5;
-					$pdf->SetXY(130, $posy);
-					$pdf->SetTextColor(0,0,60);
-					$pdf->MultiCell(70, 5, $outputlangs->transnoentities("TotalVAT"), 1,'L');
-					$pdf->SetXY(180, $posy);
-					$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 180, 5, price($object->total_tva),1, 'R');
-				}
-
-				$posy+=5;
-				$pdf->SetXY(130, $posy);
-				$pdf->SetFont('','B', 10);
-				$pdf->SetTextColor(0,0,60);
-				$pdf->MultiCell(70, 5, $outputlangs->transnoentities("TotalTTC"), 1,'L');
-				$pdf->SetXY(180, $posy);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 180, 5, price($object->total_ttc),1, 'R');
-
-				// show payments zone
-				$sumPayments = $object->getSumPayments();
-				if ($sumPayments > 0 && empty($conf->global->PDF_EXPENSEREPORT_NO_PAYMENT_DETAILS)) {
-					$posy=$this->tablePayments($pdf, $object, $posy_start_of_totals, $outputlangs);
-				}
-
-				// Pied de page
-				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPage();
-
-				$pdf->Close();
-
-				$pdf->Output($file,'F');
-
-				// Add pdfgeneration hook
-				$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));
-
-				$this->result = array('fullpath'=>$file);
-
-				return 1;   // Pas d'erreur
-			}
-			else
-			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
-				return 0;
-			}
-		}
-		else
-		{
-			$this->error=$langs->trans("ErrorConstantNotDefined","EXPENSEREPORT_OUTPUTDIR");
-			return 0;
-		}
-	}
+                    // Detect if some page were added automatically and output _tableau for past pages
+                    while ($pagenb < $pageposafter)
+                    {
+                        $pdf->setPage($pagenb);
+                        if ($pagenb == 1)
+                        {
+                            $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+                        }
+                        else
+                        {
+                            $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+                        }
+                        $this->_pagefoot($pdf,$object,$outputlangs,1);
+                        $pagenb++;
+                        $pdf->setPage($pagenb);
+                        $pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+                    }
+                    if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
+                    {
+                        if ($pagenb == 1)
+                        {
+                            $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+                        }
+                        else
+                        {
+                            $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+                        }
+                        $this->_pagefoot($pdf,$object,$outputlangs,1);
+                        // New page
+                        $pdf->AddPage();
+                        if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+                        $pagenb++;
+                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+                    }
+                }
+
+                // Show square
+                if ($pagenb == 1)
+                {
+                    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
+                    $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+                }
+                else
+                {
+                    $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+                    $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+                }
+
+                $pdf->SetFont('','', 10);
+
+                // Show total area box
+                $posy=$bottomlasttab+5;
+                $posy_start_of_totals = $posy;
+                $pdf->SetXY(130, $posy);
+                $pdf->MultiCell(70, 5, $outputlangs->transnoentities("TotalHT"), 1, 'L');
+                $pdf->SetXY(180, $posy);
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - 180, 5, price($object->total_ht), 1, 'R');
+                $pdf->SetFillColor(248,248,248);
+
+                if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+                {
+                    // TODO Show vat amout per tax level
+                    $posy+=5;
+                    $pdf->SetXY(130, $posy);
+                    $pdf->SetTextColor(0,0,60);
+                    $pdf->MultiCell(70, 5, $outputlangs->transnoentities("TotalVAT"), 1,'L');
+                    $pdf->SetXY(180, $posy);
+                    $pdf->MultiCell($this->page_largeur - $this->marge_gauche - 180, 5, price($object->total_tva),1, 'R');
+                }
+
+                $posy+=5;
+                $pdf->SetXY(130, $posy);
+                $pdf->SetFont('','B', 10);
+                $pdf->SetTextColor(0,0,60);
+                $pdf->MultiCell(70, 5, $outputlangs->transnoentities("TotalTTC"), 1,'L');
+                $pdf->SetXY(180, $posy);
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - 180, 5, price($object->total_ttc),1, 'R');
+
+                // show payments zone
+                $sumPayments = $object->getSumPayments();
+                if ($sumPayments > 0 && empty($conf->global->PDF_EXPENSEREPORT_NO_PAYMENT_DETAILS)) {
+                    $posy=$this->tablePayments($pdf, $object, $posy_start_of_totals, $outputlangs);
+                }
+
+                // Pied de page
+                $this->_pagefoot($pdf,$object,$outputlangs);
+                if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPage();
+
+                $pdf->Close();
+
+                $pdf->Output($file,'F');
+
+                // Add pdfgeneration hook
+                $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));
+
+                $this->result = array('fullpath'=>$file);
+
+                return 1;   // Pas d'erreur
+            }
+            else
+            {
+                $this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+                return 0;
+            }
+        }
+        else
+        {
+            $this->error=$langs->trans("ErrorConstantNotDefined","EXPENSEREPORT_OUTPUTDIR");
+            return 0;
+        }
+    }
 
     /**
      * @param   TCPDF       $pdf                Object PDF
@@ -542,7 +542,7 @@ 
      * @return  void
      */
     private function printLine(&$pdf, $object, $linenumber, $curY, $default_font_size, $outputlangs, $hidedetails=0)
-	{
+    {
         global $conf;
         $pdf->SetFont('','', $default_font_size - 1);
 
@@ -612,24 +612,24 @@ 
     }
 
     /**
-	 *  Show top header of page.
-	 *
-	 *  @param	PDF			$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
-	 *  @param  int	    	$showaddress    0=no, 1=yes
-	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @return	void
-	 */
-	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
-	{
-		global $conf, $langs, $hookmanager;
-
-		// Load traductions files requiredby by page
-		$outputlangs->loadLangs(array("main", "trips", "companies"));
-
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		/*
+     *  Show top header of page.
+     *
+     *  @param	PDF			$pdf     		Object PDF
+     *  @param  Object		$object     	Object to show
+     *  @param  int	    	$showaddress    0=no, 1=yes
+     *  @param  Translate	$outputlangs	Object lang for output
+     *  @return	void
+     */
+    function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+    {
+        global $conf, $langs, $hookmanager;
+
+        // Load traductions files requiredby by page
+        $outputlangs->loadLangs(array("main", "trips", "companies"));
+
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+        /*
 		// ajout du fondu vert en bas de page à droite
 		$image_fondue = $conf->mycompany->dir_output.'/fondu_vert_.jpg';
 		$pdf->Image($image_fondue,20,107,200,190);
@@ -637,430 +637,430 @@ 
 		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 		*/
 
-	    // Draft watermark
-		if ($object->fk_statut == 0 && ! empty($conf->global->EXPENSEREPORT_DRAFT_WATERMARK)) {
- 			pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->EXPENSEREPORT_DRAFT_WATERMARK);
-		}
-
-		$pdf->SetTextColor(0, 0, 60);
-		$pdf->SetFont('', 'B', $default_font_size + 3);
-
-		$posy=$this->marge_haute;
-		$posx=$this->page_largeur-$this->marge_droite-100;
-
-		$pdf->SetXY($this->marge_gauche,$posy);
-
-		// Logo
-		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo) {
-			if (is_readable($logo)) {
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-			} else {
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B', $default_font_size -2);
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
-			}
-		}
-		else
-		{
-			$text=$this->emetteur->name;
-			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
-		}
-
-		$pdf->SetFont('','B', $default_font_size + 4);
-		$pdf->SetXY($posx,$posy);
-   		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell($this->page_largeur-$this->marge_droite-$posx,6,$langs->trans("ExpenseReport"), 0, 'R');
-
-		$pdf->SetFont('','', $default_font_size -1);
-
-   		// Ref complete
-   		$posy+=8;
-   		$pdf->SetXY($posx,$posy);
-   		$pdf->SetTextColor(0,0,60);
-   		$pdf->MultiCell($this->page_largeur-$this->marge_droite-$posx, 3, $outputlangs->transnoentities("Ref")." : " . $object->ref, '', 'R');
-
-   		// Date start period
-   		$posy+=5;
-   		$pdf->SetXY($posx,$posy);
-   		$pdf->SetTextColor(0,0,60);
-   		$pdf->MultiCell($this->page_largeur-$this->marge_droite-$posx, 3, $outputlangs->transnoentities("DateStart")." : " . ($object->date_debut>0?dol_print_date($object->date_debut,"day",false,$outputlangs):''), '', 'R');
-
-   		// Date end period
-   		$posy+=5;
-   		$pdf->SetXY($posx,$posy);
-   		$pdf->SetTextColor(0,0,60);
-   		$pdf->MultiCell($this->page_largeur-$this->marge_droite-$posx, 3, $outputlangs->transnoentities("DateEnd")." : " . ($object->date_fin>0?dol_print_date($object->date_fin,"day",false,$outputlangs):''), '', 'R');
-
-   		// Status Expense Report
-   		$posy+=6;
-   		$pdf->SetXY($posx,$posy);
-   		$pdf->SetFont('','B', $default_font_size + 2);
-   		$pdf->SetTextColor(111,81,124);
-		$pdf->MultiCell($this->page_largeur-$this->marge_droite-$posx, 3, $object->getLibStatut(0), '', 'R');
-
-		if ($showaddress) {
-			// Sender properties
-			$carac_emetteur = '';
-			$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->address);
-			$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->zip).' '.$outputlangs->convToOutputCharset($this->emetteur->town);
-			$carac_emetteur .= "\n";
-			// Phone
-			if ($this->emetteur->phone) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Phone")." : ".$outputlangs->convToOutputCharset($this->emetteur->phone);
-			// Fax
-			if ($this->emetteur->fax) $carac_emetteur .= ($carac_emetteur ? ($this->emetteur->tel ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax")." : ".$outputlangs->convToOutputCharset($this->emetteur->fax);
-			// EMail
-			if ($this->emetteur->email) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Email")." : ".$outputlangs->convToOutputCharset($this->emetteur->email);
-			// Web
-			if ($this->emetteur->url) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Web")." : ".$outputlangs->convToOutputCharset($this->emetteur->url);
-
-			// Show sender
-			$posy=50;
-			$posx=$this->marge_gauche;
-			$hautcadre=40;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=118;
-
-			// Show sender frame
-			$pdf->SetTextColor(0, 0, 0);
-			$pdf->SetFont('','B', $default_font_size - 2);
-			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell(66,5, $outputlangs->transnoentities("TripSociete")." :",'','L');
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetFillColor(224,224,224);
-			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
-			$pdf->SetTextColor(0, 0, 60);
-
-			// Show sender name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
-			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-
-			// Show sender information
-			$pdf->SetXY($posx+2,$posy+8);
-			$pdf->SetFont('', '', $default_font_size - 1);
-			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
-
-			// Show recipient
-			$posy=50;
-			$posx=100;
-
-			// Show recipient frame
-			$pdf->SetTextColor(0, 0, 0);
-			$pdf->SetFont('', 'B', 8);
-			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("TripNDF")." :", 0, 'L');
-			$pdf->rect($posx, $posy, $this->page_largeur - $this->marge_gauche - $posx, $hautcadre);
-
-			// Informations for trip (dates and users workflow)
-			if ($object->fk_user_author > 0) {
-				$userfee=new User($this->db);
-				$userfee->fetch($object->fk_user_author); $posy+=3;
-				$pdf->SetXY($posx+2,$posy);
-				$pdf->SetFont('','',10);
-				$pdf->MultiCell(96,4,$outputlangs->transnoentities("AUTHOR")." : ".dolGetFirstLastname($userfee->firstname,$userfee->lastname),0,'L');
-				$posy+=5;
-				$pdf->SetXY($posx+2,$posy);
-				$pdf->MultiCell(96,4,$outputlangs->transnoentities("DateCreation")." : ".dol_print_date($object->date_create,"day",false,$outputlangs),0,'L');
-			}
-
-			if ($object->fk_statut==99)
-			{
-				if ($object->fk_user_refuse > 0) {
-					$userfee=new User($this->db);
-					$userfee->fetch($object->fk_user_refuse); $posy+=6;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("REFUSEUR")." : ".dolGetFirstLastname($userfee->firstname,$userfee->lastname),0,'L');
-					$posy+=5;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("MOTIF_REFUS")." : ".$outputlangs->convToOutputCharset($object->detail_refuse),0,'L');
-					$posy+=5;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("DATE_REFUS")." : ".dol_print_date($object->date_refuse,"day",false,$outputlangs),0,'L');
-				}
-			}
-			else if($object->fk_statut==4)
-			{
-				if ($object->fk_user_cancel > 0) {
-					$userfee=new User($this->db);
-					$userfee->fetch($object->fk_user_cancel); $posy+=6;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("CANCEL_USER")." : ".dolGetFirstLastname($userfee->firstname,$userfee->lastname),0,'L');
-					$posy+=5;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("MOTIF_CANCEL")." : ".$outputlangs->convToOutputCharset($object->detail_cancel),0,'L');
-					$posy+=5;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("DATE_CANCEL")." : ".dol_print_date($object->date_cancel,"day",false,$outputlangs),0,'L');
-				}
-			}
-			else
-			{
-				if ($object->fk_user_approve > 0) {
-					$userfee=new User($this->db);
-					$userfee->fetch($object->fk_user_approve); $posy+=6;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("VALIDOR")." : ".dolGetFirstLastname($userfee->firstname,$userfee->lastname),0,'L');
-					$posy+=5;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("DateApprove")." : ".dol_print_date($object->date_approve,"day",false,$outputlangs),0,'L');
-				}
-			}
-
-			if($object->fk_statut==6) {
-				if ($object->fk_user_paid > 0) {
-					$userfee=new User($this->db);
-					$userfee->fetch($object->fk_user_paid); $posy+=6;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("AUTHORPAIEMENT")." : ".dolGetFirstLastname($userfee->firstname,$userfee->lastname),0,'L');
-					$posy+=5;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("DATE_PAIEMENT")." : ".dol_print_date($object->date_paiement,"day",false,$outputlangs),0,'L');
-				}
-			}
-		}
-   	}
-
-	/**
-	 *   Show table for lines
-	 *
-	 *   @param     PDF			$pdf     		Object PDF
-	 *   @param		int			$tab_top		Tab top
-	 *   @param		int			$tab_height		Tab height
-	 *   @param		int			$nexY			next y
-	 *   @param		Translate	$outputlangs	Output langs
-	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
-	 *   @param		int			$hidebottom		Hide bottom bar of array
-	 *   @param		string		$currency		Currency code
-	 *   @return	void
-	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
-	{
-		global $conf;
-
-		// Force to disable hidetop and hidebottom
-		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
-
-		$currency = !empty($currency) ? $currency : $conf->currency;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		// Amount in (at tab_top - 1)
-		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('', '', $default_font_size - 2);
-		$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
-		$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 4), $tab_top -4);
-		$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
-
-		$pdf->SetDrawColor(128,128,128);
-
-		// Rect prend une longueur en 3eme param
-		$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height);
-		// line prend une position y en 3eme param
-		if (empty($hidetop)) {
-			$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);
-		}
-
-		$pdf->SetFont('','',8);
-
-		// Accountancy piece
-		if (empty($hidetop)) {
-			$pdf->SetXY($this->posxpiece-1, $tab_top+1);
-			$pdf->MultiCell($this->posxcomment-$this->posxpiece-1, 1, '', '', 'R');
-		}
-
-		// Comments
-		$pdf->line($this->posxcomment-1, $tab_top, $this->posxcomment-1, $tab_top + $tab_height);
-		if (empty($hidetop)) {
-			$pdf->SetXY($this->posxcomment-1, $tab_top+1);
-			$pdf->MultiCell($this->posxdate-$this->posxcomment-1, 1, $outputlangs->transnoentities("Description"),'','L');
-		}
-
-		// Date
-		//$pdf->line($this->posxdate-1, $tab_top, $this->posxdate-1, $tab_top + $tab_height);
-		//if (empty($hidetop))
-		//{
-		//	$pdf->SetXY($this->posxdate-1, $tab_top+1);
-		//	$pdf->MultiCell($this->posxtype-$this->posxdate-1,2, $outputlangs->transnoentities("Date"),'','C');
-		//}
-
-		// Type
-		//$pdf->line($this->posxtype-1, $tab_top, $this->posxtype-1, $tab_top + $tab_height);
-		//if (empty($hidetop))
-		//{
-		//	$pdf->SetXY($this->posxtype-1, $tab_top+1);
-		//	$pdf->MultiCell($this->posxprojet-$this->posxtype - 1, 2, $outputlangs->transnoentities("Type"), '', 'C');
-		//}
+        // Draft watermark
+        if ($object->fk_statut == 0 && ! empty($conf->global->EXPENSEREPORT_DRAFT_WATERMARK)) {
+                pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->EXPENSEREPORT_DRAFT_WATERMARK);
+        }
+
+        $pdf->SetTextColor(0, 0, 60);
+        $pdf->SetFont('', 'B', $default_font_size + 3);
+
+        $posy=$this->marge_haute;
+        $posx=$this->page_largeur-$this->marge_droite-100;
+
+        $pdf->SetXY($this->marge_gauche,$posy);
+
+        // Logo
+        $logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+        if ($this->emetteur->logo) {
+            if (is_readable($logo)) {
+                $height=pdf_getHeightForLogo($logo);
+                $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+            } else {
+                $pdf->SetTextColor(200,0,0);
+                $pdf->SetFont('','B', $default_font_size -2);
+                $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+                $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+            }
+        }
+        else
+        {
+            $text=$this->emetteur->name;
+            $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+        }
+
+        $pdf->SetFont('','B', $default_font_size + 4);
+        $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+        $pdf->MultiCell($this->page_largeur-$this->marge_droite-$posx,6,$langs->trans("ExpenseReport"), 0, 'R');
+
+        $pdf->SetFont('','', $default_font_size -1);
+
+            // Ref complete
+            $posy+=8;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell($this->page_largeur-$this->marge_droite-$posx, 3, $outputlangs->transnoentities("Ref")." : " . $object->ref, '', 'R');
+
+            // Date start period
+            $posy+=5;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell($this->page_largeur-$this->marge_droite-$posx, 3, $outputlangs->transnoentities("DateStart")." : " . ($object->date_debut>0?dol_print_date($object->date_debut,"day",false,$outputlangs):''), '', 'R');
+
+            // Date end period
+            $posy+=5;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetTextColor(0,0,60);
+            $pdf->MultiCell($this->page_largeur-$this->marge_droite-$posx, 3, $outputlangs->transnoentities("DateEnd")." : " . ($object->date_fin>0?dol_print_date($object->date_fin,"day",false,$outputlangs):''), '', 'R');
+
+            // Status Expense Report
+            $posy+=6;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetFont('','B', $default_font_size + 2);
+            $pdf->SetTextColor(111,81,124);
+        $pdf->MultiCell($this->page_largeur-$this->marge_droite-$posx, 3, $object->getLibStatut(0), '', 'R');
+
+        if ($showaddress) {
+            // Sender properties
+            $carac_emetteur = '';
+            $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->address);
+            $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->zip).' '.$outputlangs->convToOutputCharset($this->emetteur->town);
+            $carac_emetteur .= "\n";
+            // Phone
+            if ($this->emetteur->phone) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Phone")." : ".$outputlangs->convToOutputCharset($this->emetteur->phone);
+            // Fax
+            if ($this->emetteur->fax) $carac_emetteur .= ($carac_emetteur ? ($this->emetteur->tel ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax")." : ".$outputlangs->convToOutputCharset($this->emetteur->fax);
+            // EMail
+            if ($this->emetteur->email) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Email")." : ".$outputlangs->convToOutputCharset($this->emetteur->email);
+            // Web
+            if ($this->emetteur->url) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Web")." : ".$outputlangs->convToOutputCharset($this->emetteur->url);
+
+            // Show sender
+            $posy=50;
+            $posx=$this->marge_gauche;
+            $hautcadre=40;
+            if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=118;
+
+            // Show sender frame
+            $pdf->SetTextColor(0, 0, 0);
+            $pdf->SetFont('','B', $default_font_size - 2);
+            $pdf->SetXY($posx,$posy-5);
+            $pdf->MultiCell(66,5, $outputlangs->transnoentities("TripSociete")." :",'','L');
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetFillColor(224,224,224);
+            $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+            $pdf->SetTextColor(0, 0, 60);
+
+            // Show sender name
+            $pdf->SetXY($posx+2,$posy+3);
+            $pdf->SetFont('','B', $default_font_size);
+            $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+
+            // Show sender information
+            $pdf->SetXY($posx+2,$posy+8);
+            $pdf->SetFont('', '', $default_font_size - 1);
+            $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+
+            // Show recipient
+            $posy=50;
+            $posx=100;
+
+            // Show recipient frame
+            $pdf->SetTextColor(0, 0, 0);
+            $pdf->SetFont('', 'B', 8);
+            $pdf->SetXY($posx,$posy-5);
+            $pdf->MultiCell(80, 5, $outputlangs->transnoentities("TripNDF")." :", 0, 'L');
+            $pdf->rect($posx, $posy, $this->page_largeur - $this->marge_gauche - $posx, $hautcadre);
+
+            // Informations for trip (dates and users workflow)
+            if ($object->fk_user_author > 0) {
+                $userfee=new User($this->db);
+                $userfee->fetch($object->fk_user_author); $posy+=3;
+                $pdf->SetXY($posx+2,$posy);
+                $pdf->SetFont('','',10);
+                $pdf->MultiCell(96,4,$outputlangs->transnoentities("AUTHOR")." : ".dolGetFirstLastname($userfee->firstname,$userfee->lastname),0,'L');
+                $posy+=5;
+                $pdf->SetXY($posx+2,$posy);
+                $pdf->MultiCell(96,4,$outputlangs->transnoentities("DateCreation")." : ".dol_print_date($object->date_create,"day",false,$outputlangs),0,'L');
+            }
+
+            if ($object->fk_statut==99)
+            {
+                if ($object->fk_user_refuse > 0) {
+                    $userfee=new User($this->db);
+                    $userfee->fetch($object->fk_user_refuse); $posy+=6;
+                    $pdf->SetXY($posx+2,$posy);
+                    $pdf->MultiCell(96,4,$outputlangs->transnoentities("REFUSEUR")." : ".dolGetFirstLastname($userfee->firstname,$userfee->lastname),0,'L');
+                    $posy+=5;
+                    $pdf->SetXY($posx+2,$posy);
+                    $pdf->MultiCell(96,4,$outputlangs->transnoentities("MOTIF_REFUS")." : ".$outputlangs->convToOutputCharset($object->detail_refuse),0,'L');
+                    $posy+=5;
+                    $pdf->SetXY($posx+2,$posy);
+                    $pdf->MultiCell(96,4,$outputlangs->transnoentities("DATE_REFUS")." : ".dol_print_date($object->date_refuse,"day",false,$outputlangs),0,'L');
+                }
+            }
+            else if($object->fk_statut==4)
+            {
+                if ($object->fk_user_cancel > 0) {
+                    $userfee=new User($this->db);
+                    $userfee->fetch($object->fk_user_cancel); $posy+=6;
+                    $pdf->SetXY($posx+2,$posy);
+                    $pdf->MultiCell(96,4,$outputlangs->transnoentities("CANCEL_USER")." : ".dolGetFirstLastname($userfee->firstname,$userfee->lastname),0,'L');
+                    $posy+=5;
+                    $pdf->SetXY($posx+2,$posy);
+                    $pdf->MultiCell(96,4,$outputlangs->transnoentities("MOTIF_CANCEL")." : ".$outputlangs->convToOutputCharset($object->detail_cancel),0,'L');
+                    $posy+=5;
+                    $pdf->SetXY($posx+2,$posy);
+                    $pdf->MultiCell(96,4,$outputlangs->transnoentities("DATE_CANCEL")." : ".dol_print_date($object->date_cancel,"day",false,$outputlangs),0,'L');
+                }
+            }
+            else
+            {
+                if ($object->fk_user_approve > 0) {
+                    $userfee=new User($this->db);
+                    $userfee->fetch($object->fk_user_approve); $posy+=6;
+                    $pdf->SetXY($posx+2,$posy);
+                    $pdf->MultiCell(96,4,$outputlangs->transnoentities("VALIDOR")." : ".dolGetFirstLastname($userfee->firstname,$userfee->lastname),0,'L');
+                    $posy+=5;
+                    $pdf->SetXY($posx+2,$posy);
+                    $pdf->MultiCell(96,4,$outputlangs->transnoentities("DateApprove")." : ".dol_print_date($object->date_approve,"day",false,$outputlangs),0,'L');
+                }
+            }
+
+            if($object->fk_statut==6) {
+                if ($object->fk_user_paid > 0) {
+                    $userfee=new User($this->db);
+                    $userfee->fetch($object->fk_user_paid); $posy+=6;
+                    $pdf->SetXY($posx+2,$posy);
+                    $pdf->MultiCell(96,4,$outputlangs->transnoentities("AUTHORPAIEMENT")." : ".dolGetFirstLastname($userfee->firstname,$userfee->lastname),0,'L');
+                    $posy+=5;
+                    $pdf->SetXY($posx+2,$posy);
+                    $pdf->MultiCell(96,4,$outputlangs->transnoentities("DATE_PAIEMENT")." : ".dol_print_date($object->date_paiement,"day",false,$outputlangs),0,'L');
+                }
+            }
+        }
+        }
+
+    /**
+     *   Show table for lines
+     *
+     *   @param     PDF			$pdf     		Object PDF
+     *   @param		int			$tab_top		Tab top
+     *   @param		int			$tab_height		Tab height
+     *   @param		int			$nexY			next y
+     *   @param		Translate	$outputlangs	Output langs
+     *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
+     *   @param		int			$hidebottom		Hide bottom bar of array
+     *   @param		string		$currency		Currency code
+     *   @return	void
+     */
+    function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
+    {
+        global $conf;
+
+        // Force to disable hidetop and hidebottom
+        $hidebottom=0;
+        if ($hidetop) $hidetop=-1;
+
+        $currency = !empty($currency) ? $currency : $conf->currency;
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+        // Amount in (at tab_top - 1)
+        $pdf->SetTextColor(0,0,0);
+        $pdf->SetFont('', '', $default_font_size - 2);
+        $titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
+        $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 4), $tab_top -4);
+        $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+
+        $pdf->SetDrawColor(128,128,128);
+
+        // Rect prend une longueur en 3eme param
+        $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height);
+        // line prend une position y en 3eme param
+        if (empty($hidetop)) {
+            $pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);
+        }
+
+        $pdf->SetFont('','',8);
+
+        // Accountancy piece
+        if (empty($hidetop)) {
+            $pdf->SetXY($this->posxpiece-1, $tab_top+1);
+            $pdf->MultiCell($this->posxcomment-$this->posxpiece-1, 1, '', '', 'R');
+        }
+
+        // Comments
+        $pdf->line($this->posxcomment-1, $tab_top, $this->posxcomment-1, $tab_top + $tab_height);
+        if (empty($hidetop)) {
+            $pdf->SetXY($this->posxcomment-1, $tab_top+1);
+            $pdf->MultiCell($this->posxdate-$this->posxcomment-1, 1, $outputlangs->transnoentities("Description"),'','L');
+        }
+
+        // Date
+        //$pdf->line($this->posxdate-1, $tab_top, $this->posxdate-1, $tab_top + $tab_height);
+        //if (empty($hidetop))
+        //{
+        //	$pdf->SetXY($this->posxdate-1, $tab_top+1);
+        //	$pdf->MultiCell($this->posxtype-$this->posxdate-1,2, $outputlangs->transnoentities("Date"),'','C');
+        //}
+
+        // Type
+        //$pdf->line($this->posxtype-1, $tab_top, $this->posxtype-1, $tab_top + $tab_height);
+        //if (empty($hidetop))
+        //{
+        //	$pdf->SetXY($this->posxtype-1, $tab_top+1);
+        //	$pdf->MultiCell($this->posxprojet-$this->posxtype - 1, 2, $outputlangs->transnoentities("Type"), '', 'C');
+        //}
 
         //if (!empty($conf->projet->enabled))
         //{
         //    // Project
         //    $pdf->line($this->posxprojet - 1, $tab_top, $this->posxprojet - 1, $tab_top + $tab_height);
-    	//	if (empty($hidetop)) {
+        //	if (empty($hidetop)) {
         //        $pdf->SetXY($this->posxprojet - 1, $tab_top + 1);
         //        $pdf->MultiCell($this->posxtva - $this->posxprojet - 1, 2, $outputlangs->transnoentities("Project"), '', 'C');
-    	//	}
+        //	}
         //}
 
-		// VAT
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
-			$pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
-			if (empty($hidetop)) {
-				$pdf->SetXY($this->posxtva-1, $tab_top+1);
-				$pdf->MultiCell($this->posxup-$this->posxtva - 1, 2, $outputlangs->transnoentities("VAT"), '', 'C');
-			}
-		}
+        // VAT
+        if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+            $pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
+            if (empty($hidetop)) {
+                $pdf->SetXY($this->posxtva-1, $tab_top+1);
+                $pdf->MultiCell($this->posxup-$this->posxtva - 1, 2, $outputlangs->transnoentities("VAT"), '', 'C');
+            }
+        }
 
         // Unit price
-		$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
-		if (empty($hidetop)) {
-			$pdf->SetXY($this->posxup-1, $tab_top+1);
-			$pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceU"),'','C');
-		}
-
-		// Quantity
-		$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
-		if (empty($hidetop)) {
-			$pdf->SetXY($this->posxqty-1, $tab_top+1);
-			$pdf->MultiCell($this->postotalttc-$this->posxqty - 1,2, $outputlangs->transnoentities("Qty"),'','R');
-		}
-
-		// Total with all taxes
-		$pdf->line($this->postotalttc, $tab_top, $this->postotalttc, $tab_top + $tab_height);
-		if (empty($hidetop)) {
-			$pdf->SetXY($this->postotalttc-1, $tab_top+1);
-			$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalttc, 2, $outputlangs->transnoentities("TotalTTC"),'','R');
-		}
-
-		$pdf->SetTextColor(0,0,0);
-	}
-
-	/**
-	 *  Show payments table
-	 *
-	 *  @param	PDF			$pdf           Object PDF
-	 *  @param  Object		$object         Object invoice
-	 *  @param  int			$posy           Position y in PDF
-	 *  @param  Translate	$outputlangs    Object langs for output
-	 *  @return int             			<0 if KO, >0 if OK
-	 */
-	private function tablePayments(&$pdf, $object, $posy, $outputlangs)
-	{
-		global $conf;
-
-		$sign=1;
-		$tab3_posx = $this->marge_gauche;
-		$tab3_top = $posy;
-		$tab3_width = 88;
-		$tab3_height = 5;
-
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		$title=$outputlangs->transnoentities("PaymentsAlreadyDone");
-		$pdf->SetFont('','', $default_font_size - 2);
-		$pdf->SetXY($tab3_posx, $tab3_top - 4);
-		$pdf->SetTextColor(0,0,0);
-		$pdf->MultiCell(60, 3, $title, 0, 'L', 0);
-
-		$pdf->line($tab3_posx, $tab3_top, $tab3_posx+$tab3_width+2, $tab3_top); // Top border line of table title
-
-		$pdf->SetXY($tab3_posx, $tab3_top+1);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Date"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+19, $tab3_top+1); // Old value 17
-		$pdf->MultiCell(15, 3, $outputlangs->transnoentities("Amount"), 0, 'C', 0);
-		$pdf->SetXY($tab3_posx+35, $tab3_top+1);
-		$pdf->MultiCell(30, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
-		if (! empty($conf->banque->enabled)) {
-			$pdf->SetXY($tab3_posx+65, $tab3_top+1);
-			$pdf->MultiCell(25, 3, $outputlangs->transnoentities("BankAccount"), 0, 'L', 0);
-		}
-		$pdf->line($tab3_posx, $tab3_top+$tab3_height, $tab3_posx+$tab3_width+2, $tab3_top+$tab3_height); // Bottom border line of table title
-
-		$y=0;
-
-		// Loop on each payment
-		// TODO create method on expensereport class to get payments
-		// Payments already done (from payment on this expensereport)
-		$sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount, p.fk_bank,";
-		$sql.= "c.code as p_code, c.libelle as payment_type,";
-		$sql.= "ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal";
-		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."payment_expensereport as p";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepayment = c.id";
-		$sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank as b ON p.fk_bank = b.rowid';
-		$sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank_account as ba ON b.fk_account = ba.rowid';
-		$sql.= " WHERE e.rowid = '".$object->id."'";
-		$sql.= " AND p.fk_expensereport = e.rowid";
-		$sql.= ' AND e.entity IN ('.getEntity('expensereport').')';
-		$sql.= " ORDER BY dp";
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i=0;
-			while ($i < $num) {
-				$y+=$tab3_height;
-				$row = $this->db->fetch_object($resql);
-
-				$pdf->SetXY($tab3_posx, $tab3_top+$y+1);
-				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->dp),'day',false,$outputlangs,true), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+17, $tab3_top+$y+1);
-				$pdf->MultiCell(15, 3, price($sign * $row->amount, 0, $outputlangs), 0, 'R', 0);
-				$pdf->SetXY($tab3_posx+35, $tab3_top+$y+1);
-				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $row->p_code);
-
-				$pdf->MultiCell(40, 3, $oper, 0, 'L', 0);
-				if (! empty($conf->banque->enabled)) {
-					$pdf->SetXY($tab3_posx+65, $tab3_top+$y+1);
-					$pdf->MultiCell(30, 3, $row->baref, 0, 'L', 0);
-				}
-
-				$pdf->line($tab3_posx, $tab3_top+$y+$tab3_height, $tab3_posx+$tab3_width+2, $tab3_top+$y+$tab3_height); // Bottom line border of table
-				$totalpaid += $row->amount;
-				$i++;
-			}
-			if ($num > 0 && $object->paid == 0)
-			{
-				$y+=$tab3_height;
+        $pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+        if (empty($hidetop)) {
+            $pdf->SetXY($this->posxup-1, $tab_top+1);
+            $pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceU"),'','C');
+        }
+
+        // Quantity
+        $pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+        if (empty($hidetop)) {
+            $pdf->SetXY($this->posxqty-1, $tab_top+1);
+            $pdf->MultiCell($this->postotalttc-$this->posxqty - 1,2, $outputlangs->transnoentities("Qty"),'','R');
+        }
+
+        // Total with all taxes
+        $pdf->line($this->postotalttc, $tab_top, $this->postotalttc, $tab_top + $tab_height);
+        if (empty($hidetop)) {
+            $pdf->SetXY($this->postotalttc-1, $tab_top+1);
+            $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalttc, 2, $outputlangs->transnoentities("TotalTTC"),'','R');
+        }
+
+        $pdf->SetTextColor(0,0,0);
+    }
+
+    /**
+     *  Show payments table
+     *
+     *  @param	PDF			$pdf           Object PDF
+     *  @param  Object		$object         Object invoice
+     *  @param  int			$posy           Position y in PDF
+     *  @param  Translate	$outputlangs    Object langs for output
+     *  @return int             			<0 if KO, >0 if OK
+     */
+    private function tablePayments(&$pdf, $object, $posy, $outputlangs)
+    {
+        global $conf;
+
+        $sign=1;
+        $tab3_posx = $this->marge_gauche;
+        $tab3_top = $posy;
+        $tab3_width = 88;
+        $tab3_height = 5;
+
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+
+        $title=$outputlangs->transnoentities("PaymentsAlreadyDone");
+        $pdf->SetFont('','', $default_font_size - 2);
+        $pdf->SetXY($tab3_posx, $tab3_top - 4);
+        $pdf->SetTextColor(0,0,0);
+        $pdf->MultiCell(60, 3, $title, 0, 'L', 0);
+
+        $pdf->line($tab3_posx, $tab3_top, $tab3_posx+$tab3_width+2, $tab3_top); // Top border line of table title
+
+        $pdf->SetXY($tab3_posx, $tab3_top+1);
+        $pdf->MultiCell(20, 3, $outputlangs->transnoentities("Date"), 0, 'L', 0);
+        $pdf->SetXY($tab3_posx+19, $tab3_top+1); // Old value 17
+        $pdf->MultiCell(15, 3, $outputlangs->transnoentities("Amount"), 0, 'C', 0);
+        $pdf->SetXY($tab3_posx+35, $tab3_top+1);
+        $pdf->MultiCell(30, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
+        if (! empty($conf->banque->enabled)) {
+            $pdf->SetXY($tab3_posx+65, $tab3_top+1);
+            $pdf->MultiCell(25, 3, $outputlangs->transnoentities("BankAccount"), 0, 'L', 0);
+        }
+        $pdf->line($tab3_posx, $tab3_top+$tab3_height, $tab3_posx+$tab3_width+2, $tab3_top+$tab3_height); // Bottom border line of table title
+
+        $y=0;
+
+        // Loop on each payment
+        // TODO create method on expensereport class to get payments
+        // Payments already done (from payment on this expensereport)
+        $sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount, p.fk_bank,";
+        $sql.= "c.code as p_code, c.libelle as payment_type,";
+        $sql.= "ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal";
+        $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."payment_expensereport as p";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepayment = c.id";
+        $sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank as b ON p.fk_bank = b.rowid';
+        $sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank_account as ba ON b.fk_account = ba.rowid';
+        $sql.= " WHERE e.rowid = '".$object->id."'";
+        $sql.= " AND p.fk_expensereport = e.rowid";
+        $sql.= ' AND e.entity IN ('.getEntity('expensereport').')';
+        $sql.= " ORDER BY dp";
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i=0;
+            while ($i < $num) {
+                $y+=$tab3_height;
+                $row = $this->db->fetch_object($resql);
+
+                $pdf->SetXY($tab3_posx, $tab3_top+$y+1);
+                $pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->dp),'day',false,$outputlangs,true), 0, 'L', 0);
+                $pdf->SetXY($tab3_posx+17, $tab3_top+$y+1);
+                $pdf->MultiCell(15, 3, price($sign * $row->amount, 0, $outputlangs), 0, 'R', 0);
+                $pdf->SetXY($tab3_posx+35, $tab3_top+$y+1);
+                $oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $row->p_code);
+
+                $pdf->MultiCell(40, 3, $oper, 0, 'L', 0);
+                if (! empty($conf->banque->enabled)) {
+                    $pdf->SetXY($tab3_posx+65, $tab3_top+$y+1);
+                    $pdf->MultiCell(30, 3, $row->baref, 0, 'L', 0);
+                }
+
+                $pdf->line($tab3_posx, $tab3_top+$y+$tab3_height, $tab3_posx+$tab3_width+2, $tab3_top+$y+$tab3_height); // Bottom line border of table
+                $totalpaid += $row->amount;
+                $i++;
+            }
+            if ($num > 0 && $object->paid == 0)
+            {
+                $y+=$tab3_height;
 				
-				$pdf->SetXY($tab3_posx+17, $tab3_top+$y);
-				$pdf->MultiCell(15, 3, price($totalpaid), 0, 'R', 0);
-				$pdf->SetXY($tab3_posx+35, $tab3_top+$y);
-				$pdf->MultiCell(30, 4, $outputlangs->trans("AlreadyPaid"), 0, 'L', 0);
-				$y+=$tab3_height-2;
-				$pdf->SetXY($tab3_posx+17, $tab3_top+$y);
-				$pdf->MultiCell(15, 3, price($object->total_ttc), 0, 'R', 0);
-				$pdf->SetXY($tab3_posx+35, $tab3_top+$y);
-				$pdf->MultiCell(30, 4, $outputlangs->trans("AmountExpected"), 0, 'L', 0);
-				$y+=$tab3_height-2;
-				$remaintopay = $object->total_ttc - $totalpaid;
-				$pdf->SetXY($tab3_posx+17, $tab3_top+$y);
-				$pdf->MultiCell(15, 3, price($remaintopay), 0, 'R', 0);
-				$pdf->SetXY($tab3_posx+35, $tab3_top+$y);
-				$pdf->MultiCell(30, 4, $outputlangs->trans("RemainderToPay"), 0, 'L', 0);
-			}
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-	}
-
-	/**
-	 *   	Show footer of page. Need this->emetteur object
+                $pdf->SetXY($tab3_posx+17, $tab3_top+$y);
+                $pdf->MultiCell(15, 3, price($totalpaid), 0, 'R', 0);
+                $pdf->SetXY($tab3_posx+35, $tab3_top+$y);
+                $pdf->MultiCell(30, 4, $outputlangs->trans("AlreadyPaid"), 0, 'L', 0);
+                $y+=$tab3_height-2;
+                $pdf->SetXY($tab3_posx+17, $tab3_top+$y);
+                $pdf->MultiCell(15, 3, price($object->total_ttc), 0, 'R', 0);
+                $pdf->SetXY($tab3_posx+35, $tab3_top+$y);
+                $pdf->MultiCell(30, 4, $outputlangs->trans("AmountExpected"), 0, 'L', 0);
+                $y+=$tab3_height-2;
+                $remaintopay = $object->total_ttc - $totalpaid;
+                $pdf->SetXY($tab3_posx+17, $tab3_top+$y);
+                $pdf->MultiCell(15, 3, price($remaintopay), 0, 'R', 0);
+                $pdf->SetXY($tab3_posx+35, $tab3_top+$y);
+                $pdf->MultiCell(30, 4, $outputlangs->trans("RemainderToPay"), 0, 'L', 0);
+            }
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+    }
+
+    /**
+     *   	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	int								Return height of bottom margin including footer text
-	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
-	{
-		global $conf;
-		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf, $outputlangs, 'EXPENSEREPORT_FREE_TEXT', $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	int								Return height of bottom margin including footer text
+     */
+    function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+    {
+        global $conf;
+        $showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+        return pdf_pagefoot($pdf, $outputlangs, 'EXPENSEREPORT_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+    }
 }

Spacing +305 added lines, -305 removed lines

@@ -132,42 +132,42 @@ 
 
 		// 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->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1;                 // Affiche mode reglement
-		$this->option_condreg = 1;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 1;      // Affiche code produit-service
-		$this->option_multilang = 1;               // Dispo en plusieurs langues
-		$this->option_escompte = 0;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 0;             // Support credit notes
-		$this->option_freetext = 1;				   // Support add of a personalised text
-		$this->option_draft_watermark = 1;		   // Support add of a watermark on drafts
+		$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->option_logo = 1; // Affiche logo
+		$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
+		$this->option_modereg = 1; // Affiche mode reglement
+		$this->option_condreg = 1; // Affiche conditions reglement
+		$this->option_codeproduitservice = 1; // Affiche code produit-service
+		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_credit_note = 0; // Support credit notes
+		$this->option_freetext = 1; // Support add of a personalised text
+		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
 
 		$this->franchise = !$mysoc->tva_assuj;
 
 		// Get source company
-		$this->emetteur=$mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
+		$this->emetteur = $mysoc;
+		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
 
 		// Define position of columns
-		$this->posxpiece=$this->marge_gauche+1;
-		$this->posxcomment=$this->marge_gauche+10;
+		$this->posxpiece = $this->marge_gauche + 1;
+		$this->posxcomment = $this->marge_gauche + 10;
 		//$this->posxdate=88;
 		//$this->posxtype=107;
 		//$this->posxprojet=120;
-		$this->posxtva=130;
-		$this->posxup=145;
-		$this->posxqty=168;
-		$this->postotalttc=178;
+		$this->posxtva = 130;
+		$this->posxup = 145;
+		$this->posxqty = 168;
+		$this->postotalttc = 178;
         // if (empty($conf->projet->enabled)) {
         //     $this->posxtva-=20;
         //     $this->posxup-=20;
@@ -176,19 +176,19 @@ 
         // }
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
-			$this->posxdate-=20;
-			$this->posxtype-=20;
-			$this->posxprojet-=20;
-			$this->posxtva-=20;
-			$this->posxup-=20;
-			$this->posxqty-=20;
-			$this->postotalttc-=20;
+			$this->posxdate -= 20;
+			$this->posxtype -= 20;
+			$this->posxprojet -= 20;
+			$this->posxtva -= 20;
+			$this->posxup -= 20;
+			$this->posxqty -= 20;
+			$this->postotalttc -= 20;
 		}
 
-		$this->tva=array();
-		$this->localtax1=array();
-		$this->localtax2=array();
-		$this->atleastoneratenotnull=0;
+		$this->tva = array();
+		$this->localtax1 = array();
+		$this->localtax2 = array();
+		$this->atleastoneratenotnull = 0;
 	}
 
 
@@ -209,9 +209,9 @@ 
         // phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $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
-		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", "trips", "projects", "dict", "bills", "banks"));
@@ -222,20 +222,20 @@ 
 			// Definition of $dir and $file
 			if ($object->specimen) {
 				$dir = $conf->expensereport->dir_output;
-				$file = $dir . "/SPECIMEN.pdf";
+				$file = $dir."/SPECIMEN.pdf";
 			}
 			else
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->expensereport->dir_output . "/" . $objectref;
-				$file = $dir . "/" . $objectref . ".pdf";
+				$dir = $conf->expensereport->dir_output."/".$objectref;
+				$file = $dir."/".$objectref.".pdf";
 			}
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
@@ -243,25 +243,25 @@ 
 			if (file_exists($dir))
 			{
 				// 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('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);
-				$default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
-				$heightforinfotot = 40;	// 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 + 12;	// Height reserved to output the footer (value include bottom margin)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$heightforinfotot = 40; // 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 + 12; // 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->SetAutoPageBreak(1, 0);
 
                 if (class_exists('TCPDF'))
                 {
@@ -270,75 +270,75 @@ 
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
 			    // Set path to the background PDF File
-                if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
                     $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
                 }
 
 				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("Trips"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Trips"));
-				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
 
 				// New page
 				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $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);
 
 				$tab_top = 95;
-				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?65:10);
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 65 : 10);
 				$tab_height = 130;
 				$tab_height_newpage = 150;
 
 				// Show notes
-				$notetoshow=empty($object->note_public)?'':$object->note_public;
-				if (! empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
+				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
+				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
 				{
 					// Get first sale rep
 					if (is_object($object->thirdparty))
 					{
-						$salereparray=$object->thirdparty->getSalesRepresentatives($user);
-						$salerepobj=new User($this->db);
+						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
+						$salerepobj = new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
 					}
 				}
 				if ($notetoshow)
 				{
-					$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
+					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
 
 					$tab_top = 95;
 
-					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxpiece-1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxpiece - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 					$nexY = $pdf->GetY();
-					$height_note=$nexY-$tab_top;
+					$height_note = $nexY - $tab_top;
 
 					// Rect prend une longueur en 3eme param
-					$pdf->SetDrawColor(192,192,192);
-					$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+					$pdf->SetDrawColor(192, 192, 192);
+					$pdf->Rect($this->marge_gauche, $tab_top - 1, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_note + 1);
 
 					$tab_height = $tab_height - $height_note;
-					$tab_top = $nexY+6;
+					$tab_top = $nexY + 6;
 				}
 				else
 				{
-					$height_note=0;
+					$height_note = 0;
 				}
 
 				$iniY = $tab_top + 7;
@@ -346,41 +346,41 @@ 
 				$nexY = $tab_top + 7;
 
 				// Loop on each lines
-				for ($i = 0 ; $i < $nblignes ; $i++) {
-					$pdf->SetFont('','', $default_font_size - 2);   // Into loop to work with multipage
-					$pdf->SetTextColor(0,0,0);
+				for ($i = 0; $i < $nblignes; $i++) {
+					$pdf->SetFont('', '', $default_font_size - 2); // Into loop to work with multipage
+					$pdf->SetTextColor(0, 0, 0);
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
                     $curY = $nexY;
                     $pdf->startTransaction();
                     $this->printLine($pdf, $object, $i, $curY, $default_font_size, $outputlangs, $hidedetails);
-                    $pageposafter=$pdf->getPage();
+                    $pageposafter = $pdf->getPage();
 					if ($pageposafter > $pageposbefore) {
                         // There is a pagebreak
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 						$this->printLine($pdf, $object, $i, $curY, $default_font_size, $outputlangs, $hidedetails);
 						$pageposafter = $pdf->getPage();
 						$posyafter = $pdf->GetY();
 						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) {
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {
                             // There is no space left for total+free text
-							if ($i == ($nblignes-1)) {
+							if ($i == ($nblignes - 1)) {
                                 // No more lines, and no space left to show total, so we create a new page
 								$pdf->AddPage('', '', true);
-								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-								$pdf->setPage($pageposafter+1);
+								$pdf->setPage($pageposafter + 1);
 							}
 						}
 						else
 						{
 							// We found a page break
-							$showpricebeforepagebreak=0;
+							$showpricebeforepagebreak = 0;
 						}
 					}
 					else	// No pagebreak
@@ -389,10 +389,10 @@ 
 					}
                     //nexY
                     $nexY = $pdf->GetY();
-                    $pageposafter=$pdf->getPage();
+                    $pageposafter = $pdf->getPage();
                     $pdf->setPage($pageposbefore);
                     $pdf->setTopMargin($this->marge_haute);
-                    $pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+                    $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 
                     //$nblineFollowComment = 1;
                     // Cherche nombre de lignes a venir pour savoir si place suffisante
@@ -410,7 +410,7 @@ 
 					// }
 
                     //$nexY+=$nblineFollowComment*($pdf->getFontSize()*1.3);    // Passe espace entre les lignes
-                    $nexY += ($pdf->getFontSize()*1.3);    // Passe espace entre les lignes
+                    $nexY += ($pdf->getFontSize() * 1.3); // Passe espace entre les lignes
 
 					// Detect if some page were added automatically and output _tableau for past pages
 					while ($pagenb < $pageposafter)
@@ -424,13 +424,13 @@ 
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
-					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
 					{
 						if ($pagenb == 1)
 						{
@@ -440,10 +440,10 @@ 
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 						$pagenb++;
 						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
@@ -453,80 +453,80 @@ 
 				if ($pagenb == 1)
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 				else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 
-				$pdf->SetFont('','', 10);
+				$pdf->SetFont('', '', 10);
 
             	// Show total area box
-				$posy=$bottomlasttab+5;
+				$posy = $bottomlasttab + 5;
 				$posy_start_of_totals = $posy;
 				$pdf->SetXY(130, $posy);
 				$pdf->MultiCell(70, 5, $outputlangs->transnoentities("TotalHT"), 1, 'L');
 				$pdf->SetXY(180, $posy);
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 180, 5, price($object->total_ht), 1, 'R');
-				$pdf->SetFillColor(248,248,248);
+				$pdf->SetFillColor(248, 248, 248);
 
 				if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
 				{
 				    // TODO Show vat amout per tax level
-					$posy+=5;
+					$posy += 5;
 					$pdf->SetXY(130, $posy);
-					$pdf->SetTextColor(0,0,60);
-					$pdf->MultiCell(70, 5, $outputlangs->transnoentities("TotalVAT"), 1,'L');
+					$pdf->SetTextColor(0, 0, 60);
+					$pdf->MultiCell(70, 5, $outputlangs->transnoentities("TotalVAT"), 1, 'L');
 					$pdf->SetXY(180, $posy);
-					$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 180, 5, price($object->total_tva),1, 'R');
+					$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 180, 5, price($object->total_tva), 1, 'R');
 				}
 
-				$posy+=5;
+				$posy += 5;
 				$pdf->SetXY(130, $posy);
-				$pdf->SetFont('','B', 10);
-				$pdf->SetTextColor(0,0,60);
-				$pdf->MultiCell(70, 5, $outputlangs->transnoentities("TotalTTC"), 1,'L');
+				$pdf->SetFont('', 'B', 10);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell(70, 5, $outputlangs->transnoentities("TotalTTC"), 1, 'L');
 				$pdf->SetXY(180, $posy);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 180, 5, price($object->total_ttc),1, 'R');
+				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 180, 5, price($object->total_ttc), 1, 'R');
 
 				// show payments zone
 				$sumPayments = $object->getSumPayments();
 				if ($sumPayments > 0 && empty($conf->global->PDF_EXPENSEREPORT_NO_PAYMENT_DETAILS)) {
-					$posy=$this->tablePayments($pdf, $object, $posy_start_of_totals, $outputlangs);
+					$posy = $this->tablePayments($pdf, $object, $posy_start_of_totals, $outputlangs);
 				}
 
 				// Pied de page
-				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPage();
+				$this->_pagefoot($pdf, $object, $outputlangs);
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPage();
 
 				$pdf->Close();
 
-				$pdf->Output($file,'F');
+				$pdf->Output($file, 'F');
 
 				// Add pdfgeneration hook
 				$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);
 
-				return 1;   // Pas d'erreur
+				return 1; // Pas d'erreur
 			}
 			else
 			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
 		else
 		{
-			$this->error=$langs->trans("ErrorConstantNotDefined","EXPENSEREPORT_OUTPUTDIR");
+			$this->error = $langs->trans("ErrorConstantNotDefined", "EXPENSEREPORT_OUTPUTDIR");
 			return 0;
 		}
 	}
@@ -541,21 +541,21 @@ 
      * @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
      * @return  void
      */
-    private function printLine(&$pdf, $object, $linenumber, $curY, $default_font_size, $outputlangs, $hidedetails=0)
+    private function printLine(&$pdf, $object, $linenumber, $curY, $default_font_size, $outputlangs, $hidedetails = 0)
 	{
         global $conf;
-        $pdf->SetFont('','', $default_font_size - 1);
+        $pdf->SetFont('', '', $default_font_size - 1);
 
         // Accountancy piece
         $pdf->SetXY($this->posxpiece, $curY);
-        $pdf->writeHTMLCell($this->posxcomment-$this->posxpiece-0.8, 4, $this->posxpiece-1, $curY, $linenumber + 1, 0, 1);
+        $pdf->writeHTMLCell($this->posxcomment - $this->posxpiece - 0.8, 4, $this->posxpiece - 1, $curY, $linenumber + 1, 0, 1);
 
         // Date
         //$pdf->SetXY($this->posxdate -1, $curY);
         //$pdf->MultiCell($this->posxtype-$this->posxdate-0.8, 4, dol_print_date($object->lines[$linenumber]->date,"day",false,$outputlangs), 0, 'C');
 
         // Type
-        $pdf->SetXY($this->posxtype -1, $curY);
+        $pdf->SetXY($this->posxtype - 1, $curY);
         $nextColumnPosX = $this->posxup;
         if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
             $nextColumnPosX = $this->posxtva;
@@ -585,30 +585,30 @@ 
         if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
             $vat_rate = pdf_getlinevatrate($object, $linenumber, $outputlangs, $hidedetails);
             $pdf->SetXY($this->posxtva, $curY);
-            $pdf->MultiCell($this->posxup-$this->posxtva-0.8, 4,$vat_rate, 0, 'R');
+            $pdf->MultiCell($this->posxup - $this->posxtva - 0.8, 4, $vat_rate, 0, 'R');
         }
 
         // Unit price
         $pdf->SetXY($this->posxup, $curY);
-        $pdf->MultiCell($this->posxqty-$this->posxup-0.8, 4,price($object->lines[$linenumber]->value_unit), 0, 'R');
+        $pdf->MultiCell($this->posxqty - $this->posxup - 0.8, 4, price($object->lines[$linenumber]->value_unit), 0, 'R');
 
         // Quantity
         $pdf->SetXY($this->posxqty, $curY);
-        $pdf->MultiCell($this->postotalttc-$this->posxqty-0.8, 4,$object->lines[$linenumber]->qty, 0, 'R');
+        $pdf->MultiCell($this->postotalttc - $this->posxqty - 0.8, 4, $object->lines[$linenumber]->qty, 0, 'R');
 
         // Total with all taxes
-        $pdf->SetXY($this->postotalttc-1, $curY);
-        $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalttc, 4, price($object->lines[$linenumber]->total_ttc), 0, 'R');
+        $pdf->SetXY($this->postotalttc - 1, $curY);
+        $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalttc, 4, price($object->lines[$linenumber]->total_ttc), 0, 'R');
 
         // Comments
-        $pdf->SetXY($this->posxcomment, $curY );
-        $comment = $outputlangs->trans("Date").':'. dol_print_date($object->lines[$linenumber]->date,"day",false,$outputlangs).' ';
-        $comment .= $outputlangs->trans("Type").':'. $expensereporttypecodetoshow.'<br>';
-        if (! empty($object->lines[$linenumber]->projet_ref)) {
-            $comment .= $outputlangs->trans("Project").':'. $object->lines[$linenumber]->projet_ref.'<br>';
+        $pdf->SetXY($this->posxcomment, $curY);
+        $comment = $outputlangs->trans("Date").':'.dol_print_date($object->lines[$linenumber]->date, "day", false, $outputlangs).' ';
+        $comment .= $outputlangs->trans("Type").':'.$expensereporttypecodetoshow.'<br>';
+        if (!empty($object->lines[$linenumber]->projet_ref)) {
+            $comment .= $outputlangs->trans("Project").':'.$object->lines[$linenumber]->projet_ref.'<br>';
         }
         $comment .= $object->lines[$linenumber]->comments;
-        $pdf->writeHTMLCell($this->posxtva-$this->posxcomment-0.8, 4, $this->posxcomment-1, $curY, $comment, 0, 1);
+        $pdf->writeHTMLCell($this->posxtva - $this->posxcomment - 0.8, 4, $this->posxcomment - 1, $curY, $comment, 0, 1);
     }
 
     /**
@@ -638,185 +638,185 @@ 
 		*/
 
 	    // Draft watermark
-		if ($object->fk_statut == 0 && ! empty($conf->global->EXPENSEREPORT_DRAFT_WATERMARK)) {
- 			pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->EXPENSEREPORT_DRAFT_WATERMARK);
+		if ($object->fk_statut == 0 && !empty($conf->global->EXPENSEREPORT_DRAFT_WATERMARK)) {
+ 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->EXPENSEREPORT_DRAFT_WATERMARK);
 		}
 
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-		$posy=$this->marge_haute;
-		$posx=$this->page_largeur-$this->marge_droite-100;
+		$posy = $this->marge_haute;
+		$posx = $this->page_largeur - $this->marge_droite - 100;
 
-		$pdf->SetXY($this->marge_gauche,$posy);
+		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
 		if ($this->emetteur->logo) {
 			if (is_readable($logo)) {
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+			    $height = pdf_getHeightForLogo($logo);
+			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B', $default_font_size -2);
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+				$pdf->SetTextColor(200, 0, 0);
+				$pdf->SetFont('', 'B', $default_font_size - 2);
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
 		}
 		else
 		{
-			$text=$this->emetteur->name;
+			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
 
-		$pdf->SetFont('','B', $default_font_size + 4);
-		$pdf->SetXY($posx,$posy);
-   		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell($this->page_largeur-$this->marge_droite-$posx,6,$langs->trans("ExpenseReport"), 0, 'R');
+		$pdf->SetFont('', 'B', $default_font_size + 4);
+		$pdf->SetXY($posx, $posy);
+   		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 6, $langs->trans("ExpenseReport"), 0, 'R');
 
-		$pdf->SetFont('','', $default_font_size -1);
+		$pdf->SetFont('', '', $default_font_size - 1);
 
    		// Ref complete
-   		$posy+=8;
-   		$pdf->SetXY($posx,$posy);
-   		$pdf->SetTextColor(0,0,60);
-   		$pdf->MultiCell($this->page_largeur-$this->marge_droite-$posx, 3, $outputlangs->transnoentities("Ref")." : " . $object->ref, '', 'R');
+   		$posy += 8;
+   		$pdf->SetXY($posx, $posy);
+   		$pdf->SetTextColor(0, 0, 60);
+   		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities("Ref")." : ".$object->ref, '', 'R');
 
    		// Date start period
-   		$posy+=5;
-   		$pdf->SetXY($posx,$posy);
-   		$pdf->SetTextColor(0,0,60);
-   		$pdf->MultiCell($this->page_largeur-$this->marge_droite-$posx, 3, $outputlangs->transnoentities("DateStart")." : " . ($object->date_debut>0?dol_print_date($object->date_debut,"day",false,$outputlangs):''), '', 'R');
+   		$posy += 5;
+   		$pdf->SetXY($posx, $posy);
+   		$pdf->SetTextColor(0, 0, 60);
+   		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities("DateStart")." : ".($object->date_debut > 0 ?dol_print_date($object->date_debut, "day", false, $outputlangs) : ''), '', 'R');
 
    		// Date end period
-   		$posy+=5;
-   		$pdf->SetXY($posx,$posy);
-   		$pdf->SetTextColor(0,0,60);
-   		$pdf->MultiCell($this->page_largeur-$this->marge_droite-$posx, 3, $outputlangs->transnoentities("DateEnd")." : " . ($object->date_fin>0?dol_print_date($object->date_fin,"day",false,$outputlangs):''), '', 'R');
+   		$posy += 5;
+   		$pdf->SetXY($posx, $posy);
+   		$pdf->SetTextColor(0, 0, 60);
+   		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities("DateEnd")." : ".($object->date_fin > 0 ?dol_print_date($object->date_fin, "day", false, $outputlangs) : ''), '', 'R');
 
    		// Status Expense Report
-   		$posy+=6;
-   		$pdf->SetXY($posx,$posy);
-   		$pdf->SetFont('','B', $default_font_size + 2);
-   		$pdf->SetTextColor(111,81,124);
-		$pdf->MultiCell($this->page_largeur-$this->marge_droite-$posx, 3, $object->getLibStatut(0), '', 'R');
+   		$posy += 6;
+   		$pdf->SetXY($posx, $posy);
+   		$pdf->SetFont('', 'B', $default_font_size + 2);
+   		$pdf->SetTextColor(111, 81, 124);
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $object->getLibStatut(0), '', 'R');
 
 		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = '';
-			$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->address);
-			$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->zip).' '.$outputlangs->convToOutputCharset($this->emetteur->town);
+			$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->convToOutputCharset($this->emetteur->address);
+			$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->convToOutputCharset($this->emetteur->zip).' '.$outputlangs->convToOutputCharset($this->emetteur->town);
 			$carac_emetteur .= "\n";
 			// Phone
-			if ($this->emetteur->phone) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Phone")." : ".$outputlangs->convToOutputCharset($this->emetteur->phone);
+			if ($this->emetteur->phone) $carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Phone")." : ".$outputlangs->convToOutputCharset($this->emetteur->phone);
 			// Fax
-			if ($this->emetteur->fax) $carac_emetteur .= ($carac_emetteur ? ($this->emetteur->tel ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax")." : ".$outputlangs->convToOutputCharset($this->emetteur->fax);
+			if ($this->emetteur->fax) $carac_emetteur .= ($carac_emetteur ? ($this->emetteur->tel ? " - " : "\n") : '').$outputlangs->transnoentities("Fax")." : ".$outputlangs->convToOutputCharset($this->emetteur->fax);
 			// EMail
-			if ($this->emetteur->email) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Email")." : ".$outputlangs->convToOutputCharset($this->emetteur->email);
+			if ($this->emetteur->email) $carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Email")." : ".$outputlangs->convToOutputCharset($this->emetteur->email);
 			// Web
-			if ($this->emetteur->url) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Web")." : ".$outputlangs->convToOutputCharset($this->emetteur->url);
+			if ($this->emetteur->url) $carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Web")." : ".$outputlangs->convToOutputCharset($this->emetteur->url);
 
 			// Show sender
-			$posy=50;
-			$posx=$this->marge_gauche;
-			$hautcadre=40;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=118;
+			$posy = 50;
+			$posx = $this->marge_gauche;
+			$hautcadre = 40;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = 118;
 
 			// Show sender frame
 			$pdf->SetTextColor(0, 0, 0);
-			$pdf->SetFont('','B', $default_font_size - 2);
-			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell(66,5, $outputlangs->transnoentities("TripSociete")." :",'','L');
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetFillColor(224,224,224);
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY($posx, $posy - 5);
+			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("TripSociete")." :", '', 'L');
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetFillColor(224, 224, 224);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
 			$pdf->SetTextColor(0, 0, 60);
 
 			// Show sender name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
 			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
 
 			// Show sender information
-			$pdf->SetXY($posx+2,$posy+8);
+			$pdf->SetXY($posx + 2, $posy + 8);
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 
 			// Show recipient
-			$posy=50;
-			$posx=100;
+			$posy = 50;
+			$posx = 100;
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', 'B', 8);
-			$pdf->SetXY($posx,$posy-5);
+			$pdf->SetXY($posx, $posy - 5);
 			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("TripNDF")." :", 0, 'L');
 			$pdf->rect($posx, $posy, $this->page_largeur - $this->marge_gauche - $posx, $hautcadre);
 
 			// Informations for trip (dates and users workflow)
 			if ($object->fk_user_author > 0) {
-				$userfee=new User($this->db);
-				$userfee->fetch($object->fk_user_author); $posy+=3;
-				$pdf->SetXY($posx+2,$posy);
-				$pdf->SetFont('','',10);
-				$pdf->MultiCell(96,4,$outputlangs->transnoentities("AUTHOR")." : ".dolGetFirstLastname($userfee->firstname,$userfee->lastname),0,'L');
-				$posy+=5;
-				$pdf->SetXY($posx+2,$posy);
-				$pdf->MultiCell(96,4,$outputlangs->transnoentities("DateCreation")." : ".dol_print_date($object->date_create,"day",false,$outputlangs),0,'L');
+				$userfee = new User($this->db);
+				$userfee->fetch($object->fk_user_author); $posy += 3;
+				$pdf->SetXY($posx + 2, $posy);
+				$pdf->SetFont('', '', 10);
+				$pdf->MultiCell(96, 4, $outputlangs->transnoentities("AUTHOR")." : ".dolGetFirstLastname($userfee->firstname, $userfee->lastname), 0, 'L');
+				$posy += 5;
+				$pdf->SetXY($posx + 2, $posy);
+				$pdf->MultiCell(96, 4, $outputlangs->transnoentities("DateCreation")." : ".dol_print_date($object->date_create, "day", false, $outputlangs), 0, 'L');
 			}
 
-			if ($object->fk_statut==99)
+			if ($object->fk_statut == 99)
 			{
 				if ($object->fk_user_refuse > 0) {
-					$userfee=new User($this->db);
-					$userfee->fetch($object->fk_user_refuse); $posy+=6;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("REFUSEUR")." : ".dolGetFirstLastname($userfee->firstname,$userfee->lastname),0,'L');
-					$posy+=5;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("MOTIF_REFUS")." : ".$outputlangs->convToOutputCharset($object->detail_refuse),0,'L');
-					$posy+=5;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("DATE_REFUS")." : ".dol_print_date($object->date_refuse,"day",false,$outputlangs),0,'L');
+					$userfee = new User($this->db);
+					$userfee->fetch($object->fk_user_refuse); $posy += 6;
+					$pdf->SetXY($posx + 2, $posy);
+					$pdf->MultiCell(96, 4, $outputlangs->transnoentities("REFUSEUR")." : ".dolGetFirstLastname($userfee->firstname, $userfee->lastname), 0, 'L');
+					$posy += 5;
+					$pdf->SetXY($posx + 2, $posy);
+					$pdf->MultiCell(96, 4, $outputlangs->transnoentities("MOTIF_REFUS")." : ".$outputlangs->convToOutputCharset($object->detail_refuse), 0, 'L');
+					$posy += 5;
+					$pdf->SetXY($posx + 2, $posy);
+					$pdf->MultiCell(96, 4, $outputlangs->transnoentities("DATE_REFUS")." : ".dol_print_date($object->date_refuse, "day", false, $outputlangs), 0, 'L');
 				}
 			}
-			else if($object->fk_statut==4)
+			else if ($object->fk_statut == 4)
 			{
 				if ($object->fk_user_cancel > 0) {
-					$userfee=new User($this->db);
-					$userfee->fetch($object->fk_user_cancel); $posy+=6;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("CANCEL_USER")." : ".dolGetFirstLastname($userfee->firstname,$userfee->lastname),0,'L');
-					$posy+=5;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("MOTIF_CANCEL")." : ".$outputlangs->convToOutputCharset($object->detail_cancel),0,'L');
-					$posy+=5;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("DATE_CANCEL")." : ".dol_print_date($object->date_cancel,"day",false,$outputlangs),0,'L');
+					$userfee = new User($this->db);
+					$userfee->fetch($object->fk_user_cancel); $posy += 6;
+					$pdf->SetXY($posx + 2, $posy);
+					$pdf->MultiCell(96, 4, $outputlangs->transnoentities("CANCEL_USER")." : ".dolGetFirstLastname($userfee->firstname, $userfee->lastname), 0, 'L');
+					$posy += 5;
+					$pdf->SetXY($posx + 2, $posy);
+					$pdf->MultiCell(96, 4, $outputlangs->transnoentities("MOTIF_CANCEL")." : ".$outputlangs->convToOutputCharset($object->detail_cancel), 0, 'L');
+					$posy += 5;
+					$pdf->SetXY($posx + 2, $posy);
+					$pdf->MultiCell(96, 4, $outputlangs->transnoentities("DATE_CANCEL")." : ".dol_print_date($object->date_cancel, "day", false, $outputlangs), 0, 'L');
 				}
 			}
 			else
 			{
 				if ($object->fk_user_approve > 0) {
-					$userfee=new User($this->db);
-					$userfee->fetch($object->fk_user_approve); $posy+=6;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("VALIDOR")." : ".dolGetFirstLastname($userfee->firstname,$userfee->lastname),0,'L');
-					$posy+=5;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("DateApprove")." : ".dol_print_date($object->date_approve,"day",false,$outputlangs),0,'L');
+					$userfee = new User($this->db);
+					$userfee->fetch($object->fk_user_approve); $posy += 6;
+					$pdf->SetXY($posx + 2, $posy);
+					$pdf->MultiCell(96, 4, $outputlangs->transnoentities("VALIDOR")." : ".dolGetFirstLastname($userfee->firstname, $userfee->lastname), 0, 'L');
+					$posy += 5;
+					$pdf->SetXY($posx + 2, $posy);
+					$pdf->MultiCell(96, 4, $outputlangs->transnoentities("DateApprove")." : ".dol_print_date($object->date_approve, "day", false, $outputlangs), 0, 'L');
 				}
 			}
 
-			if($object->fk_statut==6) {
+			if ($object->fk_statut == 6) {
 				if ($object->fk_user_paid > 0) {
-					$userfee=new User($this->db);
-					$userfee->fetch($object->fk_user_paid); $posy+=6;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("AUTHORPAIEMENT")." : ".dolGetFirstLastname($userfee->firstname,$userfee->lastname),0,'L');
-					$posy+=5;
-					$pdf->SetXY($posx+2,$posy);
-					$pdf->MultiCell(96,4,$outputlangs->transnoentities("DATE_PAIEMENT")." : ".dol_print_date($object->date_paiement,"day",false,$outputlangs),0,'L');
+					$userfee = new User($this->db);
+					$userfee->fetch($object->fk_user_paid); $posy += 6;
+					$pdf->SetXY($posx + 2, $posy);
+					$pdf->MultiCell(96, 4, $outputlangs->transnoentities("AUTHORPAIEMENT")." : ".dolGetFirstLastname($userfee->firstname, $userfee->lastname), 0, 'L');
+					$posy += 5;
+					$pdf->SetXY($posx + 2, $posy);
+					$pdf->MultiCell(96, 4, $outputlangs->transnoentities("DATE_PAIEMENT")." : ".dol_print_date($object->date_paiement, "day", false, $outputlangs), 0, 'L');
 				}
 			}
 		}
@@ -835,46 +835,46 @@ 
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 		global $conf;
 
 		// Force to disable hidetop and hidebottom
-		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
+		$hidebottom = 0;
+		if ($hidetop) $hidetop = -1;
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		// Amount in (at tab_top - 1)
-		$pdf->SetTextColor(0,0,0);
+		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 		$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
-		$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 4), $tab_top -4);
+		$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 4), $tab_top - 4);
 		$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
-		$pdf->SetDrawColor(128,128,128);
+		$pdf->SetDrawColor(128, 128, 128);
 
 		// Rect prend une longueur en 3eme param
-		$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height);
+		$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height);
 		// line prend une position y en 3eme param
 		if (empty($hidetop)) {
-			$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);
+			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5);
 		}
 
-		$pdf->SetFont('','',8);
+		$pdf->SetFont('', '', 8);
 
 		// Accountancy piece
 		if (empty($hidetop)) {
-			$pdf->SetXY($this->posxpiece-1, $tab_top+1);
-			$pdf->MultiCell($this->posxcomment-$this->posxpiece-1, 1, '', '', 'R');
+			$pdf->SetXY($this->posxpiece - 1, $tab_top + 1);
+			$pdf->MultiCell($this->posxcomment - $this->posxpiece - 1, 1, '', '', 'R');
 		}
 
 		// Comments
-		$pdf->line($this->posxcomment-1, $tab_top, $this->posxcomment-1, $tab_top + $tab_height);
+		$pdf->line($this->posxcomment - 1, $tab_top, $this->posxcomment - 1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
-			$pdf->SetXY($this->posxcomment-1, $tab_top+1);
-			$pdf->MultiCell($this->posxdate-$this->posxcomment-1, 1, $outputlangs->transnoentities("Description"),'','L');
+			$pdf->SetXY($this->posxcomment - 1, $tab_top + 1);
+			$pdf->MultiCell($this->posxdate - $this->posxcomment - 1, 1, $outputlangs->transnoentities("Description"), '', 'L');
 		}
 
 		// Date
@@ -905,35 +905,35 @@ 
 
 		// VAT
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
-			$pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
+			$pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
-				$pdf->SetXY($this->posxtva-1, $tab_top+1);
-				$pdf->MultiCell($this->posxup-$this->posxtva - 1, 2, $outputlangs->transnoentities("VAT"), '', 'C');
+				$pdf->SetXY($this->posxtva - 1, $tab_top + 1);
+				$pdf->MultiCell($this->posxup - $this->posxtva - 1, 2, $outputlangs->transnoentities("VAT"), '', 'C');
 			}
 		}
 
         // Unit price
-		$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+		$pdf->line($this->posxup - 1, $tab_top, $this->posxup - 1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
-			$pdf->SetXY($this->posxup-1, $tab_top+1);
-			$pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceU"),'','C');
+			$pdf->SetXY($this->posxup - 1, $tab_top + 1);
+			$pdf->MultiCell($this->posxqty - $this->posxup - 1, 2, $outputlangs->transnoentities("PriceU"), '', 'C');
 		}
 
 		// Quantity
-		$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+		$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
-			$pdf->SetXY($this->posxqty-1, $tab_top+1);
-			$pdf->MultiCell($this->postotalttc-$this->posxqty - 1,2, $outputlangs->transnoentities("Qty"),'','R');
+			$pdf->SetXY($this->posxqty - 1, $tab_top + 1);
+			$pdf->MultiCell($this->postotalttc - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'R');
 		}
 
 		// Total with all taxes
 		$pdf->line($this->postotalttc, $tab_top, $this->postotalttc, $tab_top + $tab_height);
 		if (empty($hidetop)) {
-			$pdf->SetXY($this->postotalttc-1, $tab_top+1);
-			$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalttc, 2, $outputlangs->transnoentities("TotalTTC"),'','R');
+			$pdf->SetXY($this->postotalttc - 1, $tab_top + 1);
+			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalttc, 2, $outputlangs->transnoentities("TotalTTC"), '', 'R');
 		}
 
-		$pdf->SetTextColor(0,0,0);
+		$pdf->SetTextColor(0, 0, 0);
 	}
 
 	/**
@@ -949,7 +949,7 @@ 
 	{
 		global $conf;
 
-		$sign=1;
+		$sign = 1;
 		$tab3_posx = $this->marge_gauche;
 		$tab3_top = $posy;
 		$tab3_width = 88;
@@ -957,93 +957,93 @@ 
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$title=$outputlangs->transnoentities("PaymentsAlreadyDone");
-		$pdf->SetFont('','', $default_font_size - 2);
+		$title = $outputlangs->transnoentities("PaymentsAlreadyDone");
+		$pdf->SetFont('', '', $default_font_size - 2);
 		$pdf->SetXY($tab3_posx, $tab3_top - 4);
-		$pdf->SetTextColor(0,0,0);
+		$pdf->SetTextColor(0, 0, 0);
 		$pdf->MultiCell(60, 3, $title, 0, 'L', 0);
 
-		$pdf->line($tab3_posx, $tab3_top, $tab3_posx+$tab3_width+2, $tab3_top); // Top border line of table title
+		$pdf->line($tab3_posx, $tab3_top, $tab3_posx + $tab3_width + 2, $tab3_top); // Top border line of table title
 
-		$pdf->SetXY($tab3_posx, $tab3_top+1);
+		$pdf->SetXY($tab3_posx, $tab3_top + 1);
 		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Date"), 0, 'L', 0);
-		$pdf->SetXY($tab3_posx+19, $tab3_top+1); // Old value 17
+		$pdf->SetXY($tab3_posx + 19, $tab3_top + 1); // Old value 17
 		$pdf->MultiCell(15, 3, $outputlangs->transnoentities("Amount"), 0, 'C', 0);
-		$pdf->SetXY($tab3_posx+35, $tab3_top+1);
+		$pdf->SetXY($tab3_posx + 35, $tab3_top + 1);
 		$pdf->MultiCell(30, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
-		if (! empty($conf->banque->enabled)) {
-			$pdf->SetXY($tab3_posx+65, $tab3_top+1);
+		if (!empty($conf->banque->enabled)) {
+			$pdf->SetXY($tab3_posx + 65, $tab3_top + 1);
 			$pdf->MultiCell(25, 3, $outputlangs->transnoentities("BankAccount"), 0, 'L', 0);
 		}
-		$pdf->line($tab3_posx, $tab3_top+$tab3_height, $tab3_posx+$tab3_width+2, $tab3_top+$tab3_height); // Bottom border line of table title
+		$pdf->line($tab3_posx, $tab3_top + $tab3_height, $tab3_posx + $tab3_width + 2, $tab3_top + $tab3_height); // Bottom border line of table title
 
-		$y=0;
+		$y = 0;
 
 		// Loop on each payment
 		// TODO create method on expensereport class to get payments
 		// Payments already done (from payment on this expensereport)
 		$sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount, p.fk_bank,";
-		$sql.= "c.code as p_code, c.libelle as payment_type,";
-		$sql.= "ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal";
-		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."payment_expensereport as p";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepayment = c.id";
-		$sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank as b ON p.fk_bank = b.rowid';
-		$sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank_account as ba ON b.fk_account = ba.rowid';
-		$sql.= " WHERE e.rowid = '".$object->id."'";
-		$sql.= " AND p.fk_expensereport = e.rowid";
-		$sql.= ' AND e.entity IN ('.getEntity('expensereport').')';
-		$sql.= " ORDER BY dp";
-
-		$resql=$this->db->query($sql);
+		$sql .= "c.code as p_code, c.libelle as payment_type,";
+		$sql .= "ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal";
+		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."payment_expensereport as p";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepayment = c.id";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
+		$sql .= " WHERE e.rowid = '".$object->id."'";
+		$sql .= " AND p.fk_expensereport = e.rowid";
+		$sql .= ' AND e.entity IN ('.getEntity('expensereport').')';
+		$sql .= " ORDER BY dp";
+
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
-			$i=0;
+			$i = 0;
 			while ($i < $num) {
-				$y+=$tab3_height;
+				$y += $tab3_height;
 				$row = $this->db->fetch_object($resql);
 
-				$pdf->SetXY($tab3_posx, $tab3_top+$y+1);
-				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->dp),'day',false,$outputlangs,true), 0, 'L', 0);
-				$pdf->SetXY($tab3_posx+17, $tab3_top+$y+1);
+				$pdf->SetXY($tab3_posx, $tab3_top + $y + 1);
+				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->dp), 'day', false, $outputlangs, true), 0, 'L', 0);
+				$pdf->SetXY($tab3_posx + 17, $tab3_top + $y + 1);
 				$pdf->MultiCell(15, 3, price($sign * $row->amount, 0, $outputlangs), 0, 'R', 0);
-				$pdf->SetXY($tab3_posx+35, $tab3_top+$y+1);
-				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $row->p_code);
+				$pdf->SetXY($tab3_posx + 35, $tab3_top + $y + 1);
+				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$row->p_code);
 
 				$pdf->MultiCell(40, 3, $oper, 0, 'L', 0);
-				if (! empty($conf->banque->enabled)) {
-					$pdf->SetXY($tab3_posx+65, $tab3_top+$y+1);
+				if (!empty($conf->banque->enabled)) {
+					$pdf->SetXY($tab3_posx + 65, $tab3_top + $y + 1);
 					$pdf->MultiCell(30, 3, $row->baref, 0, 'L', 0);
 				}
 
-				$pdf->line($tab3_posx, $tab3_top+$y+$tab3_height, $tab3_posx+$tab3_width+2, $tab3_top+$y+$tab3_height); // Bottom line border of table
+				$pdf->line($tab3_posx, $tab3_top + $y + $tab3_height, $tab3_posx + $tab3_width + 2, $tab3_top + $y + $tab3_height); // Bottom line border of table
 				$totalpaid += $row->amount;
 				$i++;
 			}
 			if ($num > 0 && $object->paid == 0)
 			{
-				$y+=$tab3_height;
+				$y += $tab3_height;
 				
-				$pdf->SetXY($tab3_posx+17, $tab3_top+$y);
+				$pdf->SetXY($tab3_posx + 17, $tab3_top + $y);
 				$pdf->MultiCell(15, 3, price($totalpaid), 0, 'R', 0);
-				$pdf->SetXY($tab3_posx+35, $tab3_top+$y);
+				$pdf->SetXY($tab3_posx + 35, $tab3_top + $y);
 				$pdf->MultiCell(30, 4, $outputlangs->trans("AlreadyPaid"), 0, 'L', 0);
-				$y+=$tab3_height-2;
-				$pdf->SetXY($tab3_posx+17, $tab3_top+$y);
+				$y += $tab3_height - 2;
+				$pdf->SetXY($tab3_posx + 17, $tab3_top + $y);
 				$pdf->MultiCell(15, 3, price($object->total_ttc), 0, 'R', 0);
-				$pdf->SetXY($tab3_posx+35, $tab3_top+$y);
+				$pdf->SetXY($tab3_posx + 35, $tab3_top + $y);
 				$pdf->MultiCell(30, 4, $outputlangs->trans("AmountExpected"), 0, 'L', 0);
-				$y+=$tab3_height-2;
+				$y += $tab3_height - 2;
 				$remaintopay = $object->total_ttc - $totalpaid;
-				$pdf->SetXY($tab3_posx+17, $tab3_top+$y);
+				$pdf->SetXY($tab3_posx + 17, $tab3_top + $y);
 				$pdf->MultiCell(15, 3, price($remaintopay), 0, 'R', 0);
-				$pdf->SetXY($tab3_posx+35, $tab3_top+$y);
+				$pdf->SetXY($tab3_posx + 35, $tab3_top + $y);
 				$pdf->MultiCell(30, 4, $outputlangs->trans("RemainderToPay"), 0, 'L', 0);
 			}
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -1057,7 +1057,7 @@ 
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
 	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+	function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;

Braces +77 added lines, -48 removed lines

@@ -156,7 +156,10 @@ 
 
 		// Get source company
 		$this->emetteur=$mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
+		if (empty($this->emetteur->country_code)) {
+		    $this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default, if was not defined
 
 		// Define position of columns
 		$this->posxpiece=$this->marge_gauche+1;
@@ -174,9 +177,11 @@ 
         //     $this->posxqty-=20;
         //     $this->postotalttc-=20;
         // }
-		if ($this->page_largeur < 210) // To work with US executive format
+		if ($this->page_largeur < 210) {
+		    // To work with US executive format
 		{
 			$this->posxdate-=20;
+		}
 			$this->posxtype-=20;
 			$this->posxprojet-=20;
 			$this->posxtva-=20;
@@ -209,9 +214,13 @@ 
         // phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $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
-		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", "trips", "projects", "dict", "bills", "banks"));
@@ -223,8 +232,7 @@ 
 			if ($object->specimen) {
 				$dir = $conf->expensereport->dir_output;
 				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
+			} else
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expensereport->dir_output . "/" . $objectref;
@@ -259,7 +267,9 @@ 
 				$heightforinfotot = 40;	// 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 + 12;	// 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);
 
@@ -285,13 +295,17 @@ 
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Trips"));
-				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
 
 				// New page
 				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (! empty($tplidx)) {
+				    $pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('','', $default_font_size - 1);
@@ -313,7 +327,9 @@ 
 						$salereparray=$object->thirdparty->getSalesRepresentatives($user);
 						$salerepobj=new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (! empty($salerepobj->signature)) {
+						    $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+						}
 					}
 				}
 				if ($notetoshow)
@@ -335,8 +351,7 @@ 
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY+6;
-				}
-				else
+				} else
 				{
 					$height_note=0;
 				}
@@ -372,18 +387,20 @@ 
 							if ($i == ($nblignes-1)) {
                                 // No more lines, and no space left to show total, so we create a new page
 								$pdf->AddPage('', '', true);
-								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (! empty($tplidx)) {
+								    $pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								    $this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter+1);
 							}
-						}
-						else
+						} else
 						{
 							// We found a page break
 							$showpricebeforepagebreak=0;
 						}
-					}
-					else	// No pagebreak
+					} else	// No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -419,8 +436,7 @@ 
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
+						} else
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
@@ -428,24 +444,29 @@ 
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						    $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
 					{
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
+						} else
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf,$object,$outputlangs,1);
 						// New page
 						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (! empty($tplidx)) {
+						    $pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						    $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
@@ -454,8 +475,7 @@ 
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
+				} else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
@@ -499,7 +519,9 @@ 
 
 				// Pied de page
 				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPage();
+				if (method_exists($pdf,'AliasNbPages')) {
+				    $pdf->AliasNbPage();
+				}
 
 				$pdf->Close();
 
@@ -511,20 +533,19 @@ 
 				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);
 
 				return 1;   // Pas d'erreur
-			}
-			else
+			} else
 			{
 				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$langs->trans("ErrorConstantNotDefined","EXPENSEREPORT_OUTPUTDIR");
 			return 0;
@@ -662,8 +683,7 @@ 
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else
+		} else
 		{
 			$text=$this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
@@ -708,19 +728,29 @@ 
 			$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->zip).' '.$outputlangs->convToOutputCharset($this->emetteur->town);
 			$carac_emetteur .= "\n";
 			// Phone
-			if ($this->emetteur->phone) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Phone")." : ".$outputlangs->convToOutputCharset($this->emetteur->phone);
+			if ($this->emetteur->phone) {
+			    $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Phone")." : ".$outputlangs->convToOutputCharset($this->emetteur->phone);
+			}
 			// Fax
-			if ($this->emetteur->fax) $carac_emetteur .= ($carac_emetteur ? ($this->emetteur->tel ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax")." : ".$outputlangs->convToOutputCharset($this->emetteur->fax);
+			if ($this->emetteur->fax) {
+			    $carac_emetteur .= ($carac_emetteur ? ($this->emetteur->tel ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax")." : ".$outputlangs->convToOutputCharset($this->emetteur->fax);
+			}
 			// EMail
-			if ($this->emetteur->email) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Email")." : ".$outputlangs->convToOutputCharset($this->emetteur->email);
+			if ($this->emetteur->email) {
+			    $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Email")." : ".$outputlangs->convToOutputCharset($this->emetteur->email);
+			}
 			// Web
-			if ($this->emetteur->url) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Web")." : ".$outputlangs->convToOutputCharset($this->emetteur->url);
+			if ($this->emetteur->url) {
+			    $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Web")." : ".$outputlangs->convToOutputCharset($this->emetteur->url);
+			}
 
 			// Show sender
 			$posy=50;
 			$posx=$this->marge_gauche;
 			$hautcadre=40;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=118;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			    $posx=118;
+			}
 
 			// Show sender frame
 			$pdf->SetTextColor(0, 0, 0);
@@ -779,8 +809,7 @@ 
 					$pdf->SetXY($posx+2,$posy);
 					$pdf->MultiCell(96,4,$outputlangs->transnoentities("DATE_REFUS")." : ".dol_print_date($object->date_refuse,"day",false,$outputlangs),0,'L');
 				}
-			}
-			else if($object->fk_statut==4)
+			} else if($object->fk_statut==4)
 			{
 				if ($object->fk_user_cancel > 0) {
 					$userfee=new User($this->db);
@@ -794,8 +823,7 @@ 
 					$pdf->SetXY($posx+2,$posy);
 					$pdf->MultiCell(96,4,$outputlangs->transnoentities("DATE_CANCEL")." : ".dol_print_date($object->date_cancel,"day",false,$outputlangs),0,'L');
 				}
-			}
-			else
+			} else
 			{
 				if ($object->fk_user_approve > 0) {
 					$userfee=new User($this->db);
@@ -841,7 +869,9 @@ 
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
+		if ($hidetop) {
+		    $hidetop=-1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1040,8 +1070,7 @@ 
 				$pdf->SetXY($tab3_posx+35, $tab3_top+$y);
 				$pdf->MultiCell(30, 4, $outputlangs->trans("RemainderToPay"), 0, 'L', 0);
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;

dolibarr/htdocs/core/modules/expensereport/mod_expensereport_jade.php

Indentation +162 added lines, -162 removed lines

@@ -28,30 +28,30 @@ 
  */
 class mod_expensereport_jade extends ModeleNumRefExpenseReport
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
 
-	public $prefix='ER';
+    public $prefix='ER';
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Jade';
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see name
+     */
+    public $nom='Jade';
 
-	/**
-	 * @var string model name
-	 */
-	public $name='Jade';
+    /**
+     * @var string model name
+     */
+    public $name='Jade';
 
 
     /**
@@ -61,152 +61,152 @@ 
      */
     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;
-
-		$coyymm=''; $max='';
-
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
-		}
-		if ($coyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
-		{
-			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel', $max);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * 	Return next free value
-	 *
-	 *  @param  Object		$object		Object we need next value for
-	 *  @return string      			Value if KO, <0 if KO
-	 */
-	function getNextValue($object)
-	{
-		global $db,$conf;
-
-		// For backward compatibility and restore old behavior to get ref of expense report
-		if ($conf->global->EXPENSEREPORT_USE_OLD_NUMBERING_RULE)
-		{
-			$fuser = null;
-			if ($object->fk_user_author > 0)
-			{
-				$fuser=new User($db);
-				$fuser->fetch($object->fk_user_author);
-			}
-
-			$expld_car = (empty($conf->global->NDF_EXPLODE_CHAR))?"-":$conf->global->NDF_EXPLODE_CHAR;
-			$num_car = (empty($conf->global->NDF_NUM_CAR_REF))?"5":$conf->global->NDF_NUM_CAR_REF;
-
-			$sql = 'SELECT MAX(de.ref_number_int) as max';
-			$sql.= ' FROM '.MAIN_DB_PREFIX.'expensereport de';
-
-			$result = $db->query($sql);
-
-			if($db->num_rows($result) > 0):
-			$objp = $db->fetch_object($result);
-			$newref = $objp->max;
-			$newref++;
-			while(strlen($newref) < $num_car):
-				$newref = "0".$newref;
-			endwhile;
-			else:
-				$newref = 1;
-			while(strlen($newref) < $num_car):
-				$newref = "0".$newref;
-			endwhile;
-			endif;
-
-			$ref_number_int = ($newref+1)-1;
-			$update_number_int = true;
-
-			$user_author_infos = dolGetFirstLastname($fuser->firstname, $fuser->lastname);
-
-			$prefix="ER";
-			if (! empty($conf->global->EXPENSE_REPORT_PREFIX)) $prefix=$conf->global->EXPENSE_REPORT_PREFIX;
-			$newref = str_replace(' ','_', $user_author_infos).$expld_car.$prefix.$newref.$expld_car.dol_print_date($object->date_debut,'%y%m%d');
-
-			$sqlbis = 'UPDATE '.MAIN_DB_PREFIX.'expensereport SET ref_number_int = '.$ref_number_int.' WHERE rowid = '.$object->id;
-			$resqlbis = $db->query($sqlbis);
-			if (! $resqlbis)
-			{
-				dol_print_error($resqlbis);
-				exit;
-			}
-
-			dol_syslog("mod_expensereport_jade::getNextValue return ".$newref);
-			return $newref;
-		}
-
-		// D'abord on recupere la valeur max
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport";
-		$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("mod_expensereport_jade::getNextValue", LOG_DEBUG);
-			return 0;
-		}
-
-		$date=$object->date_valid;		// $object->date does not exists
-		if (empty($date))
-		{
-			$this->error = 'Date valid not defined';
-			return 0;
-		}
-
-		$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("mod_expensereport_jade::getNextValue 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;
+
+        $coyymm=''; $max='';
+
+        $posindice=8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+        $sql.= " FROM ".MAIN_DB_PREFIX."expensereport";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+        $sql.= " AND entity = ".$conf->entity;
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $row = $db->fetch_row($resql);
+            if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
+        }
+        if ($coyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
+        {
+            $langs->load("errors");
+            $this->error=$langs->trans('ErrorNumRefModel', $max);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * 	Return next free value
+     *
+     *  @param  Object		$object		Object we need next value for
+     *  @return string      			Value if KO, <0 if KO
+     */
+    function getNextValue($object)
+    {
+        global $db,$conf;
+
+        // For backward compatibility and restore old behavior to get ref of expense report
+        if ($conf->global->EXPENSEREPORT_USE_OLD_NUMBERING_RULE)
+        {
+            $fuser = null;
+            if ($object->fk_user_author > 0)
+            {
+                $fuser=new User($db);
+                $fuser->fetch($object->fk_user_author);
+            }
+
+            $expld_car = (empty($conf->global->NDF_EXPLODE_CHAR))?"-":$conf->global->NDF_EXPLODE_CHAR;
+            $num_car = (empty($conf->global->NDF_NUM_CAR_REF))?"5":$conf->global->NDF_NUM_CAR_REF;
+
+            $sql = 'SELECT MAX(de.ref_number_int) as max';
+            $sql.= ' FROM '.MAIN_DB_PREFIX.'expensereport de';
+
+            $result = $db->query($sql);
+
+            if($db->num_rows($result) > 0):
+            $objp = $db->fetch_object($result);
+            $newref = $objp->max;
+            $newref++;
+            while(strlen($newref) < $num_car):
+                $newref = "0".$newref;
+            endwhile;
+            else:
+                $newref = 1;
+            while(strlen($newref) < $num_car):
+                $newref = "0".$newref;
+            endwhile;
+            endif;
+
+            $ref_number_int = ($newref+1)-1;
+            $update_number_int = true;
+
+            $user_author_infos = dolGetFirstLastname($fuser->firstname, $fuser->lastname);
+
+            $prefix="ER";
+            if (! empty($conf->global->EXPENSE_REPORT_PREFIX)) $prefix=$conf->global->EXPENSE_REPORT_PREFIX;
+            $newref = str_replace(' ','_', $user_author_infos).$expld_car.$prefix.$newref.$expld_car.dol_print_date($object->date_debut,'%y%m%d');
+
+            $sqlbis = 'UPDATE '.MAIN_DB_PREFIX.'expensereport SET ref_number_int = '.$ref_number_int.' WHERE rowid = '.$object->id;
+            $resqlbis = $db->query($sqlbis);
+            if (! $resqlbis)
+            {
+                dol_print_error($resqlbis);
+                exit;
+            }
+
+            dol_syslog("mod_expensereport_jade::getNextValue return ".$newref);
+            return $newref;
+        }
+
+        // D'abord on recupere la valeur max
+        $posindice=8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+        $sql.= " FROM ".MAIN_DB_PREFIX."expensereport";
+        $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("mod_expensereport_jade::getNextValue", LOG_DEBUG);
+            return 0;
+        }
+
+        $date=$object->date_valid;		// $object->date does not exists
+        if (empty($date))
+        {
+            $this->error = 'Date valid not defined';
+            return 0;
+        }
+
+        $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("mod_expensereport_jade::getNextValue return ".$this->prefix.$yymm."-".$num);
+        return $this->prefix.$yymm."-".$num;
+    }
 }

Spacing +40 added lines, -40 removed lines

@@ -21,7 +21,7 @@ 
  *  \ingroup    expensereport
  *  \brief      File of class to manage customer order numbering rules Jade
  */
-require_once DOL_DOCUMENT_ROOT .'/core/modules/expensereport/modules_expensereport.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
 
 /**
  *	Class to manage customer order numbering rules Jade
@@ -32,26 +32,26 @@ 
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	public $prefix='ER';
+	public $prefix = 'ER';
 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Jade';
+	public $nom = 'Jade';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Jade';
+	public $name = 'Jade';
 
 
     /**
@@ -62,7 +62,7 @@ 
     function info()
     {
     	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
     }
 
 
@@ -85,26 +85,26 @@ 
 	 */
 	function canBeActivated()
 	{
-		global $conf,$langs,$db;
+		global $conf, $langs, $db;
 
-		$coyymm=''; $max='';
+		$coyymm = ''; $max = '';
 
-		$posindice=8;
+		$posindice = 8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport";
+		$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) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
-		if ($coyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
+		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel', $max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
 
@@ -119,7 +119,7 @@ 
 	 */
 	function getNextValue($object)
 	{
-		global $db,$conf;
+		global $db, $conf;
 
 		// For backward compatibility and restore old behavior to get ref of expense report
 		if ($conf->global->EXPENSEREPORT_USE_OLD_NUMBERING_RULE)
@@ -127,44 +127,44 @@ 
 			$fuser = null;
 			if ($object->fk_user_author > 0)
 			{
-				$fuser=new User($db);
+				$fuser = new User($db);
 				$fuser->fetch($object->fk_user_author);
 			}
 
-			$expld_car = (empty($conf->global->NDF_EXPLODE_CHAR))?"-":$conf->global->NDF_EXPLODE_CHAR;
-			$num_car = (empty($conf->global->NDF_NUM_CAR_REF))?"5":$conf->global->NDF_NUM_CAR_REF;
+			$expld_car = (empty($conf->global->NDF_EXPLODE_CHAR)) ? "-" : $conf->global->NDF_EXPLODE_CHAR;
+			$num_car = (empty($conf->global->NDF_NUM_CAR_REF)) ? "5" : $conf->global->NDF_NUM_CAR_REF;
 
 			$sql = 'SELECT MAX(de.ref_number_int) as max';
-			$sql.= ' FROM '.MAIN_DB_PREFIX.'expensereport de';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'expensereport de';
 
 			$result = $db->query($sql);
 
-			if($db->num_rows($result) > 0):
+			if ($db->num_rows($result) > 0):
 			$objp = $db->fetch_object($result);
 			$newref = $objp->max;
 			$newref++;
-			while(strlen($newref) < $num_car):
+			while (strlen($newref) < $num_car):
 				$newref = "0".$newref;
 			endwhile;
 			else:
 				$newref = 1;
-			while(strlen($newref) < $num_car):
+			while (strlen($newref) < $num_car):
 				$newref = "0".$newref;
 			endwhile;
 			endif;
 
-			$ref_number_int = ($newref+1)-1;
+			$ref_number_int = ($newref + 1) - 1;
 			$update_number_int = true;
 
 			$user_author_infos = dolGetFirstLastname($fuser->firstname, $fuser->lastname);
 
-			$prefix="ER";
-			if (! empty($conf->global->EXPENSE_REPORT_PREFIX)) $prefix=$conf->global->EXPENSE_REPORT_PREFIX;
-			$newref = str_replace(' ','_', $user_author_infos).$expld_car.$prefix.$newref.$expld_car.dol_print_date($object->date_debut,'%y%m%d');
+			$prefix = "ER";
+			if (!empty($conf->global->EXPENSE_REPORT_PREFIX)) $prefix = $conf->global->EXPENSE_REPORT_PREFIX;
+			$newref = str_replace(' ', '_', $user_author_infos).$expld_car.$prefix.$newref.$expld_car.dol_print_date($object->date_debut, '%y%m%d');
 
 			$sqlbis = 'UPDATE '.MAIN_DB_PREFIX.'expensereport SET ref_number_int = '.$ref_number_int.' WHERE rowid = '.$object->id;
 			$resqlbis = $db->query($sqlbis);
-			if (! $resqlbis)
+			if (!$resqlbis)
 			{
 				dol_print_error($resqlbis);
 				exit;
@@ -175,18 +175,18 @@ 
 		}
 
 		// D'abord on recupere la valeur max
-		$posindice=8;
+		$posindice = 8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport";
+		$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
 		{
@@ -194,17 +194,17 @@ 
 			return 0;
 		}
 
-		$date=$object->date_valid;		// $object->date does not exists
+		$date = $object->date_valid; // $object->date does not exists
 		if (empty($date))
 		{
 			$this->error = 'Date valid not defined';
 			return 0;
 		}
 
-		$yymm = strftime("%y%m",$date);
+		$yymm = strftime("%y%m", $date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
+    	if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+    	else $num = sprintf("%04s", $max + 1);
 
 		dol_syslog("mod_expensereport_jade::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

Braces +19 added lines, -8 removed lines

@@ -146,8 +146,10 @@ 
 			while(strlen($newref) < $num_car):
 				$newref = "0".$newref;
 			endwhile;
-			else:
+			else {
+			    :
 				$newref = 1;
+			}
 			while(strlen($newref) < $num_car):
 				$newref = "0".$newref;
 			endwhile;
@@ -159,7 +161,9 @@ 
 			$user_author_infos = dolGetFirstLastname($fuser->firstname, $fuser->lastname);
 
 			$prefix="ER";
-			if (! empty($conf->global->EXPENSE_REPORT_PREFIX)) $prefix=$conf->global->EXPENSE_REPORT_PREFIX;
+			if (! empty($conf->global->EXPENSE_REPORT_PREFIX)) {
+			    $prefix=$conf->global->EXPENSE_REPORT_PREFIX;
+			}
 			$newref = str_replace(' ','_', $user_author_infos).$expld_car.$prefix.$newref.$expld_car.dol_print_date($object->date_debut,'%y%m%d');
 
 			$sqlbis = 'UPDATE '.MAIN_DB_PREFIX.'expensereport SET ref_number_int = '.$ref_number_int.' WHERE rowid = '.$object->id;
@@ -185,10 +189,12 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
+			if ($obj) {
+			    $max = intval($obj->max);
+			} else {
+			    $max=0;
+			}
+		} else
 		{
 			dol_syslog("mod_expensereport_jade::getNextValue", LOG_DEBUG);
 			return 0;
@@ -203,8 +209,13 @@ 
 
 		$yymm = strftime("%y%m",$date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
+    	if ($max >= (pow(10, 4) - 1)) {
+    	    $num=$max+1;
+    	}
+    	// If counter > 9999, we do not format on 4 chars, we take number as it is
+    	else {
+    	    $num = sprintf("%04s",$max+1);
+    	}
 
 		dol_syslog("mod_expensereport_jade::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

dolibarr/htdocs/core/modules/expensereport/mod_expensereport_sand.php

Indentation +79 added lines, -79 removed lines

@@ -30,28 +30,28 @@ 
  */
 class mod_expensereport_sand extends ModeleNumRefExpenseReport
 {
-	/**
+    /**
      * 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 = '';
 
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Sand';
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see name
+     */
+    public $nom='Sand';
 
-	/**
-	 * @var string model name
-	 */
-	public $name='Sand';
+    /**
+     * @var string model name
+     */
+    public $name='Sand';
 
 
     /**
@@ -59,39 +59,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="maskconst" value="EXPENSEREPORT_SAND_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="maskconst" value="EXPENSEREPORT_SAND_MASK">';
+        $texte.= '<table class="nobordernopadding" width="100%">';
 
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("ExpenseReport"),$langs->transnoentities("ExpenseReport"));
-		//$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("ExpenseReport"),$langs->transnoentities("ExpenseReport"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+        $tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("ExpenseReport"),$langs->transnoentities("ExpenseReport"));
+        //$tooltip.=$langs->trans("GenericMaskCodes2");
+        $tooltip.=$langs->trans("GenericMaskCodes3");
+        $tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("ExpenseReport"),$langs->transnoentities("ExpenseReport"));
+        $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="maskvalue" value="'.$conf->global->EXPENSEREPORT_SAND_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="maskvalue" value="'.$conf->global->EXPENSEREPORT_SAND_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;
     }
 
     /**
@@ -101,59 +101,59 @@ 
      */
     function getExample()
     {
-     	global $conf,$langs,$user;
+            global $conf,$langs,$user;
 
-     	$exp=new ExpenseReport($this->db);
-     	$exp->initAsSpecimen();
-     	$exp->fk_user_author = $user->id;
+            $exp=new ExpenseReport($this->db);
+            $exp->initAsSpecimen();
+            $exp->fk_user_author = $user->id;
 
-     	$numExample = $this->getNextValue($exp);
+            $numExample = $this->getNextValue($exp);
 
-		if (! $numExample)
-		{
-			$numExample = $langs->trans('NotConfigured');
-		}
-		return $numExample;
+        if (! $numExample)
+        {
+            $numExample = $langs->trans('NotConfigured');
+        }
+        return $numExample;
     }
 
-	/**
-	 * 	Return next free value
-	 *
-	 *  @param  Object		$object		Object we need next value for
-	 *  @return string      			Value if KO, <0 if KO
-	 */
+    /**
+     * 	Return next free value
+     *
+     *  @param  Object		$object		Object we need next value for
+     *  @return string      			Value if KO, <0 if KO
+     */
     function getNextValue($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->EXPENSEREPORT_SAND_MASK;
+        // We get cursor rule
+        $mask=$conf->global->EXPENSEREPORT_SAND_MASK;
 
-		if (! $mask)
-		{
-			$this->error='NotConfigured';
-			return 0;
-		}
+        if (! $mask)
+        {
+            $this->error='NotConfigured';
+            return 0;
+        }
 
-		$date=$object->date_valid;		// $object->date does not exists
-		if (empty($date))
-		{
-			$this->error = 'Date valid not defined';
-			return 0;
-		}
+        $date=$object->date_valid;		// $object->date does not exists
+        if (empty($date))
+        {
+            $this->error = 'Date valid not defined';
+            return 0;
+        }
 
-		$fuser = null;
-		if ($object->fk_user_author > 0)
-		{
-			$fuser=new User($db);
-			$fuser->fetch($object->fk_user_author);
-		}
+        $fuser = null;
+        if ($object->fk_user_author > 0)
+        {
+            $fuser=new User($db);
+            $fuser->fetch($object->fk_user_author);
+        }
 
-		$numFinal=get_next_value($db,$mask,'expensereport','ref','',null, $date, 'next', true, $fuser);
+        $numFinal=get_next_value($db,$mask,'expensereport','ref','',null, $date, 'next', true, $fuser);
 
-		return $numFinal;
-	}
+        return $numFinal;
+    }
 }
 

Spacing +30 added lines, -30 removed lines

@@ -22,7 +22,7 @@ 
  * \brief      Fichier contenant la classe du modele de numerotation de reference de note de frais Sand
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/expensereport/modules_expensereport.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.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
@@ -46,12 +46,12 @@ 
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Sand';
+	public $nom = 'Sand';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Sand';
+	public $name = 'Sand';
 
 
     /**
@@ -68,28 +68,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="maskconst" value="EXPENSEREPORT_SAND_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconst" value="EXPENSEREPORT_SAND_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("ExpenseReport"),$langs->transnoentities("ExpenseReport"));
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("ExpenseReport"), $langs->transnoentities("ExpenseReport"));
 		//$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("ExpenseReport"),$langs->transnoentities("ExpenseReport"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("ExpenseReport"), $langs->transnoentities("ExpenseReport"));
+		$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="maskvalue" value="'.$conf->global->EXPENSEREPORT_SAND_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="maskvalue" value="'.$conf->global->EXPENSEREPORT_SAND_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;
     }
@@ -101,15 +101,15 @@ 
      */
     function getExample()
     {
-     	global $conf,$langs,$user;
+     	global $conf, $langs, $user;
 
-     	$exp=new ExpenseReport($this->db);
+     	$exp = new ExpenseReport($this->db);
      	$exp->initAsSpecimen();
      	$exp->fk_user_author = $user->id;
 
      	$numExample = $this->getNextValue($exp);
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -124,20 +124,20 @@ 
 	 */
     function getNextValue($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->EXPENSEREPORT_SAND_MASK;
+		$mask = $conf->global->EXPENSEREPORT_SAND_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$date=$object->date_valid;		// $object->date does not exists
+		$date = $object->date_valid; // $object->date does not exists
 		if (empty($date))
 		{
 			$this->error = 'Date valid not defined';
@@ -147,11 +147,11 @@ 
 		$fuser = null;
 		if ($object->fk_user_author > 0)
 		{
-			$fuser=new User($db);
+			$fuser = new User($db);
 			$fuser->fetch($object->fk_user_author);
 		}
 
-		$numFinal=get_next_value($db,$mask,'expensereport','ref','',null, $date, 'next', true, $fuser);
+		$numFinal = get_next_value($db, $mask, 'expensereport', 'ref', '', null, $date, 'next', true, $fuser);
 
 		return $numFinal;
 	}

dolibarr/htdocs/core/modules/expensereport/modules_expensereport.php

Indentation +93 added lines, -93 removed lines

@@ -23,33 +23,33 @@ 
  */
 abstract class ModeleExpenseReport extends CommonDocGenerator
 {
-	/**
-	 * @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
+    /**
+     *  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
      */
-	static function liste_modeles($db,$maxfilenamelength=0)
-	{
+    static function liste_modeles($db,$maxfilenamelength=0)
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		$type='expensereport';
-		$liste=array();
+        $type='expensereport';
+        $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;
+    }
 }
 
 // phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -69,7 +69,7 @@ 
 function expensereport_pdf_create(DoliDB $db, ExpenseReport $object, $message, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
     // phpcs:enable
-	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+    return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 }
 
 /**
@@ -79,81 +79,81 @@ 
 
 abstract class ModeleNumRefExpenseReport
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-	/**
-	 *	Return if a module can be used or not
-	 *
-	 *	@return		boolean     true if module can be used
-	 */
-	function isEnabled()
-	{
-		return true;
-	}
-
-	/**
-	 *	Renvoie la description par defaut du modele de numerotation
-	 *
-	 *	@return     string      Texte descripif
-	 */
-	function info()
-	{
-		global $langs;
-		$langs->load("orders");
-		return $langs->trans("NoDescription");
-	}
-
-	/**
-	 *	Renvoie un exemple de numerotation
-	 *
-	 *	@return     string      Example
-	 */
-	function getExample()
-	{
-		global $langs;
-		$langs->load("trips");
-		return $langs->trans("NoExample");
-	}
-
-	/**
-	 *	Test si les numeros deja en vigueur dans la base ne provoquent pas de conflits qui empecheraient cette numerotation de fonctionner.
-	 *
-	 *	@return     boolean     false si conflit, true si ok
-	 */
-	function canBeActivated()
-	{
-		return true;
-	}
-
-	/**
-	 *	Renvoie prochaine valeur attribuee
-	 *
-	 *	@param	Object		$object		Object we need next value for
-	 *	@return	string      Valeur
-	 */
-	function getNextValue($object)
-	{
-		global $langs;
-		return $langs->trans("NotAvailable");
-	}
-
-	/**
-	 *	Renvoie version du module numerotation
-	 *
-	 *  @return     string      Valeur
-	 */
-	function getVersion()
-	{
-		global $langs;
-		$langs->load("admin");
-
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
-		return $langs->trans("NotAvailable");
-	}
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    /**
+     *	Return if a module can be used or not
+     *
+     *	@return		boolean     true if module can be used
+     */
+    function isEnabled()
+    {
+        return true;
+    }
+
+    /**
+     *	Renvoie la description par defaut du modele de numerotation
+     *
+     *	@return     string      Texte descripif
+     */
+    function info()
+    {
+        global $langs;
+        $langs->load("orders");
+        return $langs->trans("NoDescription");
+    }
+
+    /**
+     *	Renvoie un exemple de numerotation
+     *
+     *	@return     string      Example
+     */
+    function getExample()
+    {
+        global $langs;
+        $langs->load("trips");
+        return $langs->trans("NoExample");
+    }
+
+    /**
+     *	Test si les numeros deja en vigueur dans la base ne provoquent pas de conflits qui empecheraient cette numerotation de fonctionner.
+     *
+     *	@return     boolean     false si conflit, true si ok
+     */
+    function canBeActivated()
+    {
+        return true;
+    }
+
+    /**
+     *	Renvoie prochaine valeur attribuee
+     *
+     *	@param	Object		$object		Object we need next value for
+     *	@return	string      Valeur
+     */
+    function getNextValue($object)
+    {
+        global $langs;
+        return $langs->trans("NotAvailable");
+    }
+
+    /**
+     *	Renvoie version du module numerotation
+     *
+     *  @return     string      Valeur
+     */
+    function getVersion()
+    {
+        global $langs;
+        $langs->load("admin");
+
+        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
+        if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
+        if ($this->version == 'dolibarr') return DOL_VERSION;
+        if ($this->version) return $this->version;
+        return $langs->trans("NotAvailable");
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -37,16 +37,16 @@ 
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
      */
-	static function liste_modeles($db,$maxfilenamelength=0)
+	static function liste_modeles($db, $maxfilenamelength = 0)
 	{
         // phpcs:enable
 		global $conf;
 
-		$type='expensereport';
-		$liste=array();
+		$type = 'expensereport';
+		$liste = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		$liste = getListOfModels($db, $type, $maxfilenamelength);
 
 		return $liste;
 	}
@@ -66,7 +66,7 @@ 
  *  @param      int			$hideref        Hide ref
  *  @return     int         				0 if KO, 1 if OK
  */
-function expensereport_pdf_create(DoliDB $db, ExpenseReport $object, $message, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+function expensereport_pdf_create(DoliDB $db, ExpenseReport $object, $message, $modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 {
     // phpcs:enable
 	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -82,7 +82,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 *	Return if a module can be used or not

Braces +12 added lines, -4 removed lines

@@ -142,10 +142,18 @@
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+		    return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+		    return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+		    return DOL_VERSION;
+		}
+		if ($this->version) {
+		    return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }

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

Indentation +69 added lines, -69 removed lines

@@ -33,24 +33,24 @@ 
 {
 
     /**
-	 *   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 = 2300;
 
-		// 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 = "base";
         // 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 the Dolibarr cron service";
-		// 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);
@@ -64,26 +64,26 @@ 
         //-------------
         $this->config_page_url = array("cron.php@cron");
 
-		// Dependancies
-		//-------------
-		$this->hidden = !empty($conf->global->MODULE_CRON_DISABLED); // A condition to disable module
-		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
-		$this->requiredby = array(); // List of modules id to disable if this one is disabled
-		$this->conflictwith = array(); // List of modules id this module is in conflict with
-		$this->langfiles = array("cron");
-
-		// Constants
-		//-----------
-		$this->const = array(
-				0=>array(
-					'CRON_KEY',
-					'chaine',
-					'',
-					'CRON KEY',
-					0,
-					'main',
-					0
-				),);
+        // Dependancies
+        //-------------
+        $this->hidden = !empty($conf->global->MODULE_CRON_DISABLED); // A condition to disable module
+        $this->depends = array(); // List of modules id that must be enabled if this module is enabled
+        $this->requiredby = array(); // List of modules id to disable if this one is disabled
+        $this->conflictwith = array(); // List of modules id this module is in conflict with
+        $this->langfiles = array("cron");
+
+        // Constants
+        //-----------
+        $this->const = array(
+                0=>array(
+                    'CRON_KEY',
+                    'chaine',
+                    '',
+                    'CRON KEY',
+                    0,
+                    'main',
+                    0
+                ),);
 
         // New pages on tabs
         // -----------------
@@ -93,54 +93,54 @@ 
         //------
         $this->boxes = array();
 
-		// Cronjobs
-		$this->cronjobs = array(
-			0=>array('entity'=>0, 'label'=>'PurgeDeleteTemporaryFilesShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'purgeFiles', 'parameters'=>'', 'comment'=>'PurgeDeleteTemporaryFiles', 'frequency'=>2, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>50, 'status'=>1, 'test'=>true),
-			1=>array('entity'=>0, 'label'=>'MakeLocalDatabaseDumpShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'dumpDatabase', 'parameters'=>'none,auto,1,auto,10', 'comment'=>'MakeLocalDatabaseDump', 'frequency'=>1, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>90, 'status'=>0, 'test'=>in_array($db->type, array('mysql', 'mysqli'))),
-			// 1=>array('entity'=>0, 'label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24)
-		);
+        // Cronjobs
+        $this->cronjobs = array(
+            0=>array('entity'=>0, 'label'=>'PurgeDeleteTemporaryFilesShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'purgeFiles', 'parameters'=>'', 'comment'=>'PurgeDeleteTemporaryFiles', 'frequency'=>2, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>50, 'status'=>1, 'test'=>true),
+            1=>array('entity'=>0, 'label'=>'MakeLocalDatabaseDumpShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'dumpDatabase', 'parameters'=>'none,auto,1,auto,10', 'comment'=>'MakeLocalDatabaseDump', 'frequency'=>1, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>90, 'status'=>0, 'test'=>in_array($db->type, array('mysql', 'mysqli'))),
+            // 1=>array('entity'=>0, 'label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24)
+        );
 
         // Permissions
-		$this->rights = array(); // Permission array used by this module
-		$this->rights_class = 'cron';
-		$r = 0;
-
-		$this->rights[$r][0] = 23001;
-		$this->rights[$r][1] = 'Read cron jobs';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'read';
-		$r++;
-
-		$this->rights[$r][0] = 23002;
-		$this->rights[$r][1] = 'Create cron Jobs';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'create';
-		$r++;
-
-		$this->rights[$r][0] = 23003;
-		$this->rights[$r][1] = 'Delete cron Jobs';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'delete';
-		$r++;
-
-		$this->rights[$r][0] = 23004;
-		$this->rights[$r][1] = 'Execute cron Jobs';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'execute';
-		$r++;
+        $this->rights = array(); // Permission array used by this module
+        $this->rights_class = 'cron';
+        $r = 0;
+
+        $this->rights[$r][0] = 23001;
+        $this->rights[$r][1] = 'Read cron jobs';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'read';
+        $r++;
+
+        $this->rights[$r][0] = 23002;
+        $this->rights[$r][1] = 'Create cron Jobs';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'create';
+        $r++;
+
+        $this->rights[$r][0] = 23003;
+        $this->rights[$r][1] = 'Delete cron Jobs';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'delete';
+        $r++;
+
+        $this->rights[$r][0] = 23004;
+        $this->rights[$r][1] = 'Execute cron Jobs';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'execute';
+        $r++;
 
         // Main menu entries
         $r = 0;
         $this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-						        'type'=>'left', // This is a Left menu entry
-						        'titre'=>'CronList',
-						        'url'=>'/cron/list.php?status=-2&leftmenu=admintools',
-						        'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-						        'position'=>200,
-						        'enabled'=>'$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-						        'perms'=>'$user->rights->cron->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-						        'target'=>'',
-						        'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+                                'type'=>'left', // This is a Left menu entry
+                                'titre'=>'CronList',
+                                'url'=>'/cron/list.php?status=-2&leftmenu=admintools',
+                                'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+                                'position'=>200,
+                                'enabled'=>'$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+                                'perms'=>'$user->rights->cron->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+                                'target'=>'',
+                                'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
         $r++;
     }
 }

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

Indentation +131 added lines, -131 removed lines

@@ -32,139 +32,139 @@
 class modLoan extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf;
-
-		$this->db = $db;
-		$this->numero = 520;
-
-		$this->family = "financial";
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Loans management";
-
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='bill';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array("/loan/temp");
-
-		// Config pages
-		$this->config_page_url = array('loan.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->langfiles = array("loan");
-
-		// Constants
-		$this->const = array();
-		$this->const[0] = array(
-				"LOAN_ACCOUNTING_ACCOUNT_CAPITAL",
-				"chaine",
-				"164"
-		);
-		$this->const[1] = array(
-				"LOAN_ACCOUNTING_ACCOUNT_INTEREST",
-				"chaine",
-				"6611"
-		);
-		$this->const[1] = array(
-				"LOAN_ACCOUNTING_ACCOUNT_INSURANCE",
-				"chaine",
-				"6162"
-		);
-
-		// Boxes
-		$this->boxes = array();
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'loan';
-		$r=0;
-
-		$r++;
-		$this->rights[$r][0] = 520;
-		$this->rights[$r][1] = 'Read loans';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'read';
-		$this->rights[$r][5] = '';
-
-		$r++;
-		$this->rights[$r][0] = 522;
-		$this->rights[$r][1] = 'Create/modify loans';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'write';
-		$this->rights[$r][5] = '';
-
-		$r++;
-		$this->rights[$r][0] = 524;
-		$this->rights[$r][1] = 'Delete loans';
-		$this->rights[$r][2] = 'd';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'delete';
-		$this->rights[$r][5] = '';
-
-		$r++;
-		$this->rights[$r][0] = 525;
-		$this->rights[$r][1] = 'Access loan calculator';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'calc';
-		$this->rights[$r][5] = '';
-
-		$r++;
-		$this->rights[$r][0] = 527;
-		$this->rights[$r][1] = 'Export loans';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'export';
-		$this->rights[$r][5] = '';
-
-
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
-
-		// Exports
-		//--------
-		$r=0;
-	}
-
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf;
+
+        $this->db = $db;
+        $this->numero = 520;
+
+        $this->family = "financial";
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        // Module description used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+        $this->description = "Loans management";
+
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='bill';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array("/loan/temp");
+
+        // Config pages
+        $this->config_page_url = array('loan.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->langfiles = array("loan");
+
+        // Constants
+        $this->const = array();
+        $this->const[0] = array(
+                "LOAN_ACCOUNTING_ACCOUNT_CAPITAL",
+                "chaine",
+                "164"
+        );
+        $this->const[1] = array(
+                "LOAN_ACCOUNTING_ACCOUNT_INTEREST",
+                "chaine",
+                "6611"
+        );
+        $this->const[1] = array(
+                "LOAN_ACCOUNTING_ACCOUNT_INSURANCE",
+                "chaine",
+                "6162"
+        );
+
+        // Boxes
+        $this->boxes = array();
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'loan';
+        $r=0;
+
+        $r++;
+        $this->rights[$r][0] = 520;
+        $this->rights[$r][1] = 'Read loans';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'read';
+        $this->rights[$r][5] = '';
+
+        $r++;
+        $this->rights[$r][0] = 522;
+        $this->rights[$r][1] = 'Create/modify loans';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'write';
+        $this->rights[$r][5] = '';
+
+        $r++;
+        $this->rights[$r][0] = 524;
+        $this->rights[$r][1] = 'Delete loans';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'delete';
+        $this->rights[$r][5] = '';
+
+        $r++;
+        $this->rights[$r][0] = 525;
+        $this->rights[$r][1] = 'Access loan calculator';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'calc';
+        $this->rights[$r][5] = '';
+
+        $r++;
+        $this->rights[$r][0] = 527;
+        $this->rights[$r][1] = 'Export loans';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'export';
+        $this->rights[$r][5] = '';
+
+
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+
+
+        // Exports
+        //--------
+        $r=0;
+    }
+
+
+    /**
+     *		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;
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        global $conf;
 
-		// Clean before activation
-		$this->remove($options);
+        // Clean before activation
+        $this->remove($options);
 
-		$sql = array();
+        $sql = array();
 
-		return $this->_init($sql,$options);
-	}
+        return $this->_init($sql,$options);
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -23,7 +23,7 @@ 
  *      \ingroup    loan
  *      \brief      File to activate module loan
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -46,7 +46,7 @@ 
 
 		$this->family = "financial";
 		// 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 = "Loans management";
 
@@ -54,7 +54,7 @@ 
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='bill';
+		$this->picto = 'bill';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/loan/temp");
@@ -63,11 +63,11 @@ 
 		$this->config_page_url = array('loan.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->langfiles = array("loan");
 
 		// Constants
@@ -94,7 +94,7 @@ 
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'loan';
-		$r=0;
+		$r = 0;
 
 		$r++;
 		$this->rights[$r][0] = 520;
@@ -139,12 +139,12 @@ 
 
 		// 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;
 	}
 
 
@@ -156,7 +156,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;
 
@@ -165,6 +165,6 @@ 
 
 		$sql = array();
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

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

Indentation +4 added lines, -4 removed lines

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

Spacing +13 added lines, -13 removed lines

@@ -25,7 +25,7 @@ 
  *  \ingroup    oauth
  *  \brief      File of class to describe and activate module Oauth
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 
@@ -42,14 +42,14 @@ 
      */
     function __construct($db)
     {
-        $this->db = $db ;
+        $this->db = $db;
         $this->numero = 66000;
         // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
         // It is used to group modules in module setup page
         $this->family = "interface";
         $this->module_position = '31';
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->name = preg_replace('/^mod/i', '', get_class($this));
         // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
         $this->description = "Enable OAuth authentication";
         // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
@@ -67,12 +67,12 @@ 
         $this->config_page_url = array("oauth.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                    // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(3,7,-2);   // Minimum version of Dolibarr required by module
+        $this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module                    // Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(3, 7, -2); // Minimum version of Dolibarr required by module
         $this->conflictwith = array();
         $this->langfiles = array("oauth");
 
@@ -86,7 +86,7 @@ 
         $this->rights = array();
         $this->rights_class = 'oauth';
 
-        $r=0;
+        $r = 0;
         // $this->rights[$r][0]     Id permission (unique tous modules confondus)
         // $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
         // $this->rights[$r][2]     Non utilise
@@ -102,8 +102,8 @@ 
         $this->rights[$r][4] = 'read';*/
 
         // Main menu entries
-        $this->menus = array();         // List of menus to add
-        $r=0;
+        $this->menus = array(); // List of menus to add
+        $r = 0;
 
         // This is to declare the Top Menu entry:
         //$this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',               // Put 0 if this is a top menu
@@ -130,7 +130,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;
 

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

Indentation +220 added lines, -220 removed lines

@@ -36,225 +36,225 @@
  */
 class modHoliday extends DolibarrModules
 {
-	/**
-	 *  Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *  @param	DoliDB	$db		Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-
-		// 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 = 20000;
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'holiday';
-
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		// It is used to group modules in module setup page
-		$this->family = "hr";
-		$this->module_position = '30';
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Leave requests";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Name of image file used for this module.
-		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='holiday';
-
-		// Data directories to create when module is enabled.
-		// Example: this->dirs = array("/mymodule/temp");
-		$this->dirs = array("/holiday/temp");
-		$r=0;
-
-		// Config pages
-		$this->config_page_url = array("holiday.php");
-
-
-		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
-		// $this->config_page_url = array("holiday.php?leftmenu=setup@holiday");
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("holiday");
-
-		// Constants
-		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',0),
-		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0) );
-		//                             2=>array('MAIN_MODULE_MYMODULE_NEEDSMARTY','chaine',1,'Constant to say module need smarty',0)
-		$this->const = array();			// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
-		$r=0;
-
-		$this->const[$r][0] = "HOLIDAY_ADDON";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "mod_holiday_madonna";
-		$this->const[$r][3] = 'Nom du gestionnaire de numerotation des congés';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "HOLIDAY_ADDON_PDF";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "celebrate";
-		$this->const[$r][3] = 'Name of PDF model of holiday';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "HOLIDAY_ADDON_PDF_ODT_PATH";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/holiday";
-		$this->const[$r][3] = "";
-		$this->const[$r][4] = 0;
-		$r++;
-
-		// Array to add new pages in new tabs
-		//$this->tabs[] = array('data'=>'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->read:/holiday/list.php?mainmenu=hrm&id=__ID__');	// We avoid to get one tab for each module. RH data are already in RH tab.
-		$this->tabs[] = array();  					// To add a new tab identified by code tabname1
-
-		// Boxes
-		$this->boxes = array();			// List of boxes
-		$r=0;
-
-		// Add here list of php file(s) stored in includes/boxes that contains class to show a box.
-		// Example:
-		//$this->boxes[$r][1] = "myboxa.php";
-		//$r++;
-		//$this->boxes[$r][1] = "myboxb.php";
-		//$r++;
-
-
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
-
-		$this->rights[$r][0] = 20001; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read your own leave requests';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-
-		$this->rights[$r][0] = 20002; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/modify your own leave requests';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-
-		$this->rights[$r][0] = 20003; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Delete leave requests';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'delete';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-
-		$this->rights[$r][0] = 20007;
-		$this->rights[$r][1] = 'Approve leave requests';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'approve';
-		$r++;
-
-		$this->rights[$r][0] = 20004; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read leave requests for everybody';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read_all';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-
-		$this->rights[$r][0] = 20005; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/modify leave requests for everybody';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write_all';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-
-		$this->rights[$r][0] = 20006; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Setup leave requests of users (setup and update balance)';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'define_holiday';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$r++;
-
-
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
-
-		// Exports
-		$r=0;
-
-		$r++;
-		$this->export_code[$r]='leaverequest_'.$r;
-		$this->export_label[$r]='ListeCP';
-		$this->export_icon[$r]='holiday';
-		$this->export_permission[$r]=array(array("holiday","read_all"));
-		$this->export_fields_array[$r]=array(
-			'd.rowid'=>"LeaveId",'d.fk_type'=>'TypeOfLeaveId','t.code'=>'TypeOfLeaveCode','t.label'=>'TypeOfLeaveLabel','d.fk_user'=>'UserID',
-			'u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>"Login",'d.date_debut'=>'DateStart','d.date_fin'=>'DateEnd','d.halfday'=>'HalfDay',
-			'd.date_valid'=>'DateApprove','d.fk_validator'=>"UserForApprovalID",'ua.lastname'=>"UserForApprovalLastname",'ua.firstname'=>"UserForApprovalFirstname",
-			'ua.login'=>"UserForApprovalLogin",'d.description'=>'Description','d.statut'=>'Status'
-		);
-		$this->export_entities_array[$r]=array(
-			'u.lastname'=>'user','u.firstname'=>'user','u.login'=>'user','ua.lastname'=>'user','ua.firstname'=>'user','ua.login'=>'user'
-		);
-		$this->export_alias_array[$r]=array('d.rowid'=>"idholiday");
-		$this->export_dependencies_array[$r]=array(); // 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.'holiday as d';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_holiday_types as t ON t.rowid = d.fk_type';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as ua ON ua.rowid = d.fk_validator,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'user as u';
-		$this->export_sql_end[$r] .=' WHERE d.fk_user = u.rowid';
-		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('holiday').')';
-
-		// Example:
-		// $this->export_code[$r]=$this->rights_class.'_'.$r;
-		// $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-		// $this->export_permission[$r]=array(array("facture","facture","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'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",
-		//	'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus',
-		//	'f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",
-		//	'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",
-		//	'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef'
-		//);
-		// $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'=>"invoice",'f.ref'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",
-		//	'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",
-		//	'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",
-		//	'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product'
-		//);
-		// $this->export_alias_array[$r]=array(
-		//	's.rowid'=>"socid",'s.nom'=>'soc_name','s.address'=>'soc_adres','s.zip'=>'soc_zip','s.town'=>'soc_town','s.fk_pays'=>'soc_pays','s.phone'=>'soc_tel',
-		//	's.siren'=>'soc_siren','s.siret'=>'soc_siret','s.ape'=>'soc_ape','s.idprof4'=>'soc_idprof4','s.code_compta'=>'soc_customer_accountancy',
-		//	's.code_compta_fournisseur'=>'soc_supplier_accountancy','f.rowid'=>"invoiceid",'f.ref'=>"ref",'f.datec'=>"datecreation",'f.datef'=>"dateinvoice",
-		//	'f.total'=>"totalht",'f.total_ttc'=>"totalttc",'f.tva'=>"totalvat",'f.paye'=>"paid",'f.fk_statut'=>'status','f.note'=>"note",'fd.rowid'=>'lineid',
-		//	'fd.description'=>"linedescription",'fd.price'=>"lineprice",'fd.total_ht'=>"linetotalht",'fd.total_tva'=>"linetotaltva",'fd.total_ttc'=>"linetotalttc",
-		//	'fd.tva_tx'=>"linevatrate",'fd.qty'=>"lineqty",'fd.date_start'=>"linedatestart",'fd.date_end'=>"linedateend",'fd.fk_product'=>'productid',
-		//	'p.ref'=>'productref'
-		//);
-		// $this->export_sql_start[$r]='SELECT DISTINCT ';
-		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
-		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
-		// $r++;
-	}
+    /**
+     *  Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *  @param	DoliDB	$db		Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+
+        // 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 = 20000;
+        // Key text used to identify module (for permissions, menus, etc...)
+        $this->rights_class = 'holiday';
+
+        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+        // It is used to group modules in module setup page
+        $this->family = "hr";
+        $this->module_position = '30';
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+        $this->description = "Leave requests";
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // Name of image file used for this module.
+        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+        $this->picto='holiday';
+
+        // Data directories to create when module is enabled.
+        // Example: this->dirs = array("/mymodule/temp");
+        $this->dirs = array("/holiday/temp");
+        $r=0;
+
+        // Config pages
+        $this->config_page_url = array("holiday.php");
+
+
+        // Config pages. Put here list of php page names stored in admmin directory used to setup module.
+        // $this->config_page_url = array("holiday.php?leftmenu=setup@holiday");
+
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of module ids to disable if this one is disabled
+        $this->conflictwith = array();	// List of module class names as string this module is in conflict with
+        $this->phpmin = array(5,4);					// Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+        $this->langfiles = array("holiday");
+
+        // Constants
+        // Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',0),
+        //                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0) );
+        //                             2=>array('MAIN_MODULE_MYMODULE_NEEDSMARTY','chaine',1,'Constant to say module need smarty',0)
+        $this->const = array();			// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
+        $r=0;
+
+        $this->const[$r][0] = "HOLIDAY_ADDON";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "mod_holiday_madonna";
+        $this->const[$r][3] = 'Nom du gestionnaire de numerotation des congés';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "HOLIDAY_ADDON_PDF";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "celebrate";
+        $this->const[$r][3] = 'Name of PDF model of holiday';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "HOLIDAY_ADDON_PDF_ODT_PATH";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/holiday";
+        $this->const[$r][3] = "";
+        $this->const[$r][4] = 0;
+        $r++;
+
+        // Array to add new pages in new tabs
+        //$this->tabs[] = array('data'=>'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->read:/holiday/list.php?mainmenu=hrm&id=__ID__');	// We avoid to get one tab for each module. RH data are already in RH tab.
+        $this->tabs[] = array();  					// To add a new tab identified by code tabname1
+
+        // Boxes
+        $this->boxes = array();			// List of boxes
+        $r=0;
+
+        // Add here list of php file(s) stored in includes/boxes that contains class to show a box.
+        // Example:
+        //$this->boxes[$r][1] = "myboxa.php";
+        //$r++;
+        //$this->boxes[$r][1] = "myboxb.php";
+        //$r++;
+
+
+        // Permissions
+        $this->rights = array();		// Permission array used by this module
+        $r=0;
+
+        $this->rights[$r][0] = 20001; 				// Permission id (must not be already used)
+        $this->rights[$r][1] = 'Read your own leave requests';	// Permission label
+        $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+        $this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $r++;
+
+        $this->rights[$r][0] = 20002; 				// Permission id (must not be already used)
+        $this->rights[$r][1] = 'Create/modify your own leave requests';	// Permission label
+        $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+        $this->rights[$r][4] = 'write';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $r++;
+
+        $this->rights[$r][0] = 20003; 				// Permission id (must not be already used)
+        $this->rights[$r][1] = 'Delete leave requests';	// Permission label
+        $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+        $this->rights[$r][4] = 'delete';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $r++;
+
+        $this->rights[$r][0] = 20007;
+        $this->rights[$r][1] = 'Approve leave requests';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'approve';
+        $r++;
+
+        $this->rights[$r][0] = 20004; 				// Permission id (must not be already used)
+        $this->rights[$r][1] = 'Read leave requests for everybody';	// Permission label
+        $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+        $this->rights[$r][4] = 'read_all';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $r++;
+
+        $this->rights[$r][0] = 20005; 				// Permission id (must not be already used)
+        $this->rights[$r][1] = 'Create/modify leave requests for everybody';	// Permission label
+        $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+        $this->rights[$r][4] = 'write_all';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $r++;
+
+        $this->rights[$r][0] = 20006; 				// Permission id (must not be already used)
+        $this->rights[$r][1] = 'Setup leave requests of users (setup and update balance)';	// Permission label
+        $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+        $this->rights[$r][4] = 'define_holiday';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        $r++;
+
+
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+
+
+        // Exports
+        $r=0;
+
+        $r++;
+        $this->export_code[$r]='leaverequest_'.$r;
+        $this->export_label[$r]='ListeCP';
+        $this->export_icon[$r]='holiday';
+        $this->export_permission[$r]=array(array("holiday","read_all"));
+        $this->export_fields_array[$r]=array(
+            'd.rowid'=>"LeaveId",'d.fk_type'=>'TypeOfLeaveId','t.code'=>'TypeOfLeaveCode','t.label'=>'TypeOfLeaveLabel','d.fk_user'=>'UserID',
+            'u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>"Login",'d.date_debut'=>'DateStart','d.date_fin'=>'DateEnd','d.halfday'=>'HalfDay',
+            'd.date_valid'=>'DateApprove','d.fk_validator'=>"UserForApprovalID",'ua.lastname'=>"UserForApprovalLastname",'ua.firstname'=>"UserForApprovalFirstname",
+            'ua.login'=>"UserForApprovalLogin",'d.description'=>'Description','d.statut'=>'Status'
+        );
+        $this->export_entities_array[$r]=array(
+            'u.lastname'=>'user','u.firstname'=>'user','u.login'=>'user','ua.lastname'=>'user','ua.firstname'=>'user','ua.login'=>'user'
+        );
+        $this->export_alias_array[$r]=array('d.rowid'=>"idholiday");
+        $this->export_dependencies_array[$r]=array(); // 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.'holiday as d';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_holiday_types as t ON t.rowid = d.fk_type';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as ua ON ua.rowid = d.fk_validator,';
+        $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'user as u';
+        $this->export_sql_end[$r] .=' WHERE d.fk_user = u.rowid';
+        $this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('holiday').')';
+
+        // Example:
+        // $this->export_code[$r]=$this->rights_class.'_'.$r;
+        // $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+        // $this->export_permission[$r]=array(array("facture","facture","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'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",
+        //	'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus',
+        //	'f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",
+        //	'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",
+        //	'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef'
+        //);
+        // $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'=>"invoice",'f.ref'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",
+        //	'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",
+        //	'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",
+        //	'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product'
+        //);
+        // $this->export_alias_array[$r]=array(
+        //	's.rowid'=>"socid",'s.nom'=>'soc_name','s.address'=>'soc_adres','s.zip'=>'soc_zip','s.town'=>'soc_town','s.fk_pays'=>'soc_pays','s.phone'=>'soc_tel',
+        //	's.siren'=>'soc_siren','s.siret'=>'soc_siret','s.ape'=>'soc_ape','s.idprof4'=>'soc_idprof4','s.code_compta'=>'soc_customer_accountancy',
+        //	's.code_compta_fournisseur'=>'soc_supplier_accountancy','f.rowid'=>"invoiceid",'f.ref'=>"ref",'f.datec'=>"datecreation",'f.datef'=>"dateinvoice",
+        //	'f.total'=>"totalht",'f.total_ttc'=>"totalttc",'f.tva'=>"totalvat",'f.paye'=>"paid",'f.fk_statut'=>'status','f.note'=>"note",'fd.rowid'=>'lineid',
+        //	'fd.description'=>"linedescription",'fd.price'=>"lineprice",'fd.total_ht'=>"linetotalht",'fd.total_tva'=>"linetotaltva",'fd.total_ttc'=>"linetotalttc",
+        //	'fd.tva_tx'=>"linevatrate",'fd.qty'=>"lineqty",'fd.date_start'=>"linedatestart",'fd.date_end'=>"linedateend",'fd.fk_product'=>'productid',
+        //	'p.ref'=>'productref'
+        //);
+        // $this->export_sql_start[$r]='SELECT DISTINCT ';
+        // $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
+        // $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
+        // $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
+        // $r++;
+    }
 }
 

Spacing +71 added lines, -71 removed lines

@@ -28,7 +28,7 @@ 
  *    \ingroup    holiday
  *    \brief      Description and activation file for module holiday
  */
-include_once DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php";
+include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
 
 
 /**
@@ -56,7 +56,7 @@ 
 		$this->family = "hr";
 		$this->module_position = '30';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
 		$this->description = "Leave requests";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
@@ -66,12 +66,12 @@ 
 		// Name of image file used for this module.
 		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
 		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='holiday';
+		$this->picto = 'holiday';
 
 		// Data directories to create when module is enabled.
 		// Example: this->dirs = array("/mymodule/temp");
 		$this->dirs = array("/holiday/temp");
-		$r=0;
+		$r = 0;
 
 		// Config pages
 		$this->config_page_url = array("holiday.php");
@@ -81,20 +81,20 @@ 
 		// $this->config_page_url = array("holiday.php?leftmenu=setup@holiday");
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("holiday");
 
 		// Constants
 		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',0),
 		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0) );
 		//                             2=>array('MAIN_MODULE_MYMODULE_NEEDSMARTY','chaine',1,'Constant to say module need smarty',0)
-		$this->const = array();			// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
-		$r=0;
+		$this->const = array(); // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
+		$r = 0;
 
 		$this->const[$r][0] = "HOLIDAY_ADDON";
 		$this->const[$r][1] = "chaine";
@@ -119,11 +119,11 @@ 
 
 		// Array to add new pages in new tabs
 		//$this->tabs[] = array('data'=>'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->read:/holiday/list.php?mainmenu=hrm&id=__ID__');	// We avoid to get one tab for each module. RH data are already in RH tab.
-		$this->tabs[] = array();  					// To add a new tab identified by code tabname1
+		$this->tabs[] = array(); // To add a new tab identified by code tabname1
 
 		// Boxes
-		$this->boxes = array();			// List of boxes
-		$r=0;
+		$this->boxes = array(); // List of boxes
+		$r = 0;
 
 		// Add here list of php file(s) stored in includes/boxes that contains class to show a box.
 		// Example:
@@ -134,28 +134,28 @@ 
 
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
-
-		$this->rights[$r][0] = 20001; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read your own leave requests';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
+
+		$this->rights[$r][0] = 20001; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read your own leave requests'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
-		$this->rights[$r][0] = 20002; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/modify your own leave requests';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][0] = 20002; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/modify your own leave requests'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
-		$this->rights[$r][0] = 20003; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Delete leave requests';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'delete';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][0] = 20003; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Delete leave requests'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'delete'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		$this->rights[$r][0] = 20007;
@@ -165,60 +165,60 @@ 
 		$this->rights[$r][4] = 'approve';
 		$r++;
 
-		$this->rights[$r][0] = 20004; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read leave requests for everybody';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read_all';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][0] = 20004; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read leave requests for everybody'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'read_all'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
-		$this->rights[$r][0] = 20005; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/modify leave requests for everybody';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write_all';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][0] = 20005; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/modify leave requests for everybody'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'write_all'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
-		$this->rights[$r][0] = 20006; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Setup leave requests of users (setup and update balance)';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'define_holiday';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][0] = 20006; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Setup leave requests of users (setup and update balance)'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'define_holiday'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 
 		// Menus
 		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 
 		// Exports
-		$r=0;
+		$r = 0;
 
 		$r++;
-		$this->export_code[$r]='leaverequest_'.$r;
-		$this->export_label[$r]='ListeCP';
-		$this->export_icon[$r]='holiday';
-		$this->export_permission[$r]=array(array("holiday","read_all"));
-		$this->export_fields_array[$r]=array(
-			'd.rowid'=>"LeaveId",'d.fk_type'=>'TypeOfLeaveId','t.code'=>'TypeOfLeaveCode','t.label'=>'TypeOfLeaveLabel','d.fk_user'=>'UserID',
-			'u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>"Login",'d.date_debut'=>'DateStart','d.date_fin'=>'DateEnd','d.halfday'=>'HalfDay',
-			'd.date_valid'=>'DateApprove','d.fk_validator'=>"UserForApprovalID",'ua.lastname'=>"UserForApprovalLastname",'ua.firstname'=>"UserForApprovalFirstname",
-			'ua.login'=>"UserForApprovalLogin",'d.description'=>'Description','d.statut'=>'Status'
+		$this->export_code[$r] = 'leaverequest_'.$r;
+		$this->export_label[$r] = 'ListeCP';
+		$this->export_icon[$r] = 'holiday';
+		$this->export_permission[$r] = array(array("holiday", "read_all"));
+		$this->export_fields_array[$r] = array(
+			'd.rowid'=>"LeaveId", 'd.fk_type'=>'TypeOfLeaveId', 't.code'=>'TypeOfLeaveCode', 't.label'=>'TypeOfLeaveLabel', 'd.fk_user'=>'UserID',
+			'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>"Login", 'd.date_debut'=>'DateStart', 'd.date_fin'=>'DateEnd', 'd.halfday'=>'HalfDay',
+			'd.date_valid'=>'DateApprove', 'd.fk_validator'=>"UserForApprovalID", 'ua.lastname'=>"UserForApprovalLastname", 'ua.firstname'=>"UserForApprovalFirstname",
+			'ua.login'=>"UserForApprovalLogin", 'd.description'=>'Description', 'd.statut'=>'Status'
 		);
-		$this->export_entities_array[$r]=array(
-			'u.lastname'=>'user','u.firstname'=>'user','u.login'=>'user','ua.lastname'=>'user','ua.firstname'=>'user','ua.login'=>'user'
+		$this->export_entities_array[$r] = array(
+			'u.lastname'=>'user', 'u.firstname'=>'user', 'u.login'=>'user', 'ua.lastname'=>'user', 'ua.firstname'=>'user', 'ua.login'=>'user'
 		);
-		$this->export_alias_array[$r]=array('d.rowid'=>"idholiday");
-		$this->export_dependencies_array[$r]=array(); // 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.'holiday as d';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_holiday_types as t ON t.rowid = d.fk_type';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as ua ON ua.rowid = d.fk_validator,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'user as u';
-		$this->export_sql_end[$r] .=' WHERE d.fk_user = u.rowid';
-		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('holiday').')';
+		$this->export_alias_array[$r] = array('d.rowid'=>"idholiday");
+		$this->export_dependencies_array[$r] = array(); // 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.'holiday as d';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_holiday_types as t ON t.rowid = d.fk_type';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as ua ON ua.rowid = d.fk_validator,';
+		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'user as u';
+		$this->export_sql_end[$r] .= ' WHERE d.fk_user = u.rowid';
+		$this->export_sql_end[$r] .= ' AND d.entity IN ('.getEntity('holiday').')';
 
 		// Example:
 		// $this->export_code[$r]=$this->rights_class.'_'.$r;

dolibarr/htdocs/core/modules/import/import_xlsx.modules.php

Indentation +546 added lines, -546 removed lines

@@ -41,76 +41,76 @@ 
     public $datatoimport;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+    /**
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
 
     /**
-	 * @var int ID
-	 */
-	public $id;
+     * @var int ID
+     */
+    public $id;
 
-	/**
+    /**
      * @var string label
      */
     public $label;
 
-	public $extension;    // Extension of files imported by driver
+    public $extension;    // Extension of files imported by driver
 
-	/**
+    /**
      * Dolibarr version of driver
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
-	public $label_lib;    // Label of external lib used by driver
+    public $label_lib;    // Label of external lib used by driver
 
-	public $version_lib;  // Version of external lib used by driver
+    public $version_lib;  // Version of external lib used by driver
 
-	public $separator;
+    public $separator;
 
     public $file;      // Path of file
 
-	public $handle;    // Handle fichier
-
-	public $cacheconvert=array();      // Array to cache list of value found after a convertion
+    public $handle;    // Handle fichier
 
-	public $cachefieldtable=array();   // Array to cache list of value found into fields@tables
+    public $cacheconvert=array();      // Array to cache list of value found after a convertion
 
-	public $workbook; // temporary import file
+    public $cachefieldtable=array();   // Array to cache list of value found into fields@tables
 
-	public $record; // current record
+    public $workbook; // temporary import file
 
-	public $headers;
+    public $record; // current record
 
+    public $headers;
 
-	/**
-	 *	Constructor
-	 *
-	 *	@param	DoliDB		$db				Database handler
-	 *	@param	string		$datatoimport	String code describing import set (ex: 'societe_1')
-	 */
-	function __construct($db,$datatoimport)
-	{
-		global $conf,$langs;
-		$this->db = $db;
 
-		// this is used as an extension from the example file code, so we have to put xlsx here !!!
-		$this->id='xlsx';                // Same value as xxx in file name export_xxx.modules.php
-		$this->label='Excel 2007';             // Label of driver
-		$this->desc=$langs->trans("Excel2007FormatDesc");
-		$this->extension='xlsx';         // Extension for generated file by this driver
-		$this->picto='mime/xls';		// Picto (This is not used by the example file code as Mime type, too bad ...)
-		$this->version='1.0';         // Driver version
-
-		// If driver use an external library, put its name here
+    /**
+     *	Constructor
+     *
+     *	@param	DoliDB		$db				Database handler
+     *	@param	string		$datatoimport	String code describing import set (ex: 'societe_1')
+     */
+    function __construct($db,$datatoimport)
+    {
+        global $conf,$langs;
+        $this->db = $db;
+
+        // this is used as an extension from the example file code, so we have to put xlsx here !!!
+        $this->id='xlsx';                // Same value as xxx in file name export_xxx.modules.php
+        $this->label='Excel 2007';             // Label of driver
+        $this->desc=$langs->trans("Excel2007FormatDesc");
+        $this->extension='xlsx';         // Extension for generated file by this driver
+        $this->picto='mime/xls';		// Picto (This is not used by the example file code as Mime type, too bad ...)
+        $this->version='1.0';         // Driver version
+
+        // If driver use an external library, put its name here
         require_once PHPEXCEL_PATH.'PHPExcel.php';
-		require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
+        require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
         if (! class_exists('ZipArchive')) // For Excel2007, PHPExcel need ZipArchive
         {
                 $langs->load("errors");
@@ -120,20 +120,20 @@ 
         $this->label_lib='PhpExcel';
         $this->version_lib='1.8.0';
 
-		$this->datatoimport=$datatoimport;
-		if (preg_match('/^societe_/',$datatoimport)) $this->thirpartyobject=new Societe($this->db);
-	}
+        $this->datatoimport=$datatoimport;
+        if (preg_match('/^societe_/',$datatoimport)) $this->thirpartyobject=new Societe($this->db);
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output header of an example file for this format
-	 *
-	 * 	@param	Translate	$outputlangs		Output language
-	 *  @return	string
-	 */
-	function write_header_example($outputlangs)
-	{
+    /**
+     * 	Output header of an example file for this format
+     *
+     * 	@param	Translate	$outputlangs		Output language
+     *  @return	string
+     */
+    function write_header_example($outputlangs)
+    {
         // phpcs:enable
         global $user,$conf,$langs;
         // create a temporary object, the final output will be generated in footer
@@ -159,291 +159,291 @@ 
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output title line of an example file for this format
-	 *
-	 * 	@param	Translate	$outputlangs		Output language
-	 *  @param	array		$headerlinefields	Array of fields name
-	 * 	@return	string
-	 */
-	function write_title_example($outputlangs,$headerlinefields)
-	{
+    /**
+     * 	Output title line of an example file for this format
+     *
+     * 	@param	Translate	$outputlangs		Output language
+     *  @param	array		$headerlinefields	Array of fields name
+     * 	@return	string
+     */
+    function write_title_example($outputlangs,$headerlinefields)
+    {
         // phpcs:enable
-		global $conf;
-		$this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
-		$this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
-
-		$col = 0;
-		foreach($headerlinefields as $field) {
-			$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($col, 1, $outputlangs->transnoentities($field));
-			// set autowidth
-			//$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($col + 1))->setAutoSize(true);
-			$col++;
-		}
+        global $conf;
+        $this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
+        $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
+
+        $col = 0;
+        foreach($headerlinefields as $field) {
+            $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($col, 1, $outputlangs->transnoentities($field));
+            // set autowidth
+            //$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($col + 1))->setAutoSize(true);
+            $col++;
+        }
 
-		return ''; // final output will be generated in footer
-	}
+        return ''; // final output will be generated in footer
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output record of an example file for this format
-	 *
-	 * 	@param	Translate	$outputlangs		Output language
-	 * 	@param	array		$contentlinevalues	Array of lines
-	 * 	@return	string
-	 */
-	function write_record_example($outputlangs,$contentlinevalues)
-	{
+    /**
+     * 	Output record of an example file for this format
+     *
+     * 	@param	Translate	$outputlangs		Output language
+     * 	@param	array		$contentlinevalues	Array of lines
+     * 	@return	string
+     */
+    function write_record_example($outputlangs,$contentlinevalues)
+    {
         // phpcs:enable
-		$col = 0;
-		$row = 2;
-		foreach($contentlinevalues as $cell) {
-			$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($col, $row, $cell);
-			$col++;
-		}
+        $col = 0;
+        $row = 2;
+        foreach($contentlinevalues as $cell) {
+            $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($col, $row, $cell);
+            $col++;
+        }
 
-		return ''; // final output will be generated in footer
-	}
+        return ''; // final output will be generated in footer
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output footer of an example file for this format
-	 *
-	 * 	@param	Translate	$outputlangs		Output language
-	 *  @return	string
-	 */
-	function write_footer_example($outputlangs)
-	{
+    /**
+     * 	Output footer of an example file for this format
+     *
+     * 	@param	Translate	$outputlangs		Output language
+     *  @return	string
+     */
+    function write_footer_example($outputlangs)
+    {
         // phpcs:enable
-		// return the file content as a string
-		$tempfile = tempnam(sys_get_temp_dir(), 'dol');
-		$objWriter = new PHPExcel_Writer_Excel2007($this->workbook);
-		$objWriter->save($tempfile);
-		$this->workbook->disconnectWorksheets();
-		unset($this->workbook);
-
-		$content = file_get_contents($tempfile);
-		unlink($tempfile);
-		return $content;
-	}
+        // return the file content as a string
+        $tempfile = tempnam(sys_get_temp_dir(), 'dol');
+        $objWriter = new PHPExcel_Writer_Excel2007($this->workbook);
+        $objWriter->save($tempfile);
+        $this->workbook->disconnectWorksheets();
+        unset($this->workbook);
+
+        $content = file_get_contents($tempfile);
+        unlink($tempfile);
+        return $content;
+    }
 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Open input file
-	 *
-	 *	@param	string	$file		Path of filename
-	 *	@return	int					<0 if KO, >=0 if OK
-	 */
-	function import_open_file($file)
-	{
+    /**
+     *	Open input file
+     *
+     *	@param	string	$file		Path of filename
+     *	@return	int					<0 if KO, >=0 if OK
+     */
+    function import_open_file($file)
+    {
         // phpcs:enable
-		global $langs;
-		$ret=1;
+        global $langs;
+        $ret=1;
 
-		dol_syslog(get_class($this)."::open_file file=".$file);
+        dol_syslog(get_class($this)."::open_file file=".$file);
 
-		$reader = new PHPExcel_Reader_Excel2007();
-		$this->workbook = $reader->load($file);
-		$this->record = 1;
-		$this->file = $file;
+        $reader = new PHPExcel_Reader_Excel2007();
+        $this->workbook = $reader->load($file);
+        $this->record = 1;
+        $this->file = $file;
 
-		return $ret;
-	}
+        return $ret;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Return nb of records. File must be closed.
-	 *
-	 *	@param	string	$file		Path of filename
-	 * 	@return		int		<0 if KO, >=0 if OK
-	 */
-	function import_get_nb_of_lines($file)
-	{
+    /**
+     * 	Return nb of records. File must be closed.
+     *
+     *	@param	string	$file		Path of filename
+     * 	@return		int		<0 if KO, >=0 if OK
+     */
+    function import_get_nb_of_lines($file)
+    {
         // phpcs:enable
-		$reader = new PHPExcel_Reader_Excel2007();
-		$this->workbook = $reader->load($file);
+        $reader = new PHPExcel_Reader_Excel2007();
+        $this->workbook = $reader->load($file);
 
-		$rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
+        $rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
 
-		$this->workbook->disconnectWorksheets();
-		unset($this->workbook);
+        $this->workbook->disconnectWorksheets();
+        unset($this->workbook);
 
-		return $rowcount;
-	}
+        return $rowcount;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Input header line from file
-	 *
-	 * 	@return		int		<0 if KO, >=0 if OK
-	 */
-	function import_read_header()
-	{
+    /**
+     * 	Input header line from file
+     *
+     * 	@return		int		<0 if KO, >=0 if OK
+     */
+    function import_read_header()
+    {
         // phpcs:enable
-		// This is not called by the import code !!!
-		$this->headers = array();
-		$colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn());
-		for($col=0;$col<$colcount;$col++) {
-			$this->headers[$col] = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, 1)->getValue();
-		}
-		return 0;
-	}
+        // This is not called by the import code !!!
+        $this->headers = array();
+        $colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn());
+        for($col=0;$col<$colcount;$col++) {
+            $this->headers[$col] = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, 1)->getValue();
+        }
+        return 0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Return array of next record in input file.
-	 *
-	 * 	@return		Array		Array of field values. Data are UTF8 encoded. [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=not empty string)
-	 */
-	function import_read_record()
-	{
+    /**
+     * 	Return array of next record in input file.
+     *
+     * 	@return		Array		Array of field values. Data are UTF8 encoded. [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=not empty string)
+     */
+    function import_read_record()
+    {
         // phpcs:enable
-		global $conf;
-
-		$rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
-		if($this->record > $rowcount)
-			return false;
-		$array = array();
-		$colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn(0));
-		for($col=0;$col<$colcount;$col++) {
-			$val = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, $this->record)->getValue();
-			$array[$col]['val'] = $val;
-			$array[$col]['type'] = (dol_strlen($val)?1:-1); // If empty we consider it null
-		}
-		$this->record++;
-		return $array;
-	}
+        global $conf;
+
+        $rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
+        if($this->record > $rowcount)
+            return false;
+        $array = array();
+        $colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn(0));
+        for($col=0;$col<$colcount;$col++) {
+            $val = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, $this->record)->getValue();
+            $array[$col]['val'] = $val;
+            $array[$col]['type'] = (dol_strlen($val)?1:-1); // If empty we consider it null
+        }
+        $this->record++;
+        return $array;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Close file handle
-	 *
-	 *  @return	integer
-	 */
-	function import_close_file()
-	{
+    /**
+     * 	Close file handle
+     *
+     *  @return	integer
+     */
+    function import_close_file()
+    {
         // phpcs:enable
-		$this->workbook->disconnectWorksheets();
-		unset($this->workbook);
-	}
+        $this->workbook->disconnectWorksheets();
+        unset($this->workbook);
+    }
 
 
     // What is this doing here ? it is common to all imports, is should be in the parent class
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Insert a record into database
-	 *
-	 * @param	array	$arrayrecord					Array of read values: [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=string), [fieldpos+1]...
-	 * @param	array	$array_match_file_to_database	Array of target fields where to insert data: [fieldpos] => 's.fieldname', [fieldpos+1]...
-	 * @param 	Object	$objimport						Object import (contains objimport->array_import_tables, objimport->array_import_fields, objimport->array_import_convertvalue, ...)
-	 * @param	int		$maxfields						Max number of fields to use
-	 * @param	string	$importid						Import key
-	 * @param	array	$updatekeys						Array of keys to use to try to do an update first before insert. This field are defined into the module descriptor.
-	 * @return	int										<0 if KO, >0 if OK
-	 */
-	function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$maxfields,$importid,$updatekeys)
-	{
+    /**
+     * Insert a record into database
+     *
+     * @param	array	$arrayrecord					Array of read values: [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=string), [fieldpos+1]...
+     * @param	array	$array_match_file_to_database	Array of target fields where to insert data: [fieldpos] => 's.fieldname', [fieldpos+1]...
+     * @param 	Object	$objimport						Object import (contains objimport->array_import_tables, objimport->array_import_fields, objimport->array_import_convertvalue, ...)
+     * @param	int		$maxfields						Max number of fields to use
+     * @param	string	$importid						Import key
+     * @param	array	$updatekeys						Array of keys to use to try to do an update first before insert. This field are defined into the module descriptor.
+     * @return	int										<0 if KO, >0 if OK
+     */
+    function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$maxfields,$importid,$updatekeys)
+    {
         // phpcs:enable
-		global $langs,$conf,$user;
+        global $langs,$conf,$user;
         global $thirdparty_static;    	// Specific to thirdparty import
-		global $tablewithentity_cache;	// Cache to avoid to call  desc at each rows on tables
-
-		$error=0;
-		$warning=0;
-		$this->errors=array();
-		$this->warnings=array();
-
-		//dol_syslog("import_csv.modules maxfields=".$maxfields." importid=".$importid);
-
-		//var_dump($array_match_file_to_database);
-		//var_dump($arrayrecord);
-		$array_match_database_to_file=array_flip($array_match_file_to_database);
-		$sort_array_match_file_to_database=$array_match_file_to_database;
-		ksort($sort_array_match_file_to_database);
-
-		//var_dump($sort_array_match_file_to_database);
-
-		if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val'])))
-		{
-			//print 'W';
-			$this->warnings[$warning]['lib']=$langs->trans('EmptyLine');
-			$this->warnings[$warning]['type']='EMPTY';
-			$warning++;
-		}
-		else
-		{
-			$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
-			$updatedone = false;
-			$insertdone = false;
-			// For each table to insert, me make a separate insert
-			foreach($objimport->array_import_tables[0] as $alias => $tablename)
-			{
-				// Build sql request
-				$sql='';
-				$listfields=array();
-				$listvalues=array();
-				$i=0;
-				$errorforthistable=0;
-
-				// Define $tablewithentity_cache[$tablename] if not already defined
-				if (! isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
-				{
-					dol_syslog("Check if table ".$tablename." has an entity field");
-					$resql=$this->db->DDLDescTable($tablename,'entity');
-					if ($resql)
-					{
-						$obj=$this->db->fetch_object($resql);
-						if ($obj) $tablewithentity_cache[$tablename]=1;		// table contains entity field
-						else $tablewithentity_cache[$tablename]=0;			// table does not contains entity field
-					}
-					else dol_print_error($this->db);
-				}
-				else
-				{
-					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
-				}
-
-
-				// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
-				foreach($sort_array_match_file_to_database as $key => $val)
-				{
-				    $fieldalias=preg_replace('/\..*$/i','',$val);
-				    $fieldname=preg_replace('/^.*\./i','',$val);
-
-				    if ($alias != $fieldalias) continue;    // Not a field of current table
-
-					if ($key <= $maxfields)
-					{
-						// Set $newval with value to insert and set $listvalues with sql request part for insert
-						$newval='';
-						if ($arrayrecord[($key-1)]['type'] > 0) $newval=$arrayrecord[($key-1)]['val'];    // If type of field into input file is not empty string (so defined into input file), we get value
-
-						// Make some tests on $newval
-
-						// Is it a required field ?
-						if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ((string) $newval==''))
-						{
-							$this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key);
-							$this->errors[$error]['type']='NOTNULL';
-							$errorforthistable++;
-							$error++;
-						}
-						// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
-						else
-						{
-						    // We convert field if required
-						    if (! empty($objimport->array_import_convertvalue[0][$val]))
-						    {
+        global $tablewithentity_cache;	// Cache to avoid to call  desc at each rows on tables
+
+        $error=0;
+        $warning=0;
+        $this->errors=array();
+        $this->warnings=array();
+
+        //dol_syslog("import_csv.modules maxfields=".$maxfields." importid=".$importid);
+
+        //var_dump($array_match_file_to_database);
+        //var_dump($arrayrecord);
+        $array_match_database_to_file=array_flip($array_match_file_to_database);
+        $sort_array_match_file_to_database=$array_match_file_to_database;
+        ksort($sort_array_match_file_to_database);
+
+        //var_dump($sort_array_match_file_to_database);
+
+        if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val'])))
+        {
+            //print 'W';
+            $this->warnings[$warning]['lib']=$langs->trans('EmptyLine');
+            $this->warnings[$warning]['type']='EMPTY';
+            $warning++;
+        }
+        else
+        {
+            $last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
+            $updatedone = false;
+            $insertdone = false;
+            // For each table to insert, me make a separate insert
+            foreach($objimport->array_import_tables[0] as $alias => $tablename)
+            {
+                // Build sql request
+                $sql='';
+                $listfields=array();
+                $listvalues=array();
+                $i=0;
+                $errorforthistable=0;
+
+                // Define $tablewithentity_cache[$tablename] if not already defined
+                if (! isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
+                {
+                    dol_syslog("Check if table ".$tablename." has an entity field");
+                    $resql=$this->db->DDLDescTable($tablename,'entity');
+                    if ($resql)
+                    {
+                        $obj=$this->db->fetch_object($resql);
+                        if ($obj) $tablewithentity_cache[$tablename]=1;		// table contains entity field
+                        else $tablewithentity_cache[$tablename]=0;			// table does not contains entity field
+                    }
+                    else dol_print_error($this->db);
+                }
+                else
+                {
+                    //dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
+                }
+
+
+                // Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
+                foreach($sort_array_match_file_to_database as $key => $val)
+                {
+                    $fieldalias=preg_replace('/\..*$/i','',$val);
+                    $fieldname=preg_replace('/^.*\./i','',$val);
+
+                    if ($alias != $fieldalias) continue;    // Not a field of current table
+
+                    if ($key <= $maxfields)
+                    {
+                        // Set $newval with value to insert and set $listvalues with sql request part for insert
+                        $newval='';
+                        if ($arrayrecord[($key-1)]['type'] > 0) $newval=$arrayrecord[($key-1)]['val'];    // If type of field into input file is not empty string (so defined into input file), we get value
+
+                        // Make some tests on $newval
+
+                        // Is it a required field ?
+                        if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ((string) $newval==''))
+                        {
+                            $this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key);
+                            $this->errors[$error]['type']='NOTNULL';
+                            $errorforthistable++;
+                            $error++;
+                        }
+                        // Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
+                        else
+                        {
+                            // We convert field if required
+                            if (! empty($objimport->array_import_convertvalue[0][$val]))
+                            {
                                 //print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
                                 if ($objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeid'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromref'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel'
-                                	)
+                                    || $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromref'
+                                    || $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel'
+                                    )
                                 {
                                     // New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
                                     $isidorref='id';
@@ -458,10 +458,10 @@ 
                                         $method=$objimport->array_import_convertvalue[0][$val]['method'];
                                         if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
-                                        	$newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
+                                            $newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
                                         }
                                         else
-										{
+                                        {
                                             $resultload = dol_include_once($file);
                                             if (empty($resultload))
                                             {
@@ -474,7 +474,7 @@ 
                                             // If not found, try the fetch from label
                                             if (! ($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel')
                                             {
-												call_user_func_array(array($classinstance, $method),array('', '', $newval));
+                                                call_user_func_array(array($classinstance, $method),array('', '', $newval));
                                             }
                                             $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval]=$classinstance->id;
                                             //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
@@ -561,257 +561,257 @@ 
                                 }
 
                                 //print 'Val to use as insert is '.$newval.'<br>';
-						    }
-
-						    // Test regexp
-							if (! empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
-							{
-								// If test is "Must exist in a field@table"
-								if (preg_match('/^(.*)@(.*)$/',$objimport->array_import_regex[0][$val],$reg))
-								{
-									$field=$reg[1];
-									$table=$reg[2];
-
-									// Load content of field@table into cache array
-									if (! is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
-									{
-										$sql="SELECT ".$field." as aliasfield FROM ".$table;
-										$resql=$this->db->query($sql);
-										if ($resql)
-										{
-											$num=$this->db->num_rows($resql);
-											$i=0;
-											while ($i < $num)
-											{
-												$obj=$this->db->fetch_object($resql);
-												if ($obj) $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
-												$i++;
-											}
-										}
-										else
-										{
-											dol_print_error($this->db);
-										}
-									}
-
-									// Now we check cache is not empty (should not) and key is into cache
-									if (! is_array($this->cachefieldtable[$field.'@'.$table]) || ! in_array($newval,$this->cachefieldtable[$field.'@'.$table]))
-									{
-										$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorFieldValueNotIn',$key,$newval,$field,$table);
-										$this->errors[$error]['type']='FOREIGNKEY';
-									    $errorforthistable++;
-										$error++;
-									}
-								}
-								// If test is just a static regex
-								else if (! preg_match('/'.$objimport->array_import_regex[0][$val].'/i',$newval))
-								{
-								    //if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
-									$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorWrongValueForField',$key,$newval,$objimport->array_import_regex[0][$val]);
-									$this->errors[$error]['type']='REGEX';
-									$errorforthistable++;
-									$error++;
-								}
-							}
-
-							// Other tests
-							// ...
-						}
-
-						// Define $listfields and $listvalues to build SQL request
-						$listfields[] = $fieldname;
-
-						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
-						if (empty($newval) && $arrayrecord[($key-1)]['type'] < 0)		 $listvalues[] = ($newval=='0'?$newval:"null");
-						elseif (empty($newval) && $arrayrecord[($key-1)]['type'] == 0)	 $listvalues[] = "''";
-						else															 $listvalues[] = "'".$this->db->escape($newval)."'";
-					}
-					$i++;
-				}
-
-				// We add hidden fields (but only if there is at least one field to add into table)
-				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0]))
-				{
-    				// Loop on each hidden fields to add them into listfields/listvalues
-				    foreach($objimport->array_import_fieldshidden[0] as $key => $val)
-    				{
-    				    if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue;    // Not a field of current table
-    				    if ($val == 'user->id')
-    				    {
-    				        $listfields[] = preg_replace('/^'.preg_quote($alias).'\./','',$key);
-    				        $listvalues[] = $user->id;
-    				    }
-    				    elseif (preg_match('/^lastrowid-/',$val))
-    				    {
-    				        $tmp=explode('-',$val);
-    				        $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
-							$keyfield = preg_replace('/^'.preg_quote($alias).'\./','',$key);
-    				        $listfields[] = $keyfield;
+                            }
+
+                            // Test regexp
+                            if (! empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
+                            {
+                                // If test is "Must exist in a field@table"
+                                if (preg_match('/^(.*)@(.*)$/',$objimport->array_import_regex[0][$val],$reg))
+                                {
+                                    $field=$reg[1];
+                                    $table=$reg[2];
+
+                                    // Load content of field@table into cache array
+                                    if (! is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
+                                    {
+                                        $sql="SELECT ".$field." as aliasfield FROM ".$table;
+                                        $resql=$this->db->query($sql);
+                                        if ($resql)
+                                        {
+                                            $num=$this->db->num_rows($resql);
+                                            $i=0;
+                                            while ($i < $num)
+                                            {
+                                                $obj=$this->db->fetch_object($resql);
+                                                if ($obj) $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
+                                                $i++;
+                                            }
+                                        }
+                                        else
+                                        {
+                                            dol_print_error($this->db);
+                                        }
+                                    }
+
+                                    // Now we check cache is not empty (should not) and key is into cache
+                                    if (! is_array($this->cachefieldtable[$field.'@'.$table]) || ! in_array($newval,$this->cachefieldtable[$field.'@'.$table]))
+                                    {
+                                        $this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorFieldValueNotIn',$key,$newval,$field,$table);
+                                        $this->errors[$error]['type']='FOREIGNKEY';
+                                        $errorforthistable++;
+                                        $error++;
+                                    }
+                                }
+                                // If test is just a static regex
+                                else if (! preg_match('/'.$objimport->array_import_regex[0][$val].'/i',$newval))
+                                {
+                                    //if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
+                                    $this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorWrongValueForField',$key,$newval,$objimport->array_import_regex[0][$val]);
+                                    $this->errors[$error]['type']='REGEX';
+                                    $errorforthistable++;
+                                    $error++;
+                                }
+                            }
+
+                            // Other tests
+                            // ...
+                        }
+
+                        // Define $listfields and $listvalues to build SQL request
+                        $listfields[] = $fieldname;
+
+                        // Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
+                        if (empty($newval) && $arrayrecord[($key-1)]['type'] < 0)		 $listvalues[] = ($newval=='0'?$newval:"null");
+                        elseif (empty($newval) && $arrayrecord[($key-1)]['type'] == 0)	 $listvalues[] = "''";
+                        else															 $listvalues[] = "'".$this->db->escape($newval)."'";
+                    }
+                    $i++;
+                }
+
+                // We add hidden fields (but only if there is at least one field to add into table)
+                if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0]))
+                {
+                    // Loop on each hidden fields to add them into listfields/listvalues
+                    foreach($objimport->array_import_fieldshidden[0] as $key => $val)
+                    {
+                        if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue;    // Not a field of current table
+                        if ($val == 'user->id')
+                        {
+                            $listfields[] = preg_replace('/^'.preg_quote($alias).'\./','',$key);
+                            $listvalues[] = $user->id;
+                        }
+                        elseif (preg_match('/^lastrowid-/',$val))
+                        {
+                            $tmp=explode('-',$val);
+                            $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
+                            $keyfield = preg_replace('/^'.preg_quote($alias).'\./','',$key);
+                            $listfields[] = $keyfield;
                             $listvalues[] = $lastinsertid;
-    				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
-    				    }
-    				}
-				}
-				//print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
-
-				// If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
-				// so we can try to make the insert or update now.
-				if (! $errorforthistable)
-				{
-					//print "$alias/$tablename/$listfields/$listvalues<br>";
-					if (!empty($listfields))
-					{
-						$updatedone = false;
-						$insertdone = false;
-						if (!empty($updatekeys)) {
-							// We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
-
-							if (empty($lastinsertid)) {	// No insert done yet for a parent table
-								$sqlSelect = 'SELECT rowid FROM '.$tablename;
-
-								$data = array_combine($listfields, $listvalues);
-								$where = array();
-								$filters = array();
-								foreach ($updatekeys as $key) {
-									$col = $objimport->array_import_updatekeys[0][$key];
-									$key=preg_replace('/^.*\./i','',$key);
-									$where[] = $key.' = '.$data[$key];
-									$filters[] = $col.' = '.$data[$key];
-								}
-								$sqlSelect.= ' WHERE '.implode(' AND ', $where);
-
-								$resql=$this->db->query($sqlSelect);
-								if($resql) {
-									$res = $this->db->fetch_object($resql);
-									if($resql->num_rows == 1) {
-										$lastinsertid = $res->rowid;
-										$last_insert_id_array[$tablename] = $lastinsertid;
-									} else if($resql->num_rows > 1) {
-										$this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', '));
-										$this->errors[$error]['type']='SQL';
-										$error++;
-									} else {
-										// No record found with filters, insert will be tried below
-									}
-								}
-								else
-								{
-									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
-									$error++;
-								}
-							} else {
-								// We have a last INSERT ID. Check if we have a row referencing this foreign key.
-								// This is required when updating table with some extrafields. When inserting a record in parent table, we can make
-								// a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
-								// may already exists. So we rescan the extrafield table to know if record exists or not for the rowid.
-								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
-								$sqlSelect = 'SELECT rowid FROM '.$tablename;
-
-								if(empty($keyfield)) $keyfield = 'rowid';
-								$sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
-
-								$resql=$this->db->query($sqlSelect);
-								if($resql) {
-									$res = $this->db->fetch_object($resql);
-									if($resql->num_rows == 1) {
-										// We have a row referencing this last foreign key, continue with UPDATE.
-									} else {
-										// No record found referencing this last foreign key,
-										// force $lastinsertid to 0 so we INSERT below.
-										$lastinsertid = 0;
-									}
-								}
-								else
-								{
-									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
-									$error++;
-								}
-							}
-
-							if (!empty($lastinsertid)) {
-								// Build SQL UPDATE request
-								$sqlstart = 'UPDATE '.$tablename;
-
-								$data = array_combine($listfields, $listvalues);
-								$set = array();
-								foreach ($data as $key => $val) {
-									$set[] = $key.' = '.$val;
-								}
-								$sqlstart.= ' SET '.implode(', ', $set);
-
-								if(empty($keyfield)) $keyfield = 'rowid';
-								$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
-
-								$sql = $sqlstart.$sqlend;
-
-								// Run update request
-								$resql=$this->db->query($sql);
-								if($resql) {
-									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
-									$updatedone = true;
-								}
-								else
-								{
-									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
-									$error++;
-								}
-							}
-						}
-
-						// Update not done, we do insert
-						if (!$error && !$updatedone) {
-							// Build SQL INSERT request
-							$sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
-							$sqlend = ') VALUES('.implode(', ', $listvalues).", '".$importid."'";
-							if (! empty($tablewithentity_cache[$tablename])) {
-								$sqlstart.= ', entity';
-								$sqlend.= ', '.$conf->entity;
-							}
-							if (! empty($objimport->array_import_tables_creator[0][$alias])) {
-								$sqlstart.= ', '.$objimport->array_import_tables_creator[0][$alias];
-								$sqlend.=', '.$user->id;
-							}
-							$sql = $sqlstart.$sqlend.')';
-							dol_syslog("import_xlsx.modules", LOG_DEBUG);
-
-							// Run insert request
-							if ($sql)
-							{
-								$resql=$this->db->query($sql);
-								if ($resql)
-								{
-								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
-								    $insertdone = true;
-								}
-								else
-								{
-									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
-									$error++;
-								}
-							}
-						}
-					}
-					/*else
+                            //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
+                        }
+                    }
+                }
+                //print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
+
+                // If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
+                // so we can try to make the insert or update now.
+                if (! $errorforthistable)
+                {
+                    //print "$alias/$tablename/$listfields/$listvalues<br>";
+                    if (!empty($listfields))
+                    {
+                        $updatedone = false;
+                        $insertdone = false;
+                        if (!empty($updatekeys)) {
+                            // We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
+
+                            if (empty($lastinsertid)) {	// No insert done yet for a parent table
+                                $sqlSelect = 'SELECT rowid FROM '.$tablename;
+
+                                $data = array_combine($listfields, $listvalues);
+                                $where = array();
+                                $filters = array();
+                                foreach ($updatekeys as $key) {
+                                    $col = $objimport->array_import_updatekeys[0][$key];
+                                    $key=preg_replace('/^.*\./i','',$key);
+                                    $where[] = $key.' = '.$data[$key];
+                                    $filters[] = $col.' = '.$data[$key];
+                                }
+                                $sqlSelect.= ' WHERE '.implode(' AND ', $where);
+
+                                $resql=$this->db->query($sqlSelect);
+                                if($resql) {
+                                    $res = $this->db->fetch_object($resql);
+                                    if($resql->num_rows == 1) {
+                                        $lastinsertid = $res->rowid;
+                                        $last_insert_id_array[$tablename] = $lastinsertid;
+                                    } else if($resql->num_rows > 1) {
+                                        $this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', '));
+                                        $this->errors[$error]['type']='SQL';
+                                        $error++;
+                                    } else {
+                                        // No record found with filters, insert will be tried below
+                                    }
+                                }
+                                else
+                                {
+                                    //print 'E';
+                                    $this->errors[$error]['lib']=$this->db->lasterror();
+                                    $this->errors[$error]['type']='SQL';
+                                    $error++;
+                                }
+                            } else {
+                                // We have a last INSERT ID. Check if we have a row referencing this foreign key.
+                                // This is required when updating table with some extrafields. When inserting a record in parent table, we can make
+                                // a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
+                                // may already exists. So we rescan the extrafield table to know if record exists or not for the rowid.
+                                // Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
+                                $sqlSelect = 'SELECT rowid FROM '.$tablename;
+
+                                if(empty($keyfield)) $keyfield = 'rowid';
+                                $sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
+
+                                $resql=$this->db->query($sqlSelect);
+                                if($resql) {
+                                    $res = $this->db->fetch_object($resql);
+                                    if($resql->num_rows == 1) {
+                                        // We have a row referencing this last foreign key, continue with UPDATE.
+                                    } else {
+                                        // No record found referencing this last foreign key,
+                                        // force $lastinsertid to 0 so we INSERT below.
+                                        $lastinsertid = 0;
+                                    }
+                                }
+                                else
+                                {
+                                    //print 'E';
+                                    $this->errors[$error]['lib']=$this->db->lasterror();
+                                    $this->errors[$error]['type']='SQL';
+                                    $error++;
+                                }
+                            }
+
+                            if (!empty($lastinsertid)) {
+                                // Build SQL UPDATE request
+                                $sqlstart = 'UPDATE '.$tablename;
+
+                                $data = array_combine($listfields, $listvalues);
+                                $set = array();
+                                foreach ($data as $key => $val) {
+                                    $set[] = $key.' = '.$val;
+                                }
+                                $sqlstart.= ' SET '.implode(', ', $set);
+
+                                if(empty($keyfield)) $keyfield = 'rowid';
+                                $sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
+
+                                $sql = $sqlstart.$sqlend;
+
+                                // Run update request
+                                $resql=$this->db->query($sql);
+                                if($resql) {
+                                    // No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
+                                    $updatedone = true;
+                                }
+                                else
+                                {
+                                    //print 'E';
+                                    $this->errors[$error]['lib']=$this->db->lasterror();
+                                    $this->errors[$error]['type']='SQL';
+                                    $error++;
+                                }
+                            }
+                        }
+
+                        // Update not done, we do insert
+                        if (!$error && !$updatedone) {
+                            // Build SQL INSERT request
+                            $sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
+                            $sqlend = ') VALUES('.implode(', ', $listvalues).", '".$importid."'";
+                            if (! empty($tablewithentity_cache[$tablename])) {
+                                $sqlstart.= ', entity';
+                                $sqlend.= ', '.$conf->entity;
+                            }
+                            if (! empty($objimport->array_import_tables_creator[0][$alias])) {
+                                $sqlstart.= ', '.$objimport->array_import_tables_creator[0][$alias];
+                                $sqlend.=', '.$user->id;
+                            }
+                            $sql = $sqlstart.$sqlend.')';
+                            dol_syslog("import_xlsx.modules", LOG_DEBUG);
+
+                            // Run insert request
+                            if ($sql)
+                            {
+                                $resql=$this->db->query($sql);
+                                if ($resql)
+                                {
+                                    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
+                                    $insertdone = true;
+                                }
+                                else
+                                {
+                                    //print 'E';
+                                    $this->errors[$error]['lib']=$this->db->lasterror();
+                                    $this->errors[$error]['type']='SQL';
+                                    $error++;
+                                }
+                            }
+                        }
+                    }
+                    /*else
 					{
 						dol_print_error('','ErrorFieldListEmptyFor '.$alias."/".$tablename);
 					}*/
-				}
+                }
 
-			    if ($error) break;
-			}
+                if ($error) break;
+            }
 
-			if($updatedone) $this->nbupdate++;
-			if($insertdone) $this->nbinsert++;
-		}
+            if($updatedone) $this->nbupdate++;
+            if($insertdone) $this->nbinsert++;
+        }
 
-		return 1;
-	}
+        return 1;
+    }
 }

Spacing +173 added lines, -173 removed lines

@@ -25,7 +25,7 @@ 
  *		\brief      File to load import files with Excel format
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/import/modules_import.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
 
 
 /**
@@ -43,7 +43,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[] Error codes (or messages)
@@ -60,7 +60,7 @@ 
      */
     public $label;
 
-	public $extension;    // Extension of files imported by driver
+	public $extension; // Extension of files imported by driver
 
 	/**
      * Dolibarr version of driver
@@ -68,19 +68,19 @@ 
      */
 	public $version = 'dolibarr';
 
-	public $label_lib;    // Label of external lib used by driver
+	public $label_lib; // Label of external lib used by driver
 
-	public $version_lib;  // Version of external lib used by driver
+	public $version_lib; // Version of external lib used by driver
 
 	public $separator;
 
-    public $file;      // Path of file
+    public $file; // Path of file
 
-	public $handle;    // Handle fichier
+	public $handle; // Handle fichier
 
-	public $cacheconvert=array();      // Array to cache list of value found after a convertion
+	public $cacheconvert = array(); // Array to cache list of value found after a convertion
 
-	public $cachefieldtable=array();   // Array to cache list of value found into fields@tables
+	public $cachefieldtable = array(); // Array to cache list of value found into fields@tables
 
 	public $workbook; // temporary import file
 
@@ -95,33 +95,33 @@ 
 	 *	@param	DoliDB		$db				Database handler
 	 *	@param	string		$datatoimport	String code describing import set (ex: 'societe_1')
 	 */
-	function __construct($db,$datatoimport)
+	function __construct($db, $datatoimport)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 		$this->db = $db;
 
 		// this is used as an extension from the example file code, so we have to put xlsx here !!!
-		$this->id='xlsx';                // Same value as xxx in file name export_xxx.modules.php
-		$this->label='Excel 2007';             // Label of driver
-		$this->desc=$langs->trans("Excel2007FormatDesc");
-		$this->extension='xlsx';         // Extension for generated file by this driver
-		$this->picto='mime/xls';		// Picto (This is not used by the example file code as Mime type, too bad ...)
-		$this->version='1.0';         // Driver version
+		$this->id = 'xlsx'; // Same value as xxx in file name export_xxx.modules.php
+		$this->label = 'Excel 2007'; // Label of driver
+		$this->desc = $langs->trans("Excel2007FormatDesc");
+		$this->extension = 'xlsx'; // Extension for generated file by this driver
+		$this->picto = 'mime/xls'; // Picto (This is not used by the example file code as Mime type, too bad ...)
+		$this->version = '1.0'; // Driver version
 
 		// If driver use an external library, put its name here
         require_once PHPEXCEL_PATH.'PHPExcel.php';
 		require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-        if (! class_exists('ZipArchive')) // For Excel2007, PHPExcel need ZipArchive
+        if (!class_exists('ZipArchive')) // For Excel2007, PHPExcel need ZipArchive
         {
                 $langs->load("errors");
-                $this->error=$langs->trans('ErrorPHPNeedModule','zip');
+                $this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
                 return -1;
         }
-        $this->label_lib='PhpExcel';
-        $this->version_lib='1.8.0';
+        $this->label_lib = 'PhpExcel';
+        $this->version_lib = '1.8.0';
 
-		$this->datatoimport=$datatoimport;
-		if (preg_match('/^societe_/',$datatoimport)) $this->thirpartyobject=new Societe($this->db);
+		$this->datatoimport = $datatoimport;
+		if (preg_match('/^societe_/', $datatoimport)) $this->thirpartyobject = new Societe($this->db);
 	}
 
 
@@ -135,11 +135,11 @@ 
 	function write_header_example($outputlangs)
 	{
         // phpcs:enable
-        global $user,$conf,$langs;
+        global $user, $conf, $langs;
         // create a temporary object, the final output will be generated in footer
         if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
             $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
-            $cacheSettings = array (
+            $cacheSettings = array(
                 'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
             );
             PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
@@ -166,7 +166,7 @@ 
 	 *  @param	array		$headerlinefields	Array of fields name
 	 * 	@return	string
 	 */
-	function write_title_example($outputlangs,$headerlinefields)
+	function write_title_example($outputlangs, $headerlinefields)
 	{
         // phpcs:enable
 		global $conf;
@@ -174,7 +174,7 @@ 
 		$this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
 
 		$col = 0;
-		foreach($headerlinefields as $field) {
+		foreach ($headerlinefields as $field) {
 			$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($col, 1, $outputlangs->transnoentities($field));
 			// set autowidth
 			//$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($col + 1))->setAutoSize(true);
@@ -192,12 +192,12 @@ 
 	 * 	@param	array		$contentlinevalues	Array of lines
 	 * 	@return	string
 	 */
-	function write_record_example($outputlangs,$contentlinevalues)
+	function write_record_example($outputlangs, $contentlinevalues)
 	{
         // phpcs:enable
 		$col = 0;
 		$row = 2;
-		foreach($contentlinevalues as $cell) {
+		foreach ($contentlinevalues as $cell) {
 			$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($col, $row, $cell);
 			$col++;
 		}
@@ -240,7 +240,7 @@ 
 	{
         // phpcs:enable
 		global $langs;
-		$ret=1;
+		$ret = 1;
 
 		dol_syslog(get_class($this)."::open_file file=".$file);
 
@@ -287,7 +287,7 @@ 
 		// This is not called by the import code !!!
 		$this->headers = array();
 		$colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn());
-		for($col=0;$col<$colcount;$col++) {
+		for ($col = 0; $col < $colcount; $col++) {
 			$this->headers[$col] = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, 1)->getValue();
 		}
 		return 0;
@@ -306,14 +306,14 @@ 
 		global $conf;
 
 		$rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
-		if($this->record > $rowcount)
+		if ($this->record > $rowcount)
 			return false;
 		$array = array();
 		$colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn(0));
-		for($col=0;$col<$colcount;$col++) {
+		for ($col = 0; $col < $colcount; $col++) {
 			$val = $this->workbook->getActiveSheet()->getCellByColumnAndRow($col, $this->record)->getValue();
 			$array[$col]['val'] = $val;
-			$array[$col]['type'] = (dol_strlen($val)?1:-1); // If empty we consider it null
+			$array[$col]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we consider it null
 		}
 		$this->record++;
 		return $array;
@@ -346,24 +346,24 @@ 
 	 * @param	array	$updatekeys						Array of keys to use to try to do an update first before insert. This field are defined into the module descriptor.
 	 * @return	int										<0 if KO, >0 if OK
 	 */
-	function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$maxfields,$importid,$updatekeys)
+	function import_insert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys)
 	{
         // phpcs:enable
-		global $langs,$conf,$user;
-        global $thirdparty_static;    	// Specific to thirdparty import
-		global $tablewithentity_cache;	// Cache to avoid to call  desc at each rows on tables
+		global $langs, $conf, $user;
+        global $thirdparty_static; // Specific to thirdparty import
+		global $tablewithentity_cache; // Cache to avoid to call  desc at each rows on tables
 
-		$error=0;
-		$warning=0;
-		$this->errors=array();
-		$this->warnings=array();
+		$error = 0;
+		$warning = 0;
+		$this->errors = array();
+		$this->warnings = array();
 
 		//dol_syslog("import_csv.modules maxfields=".$maxfields." importid=".$importid);
 
 		//var_dump($array_match_file_to_database);
 		//var_dump($arrayrecord);
-		$array_match_database_to_file=array_flip($array_match_file_to_database);
-		$sort_array_match_file_to_database=$array_match_file_to_database;
+		$array_match_database_to_file = array_flip($array_match_file_to_database);
+		$sort_array_match_file_to_database = $array_match_file_to_database;
 		ksort($sort_array_match_file_to_database);
 
 		//var_dump($sort_array_match_file_to_database);
@@ -371,8 +371,8 @@ 
 		if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val'])))
 		{
 			//print 'W';
-			$this->warnings[$warning]['lib']=$langs->trans('EmptyLine');
-			$this->warnings[$warning]['type']='EMPTY';
+			$this->warnings[$warning]['lib'] = $langs->trans('EmptyLine');
+			$this->warnings[$warning]['type'] = 'EMPTY';
 			$warning++;
 		}
 		else
@@ -381,25 +381,25 @@ 
 			$updatedone = false;
 			$insertdone = false;
 			// For each table to insert, me make a separate insert
-			foreach($objimport->array_import_tables[0] as $alias => $tablename)
+			foreach ($objimport->array_import_tables[0] as $alias => $tablename)
 			{
 				// Build sql request
-				$sql='';
-				$listfields=array();
-				$listvalues=array();
-				$i=0;
-				$errorforthistable=0;
+				$sql = '';
+				$listfields = array();
+				$listvalues = array();
+				$i = 0;
+				$errorforthistable = 0;
 
 				// Define $tablewithentity_cache[$tablename] if not already defined
-				if (! isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
+				if (!isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
 				{
 					dol_syslog("Check if table ".$tablename." has an entity field");
-					$resql=$this->db->DDLDescTable($tablename,'entity');
+					$resql = $this->db->DDLDescTable($tablename, 'entity');
 					if ($resql)
 					{
-						$obj=$this->db->fetch_object($resql);
-						if ($obj) $tablewithentity_cache[$tablename]=1;		// table contains entity field
-						else $tablewithentity_cache[$tablename]=0;			// table does not contains entity field
+						$obj = $this->db->fetch_object($resql);
+						if ($obj) $tablewithentity_cache[$tablename] = 1; // table contains entity field
+						else $tablewithentity_cache[$tablename] = 0; // table does not contains entity field
 					}
 					else dol_print_error($this->db);
 				}
@@ -410,26 +410,26 @@ 
 
 
 				// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
-				foreach($sort_array_match_file_to_database as $key => $val)
+				foreach ($sort_array_match_file_to_database as $key => $val)
 				{
-				    $fieldalias=preg_replace('/\..*$/i','',$val);
-				    $fieldname=preg_replace('/^.*\./i','',$val);
+				    $fieldalias = preg_replace('/\..*$/i', '', $val);
+				    $fieldname = preg_replace('/^.*\./i', '', $val);
 
-				    if ($alias != $fieldalias) continue;    // Not a field of current table
+				    if ($alias != $fieldalias) continue; // Not a field of current table
 
 					if ($key <= $maxfields)
 					{
 						// Set $newval with value to insert and set $listvalues with sql request part for insert
-						$newval='';
-						if ($arrayrecord[($key-1)]['type'] > 0) $newval=$arrayrecord[($key-1)]['val'];    // If type of field into input file is not empty string (so defined into input file), we get value
+						$newval = '';
+						if ($arrayrecord[($key - 1)]['type'] > 0) $newval = $arrayrecord[($key - 1)]['val']; // If type of field into input file is not empty string (so defined into input file), we get value
 
 						// Make some tests on $newval
 
 						// Is it a required field ?
-						if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ((string) $newval==''))
+						if (preg_match('/\*/', $objimport->array_import_fields[0][$val]) && ((string) $newval == ''))
 						{
-							$this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key);
-							$this->errors[$error]['type']='NOTNULL';
+							$this->errors[$error]['lib'] = $langs->trans('ErrorMissingMandatoryValue', $key);
+							$this->errors[$error]['type'] = 'NOTNULL';
 							$errorforthistable++;
 							$error++;
 						}
@@ -437,28 +437,28 @@ 
 						else
 						{
 						    // We convert field if required
-						    if (! empty($objimport->array_import_convertvalue[0][$val]))
+						    if (!empty($objimport->array_import_convertvalue[0][$val]))
 						    {
                                 //print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
-                                if ($objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeid'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromref'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel'
+                                if ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
+                                	|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref'
+                                	|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel'
                                 	)
                                 {
                                     // New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
-                                    $isidorref='id';
-                                    if (! is_numeric($newval) && $newval != '' && ! preg_match('/^id:/i',$newval)) $isidorref='ref';
-                                    $newval=preg_replace('/^(id|ref):/i','',$newval);    // Remove id: or ref: that was used to force if field is id or ref
+                                    $isidorref = 'id';
+                                    if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
+                                    $newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
                                     //print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
 
                                     if ($isidorref == 'ref')    // If value into input import file is a ref, we apply the function defined into descriptor
                                     {
-                                        $file=(empty($objimport->array_import_convertvalue[0][$val]['classfile'])?$objimport->array_import_convertvalue[0][$val]['file']:$objimport->array_import_convertvalue[0][$val]['classfile']);
-                                        $class=$objimport->array_import_convertvalue[0][$val]['class'];
-                                        $method=$objimport->array_import_convertvalue[0][$val]['method'];
+                                        $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+                                        $class = $objimport->array_import_convertvalue[0][$val]['class'];
+                                        $method = $objimport->array_import_convertvalue[0][$val]['method'];
                                         if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
-                                        	$newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
+                                        	$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
                                         }
                                         else
 										{
@@ -468,94 +468,94 @@ 
                                                 dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
                                                 break;
                                             }
-                                            $classinstance=new $class($this->db);
+                                            $classinstance = new $class($this->db);
                                             // Try the fetch from code or ref
-                                            call_user_func_array(array($classinstance, $method),array('', $newval));
+                                            call_user_func_array(array($classinstance, $method), array('', $newval));
                                             // If not found, try the fetch from label
-                                            if (! ($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule']=='fetchidfromcodeorlabel')
+                                            if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel')
                                             {
-												call_user_func_array(array($classinstance, $method),array('', '', $newval));
+												call_user_func_array(array($classinstance, $method), array('', '', $newval));
                                             }
-                                            $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval]=$classinstance->id;
+                                            $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] = $classinstance->id;
                                             //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
                                             if ($classinstance->id != '')	// id may be 0, it is a found value
                                             {
-                                                $newval=$classinstance->id;
+                                                $newval = $classinstance->id;
                                             }
                                             else
                                             {
-                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldValueNotIn',$key,$newval,'code',$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                                else if (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldRefNotIn',$key,$newval,$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
-                                                else $this->errors[$error]['lib']='ErrorFieldValueNotIn';
-                                                $this->errors[$error]['type']='FOREIGNKEY';
+                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+                                                else if (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
+                                                else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+                                                $this->errors[$error]['type'] = 'FOREIGNKEY';
                                                 $errorforthistable++;
                                                 $error++;
                                             }
                                         }
                                     }
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='zeroifnull')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
                                 {
-                                    if (empty($newval)) $newval='0';
+                                    if (empty($newval)) $newval = '0';
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
-                                        $this->thirpartyobject->get_codeclient(0,0);
-                                        $newval=$this->thirpartyobject->code_client;
+                                        $this->thirpartyobject->get_codeclient(0, 0);
+                                        $newval = $this->thirpartyobject->code_client;
                                         //print 'code_client='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsuppliercodeifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
-                                        $newval=$this->thirpartyobject->get_codefournisseur(0,1);
-                                        $newval=$this->thirpartyobject->code_fournisseur;
+                                        $newval = $this->thirpartyobject->get_codefournisseur(0, 1);
+                                        $newval = $this->thirpartyobject->code_fournisseur;
                                         //print 'code_fournisseur='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomeraccountancycodeifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
                                         $this->thirpartyobject->get_codecompta('customer');
-                                        $newval=$this->thirpartyobject->code_compta;
+                                        $newval = $this->thirpartyobject->code_compta;
                                         //print 'code_compta='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsupplieraccountancycodeifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
                                         $this->thirpartyobject->get_codecompta('supplier');
-                                        $newval=$this->thirpartyobject->code_compta_fournisseur;
-                                        if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                        $newval = $this->thirpartyobject->code_compta_fournisseur;
+                                        if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                         //print 'code_compta_fournisseur='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
                                 }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getrefifauto')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto')
                                 {
-                                    $defaultref='';
+                                    $defaultref = '';
                                     // TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
-                                    $obj = empty($conf->global->PROJECT_TASK_ADDON)?'mod_task_simple':$conf->global->PROJECT_TASK_ADDON;
-                                    if (! empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
+                                    $obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
+                                    if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
                                     {
-                                        require_once DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
+                                        require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
                                         $modTask = new $obj;
-                                        $defaultref = $modTask->getNextValue(null,null);
+                                        $defaultref = $modTask->getNextValue(null, null);
                                     }
-                                    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
-                                    $newval=$defaultref;
+                                    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
+                                    $newval = $defaultref;
                                 }
 
 
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
                                 {
                                     $newval = price2num($newval);
                                 }
@@ -564,27 +564,27 @@ 
 						    }
 
 						    // Test regexp
-							if (! empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
+							if (!empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
 							{
 								// If test is "Must exist in a field@table"
-								if (preg_match('/^(.*)@(.*)$/',$objimport->array_import_regex[0][$val],$reg))
+								if (preg_match('/^(.*)@(.*)$/', $objimport->array_import_regex[0][$val], $reg))
 								{
-									$field=$reg[1];
-									$table=$reg[2];
+									$field = $reg[1];
+									$table = $reg[2];
 
 									// Load content of field@table into cache array
-									if (! is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
+									if (!is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
 									{
-										$sql="SELECT ".$field." as aliasfield FROM ".$table;
-										$resql=$this->db->query($sql);
+										$sql = "SELECT ".$field." as aliasfield FROM ".$table;
+										$resql = $this->db->query($sql);
 										if ($resql)
 										{
-											$num=$this->db->num_rows($resql);
-											$i=0;
+											$num = $this->db->num_rows($resql);
+											$i = 0;
 											while ($i < $num)
 											{
-												$obj=$this->db->fetch_object($resql);
-												if ($obj) $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
+												$obj = $this->db->fetch_object($resql);
+												if ($obj) $this->cachefieldtable[$field.'@'.$table][] = $obj->aliasfield;
 												$i++;
 											}
 										}
@@ -595,20 +595,20 @@ 
 									}
 
 									// Now we check cache is not empty (should not) and key is into cache
-									if (! is_array($this->cachefieldtable[$field.'@'.$table]) || ! in_array($newval,$this->cachefieldtable[$field.'@'.$table]))
+									if (!is_array($this->cachefieldtable[$field.'@'.$table]) || !in_array($newval, $this->cachefieldtable[$field.'@'.$table]))
 									{
-										$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorFieldValueNotIn',$key,$newval,$field,$table);
-										$this->errors[$error]['type']='FOREIGNKEY';
+										$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $table);
+										$this->errors[$error]['type'] = 'FOREIGNKEY';
 									    $errorforthistable++;
 										$error++;
 									}
 								}
 								// If test is just a static regex
-								else if (! preg_match('/'.$objimport->array_import_regex[0][$val].'/i',$newval))
+								else if (!preg_match('/'.$objimport->array_import_regex[0][$val].'/i', $newval))
 								{
 								    //if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
-									$this->errors[$error]['lib']=$langs->transnoentitiesnoconv('ErrorWrongValueForField',$key,$newval,$objimport->array_import_regex[0][$val]);
-									$this->errors[$error]['type']='REGEX';
+									$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorWrongValueForField', $key, $newval, $objimport->array_import_regex[0][$val]);
+									$this->errors[$error]['type'] = 'REGEX';
 									$errorforthistable++;
 									$error++;
 								}
@@ -622,8 +622,8 @@ 
 						$listfields[] = $fieldname;
 
 						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
-						if (empty($newval) && $arrayrecord[($key-1)]['type'] < 0)		 $listvalues[] = ($newval=='0'?$newval:"null");
-						elseif (empty($newval) && $arrayrecord[($key-1)]['type'] == 0)	 $listvalues[] = "''";
+						if (empty($newval) && $arrayrecord[($key - 1)]['type'] < 0)		 $listvalues[] = ($newval == '0' ? $newval : "null");
+						elseif (empty($newval) && $arrayrecord[($key - 1)]['type'] == 0)	 $listvalues[] = "''";
 						else															 $listvalues[] = "'".$this->db->escape($newval)."'";
 					}
 					$i++;
@@ -633,19 +633,19 @@ 
 				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0]))
 				{
     				// Loop on each hidden fields to add them into listfields/listvalues
-				    foreach($objimport->array_import_fieldshidden[0] as $key => $val)
+				    foreach ($objimport->array_import_fieldshidden[0] as $key => $val)
     				{
-    				    if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue;    // Not a field of current table
+    				    if (!preg_match('/^'.preg_quote($alias).'\./', $key)) continue; // Not a field of current table
     				    if ($val == 'user->id')
     				    {
-    				        $listfields[] = preg_replace('/^'.preg_quote($alias).'\./','',$key);
+    				        $listfields[] = preg_replace('/^'.preg_quote($alias).'\./', '', $key);
     				        $listvalues[] = $user->id;
     				    }
-    				    elseif (preg_match('/^lastrowid-/',$val))
+    				    elseif (preg_match('/^lastrowid-/', $val))
     				    {
-    				        $tmp=explode('-',$val);
-    				        $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
-							$keyfield = preg_replace('/^'.preg_quote($alias).'\./','',$key);
+    				        $tmp = explode('-', $val);
+    				        $lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
+							$keyfield = preg_replace('/^'.preg_quote($alias).'\./', '', $key);
     				        $listfields[] = $keyfield;
                             $listvalues[] = $lastinsertid;
     				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
@@ -656,7 +656,7 @@ 
 
 				// If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
 				// so we can try to make the insert or update now.
-				if (! $errorforthistable)
+				if (!$errorforthistable)
 				{
 					//print "$alias/$tablename/$listfields/$listvalues<br>";
 					if (!empty($listfields))
@@ -674,21 +674,21 @@ 
 								$filters = array();
 								foreach ($updatekeys as $key) {
 									$col = $objimport->array_import_updatekeys[0][$key];
-									$key=preg_replace('/^.*\./i','',$key);
+									$key = preg_replace('/^.*\./i', '', $key);
 									$where[] = $key.' = '.$data[$key];
 									$filters[] = $col.' = '.$data[$key];
 								}
-								$sqlSelect.= ' WHERE '.implode(' AND ', $where);
+								$sqlSelect .= ' WHERE '.implode(' AND ', $where);
 
-								$resql=$this->db->query($sqlSelect);
-								if($resql) {
+								$resql = $this->db->query($sqlSelect);
+								if ($resql) {
 									$res = $this->db->fetch_object($resql);
-									if($resql->num_rows == 1) {
+									if ($resql->num_rows == 1) {
 										$lastinsertid = $res->rowid;
 										$last_insert_id_array[$tablename] = $lastinsertid;
-									} else if($resql->num_rows > 1) {
-										$this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', '));
-										$this->errors[$error]['type']='SQL';
+									} else if ($resql->num_rows > 1) {
+										$this->errors[$error]['lib'] = $langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', '));
+										$this->errors[$error]['type'] = 'SQL';
 										$error++;
 									} else {
 										// No record found with filters, insert will be tried below
@@ -697,8 +697,8 @@ 
 								else
 								{
 									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
+									$this->errors[$error]['lib'] = $this->db->lasterror();
+									$this->errors[$error]['type'] = 'SQL';
 									$error++;
 								}
 							} else {
@@ -709,13 +709,13 @@ 
 								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
 								$sqlSelect = 'SELECT rowid FROM '.$tablename;
 
-								if(empty($keyfield)) $keyfield = 'rowid';
+								if (empty($keyfield)) $keyfield = 'rowid';
 								$sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
 
-								$resql=$this->db->query($sqlSelect);
-								if($resql) {
+								$resql = $this->db->query($sqlSelect);
+								if ($resql) {
 									$res = $this->db->fetch_object($resql);
-									if($resql->num_rows == 1) {
+									if ($resql->num_rows == 1) {
 										// We have a row referencing this last foreign key, continue with UPDATE.
 									} else {
 										// No record found referencing this last foreign key,
@@ -726,8 +726,8 @@ 
 								else
 								{
 									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
+									$this->errors[$error]['lib'] = $this->db->lasterror();
+									$this->errors[$error]['type'] = 'SQL';
 									$error++;
 								}
 							}
@@ -741,24 +741,24 @@ 
 								foreach ($data as $key => $val) {
 									$set[] = $key.' = '.$val;
 								}
-								$sqlstart.= ' SET '.implode(', ', $set);
+								$sqlstart .= ' SET '.implode(', ', $set);
 
-								if(empty($keyfield)) $keyfield = 'rowid';
+								if (empty($keyfield)) $keyfield = 'rowid';
 								$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
 
 								$sql = $sqlstart.$sqlend;
 
 								// Run update request
-								$resql=$this->db->query($sql);
-								if($resql) {
+								$resql = $this->db->query($sql);
+								if ($resql) {
 									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
 									$updatedone = true;
 								}
 								else
 								{
 									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
+									$this->errors[$error]['lib'] = $this->db->lasterror();
+									$this->errors[$error]['type'] = 'SQL';
 									$error++;
 								}
 							}
@@ -769,13 +769,13 @@ 
 							// Build SQL INSERT request
 							$sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
 							$sqlend = ') VALUES('.implode(', ', $listvalues).", '".$importid."'";
-							if (! empty($tablewithentity_cache[$tablename])) {
-								$sqlstart.= ', entity';
-								$sqlend.= ', '.$conf->entity;
+							if (!empty($tablewithentity_cache[$tablename])) {
+								$sqlstart .= ', entity';
+								$sqlend .= ', '.$conf->entity;
 							}
-							if (! empty($objimport->array_import_tables_creator[0][$alias])) {
-								$sqlstart.= ', '.$objimport->array_import_tables_creator[0][$alias];
-								$sqlend.=', '.$user->id;
+							if (!empty($objimport->array_import_tables_creator[0][$alias])) {
+								$sqlstart .= ', '.$objimport->array_import_tables_creator[0][$alias];
+								$sqlend .= ', '.$user->id;
 							}
 							$sql = $sqlstart.$sqlend.')';
 							dol_syslog("import_xlsx.modules", LOG_DEBUG);
@@ -783,7 +783,7 @@ 
 							// Run insert request
 							if ($sql)
 							{
-								$resql=$this->db->query($sql);
+								$resql = $this->db->query($sql);
 								if ($resql)
 								{
 								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
@@ -792,8 +792,8 @@ 
 								else
 								{
 									//print 'E';
-									$this->errors[$error]['lib']=$this->db->lasterror();
-									$this->errors[$error]['type']='SQL';
+									$this->errors[$error]['lib'] = $this->db->lasterror();
+									$this->errors[$error]['type'] = 'SQL';
 									$error++;
 								}
 							}
@@ -808,8 +808,8 @@ 
 			    if ($error) break;
 			}
 
-			if($updatedone) $this->nbupdate++;
-			if($insertdone) $this->nbinsert++;
+			if ($updatedone) $this->nbupdate++;
+			if ($insertdone) $this->nbinsert++;
 		}
 
 		return 1;

Braces +120 added lines, -69 removed lines

@@ -111,9 +111,11 @@ 
 		// If driver use an external library, put its name here
         require_once PHPEXCEL_PATH.'PHPExcel.php';
 		require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-        if (! class_exists('ZipArchive')) // For Excel2007, PHPExcel need ZipArchive
+        if (! class_exists('ZipArchive')) {
+            // For Excel2007, PHPExcel need ZipArchive
         {
                 $langs->load("errors");
+        }
                 $this->error=$langs->trans('ErrorPHPNeedModule','zip');
                 return -1;
         }
@@ -121,7 +123,9 @@ 
         $this->version_lib='1.8.0';
 
 		$this->datatoimport=$datatoimport;
-		if (preg_match('/^societe_/',$datatoimport)) $this->thirpartyobject=new Societe($this->db);
+		if (preg_match('/^societe_/',$datatoimport)) {
+		    $this->thirpartyobject=new Societe($this->db);
+		}
 	}
 
 
@@ -306,8 +310,9 @@ 
 		global $conf;
 
 		$rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
-		if($this->record > $rowcount)
-			return false;
+		if($this->record > $rowcount) {
+					return false;
+		}
 		$array = array();
 		$colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn(0));
 		for($col=0;$col<$colcount;$col++) {
@@ -374,8 +379,7 @@ 
 			$this->warnings[$warning]['lib']=$langs->trans('EmptyLine');
 			$this->warnings[$warning]['type']='EMPTY';
 			$warning++;
-		}
-		else
+		} else
 		{
 			$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
 			$updatedone = false;
@@ -391,19 +395,27 @@ 
 				$errorforthistable=0;
 
 				// Define $tablewithentity_cache[$tablename] if not already defined
-				if (! isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
+				if (! isset($tablewithentity_cache[$tablename])) {
+				    // keep this test with "isset"
 				{
 					dol_syslog("Check if table ".$tablename." has an entity field");
+				}
 					$resql=$this->db->DDLDescTable($tablename,'entity');
 					if ($resql)
 					{
 						$obj=$this->db->fetch_object($resql);
-						if ($obj) $tablewithentity_cache[$tablename]=1;		// table contains entity field
-						else $tablewithentity_cache[$tablename]=0;			// table does not contains entity field
+						if ($obj) {
+						    $tablewithentity_cache[$tablename]=1;
+						}
+						// table contains entity field
+						else {
+						    $tablewithentity_cache[$tablename]=0;
+						}
+						// table does not contains entity field
+					} else {
+					    dol_print_error($this->db);
 					}
-					else dol_print_error($this->db);
-				}
-				else
+				} else
 				{
 					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
@@ -415,13 +427,19 @@ 
 				    $fieldalias=preg_replace('/\..*$/i','',$val);
 				    $fieldname=preg_replace('/^.*\./i','',$val);
 
-				    if ($alias != $fieldalias) continue;    // Not a field of current table
+				    if ($alias != $fieldalias) {
+				        continue;
+				    }
+				    // Not a field of current table
 
 					if ($key <= $maxfields)
 					{
 						// Set $newval with value to insert and set $listvalues with sql request part for insert
 						$newval='';
-						if ($arrayrecord[($key-1)]['type'] > 0) $newval=$arrayrecord[($key-1)]['val'];    // If type of field into input file is not empty string (so defined into input file), we get value
+						if ($arrayrecord[($key-1)]['type'] > 0) {
+						    $newval=$arrayrecord[($key-1)]['val'];
+						}
+						// If type of field into input file is not empty string (so defined into input file), we get value
 
 						// Make some tests on $newval
 
@@ -447,20 +465,23 @@ 
                                 {
                                     // New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
                                     $isidorref='id';
-                                    if (! is_numeric($newval) && $newval != '' && ! preg_match('/^id:/i',$newval)) $isidorref='ref';
+                                    if (! is_numeric($newval) && $newval != '' && ! preg_match('/^id:/i',$newval)) {
+                                        $isidorref='ref';
+                                    }
                                     $newval=preg_replace('/^(id|ref):/i','',$newval);    // Remove id: or ref: that was used to force if field is id or ref
                                     //print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
 
-                                    if ($isidorref == 'ref')    // If value into input import file is a ref, we apply the function defined into descriptor
+                                    if ($isidorref == 'ref') {
+                                        // If value into input import file is a ref, we apply the function defined into descriptor
                                     {
                                         $file=(empty($objimport->array_import_convertvalue[0][$val]['classfile'])?$objimport->array_import_convertvalue[0][$val]['file']:$objimport->array_import_convertvalue[0][$val]['classfile']);
+                                    }
                                         $class=$objimport->array_import_convertvalue[0][$val]['class'];
                                         $method=$objimport->array_import_convertvalue[0][$val]['method'];
                                         if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
                                         	$newval=$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
-                                        }
-                                        else
+                                        } else
 										{
                                             $resultload = dol_include_once($file);
                                             if (empty($resultload))
@@ -478,27 +499,32 @@ 
                                             }
                                             $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval]=$classinstance->id;
                                             //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
-                                            if ($classinstance->id != '')	// id may be 0, it is a found value
+                                            if ($classinstance->id != '') {
+                                                // id may be 0, it is a found value
                                             {
                                                 $newval=$classinstance->id;
                                             }
-                                            else
+                                            } else
                                             {
-                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldValueNotIn',$key,$newval,'code',$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                                else if (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldRefNotIn',$key,$newval,$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
-                                                else $this->errors[$error]['lib']='ErrorFieldValueNotIn';
+                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
+                                                    $this->errors[$error]['lib']=$langs->trans('ErrorFieldValueNotIn',$key,$newval,'code',$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+                                                } else if (!empty($objimport->array_import_convertvalue[0][$val]['element'])) {
+                                                    $this->errors[$error]['lib']=$langs->trans('ErrorFieldRefNotIn',$key,$newval,$langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
+                                                } else {
+                                                    $this->errors[$error]['lib']='ErrorFieldValueNotIn';
+                                                }
                                                 $this->errors[$error]['type']='FOREIGNKEY';
                                                 $errorforthistable++;
                                                 $error++;
                                             }
                                         }
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='zeroifnull')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='zeroifnull')
                                 {
-                                    if (empty($newval)) $newval='0';
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifauto')
+                                    if (empty($newval)) {
+                                        $newval='0';
+                                    }
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -506,9 +532,11 @@ 
                                         $newval=$this->thirpartyobject->code_client;
                                         //print 'code_client='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsuppliercodeifauto')
+                                    if (empty($newval)) {
+                                        $arrayrecord[($key-1)]['type']=-1;
+                                    }
+                                    // If we get empty value, we will use "null"
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsuppliercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -516,9 +544,11 @@ 
                                         $newval=$this->thirpartyobject->code_fournisseur;
                                         //print 'code_fournisseur='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomeraccountancycodeifauto')
+                                    if (empty($newval)) {
+                                        $arrayrecord[($key-1)]['type']=-1;
+                                    }
+                                    // If we get empty value, we will use "null"
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomeraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -526,20 +556,27 @@ 
                                         $newval=$this->thirpartyobject->code_compta;
                                         //print 'code_compta='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsupplieraccountancycodeifauto')
+                                    if (empty($newval)) {
+                                        $arrayrecord[($key-1)]['type']=-1;
+                                    }
+                                    // If we get empty value, we will use "null"
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsupplieraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
                                         $this->thirpartyobject->get_codecompta('supplier');
                                         $newval=$this->thirpartyobject->code_compta_fournisseur;
-                                        if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
+                                        if (empty($newval)) {
+                                            $arrayrecord[($key-1)]['type']=-1;
+                                        }
+                                        // If we get empty value, we will use "null"
                                         //print 'code_compta_fournisseur='.$newval;
                                     }
-                                    if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getrefifauto')
+                                    if (empty($newval)) {
+                                        $arrayrecord[($key-1)]['type']=-1;
+                                    }
+                                    // If we get empty value, we will use "null"
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getrefifauto')
                                 {
                                     $defaultref='';
                                     // TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
@@ -550,12 +587,11 @@ 
                                         $modTask = new $obj;
                                         $defaultref = $modTask->getNextValue(null,null);
                                     }
-                                    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
+                                    if (is_numeric($defaultref) && $defaultref <= 0) {
+                                        $defaultref='';
+                                    }
                                     $newval=$defaultref;
-                                }
-
-
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
                                 {
                                     $newval = price2num($newval);
                                 }
@@ -573,9 +609,11 @@ 
 									$table=$reg[2];
 
 									// Load content of field@table into cache array
-									if (! is_array($this->cachefieldtable[$field.'@'.$table])) // If content of field@table not already loaded into cache
+									if (! is_array($this->cachefieldtable[$field.'@'.$table])) {
+									    // If content of field@table not already loaded into cache
 									{
 										$sql="SELECT ".$field." as aliasfield FROM ".$table;
+									}
 										$resql=$this->db->query($sql);
 										if ($resql)
 										{
@@ -584,11 +622,12 @@ 
 											while ($i < $num)
 											{
 												$obj=$this->db->fetch_object($resql);
-												if ($obj) $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
+												if ($obj) {
+												    $this->cachefieldtable[$field.'@'.$table][]=$obj->aliasfield;
+												}
 												$i++;
 											}
-										}
-										else
+										} else
 										{
 											dol_print_error($this->db);
 										}
@@ -622,9 +661,13 @@ 
 						$listfields[] = $fieldname;
 
 						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
-						if (empty($newval) && $arrayrecord[($key-1)]['type'] < 0)		 $listvalues[] = ($newval=='0'?$newval:"null");
-						elseif (empty($newval) && $arrayrecord[($key-1)]['type'] == 0)	 $listvalues[] = "''";
-						else															 $listvalues[] = "'".$this->db->escape($newval)."'";
+						if (empty($newval) && $arrayrecord[($key-1)]['type'] < 0) {
+						    $listvalues[] = ($newval=='0'?$newval:"null");
+						} elseif (empty($newval) && $arrayrecord[($key-1)]['type'] == 0) {
+						    $listvalues[] = "''";
+						} else {
+						    $listvalues[] = "'".$this->db->escape($newval)."'";
+						}
 					}
 					$i++;
 				}
@@ -635,13 +678,15 @@ 
     				// Loop on each hidden fields to add them into listfields/listvalues
 				    foreach($objimport->array_import_fieldshidden[0] as $key => $val)
     				{
-    				    if (! preg_match('/^'.preg_quote($alias).'\./', $key)) continue;    // Not a field of current table
+    				    if (! preg_match('/^'.preg_quote($alias).'\./', $key)) {
+    				        continue;
+    				    }
+    				    // Not a field of current table
     				    if ($val == 'user->id')
     				    {
     				        $listfields[] = preg_replace('/^'.preg_quote($alias).'\./','',$key);
     				        $listvalues[] = $user->id;
-    				    }
-    				    elseif (preg_match('/^lastrowid-/',$val))
+    				    } elseif (preg_match('/^lastrowid-/',$val))
     				    {
     				        $tmp=explode('-',$val);
     				        $lastinsertid=(isset($last_insert_id_array[$tmp[1]]))?$last_insert_id_array[$tmp[1]]:0;
@@ -693,8 +738,7 @@ 
 									} else {
 										// No record found with filters, insert will be tried below
 									}
-								}
-								else
+								} else
 								{
 									//print 'E';
 									$this->errors[$error]['lib']=$this->db->lasterror();
@@ -709,7 +753,9 @@ 
 								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
 								$sqlSelect = 'SELECT rowid FROM '.$tablename;
 
-								if(empty($keyfield)) $keyfield = 'rowid';
+								if(empty($keyfield)) {
+								    $keyfield = 'rowid';
+								}
 								$sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
 
 								$resql=$this->db->query($sqlSelect);
@@ -722,8 +768,7 @@ 
 										// force $lastinsertid to 0 so we INSERT below.
 										$lastinsertid = 0;
 									}
-								}
-								else
+								} else
 								{
 									//print 'E';
 									$this->errors[$error]['lib']=$this->db->lasterror();
@@ -743,7 +788,9 @@ 
 								}
 								$sqlstart.= ' SET '.implode(', ', $set);
 
-								if(empty($keyfield)) $keyfield = 'rowid';
+								if(empty($keyfield)) {
+								    $keyfield = 'rowid';
+								}
 								$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
 
 								$sql = $sqlstart.$sqlend;
@@ -753,8 +800,7 @@ 
 								if($resql) {
 									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
 									$updatedone = true;
-								}
-								else
+								} else
 								{
 									//print 'E';
 									$this->errors[$error]['lib']=$this->db->lasterror();
@@ -788,8 +834,7 @@ 
 								{
 								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
 								    $insertdone = true;
-								}
-								else
+								} else
 								{
 									//print 'E';
 									$this->errors[$error]['lib']=$this->db->lasterror();
@@ -805,11 +850,17 @@ 
 					}*/
 				}
 
-			    if ($error) break;
+			    if ($error) {
+			        break;
+			    }
 			}
 
-			if($updatedone) $this->nbupdate++;
-			if($insertdone) $this->nbinsert++;
+			if($updatedone) {
+			    $this->nbupdate++;
+			}
+			if($insertdone) {
+			    $this->nbinsert++;
+			}
 		}
 
 		return 1;