Merge pull request #1507 from Evarisk/develop

Develop

README.md

@@ -3,15 +3,15 @@
 ## Informations
 
 - Numéro du module : 436301
-- Dernière mise à jour : 21/08/2023
+- Dernière mise à jour : 23/08/2023
 - Éditeur : [Evarisk](https://evarisk.com)
 - Thème : Eldy Menu
 - Licence : GPLv3
 - Disponible sur : Windows - MacOS - Linux
 
 ### Version
 
-- Version : 1.8.0
+- Version : 1.8.1
 - Compatibilité : Dolibarr 16.0.0 - 17.0.3
 - Saturne Framework : 1.1.2
 

class/answer.class.php

@@ -48,7 +48,7 @@ class Answer extends SaturneObject
      * @var int Does this object support multicompany module ?
      * 0 = No test on entity, 1 = Test with field entity, 'field@table' = Test with link by field@table.
      */
-    public int $ismultientitymanaged = 1;
+    public $ismultientitymanaged = 1;
 
     /**
      * @var int Does object support extrafields ? 0 = No, 1 = Yes.
@@ -104,7 +104,7 @@ class Answer extends SaturneObject
     /**
      * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
      */
-    public array $fields = [
+    public $fields = [
         'rowid'         => ['type' => 'integer',      'label' => 'TechnicalID',      'enabled' => 1, 'position' => 1,   'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => 'Id'],
         'ref'           => ['type' => 'varchar(128)', 'label' => 'Ref',              'enabled' => 1, 'position' => 10,  'notnull' => 1, 'visible' => 4, 'noteditable' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'validate' => 1, 'comment' => 'Reference of object'],
         'ref_ext'       => ['type' => 'varchar(128)', 'label' => 'RefExt',           'enabled' => 1, 'position' => 20,  'notnull' => 0, 'visible' => 0],

class/control.class.php

@@ -51,7 +51,7 @@ class Control extends SaturneObject
      * @var int Does this object support multicompany module ?
      * 0 = No test on entity, 1 = Test with field entity, 'field@table' = Test with link by field@table.
      */
-    public int $ismultientitymanaged = 1;
+    public $ismultientitymanaged = 1;
 
     /**
      * @var int Does object support extrafields ? 0 = No, 1 = Yes.
@@ -110,7 +110,7 @@ class Control extends SaturneObject
     /**
      * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
      */
-    public array $fields = [
+    public $fields = [
         'rowid'              => ['type' => 'integer',      'label' => 'TechnicalID',      'enabled' => 1, 'position' => 1,   'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => 'Id'],
         'ref'                => ['type' => 'varchar(128)', 'label' => 'Ref',              'enabled' => 1, 'position' => 10,  'notnull' => 1, 'visible' => 4, 'noteditable' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'validate' => 1, 'comment' => 'Reference of object'],
         'ref_ext'            => ['type' => 'varchar(128)', 'label' => 'RefExt',           'enabled' => 1, 'position' => 20,  'notnull' => 0, 'visible' => 0],

class/digiqualidocuments/controldocument.class.php

@@ -32,7 +32,7 @@ class ControlDocument extends SaturneDocuments
     /**
      * @var string Module name.
      */
-    public string $module = 'digiquali';
+    public $module = 'digiquali';
 
     /**
      * @var string Element type of object.

class/dolibarrobject.class.php

@@ -156,7 +156,7 @@ class DigiQualiSupplierProposal extends SupplierProposal
     /**
      * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
      */
-    public array $fields = [
+    public $fields = [
         'rowid'              => ['type' => 'integer',      'label' => 'TechnicalID',      'enabled' => 1, 'position' => 1,   'notnull' => 1, 'visible' => -1, 'noteditable' => 1, 'index' => 1, 'comment' => 'Id'],
         'tms'                => ['type' => 'timestamp',    'label' => 'DateModification', 'enabled' => 1, 'position' => 10,  'notnull' => 0, 'visible' => -1],
         'ref'                => ['type' => 'varchar(30)',  'label' => 'Ref',              'enabled' => 1, 'position' => 20,  'notnull' => 1, 'visible' => -1, 'noteditable' => 1, 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'validate' => 1, 'comment' => 'Reference of object'],

class/dolibarrobjects/digiqualisupplierproposal.class.php

@@ -70,7 +70,7 @@ class DigiQualiSupplierProposal extends SupplierProposal
     /**
      * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
      */
-    public array $fields = [
+    public $fields = [
         'rowid'              => ['type' => 'integer',      'label' => 'TechnicalID',      'enabled' => 1, 'position' => 1,   'notnull' => 1, 'visible' => -1, 'noteditable' => 1, 'index' => 1, 'comment' => 'Id'],
         'tms'                => ['type' => 'timestamp',    'label' => 'DateModification', 'enabled' => 1, 'position' => 10,  'notnull' => 0, 'visible' => -1],
         'ref'                => ['type' => 'varchar(30)',  'label' => 'Ref',              'enabled' => 1, 'position' => 20,  'notnull' => 1, 'visible' => -1, 'noteditable' => 1, 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'validate' => 1, 'comment' => 'Reference of object'],

class/question.class.php

@@ -48,7 +48,7 @@ class Question extends SaturneObject
      * @var int Does this object support multicompany module ?
      * 0 = No test on entity, 1 = Test with field entity, 'field@table' = Test with link by field@table.
      */
-    public int $ismultientitymanaged = 1;
+    public $ismultientitymanaged = 1;
 
     /**
      * @var int Does object support extrafields ? 0 = No, 1 = Yes.
@@ -107,7 +107,7 @@ class Question extends SaturneObject
     /**
      * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
      */
-	public array $fields = [
+	public $fields = [
         'rowid'                  => ['type' => 'integer',      'label' => 'TechnicalID',          'enabled' => 1, 'position' => 1,   'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => 'Id'],
         'ref'                    => ['type' => 'varchar(128)', 'label' => 'Ref',                  'enabled' => 1, 'position' => 10,  'notnull' => 1, 'visible' => 4, 'noteditable' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'validate' => 1, 'comment' => 'Reference of object'],
         'ref_ext'                => ['type' => 'varchar(128)', 'label' => 'RefExt',               'enabled' => 1, 'position' => 20,  'notnull' => 0, 'visible' => 0],

class/sheet.class.php

@@ -48,7 +48,7 @@ class Sheet extends SaturneObject
      * @var int Does this object support multicompany module ?
      * 0 = No test on entity, 1 = Test with field entity, 'field@table' = Test with link by field@table.
      */
-    public int $ismultientitymanaged = 1;
+    public $ismultientitymanaged = 1;
 
     /**
      * @var int Does object support extrafields ? 0 = No, 1 = Yes.
@@ -107,7 +107,7 @@ class Sheet extends SaturneObject
     /**
      * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
      */
-    public array $fields = [
+    public $fields = [
         'rowid'               => ['type' => 'integer',      'label' => 'TechnicalID',        'enabled' => 1, 'position' => 1,   'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => 'Id'],
         'ref'                 => ['type' => 'varchar(128)', 'label' => 'Ref',                'enabled' => 1, 'position' => 10,  'notnull' => 1, 'visible' => 4, 'noteditable' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'validate' => 1, 'comment' => 'Reference of object'],
         'ref_ext'             => ['type' => 'varchar(128)', 'label' => 'RefExt',             'enabled' => 1, 'position' => 20,  'notnull' => 0, 'visible' => 0],

core/modules/digiquali/digiqualidocuments/controldocument/doc_controldocument_odt.modules.php

@@ -52,7 +52,7 @@ class doc_controldocument_odt extends SaturneDocumentModel
      * @var array Minimum version of PHP required by module.
      * e.g.: PHP ≥ 5.5 = array(5, 5)
      */
-    public array $phpmin = [7, 4];
+    public $phpmin = [7, 4];
 
     /**
      * @var string Dolibarr version of the loaded document.
@@ -172,9 +172,13 @@ public function fillTagsLines(Odf $odfHandler, Translate $outputLangs, array $mo
             }
 
             if ($foundTagForLines) {
+
                 if (!empty($object)) {
-                    $object->fetchObjectLinked($object->fk_sheet, 'digiquali_sheet','', '', 'OR', 1, 'sourcetype', 0);
-                    $questionIds = $object->linkedObjectsIds;
+                    $sheet = new Sheet($this->db);
+
+                    $sheet->fetchObjectLinked($object->fk_sheet, 'digiquali_sheet','', '', 'OR', 1, 'sourcetype', 0);
+                    $questionIds = $sheet->linkedObjectsIds;
+
                     if (is_array($questionIds['digiquali_question']) && !empty($questionIds['digiquali_question'])) {
                         $controldet = new ControlLine($this->db);
                         $question   = new Question($this->db);

core/modules/modDigiQuali.class.php

@@ -77,7 +77,7 @@ public function __construct($db)
 		$this->editor_url = 'https://evarisk.com/';
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = '1.8.0';
+		$this->version = '1.8.1';
 		// Url to the file with your last numberversion of this module
 		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
 

core/tpl/digiquali_public_control.tpl.php

@@ -1,6 +1,6 @@
 <div class="signature-container" style="max-width: 1000px;">
     <div class="wpeo-gridlayout grid-2">
-        <div style="display: flex; justify-content: center; align-items: center;"><?php echo saturne_show_medias_linked('digiquali', $conf->digiquali->multidir_output[$conf->entity] . '/' . $object->element . '/'. $object->ref . '/photos/', 'small', '', 0, 0, 0, 200, 200, 0, 0, 0, $object->element . '/'. $object->ref . '/photos/', $object, 'photo', 0, 0,0, 1); ?></div>
+        <div style="display: flex; justify-content: center; align-items: center;"><?php echo saturne_show_medias_linked('digiquali', $conf->digiquali->multidir_output[$conf->entity] . '/' . $object->element . '/'. $object->ref . '/photos/', 'small', '', 0, 0, 0, 200, 200, 0, 0, 1, $object->element . '/'. $object->ref . '/photos/', $object, 'photo', 0, 0,0, 1); ?></div>
         <div class="informations">
             <?php foreach ($elementArray as $linkableObjectType => $linkableObject) {
                 if ($linkableObject['conf'] > 0 && (!empty($object->linkedObjectsIds[$linkableObject['link_name']]))) {

core/triggers/interface_99_modDigiQuali_DigiQualiTriggers.class.php

@@ -49,7 +49,7 @@ public function __construct($db)
 		$this->name        = preg_replace('/^Interface/i', '', get_class($this));
 		$this->family      = 'demo';
 		$this->description = 'DigiQuali triggers.';
-		$this->version     = '1.8.0';
+		$this->version     = '1.8.1';
 		$this->picto       = 'digiquali@digiquali';
 	}