alxarafe / alixar

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

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

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

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

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

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

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

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

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

Indentation +92 added lines, -92 removed lines

@@ -33,106 +33,106 @@
 class modExternalRss extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf;
-
-		$this->db = $db;
-		$this->numero = 320;
-
-		$this->family = "technic";
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Ajout de files d'informations RSS dans les ecrans Dolibarr";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='rss';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array("/externalrss/temp");
-
-		// Config pages
-		$this->config_page_url = array("external_rss.php");
-
-		// Dependencies
-		$this->depends = array();
-		$this->requiredby = array();
-		$this->phpmin = array(4,2,0);
-		$this->phpmax = array();
-
-		// Constants
-		$this->const = array();
-
-		// Boxes
-		$this->boxes = array();
-		// Les boites sont ajoutees lors de la configuration des flux
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'externalrss';
-	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf;
+
+        $this->db = $db;
+        $this->numero = 320;
+
+        $this->family = "technic";
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Ajout de files d'informations RSS dans les ecrans Dolibarr";
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='rss';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array("/externalrss/temp");
+
+        // Config pages
+        $this->config_page_url = array("external_rss.php");
+
+        // Dependencies
+        $this->depends = array();
+        $this->requiredby = array();
+        $this->phpmin = array(4,2,0);
+        $this->phpmax = array();
+
+        // Constants
+        $this->const = array();
+
+        // Boxes
+        $this->boxes = array();
+        // Les boites sont ajoutees lors de la configuration des flux
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'externalrss';
+    }
+
+    /**
+     *		Function called when module is enabled.
+     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *		It also creates data directories
+     *
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		global $conf;
-
-		$sql = array();
-
-		// Recherche configuration de boites
-		$this->boxes=array();
-		$sql="select name, value from ".MAIN_DB_PREFIX."const";
-		$sql.= " WHERE name like 'EXTERNAL_RSS_TITLE_%'";
-		$sql.= " AND entity = ".$conf->entity;
-		$result=$this->db->query($sql);
-		if ($result)
-		{
-			while ($obj = $this->db->fetch_object($result))
-			{
-				if (preg_match('/EXTERNAL_RSS_TITLE_([0-9]+)/i',$obj->name,$reg))
-				{
-					// Definie la boite si on a trouvee une ancienne configuration
-					//$this->boxes[$reg[1]][0] = "(ExternalRSSInformations)";
-					$this->boxes[$reg[1]]['file'] = "box_external_rss.php";
-					$this->boxes[$reg[1]]['note'] = $reg[1]." (".$obj->value.")";
-				}
-			}
-			$this->db->free($result);
-		}
-
-		$sql = array();
-
-		return $this->_init($sql,$options);
-	}
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        global $conf;
+
+        $sql = array();
+
+        // Recherche configuration de boites
+        $this->boxes=array();
+        $sql="select name, value from ".MAIN_DB_PREFIX."const";
+        $sql.= " WHERE name like 'EXTERNAL_RSS_TITLE_%'";
+        $sql.= " AND entity = ".$conf->entity;
+        $result=$this->db->query($sql);
+        if ($result)
+        {
+            while ($obj = $this->db->fetch_object($result))
+            {
+                if (preg_match('/EXTERNAL_RSS_TITLE_([0-9]+)/i',$obj->name,$reg))
+                {
+                    // Definie la boite si on a trouvee une ancienne configuration
+                    //$this->boxes[$reg[1]][0] = "(ExternalRSSInformations)";
+                    $this->boxes[$reg[1]]['file'] = "box_external_rss.php";
+                    $this->boxes[$reg[1]]['note'] = $reg[1]." (".$obj->value.")";
+                }
+            }
+            $this->db->free($result);
+        }
+
+        $sql = array();
+
+        return $this->_init($sql,$options);
+    }
 
     /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
+     *		Function called when module is disabled.
+     *      Remove from database constants, boxes and permissions from Dolibarr database.
+     *		Data directories are not deleted
+     *
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
+     *      @return     int             	1 if OK, 0 if KO
      */
     function remove($options='')
     {
-		$sql = array();
+        $sql = array();
 
-		// Delete old declarations of RSS box
-		$this->boxes[0]['file'] = "box_external_rss.php";
+        // Delete old declarations of RSS box
+        $this->boxes[0]['file'] = "box_external_rss.php";
 
-		return $this->_remove($sql,$options);
+        return $this->_remove($sql,$options);
     }
 }