#330 [Triggers] fix: getDolGlobalInt and timesheetline class access

Evarisk · Jul 12, 2023 · 4e6b1de · 4e6b1de
1 parent d6ca2e8
commit 4e6b1de
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/class/timesheet.class.php b/class/timesheet.class.php
@@ -388,7 +388,7 @@ class TimeSheetLine 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 int $ismultientitymanaged = 0;
 
     /**
      * @var int Does object support extrafields ? 0 = No, 1 = Yes.
@@ -459,9 +459,9 @@ class TimeSheetLine extends SaturneObject
     public $date_creation;
 
     /**
-     * @var float Quantity.
+     * @var float|null Quantity.
      */
-    public float $qty;
+    public ?float $qty;
 
     /**
      * @var int Rang.
@@ -471,7 +471,7 @@ class TimeSheetLine extends SaturneObject
     /**
      * @var string Description.
      */
-    public string $description;
+    public string $description = '';
 
     /**
      * @var int|null Product type.

diff --git a/core/triggers/interface_99_modDolisirh_DolisirhTriggers.class.php b/core/triggers/interface_99_modDolisirh_DolisirhTriggers.class.php
@@ -110,7 +110,7 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf
         $actioncomm->userownerid = $user->id;
         $actioncomm->percentage  = -1;
 
-        if (getDolGlobalInt($conf->global->DOLISIRH_ADVANCED_TRIGGER) && !empty($object->fields)) {
+        if (getDolGlobalInt('DOLISIRH_ADVANCED_TRIGGER') && !empty($object->fields)) {
             $actioncomm->note_private = method_exists($object, 'getTriggerDescription') ? $object->getTriggerDescription($object) : '';
         }
 
@@ -222,7 +222,7 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf
                 if ($object->src_object_type == 'dolisirh_timesheet') {
                     require_once __DIR__ . '/../../../saturne/class/saturnesignature.class.php';
 
-                    $signatory = new SaturneSignature($this->db);
+                    $signatory = new SaturneSignature($this->db, 'dolisirh');
 
                     $signatories = $signatory->fetchSignatories($object->src_object_id, 'timesheet');
                     if (!empty($signatories) && $signatories > 0) {
@@ -243,15 +243,15 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf
                 if (!empty($object->fk_user_assign)) {
                     require_once __DIR__ . '/../../../saturne/class/saturnesignature.class.php';
 
-                    $signatory = new SaturneSignature($this->db);
+                    $signatory = new SaturneSignature($this->db, 'dolisirh', $object->element);
                     $usertmp   = new User($this->db);
 
                     $usertmp->fetch($object->fk_user_assign);
                     $signatory->setSignatory($object->id, $object->element, 'user', [$object->fk_user_assign], 'Signatory');
                     $signatory->setSignatory($object->id, $object->element, 'user', [$usertmp->fk_user], 'Responsible');
                 }
 
-                if (getDolGlobalInt($conf->global->DOLISIRH_PRODUCT_SERVICE_SET)) {
+                if (getDolGlobalInt('DOLISIRH_PRODUCT_SERVICE_SET')) {
                     require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
                     $product    = new Product($this->db);

diff --git a/view/timesheet/timesheet_card.php b/view/timesheet/timesheet_card.php
@@ -67,7 +67,7 @@
 // Initialize technical objects
 $object            = new TimeSheet($db);
 $objectline        = new TimeSheetLine($db);
-$signatory         = new SaturneSignature($db);
+$signatory         = new SaturneSignature($db, 'dolisirh');
 $timesheetdocument = new TimeSheetDocument($db);
 $extrafields       = new ExtraFields($db);
 $project           = new Project($db);
@@ -924,7 +924,7 @@
 			$genallowed = $permissiontoadd; // If you can read, you can build the PDF to read content
 			$delallowed = $permissiontodelete; // If you can create/edit, you can remove a file on card
 
-			print doliSirhShowDocuments('dolisirh:TimeSheetDocument', $dir_files, $filedir, $urlsource, $genallowed, $object->status == $object::STATUS_LOCKED ? $delallowed : 0, $conf->global->DOLISIRH_TIMESHEETDOCUMENT_DEFAULT_MODEL, 1, 0, 0, 0, 0, '', '', '', $langs->defaultlang, $object, 0, 'removefile', $object->status == $object::STATUS_LOCKED && empty(dol_dir_list($filedir)), $langs->trans('TimeSheetMustBeLocked'));
+			print saturne_show_documents('dolisirh:TimeSheetDocument', $dir_files, $filedir, $urlsource, $genallowed, $object->status == $object::STATUS_LOCKED ? $delallowed : 0, $conf->global->DOLISIRH_TIMESHEETDOCUMENT_DEFAULT_MODEL, 1, 0, 0, 0, 0, '', '', '', $langs->defaultlang, $object, 0, 'removefile', $object->status == $object::STATUS_LOCKED && empty(dol_dir_list($filedir)), $langs->trans('TimeSheetMustBeLocked'));
 		}
 
 		print '</div><div class="fichehalfright">';