Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

htdocs/core/class/commonobject.class.php

@@ -4914,7 +4914,7 @@ abstract class CommonObject
 						    $this->result['filename']=$ecmfile->filename;*/
 							//var_dump($obj->update_main_doc_field);exit;
 
-							// Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)
+							// Update the last_main_doc field into main object (if document generator has property ->update_main_doc_field set)
 							$update_main_doc_field = 0;
 							if (!empty($obj->update_main_doc_field)) $update_main_doc_field = 1;
 							if ($update_main_doc_field && !empty($this->table_element))

htdocs/core/modules/contract/doc/pdf_strato.modules.php

@@ -55,6 +55,11 @@ class pdf_strato extends ModelePDFContract
 	 */
 	public $description;
 
+	/**
+	 * @var int     Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
+
 	/**
 	 * @var string document type
 	 */
@@ -131,6 +136,7 @@ class pdf_strato extends ModelePDFContract
 		$this->db = $db;
 		$this->name = 'strato';
 		$this->description = $langs->trans("StandardContractsTemplate");
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
 		// Page size for A4 format
 		$this->type = 'pdf';

htdocs/core/modules/delivery/doc/pdf_storm.modules.php

@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2014 Regis Houssin         <regis.houssin@inodbox.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
  * Copyright (C) 2008      Chiptronik
- * Copyright (C) 2011-2019 Philippe Grand        <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2021 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2020      John BOTELLA
 
@@ -54,6 +54,11 @@ class pdf_storm extends ModelePDFDeliveryOrder
 	 */
 	public $description;
 
+	/**
+	 * @var int     Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
+
 	/**
 	 * @var string document type
 	 */
@@ -61,9 +66,9 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 	/**
 	 * @var array Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.5 = array(5, 5)
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
 	 */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
 	 * Dolibarr version of the loaded document
@@ -127,6 +132,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 		$this->db = $db;
 		$this->name = "Storm";
 		$this->description = $langs->trans("DocumentModelStorm");
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
 		// Page size for A4 format
 		$this->type = 'pdf';

htdocs/core/modules/delivery/doc/pdf_typhon.modules.php

@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2014 Regis Houssin         <regis.houssin@inodbox.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
  * Copyright (C) 2008      Chiptronik
- * Copyright (C) 2011-2020 Philippe Grand        <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2021 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
 
  * This program is free software; you can redistribute it and/or modify
@@ -53,6 +53,11 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	 */
 	public $description;
 
+	/**
+	 * @var int     Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
+
 	/**
 	 * @var string document type
 	 */
@@ -126,6 +131,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		$this->db = $db;
 		$this->name = "Typhon";
 		$this->description = $langs->trans("DocumentModelTyphon");
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
 		// Page size for A4 format
 		$this->type = 'pdf';

htdocs/core/modules/expedition/doc/pdf_espadon.modules.php

@@ -51,6 +51,11 @@ class pdf_espadon extends ModelePdfExpedition
 	 */
 	public $description;
 
+	/**
+	 * @var int     Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
+
 	/**
 	 * @var string document type
 	 */
@@ -122,6 +127,7 @@ class pdf_espadon extends ModelePdfExpedition
 		$this->db = $db;
 		$this->name = "espadon";
 		$this->description = $langs->trans("DocumentModelStandardPDF");
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
 		$this->type = 'pdf';
 		$formatarray = pdf_getFormat();

htdocs/core/modules/expedition/doc/pdf_merou.modules.php

@@ -52,6 +52,11 @@ class pdf_merou extends ModelePdfExpedition
 	 */
 	public $description;
 
+	/**
+	 * @var int     Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
+
 	/**
 	 * @var string document type
 	 */
@@ -123,6 +128,7 @@ class pdf_merou extends ModelePdfExpedition
 		$this->db = $db;
 		$this->name = "merou";
 		$this->description = $langs->trans("DocumentModelMerou");
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
 		$this->type = 'pdf';
 		$formatarray = pdf_getFormat();

htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

@@ -52,6 +52,11 @@ class pdf_rouget extends ModelePdfExpedition
 	 */
 	public $description;
 
+	/**
+	 * @var int     Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
+
 	/**
 	 * @var string document type
 	 */
@@ -123,6 +128,7 @@ class pdf_rouget extends ModelePdfExpedition
 		$this->db = $db;
 		$this->name = "rouget";
 		$this->description = $langs->trans("DocumentModelStandardPDF");
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
 		$this->type = 'pdf';
 		$formatarray = pdf_getFormat();

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

@@ -59,6 +59,11 @@ class pdf_standard extends ModeleExpenseReport
 	 */
 	public $description;
 
+	/**
+	 * @var int     Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
+
 	/**
 	 * @var string document type
 	 */
@@ -133,6 +138,7 @@ class pdf_standard extends ModeleExpenseReport
 		$this->db = $db;
 		$this->name = "";
 		$this->description = $langs->trans('PDFStandardExpenseReports');
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
 		// Page size for A4 format
 		$this->type = 'pdf';

htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php

@@ -54,6 +54,11 @@ class pdf_soleil extends ModelePDFFicheinter
 	 */
 	public $description;
 
+	/**
+	 * @var int     Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
+
 	/**
 	 * @var string document type
 	 */
@@ -124,6 +129,7 @@ class pdf_soleil extends ModelePDFFicheinter
 		$this->db = $db;
 		$this->name = 'soleil';
 		$this->description = $langs->trans("DocumentModelStandardPDF");
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
 		// Page size for A4 format
 		$this->type = 'pdf';

htdocs/core/modules/project/doc/pdf_baleine.modules.php

@@ -38,6 +38,31 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 class pdf_baleine extends ModelePDFProjects
 {
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
+
+	/**
+	 * @var string model name
+	 */
+	public $name;
+
+	/**
+	 * @var string model description (short text)
+	 */
+	public $description;
+
+	/**
+	 * @var int     Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
+
+	/**
+	 * @var string document type
+	 */
+	public $type;
+
 	/**
 	 * @var array Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.6 = array(5, 6)
@@ -50,6 +75,41 @@ class pdf_baleine extends ModelePDFProjects
 	 */
 	public $version = 'dolibarr';
 
+	/**
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
+
+	/**
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
+
+	/**
+	 * @var array format
+	 */
+	public $format;
+
+	/**
+	 * @var int marge_gauche
+	 */
+	public $marge_gauche;
+
+	/**
+	 * @var int marge_droite
+	 */
+	public $marge_droite;
+
+	/**
+	 * @var int marge_haute
+	 */
+	public $marge_haute;
+
+	/**
+	 * @var int marge_basse
+	 */
+	public $marge_basse;
+
 	/**
 	 * Issuer
 	 * @var Societe Object that emits
@@ -71,6 +131,7 @@ class pdf_baleine extends ModelePDFProjects
 		$this->db = $db;
 		$this->name = "baleine";
 		$this->description = $langs->trans("DocumentModelBaleine");
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
 		// Page size for A4 format
 		$this->type = 'pdf';

htdocs/core/modules/project/doc/pdf_beluga.modules.php

@@ -54,6 +54,78 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 class pdf_beluga extends ModelePDFProjects
 {
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
+
+	/**
+	 * @var string model name
+	 */
+	public $name;
+
+	/**
+	 * @var string model description (short text)
+	 */
+	public $description;
+
+	/**
+	 * @var int     Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
+
+	/**
+	 * @var string document type
+	 */
+	public $type;
+
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
+	public $phpmin = array(5, 6);
+
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr';
+
+	 /**
+	  * @var int page_largeur
+	  */
+	public $page_largeur;
+
+	/**
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
+
+	/**
+	 * @var array format
+	 */
+	public $format;
+
+	/**
+	 * @var int marge_gauche
+	 */
+	public $marge_gauche;
+
+	/**
+	 * @var int marge_droite
+	 */
+	public $marge_droite;
+
+	/**
+	 * @var int marge_haute
+	 */
+	public $marge_haute;
+
+	/**
+	 * @var int marge_basse
+	 */
+	public $marge_basse;
+
 	/**
 	 * Page orientation
 	 * @var string 'P' or 'Portait' (default), 'L' or 'Landscape'
@@ -81,6 +153,7 @@ class pdf_beluga extends ModelePDFProjects
 		$this->db = $db;
 		$this->name = "beluga";
 		$this->description = $langs->trans("DocumentModelBeluga");
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
 		// Page size for A4 format
 		$this->type = 'pdf';

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

@@ -37,6 +37,31 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 class pdf_timespent extends ModelePDFProjects
 {
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
+
+	/**
+	 * @var string model name
+	 */
+	public $name;
+
+	/**
+	 * @var string model description (short text)
+	 */
+	public $description;
+
+	/**
+	 * @var int     Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
+
+	/**
+	 * @var string document type
+	 */
+	public $type;
+
 	/**
 	 * @var array Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.6 = array(5, 6)
@@ -49,6 +74,41 @@ class pdf_timespent extends ModelePDFProjects
 	 */
 	public $version = 'dolibarr';
 
+	/**
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
+
+	/**
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
+
+	/**
+	 * @var array format
+	 */
+	public $format;
+
+	/**
+	 * @var int marge_gauche
+	 */
+	public $marge_gauche;
+
+	/**
+	 * @var int marge_droite
+	 */
+	public $marge_droite;
+
+	/**
+	 * @var int marge_haute
+	 */
+	public $marge_haute;
+
+	/**
+	 * @var int marge_basse
+	 */
+	public $marge_basse;
+
 	/**
 	 * Issuer
 	 * @var Societe	Object that emits
@@ -70,6 +130,7 @@ class pdf_timespent extends ModelePDFProjects
 		$this->db = $db;
 		$this->name = "timespent";
 		$this->description = $langs->trans("DocumentModelTimeSpent");
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
 		// Page size for A4 format
 		$this->type = 'pdf';

htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php

@@ -70,9 +70,9 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 
 	/**
 	 * @var array Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.5 = array(5, 5)
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
 	 */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
 	 * Dolibarr version of the loaded document