alxarafe / alixar

dolibarr/htdocs/core/modules/project/doc/pdf_timespent.modules.php

Indentation +503 added lines, -503 removed lines

@@ -37,125 +37,125 @@ 
 
 class pdf_timespent extends ModelePDFProjects
 {
-	/**
-	 * Issuer
-	 * @var Societe
-	 */
-	public $emetteur;
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf,$langs,$mysoc;
-
-		// Translations
-		$langs->loadLangs(array("main", "projects", "companies"));
-
-		$this->db = $db;
-		$this->name = "timespent";
-		$this->description = $langs->trans("DocumentModelTimeSpent");
-
-		// 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 FAC_PDF_LOGO
-		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_codeproduitservice = 1;      // Affiche code produit-service
-
-		// Recupere emmetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
-
-		// Defini position des colonnes
-		$this->posxref=$this->marge_gauche+1;
-		$this->posxlabel=$this->marge_gauche+25;
-		$this->posxtimespent=$this->marge_gauche+120;
-		//$this->posxprogress=$this->marge_gauche+140;
-		$this->posxdatestart=$this->marge_gauche+152;
-		$this->posxdateend=$this->marge_gauche+170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
-			$this->posxref-=20;
-			$this->posxlabel-=20;
-			$this->posxtimespent-=20;
-			//$this->posxprogress-=20;
-			$this->posxdatestart-=20;
-			$this->posxdateend-=20;
-		}
-	}
+    /**
+     * Issuer
+     * @var Societe
+     */
+    public $emetteur;
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf,$langs,$mysoc;
+
+        // Translations
+        $langs->loadLangs(array("main", "projects", "companies"));
+
+        $this->db = $db;
+        $this->name = "timespent";
+        $this->description = $langs->trans("DocumentModelTimeSpent");
+
+        // 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 FAC_PDF_LOGO
+        $this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
+        $this->option_codeproduitservice = 1;      // Affiche code produit-service
+
+        // Recupere emmetteur
+        $this->emetteur=$mysoc;
+        if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+
+        // Defini position des colonnes
+        $this->posxref=$this->marge_gauche+1;
+        $this->posxlabel=$this->marge_gauche+25;
+        $this->posxtimespent=$this->marge_gauche+120;
+        //$this->posxprogress=$this->marge_gauche+140;
+        $this->posxdatestart=$this->marge_gauche+152;
+        $this->posxdateend=$this->marge_gauche+170;
+        if ($this->page_largeur < 210) // To work with US executive format
+        {
+            $this->posxref-=20;
+            $this->posxlabel-=20;
+            $this->posxtimespent-=20;
+            //$this->posxprogress-=20;
+            $this->posxdatestart-=20;
+            $this->posxdateend-=20;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Fonction generant le projet sur le disque
-	 *
-	 *	@param	Project		$object   		Object project a generer
-	 *	@param	Translate	$outputlangs	Lang output object
-	 *	@return	int         				1 if OK, <=0 if KO
-	 */
-	function write_file($object,$outputlangs)
-	{
+    /**
+     *	Fonction generant le projet sur le disque
+     *
+     *	@param	Project		$object   		Object project a generer
+     *	@param	Translate	$outputlangs	Lang output object
+     *	@return	int         				1 if OK, <=0 if KO
+     */
+    function write_file($object,$outputlangs)
+    {
         // phpcs:enable
-		global $conf, $hookmanager, $langs, $user;
-
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-
-		// Load traductions files requiredby by page
-		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
-
-		if ($conf->projet->dir_output)
-		{
-			//$nblignes = count($object->lines);  // This is set later with array of tasks
-
-			$objectref = dol_sanitizeFileName($object->ref);
-			$dir = $conf->projet->dir_output;
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $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
-				$pdf->SetAutoPageBreak(1,0);
-
-				$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 + 8;	// Height reserved to output the footer (value include bottom margin)
+        global $conf, $hookmanager, $langs, $user;
+
+        if (! is_object($outputlangs)) $outputlangs=$langs;
+        // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+        if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+
+        // Load traductions files requiredby by page
+        $outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
+
+        if ($conf->projet->dir_output)
+        {
+            //$nblignes = count($object->lines);  // This is set later with array of tasks
+
+            $objectref = dol_sanitizeFileName($object->ref);
+            $dir = $conf->projet->dir_output;
+            if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $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
+                $pdf->SetAutoPageBreak(1,0);
+
+                $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 + 8;	// Height reserved to output the footer (value include bottom margin)
 
                 if (class_exists('TCPDF'))
                 {
@@ -170,403 +170,403 @@ 
                     $tplidx = $pdf->importPage(1);
                 }
 
-				// Complete object by loading several other informations
-				$task = new Task($this->db);
-				$tasksarray = $task->getTasksArray(0,0,$object->id);
+                // Complete object by loading several other informations
+                $task = new Task($this->db);
+                $tasksarray = $task->getTasksArray(0,0,$object->id);
 
                 if (! $object->id > 0)  // Special case when used with object = specimen, we may return all lines
                 {
                     $tasksarray=array_slice($tasksarray, 0, min(5, count($tasksarray)));
                 }
 
-				$object->lines=$tasksarray;
-				$nblignes=count($object->lines);
-
-				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
-
-				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-				$pdf->SetSubject($outputlangs->transnoentities("Project"));
-				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
-				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Project"));
-				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 = 50;
-				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
-				$tab_height = 170;
-				$tab_height_newpage = 190;
-
-				// Show public note
-				$notetoshow=empty($object->note_public)?'':$object->note_public;
-				if ($notetoshow)
-				{
-					$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
-					complete_substitutions_array($substitutionarray, $outputlangs, $object);
-					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
-
-					$tab_top -= 2;
-
-					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxref-1, $tab_top-2, 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;
-				}
-
-				$heightoftitleline = 10;
-				$iniY = $tab_top + $heightoftitleline + 1;
-				$curY = $tab_top + $heightoftitleline + 1;
-				$nexY = $tab_top + $heightoftitleline + 1;
-
-				// Loop on each lines
-				for ($i = 0 ; $i < $nblignes ; $i++)
-				{
-					$curY = $nexY;
-					$pdf->SetFont('','', $default_font_size - 1);   // 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();
-
-					// Description of line
-					$ref=$object->lines[$i]->ref;
-					$libelleline=$object->lines[$i]->label;
-					//$progress=($object->lines[$i]->progress?$object->lines[$i]->progress.'%':'');
-					$datestart=dol_print_date($object->lines[$i]->date_start,'day');
-					$dateend=dol_print_date($object->lines[$i]->date_end,'day');
-					$planned_timespent=convertSecondToTime((int) $object->lines[$i]->planned_timespent,'allhourmin');
-
-					$showpricebeforepagebreak=1;
-
-					$pdf->startTransaction();
-					// Label
-					$pdf->SetXY($this->posxlabel, $curY);
-					$pdf->MultiCell($this->posxtimespent-$this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
-					$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.
-						// Label
-						$pdf->SetXY($this->posxlabel, $curY);
-						$posybefore=$pdf->GetY();
-						$pdf->MultiCell($this->posxtimespent-$this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
-						$pageposafter=$pdf->getPage();
-						$posyafter=$pdf->GetY();
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
-						{
-							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;
-							$forcedesconsamepage=1;
-							if ($forcedesconsamepage)
-							{
-								$pdf->rollbackTransaction(true);
-								$pageposafter=$pageposbefore;
-								$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-
-								$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);
-								$pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
-								$pdf->MultiCell(0, 3, '');		// Set interline to 3
-								$pdf->SetTextColor(0,0,0);
-
-								$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-								$curY = $tab_top_newpage + $heightoftitleline + 1;
-
-								// Label
-								$pdf->SetXY($this->posxlabel, $curY);
-								$posybefore=$pdf->GetY();
-								$pdf->MultiCell($this->posxtimespent-$this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
-								$pageposafter=$pdf->getPage();
-								$posyafter=$pdf->GetY();
-							}
-						}
-						//var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
-					}
-					else	// No pagebreak
-					{
-						$pdf->commitTransaction();
-					}
-					$posYAfterDescription=$pdf->GetY();
-
-					$nexY = $pdf->GetY();
-					$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.
-
-					// We suppose that a too long description is moved completely on next page
-					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
-						//var_dump($pageposbefore.'-'.$pageposafter.'-'.$showpricebeforepagebreak);
-						$pdf->setPage($pageposafter); $curY = $tab_top_newpage + $heightoftitleline + 1;
-					}
-
-					$pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
-
-					// Ref of task
-					$pdf->SetXY($this->posxref, $curY);
-					$pdf->MultiCell($this->posxlabel-$this->posxref, 3, $outputlangs->convToOutputCharset($ref), 0, 'L');
-					// timespent
-					$pdf->SetXY($this->posxtimespent, $curY);
-					$pdf->MultiCell($this->posxdatestart-$this->posxtimespent, 3, $planned_timespent?$planned_timespent:'', 0, 'R');
-					// Progress
-					//$pdf->SetXY($this->posxprogress, $curY);
-					//$pdf->MultiCell($this->posxdatestart-$this->posxprogress, 3, $progress, 0, 'R');
-					// Date
-					$pdf->SetXY($this->posxdatestart, $curY);
-					$pdf->MultiCell($this->posxdateend-$this->posxdatestart, 3, $datestart, 0, 'C');
-					$pdf->SetXY($this->posxdateend, $curY);
-					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->posxdateend, 3, $dateend, 0, 'C');
-
-					// Add line
-					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
-					{
-						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
-						//$pdf->SetDrawColor(190,190,200);
-						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
-						$pdf->SetLineStyle(array('dash'=>0));
-					}
-
-					$nexY+=2;    // 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);
-				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;
-
-				// Pied de page
-				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
-
-				$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->transnoentities("ErrorCanNotCreateDir",$dir);
-				return 0;
-			}
-		}
-		else
-		{
-			$this->error=$langs->transnoentities("ErrorConstantNotDefined","PROJECT_OUTPUTDIR");
-			return 0;
-		}
-	}
-
-
-	/**
-	 *   Show table for lines
-	 *
-	 *   @param		PDF			$pdf     		Object PDF
-	 *   @param		string		$tab_top		Top position of table
-	 *   @param		string		$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y
-	 *   @param		Translate	$outputlangs	Langs object
-	 *   @param		int			$hidetop		Hide top bar of array
-	 *   @param		int			$hidebottom		Hide bottom bar of array
-	 *   @return	void
-	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
-	{
-		global $conf,$mysoc;
-
-		$heightoftitleline = 10;
+                $object->lines=$tasksarray;
+                $nblignes=count($object->lines);
+
+                $pdf->Open();
+                $pagenb=0;
+                $pdf->SetDrawColor(128,128,128);
+
+                $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+                $pdf->SetSubject($outputlangs->transnoentities("Project"));
+                $pdf->SetCreator("Dolibarr ".DOL_VERSION);
+                $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+                $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Project"));
+                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 = 50;
+                $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
+                $tab_height = 170;
+                $tab_height_newpage = 190;
+
+                // Show public note
+                $notetoshow=empty($object->note_public)?'':$object->note_public;
+                if ($notetoshow)
+                {
+                    $substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
+                    complete_substitutions_array($substitutionarray, $outputlangs, $object);
+                    $notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+
+                    $tab_top -= 2;
+
+                    $pdf->SetFont('','', $default_font_size - 1);
+                    $pdf->writeHTMLCell(190, 3, $this->posxref-1, $tab_top-2, 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;
+                }
+
+                $heightoftitleline = 10;
+                $iniY = $tab_top + $heightoftitleline + 1;
+                $curY = $tab_top + $heightoftitleline + 1;
+                $nexY = $tab_top + $heightoftitleline + 1;
+
+                // Loop on each lines
+                for ($i = 0 ; $i < $nblignes ; $i++)
+                {
+                    $curY = $nexY;
+                    $pdf->SetFont('','', $default_font_size - 1);   // 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();
+
+                    // Description of line
+                    $ref=$object->lines[$i]->ref;
+                    $libelleline=$object->lines[$i]->label;
+                    //$progress=($object->lines[$i]->progress?$object->lines[$i]->progress.'%':'');
+                    $datestart=dol_print_date($object->lines[$i]->date_start,'day');
+                    $dateend=dol_print_date($object->lines[$i]->date_end,'day');
+                    $planned_timespent=convertSecondToTime((int) $object->lines[$i]->planned_timespent,'allhourmin');
+
+                    $showpricebeforepagebreak=1;
+
+                    $pdf->startTransaction();
+                    // Label
+                    $pdf->SetXY($this->posxlabel, $curY);
+                    $pdf->MultiCell($this->posxtimespent-$this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
+                    $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.
+                        // Label
+                        $pdf->SetXY($this->posxlabel, $curY);
+                        $posybefore=$pdf->GetY();
+                        $pdf->MultiCell($this->posxtimespent-$this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
+                        $pageposafter=$pdf->getPage();
+                        $posyafter=$pdf->GetY();
+                        if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
+                        {
+                            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;
+                            $forcedesconsamepage=1;
+                            if ($forcedesconsamepage)
+                            {
+                                $pdf->rollbackTransaction(true);
+                                $pageposafter=$pageposbefore;
+                                $pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+
+                                $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);
+                                $pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
+                                $pdf->MultiCell(0, 3, '');		// Set interline to 3
+                                $pdf->SetTextColor(0,0,0);
+
+                                $pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+                                $curY = $tab_top_newpage + $heightoftitleline + 1;
+
+                                // Label
+                                $pdf->SetXY($this->posxlabel, $curY);
+                                $posybefore=$pdf->GetY();
+                                $pdf->MultiCell($this->posxtimespent-$this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
+                                $pageposafter=$pdf->getPage();
+                                $posyafter=$pdf->GetY();
+                            }
+                        }
+                        //var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
+                    }
+                    else	// No pagebreak
+                    {
+                        $pdf->commitTransaction();
+                    }
+                    $posYAfterDescription=$pdf->GetY();
+
+                    $nexY = $pdf->GetY();
+                    $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.
+
+                    // We suppose that a too long description is moved completely on next page
+                    if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+                        //var_dump($pageposbefore.'-'.$pageposafter.'-'.$showpricebeforepagebreak);
+                        $pdf->setPage($pageposafter); $curY = $tab_top_newpage + $heightoftitleline + 1;
+                    }
+
+                    $pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
+
+                    // Ref of task
+                    $pdf->SetXY($this->posxref, $curY);
+                    $pdf->MultiCell($this->posxlabel-$this->posxref, 3, $outputlangs->convToOutputCharset($ref), 0, 'L');
+                    // timespent
+                    $pdf->SetXY($this->posxtimespent, $curY);
+                    $pdf->MultiCell($this->posxdatestart-$this->posxtimespent, 3, $planned_timespent?$planned_timespent:'', 0, 'R');
+                    // Progress
+                    //$pdf->SetXY($this->posxprogress, $curY);
+                    //$pdf->MultiCell($this->posxdatestart-$this->posxprogress, 3, $progress, 0, 'R');
+                    // Date
+                    $pdf->SetXY($this->posxdatestart, $curY);
+                    $pdf->MultiCell($this->posxdateend-$this->posxdatestart, 3, $datestart, 0, 'C');
+                    $pdf->SetXY($this->posxdateend, $curY);
+                    $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->posxdateend, 3, $dateend, 0, 'C');
+
+                    // Add line
+                    if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+                    {
+                        $pdf->setPage($pageposafter);
+                        $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
+                        //$pdf->SetDrawColor(190,190,200);
+                        $pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+                        $pdf->SetLineStyle(array('dash'=>0));
+                    }
+
+                    $nexY+=2;    // 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);
+                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;
+
+                // Pied de page
+                $this->_pagefoot($pdf, $object, $outputlangs);
+                if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+
+                $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->transnoentities("ErrorCanNotCreateDir",$dir);
+                return 0;
+            }
+        }
+        else
+        {
+            $this->error=$langs->transnoentities("ErrorConstantNotDefined","PROJECT_OUTPUTDIR");
+            return 0;
+        }
+    }
+
+
+    /**
+     *   Show table for lines
+     *
+     *   @param		PDF			$pdf     		Object PDF
+     *   @param		string		$tab_top		Top position of table
+     *   @param		string		$tab_height		Height of table (rectangle)
+     *   @param		int			$nexY			Y
+     *   @param		Translate	$outputlangs	Langs object
+     *   @param		int			$hidetop		Hide top bar of array
+     *   @param		int			$hidebottom		Hide bottom bar of array
+     *   @return	void
+     */
+    function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+    {
+        global $conf,$mysoc;
+
+        $heightoftitleline = 10;
 
         $default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$pdf->SetDrawColor(128,128,128);
+        $pdf->SetDrawColor(128,128,128);
 
-		// Draw rect of all tab (title + lines). 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);
+        // Draw rect of all tab (title + lines). 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
-		$pdf->line($this->marge_gauche, $tab_top+$heightoftitleline, $this->page_largeur-$this->marge_droite, $tab_top+$heightoftitleline);
+        // line prend une position y en 3eme param
+        $pdf->line($this->marge_gauche, $tab_top+$heightoftitleline, $this->page_largeur-$this->marge_droite, $tab_top+$heightoftitleline);
 
-		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','', $default_font_size);
+        $pdf->SetTextColor(0,0,0);
+        $pdf->SetFont('','', $default_font_size);
 
-		$pdf->SetXY($this->posxref, $tab_top+1);
-		$pdf->MultiCell($this->posxlabel-$this->posxref,3, $outputlangs->transnoentities("Tasks"),'','L');
+        $pdf->SetXY($this->posxref, $tab_top+1);
+        $pdf->MultiCell($this->posxlabel-$this->posxref,3, $outputlangs->transnoentities("Tasks"),'','L');
 
-		$pdf->SetXY($this->posxlabel, $tab_top+1);
-		$pdf->MultiCell($this->posxtimespent-$this->posxlabel, 3, $outputlangs->transnoentities("Description"), 0, 'L');
+        $pdf->SetXY($this->posxlabel, $tab_top+1);
+        $pdf->MultiCell($this->posxtimespent-$this->posxlabel, 3, $outputlangs->transnoentities("Description"), 0, 'L');
 
-		$pdf->SetXY($this->posxtimespent, $tab_top+1);
-		$pdf->MultiCell($this->posxdatestart-$this->posxtimespent, 3, $outputlangs->transnoentities("TimeSpent"), 0, 'R');
+        $pdf->SetXY($this->posxtimespent, $tab_top+1);
+        $pdf->MultiCell($this->posxdatestart-$this->posxtimespent, 3, $outputlangs->transnoentities("TimeSpent"), 0, 'R');
 
-		//$pdf->SetXY($this->posxprogress, $tab_top+1);
-		//$pdf->MultiCell($this->posxdatestart-$this->posxprogress, 3, '%', 0, 'R');
+        //$pdf->SetXY($this->posxprogress, $tab_top+1);
+        //$pdf->MultiCell($this->posxdatestart-$this->posxprogress, 3, '%', 0, 'R');
 
-		$pdf->SetXY($this->posxdatestart, $tab_top+1);
-		$pdf->MultiCell($this->posxdateend-$this->posxdatestart, 3, $outputlangs->transnoentities("Date"), 0, 'C');
+        $pdf->SetXY($this->posxdatestart, $tab_top+1);
+        $pdf->MultiCell($this->posxdateend-$this->posxdatestart, 3, $outputlangs->transnoentities("Date"), 0, 'C');
 
-		$pdf->SetXY($this->posxdateend, $tab_top+1);
-		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdatestart, 3, '', 0, 'C');
-	}
+        $pdf->SetXY($this->posxdateend, $tab_top+1);
+        $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdatestart, 3, '', 0, 'C');
+    }
 
-	/**
-	 *  Show top header of page.
-	 *
-	 *  @param	PDF			$pdf     		Object PDF
-	 *  @param  Project		$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 $langs,$conf,$mysoc;
+    /**
+     *  Show top header of page.
+     *
+     *  @param	PDF			$pdf     		Object PDF
+     *  @param  Project		$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 $langs,$conf,$mysoc;
 
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+        pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
+        $pdf->SetTextColor(0,0,60);
+        $pdf->SetFont('','B', $default_font_size + 3);
 
         $posx=$this->page_largeur-$this->marge_droite-100;
-		$posy=$this->marge_haute;
-
-		$pdf->SetXY($this->marge_gauche,$posy);
-
-		// Logo
-		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-		if ($mysoc->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, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
-				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
-			}
-		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
-
-		$pdf->SetFont('','B', $default_font_size + 3);
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Project")." ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
-		$pdf->SetFont('','', $default_font_size + 2);
-
-		$posy+=6;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateStart")." : " . dol_print_date($object->date_start,'day',false,$outputlangs,true), '', 'R');
-
-		$posy+=6;
-		$pdf->SetXY($posx,$posy);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateEnd")." : " . dol_print_date($object->date_end,'day',false,$outputlangs,true), '', 'R');
-
-		if (is_object($object->thirdparty))
-		{
-			$posy+=6;
-			$pdf->SetXY($posx,$posy);
-			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("ThirdParty")." : " . $object->thirdparty->getFullName($outputlangs), '', 'R');
-		}
-
-		$pdf->SetTextColor(0,0,60);
-
-		// Add list of linked objects
-		/* Removed: A project can have more than thousands linked objects (orders, invoices, proposals, etc....
+        $posy=$this->marge_haute;
+
+        $pdf->SetXY($this->marge_gauche,$posy);
+
+        // Logo
+        $logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+        if ($mysoc->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, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+                $pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
+            }
+        }
+        else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+
+        $pdf->SetFont('','B', $default_font_size + 3);
+        $pdf->SetXY($posx,$posy);
+        $pdf->SetTextColor(0,0,60);
+        $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Project")." ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
+        $pdf->SetFont('','', $default_font_size + 2);
+
+        $posy+=6;
+        $pdf->SetXY($posx,$posy);
+        $pdf->SetTextColor(0,0,60);
+        $pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateStart")." : " . dol_print_date($object->date_start,'day',false,$outputlangs,true), '', 'R');
+
+        $posy+=6;
+        $pdf->SetXY($posx,$posy);
+        $pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateEnd")." : " . dol_print_date($object->date_end,'day',false,$outputlangs,true), '', 'R');
+
+        if (is_object($object->thirdparty))
+        {
+            $posy+=6;
+            $pdf->SetXY($posx,$posy);
+            $pdf->MultiCell(100, 4, $outputlangs->transnoentities("ThirdParty")." : " . $object->thirdparty->getFullName($outputlangs), '', 'R');
+        }
+
+        $pdf->SetTextColor(0,0,60);
+
+        // Add list of linked objects
+        /* Removed: A project can have more than thousands linked objects (orders, invoices, proposals, etc....
 		$object->fetchObjectLinked();
 
 	    foreach($object->linkedObjects as $objecttype => $objects)
@@ -588,21 +588,21 @@ 
 	    	}
 	    }
         */
-	}
+    }
 
-	/**
-	 *   	Show footer of page. Need this->emetteur object
+    /**
+     *   	Show footer of page. Need this->emetteur object
      *
-	 *   	@param	PDF			$pdf     			PDF
-	 * 		@param	Project		$object				Object to show
-	 *      @param	Translate	$outputlangs		Object lang for output
-	 *      @param	int			$hidefreetext		1=Hide free text
-	 *      @return	integer
-	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
-	{
-		global $conf;
-		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf,$outputlangs,'PROJECT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
-	}
+     *   	@param	PDF			$pdf     			PDF
+     * 		@param	Project		$object				Object to show
+     *      @param	Translate	$outputlangs		Object lang for output
+     *      @param	int			$hidefreetext		1=Hide free text
+     *      @return	integer
+     */
+    function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+    {
+        global $conf;
+        $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+        return pdf_pagefoot($pdf,$outputlangs,'PROJECT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+    }
 }

Spacing +173 added lines, -173 removed lines

@@ -50,7 +50,7 @@ 
 	 */
 	function __construct($db)
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		// Translations
 		$langs->loadLangs(array("main", "projects", "companies"));
@@ -61,38 +61,38 @@ 
 
 		// Dimension page pour format A4
 		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
+		$formatarray = pdf_getFormat();
 		$this->page_largeur = $formatarray['width'];
 		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1;                    // Affiche logo FAC_PDF_LOGO
-		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_codeproduitservice = 1;      // Affiche code produit-service
+		$this->option_logo = 1; // Affiche logo FAC_PDF_LOGO
+		$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
+		$this->option_codeproduitservice = 1; // Affiche code produit-service
 
 		// Recupere emmetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 
 		// Defini position des colonnes
-		$this->posxref=$this->marge_gauche+1;
-		$this->posxlabel=$this->marge_gauche+25;
-		$this->posxtimespent=$this->marge_gauche+120;
+		$this->posxref = $this->marge_gauche + 1;
+		$this->posxlabel = $this->marge_gauche + 25;
+		$this->posxtimespent = $this->marge_gauche + 120;
 		//$this->posxprogress=$this->marge_gauche+140;
-		$this->posxdatestart=$this->marge_gauche+152;
-		$this->posxdateend=$this->marge_gauche+170;
+		$this->posxdatestart = $this->marge_gauche + 152;
+		$this->posxdateend = $this->marge_gauche + 170;
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
-			$this->posxref-=20;
-			$this->posxlabel-=20;
-			$this->posxtimespent-=20;
+			$this->posxref -= 20;
+			$this->posxlabel -= 20;
+			$this->posxtimespent -= 20;
 			//$this->posxprogress-=20;
-			$this->posxdatestart-=20;
-			$this->posxdateend-=20;
+			$this->posxdatestart -= 20;
+			$this->posxdateend -= 20;
 		}
 	}
 
@@ -105,14 +105,14 @@ 
 	 *	@param	Translate	$outputlangs	Lang output object
 	 *	@return	int         				1 if OK, <=0 if KO
 	 */
-	function write_file($object,$outputlangs)
+	function write_file($object, $outputlangs)
 	{
         // phpcs:enable
 		global $conf, $hookmanager, $langs, $user;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
@@ -123,14 +123,14 @@ 
 
 			$objectref = dol_sanitizeFileName($object->ref);
 			$dir = $conf->projet->dir_output;
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
-			$file = $dir . "/" . $objectref . ".pdf";
+			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$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;
 				}
 			}
@@ -138,24 +138,24 @@ 
 			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
-				$pdf->SetAutoPageBreak(1,0);
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$pdf->SetAutoPageBreak(1, 0);
 
-				$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 + 8;	// Height reserved to output the footer (value include bottom margin)
+				$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 + 8; // Height reserved to output the footer (value include bottom margin)
 
                 if (class_exists('TCPDF'))
                 {
@@ -164,7 +164,7 @@ 
                 }
                 $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);
@@ -172,68 +172,68 @@ 
 
 				// Complete object by loading several other informations
 				$task = new Task($this->db);
-				$tasksarray = $task->getTasksArray(0,0,$object->id);
+				$tasksarray = $task->getTasksArray(0, 0, $object->id);
 
-                if (! $object->id > 0)  // Special case when used with object = specimen, we may return all lines
+                if (!$object->id > 0)  // Special case when used with object = specimen, we may return all lines
                 {
-                    $tasksarray=array_slice($tasksarray, 0, min(5, count($tasksarray)));
+                    $tasksarray = array_slice($tasksarray, 0, min(5, count($tasksarray)));
                 }
 
-				$object->lines=$tasksarray;
-				$nblignes=count($object->lines);
+				$object->lines = $tasksarray;
+				$nblignes = count($object->lines);
 
 				$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("Project"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Project"));
-				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 = 50;
-				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
 				$tab_height = 170;
 				$tab_height_newpage = 190;
 
 				// Show public note
-				$notetoshow=empty($object->note_public)?'':$object->note_public;
+				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
 				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 -= 2;
 
-					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxref-1, $tab_top-2, dol_htmlentitiesbr($notetoshow), 0, 1);
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxref - 1, $tab_top - 2, 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;
 				}
 
 				$heightoftitleline = 10;
@@ -242,81 +242,81 @@ 
 				$nexY = $tab_top + $heightoftitleline + 1;
 
 				// Loop on each lines
-				for ($i = 0 ; $i < $nblignes ; $i++)
+				for ($i = 0; $i < $nblignes; $i++)
 				{
 					$curY = $nexY;
-					$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
-					$pdf->SetTextColor(0,0,0);
+					$pdf->SetFont('', '', $default_font_size - 1); // 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->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pageposbefore = $pdf->getPage();
 
 					// Description of line
-					$ref=$object->lines[$i]->ref;
-					$libelleline=$object->lines[$i]->label;
+					$ref = $object->lines[$i]->ref;
+					$libelleline = $object->lines[$i]->label;
 					//$progress=($object->lines[$i]->progress?$object->lines[$i]->progress.'%':'');
-					$datestart=dol_print_date($object->lines[$i]->date_start,'day');
-					$dateend=dol_print_date($object->lines[$i]->date_end,'day');
-					$planned_timespent=convertSecondToTime((int) $object->lines[$i]->planned_timespent,'allhourmin');
+					$datestart = dol_print_date($object->lines[$i]->date_start, 'day');
+					$dateend = dol_print_date($object->lines[$i]->date_end, 'day');
+					$planned_timespent = convertSecondToTime((int) $object->lines[$i]->planned_timespent, 'allhourmin');
 
-					$showpricebeforepagebreak=1;
+					$showpricebeforepagebreak = 1;
 
 					$pdf->startTransaction();
 					// Label
 					$pdf->SetXY($this->posxlabel, $curY);
-					$pdf->MultiCell($this->posxtimespent-$this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
-					$pageposafter=$pdf->getPage();
+					$pdf->MultiCell($this->posxtimespent - $this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
+					$pageposafter = $pdf->getPage();
 					if ($pageposafter > $pageposbefore)	// There is a pagebreak
 					{
 						$pdf->rollbackTransaction(true);
-						$pageposafter=$pageposbefore;
+						$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.
 						// Label
 						$pdf->SetXY($this->posxlabel, $curY);
-						$posybefore=$pdf->GetY();
-						$pdf->MultiCell($this->posxtimespent-$this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
-						$pageposafter=$pdf->getPage();
-						$posyafter=$pdf->GetY();
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
+						$posybefore = $pdf->GetY();
+						$pdf->MultiCell($this->posxtimespent - $this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
+						$pageposafter = $pdf->getPage();
+						$posyafter = $pdf->GetY();
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
 						{
-							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
+							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);
+								$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);
+								$pdf->setPage($pageposafter + 1);
 							}
 						}
 						else
 						{
 							// We found a page break
-							$showpricebeforepagebreak=0;
-							$forcedesconsamepage=1;
+							$showpricebeforepagebreak = 0;
+							$forcedesconsamepage = 1;
 							if ($forcedesconsamepage)
 							{
 								$pdf->rollbackTransaction(true);
-								$pageposafter=$pageposbefore;
-								$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+								$pageposafter = $pageposbefore;
+								$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
-								$pdf->AddPage('','',true);
-								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+								$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);
-								$pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
-								$pdf->MultiCell(0, 3, '');		// Set interline to 3
-								$pdf->SetTextColor(0,0,0);
+								$pdf->setPage($pageposafter + 1);
+								$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+								$pdf->MultiCell(0, 3, ''); // Set interline to 3
+								$pdf->SetTextColor(0, 0, 0);
 
-								$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.
 								$curY = $tab_top_newpage + $heightoftitleline + 1;
 
 								// Label
 								$pdf->SetXY($this->posxlabel, $curY);
-								$posybefore=$pdf->GetY();
-								$pdf->MultiCell($this->posxtimespent-$this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
-								$pageposafter=$pdf->getPage();
-								$posyafter=$pdf->GetY();
+								$posybefore = $pdf->GetY();
+								$pdf->MultiCell($this->posxtimespent - $this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
+								$pageposafter = $pdf->getPage();
+								$posyafter = $pdf->GetY();
 							}
 						}
 						//var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
@@ -325,13 +325,13 @@ 
 					{
 						$pdf->commitTransaction();
 					}
-					$posYAfterDescription=$pdf->GetY();
+					$posYAfterDescription = $pdf->GetY();
 
 					$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.
 
 					// We suppose that a too long description is moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
@@ -339,34 +339,34 @@ 
 						$pdf->setPage($pageposafter); $curY = $tab_top_newpage + $heightoftitleline + 1;
 					}
 
-					$pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
 					// Ref of task
 					$pdf->SetXY($this->posxref, $curY);
-					$pdf->MultiCell($this->posxlabel-$this->posxref, 3, $outputlangs->convToOutputCharset($ref), 0, 'L');
+					$pdf->MultiCell($this->posxlabel - $this->posxref, 3, $outputlangs->convToOutputCharset($ref), 0, 'L');
 					// timespent
 					$pdf->SetXY($this->posxtimespent, $curY);
-					$pdf->MultiCell($this->posxdatestart-$this->posxtimespent, 3, $planned_timespent?$planned_timespent:'', 0, 'R');
+					$pdf->MultiCell($this->posxdatestart - $this->posxtimespent, 3, $planned_timespent ? $planned_timespent : '', 0, 'R');
 					// Progress
 					//$pdf->SetXY($this->posxprogress, $curY);
 					//$pdf->MultiCell($this->posxdatestart-$this->posxprogress, 3, $progress, 0, 'R');
 					// Date
 					$pdf->SetXY($this->posxdatestart, $curY);
-					$pdf->MultiCell($this->posxdateend-$this->posxdatestart, 3, $datestart, 0, 'C');
+					$pdf->MultiCell($this->posxdateend - $this->posxdatestart, 3, $datestart, 0, 'C');
 					$pdf->SetXY($this->posxdateend, $curY);
-					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->posxdateend, 3, $dateend, 0, 'C');
+					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdateend, 3, $dateend, 0, 'C');
 
 					// Add line
-					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
 					{
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
+						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
-						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
+						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
 						$pdf->SetLineStyle(array('dash'=>0));
 					}
 
-					$nexY+=2;    // Passe espace entre les lignes
+					$nexY += 2; // Passe espace entre les lignes
 
 					// Detect if some page were added automatically and output _tableau for past pages
 					while ($pagenb < $pageposafter)
@@ -380,13 +380,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)
 						{
@@ -396,10 +396,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);
 					}
@@ -410,7 +410,7 @@ 
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 				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;
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
@@ -422,26 +422,26 @@ 
 
 				// 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->transnoentities("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
 		else
 		{
-			$this->error=$langs->transnoentities("ErrorConstantNotDefined","PROJECT_OUTPUTDIR");
+			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "PROJECT_OUTPUTDIR");
 			return 0;
 		}
 	}
@@ -459,41 +459,41 @@ 
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
-		global $conf,$mysoc;
+		global $conf, $mysoc;
 
 		$heightoftitleline = 10;
 
         $default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$pdf->SetDrawColor(128,128,128);
+		$pdf->SetDrawColor(128, 128, 128);
 
 		// Draw rect of all tab (title + lines). 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
-		$pdf->line($this->marge_gauche, $tab_top+$heightoftitleline, $this->page_largeur-$this->marge_droite, $tab_top+$heightoftitleline);
+		$pdf->line($this->marge_gauche, $tab_top + $heightoftitleline, $this->page_largeur - $this->marge_droite, $tab_top + $heightoftitleline);
 
-		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','', $default_font_size);
+		$pdf->SetTextColor(0, 0, 0);
+		$pdf->SetFont('', '', $default_font_size);
 
-		$pdf->SetXY($this->posxref, $tab_top+1);
-		$pdf->MultiCell($this->posxlabel-$this->posxref,3, $outputlangs->transnoentities("Tasks"),'','L');
+		$pdf->SetXY($this->posxref, $tab_top + 1);
+		$pdf->MultiCell($this->posxlabel - $this->posxref, 3, $outputlangs->transnoentities("Tasks"), '', 'L');
 
-		$pdf->SetXY($this->posxlabel, $tab_top+1);
-		$pdf->MultiCell($this->posxtimespent-$this->posxlabel, 3, $outputlangs->transnoentities("Description"), 0, 'L');
+		$pdf->SetXY($this->posxlabel, $tab_top + 1);
+		$pdf->MultiCell($this->posxtimespent - $this->posxlabel, 3, $outputlangs->transnoentities("Description"), 0, 'L');
 
-		$pdf->SetXY($this->posxtimespent, $tab_top+1);
-		$pdf->MultiCell($this->posxdatestart-$this->posxtimespent, 3, $outputlangs->transnoentities("TimeSpent"), 0, 'R');
+		$pdf->SetXY($this->posxtimespent, $tab_top + 1);
+		$pdf->MultiCell($this->posxdatestart - $this->posxtimespent, 3, $outputlangs->transnoentities("TimeSpent"), 0, 'R');
 
 		//$pdf->SetXY($this->posxprogress, $tab_top+1);
 		//$pdf->MultiCell($this->posxdatestart-$this->posxprogress, 3, '%', 0, 'R');
 
-		$pdf->SetXY($this->posxdatestart, $tab_top+1);
-		$pdf->MultiCell($this->posxdateend-$this->posxdatestart, 3, $outputlangs->transnoentities("Date"), 0, 'C');
+		$pdf->SetXY($this->posxdatestart, $tab_top + 1);
+		$pdf->MultiCell($this->posxdateend - $this->posxdatestart, 3, $outputlangs->transnoentities("Date"), 0, 'C');
 
-		$pdf->SetXY($this->posxdateend, $tab_top+1);
+		$pdf->SetXY($this->posxdateend, $tab_top + 1);
 		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdatestart, 3, '', 0, 'C');
 	}
 
@@ -508,62 +508,62 @@ 
 	 */
 	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
-		global $langs,$conf,$mysoc;
+		global $langs, $conf, $mysoc;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-        $posx=$this->page_largeur-$this->marge_droite-100;
-		$posy=$this->marge_haute;
+        $posx = $this->page_largeur - $this->marge_droite - 100;
+		$posy = $this->marge_haute;
 
-		$pdf->SetXY($this->marge_gauche,$posy);
+		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
-		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 		if ($mysoc->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, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+				$pdf->SetTextColor(200, 0, 0);
+				$pdf->SetFont('', 'B', $default_font_size - 2);
+				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
 		}
 		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
-		$pdf->SetFont('','B', $default_font_size + 3);
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Project")." ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
-		$pdf->SetFont('','', $default_font_size + 2);
+		$pdf->SetFont('', '', $default_font_size + 2);
 
-		$posy+=6;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateStart")." : " . dol_print_date($object->date_start,'day',false,$outputlangs,true), '', 'R');
+		$posy += 6;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateStart")." : ".dol_print_date($object->date_start, 'day', false, $outputlangs, true), '', 'R');
 
-		$posy+=6;
-		$pdf->SetXY($posx,$posy);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateEnd")." : " . dol_print_date($object->date_end,'day',false,$outputlangs,true), '', 'R');
+		$posy += 6;
+		$pdf->SetXY($posx, $posy);
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateEnd")." : ".dol_print_date($object->date_end, 'day', false, $outputlangs, true), '', 'R');
 
 		if (is_object($object->thirdparty))
 		{
-			$posy+=6;
-			$pdf->SetXY($posx,$posy);
-			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("ThirdParty")." : " . $object->thirdparty->getFullName($outputlangs), '', 'R');
+			$posy += 6;
+			$pdf->SetXY($posx, $posy);
+			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("ThirdParty")." : ".$object->thirdparty->getFullName($outputlangs), '', 'R');
 		}
 
-		$pdf->SetTextColor(0,0,60);
+		$pdf->SetTextColor(0, 0, 60);
 
 		// Add list of linked objects
 		/* Removed: A project can have more than thousands linked objects (orders, invoices, proposals, etc....
@@ -599,10 +599,10 @@ 
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	integer
 	 */
-	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;
-		return pdf_pagefoot($pdf,$outputlangs,'PROJECT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		return pdf_pagefoot($pdf, $outputlangs, 'PROJECT_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }

Braces +73 added lines, -41 removed lines

@@ -76,7 +76,10 @@ 
 
 		// Recupere emmetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		if (! $this->emetteur->country_code) {
+		    $this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default if not defined
 
 		// Defini position des colonnes
 		$this->posxref=$this->marge_gauche+1;
@@ -85,9 +88,11 @@ 
 		//$this->posxprogress=$this->marge_gauche+140;
 		$this->posxdatestart=$this->marge_gauche+152;
 		$this->posxdateend=$this->marge_gauche+170;
-		if ($this->page_largeur < 210) // To work with US executive format
+		if ($this->page_largeur < 210) {
+		    // To work with US executive format
 		{
 			$this->posxref-=20;
+		}
 			$this->posxlabel-=20;
 			$this->posxtimespent-=20;
 			//$this->posxprogress-=20;
@@ -110,9 +115,13 @@ 
         // phpcs:enable
 		global $conf, $hookmanager, $langs, $user;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (! empty($conf->global->MAIN_USE_FPDF)) {
+		    $outputlangs->charset_output='ISO-8859-1';
+		}
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
@@ -123,7 +132,9 @@ 
 
 			$objectref = dol_sanitizeFileName($object->ref);
 			$dir = $conf->projet->dir_output;
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+			if (! preg_match('/specimen/i',$objectref)) {
+			    $dir.= "/" . $objectref;
+			}
 			$file = $dir . "/" . $objectref . ".pdf";
 
 			if (! file_exists($dir))
@@ -174,10 +185,12 @@ 
 				$task = new Task($this->db);
 				$tasksarray = $task->getTasksArray(0,0,$object->id);
 
-                if (! $object->id > 0)  // Special case when used with object = specimen, we may return all lines
+                if (! $object->id > 0) {
+                    // Special case when used with object = specimen, we may return all lines
                 {
                     $tasksarray=array_slice($tasksarray, 0, min(5, count($tasksarray)));
                 }
+                }
 
 				$object->lines=$tasksarray;
 				$nblignes=count($object->lines);
@@ -191,13 +204,17 @@ 
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Project"));
-				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);
@@ -230,8 +247,7 @@ 
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY+6;
-				}
-				else
+				} else
 				{
 					$height_note=0;
 				}
@@ -267,9 +283,11 @@ 
 					$pdf->SetXY($this->posxlabel, $curY);
 					$pdf->MultiCell($this->posxtimespent-$this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
 					$pageposafter=$pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
+					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.
@@ -279,17 +297,22 @@ 
 						$pdf->MultiCell($this->posxtimespent-$this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
 						$pageposafter=$pdf->getPage();
 						$posyafter=$pdf->GetY();
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) {
+						    // There is no space left for total+free text
 						{
 							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;
@@ -301,8 +324,12 @@ 
 								$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
 
 								$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);
 								$pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
 								$pdf->MultiCell(0, 3, '');		// Set interline to 3
@@ -320,8 +347,7 @@ 
 							}
 						}
 						//var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
-					}
-					else	// No pagebreak
+					} else	// No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -375,8 +401,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);
 						}
@@ -384,37 +409,45 @@ 
 						$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);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == 1)
-					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-				else
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+				if ($pagenb == 1) {
+									$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
+				} 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;
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+				    $pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -426,20 +459,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->transnoentities("ErrorCanNotCreateDir",$dir);
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$langs->transnoentities("ErrorConstantNotDefined","PROJECT_OUTPUTDIR");
 			return 0;
@@ -530,16 +562,16 @@ 
 			{
 			    $height=pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-			}
-			else
+			} else
 			{
 				$pdf->SetTextColor(200,0,0);
 				$pdf->SetFont('','B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
+		} else {
+		    $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('','B', $default_font_size + 3);
 		$pdf->SetXY($posx,$posy);

dolibarr/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php

Indentation +1110 added lines, -1110 removed lines

@@ -54,85 +54,85 @@ 
  */
 class doc_generic_project_odt extends ModelePDFProjects
 {
-	/**
-	 * Issuer
-	 * @var Societe
-	 */
-	public $emetteur;
+    /**
+     * Issuer
+     * @var Societe
+     */
+    public $emetteur;
 
-	/**
+    /**
      * @var array() Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.4 = array(5, 4)
+     * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 4);
+    public $phpmin = array(5, 4);
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $langs, $mysoc;
-
-		// Load traductions files requiredby by page
-		$langs->loadLangs(array("companies", "main"));
-
-		$this->db = $db;
-		$this->name = "ODT templates";
-		$this->description = $langs->trans("DocumentModelOdt");
-		$this->scandir = 'PROJECT_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
-
-		// Dimension page pour format A4
-		$this->type = 'odt';
-		$this->page_largeur = 0;
-		$this->page_hauteur = 0;
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=0;
-		$this->marge_droite=0;
-		$this->marge_haute=0;
-		$this->marge_basse=0;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 0;                     // Gere option tva COMMANDE_TVAOPTION
-		$this->option_modereg = 0;                 // Affiche mode reglement
-		$this->option_condreg = 0;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 0;      // 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 = 0;		   // Support add of a watermark on drafts
-
-		// Recupere emetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2);    // Par defaut, si n'etait pas defini
-	}
+    public $version = 'dolibarr';
+
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $langs, $mysoc;
+
+        // Load traductions files requiredby by page
+        $langs->loadLangs(array("companies", "main"));
+
+        $this->db = $db;
+        $this->name = "ODT templates";
+        $this->description = $langs->trans("DocumentModelOdt");
+        $this->scandir = 'PROJECT_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+
+        // Dimension page pour format A4
+        $this->type = 'odt';
+        $this->page_largeur = 0;
+        $this->page_hauteur = 0;
+        $this->format = array($this->page_largeur,$this->page_hauteur);
+        $this->marge_gauche=0;
+        $this->marge_droite=0;
+        $this->marge_haute=0;
+        $this->marge_basse=0;
+
+        $this->option_logo = 1;                    // Affiche logo
+        $this->option_tva = 0;                     // Gere option tva COMMANDE_TVAOPTION
+        $this->option_modereg = 0;                 // Affiche mode reglement
+        $this->option_condreg = 0;                 // Affiche conditions reglement
+        $this->option_codeproduitservice = 0;      // 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 = 0;		   // Support add of a watermark on drafts
+
+        // Recupere emetteur
+        $this->emetteur=$mysoc;
+        if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2);    // Par defaut, si n'etait pas defini
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Define array with couple substitution key => substitution value
-	 *
-	 * @param   Project			$object             Main object to use as data source
-	 * @param   Translate		$outputlangs        Lang object to use for output
+    /**
+     * Define array with couple substitution key => substitution value
+     *
+     * @param   Project			$object             Main object to use as data source
+     * @param   Translate		$outputlangs        Lang object to use for output
      * @param   string		    $array_key	        Name of the key for return array
-	 * @return	array								Array of substitution
-	 */
-	function get_substitutionarray_object($object,$outputlangs,$array_key='object')
-	{
+     * @return	array								Array of substitution
+     */
+    function get_substitutionarray_object($object,$outputlangs,$array_key='object')
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		$resarray=array(
-		    $array_key.'_id'=>$object->id,
+        $resarray=array(
+            $array_key.'_id'=>$object->id,
             $array_key.'_ref'=>$object->ref,
             $array_key.'_title'=>$object->title,
             $array_key.'_description'=>$object->description,
@@ -144,1086 +144,1086 @@ 
             $array_key.'_note_public'=>$object->note_public,
             $array_key.'_public'=>$object->public,
             $array_key.'_statut'=>$object->getLibStatut()
-		);
+        );
 
-		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-		$extrafields = new ExtraFields($this->db);
-		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element,true);
-		$object->fetch_optionals();
+        require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+        $extrafields = new ExtraFields($this->db);
+        $extralabels = $extrafields->fetch_name_optionals_label($object->table_element,true);
+        $object->fetch_optionals();
 
-		$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
+        $resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
 
-		return $resarray;
-	}
+        return $resarray;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  array			$task				Task Object
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_tasks(Task $task,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  array			$task				Task Object
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_tasks(Task $task,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-
-		$resarray = array(
-			'task_ref'=>$task->ref,
-			'task_fk_project'=>$task->fk_project,
-			'task_projectref'=>$task->projectref,
-			'task_projectlabel'=>$task->projectlabel,
-			'task_label'=>$task->label,
-			'task_description'=>$task->description,
-			'task_fk_parent'=>$task->fk_parent,
-			'task_duration'=>$task->duration,
-			'task_duration_hour'=>convertSecondToTime($task->duration,'all'),
-			'task_progress'=>$task->progress,
-			'task_public'=>$task->public,
-			'task_date_start'=>dol_print_date($task->date_start,'day'),
-			'task_date_end'=>dol_print_date($task->date_end,'day'),
-			'task_note_private'=>$task->note_private,
-			'task_note_public'=>$task->note_public
-		);
-
-		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-		$extrafields = new ExtraFields($this->db);
-		$extralabels = $extrafields->fetch_name_optionals_label($task->table_element,true);
-		$task->fetch_optionals($task->id,$extralabels);
-
-		$resarray = $this->fill_substitutionarray_with_extrafields($task,$resarray,$extrafields,'task',$outputlangs);
-
-		return $resarray;
-	}
+        global $conf;
+
+        $resarray = array(
+            'task_ref'=>$task->ref,
+            'task_fk_project'=>$task->fk_project,
+            'task_projectref'=>$task->projectref,
+            'task_projectlabel'=>$task->projectlabel,
+            'task_label'=>$task->label,
+            'task_description'=>$task->description,
+            'task_fk_parent'=>$task->fk_parent,
+            'task_duration'=>$task->duration,
+            'task_duration_hour'=>convertSecondToTime($task->duration,'all'),
+            'task_progress'=>$task->progress,
+            'task_public'=>$task->public,
+            'task_date_start'=>dol_print_date($task->date_start,'day'),
+            'task_date_end'=>dol_print_date($task->date_end,'day'),
+            'task_note_private'=>$task->note_private,
+            'task_note_public'=>$task->note_public
+        );
+
+        require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+        $extrafields = new ExtraFields($this->db);
+        $extralabels = $extrafields->fetch_name_optionals_label($task->table_element,true);
+        $task->fetch_optionals($task->id,$extralabels);
+
+        $resarray = $this->fill_substitutionarray_with_extrafields($task,$resarray,$extrafields,'task',$outputlangs);
+
+        return $resarray;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  array			$contact			Contact array
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_project_contacts($contact,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  array			$contact			Contact array
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_project_contacts($contact,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-		$pc='projcontacts_'; // prefix to avoid typos
-
-		$ret = array(
-			$pc.'id'=>$contact['id'],
-			$pc.'rowid'=>$contact['rowid'],
-			$pc.'role'=>$contact['libelle'],
-			$pc.'lastname'=>$contact['lastname'],
-			$pc.'firstname'=>$contact['firstname'],
-			$pc.'civility'=>$contact['civility'],
-			$pc.'fullcivname'=>$contact['fullname'],
-			$pc.'socname'=>$contact['socname'],
-			$pc.'email'=>$contact['email']
-			);
-
-		if ($contact['source']=='external') {
-			$ret[$pc.'isInternal'] = ''; // not internal
-
-			$ct = new Contact($this->db);
-			$ct->fetch($contact['id']);
-			$ret[$pc.'phone_pro'] = $ct->phone_pro;
-			$ret[$pc.'phone_perso'] = $ct->phone_perso;
-			$ret[$pc.'phone_mobile'] = $ct->phone_mobile;
-
-			// fetch external user extrafields
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields=new ExtraFields($this->db);
-			$extralabels=$extrafields->fetch_name_optionals_label($ct->table_element, true);
-			$extrafields_num = $ct->fetch_optionals();
-			//dol_syslog(get_class($this)."::get_substitutionarray_project_contacts: ===== Number of Extrafields found: ".$extrafields_num, LOG_DEBUG);
-			foreach($ct->array_options as $efkey => $efval) {
-				dol_syslog(get_class($this)."::get_substitutionarray_project_contacts: +++++ Extrafield ".$efkey." => ".$efval, LOG_DEBUG);
-				$ret[$pc.$efkey] = $efval; // add nothing else because it already comes as 'options_XX'
-			}
-		} elseif ($contact['source']=='internal') {
-			$ret[$pc.'isInternal'] = '1'; // this is an internal user
-
-			$ct = new User($this->db);
-			$ct->fetch($contact['id']);
-			$ret[$pc.'phone_pro'] = $ct->office_phone;
-			$ret[$pc.'phone_perso'] = '';
-			$ret[$pc.'phone_mobile'] = $ct->user_mobile;
-			// do internal users have extrafields ?
-		}
-		return $ret;
-	}
+        global $conf;
+        $pc='projcontacts_'; // prefix to avoid typos
+
+        $ret = array(
+            $pc.'id'=>$contact['id'],
+            $pc.'rowid'=>$contact['rowid'],
+            $pc.'role'=>$contact['libelle'],
+            $pc.'lastname'=>$contact['lastname'],
+            $pc.'firstname'=>$contact['firstname'],
+            $pc.'civility'=>$contact['civility'],
+            $pc.'fullcivname'=>$contact['fullname'],
+            $pc.'socname'=>$contact['socname'],
+            $pc.'email'=>$contact['email']
+            );
+
+        if ($contact['source']=='external') {
+            $ret[$pc.'isInternal'] = ''; // not internal
+
+            $ct = new Contact($this->db);
+            $ct->fetch($contact['id']);
+            $ret[$pc.'phone_pro'] = $ct->phone_pro;
+            $ret[$pc.'phone_perso'] = $ct->phone_perso;
+            $ret[$pc.'phone_mobile'] = $ct->phone_mobile;
+
+            // fetch external user extrafields
+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+            $extrafields=new ExtraFields($this->db);
+            $extralabels=$extrafields->fetch_name_optionals_label($ct->table_element, true);
+            $extrafields_num = $ct->fetch_optionals();
+            //dol_syslog(get_class($this)."::get_substitutionarray_project_contacts: ===== Number of Extrafields found: ".$extrafields_num, LOG_DEBUG);
+            foreach($ct->array_options as $efkey => $efval) {
+                dol_syslog(get_class($this)."::get_substitutionarray_project_contacts: +++++ Extrafield ".$efkey." => ".$efval, LOG_DEBUG);
+                $ret[$pc.$efkey] = $efval; // add nothing else because it already comes as 'options_XX'
+            }
+        } elseif ($contact['source']=='internal') {
+            $ret[$pc.'isInternal'] = '1'; // this is an internal user
+
+            $ct = new User($this->db);
+            $ct->fetch($contact['id']);
+            $ret[$pc.'phone_pro'] = $ct->office_phone;
+            $ret[$pc.'phone_perso'] = '';
+            $ret[$pc.'phone_mobile'] = $ct->user_mobile;
+            // do internal users have extrafields ?
+        }
+        return $ret;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  array			$file				file array
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_project_file($file,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  array			$file				file array
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_project_file($file,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		return array(
-		'projfile_name'=>$file['name'],
-		'projfile_date'=>dol_print_date($file['date'],'day'),
-		'projfile_size'=>$file['size']
-		);
-	}
+        return array(
+        'projfile_name'=>$file['name'],
+        'projfile_date'=>dol_print_date($file['date'],'day'),
+        'projfile_size'=>$file['size']
+        );
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  array			$refdetail			Reference array
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_project_reference($refdetail,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  array			$refdetail			Reference array
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_project_reference($refdetail,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-
-		return array(
-		'projref_type'=>$refdetail['type'],
-		'projref_ref'=>$refdetail['ref'],
-		'projref_date'=>dol_print_date($refdetail['date'],'day'),
-		'projref_socname'=>$refdetail['socname'],
-		'projref_amountht'=>price($refdetail['amountht'],0,$outputlangs),
-		'projref_amountttc'=>price($refdetail['amountttc'],0,$outputlangs),
-		'projref_status'=>$refdetail['status']
-		);
-	}
+        global $conf;
+
+        return array(
+        'projref_type'=>$refdetail['type'],
+        'projref_ref'=>$refdetail['ref'],
+        'projref_date'=>dol_print_date($refdetail['date'],'day'),
+        'projref_socname'=>$refdetail['socname'],
+        'projref_amountht'=>price($refdetail['amountht'],0,$outputlangs),
+        'projref_amountttc'=>price($refdetail['amountttc'],0,$outputlangs),
+        'projref_status'=>$refdetail['status']
+        );
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  array			$taskressource			Reference array
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_tasksressource($taskressource,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  array			$taskressource			Reference array
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_tasksressource($taskressource,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-		//dol_syslog(get_class($this).'::get_substitutionarray_tasksressource taskressource='.var_export($taskressource,true),LOG_DEBUG);
-		return array(
-		'taskressource_rowid'=>$taskressource['rowid'],
-		'taskressource_role'=>$taskressource['libelle'],
-		'taskressource_lastname'=>$taskressource['lastname'],
-		'taskressource_firstname'=>$taskressource['firstname'],
-		'taskressource_fullcivname'=>$taskressource['fullname'],
-		'taskressource_socname'=>$taskressource['socname'],
-		'taskressource_email'=>$taskressource['email']
-		);
-	}
+        global $conf;
+        //dol_syslog(get_class($this).'::get_substitutionarray_tasksressource taskressource='.var_export($taskressource,true),LOG_DEBUG);
+        return array(
+        'taskressource_rowid'=>$taskressource['rowid'],
+        'taskressource_role'=>$taskressource['libelle'],
+        'taskressource_lastname'=>$taskressource['lastname'],
+        'taskressource_firstname'=>$taskressource['firstname'],
+        'taskressource_fullcivname'=>$taskressource['fullname'],
+        'taskressource_socname'=>$taskressource['socname'],
+        'taskressource_email'=>$taskressource['email']
+        );
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  object			$tasktime			times object
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_taskstime($tasktime,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  object			$tasktime			times object
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_taskstime($tasktime,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-
-		return array(
-		'tasktime_rowid'=>$tasktime['rowid'],
-		'tasktime_task_date'=>dol_print_date($tasktime['task_date'],'day'),
-		'tasktime_task_duration_sec'=>$tasktime['task_duration'],
-		'tasktime_task_duration'=>convertSecondToTime($tasktime['task_duration'],'all'),
-		'tasktime_note'=>$tasktime['note'],
-		'tasktime_fk_user'=>$tasktime['fk_user'],
-		'tasktime_user_name'=>$tasktime['name'],
-		'tasktime_user_first'=>$tasktime['firstname'],
-		'tasktime_fullcivname'=>$tasktime['fullcivname'],
-		'tasktime_amountht'=>$tasktime['amountht'],
-		'tasktime_amountttc'=>$tasktime['amountttc'],
-		'tasktime_thm'=>$tasktime['thm'],
-		);
-	}
+        global $conf;
+
+        return array(
+        'tasktime_rowid'=>$tasktime['rowid'],
+        'tasktime_task_date'=>dol_print_date($tasktime['task_date'],'day'),
+        'tasktime_task_duration_sec'=>$tasktime['task_duration'],
+        'tasktime_task_duration'=>convertSecondToTime($tasktime['task_duration'],'all'),
+        'tasktime_note'=>$tasktime['note'],
+        'tasktime_fk_user'=>$tasktime['fk_user'],
+        'tasktime_user_name'=>$tasktime['name'],
+        'tasktime_user_first'=>$tasktime['firstname'],
+        'tasktime_fullcivname'=>$tasktime['fullcivname'],
+        'tasktime_amountht'=>$tasktime['amountht'],
+        'tasktime_amountttc'=>$tasktime['amountttc'],
+        'tasktime_thm'=>$tasktime['thm'],
+        );
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  array			$file				file array
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_task_file($file,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  array			$file				file array
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_task_file($file,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-
-		return array(
-		'tasksfile_name'=>$file['name'],
-		'tasksfile_date'=>dol_print_date($file['date'],'day'),
-		'tasksfile_size'=>$file['size']
-		);
-	}
-
-
-	/**
-	 *	Return description of a module
-	 *
-	 *	@param	Translate	$langs      Lang object to use for output
-	 *	@return string       			Description
-	 */
-	function info($langs)
-	{
-		global $conf,$langs;
-
-		// Load translation files required by the page
+        global $conf;
+
+        return array(
+        'tasksfile_name'=>$file['name'],
+        'tasksfile_date'=>dol_print_date($file['date'],'day'),
+        'tasksfile_size'=>$file['size']
+        );
+    }
+
+
+    /**
+     *	Return description of a module
+     *
+     *	@param	Translate	$langs      Lang object to use for output
+     *	@return string       			Description
+     */
+    function info($langs)
+    {
+        global $conf,$langs;
+
+        // Load translation files required by the page
         $langs->loadLangs(array("companies","errors"));
 
-		$form = new Form($this->db);
-
-		$texte = $this->description.".<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="PROJECT_ADDON_PDF_ODT_PATH">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		// List of directories area
-		$texte.= '<tr><td>';
-		$texttitle=$langs->trans("ListOfDirectories");
-		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->PROJECT_ADDON_PDF_ODT_PATH)));
-		$listoffiles=array();
-		foreach($listofdir as $key=>$tmpdir)
-		{
-			$tmpdir=trim($tmpdir);
-			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-			if (! $tmpdir) {
-				unset($listofdir[$key]); continue;
-			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
-			else
-			{
-				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
-			}
-		}
-		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
-		// Add list of substitution keys
-		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
-		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
-
-		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
-		$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
-		$texte.= '<textarea class="flat" cols="60" name="value1">';
-		$texte.=$conf->global->PROJECT_ADDON_PDF_ODT_PATH;
-		$texte.= '</textarea>';
-		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
-		$texte.= '<br></div></div>';
-
-		// Scan directories
-		$nbofiles=count($listoffiles);
-		if (! empty($conf->global->PROJECT_ADDON_PDF_ODT_PATH))
-		{
-			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>';
-			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
-			$texte.=$nbofiles;
-			//$texte.=$nbofiles?'</a>':'';
-			$texte.='</b>';
-		}
-
-		if ($nbofiles)
-		{
-   			$texte.='<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach($listoffiles as $file)
-   			{
+        $form = new Form($this->db);
+
+        $texte = $this->description.".<br>\n";
+        $texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        $texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        $texte.= '<input type="hidden" name="action" value="setModuleOptions">';
+        $texte.= '<input type="hidden" name="param1" value="PROJECT_ADDON_PDF_ODT_PATH">';
+        $texte.= '<table class="nobordernopadding" width="100%">';
+
+        // List of directories area
+        $texte.= '<tr><td>';
+        $texttitle=$langs->trans("ListOfDirectories");
+        $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->PROJECT_ADDON_PDF_ODT_PATH)));
+        $listoffiles=array();
+        foreach($listofdir as $key=>$tmpdir)
+        {
+            $tmpdir=trim($tmpdir);
+            $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+            if (! $tmpdir) {
+                unset($listofdir[$key]); continue;
+            }
+            if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+            else
+            {
+                $tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
+                if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+            }
+        }
+        $texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+        // Add list of substitution keys
+        $texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+        $texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
+
+        $texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
+        $texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+        $texte.= '<textarea class="flat" cols="60" name="value1">';
+        $texte.=$conf->global->PROJECT_ADDON_PDF_ODT_PATH;
+        $texte.= '</textarea>';
+        $texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
+        $texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+        $texte.= '<br></div></div>';
+
+        // Scan directories
+        $nbofiles=count($listoffiles);
+        if (! empty($conf->global->PROJECT_ADDON_PDF_ODT_PATH))
+        {
+            $texte.=$langs->trans("NumberOfModelFilesFound").': <b>';
+            //$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
+            $texte.=$nbofiles;
+            //$texte.=$nbofiles?'</a>':'';
+            $texte.='</b>';
+        }
+
+        if ($nbofiles)
+        {
+                $texte.='<div id="div_'.get_class($this).'" class="hidden">';
+                foreach($listoffiles as $file)
+                {
                 $texte.=$file['name'].'<br>';
-   			}
-   			$texte.='<div id="div_'.get_class($this).'">';
-		}
+                }
+                $texte.='<div id="div_'.get_class($this).'">';
+        }
 
-		$texte.= '</td>';
+        $texte.= '</td>';
 
-		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
-		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
-		$texte.= '</td>';
-		$texte.= '</tr>';
+        $texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+        $texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
+        $texte.= '</td>';
+        $texte.= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+        $texte.= '</table>';
+        $texte.= '</form>';
 
-		return $texte;
-	}
+        return $texte;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Function to build a document on disk using the generic odt module.
-	 *
-	 *	@param	Project		$object					Object source to build document
-	 *	@param	Translate	$outputlangs			Lang output object
-	 * 	@param	string		$srctemplatepath	    Full path of source filename for generator using a template file
-	 *	@return	int         						1 if OK, <=0 if KO
-	 */
-	function write_file($object,$outputlangs,$srctemplatepath)
-	{
+    /**
+     *	Function to build a document on disk using the generic odt module.
+     *
+     *	@param	Project		$object					Object source to build document
+     *	@param	Translate	$outputlangs			Lang output object
+     * 	@param	string		$srctemplatepath	    Full path of source filename for generator using a template file
+     *	@return	int         						1 if OK, <=0 if KO
+     */
+    function write_file($object,$outputlangs,$srctemplatepath)
+    {
         // phpcs:enable
-		global $user,$langs,$conf,$mysoc,$hookmanager;
-
-		if (empty($srctemplatepath))
-		{
-			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
-			return -1;
-		}
-
-		// Add odtgeneration hook
-		if (! is_object($hookmanager))
-		{
-			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
-		}
-		$hookmanager->initHooks(array('odtgeneration'));
-		global $action;
-
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='UTF-8';
-
-		// Load translation files required by the page
-		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
-
-		if ($conf->projet->dir_output)
-		{
-			// If $object is id instead of object
-			if (! is_object($object))
-			{
-				$id = $object;
-				$object = new Project($this->db);
-				$result=$object->fetch($id);
-				if ($result < 0)
-				{
-					dol_print_error($this->db,$object->error);
-					return -1;
-				}
-			}
-
-			$dir = $conf->projet->dir_output;
-			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
-			$file = $dir . "/" . $objectref . ".odt";
-
-			if (! file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-					return -1;
-				}
-			}
-
-			if (file_exists($dir))
-			{
-				//print "srctemplatepath=".$srctemplatepath;	// Src filename
-				$newfile=basename($srctemplatepath);
-				$newfiletmp=preg_replace('/\.od(t|s)/i','',$newfile);
-				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
-				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
-				$newfiletmp=$objectref.'_'.$newfiletmp;
-				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
-				// Get extension (ods or odt)
-				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
-				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
-				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
-					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
-				}
-				else
-				{
-					$filename=$newfiletmp.'.'.$newfileformat;
-				}
-				$file=$dir.'/'.$filename;
-				//print "newdir=".$dir;
-				//print "newfile=".$newfile;
-				//print "file=".$file;
-				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
-
-				dol_mkdir($conf->projet->dir_temp);
-
-				// If PROJECTLEADER contact defined on project, we use it
-				$usecontact=false;
-				$arrayidcontact=$object->getIdContact('external','PROJECTLEADER');
-				if (count($arrayidcontact) > 0)
-				{
-					$usecontact=true;
-					$result=$object->fetch_contact($arrayidcontact[0]);
-				}
-
-				// Recipient name
-				$contactobject=null;
-				if (! empty($usecontact))
-				{
-        			// if we have a PROJECTLEADER contact and we dont use it as recipient we store the contact object for later use
-        			$contactobject = $object->contact;
-				}
-
-				$socobject=$object->thirdparty;
-
-				// Make substitution
-				$substitutionarray=array(
-				'__FROM_NAME__' => $this->emetteur->name,
-				'__FROM_EMAIL__' => $this->emetteur->email,
-				);
-				complete_substitutions_array($substitutionarray, $langs, $object);
-				// Call the ODTSubstitution hook
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-				// Open and load template
-				require_once ODTPHP_PATH.'odf.php';
-				try {
-					$odfHandler = new odf(
-						$srctemplatepath,
-						array(
-						'PATH_TO_TMP'	  => $conf->projet->dir_temp,
-						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
-						'DELIMITER_LEFT'  => '{',
-						'DELIMITER_RIGHT' => '}'
-						)
-					);
-				} catch (Exception $e) {
-					$this->error=$e->getMessage();
-					dol_syslog($e->getMessage(), LOG_INFO);
-					return -1;
-				}
-				// After construction $odfHandler->contentXml contains content and
-				// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
-				// [!-- BEGIN lines --]*[!-- END lines --]
-				//print html_entity_decode($odfHandler->__toString());
-				//print exit;
-
-
-				// Define substitution array
-				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-				$array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
-				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
-				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
-				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
-				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_other=$this->get_substitutionarray_other($outputlangs);
-				// retrieve contact information for use in object as contact_xxx tags
-				$array_project_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_project_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
-
-				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_project_contact);
-				complete_substitutions_array($tmparray, $outputlangs, $object);
-
-				// Call the ODTSubstitution hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						if (preg_match('/logo$/',$key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
-						{
-							$odfHandler->setVars($key, $value, true, 'UTF-8');
-						}
-					}
-					catch (OdfException $e)
-					{
+        global $user,$langs,$conf,$mysoc,$hookmanager;
+
+        if (empty($srctemplatepath))
+        {
+            dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
+            return -1;
+        }
+
+        // Add odtgeneration hook
+        if (! is_object($hookmanager))
+        {
+            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+            $hookmanager=new HookManager($this->db);
+        }
+        $hookmanager->initHooks(array('odtgeneration'));
+        global $action;
+
+        if (! is_object($outputlangs)) $outputlangs=$langs;
+        $sav_charset_output=$outputlangs->charset_output;
+        $outputlangs->charset_output='UTF-8';
+
+        // Load translation files required by the page
+        $outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
+
+        if ($conf->projet->dir_output)
+        {
+            // If $object is id instead of object
+            if (! is_object($object))
+            {
+                $id = $object;
+                $object = new Project($this->db);
+                $result=$object->fetch($id);
+                if ($result < 0)
+                {
+                    dol_print_error($this->db,$object->error);
+                    return -1;
+                }
+            }
+
+            $dir = $conf->projet->dir_output;
+            $objectref = dol_sanitizeFileName($object->ref);
+            if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+            $file = $dir . "/" . $objectref . ".odt";
+
+            if (! file_exists($dir))
+            {
+                if (dol_mkdir($dir) < 0)
+                {
+                    $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                    return -1;
+                }
+            }
+
+            if (file_exists($dir))
+            {
+                //print "srctemplatepath=".$srctemplatepath;	// Src filename
+                $newfile=basename($srctemplatepath);
+                $newfiletmp=preg_replace('/\.od(t|s)/i','',$newfile);
+                $newfiletmp=preg_replace('/template_/i','',$newfiletmp);
+                $newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
+                $newfiletmp=$objectref.'_'.$newfiletmp;
+                //$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
+                // Get extension (ods or odt)
+                $newfileformat=substr($newfile, strrpos($newfile, '.')+1);
+                if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
+                {
+                    $format=$conf->global->MAIN_DOC_USE_TIMING;
+                    if ($format == '1') $format='%Y%m%d%H%M%S';
+                    $filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
+                }
+                else
+                {
+                    $filename=$newfiletmp.'.'.$newfileformat;
+                }
+                $file=$dir.'/'.$filename;
+                //print "newdir=".$dir;
+                //print "newfile=".$newfile;
+                //print "file=".$file;
+                //print "conf->societe->dir_temp=".$conf->societe->dir_temp;
+
+                dol_mkdir($conf->projet->dir_temp);
+
+                // If PROJECTLEADER contact defined on project, we use it
+                $usecontact=false;
+                $arrayidcontact=$object->getIdContact('external','PROJECTLEADER');
+                if (count($arrayidcontact) > 0)
+                {
+                    $usecontact=true;
+                    $result=$object->fetch_contact($arrayidcontact[0]);
+                }
+
+                // Recipient name
+                $contactobject=null;
+                if (! empty($usecontact))
+                {
+                    // if we have a PROJECTLEADER contact and we dont use it as recipient we store the contact object for later use
+                    $contactobject = $object->contact;
+                }
+
+                $socobject=$object->thirdparty;
+
+                // Make substitution
+                $substitutionarray=array(
+                '__FROM_NAME__' => $this->emetteur->name,
+                '__FROM_EMAIL__' => $this->emetteur->email,
+                );
+                complete_substitutions_array($substitutionarray, $langs, $object);
+                // Call the ODTSubstitution hook
+                $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+                $reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+                // Open and load template
+                require_once ODTPHP_PATH.'odf.php';
+                try {
+                    $odfHandler = new odf(
+                        $srctemplatepath,
+                        array(
+                        'PATH_TO_TMP'	  => $conf->projet->dir_temp,
+                        'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+                        'DELIMITER_LEFT'  => '{',
+                        'DELIMITER_RIGHT' => '}'
+                        )
+                    );
+                } catch (Exception $e) {
+                    $this->error=$e->getMessage();
+                    dol_syslog($e->getMessage(), LOG_INFO);
+                    return -1;
+                }
+                // After construction $odfHandler->contentXml contains content and
+                // [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
+                // [!-- BEGIN lines --]*[!-- END lines --]
+                //print html_entity_decode($odfHandler->__toString());
+                //print exit;
+
+
+                // Define substitution array
+                $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+                $array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
+                $array_objet=$this->get_substitutionarray_object($object,$outputlangs);
+                $array_user=$this->get_substitutionarray_user($user,$outputlangs);
+                $array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
+                $array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
+                $array_other=$this->get_substitutionarray_other($outputlangs);
+                // retrieve contact information for use in object as contact_xxx tags
+                $array_project_contact = array();
+                if ($usecontact && is_object($contactobject)) $array_project_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+
+                $tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_project_contact);
+                complete_substitutions_array($tmparray, $outputlangs, $object);
+
+                // Call the ODTSubstitution hook
+                $parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+                $reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+                foreach($tmparray as $key=>$value)
+                {
+                    try {
+                        if (preg_match('/logo$/',$key)) // Image
+                        {
+                            if (file_exists($value)) $odfHandler->setImage($key, $value);
+                            else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+                        }
+                        else    // Text
+                        {
+                            $odfHandler->setVars($key, $value, true, 'UTF-8');
+                        }
+                    }
+                    catch (OdfException $e)
+                    {
                         dol_syslog($e->getMessage(), LOG_INFO);
-					}
-				}
-
-				// Replace tags of lines for tasks
-				try
-				{
-					$listlines = $odfHandler->setSegment('tasks');
-
-					$taskstatic = new Task($this->db);
-
-					// Security check
-					$socid=0;
-					if (!empty($object->fk_soc)) $socid = $object->fk_soc;
-
-					$tasksarray=$taskstatic->getTasksArray(0, 0, $object->id, $socid, 0);
-
-
-					foreach ($tasksarray as $task)
-					{
-						$tmparray=$this->get_substitutionarray_tasks($task,$outputlangs);
-						//complete_substitutions_array($tmparray, $outputlangs, $object, $task, "completesubstitutionarray_lines");
-						foreach($tmparray as $key => $val)
-						{
-							try
-							{
-								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch(OdfException $e)
-							{
-								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch(SegmentException $e)
-							{
-								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-						}
-
-						$taskobj=new Task($this->db);
-						$taskobj->fetch($task->id);
-
-						// Replace tags of lines for contacts task
-						$sourcearray=array('internal','external');
-						$contact_arrray=array();
-						foreach ($sourcearray as $source) {
-							$contact_temp=$taskobj->liste_contact(-1,$source);
-							if ((is_array($contact_temp) && count($contact_temp) > 0))
-							{
-								$contact_arrray=array_merge($contact_arrray,$contact_temp);
-							}
-						}
-						if ((is_array($contact_arrray) && count($contact_arrray) > 0))
-						{
-							$listlinestaskres = $listlines->__get('tasksressources');
-
-							foreach ($contact_arrray as $contact)
-							{
-								if ($contact['source']=='internal') {
-									$objectdetail=new User($this->db);
-									$objectdetail->fetch($contact['id']);
-									$contact['socname']=$mysoc->name;
-								} elseif ($contact['source']=='external') {
-									$objectdetail=new Contact($this->db);
-									$objectdetail->fetch($contact['id']);
-
-									$soc=new Societe($this->db);
-									$soc->fetch($contact['socid']);
-									$contact['socname']=$soc->name;
-								}
-								$contact['fullname']=$objectdetail->getFullName($outputlangs,1);
-
-								$tmparray=$this->get_substitutionarray_tasksressource($contact,$outputlangs);
-
-								foreach($tmparray as $key => $val)
-								{
-									try
-									{
-										$listlinestaskres->setVars($key, $val, true, 'UTF-8');
-									}
-									catch(OdfException $e)
-									{
-										dol_syslog($e->getMessage(), LOG_INFO);
-									}
-									catch(SegmentException $e)
-									{
-										dol_syslog($e->getMessage(), LOG_INFO);
-									}
-								}
-								$listlinestaskres->merge();
-							}
-						}
-
-						//Time ressources
-						$sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note";
-						$sql.= ", u.lastname, u.firstname, t.thm";
-						$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
-						$sql .= " , ".MAIN_DB_PREFIX."user as u";
-						$sql .= " WHERE t.fk_task =".$task->id;
-						$sql .= " AND t.fk_user = u.rowid";
-						$sql .= " ORDER BY t.task_date DESC";
-
-						$resql = $this->db->query($sql);
-						if ($resql)
-						{
-							$num = $this->db->num_rows($resql);
-							$i = 0;
-							$tasks = array();
-							$row=array();
-							$listlinestasktime = $listlines->__get('taskstimes');
-							if (empty($num)) {
-								$row['rowid']='';
-								$row['task_date']='';
-								$row['task_duration']='';
-								$row['$tasktime']='';
-								$row['note']='';
-								$row['fk_user']='';
-								$row['name']='';
-								$row['firstname']='';
-								$row['fullcivname']='';
-								$row['amountht']='';
-								$row['amountttc']='';
-								$row['thm']='';
-								$tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
-								foreach($tmparray as $key => $val)
-								{
-									try
-									{
-										$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-									}
-									catch(OdfException $e)
-									{
-										dol_syslog($e->getMessage(), LOG_INFO);
-									}
-									catch(SegmentException $e)
-									{
-										dol_syslog($e->getMessage(), LOG_INFO);
-									}
-								}
-								$listlinestasktime->merge();
-							}
-							while ($i < $num)
-							{
-								$row = $this->db->fetch_array($resql);
-								if (!empty($row['fk_user'])) {
-									$objectdetail=new User($this->db);
-									$objectdetail->fetch($row['fk_user']);
-									$row['fullcivname']=$objectdetail->getFullName($outputlangs,1);
-								} else {
-									$row['fullcivname']='';
-								}
-
-								if (!empty($row['thm'])) {
-									$row['amountht']=($row['task_duration'] / 3600) * $row['thm'];
-									$defaultvat = get_default_tva($mysoc, $mysoc);
-									$row['amountttc']=price2num($row['amountht'] * (1 + ($defaultvat / 100)),'MT');
-								} else {
-									$row['amountht']=0;
-									$row['amountttc']=0;
-									$row['thm']=0;
-								}
-
-								$tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
-
-								foreach($tmparray as $key => $val)
-								{
-									try
-									{
-										$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-									}
-									catch(OdfException $e)
-									{
-										dol_syslog($e->getMessage(), LOG_INFO);
-									}
-									catch(SegmentException $e)
-									{
-										dol_syslog($e->getMessage(), LOG_INFO);
-									}
-								}
-								$listlinestasktime->merge();
-								$i++;
-							}
-							$this->db->free($resql);
-						}
-
-
-						// Replace tags of project files
-						$listtasksfiles = $listlines->__get('tasksfiles');
-
-						$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref).'/'.dol_sanitizeFileName($task->ref);
-						$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
-
-
-						foreach ($filearray as $filedetail)
-						{
-							$tmparray=$this->get_substitutionarray_task_file($filedetail,$outputlangs);
-							//dol_syslog(get_class($this).'::main $tmparray'.var_export($tmparray,true));
-							foreach($tmparray as $key => $val)
-							{
-								try
-								{
-									$listtasksfiles->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
-								{
-									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
-								{
-									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-							}
-							$listtasksfiles->merge();
-						}
-						$listlines->merge();
-					}
-					$odfHandler->mergeSegment($listlines);
-				}
-				catch(OdfException $e)
-				{
-					$ExceptionTrace=$e->getTrace();
-					// no segment defined on ODT is not an error
-					if($ExceptionTrace[0]['function'] != 'setSegment')
-					{
-						$this->error=$e->getMessage();
-						dol_syslog($this->error, LOG_WARNING);
-						return -1;
-					}
-				}
-
-				// Replace tags of project files
-				try
-				{
-					$listlines = $odfHandler->setSegment('projectfiles');
-
-					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
-					$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
-
-					foreach ($filearray as $filedetail)
-					{
-						//dol_syslog(get_class($this).'::main $filedetail'.var_export($filedetail,true));
-						$tmparray=$this->get_substitutionarray_project_file($filedetail,$outputlangs);
-
-						foreach($tmparray as $key => $val)
-						{
-							try
-							{
-								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch(OdfException $e)
-							{
-								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch(SegmentException $e)
-							{
-								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-						}
-						$listlines->merge();
-					}
-					$odfHandler->mergeSegment($listlines);
-				}
-				catch(OdfException $e)
-				{
-					$this->error=$e->getMessage();
-					dol_syslog($this->error, LOG_WARNING);
-					return -1;
-				}
-
-				// Replace tags of lines for contacts
-				$sourcearray=array('internal','external');
-				$contact_arrray=array();
-				foreach ($sourcearray as $source) {
-					$contact_temp=$object->liste_contact(-1,$source);
-					if ((is_array($contact_temp) && count($contact_temp) > 0))
-					{
-						$contact_arrray=array_merge($contact_arrray,$contact_temp);
-					}
-				}
-				if ((is_array($contact_arrray) && count($contact_arrray) > 0))
-				{
-					try
-					{
-						$listlines = $odfHandler->setSegment('projectcontacts');
-
-						foreach ($contact_arrray as $contact)
-						{
-							if ($contact['source']=='internal') {
-								$objectdetail=new User($this->db);
-								$objectdetail->fetch($contact['id']);
-								$contact['socname']=$mysoc->name;
-							} elseif ($contact['source']=='external') {
-								$objectdetail=new Contact($this->db);
-								$objectdetail->fetch($contact['id']);
-
-								$soc=new Societe($this->db);
-								$soc->fetch($contact['socid']);
-								$contact['socname']=$soc->name;
-							}
-							$contact['fullname']=$objectdetail->getFullName($outputlangs,1);
-
-							$tmparray=$this->get_substitutionarray_project_contacts($contact,$outputlangs);
-							foreach($tmparray as $key => $val)
-							{
-								try
-								{
-									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
-								{
-									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch(SegmentException $e)
-								{
-									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-							}
-							$listlines->merge();
-						}
-						$odfHandler->mergeSegment($listlines);
-					}
-					catch(OdfException $e)
-					{
-						$this->error=$e->getMessage();
-						dol_syslog($this->error, LOG_WARNING);
-						return -1;
-					}
-				}
-
-				//List of referent
-
-				$listofreferent = array(
-					'propal' => array(
-						'title' => "ListProposalsAssociatedProject",
-						'class' => 'Propal',
-						'table' => 'propal',
-						'test' => $conf->propal->enabled && $user->rights->propale->lire
-					),
-					'order' => array(
-						'title' => "ListOrdersAssociatedProject",
-						'class' => 'Commande',
-						'table' => 'commande',
-						'test' => $conf->commande->enabled && $user->rights->commande->lire
-					),
-					'invoice' => array(
-						'title' => "ListInvoicesAssociatedProject",
-						'class' => 'Facture',
-						'table' => 'facture',
-						'test' => $conf->facture->enabled && $user->rights->facture->lire
-					),
-					'invoice_predefined' => array(
-						'title' => "ListPredefinedInvoicesAssociatedProject",
-						'class' => 'FactureRec',
-						'table' => 'facture_rec',
-						'test' => $conf->facture->enabled && $user->rights->facture->lire
-					),
-					'proposal_supplier' => array(
-						'title' => "ListSupplierProposalsAssociatedProject",
-						'class' => 'SupplierProposal',
-						'table' => 'supplier_proposal',
-						'test' => $conf->supplier_proposal->enabled && $user->rights->supplier_proposal->lire
-					),
-					'order_supplier' => array(
-						'title' => "ListSupplierOrdersAssociatedProject",
-						'table' => 'commande_fournisseur',
-						'class' => 'CommandeFournisseur',
-						'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire
-					),
-					'invoice_supplier' => array(
-						'title' => "ListSupplierInvoicesAssociatedProject",
-						'table' => 'facture_fourn',
-						'class' => 'FactureFournisseur',
-						'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire
-					),
-					'contract' => array(
-						'title' => "ListContractAssociatedProject",
-						'class' => 'Contrat',
-						'table' => 'contrat',
-						'test' => $conf->contrat->enabled && $user->rights->contrat->lire
-					),
-					'intervention' => array(
-						'title' => "ListFichinterAssociatedProject",
-						'class' => 'Fichinter',
-						'table' => 'fichinter',
-						'disableamount' => 1,
-						'test' => $conf->ficheinter->enabled && $user->rights->ficheinter->lire
-					),
-					'shipping' => array(
-						'title' => "ListShippingAssociatedProject",
-						'class' => 'Expedition',
-						'table' => 'expedition',
-						'disableamount' => 1,
-						'test' => $conf->expedition->enabled && $user->rights->expedition->lire
-					),
-					'trip' => array(
-						'title' => "ListTripAssociatedProject",
-						'class' => 'Deplacement',
-						'table' => 'deplacement',
-						'disableamount' => 1,
-						'test' => $conf->deplacement->enabled && $user->rights->deplacement->lire
-					),
-					'expensereport' => array(
-						'title' => "ListExpenseReportsAssociatedProject",
-						'class' => 'ExpenseReportLine',
-						'table' => 'expensereport_det',
-						'test' => $conf->expensereport->enabled && $user->rights->expensereport->lire
-					),
-					'donation' => array(
-						'title' => "ListDonationsAssociatedProject",
-						'class' => 'Don',
-						'table' => 'don',
-						'test' => $conf->don->enabled && $user->rights->don->lire
-					),
-					'loan' => array(
-						'title' => "ListLoanAssociatedProject",
-						'class' => 'Loan',
-						'table' => 'loan',
-						'test' => $conf->loan->enabled && $user->rights->loan->read
-					),
-					'chargesociales' => array(
-						'title' => "ListSocialContributionAssociatedProject",
-						'class' => 'ChargeSociales',
-						'table' => 'chargesociales',
-						'urlnew' => DOL_URL_ROOT . '/compta/sociales/card.php?action=create&projectid=' . $object->id,
-						'test' => $conf->tax->enabled && $user->rights->tax->charges->lire
-					),
-					'stock_mouvement' => array(
-						'title' => "ListMouvementStockProject",
-						'class' => 'MouvementStock',
-						'table' => 'stock_mouvement',
-						'test' => ($conf->stock->enabled && $user->rights->stock->mouvement->lire && ! empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW))
-					),
-					'agenda' => array(
-						'title' => "ListActionsAssociatedProject",
-						'class' => 'ActionComm',
-						'table' => 'actioncomm',
-						'disableamount' => 1,
-						'test' => $conf->agenda->enabled && $user->rights->agenda->allactions->lire
-					),
-				);
-
-				//Insert reference
-				try
-				{
-					$listlines = $odfHandler->setSegment('projectrefs');
-
-					foreach ($listofreferent as $keyref => $valueref)
-					{
-						$title=$valueref['title'];
-						$tablename=$valueref['table'];
-						$classname=$valueref['class'];
-						$qualified=$valueref['test'];
-						if ($qualified)
-						{
-							$elementarray = $object->get_element_list($keyref, $tablename);
-							if (count($elementarray)>0 && is_array($elementarray))
-							{
-								$total_ht = 0;
-								$total_ttc = 0;
-								$num=count($elementarray);
-								for ($i = 0; $i < $num; $i++)
-								{
-									$ref_array=array();
-									$ref_array['type']=$langs->trans($classname);
-
-									$element = new $classname($this->db);
-									$element->fetch($elementarray[$i]);
-									$element->fetch_thirdparty();
-
-									//Ref object
-									$ref_array['ref']=$element->ref;
-
-									//Date object
-									$dateref=$element->date;
-									if (empty($dateref)) $dateref=$element->datep;
-									if (empty($dateref)) $dateref=$element->date_contrat;
-									$ref_array['date']=$dateref;
-
-									//Soc object
-									if (is_object($element->thirdparty)) {
-										$ref_array['socname']=$element->thirdparty->name;
-									} else {
-										$ref_array['socname']='';
-									}
-
-									//Amount object
-									if (empty($valueref['disableamount'])) {
-										if (!empty($element->total_ht)) {
-											$ref_array['amountht']=$element->total_ht;
-											$ref_array['amountttc']=$element->total_ttc;
-										} else {
-											$ref_array['amountht']=0;
-											$ref_array['amountttc']=0;
-										}
-									} else {
-										$ref_array['amountht']='';
-										$ref_array['amountttc']='';
-									}
-
-									$ref_array['status']=$element->getLibStatut(0);
-
-									$tmparray=$this->get_substitutionarray_project_reference($ref_array,$outputlangs);
-
-									foreach($tmparray as $key => $val)
-									{
-										try
-										{
-											$listlines->setVars($key, $val, true, 'UTF-8');
-										}
-										catch(OdfException $e)
-										{
-											dol_syslog($e->getMessage(), LOG_INFO);
-										}
-										catch(SegmentException $e)
-										{
-											dol_syslog($e->getMessage(), LOG_INFO);
-										}
-									}
-									$listlines->merge();
-								}
-							}
-						}
-						$odfHandler->mergeSegment($listlines);
-					}
-				} catch(OdfException $e) {
-					$this->error=$e->getMessage();
-					dol_syslog($this->error, LOG_WARNING);
-					return -1;
-				}
-
-				// Replace labels translated
-				$tmparray=$outputlangs->get_translations_for_substitutions();
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					} catch (OdfException $e) {
+                    }
+                }
+
+                // Replace tags of lines for tasks
+                try
+                {
+                    $listlines = $odfHandler->setSegment('tasks');
+
+                    $taskstatic = new Task($this->db);
+
+                    // Security check
+                    $socid=0;
+                    if (!empty($object->fk_soc)) $socid = $object->fk_soc;
+
+                    $tasksarray=$taskstatic->getTasksArray(0, 0, $object->id, $socid, 0);
+
+
+                    foreach ($tasksarray as $task)
+                    {
+                        $tmparray=$this->get_substitutionarray_tasks($task,$outputlangs);
+                        //complete_substitutions_array($tmparray, $outputlangs, $object, $task, "completesubstitutionarray_lines");
+                        foreach($tmparray as $key => $val)
+                        {
+                            try
+                            {
+                                $listlines->setVars($key, $val, true, 'UTF-8');
+                            }
+                            catch(OdfException $e)
+                            {
+                                dol_syslog($e->getMessage(), LOG_INFO);
+                            }
+                            catch(SegmentException $e)
+                            {
+                                dol_syslog($e->getMessage(), LOG_INFO);
+                            }
+                        }
+
+                        $taskobj=new Task($this->db);
+                        $taskobj->fetch($task->id);
+
+                        // Replace tags of lines for contacts task
+                        $sourcearray=array('internal','external');
+                        $contact_arrray=array();
+                        foreach ($sourcearray as $source) {
+                            $contact_temp=$taskobj->liste_contact(-1,$source);
+                            if ((is_array($contact_temp) && count($contact_temp) > 0))
+                            {
+                                $contact_arrray=array_merge($contact_arrray,$contact_temp);
+                            }
+                        }
+                        if ((is_array($contact_arrray) && count($contact_arrray) > 0))
+                        {
+                            $listlinestaskres = $listlines->__get('tasksressources');
+
+                            foreach ($contact_arrray as $contact)
+                            {
+                                if ($contact['source']=='internal') {
+                                    $objectdetail=new User($this->db);
+                                    $objectdetail->fetch($contact['id']);
+                                    $contact['socname']=$mysoc->name;
+                                } elseif ($contact['source']=='external') {
+                                    $objectdetail=new Contact($this->db);
+                                    $objectdetail->fetch($contact['id']);
+
+                                    $soc=new Societe($this->db);
+                                    $soc->fetch($contact['socid']);
+                                    $contact['socname']=$soc->name;
+                                }
+                                $contact['fullname']=$objectdetail->getFullName($outputlangs,1);
+
+                                $tmparray=$this->get_substitutionarray_tasksressource($contact,$outputlangs);
+
+                                foreach($tmparray as $key => $val)
+                                {
+                                    try
+                                    {
+                                        $listlinestaskres->setVars($key, $val, true, 'UTF-8');
+                                    }
+                                    catch(OdfException $e)
+                                    {
+                                        dol_syslog($e->getMessage(), LOG_INFO);
+                                    }
+                                    catch(SegmentException $e)
+                                    {
+                                        dol_syslog($e->getMessage(), LOG_INFO);
+                                    }
+                                }
+                                $listlinestaskres->merge();
+                            }
+                        }
+
+                        //Time ressources
+                        $sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note";
+                        $sql.= ", u.lastname, u.firstname, t.thm";
+                        $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
+                        $sql .= " , ".MAIN_DB_PREFIX."user as u";
+                        $sql .= " WHERE t.fk_task =".$task->id;
+                        $sql .= " AND t.fk_user = u.rowid";
+                        $sql .= " ORDER BY t.task_date DESC";
+
+                        $resql = $this->db->query($sql);
+                        if ($resql)
+                        {
+                            $num = $this->db->num_rows($resql);
+                            $i = 0;
+                            $tasks = array();
+                            $row=array();
+                            $listlinestasktime = $listlines->__get('taskstimes');
+                            if (empty($num)) {
+                                $row['rowid']='';
+                                $row['task_date']='';
+                                $row['task_duration']='';
+                                $row['$tasktime']='';
+                                $row['note']='';
+                                $row['fk_user']='';
+                                $row['name']='';
+                                $row['firstname']='';
+                                $row['fullcivname']='';
+                                $row['amountht']='';
+                                $row['amountttc']='';
+                                $row['thm']='';
+                                $tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
+                                foreach($tmparray as $key => $val)
+                                {
+                                    try
+                                    {
+                                        $listlinestasktime->setVars($key, $val, true, 'UTF-8');
+                                    }
+                                    catch(OdfException $e)
+                                    {
+                                        dol_syslog($e->getMessage(), LOG_INFO);
+                                    }
+                                    catch(SegmentException $e)
+                                    {
+                                        dol_syslog($e->getMessage(), LOG_INFO);
+                                    }
+                                }
+                                $listlinestasktime->merge();
+                            }
+                            while ($i < $num)
+                            {
+                                $row = $this->db->fetch_array($resql);
+                                if (!empty($row['fk_user'])) {
+                                    $objectdetail=new User($this->db);
+                                    $objectdetail->fetch($row['fk_user']);
+                                    $row['fullcivname']=$objectdetail->getFullName($outputlangs,1);
+                                } else {
+                                    $row['fullcivname']='';
+                                }
+
+                                if (!empty($row['thm'])) {
+                                    $row['amountht']=($row['task_duration'] / 3600) * $row['thm'];
+                                    $defaultvat = get_default_tva($mysoc, $mysoc);
+                                    $row['amountttc']=price2num($row['amountht'] * (1 + ($defaultvat / 100)),'MT');
+                                } else {
+                                    $row['amountht']=0;
+                                    $row['amountttc']=0;
+                                    $row['thm']=0;
+                                }
+
+                                $tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
+
+                                foreach($tmparray as $key => $val)
+                                {
+                                    try
+                                    {
+                                        $listlinestasktime->setVars($key, $val, true, 'UTF-8');
+                                    }
+                                    catch(OdfException $e)
+                                    {
+                                        dol_syslog($e->getMessage(), LOG_INFO);
+                                    }
+                                    catch(SegmentException $e)
+                                    {
+                                        dol_syslog($e->getMessage(), LOG_INFO);
+                                    }
+                                }
+                                $listlinestasktime->merge();
+                                $i++;
+                            }
+                            $this->db->free($resql);
+                        }
+
+
+                        // Replace tags of project files
+                        $listtasksfiles = $listlines->__get('tasksfiles');
+
+                        $upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref).'/'.dol_sanitizeFileName($task->ref);
+                        $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
+
+
+                        foreach ($filearray as $filedetail)
+                        {
+                            $tmparray=$this->get_substitutionarray_task_file($filedetail,$outputlangs);
+                            //dol_syslog(get_class($this).'::main $tmparray'.var_export($tmparray,true));
+                            foreach($tmparray as $key => $val)
+                            {
+                                try
+                                {
+                                    $listtasksfiles->setVars($key, $val, true, 'UTF-8');
+                                }
+                                catch (OdfException $e)
+                                {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                                catch (SegmentException $e)
+                                {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                            }
+                            $listtasksfiles->merge();
+                        }
+                        $listlines->merge();
+                    }
+                    $odfHandler->mergeSegment($listlines);
+                }
+                catch(OdfException $e)
+                {
+                    $ExceptionTrace=$e->getTrace();
+                    // no segment defined on ODT is not an error
+                    if($ExceptionTrace[0]['function'] != 'setSegment')
+                    {
+                        $this->error=$e->getMessage();
+                        dol_syslog($this->error, LOG_WARNING);
+                        return -1;
+                    }
+                }
+
+                // Replace tags of project files
+                try
+                {
+                    $listlines = $odfHandler->setSegment('projectfiles');
+
+                    $upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
+                    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
+
+                    foreach ($filearray as $filedetail)
+                    {
+                        //dol_syslog(get_class($this).'::main $filedetail'.var_export($filedetail,true));
+                        $tmparray=$this->get_substitutionarray_project_file($filedetail,$outputlangs);
+
+                        foreach($tmparray as $key => $val)
+                        {
+                            try
+                            {
+                                $listlines->setVars($key, $val, true, 'UTF-8');
+                            }
+                            catch(OdfException $e)
+                            {
+                                dol_syslog($e->getMessage(), LOG_INFO);
+                            }
+                            catch(SegmentException $e)
+                            {
+                                dol_syslog($e->getMessage(), LOG_INFO);
+                            }
+                        }
+                        $listlines->merge();
+                    }
+                    $odfHandler->mergeSegment($listlines);
+                }
+                catch(OdfException $e)
+                {
+                    $this->error=$e->getMessage();
+                    dol_syslog($this->error, LOG_WARNING);
+                    return -1;
+                }
+
+                // Replace tags of lines for contacts
+                $sourcearray=array('internal','external');
+                $contact_arrray=array();
+                foreach ($sourcearray as $source) {
+                    $contact_temp=$object->liste_contact(-1,$source);
+                    if ((is_array($contact_temp) && count($contact_temp) > 0))
+                    {
+                        $contact_arrray=array_merge($contact_arrray,$contact_temp);
+                    }
+                }
+                if ((is_array($contact_arrray) && count($contact_arrray) > 0))
+                {
+                    try
+                    {
+                        $listlines = $odfHandler->setSegment('projectcontacts');
+
+                        foreach ($contact_arrray as $contact)
+                        {
+                            if ($contact['source']=='internal') {
+                                $objectdetail=new User($this->db);
+                                $objectdetail->fetch($contact['id']);
+                                $contact['socname']=$mysoc->name;
+                            } elseif ($contact['source']=='external') {
+                                $objectdetail=new Contact($this->db);
+                                $objectdetail->fetch($contact['id']);
+
+                                $soc=new Societe($this->db);
+                                $soc->fetch($contact['socid']);
+                                $contact['socname']=$soc->name;
+                            }
+                            $contact['fullname']=$objectdetail->getFullName($outputlangs,1);
+
+                            $tmparray=$this->get_substitutionarray_project_contacts($contact,$outputlangs);
+                            foreach($tmparray as $key => $val)
+                            {
+                                try
+                                {
+                                    $listlines->setVars($key, $val, true, 'UTF-8');
+                                }
+                                catch(OdfException $e)
+                                {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                                catch(SegmentException $e)
+                                {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                            }
+                            $listlines->merge();
+                        }
+                        $odfHandler->mergeSegment($listlines);
+                    }
+                    catch(OdfException $e)
+                    {
+                        $this->error=$e->getMessage();
+                        dol_syslog($this->error, LOG_WARNING);
+                        return -1;
+                    }
+                }
+
+                //List of referent
+
+                $listofreferent = array(
+                    'propal' => array(
+                        'title' => "ListProposalsAssociatedProject",
+                        'class' => 'Propal',
+                        'table' => 'propal',
+                        'test' => $conf->propal->enabled && $user->rights->propale->lire
+                    ),
+                    'order' => array(
+                        'title' => "ListOrdersAssociatedProject",
+                        'class' => 'Commande',
+                        'table' => 'commande',
+                        'test' => $conf->commande->enabled && $user->rights->commande->lire
+                    ),
+                    'invoice' => array(
+                        'title' => "ListInvoicesAssociatedProject",
+                        'class' => 'Facture',
+                        'table' => 'facture',
+                        'test' => $conf->facture->enabled && $user->rights->facture->lire
+                    ),
+                    'invoice_predefined' => array(
+                        'title' => "ListPredefinedInvoicesAssociatedProject",
+                        'class' => 'FactureRec',
+                        'table' => 'facture_rec',
+                        'test' => $conf->facture->enabled && $user->rights->facture->lire
+                    ),
+                    'proposal_supplier' => array(
+                        'title' => "ListSupplierProposalsAssociatedProject",
+                        'class' => 'SupplierProposal',
+                        'table' => 'supplier_proposal',
+                        'test' => $conf->supplier_proposal->enabled && $user->rights->supplier_proposal->lire
+                    ),
+                    'order_supplier' => array(
+                        'title' => "ListSupplierOrdersAssociatedProject",
+                        'table' => 'commande_fournisseur',
+                        'class' => 'CommandeFournisseur',
+                        'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire
+                    ),
+                    'invoice_supplier' => array(
+                        'title' => "ListSupplierInvoicesAssociatedProject",
+                        'table' => 'facture_fourn',
+                        'class' => 'FactureFournisseur',
+                        'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire
+                    ),
+                    'contract' => array(
+                        'title' => "ListContractAssociatedProject",
+                        'class' => 'Contrat',
+                        'table' => 'contrat',
+                        'test' => $conf->contrat->enabled && $user->rights->contrat->lire
+                    ),
+                    'intervention' => array(
+                        'title' => "ListFichinterAssociatedProject",
+                        'class' => 'Fichinter',
+                        'table' => 'fichinter',
+                        'disableamount' => 1,
+                        'test' => $conf->ficheinter->enabled && $user->rights->ficheinter->lire
+                    ),
+                    'shipping' => array(
+                        'title' => "ListShippingAssociatedProject",
+                        'class' => 'Expedition',
+                        'table' => 'expedition',
+                        'disableamount' => 1,
+                        'test' => $conf->expedition->enabled && $user->rights->expedition->lire
+                    ),
+                    'trip' => array(
+                        'title' => "ListTripAssociatedProject",
+                        'class' => 'Deplacement',
+                        'table' => 'deplacement',
+                        'disableamount' => 1,
+                        'test' => $conf->deplacement->enabled && $user->rights->deplacement->lire
+                    ),
+                    'expensereport' => array(
+                        'title' => "ListExpenseReportsAssociatedProject",
+                        'class' => 'ExpenseReportLine',
+                        'table' => 'expensereport_det',
+                        'test' => $conf->expensereport->enabled && $user->rights->expensereport->lire
+                    ),
+                    'donation' => array(
+                        'title' => "ListDonationsAssociatedProject",
+                        'class' => 'Don',
+                        'table' => 'don',
+                        'test' => $conf->don->enabled && $user->rights->don->lire
+                    ),
+                    'loan' => array(
+                        'title' => "ListLoanAssociatedProject",
+                        'class' => 'Loan',
+                        'table' => 'loan',
+                        'test' => $conf->loan->enabled && $user->rights->loan->read
+                    ),
+                    'chargesociales' => array(
+                        'title' => "ListSocialContributionAssociatedProject",
+                        'class' => 'ChargeSociales',
+                        'table' => 'chargesociales',
+                        'urlnew' => DOL_URL_ROOT . '/compta/sociales/card.php?action=create&projectid=' . $object->id,
+                        'test' => $conf->tax->enabled && $user->rights->tax->charges->lire
+                    ),
+                    'stock_mouvement' => array(
+                        'title' => "ListMouvementStockProject",
+                        'class' => 'MouvementStock',
+                        'table' => 'stock_mouvement',
+                        'test' => ($conf->stock->enabled && $user->rights->stock->mouvement->lire && ! empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW))
+                    ),
+                    'agenda' => array(
+                        'title' => "ListActionsAssociatedProject",
+                        'class' => 'ActionComm',
+                        'table' => 'actioncomm',
+                        'disableamount' => 1,
+                        'test' => $conf->agenda->enabled && $user->rights->agenda->allactions->lire
+                    ),
+                );
+
+                //Insert reference
+                try
+                {
+                    $listlines = $odfHandler->setSegment('projectrefs');
+
+                    foreach ($listofreferent as $keyref => $valueref)
+                    {
+                        $title=$valueref['title'];
+                        $tablename=$valueref['table'];
+                        $classname=$valueref['class'];
+                        $qualified=$valueref['test'];
+                        if ($qualified)
+                        {
+                            $elementarray = $object->get_element_list($keyref, $tablename);
+                            if (count($elementarray)>0 && is_array($elementarray))
+                            {
+                                $total_ht = 0;
+                                $total_ttc = 0;
+                                $num=count($elementarray);
+                                for ($i = 0; $i < $num; $i++)
+                                {
+                                    $ref_array=array();
+                                    $ref_array['type']=$langs->trans($classname);
+
+                                    $element = new $classname($this->db);
+                                    $element->fetch($elementarray[$i]);
+                                    $element->fetch_thirdparty();
+
+                                    //Ref object
+                                    $ref_array['ref']=$element->ref;
+
+                                    //Date object
+                                    $dateref=$element->date;
+                                    if (empty($dateref)) $dateref=$element->datep;
+                                    if (empty($dateref)) $dateref=$element->date_contrat;
+                                    $ref_array['date']=$dateref;
+
+                                    //Soc object
+                                    if (is_object($element->thirdparty)) {
+                                        $ref_array['socname']=$element->thirdparty->name;
+                                    } else {
+                                        $ref_array['socname']='';
+                                    }
+
+                                    //Amount object
+                                    if (empty($valueref['disableamount'])) {
+                                        if (!empty($element->total_ht)) {
+                                            $ref_array['amountht']=$element->total_ht;
+                                            $ref_array['amountttc']=$element->total_ttc;
+                                        } else {
+                                            $ref_array['amountht']=0;
+                                            $ref_array['amountttc']=0;
+                                        }
+                                    } else {
+                                        $ref_array['amountht']='';
+                                        $ref_array['amountttc']='';
+                                    }
+
+                                    $ref_array['status']=$element->getLibStatut(0);
+
+                                    $tmparray=$this->get_substitutionarray_project_reference($ref_array,$outputlangs);
+
+                                    foreach($tmparray as $key => $val)
+                                    {
+                                        try
+                                        {
+                                            $listlines->setVars($key, $val, true, 'UTF-8');
+                                        }
+                                        catch(OdfException $e)
+                                        {
+                                            dol_syslog($e->getMessage(), LOG_INFO);
+                                        }
+                                        catch(SegmentException $e)
+                                        {
+                                            dol_syslog($e->getMessage(), LOG_INFO);
+                                        }
+                                    }
+                                    $listlines->merge();
+                                }
+                            }
+                        }
+                        $odfHandler->mergeSegment($listlines);
+                    }
+                } catch(OdfException $e) {
+                    $this->error=$e->getMessage();
+                    dol_syslog($this->error, LOG_WARNING);
+                    return -1;
+                }
+
+                // Replace labels translated
+                $tmparray=$outputlangs->get_translations_for_substitutions();
+                foreach($tmparray as $key=>$value)
+                {
+                    try {
+                        $odfHandler->setVars($key, $value, true, 'UTF-8');
+                    } catch (OdfException $e) {
                         dol_syslog($e->getMessage(), LOG_INFO);
-					}
-				}
-
-				// Call the beforeODTSave hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-
-				// Write new file
-				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
-					try {
-						$odfHandler->exportAsAttachedPDF($file);
-					} catch (Exception $e) {
-						$this->error=$e->getMessage();
-						return -1;
-					}
-				} else {
-					try {
-						$odfHandler->saveToDisk($file);
-					} catch (Exception $e){
-						$this->error=$e->getMessage();
+                    }
+                }
+
+                // Call the beforeODTSave hook
+                $parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+                $reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+
+                // Write new file
+                if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
+                    try {
+                        $odfHandler->exportAsAttachedPDF($file);
+                    } catch (Exception $e) {
+                        $this->error=$e->getMessage();
+                        return -1;
+                    }
+                } else {
+                    try {
+                        $odfHandler->saveToDisk($file);
+                    } catch (Exception $e){
+                        $this->error=$e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
-						return -1;
-					}
-				}
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
-
-				$odfHandler=null;	// Destroy object
-
-				$this->result = array('fullpath'=>$file);
-
-				return 1;   // Success
-			}
-			else
-			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-				return -1;
-			}
-		}
-
-		return -1;
-	}
+                        return -1;
+                    }
+                }
+                $parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+                $reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+                if (! empty($conf->global->MAIN_UMASK))
+                    @chmod($file, octdec($conf->global->MAIN_UMASK));
+
+                $odfHandler=null;	// Destroy object
+
+                $this->result = array('fullpath'=>$file);
+
+                return 1;   // Success
+            }
+            else
+            {
+                $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                return -1;
+            }
+        }
+
+        return -1;
+    }
 }

Spacing +286 added lines, -286 removed lines

@@ -37,16 +37,16 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (! empty($conf->propal->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (! empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
-if (! empty($conf->commande->enabled))    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (! empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-if (! empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-if (! empty($conf->contrat->enabled))     require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (! empty($conf->ficheinter->enabled))  require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-if (! empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
-if (! empty($conf->agenda->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+if (!empty($conf->propal->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (!empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+if (!empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
+if (!empty($conf->commande->enabled))    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+if (!empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+if (!empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+if (!empty($conf->contrat->enabled))     require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+if (!empty($conf->ficheinter->enabled))  require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+if (!empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
+if (!empty($conf->agenda->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 
 /**
@@ -88,32 +88,32 @@ 
 		$this->db = $db;
 		$this->name = "ODT templates";
 		$this->description = $langs->trans("DocumentModelOdt");
-		$this->scandir = 'PROJECT_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+		$this->scandir = 'PROJECT_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
 
 		// Dimension page pour format A4
 		$this->type = 'odt';
 		$this->page_largeur = 0;
 		$this->page_hauteur = 0;
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=0;
-		$this->marge_droite=0;
-		$this->marge_haute=0;
-		$this->marge_basse=0;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 0;                     // Gere option tva COMMANDE_TVAOPTION
-		$this->option_modereg = 0;                 // Affiche mode reglement
-		$this->option_condreg = 0;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 0;      // 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 = 0;		   // Support add of a watermark on drafts
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = 0;
+		$this->marge_droite = 0;
+		$this->marge_haute = 0;
+		$this->marge_basse = 0;
+
+		$this->option_logo = 1; // Affiche logo
+		$this->option_tva = 0; // Gere option tva COMMANDE_TVAOPTION
+		$this->option_modereg = 0; // Affiche mode reglement
+		$this->option_condreg = 0; // Affiche conditions reglement
+		$this->option_codeproduitservice = 0; // 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 = 0; // Support add of a watermark on drafts
 
 		// Recupere emetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2);    // Par defaut, si n'etait pas defini
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->pays_code) $this->emetteur->pays_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
 	}
 
 
@@ -126,20 +126,20 @@ 
      * @param   string		    $array_key	        Name of the key for return array
 	 * @return	array								Array of substitution
 	 */
-	function get_substitutionarray_object($object,$outputlangs,$array_key='object')
+	function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
 	{
         // phpcs:enable
 		global $conf;
 
-		$resarray=array(
+		$resarray = array(
 		    $array_key.'_id'=>$object->id,
             $array_key.'_ref'=>$object->ref,
             $array_key.'_title'=>$object->title,
             $array_key.'_description'=>$object->description,
-            $array_key.'_date_creation'=>dol_print_date($object->date_c,'day'),
-            $array_key.'_date_modification'=>dol_print_date($object->date_m,'day'),
-            $array_key.'_date_start'=>dol_print_date($object->date_start,'day'),
-            $array_key.'_date_end'=>dol_print_date($object->date_end,'day'),
+            $array_key.'_date_creation'=>dol_print_date($object->date_c, 'day'),
+            $array_key.'_date_modification'=>dol_print_date($object->date_m, 'day'),
+            $array_key.'_date_start'=>dol_print_date($object->date_start, 'day'),
+            $array_key.'_date_end'=>dol_print_date($object->date_end, 'day'),
             $array_key.'_note_private'=>$object->note_private,
             $array_key.'_note_public'=>$object->note_public,
             $array_key.'_public'=>$object->public,
@@ -148,10 +148,10 @@ 
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		$extrafields = new ExtraFields($this->db);
-		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element,true);
+		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element, true);
 		$object->fetch_optionals();
 
-		$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
+		$resarray = $this->fill_substitutionarray_with_extrafields($object, $resarray, $extrafields, $array_key, $outputlangs);
 
 		return $resarray;
 	}
@@ -164,7 +164,7 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_tasks(Task $task,$outputlangs)
+	function get_substitutionarray_tasks(Task $task, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
@@ -178,21 +178,21 @@ 
 			'task_description'=>$task->description,
 			'task_fk_parent'=>$task->fk_parent,
 			'task_duration'=>$task->duration,
-			'task_duration_hour'=>convertSecondToTime($task->duration,'all'),
+			'task_duration_hour'=>convertSecondToTime($task->duration, 'all'),
 			'task_progress'=>$task->progress,
 			'task_public'=>$task->public,
-			'task_date_start'=>dol_print_date($task->date_start,'day'),
-			'task_date_end'=>dol_print_date($task->date_end,'day'),
+			'task_date_start'=>dol_print_date($task->date_start, 'day'),
+			'task_date_end'=>dol_print_date($task->date_end, 'day'),
 			'task_note_private'=>$task->note_private,
 			'task_note_public'=>$task->note_public
 		);
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		$extrafields = new ExtraFields($this->db);
-		$extralabels = $extrafields->fetch_name_optionals_label($task->table_element,true);
-		$task->fetch_optionals($task->id,$extralabels);
+		$extralabels = $extrafields->fetch_name_optionals_label($task->table_element, true);
+		$task->fetch_optionals($task->id, $extralabels);
 
-		$resarray = $this->fill_substitutionarray_with_extrafields($task,$resarray,$extrafields,'task',$outputlangs);
+		$resarray = $this->fill_substitutionarray_with_extrafields($task, $resarray, $extrafields, 'task', $outputlangs);
 
 		return $resarray;
 	}
@@ -205,11 +205,11 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_project_contacts($contact,$outputlangs)
+	function get_substitutionarray_project_contacts($contact, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
-		$pc='projcontacts_'; // prefix to avoid typos
+		$pc = 'projcontacts_'; // prefix to avoid typos
 
 		$ret = array(
 			$pc.'id'=>$contact['id'],
@@ -223,7 +223,7 @@ 
 			$pc.'email'=>$contact['email']
 			);
 
-		if ($contact['source']=='external') {
+		if ($contact['source'] == 'external') {
 			$ret[$pc.'isInternal'] = ''; // not internal
 
 			$ct = new Contact($this->db);
@@ -234,15 +234,15 @@ 
 
 			// fetch external user extrafields
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields=new ExtraFields($this->db);
-			$extralabels=$extrafields->fetch_name_optionals_label($ct->table_element, true);
+			$extrafields = new ExtraFields($this->db);
+			$extralabels = $extrafields->fetch_name_optionals_label($ct->table_element, true);
 			$extrafields_num = $ct->fetch_optionals();
 			//dol_syslog(get_class($this)."::get_substitutionarray_project_contacts: ===== Number of Extrafields found: ".$extrafields_num, LOG_DEBUG);
-			foreach($ct->array_options as $efkey => $efval) {
+			foreach ($ct->array_options as $efkey => $efval) {
 				dol_syslog(get_class($this)."::get_substitutionarray_project_contacts: +++++ Extrafield ".$efkey." => ".$efval, LOG_DEBUG);
 				$ret[$pc.$efkey] = $efval; // add nothing else because it already comes as 'options_XX'
 			}
-		} elseif ($contact['source']=='internal') {
+		} elseif ($contact['source'] == 'internal') {
 			$ret[$pc.'isInternal'] = '1'; // this is an internal user
 
 			$ct = new User($this->db);
@@ -263,14 +263,14 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_project_file($file,$outputlangs)
+	function get_substitutionarray_project_file($file, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
 
 		return array(
 		'projfile_name'=>$file['name'],
-		'projfile_date'=>dol_print_date($file['date'],'day'),
+		'projfile_date'=>dol_print_date($file['date'], 'day'),
 		'projfile_size'=>$file['size']
 		);
 	}
@@ -283,7 +283,7 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_project_reference($refdetail,$outputlangs)
+	function get_substitutionarray_project_reference($refdetail, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
@@ -291,10 +291,10 @@ 
 		return array(
 		'projref_type'=>$refdetail['type'],
 		'projref_ref'=>$refdetail['ref'],
-		'projref_date'=>dol_print_date($refdetail['date'],'day'),
+		'projref_date'=>dol_print_date($refdetail['date'], 'day'),
 		'projref_socname'=>$refdetail['socname'],
-		'projref_amountht'=>price($refdetail['amountht'],0,$outputlangs),
-		'projref_amountttc'=>price($refdetail['amountttc'],0,$outputlangs),
+		'projref_amountht'=>price($refdetail['amountht'], 0, $outputlangs),
+		'projref_amountttc'=>price($refdetail['amountttc'], 0, $outputlangs),
 		'projref_status'=>$refdetail['status']
 		);
 	}
@@ -307,7 +307,7 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_tasksressource($taskressource,$outputlangs)
+	function get_substitutionarray_tasksressource($taskressource, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
@@ -331,16 +331,16 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_taskstime($tasktime,$outputlangs)
+	function get_substitutionarray_taskstime($tasktime, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
 
 		return array(
 		'tasktime_rowid'=>$tasktime['rowid'],
-		'tasktime_task_date'=>dol_print_date($tasktime['task_date'],'day'),
+		'tasktime_task_date'=>dol_print_date($tasktime['task_date'], 'day'),
 		'tasktime_task_duration_sec'=>$tasktime['task_duration'],
-		'tasktime_task_duration'=>convertSecondToTime($tasktime['task_duration'],'all'),
+		'tasktime_task_duration'=>convertSecondToTime($tasktime['task_duration'], 'all'),
 		'tasktime_note'=>$tasktime['note'],
 		'tasktime_fk_user'=>$tasktime['fk_user'],
 		'tasktime_user_name'=>$tasktime['name'],
@@ -360,14 +360,14 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_task_file($file,$outputlangs)
+	function get_substitutionarray_task_file($file, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
 
 		return array(
 		'tasksfile_name'=>$file['name'],
-		'tasksfile_date'=>dol_print_date($file['date'],'day'),
+		'tasksfile_date'=>dol_print_date($file['date'], 'day'),
 		'tasksfile_size'=>$file['size']
 		);
 	}
@@ -381,83 +381,83 @@ 
 	 */
 	function info($langs)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("companies","errors"));
+        $langs->loadLangs(array("companies", "errors"));
 
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="PROJECT_ADDON_PDF_ODT_PATH">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="PROJECT_ADDON_PDF_ODT_PATH">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		// List of directories area
-		$texte.= '<tr><td>';
-		$texttitle=$langs->trans("ListOfDirectories");
-		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->PROJECT_ADDON_PDF_ODT_PATH)));
-		$listoffiles=array();
-		foreach($listofdir as $key=>$tmpdir)
+		$texte .= '<tr><td>';
+		$texttitle = $langs->trans("ListOfDirectories");
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->PROJECT_ADDON_PDF_ODT_PATH)));
+		$listoffiles = array();
+		foreach ($listofdir as $key=>$tmpdir)
 		{
-			$tmpdir=trim($tmpdir);
-			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-			if (! $tmpdir) {
+			$tmpdir = trim($tmpdir);
+			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
 			else
 			{
-				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
+				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
 		}
-		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
 		// Add list of substitution keys
-		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
-		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
-
-		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
-		$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
-		$texte.= '<textarea class="flat" cols="60" name="value1">';
-		$texte.=$conf->global->PROJECT_ADDON_PDF_ODT_PATH;
-		$texte.= '</textarea>';
-		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
-		$texte.= '<br></div></div>';
+		$texthelp .= '<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp .= $langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
+
+		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
+		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+		$texte .= '<textarea class="flat" cols="60" name="value1">';
+		$texte .= $conf->global->PROJECT_ADDON_PDF_ODT_PATH;
+		$texte .= '</textarea>';
+		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
+		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<br></div></div>';
 
 		// Scan directories
-		$nbofiles=count($listoffiles);
-		if (! empty($conf->global->PROJECT_ADDON_PDF_ODT_PATH))
+		$nbofiles = count($listoffiles);
+		if (!empty($conf->global->PROJECT_ADDON_PDF_ODT_PATH))
 		{
-			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>';
+			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
-			$texte.=$nbofiles;
+			$texte .= $nbofiles;
 			//$texte.=$nbofiles?'</a>':'';
-			$texte.='</b>';
+			$texte .= '</b>';
 		}
 
 		if ($nbofiles)
 		{
-   			$texte.='<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach($listoffiles as $file)
+   			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
+   			foreach ($listoffiles as $file)
    			{
-                $texte.=$file['name'].'<br>';
+                $texte .= $file['name'].'<br>';
    			}
-   			$texte.='<div id="div_'.get_class($this).'">';
+   			$texte .= '<div id="div_'.get_class($this).'">';
 		}
 
-		$texte.= '</td>';
+		$texte .= '</td>';
 
-		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
-		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
-		$texte.= '</td>';
-		$texte.= '</tr>';
+		$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</td>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
 	}
@@ -471,10 +471,10 @@ 
 	 * 	@param	string		$srctemplatepath	    Full path of source filename for generator using a template file
 	 *	@return	int         						1 if OK, <=0 if KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath)
+	function write_file($object, $outputlangs, $srctemplatepath)
 	{
         // phpcs:enable
-		global $user,$langs,$conf,$mysoc,$hookmanager;
+		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
 		{
@@ -483,17 +483,17 @@ 
 		}
 
 		// Add odtgeneration hook
-		if (! is_object($hookmanager))
+		if (!is_object($hookmanager))
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
+			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='UTF-8';
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		$sav_charset_output = $outputlangs->charset_output;
+		$outputlangs->charset_output = 'UTF-8';
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
@@ -501,28 +501,28 @@ 
 		if ($conf->projet->dir_output)
 		{
 			// If $object is id instead of object
-			if (! is_object($object))
+			if (!is_object($object))
 			{
 				$id = $object;
 				$object = new Project($this->db);
-				$result=$object->fetch($id);
+				$result = $object->fetch($id);
 				if ($result < 0)
 				{
-					dol_print_error($this->db,$object->error);
+					dol_print_error($this->db, $object->error);
 					return -1;
 				}
 			}
 
 			$dir = $conf->projet->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
-			$file = $dir . "/" . $objectref . ".odt";
+			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			$file = $dir."/".$objectref.".odt";
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
@@ -530,25 +530,25 @@ 
 			if (file_exists($dir))
 			{
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
-				$newfile=basename($srctemplatepath);
-				$newfiletmp=preg_replace('/\.od(t|s)/i','',$newfile);
-				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
-				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
-				$newfiletmp=$objectref.'_'.$newfiletmp;
+				$newfile = basename($srctemplatepath);
+				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
+				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
+				$newfiletmp = $objectref.'_'.$newfiletmp;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
-				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
-				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
+				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
-					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
+				    $format = $conf->global->MAIN_DOC_USE_TIMING;
+				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
 				else
 				{
-					$filename=$newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp.'.'.$newfileformat;
 				}
-				$file=$dir.'/'.$filename;
+				$file = $dir.'/'.$filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -557,33 +557,33 @@ 
 				dol_mkdir($conf->projet->dir_temp);
 
 				// If PROJECTLEADER contact defined on project, we use it
-				$usecontact=false;
-				$arrayidcontact=$object->getIdContact('external','PROJECTLEADER');
+				$usecontact = false;
+				$arrayidcontact = $object->getIdContact('external', 'PROJECTLEADER');
 				if (count($arrayidcontact) > 0)
 				{
-					$usecontact=true;
-					$result=$object->fetch_contact($arrayidcontact[0]);
+					$usecontact = true;
+					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
 
 				// Recipient name
-				$contactobject=null;
-				if (! empty($usecontact))
+				$contactobject = null;
+				if (!empty($usecontact))
 				{
         			// if we have a PROJECTLEADER contact and we dont use it as recipient we store the contact object for later use
         			$contactobject = $object->contact;
 				}
 
-				$socobject=$object->thirdparty;
+				$socobject = $object->thirdparty;
 
 				// Make substitution
-				$substitutionarray=array(
+				$substitutionarray = array(
 				'__FROM_NAME__' => $this->emetteur->name,
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
@@ -592,13 +592,13 @@ 
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->projet->dir_temp,
-						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+						'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
 						'DELIMITER_LEFT'  => '{',
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
 				} catch (Exception $e) {
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
 				}
@@ -612,26 +612,26 @@ 
 				// Define substitution array
 				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 				$array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
-				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
-				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
-				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
-				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_other=$this->get_substitutionarray_other($outputlangs);
+				$array_objet = $this->get_substitutionarray_object($object, $outputlangs);
+				$array_user = $this->get_substitutionarray_user($user, $outputlangs);
+				$array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
+				$array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_project_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_project_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				if ($usecontact && is_object($contactobject)) $array_project_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
 
-				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_project_contact);
+				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other, $array_project_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 
 				// Call the ODTSubstitution hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				foreach($tmparray as $key=>$value)
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/', $key)) // Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
@@ -655,43 +655,43 @@ 
 					$taskstatic = new Task($this->db);
 
 					// Security check
-					$socid=0;
+					$socid = 0;
 					if (!empty($object->fk_soc)) $socid = $object->fk_soc;
 
-					$tasksarray=$taskstatic->getTasksArray(0, 0, $object->id, $socid, 0);
+					$tasksarray = $taskstatic->getTasksArray(0, 0, $object->id, $socid, 0);
 
 
 					foreach ($tasksarray as $task)
 					{
-						$tmparray=$this->get_substitutionarray_tasks($task,$outputlangs);
+						$tmparray = $this->get_substitutionarray_tasks($task, $outputlangs);
 						//complete_substitutions_array($tmparray, $outputlangs, $object, $task, "completesubstitutionarray_lines");
-						foreach($tmparray as $key => $val)
+						foreach ($tmparray as $key => $val)
 						{
 							try
 							{
 								$listlines->setVars($key, $val, true, 'UTF-8');
 							}
-							catch(OdfException $e)
+							catch (OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
-							catch(SegmentException $e)
+							catch (SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
 						}
 
-						$taskobj=new Task($this->db);
+						$taskobj = new Task($this->db);
 						$taskobj->fetch($task->id);
 
 						// Replace tags of lines for contacts task
-						$sourcearray=array('internal','external');
-						$contact_arrray=array();
+						$sourcearray = array('internal', 'external');
+						$contact_arrray = array();
 						foreach ($sourcearray as $source) {
-							$contact_temp=$taskobj->liste_contact(-1,$source);
+							$contact_temp = $taskobj->liste_contact(-1, $source);
 							if ((is_array($contact_temp) && count($contact_temp) > 0))
 							{
-								$contact_arrray=array_merge($contact_arrray,$contact_temp);
+								$contact_arrray = array_merge($contact_arrray, $contact_temp);
 							}
 						}
 						if ((is_array($contact_arrray) && count($contact_arrray) > 0))
@@ -700,33 +700,33 @@ 
 
 							foreach ($contact_arrray as $contact)
 							{
-								if ($contact['source']=='internal') {
-									$objectdetail=new User($this->db);
+								if ($contact['source'] == 'internal') {
+									$objectdetail = new User($this->db);
 									$objectdetail->fetch($contact['id']);
-									$contact['socname']=$mysoc->name;
-								} elseif ($contact['source']=='external') {
-									$objectdetail=new Contact($this->db);
+									$contact['socname'] = $mysoc->name;
+								} elseif ($contact['source'] == 'external') {
+									$objectdetail = new Contact($this->db);
 									$objectdetail->fetch($contact['id']);
 
-									$soc=new Societe($this->db);
+									$soc = new Societe($this->db);
 									$soc->fetch($contact['socid']);
-									$contact['socname']=$soc->name;
+									$contact['socname'] = $soc->name;
 								}
-								$contact['fullname']=$objectdetail->getFullName($outputlangs,1);
+								$contact['fullname'] = $objectdetail->getFullName($outputlangs, 1);
 
-								$tmparray=$this->get_substitutionarray_tasksressource($contact,$outputlangs);
+								$tmparray = $this->get_substitutionarray_tasksressource($contact, $outputlangs);
 
-								foreach($tmparray as $key => $val)
+								foreach ($tmparray as $key => $val)
 								{
 									try
 									{
 										$listlinestaskres->setVars($key, $val, true, 'UTF-8');
 									}
-									catch(OdfException $e)
+									catch (OdfException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
-									catch(SegmentException $e)
+									catch (SegmentException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
@@ -737,7 +737,7 @@ 
 
 						//Time ressources
 						$sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note";
-						$sql.= ", u.lastname, u.firstname, t.thm";
+						$sql .= ", u.lastname, u.firstname, t.thm";
 						$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
 						$sql .= " , ".MAIN_DB_PREFIX."user as u";
 						$sql .= " WHERE t.fk_task =".$task->id;
@@ -750,33 +750,33 @@ 
 							$num = $this->db->num_rows($resql);
 							$i = 0;
 							$tasks = array();
-							$row=array();
+							$row = array();
 							$listlinestasktime = $listlines->__get('taskstimes');
 							if (empty($num)) {
-								$row['rowid']='';
-								$row['task_date']='';
-								$row['task_duration']='';
-								$row['$tasktime']='';
-								$row['note']='';
-								$row['fk_user']='';
-								$row['name']='';
-								$row['firstname']='';
-								$row['fullcivname']='';
-								$row['amountht']='';
-								$row['amountttc']='';
-								$row['thm']='';
-								$tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
-								foreach($tmparray as $key => $val)
+								$row['rowid'] = '';
+								$row['task_date'] = '';
+								$row['task_duration'] = '';
+								$row['$tasktime'] = '';
+								$row['note'] = '';
+								$row['fk_user'] = '';
+								$row['name'] = '';
+								$row['firstname'] = '';
+								$row['fullcivname'] = '';
+								$row['amountht'] = '';
+								$row['amountttc'] = '';
+								$row['thm'] = '';
+								$tmparray = $this->get_substitutionarray_taskstime($row, $outputlangs);
+								foreach ($tmparray as $key => $val)
 								{
 									try
 									{
 										$listlinestasktime->setVars($key, $val, true, 'UTF-8');
 									}
-									catch(OdfException $e)
+									catch (OdfException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
-									catch(SegmentException $e)
+									catch (SegmentException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
@@ -787,36 +787,36 @@ 
 							{
 								$row = $this->db->fetch_array($resql);
 								if (!empty($row['fk_user'])) {
-									$objectdetail=new User($this->db);
+									$objectdetail = new User($this->db);
 									$objectdetail->fetch($row['fk_user']);
-									$row['fullcivname']=$objectdetail->getFullName($outputlangs,1);
+									$row['fullcivname'] = $objectdetail->getFullName($outputlangs, 1);
 								} else {
-									$row['fullcivname']='';
+									$row['fullcivname'] = '';
 								}
 
 								if (!empty($row['thm'])) {
-									$row['amountht']=($row['task_duration'] / 3600) * $row['thm'];
+									$row['amountht'] = ($row['task_duration'] / 3600) * $row['thm'];
 									$defaultvat = get_default_tva($mysoc, $mysoc);
-									$row['amountttc']=price2num($row['amountht'] * (1 + ($defaultvat / 100)),'MT');
+									$row['amountttc'] = price2num($row['amountht'] * (1 + ($defaultvat / 100)), 'MT');
 								} else {
-									$row['amountht']=0;
-									$row['amountttc']=0;
-									$row['thm']=0;
+									$row['amountht'] = 0;
+									$row['amountttc'] = 0;
+									$row['thm'] = 0;
 								}
 
-								$tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
+								$tmparray = $this->get_substitutionarray_taskstime($row, $outputlangs);
 
-								foreach($tmparray as $key => $val)
+								foreach ($tmparray as $key => $val)
 								{
 									try
 									{
 										$listlinestasktime->setVars($key, $val, true, 'UTF-8');
 									}
-									catch(OdfException $e)
+									catch (OdfException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
-									catch(SegmentException $e)
+									catch (SegmentException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
@@ -832,14 +832,14 @@ 
 						$listtasksfiles = $listlines->__get('tasksfiles');
 
 						$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref).'/'.dol_sanitizeFileName($task->ref);
-						$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
+						$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', 'name', SORT_ASC, 1);
 
 
 						foreach ($filearray as $filedetail)
 						{
-							$tmparray=$this->get_substitutionarray_task_file($filedetail,$outputlangs);
+							$tmparray = $this->get_substitutionarray_task_file($filedetail, $outputlangs);
 							//dol_syslog(get_class($this).'::main $tmparray'.var_export($tmparray,true));
-							foreach($tmparray as $key => $val)
+							foreach ($tmparray as $key => $val)
 							{
 								try
 								{
@@ -860,13 +860,13 @@ 
 					}
 					$odfHandler->mergeSegment($listlines);
 				}
-				catch(OdfException $e)
+				catch (OdfException $e)
 				{
-					$ExceptionTrace=$e->getTrace();
+					$ExceptionTrace = $e->getTrace();
 					// no segment defined on ODT is not an error
-					if($ExceptionTrace[0]['function'] != 'setSegment')
+					if ($ExceptionTrace[0]['function'] != 'setSegment')
 					{
-						$this->error=$e->getMessage();
+						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 						return -1;
 					}
@@ -878,24 +878,24 @@ 
 					$listlines = $odfHandler->setSegment('projectfiles');
 
 					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
-					$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
+					$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', 'name', SORT_ASC, 1);
 
 					foreach ($filearray as $filedetail)
 					{
 						//dol_syslog(get_class($this).'::main $filedetail'.var_export($filedetail,true));
-						$tmparray=$this->get_substitutionarray_project_file($filedetail,$outputlangs);
+						$tmparray = $this->get_substitutionarray_project_file($filedetail, $outputlangs);
 
-						foreach($tmparray as $key => $val)
+						foreach ($tmparray as $key => $val)
 						{
 							try
 							{
 								$listlines->setVars($key, $val, true, 'UTF-8');
 							}
-							catch(OdfException $e)
+							catch (OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
-							catch(SegmentException $e)
+							catch (SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -904,21 +904,21 @@ 
 					}
 					$odfHandler->mergeSegment($listlines);
 				}
-				catch(OdfException $e)
+				catch (OdfException $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
 				}
 
 				// Replace tags of lines for contacts
-				$sourcearray=array('internal','external');
-				$contact_arrray=array();
+				$sourcearray = array('internal', 'external');
+				$contact_arrray = array();
 				foreach ($sourcearray as $source) {
-					$contact_temp=$object->liste_contact(-1,$source);
+					$contact_temp = $object->liste_contact(-1, $source);
 					if ((is_array($contact_temp) && count($contact_temp) > 0))
 					{
-						$contact_arrray=array_merge($contact_arrray,$contact_temp);
+						$contact_arrray = array_merge($contact_arrray, $contact_temp);
 					}
 				}
 				if ((is_array($contact_arrray) && count($contact_arrray) > 0))
@@ -929,32 +929,32 @@ 
 
 						foreach ($contact_arrray as $contact)
 						{
-							if ($contact['source']=='internal') {
-								$objectdetail=new User($this->db);
+							if ($contact['source'] == 'internal') {
+								$objectdetail = new User($this->db);
 								$objectdetail->fetch($contact['id']);
-								$contact['socname']=$mysoc->name;
-							} elseif ($contact['source']=='external') {
-								$objectdetail=new Contact($this->db);
+								$contact['socname'] = $mysoc->name;
+							} elseif ($contact['source'] == 'external') {
+								$objectdetail = new Contact($this->db);
 								$objectdetail->fetch($contact['id']);
 
-								$soc=new Societe($this->db);
+								$soc = new Societe($this->db);
 								$soc->fetch($contact['socid']);
-								$contact['socname']=$soc->name;
+								$contact['socname'] = $soc->name;
 							}
-							$contact['fullname']=$objectdetail->getFullName($outputlangs,1);
+							$contact['fullname'] = $objectdetail->getFullName($outputlangs, 1);
 
-							$tmparray=$this->get_substitutionarray_project_contacts($contact,$outputlangs);
-							foreach($tmparray as $key => $val)
+							$tmparray = $this->get_substitutionarray_project_contacts($contact, $outputlangs);
+							foreach ($tmparray as $key => $val)
 							{
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
-								catch(OdfException $e)
+								catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
-								catch(SegmentException $e)
+								catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -963,9 +963,9 @@ 
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
-						$this->error=$e->getMessage();
+						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 						return -1;
 					}
@@ -1065,14 +1065,14 @@ 
 						'title' => "ListSocialContributionAssociatedProject",
 						'class' => 'ChargeSociales',
 						'table' => 'chargesociales',
-						'urlnew' => DOL_URL_ROOT . '/compta/sociales/card.php?action=create&projectid=' . $object->id,
+						'urlnew' => DOL_URL_ROOT.'/compta/sociales/card.php?action=create&projectid='.$object->id,
 						'test' => $conf->tax->enabled && $user->rights->tax->charges->lire
 					),
 					'stock_mouvement' => array(
 						'title' => "ListMouvementStockProject",
 						'class' => 'MouvementStock',
 						'table' => 'stock_mouvement',
-						'test' => ($conf->stock->enabled && $user->rights->stock->mouvement->lire && ! empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW))
+						'test' => ($conf->stock->enabled && $user->rights->stock->mouvement->lire && !empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW))
 					),
 					'agenda' => array(
 						'title' => "ListActionsAssociatedProject",
@@ -1090,72 +1090,72 @@ 
 
 					foreach ($listofreferent as $keyref => $valueref)
 					{
-						$title=$valueref['title'];
-						$tablename=$valueref['table'];
-						$classname=$valueref['class'];
-						$qualified=$valueref['test'];
+						$title = $valueref['title'];
+						$tablename = $valueref['table'];
+						$classname = $valueref['class'];
+						$qualified = $valueref['test'];
 						if ($qualified)
 						{
 							$elementarray = $object->get_element_list($keyref, $tablename);
-							if (count($elementarray)>0 && is_array($elementarray))
+							if (count($elementarray) > 0 && is_array($elementarray))
 							{
 								$total_ht = 0;
 								$total_ttc = 0;
-								$num=count($elementarray);
+								$num = count($elementarray);
 								for ($i = 0; $i < $num; $i++)
 								{
-									$ref_array=array();
-									$ref_array['type']=$langs->trans($classname);
+									$ref_array = array();
+									$ref_array['type'] = $langs->trans($classname);
 
 									$element = new $classname($this->db);
 									$element->fetch($elementarray[$i]);
 									$element->fetch_thirdparty();
 
 									//Ref object
-									$ref_array['ref']=$element->ref;
+									$ref_array['ref'] = $element->ref;
 
 									//Date object
-									$dateref=$element->date;
-									if (empty($dateref)) $dateref=$element->datep;
-									if (empty($dateref)) $dateref=$element->date_contrat;
-									$ref_array['date']=$dateref;
+									$dateref = $element->date;
+									if (empty($dateref)) $dateref = $element->datep;
+									if (empty($dateref)) $dateref = $element->date_contrat;
+									$ref_array['date'] = $dateref;
 
 									//Soc object
 									if (is_object($element->thirdparty)) {
-										$ref_array['socname']=$element->thirdparty->name;
+										$ref_array['socname'] = $element->thirdparty->name;
 									} else {
-										$ref_array['socname']='';
+										$ref_array['socname'] = '';
 									}
 
 									//Amount object
 									if (empty($valueref['disableamount'])) {
 										if (!empty($element->total_ht)) {
-											$ref_array['amountht']=$element->total_ht;
-											$ref_array['amountttc']=$element->total_ttc;
+											$ref_array['amountht'] = $element->total_ht;
+											$ref_array['amountttc'] = $element->total_ttc;
 										} else {
-											$ref_array['amountht']=0;
-											$ref_array['amountttc']=0;
+											$ref_array['amountht'] = 0;
+											$ref_array['amountttc'] = 0;
 										}
 									} else {
-										$ref_array['amountht']='';
-										$ref_array['amountttc']='';
+										$ref_array['amountht'] = '';
+										$ref_array['amountttc'] = '';
 									}
 
-									$ref_array['status']=$element->getLibStatut(0);
+									$ref_array['status'] = $element->getLibStatut(0);
 
-									$tmparray=$this->get_substitutionarray_project_reference($ref_array,$outputlangs);
+									$tmparray = $this->get_substitutionarray_project_reference($ref_array, $outputlangs);
 
-									foreach($tmparray as $key => $val)
+									foreach ($tmparray as $key => $val)
 									{
 										try
 										{
 											$listlines->setVars($key, $val, true, 'UTF-8');
 										}
-										catch(OdfException $e)
+										catch (OdfException $e)
 										{
 											dol_syslog($e->getMessage(), LOG_INFO);
 										}
-										catch(SegmentException $e)
+										catch (SegmentException $e)
 										{
 											dol_syslog($e->getMessage(), LOG_INFO);
 										}
@@ -1166,15 +1166,15 @@ 
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				} catch(OdfException $e) {
-					$this->error=$e->getMessage();
+				} catch (OdfException $e) {
+					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
 				}
 
 				// Replace labels translated
-				$tmparray=$outputlangs->get_translations_for_substitutions();
-				foreach($tmparray as $key=>$value)
+				$tmparray = $outputlangs->get_translations_for_substitutions();
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
@@ -1184,8 +1184,8 @@ 
 				}
 
 				// Call the beforeODTSave hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 
 				// Write new file
@@ -1193,33 +1193,33 @@ 
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
-						$this->error=$e->getMessage();
+						$this->error = $e->getMessage();
 						return -1;
 					}
 				} else {
 					try {
 						$odfHandler->saveToDisk($file);
-					} catch (Exception $e){
-						$this->error=$e->getMessage();
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-				$odfHandler=null;	// Destroy object
+				$odfHandler = null; // Destroy object
 
 				$this->result = array('fullpath'=>$file);
 
-				return 1;   // Success
+				return 1; // Success
 			}
 			else
 			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
 		}

Braces +92 added lines, -71 removed lines

@@ -37,16 +37,36 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (! empty($conf->propal->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (! empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
-if (! empty($conf->commande->enabled))    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (! empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-if (! empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-if (! empty($conf->contrat->enabled))     require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (! empty($conf->ficheinter->enabled))  require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-if (! empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
-if (! empty($conf->agenda->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+if (! empty($conf->propal->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (! empty($conf->facture->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+}
+if (! empty($conf->facture->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
+}
+if (! empty($conf->commande->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
+if (! empty($conf->fournisseur->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+}
+if (! empty($conf->fournisseur->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+}
+if (! empty($conf->contrat->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+}
+if (! empty($conf->ficheinter->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+}
+if (! empty($conf->deplacement->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
+}
+if (! empty($conf->agenda->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+}
 
 
 /**
@@ -113,7 +133,10 @@ 
 
 		// Recupere emetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2);    // Par defaut, si n'etait pas defini
+		if (! $this->emetteur->pays_code) {
+		    $this->emetteur->pays_code=substr($langs->defaultlang,-2);
+		}
+		// Par defaut, si n'etait pas defini
 	}
 
 
@@ -407,11 +430,14 @@ 
 			if (! $tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
-			else
+			if (! is_dir($tmpdir)) {
+			    $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			} else
 			{
 				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+				if (count($tmpfiles)) {
+				    $listoffiles=array_merge($listoffiles,$tmpfiles);
+				}
 			}
 		}
 		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
@@ -491,7 +517,9 @@ 
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		$sav_charset_output=$outputlangs->charset_output;
 		$outputlangs->charset_output='UTF-8';
 
@@ -515,7 +543,9 @@ 
 
 			$dir = $conf->projet->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+			if (! preg_match('/specimen/i',$objectref)) {
+			    $dir.= "/" . $objectref;
+			}
 			$file = $dir . "/" . $objectref . ".odt";
 
 			if (! file_exists($dir))
@@ -541,10 +571,11 @@ 
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
 				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
+				    if ($format == '1') {
+				        $format='%Y%m%d%H%M%S';
+				    }
 					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
-				}
-				else
+				} else
 				{
 					$filename=$newfiletmp.'.'.$newfileformat;
 				}
@@ -619,7 +650,9 @@ 
 				$array_other=$this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_project_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_project_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				if ($usecontact && is_object($contactobject)) {
+				    $array_project_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_project_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -631,17 +664,18 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/',$key)) {
+						    // Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else {
+							    $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else    // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -656,7 +690,9 @@ 
 
 					// Security check
 					$socid=0;
-					if (!empty($object->fk_soc)) $socid = $object->fk_soc;
+					if (!empty($object->fk_soc)) {
+					    $socid = $object->fk_soc;
+					}
 
 					$tasksarray=$taskstatic->getTasksArray(0, 0, $object->id, $socid, 0);
 
@@ -670,12 +706,10 @@ 
 							try
 							{
 								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch(OdfException $e)
+							} catch(OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch(SegmentException $e)
+							} catch(SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -721,12 +755,10 @@ 
 									try
 									{
 										$listlinestaskres->setVars($key, $val, true, 'UTF-8');
-									}
-									catch(OdfException $e)
+									} catch(OdfException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
-									}
-									catch(SegmentException $e)
+									} catch(SegmentException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
@@ -771,12 +803,10 @@ 
 									try
 									{
 										$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-									}
-									catch(OdfException $e)
+									} catch(OdfException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
-									}
-									catch(SegmentException $e)
+									} catch(SegmentException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
@@ -811,12 +841,10 @@ 
 									try
 									{
 										$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-									}
-									catch(OdfException $e)
+									} catch(OdfException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
-									}
-									catch(SegmentException $e)
+									} catch(SegmentException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
@@ -844,12 +872,10 @@ 
 								try
 								{
 									$listtasksfiles->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -859,8 +885,7 @@ 
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$ExceptionTrace=$e->getTrace();
 					// no segment defined on ODT is not an error
@@ -890,12 +915,10 @@ 
 							try
 							{
 								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch(OdfException $e)
+							} catch(OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch(SegmentException $e)
+							} catch(SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -903,8 +926,7 @@ 
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -949,12 +971,10 @@ 
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
+								} catch(OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch(SegmentException $e)
+								} catch(SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -962,8 +982,7 @@ 
 							$listlines->merge();
 						}
 						$odfHandler->mergeSegment($listlines);
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 						$this->error=$e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
@@ -1116,8 +1135,12 @@ 
 
 									//Date object
 									$dateref=$element->date;
-									if (empty($dateref)) $dateref=$element->datep;
-									if (empty($dateref)) $dateref=$element->date_contrat;
+									if (empty($dateref)) {
+									    $dateref=$element->datep;
+									}
+									if (empty($dateref)) {
+									    $dateref=$element->date_contrat;
+									}
 									$ref_array['date']=$dateref;
 
 									//Soc object
@@ -1150,12 +1173,10 @@ 
 										try
 										{
 											$listlines->setVars($key, $val, true, 'UTF-8');
-										}
-										catch(OdfException $e)
+										} catch(OdfException $e)
 										{
 											dol_syslog($e->getMessage(), LOG_INFO);
-										}
-										catch(SegmentException $e)
+										} catch(SegmentException $e)
 										{
 											dol_syslog($e->getMessage(), LOG_INFO);
 										}
@@ -1208,16 +1229,16 @@ 
 				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
 				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+									@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler=null;	// Destroy object
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;   // Success
-			}
-			else
+			} else
 			{
 				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return -1;

dolibarr/htdocs/core/modules/project/modules_project.php

Indentation +94 added lines, -94 removed lines

@@ -31,33 +31,33 @@ 
  */
 abstract class ModelePDFProjects 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='project';
-		$liste=array();
+        $type='project';
+        $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;
+    }
 }
 
 
@@ -67,83 +67,83 @@ 
  */
 abstract class ModeleNumRefProjects
 {
-	/**
-	 * @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;
-	}
-
-	/**
-	 *  Renvoi la description par defaut du modele de numerotation
-	 *
-	 *  @return     string      Texte descripif
-	 */
-	function info()
-	{
-		global $langs;
-		$langs->load("projects");
-		return $langs->trans("NoDescription");
-	}
-
-	/**
-	 *  Renvoi un exemple de numerotation
-	 *
-	 *  @return     string      Example
-	 */
-	function getExample()
-	{
-		global $langs;
-		$langs->load("projects");
-		return $langs->trans("NoExample");
-	}
-
-	/**
-	 *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
-	 *  de conflits qui empechera cette numerotation de fonctionner.
-	 *
-	 *  @return     boolean     false si conflit, true si ok
-	 */
-	function canBeActivated()
-	{
-		return true;
-	}
-
-	/**
-	 *  Renvoi prochaine valeur attribuee
-	 *
-	 *	@param	Societe		$objsoc		Object third party
-	 *	@param	Project		$project	Object project
-	 *	@return	string					Valeur
-	 */
-	function getNextValue($objsoc, $project)
-	{
-		global $langs;
-		return $langs->trans("NotAvailable");
-	}
-
-	/**
-	 *  Renvoi 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;
+    }
+
+    /**
+     *  Renvoi la description par defaut du modele de numerotation
+     *
+     *  @return     string      Texte descripif
+     */
+    function info()
+    {
+        global $langs;
+        $langs->load("projects");
+        return $langs->trans("NoDescription");
+    }
+
+    /**
+     *  Renvoi un exemple de numerotation
+     *
+     *  @return     string      Example
+     */
+    function getExample()
+    {
+        global $langs;
+        $langs->load("projects");
+        return $langs->trans("NoExample");
+    }
+
+    /**
+     *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
+     *  de conflits qui empechera cette numerotation de fonctionner.
+     *
+     *  @return     boolean     false si conflit, true si ok
+     */
+    function canBeActivated()
+    {
+        return true;
+    }
+
+    /**
+     *  Renvoi prochaine valeur attribuee
+     *
+     *	@param	Societe		$objsoc		Object third party
+     *	@param	Project		$project	Object project
+     *	@return	string					Valeur
+     */
+    function getNextValue($objsoc, $project)
+    {
+        global $langs;
+        return $langs->trans("NotAvailable");
+    }
+
+    /**
+     *  Renvoi 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 +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -45,16 +45,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='project';
-		$liste=array();
+		$type = 'project';
+		$liste = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		$liste = getListOfModels($db, $type, $maxfilenamelength);
 
 		return $liste;
 	}
@@ -70,7 +70,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 *  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/project/mod_project_simple.php

Indentation +63 added lines, -63 removed lines

@@ -31,30 +31,30 @@ 
  */
 class mod_project_simple extends ModeleNumRefProjects
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
 
-	public $prefix='PJ';
+    public $prefix='PJ';
 
     /**
-	 * @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='Simple';
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see name
+     */
+    public $nom='Simple';
 
-	/**
-	 * @var string model name
-	 */
-	public $name='Simple';
+    /**
+     * @var string model name
+     */
+    public $name='Simple';
 
 
     /**
@@ -64,8 +64,8 @@ 
      */
     function info()
     {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+        global $langs;
+            return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
     }
 
 
@@ -87,14 +87,14 @@ 
      */
     function canBeActivated()
     {
-    	global $conf,$langs,$db;
+        global $conf,$langs,$db;
 
         $coyymm=''; $max='';
 
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+        $posindice=8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
         $sql.= " FROM ".MAIN_DB_PREFIX."projet";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
         $sql.= " AND entity = ".$conf->entity;
         $resql=$db->query($sql);
         if ($resql)
@@ -108,54 +108,54 @@ 
         }
         else
         {
-			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
+            $langs->load("errors");
+            $this->error=$langs->trans('ErrorNumRefModel',$max);
             return false;
         }
     }
 
 
-   /**
-	*  Return next value
-	*
-	*  @param   Societe	$objsoc		Object third party
-	*  @param   Project	$project	Object project
-	*  @return	string				Value if OK, 0 if KO
-	*/
+    /**
+     *  Return next value
+     *
+     *  @param   Societe	$objsoc		Object third party
+     *  @param   Project	$project	Object project
+     *  @return	string				Value if OK, 0 if KO
+     */
     function getNextValue($objsoc, $project)
     {
-		global $db,$conf;
-
-		// D'abord on recupere la valeur max
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."projet";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
-		{
-			dol_syslog("mod_project_simple::getNextValue", LOG_DEBUG);
-			return -1;
-		}
-
-		$date=empty($project->date_c)?dol_now():$project->date_c;
-
-		//$yymm = strftime("%y%m",time());
-		$yymm = strftime("%y%m",$date);
-
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
-
-		dol_syslog("mod_project_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
-		return $this->prefix.$yymm."-".$num;
+        global $db,$conf;
+
+        // 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."projet";
+        $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_project_simple::getNextValue", LOG_DEBUG);
+            return -1;
+        }
+
+        $date=empty($project->date_c)?dol_now():$project->date_c;
+
+        //$yymm = strftime("%y%m",time());
+        $yymm = strftime("%y%m",$date);
+
+        if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
+        else $num = sprintf("%04s",$max+1);
+
+        dol_syslog("mod_project_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
+        return $this->prefix.$yymm."-".$num;
     }
 
 

Spacing +29 added lines, -29 removed lines

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

Braces +14 added lines, -8 removed lines

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

dolibarr/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php

Indentation +756 added lines, -756 removed lines

@@ -55,84 +55,84 @@ 
  */
 class doc_generic_task_odt extends ModelePDFTask
 {
-	/**
-	 * Issuer
-	 * @var Company object that emits
-	 */
-	public $emetteur;
-
-	/**
-   * @var array() Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.4 = array(5, 4)
-   */
-	public $phpmin = array(5, 4);
-
-	/**
+    /**
+     * Issuer
+     * @var Company object that emits
+     */
+    public $emetteur;
+
+    /**
+     * @var array() Minimum version of PHP required by module.
+     * e.g.: PHP ≥ 5.4 = array(5, 4)
+     */
+    public $phpmin = array(5, 4);
+
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $langs, $mysoc;
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $langs, $mysoc;
 
-		// Load translation files required by the page
+        // Load translation files required by the page
         $langs->loadLangs(array("main","companies"));
 
-		$this->db = $db;
-		$this->name = "ODT templates";
-		$this->description = $langs->trans("DocumentModelOdt");
-		$this->scandir = 'PROJECT_TASK_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
-
-		// Dimension page pour format A4
-		$this->type = 'odt';
-		$this->page_largeur = 0;
-		$this->page_hauteur = 0;
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=0;
-		$this->marge_droite=0;
-		$this->marge_haute=0;
-		$this->marge_basse=0;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 0;                     // Gere option tva COMMANDE_TVAOPTION
-		$this->option_modereg = 0;                 // Affiche mode reglement
-		$this->option_condreg = 0;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 0;      // Affiche code produit-service
-		$this->option_multilang = 0;               // 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 = 0;		   // Support add of a watermark on drafts
-
-		// Recupere emetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2);    // Par defaut, si n'etait pas defini
-	}
+        $this->db = $db;
+        $this->name = "ODT templates";
+        $this->description = $langs->trans("DocumentModelOdt");
+        $this->scandir = 'PROJECT_TASK_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+
+        // Dimension page pour format A4
+        $this->type = 'odt';
+        $this->page_largeur = 0;
+        $this->page_hauteur = 0;
+        $this->format = array($this->page_largeur,$this->page_hauteur);
+        $this->marge_gauche=0;
+        $this->marge_droite=0;
+        $this->marge_haute=0;
+        $this->marge_basse=0;
+
+        $this->option_logo = 1;                    // Affiche logo
+        $this->option_tva = 0;                     // Gere option tva COMMANDE_TVAOPTION
+        $this->option_modereg = 0;                 // Affiche mode reglement
+        $this->option_condreg = 0;                 // Affiche conditions reglement
+        $this->option_codeproduitservice = 0;      // Affiche code produit-service
+        $this->option_multilang = 0;               // 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 = 0;		   // Support add of a watermark on drafts
+
+        // Recupere emetteur
+        $this->emetteur=$mysoc;
+        if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2);    // Par defaut, si n'etait pas defini
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Define array with couple substitution key => substitution value
-	 *
-	 * @param   Project			$object             Main object to use as data source
-	 * @param   Translate		$outputlangs        Lang object to use for output
+    /**
+     * Define array with couple substitution key => substitution value
+     *
+     * @param   Project			$object             Main object to use as data source
+     * @param   Translate		$outputlangs        Lang object to use for output
      * @param   string		    $array_key	        Name of the key for return array
-	 * @return	array								Array of substitution
-	 */
-	function get_substitutionarray_object($object,$outputlangs,$array_key='object')
-	{
+     * @return	array								Array of substitution
+     */
+    function get_substitutionarray_object($object,$outputlangs,$array_key='object')
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		$resarray=array(
+        $resarray=array(
             $array_key.'_id'=>$object->id,
             $array_key.'_ref'=>$object->ref,
             $array_key.'_title'=>$object->title,
@@ -145,735 +145,735 @@ 
             $array_key.'_note_public'=>$object->note_public,
             $array_key.'_public'=>$object->public,
             $array_key.'_statut'=>$object->getLibStatut()
-		);
+        );
 
-		// Retrieve extrafields
-		if (is_array($object->array_options) && count($object->array_options))
-		{
-			$extrafieldkey=$object->element;
+        // Retrieve extrafields
+        if (is_array($object->array_options) && count($object->array_options))
+        {
+            $extrafieldkey=$object->element;
 
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields = new ExtraFields($this->db);
-			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
-			$object->fetch_optionals();
+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+            $extrafields = new ExtraFields($this->db);
+            $extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
+            $object->fetch_optionals();
 
-			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
-		}
+            $resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
+        }
 
-		return $resarray;
-	}
+        return $resarray;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  array			$task				Task Object
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_tasks($task,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  array			$task				Task Object
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_tasks($task,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-
-		return array(
-		'task_ref'=>$task->ref,
-		'task_fk_project'=>$task->fk_project,
-		'task_projectref'=>$task->projectref,
-		'task_projectlabel'=>$task->projectlabel,
-		'task_label'=>$task->label,
-		'task_description'=>$task->description,
-		'task_fk_parent'=>$task->fk_parent,
-		'task_duration'=>$task->duration,
-		'task_progress'=>$task->progress,
-		'task_public'=>$task->public,
-		'task_date_start'=>dol_print_date($task->date_start,'day'),
-		'task_date_end'=>dol_print_date($task->date_end,'day'),
-		'task_note_private'=>$task->note_private,
-		'task_note_public'=>$task->note_public
-		);
-	}
+        global $conf;
+
+        return array(
+        'task_ref'=>$task->ref,
+        'task_fk_project'=>$task->fk_project,
+        'task_projectref'=>$task->projectref,
+        'task_projectlabel'=>$task->projectlabel,
+        'task_label'=>$task->label,
+        'task_description'=>$task->description,
+        'task_fk_parent'=>$task->fk_parent,
+        'task_duration'=>$task->duration,
+        'task_progress'=>$task->progress,
+        'task_public'=>$task->public,
+        'task_date_start'=>dol_print_date($task->date_start,'day'),
+        'task_date_end'=>dol_print_date($task->date_end,'day'),
+        'task_note_private'=>$task->note_private,
+        'task_note_public'=>$task->note_public
+        );
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  array			$contact			Contact array
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_project_contacts($contact,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  array			$contact			Contact array
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_project_contacts($contact,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-
-		return array(
-		'projcontacts_id'=>$contact['id'],
-		'projcontacts_rowid'=>$contact['rowid'],
-		'projcontacts_role'=>$contact['libelle'],
-		'projcontacts_lastname'=>$contact['lastname'],
-		'projcontacts_firstname'=>$contact['firstname'],
-		'projcontacts_fullcivname'=>$contact['fullname'],
-		'projcontacts_socname'=>$contact['socname'],
-		'projcontacts_email'=>$contact['email']
-		);
-	}
+        global $conf;
+
+        return array(
+        'projcontacts_id'=>$contact['id'],
+        'projcontacts_rowid'=>$contact['rowid'],
+        'projcontacts_role'=>$contact['libelle'],
+        'projcontacts_lastname'=>$contact['lastname'],
+        'projcontacts_firstname'=>$contact['firstname'],
+        'projcontacts_fullcivname'=>$contact['fullname'],
+        'projcontacts_socname'=>$contact['socname'],
+        'projcontacts_email'=>$contact['email']
+        );
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  array			$file				file array
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_project_file($file,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  array			$file				file array
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_project_file($file,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		return array(
-		'projfile_name'=>$file['name'],
-		'projfile_date'=>dol_print_date($file['date'],'day'),
-		'projfile_size'=>$file['size']
-		);
-	}
+        return array(
+        'projfile_name'=>$file['name'],
+        'projfile_date'=>dol_print_date($file['date'],'day'),
+        'projfile_size'=>$file['size']
+        );
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  array			$refdetail			Reference array
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_project_reference($refdetail,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  array			$refdetail			Reference array
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_project_reference($refdetail,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-
-		return array(
-		'projref_type'=>$refdetail['type'],
-		'projref_ref'=>$refdetail['ref'],
-		'projref_date'=>dol_print_date($refdetail['date'],'day'),
-		'projref_socname'=>$refdetail['socname'],
-		'projref_amountht'=>price($refdetail['amountht'],0,$outputlangs),
-		'projref_amountttc'=>price($refdetail['amountttc'],0,$outputlangs),
-		'projref_status'=>$refdetail['status']
-		);
-	}
+        global $conf;
+
+        return array(
+        'projref_type'=>$refdetail['type'],
+        'projref_ref'=>$refdetail['ref'],
+        'projref_date'=>dol_print_date($refdetail['date'],'day'),
+        'projref_socname'=>$refdetail['socname'],
+        'projref_amountht'=>price($refdetail['amountht'],0,$outputlangs),
+        'projref_amountttc'=>price($refdetail['amountttc'],0,$outputlangs),
+        'projref_status'=>$refdetail['status']
+        );
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  array			$taskressource			Reference array
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_tasksressource($taskressource,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  array			$taskressource			Reference array
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_tasksressource($taskressource,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-		//dol_syslog(get_class($this).'::get_substitutionarray_tasksressource taskressource='.var_export($taskressource,true),LOG_DEBUG);
-		return array(
-		'taskressource_rowid'=>$taskressource['rowid'],
-		'taskressource_role'=>$taskressource['libelle'],
-		'taskressource_lastname'=>$taskressource['lastname'],
-		'taskressource_firstname'=>$taskressource['firstname'],
-		'taskressource_fullcivname'=>$taskressource['fullname'],
-		'taskressource_socname'=>$taskressource['socname'],
-		'taskressource_email'=>$taskressource['email']
-		);
-	}
+        global $conf;
+        //dol_syslog(get_class($this).'::get_substitutionarray_tasksressource taskressource='.var_export($taskressource,true),LOG_DEBUG);
+        return array(
+        'taskressource_rowid'=>$taskressource['rowid'],
+        'taskressource_role'=>$taskressource['libelle'],
+        'taskressource_lastname'=>$taskressource['lastname'],
+        'taskressource_firstname'=>$taskressource['firstname'],
+        'taskressource_fullcivname'=>$taskressource['fullname'],
+        'taskressource_socname'=>$taskressource['socname'],
+        'taskressource_email'=>$taskressource['email']
+        );
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  object			$tasktime			times object
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_taskstime($tasktime,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  object			$tasktime			times object
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_taskstime($tasktime,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-
-		return array(
-		'tasktime_rowid'=>$tasktime['rowid'],
-		'tasktime_task_date'=>dol_print_date($tasktime['task_date'],'day'),
-		'tasktime_task_duration'=>convertSecondToTime($tasktime['task_duration'],'all'),
-		'tasktime_note'=>$tasktime['note'],
-		'tasktime_fk_user'=>$tasktime['fk_user'],
-		'tasktime_user_name'=>$tasktime['name'],
-		'tasktime_user_first'=>$tasktime['firstname'],
-		'tasktime_fullcivname'=>$tasktime['fullcivname']
-		);
-	}
+        global $conf;
+
+        return array(
+        'tasktime_rowid'=>$tasktime['rowid'],
+        'tasktime_task_date'=>dol_print_date($tasktime['task_date'],'day'),
+        'tasktime_task_duration'=>convertSecondToTime($tasktime['task_duration'],'all'),
+        'tasktime_note'=>$tasktime['note'],
+        'tasktime_fk_user'=>$tasktime['fk_user'],
+        'tasktime_user_name'=>$tasktime['name'],
+        'tasktime_user_first'=>$tasktime['firstname'],
+        'tasktime_fullcivname'=>$tasktime['fullcivname']
+        );
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  array			$file				file array
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_task_file($file,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  array			$file				file array
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_task_file($file,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-
-		return array(
-		'tasksfile_name'=>$file['name'],
-		'tasksfile_date'=>dol_print_date($file['date'],'day'),
-		'tasksfile_size'=>$file['size']
-		);
-	}
-
-
-	/**
-	 *	Return description of a module
-	 *
-	 *	@param	Translate	$langs      Lang object to use for output
-	 *	@return string       			Description
-	 */
-	function info($langs)
-	{
-		global $conf,$langs;
-
-		// Load translation files required by the page
+        global $conf;
+
+        return array(
+        'tasksfile_name'=>$file['name'],
+        'tasksfile_date'=>dol_print_date($file['date'],'day'),
+        'tasksfile_size'=>$file['size']
+        );
+    }
+
+
+    /**
+     *	Return description of a module
+     *
+     *	@param	Translate	$langs      Lang object to use for output
+     *	@return string       			Description
+     */
+    function info($langs)
+    {
+        global $conf,$langs;
+
+        // Load translation files required by the page
         $langs->loadLangs(array("errors","companies"));
 
-		$form = new Form($this->db);
-
-		$texte = $this->description.".<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="PROJECT_TASK_ADDON_PDF_ODT_PATH">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		// List of directories area
-		$texte.= '<tr><td>';
-		$texttitle=$langs->trans("ListOfDirectories");
-		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH)));
-		$listoffiles=array();
-		foreach($listofdir as $key=>$tmpdir)
-		{
-			$tmpdir=trim($tmpdir);
-			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-			if (! $tmpdir) {
-				unset($listofdir[$key]); continue;
-			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
-			else
-			{
-				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
-			}
-		}
-		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
-		// Add list of substitution keys
-		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
-		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
-
-		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
-		$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
-		$texte.= '<textarea class="flat" cols="60" name="value1">';
-		$texte.=$conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH;
-		$texte.= '</textarea>';
-		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
-		$texte.= '<br></div></div>';
-
-		// Scan directories
-		$nbofiles=count($listoffiles);
-		if (! empty($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH))
-		{
-			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>';
-			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
-			$texte.=$nbofiles;
-			//$texte.=$nbofiles?'</a>':'';
-			$texte.='</b>';
-		}
-
-		if ($nbofiles)
-		{
-   			$texte.='<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach($listoffiles as $file)
-   			{
+        $form = new Form($this->db);
+
+        $texte = $this->description.".<br>\n";
+        $texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        $texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        $texte.= '<input type="hidden" name="action" value="setModuleOptions">';
+        $texte.= '<input type="hidden" name="param1" value="PROJECT_TASK_ADDON_PDF_ODT_PATH">';
+        $texte.= '<table class="nobordernopadding" width="100%">';
+
+        // List of directories area
+        $texte.= '<tr><td>';
+        $texttitle=$langs->trans("ListOfDirectories");
+        $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH)));
+        $listoffiles=array();
+        foreach($listofdir as $key=>$tmpdir)
+        {
+            $tmpdir=trim($tmpdir);
+            $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+            if (! $tmpdir) {
+                unset($listofdir[$key]); continue;
+            }
+            if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+            else
+            {
+                $tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
+                if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+            }
+        }
+        $texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+        // Add list of substitution keys
+        $texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+        $texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
+
+        $texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
+        $texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+        $texte.= '<textarea class="flat" cols="60" name="value1">';
+        $texte.=$conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH;
+        $texte.= '</textarea>';
+        $texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
+        $texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+        $texte.= '<br></div></div>';
+
+        // Scan directories
+        $nbofiles=count($listoffiles);
+        if (! empty($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH))
+        {
+            $texte.=$langs->trans("NumberOfModelFilesFound").': <b>';
+            //$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
+            $texte.=$nbofiles;
+            //$texte.=$nbofiles?'</a>':'';
+            $texte.='</b>';
+        }
+
+        if ($nbofiles)
+        {
+                $texte.='<div id="div_'.get_class($this).'" class="hidden">';
+                foreach($listoffiles as $file)
+                {
                 $texte.=$file['name'].'<br>';
-   			}
-   			$texte.='<div id="div_'.get_class($this).'">';
-		}
+                }
+                $texte.='<div id="div_'.get_class($this).'">';
+        }
 
-		$texte.= '</td>';
+        $texte.= '</td>';
 
-		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
-		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
-		$texte.= '</td>';
-		$texte.= '</tr>';
+        $texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+        $texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
+        $texte.= '</td>';
+        $texte.= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+        $texte.= '</table>';
+        $texte.= '</form>';
 
-		return $texte;
-	}
+        return $texte;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Function to build a document on disk using the generic odt module.
-	 *
-	 *	@param	Commande	$object					Object source to build document
-	 *	@param	Translate	$outputlangs			Lang output object
-	 * 	@param	string		$srctemplatepath	    Full path of source filename for generator using a template file
-	 *	@return	int         						1 if OK, <=0 if KO
-	 */
-	function write_file($object,$outputlangs,$srctemplatepath)
-	{
+    /**
+     *	Function to build a document on disk using the generic odt module.
+     *
+     *	@param	Commande	$object					Object source to build document
+     *	@param	Translate	$outputlangs			Lang output object
+     * 	@param	string		$srctemplatepath	    Full path of source filename for generator using a template file
+     *	@return	int         						1 if OK, <=0 if KO
+     */
+    function write_file($object,$outputlangs,$srctemplatepath)
+    {
         // phpcs:enable
-		global $user,$langs,$conf,$mysoc,$hookmanager;
-
-		if (empty($srctemplatepath))
-		{
-			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
-			return -1;
-		}
-
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='UTF-8';
-
-		// Load translation files required by the page
-		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
-
-		if ($conf->projet->dir_output)
-		{
-			// If $object is id instead of object
-			if (! is_object($object))
-			{
-				$id = $object;
-				$object = new Task($this->db);
-				$result=$object->fetch($id);
-				if ($result < 0)
-				{
-					dol_print_error($this->db,$object->error);
-					return -1;
-				}
-			}
-			$project= new Project($this->db);
-			$project->fetch($object->fk_project);
-			$project->fetch_thirdparty();
-
-			$dir = $conf->projet->dir_output. "/" . $project->ref. "/";
-			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
-			$file = $dir . "/" . $objectref . ".odt";
-
-			if (! file_exists($dir))
-			{
-				print '$dir'.$dir;
-				if (dol_mkdir($dir) < 0)
-				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-					return -1;
-				}
-			}
-
-
-			if (file_exists($dir))
-			{
-				//print "srctemplatepath=".$srctemplatepath;	// Src filename
-				$newfile=basename($srctemplatepath);
-				$newfiletmp=preg_replace('/\.(ods|odt)/i','',$newfile);
-				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
-				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
-				$newfiletmp=$objectref.'_'.$newfiletmp;
-				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
-				$file=$dir.'/'.$newfiletmp.'.odt';
-				//print "newdir=".$dir;
-				//print "newfile=".$newfile;
-				//print "file=".$file;
-				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
-
-				dol_mkdir($conf->projet->dir_temp);
-
-				$socobject=$project->thirdparty;
-
-				// Make substitution
-				$substitutionarray=array(
-				'__FROM_NAME__' => $this->emetteur->name,
-				'__FROM_EMAIL__' => $this->emetteur->email,
-				);
-				complete_substitutions_array($substitutionarray, $langs, $object);
-				// Call the ODTSubstitution hook
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-				// Open and load template
-				require_once ODTPHP_PATH.'odf.php';
-				try {
-					$odfHandler = new odf(
-						$srctemplatepath,
-						array(
-						'PATH_TO_TMP'	  => $conf->projet->dir_temp,
-						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
-						'DELIMITER_LEFT'  => '{',
-						'DELIMITER_RIGHT' => '}'
-						)
-					);
-				}
-				catch(Exception $e)
-				{
-					$this->error=$e->getMessage();
-					return -1;
-				}
-				// After construction $odfHandler->contentXml contains content and
-				// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
-				// [!-- BEGIN lines --]*[!-- END lines --]
-				//print html_entity_decode($odfHandler->__toString());
-				//print exit;
-
-
-				// Define substitution array
-				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-				$array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
-				$array_objet=$this->get_substitutionarray_object($project,$outputlangs);
-				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
-				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
-				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_other=$this->get_substitutionarray_other($outputlangs);
-
-				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other);
-				complete_substitutions_array($tmparray, $outputlangs, $object);
-
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						if (preg_match('/logo$/',$key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
-						{
-							$odfHandler->setVars($key, $value, true, 'UTF-8');
-						}
-					} catch (OdfException $e) {
+        global $user,$langs,$conf,$mysoc,$hookmanager;
+
+        if (empty($srctemplatepath))
+        {
+            dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
+            return -1;
+        }
+
+        if (! is_object($outputlangs)) $outputlangs=$langs;
+        $sav_charset_output=$outputlangs->charset_output;
+        $outputlangs->charset_output='UTF-8';
+
+        // Load translation files required by the page
+        $outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
+
+        if ($conf->projet->dir_output)
+        {
+            // If $object is id instead of object
+            if (! is_object($object))
+            {
+                $id = $object;
+                $object = new Task($this->db);
+                $result=$object->fetch($id);
+                if ($result < 0)
+                {
+                    dol_print_error($this->db,$object->error);
+                    return -1;
+                }
+            }
+            $project= new Project($this->db);
+            $project->fetch($object->fk_project);
+            $project->fetch_thirdparty();
+
+            $dir = $conf->projet->dir_output. "/" . $project->ref. "/";
+            $objectref = dol_sanitizeFileName($object->ref);
+            if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+            $file = $dir . "/" . $objectref . ".odt";
+
+            if (! file_exists($dir))
+            {
+                print '$dir'.$dir;
+                if (dol_mkdir($dir) < 0)
+                {
+                    $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                    return -1;
+                }
+            }
+
+
+            if (file_exists($dir))
+            {
+                //print "srctemplatepath=".$srctemplatepath;	// Src filename
+                $newfile=basename($srctemplatepath);
+                $newfiletmp=preg_replace('/\.(ods|odt)/i','',$newfile);
+                $newfiletmp=preg_replace('/template_/i','',$newfiletmp);
+                $newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
+                $newfiletmp=$objectref.'_'.$newfiletmp;
+                //$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
+                $file=$dir.'/'.$newfiletmp.'.odt';
+                //print "newdir=".$dir;
+                //print "newfile=".$newfile;
+                //print "file=".$file;
+                //print "conf->societe->dir_temp=".$conf->societe->dir_temp;
+
+                dol_mkdir($conf->projet->dir_temp);
+
+                $socobject=$project->thirdparty;
+
+                // Make substitution
+                $substitutionarray=array(
+                '__FROM_NAME__' => $this->emetteur->name,
+                '__FROM_EMAIL__' => $this->emetteur->email,
+                );
+                complete_substitutions_array($substitutionarray, $langs, $object);
+                // Call the ODTSubstitution hook
+                $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+                $reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+                // Open and load template
+                require_once ODTPHP_PATH.'odf.php';
+                try {
+                    $odfHandler = new odf(
+                        $srctemplatepath,
+                        array(
+                        'PATH_TO_TMP'	  => $conf->projet->dir_temp,
+                        'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+                        'DELIMITER_LEFT'  => '{',
+                        'DELIMITER_RIGHT' => '}'
+                        )
+                    );
+                }
+                catch(Exception $e)
+                {
+                    $this->error=$e->getMessage();
+                    return -1;
+                }
+                // After construction $odfHandler->contentXml contains content and
+                // [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
+                // [!-- BEGIN lines --]*[!-- END lines --]
+                //print html_entity_decode($odfHandler->__toString());
+                //print exit;
+
+
+                // Define substitution array
+                $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+                $array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
+                $array_objet=$this->get_substitutionarray_object($project,$outputlangs);
+                $array_user=$this->get_substitutionarray_user($user,$outputlangs);
+                $array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
+                $array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
+                $array_other=$this->get_substitutionarray_other($outputlangs);
+
+                $tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other);
+                complete_substitutions_array($tmparray, $outputlangs, $object);
+
+                foreach($tmparray as $key=>$value)
+                {
+                    try {
+                        if (preg_match('/logo$/',$key)) // Image
+                        {
+                            if (file_exists($value)) $odfHandler->setImage($key, $value);
+                            else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+                        }
+                        else    // Text
+                        {
+                            $odfHandler->setVars($key, $value, true, 'UTF-8');
+                        }
+                    } catch (OdfException $e) {
                         dol_syslog($e->getMessage(), LOG_INFO);
-					}
-				}
-
-				// Replace tags of lines for tasks
-				try
-				{
-					// Security check
-					$socid=0;
-					if (!empty($project->fk_soc)) $socid = $project->fk_soc;
-
-					$tmparray=$this->get_substitutionarray_tasks($object,$outputlangs);
-					complete_substitutions_array($tmparray, $outputlangs, $object);
-					foreach($tmparray as $key => $val)
-					{
-						try {
-							$odfHandler->setVars($key, $val, true, 'UTF-8');
-						} catch (OdfException $e) {
-							dol_syslog($e->getMessage(), LOG_INFO);
-						} catch(SegmentException $e) {
-							dol_syslog($e->getMessage(), LOG_INFO);
-						}
-					}
-
-					// Replace tags of lines for contacts task
-					$sourcearray=array('internal','external');
-					$contact_arrray=array();
-					foreach ($sourcearray as $source) {
-						$contact_temp=$object->liste_contact(-1,$source);
-						if ((is_array($contact_temp) && count($contact_temp) > 0))
-						{
-							$contact_arrray=array_merge($contact_arrray,$contact_temp);
-						}
-					}
-					if ((is_array($contact_arrray) && count($contact_arrray) > 0))
-					{
-						$listlinestaskres = $odfHandler->setSegment('tasksressources');
-
-						foreach ($contact_arrray as $contact)
-						{
-							if ($contact['source']=='internal') {
-								$objectdetail=new User($this->db);
-								$objectdetail->fetch($contact['id']);
-								$contact['socname']=$mysoc->name;
-							} elseif ($contact['source']=='external') {
-								$objectdetail=new Contact($this->db);
-								$objectdetail->fetch($contact['id']);
-
-								$soc=new Societe($this->db);
-								$soc->fetch($contact['socid']);
-								$contact['socname']=$soc->name;
-							}
-							$contact['fullname']=$objectdetail->getFullName($outputlangs,1);
-
-							$tmparray=$this->get_substitutionarray_tasksressource($contact,$outputlangs);
-
-							foreach($tmparray as $key => $val)
-							{
-								try {
-									$listlinestaskres->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e) {
-									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e) {
-									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-							}
-							$listlinestaskres->merge();
-						}
-						$odfHandler->mergeSegment($listlinestaskres);
-					}
-
-					// Time ressources
-					$sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note";
-					$sql.= ", u.lastname, u.firstname";
-					$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
-					$sql .= " , ".MAIN_DB_PREFIX."user as u";
-					$sql .= " WHERE t.fk_task =".$object->id;
-					$sql .= " AND t.fk_user = u.rowid";
-					$sql .= " ORDER BY t.task_date DESC";
-
-					$resql = $this->db->query($sql);
-					if ($resql)
-					{
-						$num = $this->db->num_rows($resql);
-						$i = 0;
-						$tasks = array();
-						$listlinestasktime = $odfHandler->setSegment('taskstimes');
-						while ($i < $num)
-						{
-							$row = $this->db->fetch_array($resql);
-							if (!empty($row['fk_user'])) {
-								$objectdetail=new User($this->db);
-								$objectdetail->fetch($row['fk_user']);
-								// TODO Use a cache to aoid fetch for same user
-								$row['fullcivname']=$objectdetail->getFullName($outputlangs,1);
-							} else {
-								$row['fullcivname']='';
-							}
-
-							$tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
-
-							foreach($tmparray as $key => $val)
-							{
-								try
-								{
-									$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
-								{
-									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch(SegmentException $e)
-								{
-									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-							}
-							$listlinestasktime->merge();
-							$i++;
-						}
-						$this->db->free($resql);
-
-						$odfHandler->mergeSegment($listlinestasktime);
-					}
-
-
-					// Replace tags of project files
-					$listtasksfiles = $odfHandler->setSegment('tasksfiles');
-
-					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($object->ref);
-					$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
-
-
-					foreach ($filearray as $filedetail)
-					{
-						$tmparray=$this->get_substitutionarray_task_file($filedetail,$outputlangs);
-						//dol_syslog(get_class($this).'::main $tmparray'.var_export($tmparray,true));
-						foreach($tmparray as $key => $val)
-						{
-							try
-							{
-								$listtasksfiles->setVars($key, $val, true, 'UTF-8');
-							}
-							catch(OdfException $e)
-							{
-								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch(SegmentException $e)
-							{
-								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-						}
-						$listtasksfiles->merge();
-					}
-					//$listlines->merge();
-
-					$odfHandler->mergeSegment($listtasksfiles);
-				}
-				catch(OdfException $e)
-				{
-					$this->error=$e->getMessage();
-					dol_syslog($this->error, LOG_WARNING);
-					return -1;
-				}
-
-
-
-				// Replace tags of project files
-				try
-				{
-					$listlines = $odfHandler->setSegment('projectfiles');
-
-					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
-					$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
-
-
-					foreach ($filearray as $filedetail)
-					{
-						//dol_syslog(get_class($this).'::main $filedetail'.var_export($filedetail,true));
-						$tmparray=$this->get_substitutionarray_project_file($filedetail,$outputlangs);
-
-						foreach($tmparray as $key => $val)
-						{
-							try
-							{
-								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch(OdfException $e)
-							{
-								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch(SegmentException $e)
-							{
-								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-						}
-						$listlines->merge();
-					}
-					$odfHandler->mergeSegment($listlines);
-				}
-				catch(OdfException $e)
-				{
-					$this->error=$e->getMessage();
-					dol_syslog($this->error, LOG_WARNING);
-					return -1;
-				}
-
-				// Replace tags of lines for contacts
-				$sourcearray=array('internal','external');
-				$contact_arrray=array();
-				foreach ($sourcearray as $source) {
-					$contact_temp=$project->liste_contact(-1,$source);
-					if ((is_array($contact_temp) && count($contact_temp) > 0))
-					{
-						$contact_arrray=array_merge($contact_arrray,$contact_temp);
-					}
-				}
-				if ((is_array($contact_arrray) && count($contact_arrray) > 0))
-				{
-					try
-					{
-						$listlines = $odfHandler->setSegment('projectcontacts');
-
-						foreach ($contact_arrray as $contact)
-						{
-							if ($contact['source']=='internal') {
-								$objectdetail=new User($this->db);
-								$objectdetail->fetch($contact['id']);
-								$contact['socname']=$mysoc->name;
-							} elseif ($contact['source']=='external') {
-								$objectdetail=new Contact($this->db);
-								$objectdetail->fetch($contact['id']);
-
-								$soc=new Societe($this->db);
-								$soc->fetch($contact['socid']);
-								$contact['socname']=$soc->name;
-							}
-							$contact['fullname']=$objectdetail->getFullName($outputlangs,1);
-
-							$tmparray=$this->get_substitutionarray_project_contacts($contact,$outputlangs);
-
-							foreach($tmparray as $key => $val)
-							{
-								try
-								{
-									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
-								{
-									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch(SegmentException $e)
-								{
-									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-							}
-							$listlines->merge();
-						}
-						$odfHandler->mergeSegment($listlines);
-					}
-					catch(OdfException $e)
-					{
-						$this->error=$e->getMessage();
-						dol_syslog($this->error, LOG_WARNING);
-						return -1;
-					}
-				}
-
-
-				// Call the beforeODTSave hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-
-				// Write new file
-				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
-					try {
-						$odfHandler->exportAsAttachedPDF($file);
-					} catch (Exception $e) {
-						$this->error=$e->getMessage();
+                    }
+                }
+
+                // Replace tags of lines for tasks
+                try
+                {
+                    // Security check
+                    $socid=0;
+                    if (!empty($project->fk_soc)) $socid = $project->fk_soc;
+
+                    $tmparray=$this->get_substitutionarray_tasks($object,$outputlangs);
+                    complete_substitutions_array($tmparray, $outputlangs, $object);
+                    foreach($tmparray as $key => $val)
+                    {
+                        try {
+                            $odfHandler->setVars($key, $val, true, 'UTF-8');
+                        } catch (OdfException $e) {
+                            dol_syslog($e->getMessage(), LOG_INFO);
+                        } catch(SegmentException $e) {
+                            dol_syslog($e->getMessage(), LOG_INFO);
+                        }
+                    }
+
+                    // Replace tags of lines for contacts task
+                    $sourcearray=array('internal','external');
+                    $contact_arrray=array();
+                    foreach ($sourcearray as $source) {
+                        $contact_temp=$object->liste_contact(-1,$source);
+                        if ((is_array($contact_temp) && count($contact_temp) > 0))
+                        {
+                            $contact_arrray=array_merge($contact_arrray,$contact_temp);
+                        }
+                    }
+                    if ((is_array($contact_arrray) && count($contact_arrray) > 0))
+                    {
+                        $listlinestaskres = $odfHandler->setSegment('tasksressources');
+
+                        foreach ($contact_arrray as $contact)
+                        {
+                            if ($contact['source']=='internal') {
+                                $objectdetail=new User($this->db);
+                                $objectdetail->fetch($contact['id']);
+                                $contact['socname']=$mysoc->name;
+                            } elseif ($contact['source']=='external') {
+                                $objectdetail=new Contact($this->db);
+                                $objectdetail->fetch($contact['id']);
+
+                                $soc=new Societe($this->db);
+                                $soc->fetch($contact['socid']);
+                                $contact['socname']=$soc->name;
+                            }
+                            $contact['fullname']=$objectdetail->getFullName($outputlangs,1);
+
+                            $tmparray=$this->get_substitutionarray_tasksressource($contact,$outputlangs);
+
+                            foreach($tmparray as $key => $val)
+                            {
+                                try {
+                                    $listlinestaskres->setVars($key, $val, true, 'UTF-8');
+                                } catch (OdfException $e) {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                                catch (SegmentException $e) {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                            }
+                            $listlinestaskres->merge();
+                        }
+                        $odfHandler->mergeSegment($listlinestaskres);
+                    }
+
+                    // Time ressources
+                    $sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note";
+                    $sql.= ", u.lastname, u.firstname";
+                    $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
+                    $sql .= " , ".MAIN_DB_PREFIX."user as u";
+                    $sql .= " WHERE t.fk_task =".$object->id;
+                    $sql .= " AND t.fk_user = u.rowid";
+                    $sql .= " ORDER BY t.task_date DESC";
+
+                    $resql = $this->db->query($sql);
+                    if ($resql)
+                    {
+                        $num = $this->db->num_rows($resql);
+                        $i = 0;
+                        $tasks = array();
+                        $listlinestasktime = $odfHandler->setSegment('taskstimes');
+                        while ($i < $num)
+                        {
+                            $row = $this->db->fetch_array($resql);
+                            if (!empty($row['fk_user'])) {
+                                $objectdetail=new User($this->db);
+                                $objectdetail->fetch($row['fk_user']);
+                                // TODO Use a cache to aoid fetch for same user
+                                $row['fullcivname']=$objectdetail->getFullName($outputlangs,1);
+                            } else {
+                                $row['fullcivname']='';
+                            }
+
+                            $tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
+
+                            foreach($tmparray as $key => $val)
+                            {
+                                try
+                                {
+                                    $listlinestasktime->setVars($key, $val, true, 'UTF-8');
+                                }
+                                catch(OdfException $e)
+                                {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                                catch(SegmentException $e)
+                                {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                            }
+                            $listlinestasktime->merge();
+                            $i++;
+                        }
+                        $this->db->free($resql);
+
+                        $odfHandler->mergeSegment($listlinestasktime);
+                    }
+
+
+                    // Replace tags of project files
+                    $listtasksfiles = $odfHandler->setSegment('tasksfiles');
+
+                    $upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($object->ref);
+                    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
+
+
+                    foreach ($filearray as $filedetail)
+                    {
+                        $tmparray=$this->get_substitutionarray_task_file($filedetail,$outputlangs);
+                        //dol_syslog(get_class($this).'::main $tmparray'.var_export($tmparray,true));
+                        foreach($tmparray as $key => $val)
+                        {
+                            try
+                            {
+                                $listtasksfiles->setVars($key, $val, true, 'UTF-8');
+                            }
+                            catch(OdfException $e)
+                            {
+                                dol_syslog($e->getMessage(), LOG_INFO);
+                            }
+                            catch(SegmentException $e)
+                            {
+                                dol_syslog($e->getMessage(), LOG_INFO);
+                            }
+                        }
+                        $listtasksfiles->merge();
+                    }
+                    //$listlines->merge();
+
+                    $odfHandler->mergeSegment($listtasksfiles);
+                }
+                catch(OdfException $e)
+                {
+                    $this->error=$e->getMessage();
+                    dol_syslog($this->error, LOG_WARNING);
+                    return -1;
+                }
+
+
+
+                // Replace tags of project files
+                try
+                {
+                    $listlines = $odfHandler->setSegment('projectfiles');
+
+                    $upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
+                    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
+
+
+                    foreach ($filearray as $filedetail)
+                    {
+                        //dol_syslog(get_class($this).'::main $filedetail'.var_export($filedetail,true));
+                        $tmparray=$this->get_substitutionarray_project_file($filedetail,$outputlangs);
+
+                        foreach($tmparray as $key => $val)
+                        {
+                            try
+                            {
+                                $listlines->setVars($key, $val, true, 'UTF-8');
+                            }
+                            catch(OdfException $e)
+                            {
+                                dol_syslog($e->getMessage(), LOG_INFO);
+                            }
+                            catch(SegmentException $e)
+                            {
+                                dol_syslog($e->getMessage(), LOG_INFO);
+                            }
+                        }
+                        $listlines->merge();
+                    }
+                    $odfHandler->mergeSegment($listlines);
+                }
+                catch(OdfException $e)
+                {
+                    $this->error=$e->getMessage();
+                    dol_syslog($this->error, LOG_WARNING);
+                    return -1;
+                }
+
+                // Replace tags of lines for contacts
+                $sourcearray=array('internal','external');
+                $contact_arrray=array();
+                foreach ($sourcearray as $source) {
+                    $contact_temp=$project->liste_contact(-1,$source);
+                    if ((is_array($contact_temp) && count($contact_temp) > 0))
+                    {
+                        $contact_arrray=array_merge($contact_arrray,$contact_temp);
+                    }
+                }
+                if ((is_array($contact_arrray) && count($contact_arrray) > 0))
+                {
+                    try
+                    {
+                        $listlines = $odfHandler->setSegment('projectcontacts');
+
+                        foreach ($contact_arrray as $contact)
+                        {
+                            if ($contact['source']=='internal') {
+                                $objectdetail=new User($this->db);
+                                $objectdetail->fetch($contact['id']);
+                                $contact['socname']=$mysoc->name;
+                            } elseif ($contact['source']=='external') {
+                                $objectdetail=new Contact($this->db);
+                                $objectdetail->fetch($contact['id']);
+
+                                $soc=new Societe($this->db);
+                                $soc->fetch($contact['socid']);
+                                $contact['socname']=$soc->name;
+                            }
+                            $contact['fullname']=$objectdetail->getFullName($outputlangs,1);
+
+                            $tmparray=$this->get_substitutionarray_project_contacts($contact,$outputlangs);
+
+                            foreach($tmparray as $key => $val)
+                            {
+                                try
+                                {
+                                    $listlines->setVars($key, $val, true, 'UTF-8');
+                                }
+                                catch(OdfException $e)
+                                {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                                catch(SegmentException $e)
+                                {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                            }
+                            $listlines->merge();
+                        }
+                        $odfHandler->mergeSegment($listlines);
+                    }
+                    catch(OdfException $e)
+                    {
+                        $this->error=$e->getMessage();
+                        dol_syslog($this->error, LOG_WARNING);
+                        return -1;
+                    }
+                }
+
+
+                // Call the beforeODTSave hook
+                $parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+                $reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+
+                // Write new file
+                if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
+                    try {
+                        $odfHandler->exportAsAttachedPDF($file);
+                    } catch (Exception $e) {
+                        $this->error=$e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
-						return -1;
-					}
-				}
-				else {
-					try {
-						$odfHandler->saveToDisk($file);
-					} catch (Exception $e) {
-						$this->error=$e->getMessage();
+                        return -1;
+                    }
+                }
+                else {
+                    try {
+                        $odfHandler->saveToDisk($file);
+                    } catch (Exception $e) {
+                        $this->error=$e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
-						return -1;
-					}
-				}
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
-
-				$odfHandler=null;	// Destroy object
-
-				$this->result = array('fullpath'=>$file);
-
-				return 1;   // Success
-			}
-			else
-			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-				return -1;
-			}
-		}
-
-		return -1;
-	}
+                        return -1;
+                    }
+                }
+                $parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+                $reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+                if (! empty($conf->global->MAIN_UMASK))
+                    @chmod($file, octdec($conf->global->MAIN_UMASK));
+
+                $odfHandler=null;	// Destroy object
+
+                $this->result = array('fullpath'=>$file);
+
+                return 1;   // Success
+            }
+            else
+            {
+                $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                return -1;
+            }
+        }
+
+        return -1;
+    }
 }

Spacing +204 added lines, -204 removed lines

@@ -38,16 +38,16 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (! empty($conf->propal->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (! empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
-if (! empty($conf->commande->enabled))    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (! empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-if (! empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-if (! empty($conf->contrat->enabled))     require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (! empty($conf->ficheinter->enabled))  require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-if (! empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
-if (! empty($conf->agenda->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+if (!empty($conf->propal->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (!empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+if (!empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
+if (!empty($conf->commande->enabled))    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+if (!empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+if (!empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+if (!empty($conf->contrat->enabled))     require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+if (!empty($conf->ficheinter->enabled))  require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+if (!empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
+if (!empty($conf->agenda->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 
 /**
@@ -84,37 +84,37 @@ 
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main","companies"));
+        $langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
 		$this->description = $langs->trans("DocumentModelOdt");
-		$this->scandir = 'PROJECT_TASK_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+		$this->scandir = 'PROJECT_TASK_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
 
 		// Dimension page pour format A4
 		$this->type = 'odt';
 		$this->page_largeur = 0;
 		$this->page_hauteur = 0;
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=0;
-		$this->marge_droite=0;
-		$this->marge_haute=0;
-		$this->marge_basse=0;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 0;                     // Gere option tva COMMANDE_TVAOPTION
-		$this->option_modereg = 0;                 // Affiche mode reglement
-		$this->option_condreg = 0;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 0;      // Affiche code produit-service
-		$this->option_multilang = 0;               // 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 = 0;		   // Support add of a watermark on drafts
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = 0;
+		$this->marge_droite = 0;
+		$this->marge_haute = 0;
+		$this->marge_basse = 0;
+
+		$this->option_logo = 1; // Affiche logo
+		$this->option_tva = 0; // Gere option tva COMMANDE_TVAOPTION
+		$this->option_modereg = 0; // Affiche mode reglement
+		$this->option_condreg = 0; // Affiche conditions reglement
+		$this->option_codeproduitservice = 0; // Affiche code produit-service
+		$this->option_multilang = 0; // 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 = 0; // Support add of a watermark on drafts
 
 		// Recupere emetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2);    // Par defaut, si n'etait pas defini
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->pays_code) $this->emetteur->pays_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
 	}
 
 
@@ -127,20 +127,20 @@ 
      * @param   string		    $array_key	        Name of the key for return array
 	 * @return	array								Array of substitution
 	 */
-	function get_substitutionarray_object($object,$outputlangs,$array_key='object')
+	function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
 	{
         // phpcs:enable
 		global $conf;
 
-		$resarray=array(
+		$resarray = array(
             $array_key.'_id'=>$object->id,
             $array_key.'_ref'=>$object->ref,
             $array_key.'_title'=>$object->title,
             $array_key.'_description'=>$object->description,
-            $array_key.'_date_creation'=>dol_print_date($object->date_c,'day'),
-            $array_key.'_date_modification'=>dol_print_date($object->date_m,'day'),
-            $array_key.'_date_start'=>dol_print_date($object->date_start,'day'),
-            $array_key.'_date_end'=>dol_print_date($object->date_end,'day'),
+            $array_key.'_date_creation'=>dol_print_date($object->date_c, 'day'),
+            $array_key.'_date_modification'=>dol_print_date($object->date_m, 'day'),
+            $array_key.'_date_start'=>dol_print_date($object->date_start, 'day'),
+            $array_key.'_date_end'=>dol_print_date($object->date_end, 'day'),
             $array_key.'_note_private'=>$object->note_private,
             $array_key.'_note_public'=>$object->note_public,
             $array_key.'_public'=>$object->public,
@@ -150,14 +150,14 @@ 
 		// Retrieve extrafields
 		if (is_array($object->array_options) && count($object->array_options))
 		{
-			$extrafieldkey=$object->element;
+			$extrafieldkey = $object->element;
 
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
-			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
+			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey, true);
 			$object->fetch_optionals();
 
-			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
+			$resarray = $this->fill_substitutionarray_with_extrafields($object, $resarray, $extrafields, $array_key, $outputlangs);
 		}
 
 		return $resarray;
@@ -171,7 +171,7 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_tasks($task,$outputlangs)
+	function get_substitutionarray_tasks($task, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
@@ -187,8 +187,8 @@ 
 		'task_duration'=>$task->duration,
 		'task_progress'=>$task->progress,
 		'task_public'=>$task->public,
-		'task_date_start'=>dol_print_date($task->date_start,'day'),
-		'task_date_end'=>dol_print_date($task->date_end,'day'),
+		'task_date_start'=>dol_print_date($task->date_start, 'day'),
+		'task_date_end'=>dol_print_date($task->date_end, 'day'),
 		'task_note_private'=>$task->note_private,
 		'task_note_public'=>$task->note_public
 		);
@@ -202,7 +202,7 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_project_contacts($contact,$outputlangs)
+	function get_substitutionarray_project_contacts($contact, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
@@ -227,14 +227,14 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_project_file($file,$outputlangs)
+	function get_substitutionarray_project_file($file, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
 
 		return array(
 		'projfile_name'=>$file['name'],
-		'projfile_date'=>dol_print_date($file['date'],'day'),
+		'projfile_date'=>dol_print_date($file['date'], 'day'),
 		'projfile_size'=>$file['size']
 		);
 	}
@@ -247,7 +247,7 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_project_reference($refdetail,$outputlangs)
+	function get_substitutionarray_project_reference($refdetail, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
@@ -255,10 +255,10 @@ 
 		return array(
 		'projref_type'=>$refdetail['type'],
 		'projref_ref'=>$refdetail['ref'],
-		'projref_date'=>dol_print_date($refdetail['date'],'day'),
+		'projref_date'=>dol_print_date($refdetail['date'], 'day'),
 		'projref_socname'=>$refdetail['socname'],
-		'projref_amountht'=>price($refdetail['amountht'],0,$outputlangs),
-		'projref_amountttc'=>price($refdetail['amountttc'],0,$outputlangs),
+		'projref_amountht'=>price($refdetail['amountht'], 0, $outputlangs),
+		'projref_amountttc'=>price($refdetail['amountttc'], 0, $outputlangs),
 		'projref_status'=>$refdetail['status']
 		);
 	}
@@ -271,7 +271,7 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_tasksressource($taskressource,$outputlangs)
+	function get_substitutionarray_tasksressource($taskressource, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
@@ -295,15 +295,15 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_taskstime($tasktime,$outputlangs)
+	function get_substitutionarray_taskstime($tasktime, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
 
 		return array(
 		'tasktime_rowid'=>$tasktime['rowid'],
-		'tasktime_task_date'=>dol_print_date($tasktime['task_date'],'day'),
-		'tasktime_task_duration'=>convertSecondToTime($tasktime['task_duration'],'all'),
+		'tasktime_task_date'=>dol_print_date($tasktime['task_date'], 'day'),
+		'tasktime_task_duration'=>convertSecondToTime($tasktime['task_duration'], 'all'),
 		'tasktime_note'=>$tasktime['note'],
 		'tasktime_fk_user'=>$tasktime['fk_user'],
 		'tasktime_user_name'=>$tasktime['name'],
@@ -320,14 +320,14 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_task_file($file,$outputlangs)
+	function get_substitutionarray_task_file($file, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
 
 		return array(
 		'tasksfile_name'=>$file['name'],
-		'tasksfile_date'=>dol_print_date($file['date'],'day'),
+		'tasksfile_date'=>dol_print_date($file['date'], 'day'),
 		'tasksfile_size'=>$file['size']
 		);
 	}
@@ -341,83 +341,83 @@ 
 	 */
 	function info($langs)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors","companies"));
+        $langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="PROJECT_TASK_ADDON_PDF_ODT_PATH">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="PROJECT_TASK_ADDON_PDF_ODT_PATH">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		// List of directories area
-		$texte.= '<tr><td>';
-		$texttitle=$langs->trans("ListOfDirectories");
-		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH)));
-		$listoffiles=array();
-		foreach($listofdir as $key=>$tmpdir)
+		$texte .= '<tr><td>';
+		$texttitle = $langs->trans("ListOfDirectories");
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH)));
+		$listoffiles = array();
+		foreach ($listofdir as $key=>$tmpdir)
 		{
-			$tmpdir=trim($tmpdir);
-			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-			if (! $tmpdir) {
+			$tmpdir = trim($tmpdir);
+			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
 			else
 			{
-				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
+				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
 		}
-		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
 		// Add list of substitution keys
-		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
-		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
-
-		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
-		$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
-		$texte.= '<textarea class="flat" cols="60" name="value1">';
-		$texte.=$conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH;
-		$texte.= '</textarea>';
-		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
-		$texte.= '<br></div></div>';
+		$texthelp .= '<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp .= $langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
+
+		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
+		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+		$texte .= '<textarea class="flat" cols="60" name="value1">';
+		$texte .= $conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH;
+		$texte .= '</textarea>';
+		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
+		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<br></div></div>';
 
 		// Scan directories
-		$nbofiles=count($listoffiles);
-		if (! empty($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH))
+		$nbofiles = count($listoffiles);
+		if (!empty($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH))
 		{
-			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>';
+			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
-			$texte.=$nbofiles;
+			$texte .= $nbofiles;
 			//$texte.=$nbofiles?'</a>':'';
-			$texte.='</b>';
+			$texte .= '</b>';
 		}
 
 		if ($nbofiles)
 		{
-   			$texte.='<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach($listoffiles as $file)
+   			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
+   			foreach ($listoffiles as $file)
    			{
-                $texte.=$file['name'].'<br>';
+                $texte .= $file['name'].'<br>';
    			}
-   			$texte.='<div id="div_'.get_class($this).'">';
+   			$texte .= '<div id="div_'.get_class($this).'">';
 		}
 
-		$texte.= '</td>';
+		$texte .= '</td>';
 
-		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
-		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
-		$texte.= '</td>';
-		$texte.= '</tr>';
+		$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</td>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
 	}
@@ -431,10 +431,10 @@ 
 	 * 	@param	string		$srctemplatepath	    Full path of source filename for generator using a template file
 	 *	@return	int         						1 if OK, <=0 if KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath)
+	function write_file($object, $outputlangs, $srctemplatepath)
 	{
         // phpcs:enable
-		global $user,$langs,$conf,$mysoc,$hookmanager;
+		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
 		{
@@ -442,9 +442,9 @@ 
 			return -1;
 		}
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='UTF-8';
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		$sav_charset_output = $outputlangs->charset_output;
+		$outputlangs->charset_output = 'UTF-8';
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
@@ -452,32 +452,32 @@ 
 		if ($conf->projet->dir_output)
 		{
 			// If $object is id instead of object
-			if (! is_object($object))
+			if (!is_object($object))
 			{
 				$id = $object;
 				$object = new Task($this->db);
-				$result=$object->fetch($id);
+				$result = $object->fetch($id);
 				if ($result < 0)
 				{
-					dol_print_error($this->db,$object->error);
+					dol_print_error($this->db, $object->error);
 					return -1;
 				}
 			}
-			$project= new Project($this->db);
+			$project = new Project($this->db);
 			$project->fetch($object->fk_project);
 			$project->fetch_thirdparty();
 
-			$dir = $conf->projet->dir_output. "/" . $project->ref. "/";
+			$dir = $conf->projet->dir_output."/".$project->ref."/";
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
-			$file = $dir . "/" . $objectref . ".odt";
+			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			$file = $dir."/".$objectref.".odt";
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				print '$dir'.$dir;
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
@@ -486,13 +486,13 @@ 
 			if (file_exists($dir))
 			{
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
-				$newfile=basename($srctemplatepath);
-				$newfiletmp=preg_replace('/\.(ods|odt)/i','',$newfile);
-				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
-				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
-				$newfiletmp=$objectref.'_'.$newfiletmp;
+				$newfile = basename($srctemplatepath);
+				$newfiletmp = preg_replace('/\.(ods|odt)/i', '', $newfile);
+				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
+				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
+				$newfiletmp = $objectref.'_'.$newfiletmp;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
-				$file=$dir.'/'.$newfiletmp.'.odt';
+				$file = $dir.'/'.$newfiletmp.'.odt';
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -500,17 +500,17 @@ 
 
 				dol_mkdir($conf->projet->dir_temp);
 
-				$socobject=$project->thirdparty;
+				$socobject = $project->thirdparty;
 
 				// Make substitution
-				$substitutionarray=array(
+				$substitutionarray = array(
 				'__FROM_NAME__' => $this->emetteur->name,
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
@@ -519,15 +519,15 @@ 
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->projet->dir_temp,
-						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+						'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
 						'DELIMITER_LEFT'  => '{',
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					return -1;
 				}
 				// After construction $odfHandler->contentXml contains content and
@@ -540,19 +540,19 @@ 
 				// Define substitution array
 				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 				$array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
-				$array_objet=$this->get_substitutionarray_object($project,$outputlangs);
-				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
-				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
-				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_other=$this->get_substitutionarray_other($outputlangs);
+				$array_objet = $this->get_substitutionarray_object($project, $outputlangs);
+				$array_user = $this->get_substitutionarray_user($user, $outputlangs);
+				$array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
+				$array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+				$array_other = $this->get_substitutionarray_other($outputlangs);
 
-				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other);
+				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 
-				foreach($tmparray as $key=>$value)
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/', $key)) // Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
@@ -570,30 +570,30 @@ 
 				try
 				{
 					// Security check
-					$socid=0;
+					$socid = 0;
 					if (!empty($project->fk_soc)) $socid = $project->fk_soc;
 
-					$tmparray=$this->get_substitutionarray_tasks($object,$outputlangs);
+					$tmparray = $this->get_substitutionarray_tasks($object, $outputlangs);
 					complete_substitutions_array($tmparray, $outputlangs, $object);
-					foreach($tmparray as $key => $val)
+					foreach ($tmparray as $key => $val)
 					{
 						try {
 							$odfHandler->setVars($key, $val, true, 'UTF-8');
 						} catch (OdfException $e) {
 							dol_syslog($e->getMessage(), LOG_INFO);
-						} catch(SegmentException $e) {
+						} catch (SegmentException $e) {
 							dol_syslog($e->getMessage(), LOG_INFO);
 						}
 					}
 
 					// Replace tags of lines for contacts task
-					$sourcearray=array('internal','external');
-					$contact_arrray=array();
+					$sourcearray = array('internal', 'external');
+					$contact_arrray = array();
 					foreach ($sourcearray as $source) {
-						$contact_temp=$object->liste_contact(-1,$source);
+						$contact_temp = $object->liste_contact(-1, $source);
 						if ((is_array($contact_temp) && count($contact_temp) > 0))
 						{
-							$contact_arrray=array_merge($contact_arrray,$contact_temp);
+							$contact_arrray = array_merge($contact_arrray, $contact_temp);
 						}
 					}
 					if ((is_array($contact_arrray) && count($contact_arrray) > 0))
@@ -602,23 +602,23 @@ 
 
 						foreach ($contact_arrray as $contact)
 						{
-							if ($contact['source']=='internal') {
-								$objectdetail=new User($this->db);
+							if ($contact['source'] == 'internal') {
+								$objectdetail = new User($this->db);
 								$objectdetail->fetch($contact['id']);
-								$contact['socname']=$mysoc->name;
-							} elseif ($contact['source']=='external') {
-								$objectdetail=new Contact($this->db);
+								$contact['socname'] = $mysoc->name;
+							} elseif ($contact['source'] == 'external') {
+								$objectdetail = new Contact($this->db);
 								$objectdetail->fetch($contact['id']);
 
-								$soc=new Societe($this->db);
+								$soc = new Societe($this->db);
 								$soc->fetch($contact['socid']);
-								$contact['socname']=$soc->name;
+								$contact['socname'] = $soc->name;
 							}
-							$contact['fullname']=$objectdetail->getFullName($outputlangs,1);
+							$contact['fullname'] = $objectdetail->getFullName($outputlangs, 1);
 
-							$tmparray=$this->get_substitutionarray_tasksressource($contact,$outputlangs);
+							$tmparray = $this->get_substitutionarray_tasksressource($contact, $outputlangs);
 
-							foreach($tmparray as $key => $val)
+							foreach ($tmparray as $key => $val)
 							{
 								try {
 									$listlinestaskres->setVars($key, $val, true, 'UTF-8');
@@ -636,7 +636,7 @@ 
 
 					// Time ressources
 					$sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note";
-					$sql.= ", u.lastname, u.firstname";
+					$sql .= ", u.lastname, u.firstname";
 					$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
 					$sql .= " , ".MAIN_DB_PREFIX."user as u";
 					$sql .= " WHERE t.fk_task =".$object->id;
@@ -654,27 +654,27 @@ 
 						{
 							$row = $this->db->fetch_array($resql);
 							if (!empty($row['fk_user'])) {
-								$objectdetail=new User($this->db);
+								$objectdetail = new User($this->db);
 								$objectdetail->fetch($row['fk_user']);
 								// TODO Use a cache to aoid fetch for same user
-								$row['fullcivname']=$objectdetail->getFullName($outputlangs,1);
+								$row['fullcivname'] = $objectdetail->getFullName($outputlangs, 1);
 							} else {
-								$row['fullcivname']='';
+								$row['fullcivname'] = '';
 							}
 
-							$tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
+							$tmparray = $this->get_substitutionarray_taskstime($row, $outputlangs);
 
-							foreach($tmparray as $key => $val)
+							foreach ($tmparray as $key => $val)
 							{
 								try
 								{
 									$listlinestasktime->setVars($key, $val, true, 'UTF-8');
 								}
-								catch(OdfException $e)
+								catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
-								catch(SegmentException $e)
+								catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -692,24 +692,24 @@ 
 					$listtasksfiles = $odfHandler->setSegment('tasksfiles');
 
 					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($object->ref);
-					$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
+					$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', 'name', SORT_ASC, 1);
 
 
 					foreach ($filearray as $filedetail)
 					{
-						$tmparray=$this->get_substitutionarray_task_file($filedetail,$outputlangs);
+						$tmparray = $this->get_substitutionarray_task_file($filedetail, $outputlangs);
 						//dol_syslog(get_class($this).'::main $tmparray'.var_export($tmparray,true));
-						foreach($tmparray as $key => $val)
+						foreach ($tmparray as $key => $val)
 						{
 							try
 							{
 								$listtasksfiles->setVars($key, $val, true, 'UTF-8');
 							}
-							catch(OdfException $e)
+							catch (OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
-							catch(SegmentException $e)
+							catch (SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -720,9 +720,9 @@ 
 
 					$odfHandler->mergeSegment($listtasksfiles);
 				}
-				catch(OdfException $e)
+				catch (OdfException $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
 				}
@@ -735,25 +735,25 @@ 
 					$listlines = $odfHandler->setSegment('projectfiles');
 
 					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
-					$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
+					$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', 'name', SORT_ASC, 1);
 
 
 					foreach ($filearray as $filedetail)
 					{
 						//dol_syslog(get_class($this).'::main $filedetail'.var_export($filedetail,true));
-						$tmparray=$this->get_substitutionarray_project_file($filedetail,$outputlangs);
+						$tmparray = $this->get_substitutionarray_project_file($filedetail, $outputlangs);
 
-						foreach($tmparray as $key => $val)
+						foreach ($tmparray as $key => $val)
 						{
 							try
 							{
 								$listlines->setVars($key, $val, true, 'UTF-8');
 							}
-							catch(OdfException $e)
+							catch (OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
-							catch(SegmentException $e)
+							catch (SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -762,21 +762,21 @@ 
 					}
 					$odfHandler->mergeSegment($listlines);
 				}
-				catch(OdfException $e)
+				catch (OdfException $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
 				}
 
 				// Replace tags of lines for contacts
-				$sourcearray=array('internal','external');
-				$contact_arrray=array();
+				$sourcearray = array('internal', 'external');
+				$contact_arrray = array();
 				foreach ($sourcearray as $source) {
-					$contact_temp=$project->liste_contact(-1,$source);
+					$contact_temp = $project->liste_contact(-1, $source);
 					if ((is_array($contact_temp) && count($contact_temp) > 0))
 					{
-						$contact_arrray=array_merge($contact_arrray,$contact_temp);
+						$contact_arrray = array_merge($contact_arrray, $contact_temp);
 					}
 				}
 				if ((is_array($contact_arrray) && count($contact_arrray) > 0))
@@ -787,33 +787,33 @@ 
 
 						foreach ($contact_arrray as $contact)
 						{
-							if ($contact['source']=='internal') {
-								$objectdetail=new User($this->db);
+							if ($contact['source'] == 'internal') {
+								$objectdetail = new User($this->db);
 								$objectdetail->fetch($contact['id']);
-								$contact['socname']=$mysoc->name;
-							} elseif ($contact['source']=='external') {
-								$objectdetail=new Contact($this->db);
+								$contact['socname'] = $mysoc->name;
+							} elseif ($contact['source'] == 'external') {
+								$objectdetail = new Contact($this->db);
 								$objectdetail->fetch($contact['id']);
 
-								$soc=new Societe($this->db);
+								$soc = new Societe($this->db);
 								$soc->fetch($contact['socid']);
-								$contact['socname']=$soc->name;
+								$contact['socname'] = $soc->name;
 							}
-							$contact['fullname']=$objectdetail->getFullName($outputlangs,1);
+							$contact['fullname'] = $objectdetail->getFullName($outputlangs, 1);
 
-							$tmparray=$this->get_substitutionarray_project_contacts($contact,$outputlangs);
+							$tmparray = $this->get_substitutionarray_project_contacts($contact, $outputlangs);
 
-							foreach($tmparray as $key => $val)
+							foreach ($tmparray as $key => $val)
 							{
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
-								catch(OdfException $e)
+								catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
-								catch(SegmentException $e)
+								catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -822,9 +822,9 @@ 
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
-						$this->error=$e->getMessage();
+						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 						return -1;
 					}
@@ -832,8 +832,8 @@ 
 
 
 				// Call the beforeODTSave hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 
 				// Write new file
@@ -841,7 +841,7 @@ 
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
-						$this->error=$e->getMessage();
+						$this->error = $e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
@@ -850,26 +850,26 @@ 
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
-						$this->error=$e->getMessage();
+						$this->error = $e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-				$odfHandler=null;	// Destroy object
+				$odfHandler = null; // Destroy object
 
 				$this->result = array('fullpath'=>$file);
 
-				return 1;   // Success
+				return 1; // Success
 			}
 			else
 			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
 		}

Braces +73 added lines, -53 removed lines

@@ -38,16 +38,36 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (! empty($conf->propal->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (! empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
-if (! empty($conf->commande->enabled))    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (! empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-if (! empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-if (! empty($conf->contrat->enabled))     require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (! empty($conf->ficheinter->enabled))  require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-if (! empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
-if (! empty($conf->agenda->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+if (! empty($conf->propal->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (! empty($conf->facture->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+}
+if (! empty($conf->facture->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
+}
+if (! empty($conf->commande->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
+if (! empty($conf->fournisseur->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+}
+if (! empty($conf->fournisseur->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+}
+if (! empty($conf->contrat->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+}
+if (! empty($conf->ficheinter->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+}
+if (! empty($conf->deplacement->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
+}
+if (! empty($conf->agenda->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+}
 
 
 /**
@@ -114,7 +134,10 @@ 
 
 		// Recupere emetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2);    // Par defaut, si n'etait pas defini
+		if (! $this->emetteur->pays_code) {
+		    $this->emetteur->pays_code=substr($langs->defaultlang,-2);
+		}
+		// Par defaut, si n'etait pas defini
 	}
 
 
@@ -367,11 +390,14 @@ 
 			if (! $tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
-			else
+			if (! is_dir($tmpdir)) {
+			    $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			} else
 			{
 				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+				if (count($tmpfiles)) {
+				    $listoffiles=array_merge($listoffiles,$tmpfiles);
+				}
 			}
 		}
 		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
@@ -442,7 +468,9 @@ 
 			return -1;
 		}
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		$sav_charset_output=$outputlangs->charset_output;
 		$outputlangs->charset_output='UTF-8';
 
@@ -469,7 +497,9 @@ 
 
 			$dir = $conf->projet->dir_output. "/" . $project->ref. "/";
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+			if (! preg_match('/specimen/i',$objectref)) {
+			    $dir.= "/" . $objectref;
+			}
 			$file = $dir . "/" . $objectref . ".odt";
 
 			if (! file_exists($dir))
@@ -524,8 +554,7 @@ 
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error=$e->getMessage();
 					return -1;
@@ -552,12 +581,14 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/',$key)) {
+						    // Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else {
+							    $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else    // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -571,7 +602,9 @@ 
 				{
 					// Security check
 					$socid=0;
-					if (!empty($project->fk_soc)) $socid = $project->fk_soc;
+					if (!empty($project->fk_soc)) {
+					    $socid = $project->fk_soc;
+					}
 
 					$tmparray=$this->get_substitutionarray_tasks($object,$outputlangs);
 					complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -624,8 +657,7 @@ 
 									$listlinestaskres->setVars($key, $val, true, 'UTF-8');
 								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e) {
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
@@ -669,12 +701,10 @@ 
 								try
 								{
 									$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
+								} catch(OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch(SegmentException $e)
+								} catch(SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -704,12 +734,10 @@ 
 							try
 							{
 								$listtasksfiles->setVars($key, $val, true, 'UTF-8');
-							}
-							catch(OdfException $e)
+							} catch(OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch(SegmentException $e)
+							} catch(SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -719,8 +747,7 @@ 
 					//$listlines->merge();
 
 					$odfHandler->mergeSegment($listtasksfiles);
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -748,12 +775,10 @@ 
 							try
 							{
 								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch(OdfException $e)
+							} catch(OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch(SegmentException $e)
+							} catch(SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -761,8 +786,7 @@ 
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -808,12 +832,10 @@ 
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
+								} catch(OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch(SegmentException $e)
+								} catch(SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -821,8 +843,7 @@ 
 							$listlines->merge();
 						}
 						$odfHandler->mergeSegment($listlines);
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 						$this->error=$e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
@@ -845,8 +866,7 @@ 
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -858,16 +878,16 @@ 
 				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
 				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+									@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler=null;	// Destroy object
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;   // Success
-			}
-			else
+			} else
 			{
 				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return -1;

dolibarr/htdocs/core/modules/project/task/mod_task_simple.php

Indentation +65 added lines, -65 removed lines

@@ -31,30 +31,30 @@ 
  */
 class mod_task_simple extends ModeleNumRefTask
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
 
-	public $prefix='TK';
+    public $prefix='TK';
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Simple';
+    /**
+     * @var string
+     * @deprecated
+     * @see name
+     */
+    public $nom='Simple';
 
-	/**
-	 * @var string name
-	 */
-	public $name='Simple';
+    /**
+     * @var string name
+     */
+    public $name='Simple';
 
 
     /**
@@ -64,8 +64,8 @@ 
      */
     function info()
     {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+        global $langs;
+            return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
     }
 
 
@@ -87,16 +87,16 @@ 
      */
     function canBeActivated()
     {
-    	global $conf,$langs,$db;
+        global $conf,$langs,$db;
 
         $coyymm=''; $max='';
 
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(task.ref FROM " . $posindice . ") AS SIGNED)) as max";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "projet_task AS task, ";
-		$sql .= MAIN_DB_PREFIX . "projet AS project WHERE task.fk_projet=project.rowid";
-		$sql .= " AND task.ref LIKE '" . $db->escape($this->prefix) . "____-%'";
-		$sql .= " AND project.entity = " . $conf->entity;
+        $posindice=8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(task.ref FROM " . $posindice . ") AS SIGNED)) as max";
+        $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task AS task, ";
+        $sql .= MAIN_DB_PREFIX . "projet AS project WHERE task.fk_projet=project.rowid";
+        $sql .= " AND task.ref LIKE '" . $db->escape($this->prefix) . "____-%'";
+        $sql .= " AND project.entity = " . $conf->entity;
         $resql=$db->query($sql);
         if ($resql)
         {
@@ -109,53 +109,53 @@ 
         }
         else
         {
-			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
+            $langs->load("errors");
+            $this->error=$langs->trans('ErrorNumRefModel',$max);
             return false;
         }
     }
 
 
-   /**
-	*  Return next value
-	*
-	*  @param   Societe	$objsoc		Object third party
-	*  @param   Task	$object		Object Task
-	*  @return	string				Value if OK, 0 if KO
-	*/
+    /**
+     *  Return next value
+     *
+     *  @param   Societe	$objsoc		Object third party
+     *  @param   Task	$object		Object Task
+     *  @return	string				Value if OK, 0 if KO
+     */
     function getNextValue($objsoc,$object)
     {
-		global $db,$conf;
-
-		// 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."projet_task";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
-		{
-			dol_syslog("mod_task_simple::getNextValue", LOG_DEBUG);
-			return -1;
-		}
-
-		$date=empty($object->date_c)?dol_now():$object->date_c;
-
-		//$yymm = strftime("%y%m",time());
-		$yymm = strftime("%y%m",$date);
-
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
-
-		dol_syslog("mod_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
-		return $this->prefix.$yymm."-".$num;
+        global $db,$conf;
+
+        // 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."projet_task";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj) $max = intval($obj->max);
+            else $max=0;
+        }
+        else
+        {
+            dol_syslog("mod_task_simple::getNextValue", LOG_DEBUG);
+            return -1;
+        }
+
+        $date=empty($object->date_c)?dol_now():$object->date_c;
+
+        //$yymm = strftime("%y%m",time());
+        $yymm = strftime("%y%m",$date);
+
+        if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
+        else $num = sprintf("%04s",$max+1);
+
+        dol_syslog("mod_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
+        return $this->prefix.$yymm."-".$num;
     }
 
 

Spacing +32 added lines, -32 removed lines

@@ -23,7 +23,7 @@ 
  *	\brief      File with class to manage the numbering module Simple for project references
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/project/task/modules_task.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
 
 
 /**
@@ -35,26 +35,26 @@ 
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	public $prefix='TK';
+	public $prefix = 'TK';
 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Simple';
+	public $nom = 'Simple';
 
 	/**
 	 * @var string name
 	 */
-	public $name='Simple';
+	public $name = 'Simple';
 
 
     /**
@@ -65,7 +65,7 @@ 
     function info()
     {
     	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
     }
 
 
@@ -87,30 +87,30 @@ 
      */
     function canBeActivated()
     {
-    	global $conf,$langs,$db;
+    	global $conf, $langs, $db;
 
-        $coyymm=''; $max='';
+        $coyymm = ''; $max = '';
 
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(task.ref FROM " . $posindice . ") AS SIGNED)) as max";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "projet_task AS task, ";
-		$sql .= MAIN_DB_PREFIX . "projet AS project WHERE task.fk_projet=project.rowid";
-		$sql .= " AND task.ref LIKE '" . $db->escape($this->prefix) . "____-%'";
-		$sql .= " AND project.entity = " . $conf->entity;
-        $resql=$db->query($sql);
+		$posindice = 8;
+		$sql = "SELECT MAX(CAST(SUBSTRING(task.ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task AS task, ";
+		$sql .= MAIN_DB_PREFIX."projet AS project WHERE task.fk_projet=project.rowid";
+		$sql .= " AND task.ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND project.entity = ".$conf->entity;
+        $resql = $db->query($sql);
         if ($resql)
         {
             $row = $db->fetch_row($resql);
-            if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
+            if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
         }
-        if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
+        if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
         {
             return true;
         }
         else
         {
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
             return false;
         }
     }
@@ -123,22 +123,22 @@ 
 	*  @param   Task	$object		Object Task
 	*  @return	string				Value if OK, 0 if KO
 	*/
-    function getNextValue($objsoc,$object)
+    function getNextValue($objsoc, $object)
     {
-		global $db,$conf;
+		global $db, $conf;
 
 		// D'abord on recupere la valeur max
-		$posindice=8;
+		$posindice = 8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."projet_task";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 
-		$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
 		{
@@ -146,13 +146,13 @@ 
 			return -1;
 		}
 
-		$date=empty($object->date_c)?dol_now():$object->date_c;
+		$date = empty($object->date_c) ?dol_now() : $object->date_c;
 
 		//$yymm = strftime("%y%m",time());
-		$yymm = strftime("%y%m",$date);
+		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		else $num = sprintf("%04s", $max + 1);
 
 		dol_syslog("mod_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
@@ -167,8 +167,8 @@ 
      *  @param  Task	$object     Object task
      *  @return string              Next not used reference
      */
-    function task_get_num($objsoc=0,$object='')
+    function task_get_num($objsoc = 0, $object = '')
     {
-        return $this->getNextValue($objsoc,$object);
+        return $this->getNextValue($objsoc, $object);
     }
 }

Braces +14 added lines, -8 removed lines

@@ -106,8 +106,7 @@ 
         if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
         {
             return true;
-        }
-        else
+        } else
         {
 			$langs->load("errors");
 			$this->error=$langs->trans('ErrorNumRefModel',$max);
@@ -137,10 +136,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_task_simple::getNextValue", LOG_DEBUG);
 			return -1;
@@ -151,8 +152,13 @@ 
 		//$yymm = strftime("%y%m",time());
 		$yymm = strftime("%y%m",$date);
 
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) {
+		    $num=$max+1;
+		}
+		// If counter > 9999, we do not format on 4 chars, we take number as it is
+		else {
+		    $num = sprintf("%04s",$max+1);
+		}
 
 		dol_syslog("mod_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

dolibarr/htdocs/core/modules/project/task/mod_task_universal.php

Indentation +68 added lines, -68 removed lines

@@ -30,28 +30,28 @@ 
  */
 class mod_task_universal extends ModeleNumRefTask
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
 
-	/**
+    /**
      * @var string Error code (or message)
      */
     public $error = '';
 
-	/**
-	 * @var string
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Universal';
+    /**
+     * @var string
+     * @deprecated
+     * @see name
+     */
+    public $nom='Universal';
 
-	/**
-	 * @var string name
-	 */
-	public $name='Universal';
+    /**
+     * @var string name
+     */
+    public $name='Universal';
 
 
     /**
@@ -59,40 +59,40 @@ 
      *
      *  @return     string      Texte descripif
      */
-	function info()
+    function info()
     {
-    	global $conf,$langs;
+        global $conf,$langs;
 
-		// Load translation files required by the page
+        // Load translation files required by the page
         $langs->loadLangs(array("projects","admin"));
 
-		$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="updateMaskTask">';
-		$texte.= '<input type="hidden" name="maskconsttask" value="PROJECT_TASK_UNIVERSAL_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="updateMaskTask">';
+        $texte.= '<input type="hidden" name="maskconsttask" value="PROJECT_TASK_UNIVERSAL_MASK">';
+        $texte.= '<table class="nobordernopadding" width="100%">';
 
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Task"),$langs->transnoentities("Task"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Task"),$langs->transnoentities("Task"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+        $tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Task"),$langs->transnoentities("Task"));
+        $tooltip.=$langs->trans("GenericMaskCodes2");
+        $tooltip.=$langs->trans("GenericMaskCodes3");
+        $tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Task"),$langs->transnoentities("Task"));
+        $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="masktask" value="'.$conf->global->PROJECT_TASK_UNIVERSAL_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="masktask" value="'.$conf->global->PROJECT_TASK_UNIVERSAL_MASK.'">',$tooltip,1,1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+        $texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+        $texte.= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+        $texte.= '</table>';
+        $texte.= '</form>';
 
-		return $texte;
+        return $texte;
     }
 
     /**
@@ -102,47 +102,47 @@ 
      */
     function getExample()
     {
-    	global $conf,$langs,$mysoc;
-
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
-
-		if (! $numExample)
-		{
-			$numExample = $langs->trans('NotConfigured');
-		}
-		return $numExample;
+        global $conf,$langs,$mysoc;
+
+        $old_code_client=$mysoc->code_client;
+        $mysoc->code_client='CCCCCCCCCC';
+        $numExample = $this->getNextValue($mysoc,'');
+        $mysoc->code_client=$old_code_client;
+
+        if (! $numExample)
+        {
+            $numExample = $langs->trans('NotConfigured');
+        }
+        return $numExample;
     }
 
-   /**
-	*  Return next value
-	*
-	*  @param	Societe		$objsoc		Object third party
-	*  @param   Task		$object	    Object task
-	*  @return  string					Value if OK, 0 if KO
-	*/
+    /**
+     *  Return next value
+     *
+     *  @param	Societe		$objsoc		Object third party
+     *  @param   Task		$object	    Object task
+     *  @return  string					Value if OK, 0 if KO
+     */
     function getNextValue($objsoc,$object)
     {
-		global $db,$conf;
+        global $db,$conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+        require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
 
-		// On defini critere recherche compteur
-		$mask=$conf->global->PROJECT_TASK_UNIVERSAL_MASK;
+        // On defini critere recherche compteur
+        $mask=$conf->global->PROJECT_TASK_UNIVERSAL_MASK;
 
-		if (! $mask)
-		{
-			$this->error='NotConfigured';
-			return 0;
-		}
+        if (! $mask)
+        {
+            $this->error='NotConfigured';
+            return 0;
+        }
 
-		$date=empty($object->date_c)?dol_now():$object->date_c;
-		$numFinal=get_next_value($db,$mask,'projet_task','ref','',(is_object($objsoc)?$objsoc->code_client:''),$date);
+        $date=empty($object->date_c)?dol_now():$object->date_c;
+        $numFinal=get_next_value($db,$mask,'projet_task','ref','',(is_object($objsoc)?$objsoc->code_client:''),$date);
 
-		return  $numFinal;
-	}
+        return  $numFinal;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

Spacing +38 added lines, -38 removed lines

@@ -22,7 +22,7 @@ 
  *	\brief      Fichier contenant la classe du modele de numerotation de reference de projet Universal
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/project/task/modules_task.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.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 code (or message)
@@ -46,12 +46,12 @@ 
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Universal';
+	public $nom = 'Universal';
 
 	/**
 	 * @var string name
 	 */
-	public $name='Universal';
+	public $name = 'Universal';
 
 
     /**
@@ -61,36 +61,36 @@ 
      */
 	function info()
     {
-    	global $conf,$langs;
+    	global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("projects","admin"));
+        $langs->loadLangs(array("projects", "admin"));
 
 		$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="updateMaskTask">';
-		$texte.= '<input type="hidden" name="maskconsttask" value="PROJECT_TASK_UNIVERSAL_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Task"),$langs->transnoentities("Task"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Task"),$langs->transnoentities("Task"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMaskTask">';
+		$texte .= '<input type="hidden" name="maskconsttask" value="PROJECT_TASK_UNIVERSAL_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Task"), $langs->transnoentities("Task"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Task"), $langs->transnoentities("Task"));
+		$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="masktask" value="'.$conf->global->PROJECT_TASK_UNIVERSAL_MASK.'">',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="masktask" value="'.$conf->global->PROJECT_TASK_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -102,14 +102,14 @@ 
      */
     function getExample()
     {
-    	global $conf,$langs,$mysoc;
+    	global $conf, $langs, $mysoc;
 
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
+    	$old_code_client = $mysoc->code_client;
+    	$mysoc->code_client = 'CCCCCCCCCC';
+    	$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -123,23 +123,23 @@ 
 	*  @param   Task		$object	    Object task
 	*  @return  string					Value if OK, 0 if KO
 	*/
-    function getNextValue($objsoc,$object)
+    function getNextValue($objsoc, $object)
     {
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// On defini critere recherche compteur
-		$mask=$conf->global->PROJECT_TASK_UNIVERSAL_MASK;
+		$mask = $conf->global->PROJECT_TASK_UNIVERSAL_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$date=empty($object->date_c)?dol_now():$object->date_c;
-		$numFinal=get_next_value($db,$mask,'projet_task','ref','',(is_object($objsoc)?$objsoc->code_client:''),$date);
+		$date = empty($object->date_c) ?dol_now() : $object->date_c;
+		$numFinal = get_next_value($db, $mask, 'projet_task', 'ref', '', (is_object($objsoc) ? $objsoc->code_client : ''), $date);
 
 		return  $numFinal;
 	}
@@ -153,7 +153,7 @@ 
      *  @param  Task		$object	    Object task
      *  @return string      			Next not used reference
      */
-    function project_get_num($objsoc=0,$object='')
+    function project_get_num($objsoc = 0, $object = '')
     {
         // phpcs:enable
         return $this->getNextValue($objsoc, $object);

dolibarr/htdocs/core/modules/project/task/modules_task.php

Indentation +93 added lines, -93 removed lines

@@ -32,33 +32,33 @@ 
  */
 abstract class ModelePDFTask 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)
-	{
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		$type='project_task';
-		$liste=array();
+        $type='project_task';
+        $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;
+    }
 }
 
 
@@ -68,82 +68,82 @@ 
  */
 abstract class ModeleNumRefTask
 {
-	/**
-	 * @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;
-	}
-
-	/**
-	 *  Renvoi la description par defaut du modele de numerotation
-	 *
-	 *  @return     string      Texte descripif
-	 */
-	function info()
-	{
-		global $langs;
-		$langs->load("projects");
-		return $langs->trans("NoDescription");
-	}
-
-	/**
-	 *  Renvoi un exemple de numerotation
-	 *
-	 *  @return     string      Example
-	 */
-	function getExample()
-	{
-		global $langs;
-		$langs->load("projects");
-		return $langs->trans("NoExample");
-	}
-
-	/**
-	 *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
-	 *  de conflits qui empechera cette numerotation de fonctionner.
-	 *
-	 *  @return     boolean     false si conflit, true si ok
-	 */
-	function canBeActivated()
-	{
-		return true;
-	}
-
-	/**
-	 *  Renvoi prochaine valeur attribuee
-	 *
-	 *	@param	Societe		$objsoc		Object third party
-	 *	@param	Project		$project	Object project
-	 *	@return	string					Valeur
-	 */
-	function getNextValue($objsoc, $project)
-	{
-		global $langs;
-		return $langs->trans("NotAvailable");
-	}
-
-	/**
-	 *  Renvoi 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;
-		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;
+    }
+
+    /**
+     *  Renvoi la description par defaut du modele de numerotation
+     *
+     *  @return     string      Texte descripif
+     */
+    function info()
+    {
+        global $langs;
+        $langs->load("projects");
+        return $langs->trans("NoDescription");
+    }
+
+    /**
+     *  Renvoi un exemple de numerotation
+     *
+     *  @return     string      Example
+     */
+    function getExample()
+    {
+        global $langs;
+        $langs->load("projects");
+        return $langs->trans("NoExample");
+    }
+
+    /**
+     *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
+     *  de conflits qui empechera cette numerotation de fonctionner.
+     *
+     *  @return     boolean     false si conflit, true si ok
+     */
+    function canBeActivated()
+    {
+        return true;
+    }
+
+    /**
+     *  Renvoi prochaine valeur attribuee
+     *
+     *	@param	Societe		$objsoc		Object third party
+     *	@param	Project		$project	Object project
+     *	@return	string					Valeur
+     */
+    function getNextValue($objsoc, $project)
+    {
+        global $langs;
+        return $langs->trans("NotAvailable");
+    }
+
+    /**
+     *  Renvoi 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;
+        return $langs->trans("NotAvailable");
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -46,16 +46,16 @@ 
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
      */
-    static function liste_modeles($db,$maxfilenamelength=0)
+    static function liste_modeles($db, $maxfilenamelength = 0)
 	{
         // phpcs:enable
 		global $conf;
 
-		$type='project_task';
-		$liste=array();
+		$type = 'project_task';
+		$liste = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		$liste = getListOfModels($db, $type, $maxfilenamelength);
 
 		return $liste;
 	}
@@ -71,7 +71,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 *  Return if a module can be used or not

Braces +9 added lines, -3 removed lines

@@ -141,9 +141,15 @@
 		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 == 'development') {
+		    return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+		    return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+		    return DOL_VERSION;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }

dolibarr/htdocs/core/modules/project/mod_project_universal.php

Indentation +68 added lines, -68 removed lines

@@ -30,28 +30,28 @@ 
  */
 class mod_project_universal extends ModeleNumRefProjects
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
 
-	/**
+    /**
      * @var string Error code (or message)
      */
     public $error = '';
 
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Universal';
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see name
+     */
+    public $nom='Universal';
 
-	/**
-	 * @var string model name
-	 */
-	public $name='Universal';
+    /**
+     * @var string model name
+     */
+    public $name='Universal';
 
 
     /**
@@ -59,40 +59,40 @@ 
      *
      *  @return     string      Texte descripif
      */
-	function info()
+    function info()
     {
-    	global $conf, $langs;
+        global $conf, $langs;
 
-		// Load translation files required by the page
+        // Load translation files required by the page
         $langs->loadLangs(array("projects","admin"));
 
-		$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="maskconstproject" value="PROJECT_UNIVERSAL_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="maskconstproject" value="PROJECT_UNIVERSAL_MASK">';
+        $texte.= '<table class="nobordernopadding" width="100%">';
 
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Project"),$langs->transnoentities("Project"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Project"),$langs->transnoentities("Project"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+        $tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Project"),$langs->transnoentities("Project"));
+        $tooltip.=$langs->trans("GenericMaskCodes2");
+        $tooltip.=$langs->trans("GenericMaskCodes3");
+        $tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Project"),$langs->transnoentities("Project"));
+        $tooltip.=$langs->trans("GenericMaskCodes5");
 
-		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskproject" value="'.$conf->global->PROJECT_UNIVERSAL_MASK.'">',$tooltip,1,1).'</td>';
+        // Parametrage du prefix
+        $texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
+        $texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskproject" value="'.$conf->global->PROJECT_UNIVERSAL_MASK.'">',$tooltip,1,1).'</td>';
 
-		$texte.= '<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;
     }
 
     /**
@@ -102,47 +102,47 @@ 
      */
     function getExample()
     {
-    	global $conf,$langs,$mysoc;
-
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
-
-		if (! $numExample)
-		{
-			$numExample = $langs->trans('NotConfigured');
-		}
-		return $numExample;
+        global $conf,$langs,$mysoc;
+
+        $old_code_client=$mysoc->code_client;
+        $mysoc->code_client='CCCCCCCCCC';
+        $numExample = $this->getNextValue($mysoc,'');
+        $mysoc->code_client=$old_code_client;
+
+        if (! $numExample)
+        {
+            $numExample = $langs->trans('NotConfigured');
+        }
+        return $numExample;
     }
 
-   /**
-	*  Return next value
-	*
-	*  @param	Societe		$objsoc		Object third party
-	*  @param   Project		$project	Object project
-	*  @return  string					Value if OK, 0 if KO
-	*/
+    /**
+     *  Return next value
+     *
+     *  @param	Societe		$objsoc		Object third party
+     *  @param   Project		$project	Object project
+     *  @return  string					Value if OK, 0 if KO
+     */
     function getNextValue($objsoc, $project)
     {
-		global $db,$conf;
+        global $db,$conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+        require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
 
-		// On defini critere recherche compteur
-		$mask=$conf->global->PROJECT_UNIVERSAL_MASK;
+        // On defini critere recherche compteur
+        $mask=$conf->global->PROJECT_UNIVERSAL_MASK;
 
-		if (! $mask)
-		{
-			$this->error='NotConfigured';
-			return 0;
-		}
+        if (! $mask)
+        {
+            $this->error='NotConfigured';
+            return 0;
+        }
 
-		$date=empty($project->date_c)?dol_now():$project->date_c;
-		$numFinal=get_next_value($db, $mask, 'projet', 'ref', '', (is_object($objsoc) ? $objsoc->code_client : ''), $date);
+        $date=empty($project->date_c)?dol_now():$project->date_c;
+        $numFinal=get_next_value($db, $mask, 'projet', 'ref', '', (is_object($objsoc) ? $objsoc->code_client : ''), $date);
 
-		return  $numFinal;
-	}
+        return  $numFinal;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

Spacing +36 added lines, -36 removed lines

@@ -22,7 +22,7 @@ 
  *	\brief      Fichier contenant la classe du modele de numerotation de reference de projet Universal
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/project/modules_project.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
 
 
 /**
@@ -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 code (or message)
@@ -46,12 +46,12 @@ 
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Universal';
+	public $nom = 'Universal';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Universal';
+	public $name = 'Universal';
 
 
     /**
@@ -64,33 +64,33 @@ 
     	global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("projects","admin"));
+        $langs->loadLangs(array("projects", "admin"));
 
 		$form = new Form($this->db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstproject" value="PROJECT_UNIVERSAL_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Project"),$langs->transnoentities("Project"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Project"),$langs->transnoentities("Project"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstproject" value="PROJECT_UNIVERSAL_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Project"), $langs->transnoentities("Project"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Project"), $langs->transnoentities("Project"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskproject" value="'.$conf->global->PROJECT_UNIVERSAL_MASK.'">',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskproject" value="'.$conf->global->PROJECT_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -102,14 +102,14 @@ 
      */
     function getExample()
     {
-    	global $conf,$langs,$mysoc;
+    	global $conf, $langs, $mysoc;
 
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
+    	$old_code_client = $mysoc->code_client;
+    	$mysoc->code_client = 'CCCCCCCCCC';
+    	$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -125,21 +125,21 @@ 
 	*/
     function getNextValue($objsoc, $project)
     {
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// On defini critere recherche compteur
-		$mask=$conf->global->PROJECT_UNIVERSAL_MASK;
+		$mask = $conf->global->PROJECT_UNIVERSAL_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$date=empty($project->date_c)?dol_now():$project->date_c;
-		$numFinal=get_next_value($db, $mask, 'projet', 'ref', '', (is_object($objsoc) ? $objsoc->code_client : ''), $date);
+		$date = empty($project->date_c) ?dol_now() : $project->date_c;
+		$numFinal = get_next_value($db, $mask, 'projet', 'ref', '', (is_object($objsoc) ? $objsoc->code_client : ''), $date);
 
 		return  $numFinal;
 	}
@@ -153,7 +153,7 @@ 
      *  @param  Project		$project	Object project
      *  @return string      			Next not used reference
      */
-    function project_get_num($objsoc=0, $project='')
+    function project_get_num($objsoc = 0, $project = '')
     {
         // phpcs:enable
         return $this->getNextValue($objsoc, $project);