diff --git a/README.md b/README.md
index 2b648ba3f..588c466af 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 ## Informations
 
 - Numéro du module : 436302
-- Dernière mise à jour : 08/04/2024
+- Dernière mise à jour : 23/04/2024
 - Éditeur : [Evarisk](https://evarisk.com)
 - Thème : Eldy Menu
 - Licence : GPLv3
@@ -11,7 +11,7 @@
 
 ### Version
 
-- Version : 9.15.0
+- Version : 10.0.0
 - PHP : 7.4.33
 - Compatibilité : Dolibarr 16.0.0 - 19.0.1
 - Saturne Framework : 1.3.0
diff --git a/admin/config/riskassessmentdocument.php b/admin/config/riskassessmentdocument.php
index 4ab9e6f16..413d402e7 100644
--- a/admin/config/riskassessmentdocument.php
+++ b/admin/config/riskassessmentdocument.php
@@ -81,6 +81,8 @@
 if (($action == 'update' && ! GETPOST("cancel", 'alpha')) || ($action == 'updateedit')) {
 	$DUProject             = GETPOST('DUProject', 'none');
 	$DUProject             = preg_split('/_/', $DUProject);
+    $EnvironmentProject    = GETPOST('EnvironmentProject', 'none');
+    $EnvironmentProject    = preg_split('/_/', $EnvironmentProject);
 	$evaluatorDuration     = GETPOST('EvaluatorDuration', 'alpha');
 	$taskTimeSpentDuration = GETPOST('TaskTimeSpentDuration', 'alpha');
 
@@ -101,6 +103,23 @@
         }
     }
 
+    if ($EnvironmentProject[0] > 0 && $EnvironmentProject[0] != $conf->global->DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT) {
+        dolibarr_set_const($db, "DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT", $EnvironmentProject[0], 'integer', 0, '', $conf->entity);
+
+        $url = '/projet/tasks.php?id=' . $EnvironmentProject[0];
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
+        $sql .= " url='".$db->escape($url)."'";
+        $sql .= " WHERE leftmenu='digiriskenvironmentalactionplan'";
+        $sql .= " AND entity=" . $conf->entity;
+
+        $resql = $db->query($sql);
+        if (!$resql) {
+            $error = "Error ".$db->lasterror();
+            return -1;
+        }
+    }
+
 	if (!empty($evaluatorDuration) || $evaluatorDuration === '0') {
 		dolibarr_set_const($db, "DIGIRISKDOLIBARR_EVALUATOR_DURATION", $evaluatorDuration, 'integer', 0, '', $conf->entity);
 	}
@@ -193,6 +212,11 @@
         'name'        => 'RiskListParentView',
         'description' => 'RiskListParentViewDescription',
         'code'        => 'DIGIRISKDOLIBARR_RISK_LIST_PARENT_VIEW',
+    ],
+    'CategoryOnRisk' => [
+        'name'        => 'CategoryOnRisk',
+        'description' => 'CategoryOnRiskDescription',
+        'code'        => 'DIGIRISKDOLIBARR_CATEGORY_ON_RISK',
     ],
 	'ShowInheritedRisksInDocuments' => [
 		'name'        => 'ShowInheritedRisksInDocuments',
@@ -278,6 +302,12 @@
 	print '<td><input type="submit" class="button" name="save" value="' . $langs->trans("Save") . '">';
 	print '</td></tr>';
 
+    print '<tr class="oddeven"><td><label for="EnvironmentProject">' . $langs->trans("EnvironmentProject") . '</label></td><td>';
+    $formproject->select_projects(-1,  $conf->global->DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT, 'EnvironmentProject', 0, 0, 0, 0, 0, 0, 0, '', 0, 0, 'maxwidth500');
+    print ' <a href="' . DOL_URL_ROOT . '/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?action=create&socid=' . $soc->id) . '"><span class="fa fa-plus-circle valignmiddle" title="' . $langs->trans("AddProject") . '"></span></a>';
+    print '<td><input type="submit" class="button" name="save" value="' . $langs->trans("Save") . '">';
+    print '</td></tr>';
+
 	print '<tr class="oddeven"><td><label for="projectContactType">' . $langs->trans("DefaultProjectContactType") . '</label></td><td class="maxwidth500">';
 	$formcompany->selectTypeContact($project, $conf->global->DIGIRISKDOLIBARR_DEFAULT_PROJECT_CONTACT_TYPE, 'project_contact_type', 'internal', 'position', 0, 'minwidth500');
 	print '<td><input type="submit" class="button" name="save" value="' . $langs->trans("Save") . '">';
diff --git a/class/actions_digiriskdolibarr.class.php b/class/actions_digiriskdolibarr.class.php
index a953b17fd..747eae69b 100644
--- a/class/actions_digiriskdolibarr.class.php
+++ b/class/actions_digiriskdolibarr.class.php
@@ -72,7 +72,7 @@ public function constructCategory($parameters, &$object)
     {
         $error = 0; // Error counter
 
-        if (($parameters['currentcontext'] == 'category')) {
+        if (strpos($parameters['context'], 'category') !== false) {
             $tags = [
                 'accident' => [
                     'id'        => 436302001,
@@ -92,6 +92,12 @@ public function constructCategory($parameters, &$object)
                     'obj_class' => 'FirePermit',
                     'obj_table' => 'digiriskdolibarr_firepermit',
                 ],
+                'risk' => [
+                    'id'        => 436302004,
+                    'code'      => 'risk',
+                    'obj_class' => 'Risk',
+                    'obj_table' => 'digiriskdolibarr_risk',
+                ],
             ];
         }
 
@@ -210,7 +216,7 @@ public function printCommonFooter($parameters)
                 $fileDir    = $upload_dir . '/' . $dirFiles;
                 $urlSource  = $_SERVER['PHP_SELF'] . '?id=' . $object->id;
 
-                $out = saturne_show_documents('digiriskdolibarr:TicketDocument', $dirFiles, $fileDir, $urlSource, $user->rights->ticket->write, $user->rights->ticket->delete, getDolGlobalString('DIGIRISKDOLIBARR_TICKET_DEFAULT_MODEL'), 1, 0, 0, 0, '', '', '', '', '', $object); ?>
+                $out = saturne_show_documents('digiriskdolibarr:TicketDocument', $dirFiles, $fileDir, $urlSource, $user->rights->ticket->write, $user->rights->ticket->delete, getDolGlobalString('DIGIRISKDOLIBARR_TICKETDOCUMENT_DEFAULT_MODEL'), 1, 0, 0, 0, '', '', '', '', '', $object); ?>
 
                 <script>
                     jQuery('.fichehalfleft .div-table-responsive-no-min').first().append(<?php echo json_encode($out); ?>);
@@ -568,7 +574,7 @@ public function doActions($parameters, $object, $action)
                 $permissiontoadd     = $user->rights->ticket->write;
             }
 
-            if ($action == 'remove_file') {
+            if ($action == 'remove_file' && preg_match('/\bticketdocument\b/', GETPOST('file'))) {
                 $upload_dir         = $conf->digiriskdolibarr->multidir_output[$conf->entity ?? 1];
                 $permissiontodelete = $user->rights->ticket->delete;
             }
@@ -968,6 +974,10 @@ public function saturneAdminDocumentData(array $parameters): int
 				'documentType' => 'listingrisksaction',
 				'picto'        => 'fontawesome_fa-exclamation_fas_#d35968'
 			],
+            'ListingRisksEnvironmentalAction' => [
+                'documentType' => 'listingrisksenvironmentalaction',
+                'picto'        => 'fontawesome_fa-exclamation_fas_#d35968'
+            ],
 			'ListingRisksPhoto' => [
 				'documentType' => 'listingrisksphoto',
 				'picto'        => 'fontawesome_fa-images_fas_#d35968'
@@ -1031,7 +1041,8 @@ public function saturneAdminAdditionalConfig(array $parameters): int
 	{
 		$additionalConfig = [
 			'ShowPictoName' => 'DIGIRISKDOLIBARR_DOCUMENT_SHOW_PICTO_NAME',
-			'GenerateZipArchiveWithDigiriskElementDocuments' => 'DIGIRISKDOLIBARR_GENERATE_ARCHIVE_WITH_DIGIRISKELEMENT_DOCUMENTS'
+            'GenerateZipArchiveWithDigiriskElementDocuments' => 'DIGIRISKDOLIBARR_GENERATE_ARCHIVE_WITH_DIGIRISKELEMENT_DOCUMENTS',
+			'RiskAssessmentColor' => 'DIGIRISKDOLIBARR_PROJECTDOCUMENT_DISPLAY_RISKASSESSMENT_COLOR'
 		];
 
 		// Do something only for the current context.
diff --git a/class/digiriskdocuments.class.php b/class/digiriskdocuments.class.php
index 1f52e121d..9652d3c64 100644
--- a/class/digiriskdocuments.class.php
+++ b/class/digiriskdocuments.class.php
@@ -51,31 +51,18 @@ public function __construct(DoliDB $db, $module, $element)
 		parent::__construct($db, $module, $element);
 	}
 
-	/**
-	 * Create object into database
-	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             0 < if KO, ID of created object if OK
-	 */
-	public function create(User $user, bool $notrigger = false, object $parentObject = null): int
-	{
-		$now = dol_now();
-
-		$this->ref_ext       = 'digirisk_' . $this->ref;
-		$this->date_creation = $this->db->idate($now);
-		$this->tms           = $now;
-		$this->import_key    = "";
-		$this->status        = 1;
-		$this->type          = $this->element;
-		$this->module_name   = $this->module;
-		$this->fk_user_creat = $user->id ?: 1;
-        $this->parent_id     = $parentObject->id;
-        $this->parent_type   = $parentObject->element;
-
-		$this->DigiriskFillJSON();
-		return $this->createCommon($user, $notrigger);
-	}
+    /**
+     * Create object into database
+     *
+     * @param  User $user      User that creates
+     * @param  bool $notrigger false = launch triggers after, true = disable triggers
+     * @return int             0 < if KO, ID of created object if OK
+     */
+    public function create(User $user, bool $notrigger = false, object $parentObject = null): int
+    {
+        $this->DigiriskFillJSON();
+        return parent::create($user, $notrigger, $parentObject);
+    }
 
 	/**
 	 * Function for JSON filling before saving in database
@@ -230,15 +217,15 @@ public function fillRiskData(Odf $odfHandler, $object, Translate $outputLangs, $
                                     }
 
                                     if ($conf->global->DIGIRISKDOLIBARR_SHOW_RISK_ORIGIN) {
-                                        $nomElement .= (!empty($conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS) ? 'S' . $element->entity . ' - ' : '') . $element->ref . ' - ' . $element->label;
+                                        $nomElement .= (!empty($conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS) ? 'S' . $element->entity : '') . ' - ' . $element->ref . ' - ' . $element->label;
                                         if ($line->fk_element != $line->appliedOn) {
-                                            $nomElement .= "\n" . ($dash > 0 ? ' - ' : '') . $langs->trans('AppliedOn') . ' ' . $linked_element->ref . ' - ' . $linked_element->label;
+                                            $nomElement .= ($dash > 0 ? ' - ' : '') . $langs->trans('AppliedOn') . ' ' . $linked_element->ref . ' - ' . $linked_element->label;
                                         }
                                     } else {
                                         if ($linked_element->id > 0) {
-                                            $nomElement .= "\n" . ($dash > 0 ? ' - ' : '') . $linked_element->ref . ' - ' . $linked_element->label;
+                                            $nomElement .= ($dash > 0 ? ' - ' : '') . $linked_element->ref . ' - ' . $linked_element->label;
                                         } else {
-                                            $nomElement .= "\n" . ($dash > 0 ? ' - ' : '') . $element->ref . ' - ' . $element->label;
+                                            $nomElement .= ($dash > 0 ? ' - ' : '') . $element->ref . ' - ' . $element->label;
                                         }
                                     }
 
diff --git a/class/digiriskdolibarrdocuments/listingrisksenvironmentalaction.class.php b/class/digiriskdolibarrdocuments/listingrisksenvironmentalaction.class.php
new file mode 100644
index 000000000..d7106950c
--- /dev/null
+++ b/class/digiriskdolibarrdocuments/listingrisksenvironmentalaction.class.php
@@ -0,0 +1,51 @@
+<?php
+/* Copyright (C) 2024 EVARISK <technique@evarisk.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    class/digiriskdolibarrdocuments/listingrisksenvironmentalaction.class.php
+ * \ingroup digiriskdolibarr
+ * \brief   This file is a class file for ListingRisksEnvironmentalAction
+ */
+
+// Load DigiriskDolibarr libraries
+require_once __DIR__ . '/../digiriskdocuments.class.php';
+
+/**
+ * Class for ListingRisksEnvironmentalAction
+ */
+class ListingRisksEnvironmentalAction extends DigiriskDocuments
+{
+    /**
+     * @var string Module name
+     */
+    public $module = 'digiriskdolibarr';
+
+    /**
+     * @var string Element type of object
+     */
+    public $element = 'listingrisksenvironmentalaction';
+
+    /**
+     * Constructor
+     *
+     * @param DoliDb $db Database handler
+     */
+    public function __construct(DoliDB $db)
+    {
+        parent::__construct($db, $this->module, $this->element);
+    }
+}
diff --git a/class/digiriskdolibarrdocuments/listingrisksenvironmentaldocument.class.php b/class/digiriskdolibarrdocuments/listingrisksenvironmentaldocument.class.php
new file mode 100644
index 000000000..bcb4103cb
--- /dev/null
+++ b/class/digiriskdolibarrdocuments/listingrisksenvironmentaldocument.class.php
@@ -0,0 +1,53 @@
+<?php
+/* Copyright (C) 2024 EVARISK <technique@evarisk.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    class/digiriskdolibarrdocuments/listingrisksenvironmentaldocument.class.php
+ * \ingroup digiriskdolibarr
+ * \brief   This file is a class file for ListingRisksEnvironmentalDocument
+ */
+
+
+// Load DigiriskDolibarr librairies
+require_once __DIR__ . '/../digiriskdocuments.class.php';
+
+/**
+ * Class for ListingRisksEnvironmentalDocument
+ */
+
+class ListingRisksEnvironmentalDocument extends DigiriskDocuments
+{
+    /**
+     * @var string Module name
+     */
+    public $module = 'digiriskdolibarr';
+
+    /**
+     * @var string Element type of object
+     */
+    public $element = 'listingrisksenvironmentaldocument';
+
+    /**
+     * Constructor
+     *
+     * @param DoliDb $db Database handler
+     */
+    public function __construct(DoliDB $db)
+    {
+        parent::__construct($db, $this->module, $this->element);
+    }
+}
diff --git a/class/digiriskelement.class.php b/class/digiriskelement.class.php
index 05ca24a06..b53bb3528 100644
--- a/class/digiriskelement.class.php
+++ b/class/digiriskelement.class.php
@@ -489,7 +489,8 @@ public function getBannerTabContent(): array
         }
         $morehtmlref .= '<br>';
         $this->fetch($this->id);
-        $this->fk_project = $conf->global->DIGIRISKDOLIBARR_DU_PROJECT;
+        $riskType         = GETPOST('type');
+        $this->fk_project = $riskType == 'riskenvironmental' ? $conf->global->DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT : $conf->global->DIGIRISKDOLIBARR_DU_PROJECT;
         $moreParams['project']['disable_edit'] = 1;
 
         return [$morehtmlref, $moreParams];
diff --git a/class/riskanalysis/risk.class.php b/class/riskanalysis/risk.class.php
index d66fa9932..ffbcba538 100644
--- a/class/riskanalysis/risk.class.php
+++ b/class/riskanalysis/risk.class.php
@@ -88,6 +88,7 @@ class Risk extends SaturneObject
 		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 80, 'notnull' => 0, 'visible' => 0,),
 		'category' => array('type' => 'varchar(255)', 'label' => 'RiskCategory', 'enabled' => '1', 'position' => 21, 'notnull' => 0, 'visible' => 1,),
 		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 23, 'notnull' => 0, 'visible' => -1,),
+		'type' => array('type' => 'varchar(255)', 'label' => 'Type', 'enabled' => '1', 'position' => 24, 'notnull' => 1, 'visible' => 0, 'default' => '(PROV)'),
 		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 110, 'notnull' => 1, 'visible' => 0, 'foreignkey' => 'user.rowid',),
 		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 120, 'notnull' => -1, 'visible' => 0,),
 		'fk_projet' => array('type' => 'integer:Project:projet/class/project.class.php', 'label' => 'Projet', 'enabled' => '1', 'position' => 140, 'notnull' => 1, 'visible' => 0,),
@@ -103,6 +104,7 @@ class Risk extends SaturneObject
 	public $status;
 	public $category;
 	public $description;
+    public $type = 'risk';
 	public $fk_user_creat;
 	public $fk_user_modif;
 	public $fk_element;
@@ -148,6 +150,12 @@ public function __construct(DoliDB $db)
             ]
         ];
 
+        $riskType = GETPOST('type');
+        if ($riskType == 'riskenvironmental') {
+            $this->type  = 'riskenvironmental';
+            $this->picto = 'fontawesome_fa-leaf_fas_#d35968';
+        }
+    
 		parent::__construct($db, $this->module, $this->element);
 	}
 
@@ -181,10 +189,10 @@ public function fetchRisksOrderedByCotation($parent_id, $get_children_data = fal
 		$objects = $object->getActiveDigiriskElements();
 
 		$risk     = new Risk($this->db);
-		$riskList = $risk->fetchAll('', '', 0, 0, ['customsql' => 'status = ' . self::STATUS_VALIDATED . $moreParams['filter']], 'AND', $get_shared_data ? 1 : 0);
+		$riskList = $risk->fetchAll('', '', 0, 0, ['customsql' => 'status = ' . self::STATUS_VALIDATED . $moreParams['filterRisk']], 'AND', $get_shared_data ? 1 : 0);
 
 		$riskAssessment     = new RiskAssessment($this->db);
-		$riskAssessmentList = $riskAssessment->fetchAll('', '', 0, 0, ['customsql' => 'status = ' . RiskAssessment::STATUS_VALIDATED . $moreParams['filter']], 'AND', $get_shared_data ? 1 : 0);
+		$riskAssessmentList = $riskAssessment->fetchAll('', '', 0, 0, ['customsql' => 'status = ' . RiskAssessment::STATUS_VALIDATED . $moreParams['filterRiskAssessment']], 'AND', $get_shared_data ? 1 : 0);
 
 		if (is_array($riskAssessmentList) && !empty($riskAssessmentList)) {
 			foreach ($riskAssessmentList as $riskAssessmentSingle) {
@@ -338,7 +346,8 @@ public function fetchRisksOrderedByCotation($parent_id, $get_children_data = fal
 	public function getDangerCategories()
 	{
 		$json_categories = file_get_contents(DOL_DOCUMENT_ROOT . '/custom/digiriskdolibarr/js/json/dangerCategories.json');
-		return json_decode($json_categories, true);
+        $jsonArray       = json_decode($json_categories, true);
+		return $jsonArray[0][$this->type];
 	}
 
 	/**
diff --git a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/accidentinvestigationdocument/doc_accidentinvestigationdocument_odt.modules.php b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/accidentinvestigationdocument/doc_accidentinvestigationdocument_odt.modules.php
index bad459cd7..0677b21fb 100644
--- a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/accidentinvestigationdocument/doc_accidentinvestigationdocument_odt.modules.php
+++ b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/accidentinvestigationdocument/doc_accidentinvestigationdocument_odt.modules.php
@@ -144,8 +144,8 @@ public function fillTagsLines(Odf $odfHandler, Translate $outputLangs, array $mo
 		// Replace tags of lines.
 		try {
 			$this->setAttendantsSegment($odfHandler, $outputLangs, $moreParam);
-
-			$risks = $moreParam['gp_ut_id'] > 0 ? $risk->fetchRisksOrderedByCotation($moreParam['gp_ut_id'], true, $conf->global->DIGIRISKDOLIBARR_SHOW_INHERITED_RISKS_IN_DOCUMENTS, $conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS) : [];
+            $moreParam['filterRisk'] = ' AND t.type = "risk"';
+			$risks = $moreParam['gp_ut_id'] > 0 ? $risk->fetchRisksOrderedByCotation($moreParam['gp_ut_id'], true, $conf->global->DIGIRISKDOLIBARR_SHOW_INHERITED_RISKS_IN_DOCUMENTS, $conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS, $moreParam) : [];
 			$digiriskDocument->fillRiskData($odfHandler, $this, $outputLangs, [], null, $risks);
 
 			$moreParam['task_type'] = 'cur_task';
diff --git a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/auditreportdocument/doc_auditreportdocument_odt.modules.php b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/auditreportdocument/doc_auditreportdocument_odt.modules.php
index 889c1143b..4df3fca23 100644
--- a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/auditreportdocument/doc_auditreportdocument_odt.modules.php
+++ b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/auditreportdocument/doc_auditreportdocument_odt.modules.php
@@ -125,8 +125,10 @@ public function write_file(SaturneDocuments $objectDocument, Translate $outputLa
             $filter         = " AND (t.date_creation BETWEEN '$startDate' AND '$endDate' OR t.tms BETWEEN '$startDate' AND '$endDate')";
             $specificFilter = " AND (t.datec BETWEEN '$startDate' AND '$endDate' OR t.tms BETWEEN '$startDate' AND '$endDate')";
 
-            $moreParam['filter']         = $filter;
-            $moreParam['specificFilter'] = $specificFilter;
+            $moreParam['filter']               = $filter;
+            $moreParam['filterRisk']           = $filter . ' AND t.type = "risk"';
+            $moreParam['filterRiskAssessment'] = $filter;
+            $moreParam['specificFilter']       = $specificFilter;
         }
 
         $groupments       = [];
diff --git a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksdocument/doc_listingrisksaction_odt.modules.php b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksdocument/doc_listingrisksaction_odt.modules.php
index bbbfdd4b1..eab2dd925 100644
--- a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksdocument/doc_listingrisksaction_odt.modules.php
+++ b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksdocument/doc_listingrisksaction_odt.modules.php
@@ -91,8 +91,9 @@ public function fillTagsLines(Odf $odfHandler, Translate $outputLangs, array $mo
 		$objectDocument = $moreParam['objectDocument'];
 
 		try {
+            $moreParam['filterRisk'] = ' AND t.type = "risk"';
 			$risk  = new Risk($this->db);
-			$risks = $risk->fetchRisksOrderedByCotation($digiriskelement->id > 0 ? $digiriskelement->id : 0, true, $conf->global->DIGIRISKDOLIBARR_SHOW_INHERITED_RISKS_IN_DOCUMENTS, $conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS);
+			$risks = $risk->fetchRisksOrderedByCotation($digiriskelement->id > 0 ? $digiriskelement->id : 0, true, $conf->global->DIGIRISKDOLIBARR_SHOW_INHERITED_RISKS_IN_DOCUMENTS, $conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS, $moreParam);
 
 			$objectDocument->fillRiskData($odfHandler, $objectDocument, $outputLangs, [], '', $risks, $conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS);
 
diff --git a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksdocument/doc_listingrisksdocument_odt.modules.php b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksdocument/doc_listingrisksdocument_odt.modules.php
index 14e29465c..a1a56c15d 100644
--- a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksdocument/doc_listingrisksdocument_odt.modules.php
+++ b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksdocument/doc_listingrisksdocument_odt.modules.php
@@ -91,8 +91,9 @@ public function fillTagsLines(Odf $odfHandler, Translate $outputLangs, array $mo
 		$objectDocument = $moreParam['objectDocument'];
 
 		try {
+            $moreParam['filterRisk'] = ' AND t.type = "risk"';
 			$risk  = new Risk($this->db);
-			$risks = $risk->fetchRisksOrderedByCotation($digiriskelement->id > 0 ? $digiriskelement->id : 0, true, $conf->global->DIGIRISKDOLIBARR_SHOW_INHERITED_RISKS_IN_DOCUMENTS, $conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS);
+			$risks = $risk->fetchRisksOrderedByCotation($digiriskelement->id > 0 ? $digiriskelement->id : 0, true, $conf->global->DIGIRISKDOLIBARR_SHOW_INHERITED_RISKS_IN_DOCUMENTS, $conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS, $moreParam);
 
 			$objectDocument->fillRiskData($odfHandler, $objectDocument, $outputLangs, [], '', $risks, $conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS);
 
diff --git a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksdocument/doc_listingrisksphoto_odt.modules.php b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksdocument/doc_listingrisksphoto_odt.modules.php
index fb00fbd9d..5d47b429f 100644
--- a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksdocument/doc_listingrisksphoto_odt.modules.php
+++ b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksdocument/doc_listingrisksphoto_odt.modules.php
@@ -91,8 +91,9 @@ public function fillTagsLines(Odf $odfHandler, Translate $outputLangs, array $mo
 		$objectDocument = $moreParam['objectDocument'];
 
 		try {
+            $moreParam['filterRisk'] = ' AND t.type = "risk"';
 			$risk  = new Risk($this->db);
-			$risks = $risk->fetchRisksOrderedByCotation($digiriskelement->id > 0 ? $digiriskelement->id : 0, true, $conf->global->DIGIRISKDOLIBARR_SHOW_INHERITED_RISKS_IN_DOCUMENTS, $conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS);
+			$risks = $risk->fetchRisksOrderedByCotation($digiriskelement->id > 0 ? $digiriskelement->id : 0, true, $conf->global->DIGIRISKDOLIBARR_SHOW_INHERITED_RISKS_IN_DOCUMENTS, $conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS, $moreParam);
 
 			$objectDocument->fillRiskData($odfHandler, $objectDocument, $outputLangs, [], '', $risks, $conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS);
 
diff --git a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksenvironmentalaction/index.php b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksenvironmentalaction/index.php
new file mode 100644
index 000000000..cd6990e24
--- /dev/null
+++ b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksenvironmentalaction/index.php
@@ -0,0 +1,2 @@
+<?php
+//Silence is golden
diff --git a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksenvironmentalaction/mod_listingrisksenvironmentalaction_jocaste.php b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksenvironmentalaction/mod_listingrisksenvironmentalaction_jocaste.php
new file mode 100644
index 000000000..1c98c1024
--- /dev/null
+++ b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksenvironmentalaction/mod_listingrisksenvironmentalaction_jocaste.php
@@ -0,0 +1,42 @@
+<?php
+/* Copyright (C) 2024 EVARISK <technique@evarisk.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ * \file    core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksenvironmentalaction/mod_listingrisksenvironmentalaction_jocaste.php
+ * \ingroup digiriskdolibarr
+ * \brief   File that contains the numbering module rules jocaste
+ */
+
+// Load Saturne libraries
+require_once __DIR__ . '/../../../../../../saturne/core/modules/saturne/modules_saturne.php';
+
+/**
+ * Class of file that contains the numbering module rules jocaste
+ */
+class mod_listingrisksenvironmentalaction_jocaste extends CustomModeleNumRefSaturne
+{
+    /**
+     * @var string Model name
+     */
+    public string $name = 'Jocaste';
+
+    public function __construct()
+    {
+        self::setCustomValue('digiriskdolibarr', 'listingrisksenvironmentalaction');
+    }
+}
diff --git a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksenvironmentalaction/mod_listingrisksenvironmentalaction_standard.php b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksenvironmentalaction/mod_listingrisksenvironmentalaction_standard.php
new file mode 100644
index 000000000..adce66b24
--- /dev/null
+++ b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksenvironmentalaction/mod_listingrisksenvironmentalaction_standard.php
@@ -0,0 +1,42 @@
+<?php
+/* Copyright (C) 2024 EVARISK <technique@evarisk.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *  \file    core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksenvironmentalaction/mod_listingrisksenvironmentalaction_standard.php
+ *  \ingroup digiriskdolibarr
+ *  \brief   File of class to manage listingrisksenvironmentalaction numbering rules standard
+ */
+
+// Load Saturne libraries
+require_once __DIR__ . '/../../../../../../saturne/core/modules/saturne/modules_saturne.php';
+
+/**
+ * Class to manage listingrisksenvironmentalaction numbering rules standard
+ */
+class mod_listingrisksenvironmentalaction_standard extends ModeleNumRefSaturne
+{
+    /**
+     * @var string Numbering module ref prefix
+     */
+    public string $prefix = 'RLE';
+
+    /**
+     * @var string Name
+     */
+    public string $name = 'Ersa';
+}
diff --git a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksenvironmentaldocument/doc_listingrisksenvironmentalaction_odt.modules.php b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksenvironmentaldocument/doc_listingrisksenvironmentalaction_odt.modules.php
new file mode 100644
index 000000000..c3df56209
--- /dev/null
+++ b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksenvironmentaldocument/doc_listingrisksenvironmentalaction_odt.modules.php
@@ -0,0 +1,131 @@
+<?php
+/* Copyright (C) 2024 EVARISK <technique@evarisk.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *	\file    core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksenvironmentaldocument/doc_listingrisksenvironmentalaction_odt.modules.php
+ *	\ingroup digiriskdolibarr
+ *	\brief   File of class to build ODT documents for digiriskdolibarr
+ */
+
+require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/doc.lib.php';
+
+// Load DigiriskDolibarr libraries
+require_once __DIR__ . '/../../../../../class/riskanalysis/risk.class.php';
+
+// Load Saturne libraries
+require_once __DIR__ . '/../../../../../../saturne/core/modules/saturne/modules_saturne.php';
+
+/**
+ *	Class to build documents using ODF templates generator
+ */
+class doc_listingrisksenvironmentalaction_odt extends SaturneDocumentModel
+{
+    /**
+     * @var string Module
+     */
+    public string $module = 'digiriskdolibarr';
+
+    /**
+     * @var string Document type
+     */
+    public string $document_type = 'listingrisksenvironmentalaction';
+
+    /**
+     * Constructor
+     *
+     * @param DoliDB $db Database handler
+     */
+    public function __construct(DoliDB $db)
+    {
+        parent::__construct($db, $this->module, $this->document_type);
+    }
+
+    /**
+     * Return description of a module
+     *
+     * @param  Translate $langs Lang object to use for output
+     * @return string           Description
+     */
+    public function info(Translate $langs): string
+    {
+        return parent::info($langs);
+    }
+
+    /**
+     * Fill all odt tags for segments lines
+     *
+     * @param  Odf       $odfHandler  Object builder odf library
+     * @param  Translate $outputLangs Lang object to use for output
+     * @param  array     $moreParam   More param (Object/user/etc)
+     *
+     * @return int                    1 if OK, <=0 if KO
+     * @throws Exception
+     */
+    public function fillTagsLines(Odf $odfHandler, Translate $outputLangs, array $moreParam): int
+    {
+        global $conf;
+
+        if (get_class($moreParam['object']) == 'DigiriskElement') {
+            $digiriskelement = $moreParam['object'];
+        } else {
+            $digiriskelement = null;
+        }
+
+        $objectDocument = $moreParam['objectDocument'];
+
+        try {
+            $moreParam['filterRisk'] = ' AND t.type = "riskenvironmental"';
+            $risk  = new Risk($this->db);
+            $risks = $risk->fetchRisksOrderedByCotation($digiriskelement->id > 0 ? $digiriskelement->id : 0, true, $conf->global->DIGIRISKDOLIBARR_SHOW_INHERITED_RISKS_IN_DOCUMENTS, $conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS, $moreParam);
+
+            $objectDocument->fillRiskData($odfHandler, $objectDocument, $outputLangs, [], '', $risks, $conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS);
+
+        } catch (OdfException $e) {
+            $this->error = $e->getMessage();
+            dol_syslog($this->error, LOG_WARNING);
+            return -1;
+        }
+        return 0;
+    }
+
+    /**
+     * Function to build a document on disk
+     *
+     * @param  SaturneDocuments $objectDocument  Object source to build document
+     * @param  Translate        $outputLangs     Lang object to use for output
+     * @param  string           $srcTemplatePath Full path of source filename for generator using a template file
+     * @param  int              $hideDetails     Do not show line details
+     * @param  int              $hideDesc        Do not show desc
+     * @param  int              $hideRef         Do not show ref
+     * @param  array            $moreParam       More param (Object/user/etc)
+     * @return int                               1 if OK, <=0 if KO
+     * @throws Exception
+     */
+    public function write_file(SaturneDocuments $objectDocument, Translate $outputLangs, string $srcTemplatePath, int $hideDetails = 0, int $hideDesc = 0, int $hideRef = 0, array $moreParam): int
+    {
+        $tmpArray = [];
+
+        $moreParam['tmparray']         = $tmpArray;
+        $moreParam['objectDocument']   = $objectDocument;
+        $moreParam['hideTemplateName'] = 1;
+
+        return parent::write_file($objectDocument, $outputLangs, $srcTemplatePath, $hideDetails, $hideDesc, $hideRef, $moreParam);
+    }
+}
diff --git a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksenvironmentaldocument/index.php b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksenvironmentaldocument/index.php
new file mode 100644
index 000000000..cd6990e24
--- /dev/null
+++ b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/listingrisksenvironmentaldocument/index.php
@@ -0,0 +1,2 @@
+<?php
+//Silence is golden
diff --git a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/projectdocument/pdf_orque_projectdocument.modules.php b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/projectdocument/pdf_orque_projectdocument.modules.php
index 9bc9a25aa..5e0d8554b 100644
--- a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/projectdocument/pdf_orque_projectdocument.modules.php
+++ b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/projectdocument/pdf_orque_projectdocument.modules.php
@@ -393,6 +393,31 @@ public function write_file(	SaturneDocuments $objectDocument, Translate $outputL
 				$curY = $tab_top + $heightoftitleline + 1;
 				$nexY = $tab_top + $heightoftitleline + 1;
 
+				// Sort the info by descending order of cotation
+				$objectDoc = array();
+				for ($i = 0; $i < $nblines; $i++) {
+                    $object->lines[$i]->fetch_optionals();
+                    $risk->fetch($object->lines[$i]->array_options['options_fk_risk']);
+					$lastEvaluation = $riskassessment->fetchFromParent($risk->id, 1);
+					if ($lastEvaluation > 0 && !empty($lastEvaluation) && is_array($lastEvaluation)) {
+						$lastEvaluation = array_shift($lastEvaluation);
+					}
+
+					$tmpArray = array("cotation" => empty($lastEvaluation->cotation) ? 0 : $lastEvaluation->cotation);
+					$tmpArray += array("task_ref" => $object->lines[$i]->ref);
+					$tmpArray += array("risk_ref" => $risk->ref);
+					$tmpArray += array("label" => $object->lines[$i]->label);
+					$tmpArray += array("budget" => $object->lines[$i]->budget_amount);
+					$tmpArray += array("progress" => $object->lines[$i]->progress ? $object->lines[$i]->progress . '%' : '');
+					$tmpArray += array("date_start" => $object->lines[$i]->date_start);
+					$tmpArray += array("date_end" => $object->lines[$i]->date_end);
+					$tmpArray += array("workload" =>  $object->lines[$i]->planned_workload);
+					array_push($objectDoc, $tmpArray);
+				}
+				usort($objectDoc, function($a, $b) {
+					return $b['cotation'] <=> $a['cotation'];
+				});
+
 				// Loop on each lines
 
 				for ($i = 0; $i < $nblines; $i++) {
@@ -404,22 +429,17 @@ public function write_file(	SaturneDocuments $objectDocument, Translate $outputL
 					$pdf->setPageOrientation($this->orientation, 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
-					$risk->fetch($object->lines[$i]->options_fk_risk);
-					$lastEvaluation = $riskassessment->fetchFromParent($risk->id, 1);
-					if ($lastEvaluation > 0 && !empty($lastEvaluation) && is_array($lastEvaluation)) {
-						$lastEvaluation = array_shift($lastEvaluation);
-					}
-
 					// Description of line
-					$ref = $object->lines[$i]->ref;
-					$libelleline = $object->lines[$i]->label;
-					$riskref = $risk->ref;
-					$lastEvaluation = $lastEvaluation->cotation ?: 0;
-					$budget = price($object->lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
-					$progress = ($object->lines[$i]->progress ? $object->lines[$i]->progress.'%' : '');
-					$datestart = dol_print_date($object->lines[$i]->date_start, 'day');
-					$dateend = dol_print_date($object->lines[$i]->date_end, 'day');
-					$planned_workload = convertSecondToTime((int) $object->lines[$i]->planned_workload, 'allhourmin');
+					$ref = $objectDoc[$i]['task_ref'];
+					$libelleline = $objectDoc[$i]['label'];
+					$riskref = $objectDoc[$i]['risk_ref'];
+					$lastEvaluation = $objectDoc[$i]['cotation'];
+					$budget = price($objectDoc[$i]['budget'], 0, $langs, 1, 0, 0, $conf->currency);
+					$progress = $objectDoc[$i]['progress'];
+					$datestart = dol_print_date($objectDoc[$i]['date_start'], 'day');
+					$dateend = dol_print_date($objectDoc[$i]['date_end'], 'day');
+					$planned_workload = convertSecondToTime((int) $objectDoc[$i]['workload'], 'allhourmin');
+					$totalbudget += $objectDoc[$i]['budget'];
 
 					$showpricebeforepagebreak = 1;
 
@@ -518,8 +538,20 @@ public function write_file(	SaturneDocuments $objectDocument, Translate $outputL
 					$pdf->SetXY($this->posxrisk, $curY);
 					$pdf->MultiCell($this->posxriskassessment - $this->posxrisk, 3, $riskref, 0, 'L');
 					// Risk assessment
+					if ($conf->global->DIGIRISKDOLIBARR_PROJECTDOCUMENT_DISPLAY_RISKASSESSMENT_COLOR) {
+						if ($lastEvaluation < 47) {
+							$pdf->SetTextColor(169, 169, 169);
+						} else if ($lastEvaluation < 51) {
+							$pdf->SetTextColor(255, 165, 0);
+						} else if ($lastEvaluation < 80) {
+							$pdf->SetTextColor(255, 0, 0);
+						} else {
+							$pdf->SetTextColor(0, 0, 0);
+						}
+					}
 					$pdf->SetXY($this->posxriskassessment, $curY);
 					$pdf->MultiCell($this->posxlabel - $this->posxriskassessment, 3, $lastEvaluation, 0, 'C');
+					$pdf->SetTextColor(0, 0, 0);
 					// task budget
 					$pdf->SetXY($this->posxbudget, $curY);
 					$pdf->MultiCell($this->posxworkload - $this->posxbudget, 3, $budget, 0, 'R');
@@ -587,6 +619,16 @@ public function write_file(	SaturneDocuments $objectDocument, Translate $outputL
 					}
 				}
 
+				// Break line between total budget and tasks
+				$curY += 10;
+				$pdf->line($this->marge_gauche, $curY, $this->page_largeur - $this->marge_droite, $curY);
+				$curY += 5;
+				$totalbudget = price($totalbudget, 0, $langs, 1, 0, 0, $conf->currency);
+
+				// Total budget of task
+				$pdf->SetXY($this->posxref, $curY);
+				$pdf->MultiCell($this->posxbudget - $this->posxlabel, 3, $outputlangs->convToOutputCharset($langs->transnoentities('TotalBudget')) . ' : ' . $outputlangs->convToOutputCharset($totalbudget), 0, 'L');
+
 				// Show square
 				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
diff --git a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/riskassessmentdocument/doc_riskassessmentdocument_odt.modules.php b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/riskassessmentdocument/doc_riskassessmentdocument_odt.modules.php
index c166ceb67..89609d157 100644
--- a/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/riskassessmentdocument/doc_riskassessmentdocument_odt.modules.php
+++ b/core/modules/digiriskdolibarr/digiriskdolibarrdocuments/riskassessmentdocument/doc_riskassessmentdocument_odt.modules.php
@@ -103,10 +103,11 @@ public function fillTagsLines(Odf $odfHandler, Translate $outputLangs, array $mo
 				$ticket                = new Ticket($this->db);
 				$category              = new Categorie($this->db);
 
-				$digiriskelementlist   = $digiriskelementobject->fetchDigiriskElementFlat(0);
-				$risks                 = $risk->fetchRisksOrderedByCotation(0, true, $conf->global->DIGIRISKDOLIBARR_SHOW_INHERITED_RISKS_IN_DOCUMENTS, $conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS);
-				$riskAssessmentList    = $riskassessment->fetchAll('', '', 0, 0, ['customsql' => 'status = 1']);
-				$riskList              = $risk->fetchAll('', '', 0, 0, array(), 'AND', $conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS);
+                $moreParam['filterRisk'] = ' AND t.type = "risk"';
+				$risks                   = $risk->fetchRisksOrderedByCotation(0, true, $conf->global->DIGIRISKDOLIBARR_SHOW_INHERITED_RISKS_IN_DOCUMENTS, $conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS, $moreParam);
+				$riskAssessmentList      = $riskassessment->fetchAll('', '', 0, 0, ['customsql' => 'status = 1']);
+				$riskList                = $risk->fetchAll('', '', 0, 0, array(), 'AND', $conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS);
+				$digiriskelementlist     = $digiriskelementobject->fetchDigiriskElementFlat(0);
 
 				if (is_array($digiriskelementlist) && !empty($digiriskelementlist)) {
 					$listLines = $odfHandler->setSegment('elementParHierarchie');
diff --git a/core/modules/modDigiriskDolibarr.class.php b/core/modules/modDigiriskDolibarr.class.php
index 5a94ab0db..2639e8e89 100644
--- a/core/modules/modDigiriskDolibarr.class.php
+++ b/core/modules/modDigiriskDolibarr.class.php
@@ -380,7 +380,7 @@ public function __construct($db)
 		$this->descriptionlong = "Digirisk";
 		$this->editor_name     = 'Evarisk';
 		$this->editor_url      = 'https://evarisk.com';
-		$this->version         = '9.15.0';
+		$this->version         = '10.0.0';
 		$this->const_name      = 'MAIN_MODULE_' . strtoupper($this->name);
 		$this->picto           = 'digiriskdolibarr_color@digiriskdolibarr';
 
@@ -462,8 +462,9 @@ public function __construct($db)
 			"/ecm/digiriskdolibarr/preventionplandocument",
 			"/ecm/digiriskdolibarr/groupmentdocument",
 			"/ecm/digiriskdolibarr/workunitdocument",
-            "/ecm/digiriskdolibarr/listingrisksdocument",
             "/ecm/digiriskdolibarr/listingrisksaction",
+            "/ecm/digiriskdolibarr/listingrisksdocument",
+			"/ecm/digiriskdolibarr/listingrisksenvironmentalaction",
 			"/ecm/digiriskdolibarr/listingrisksphoto",
 			"/ecm/digiriskdolibarr/ticketdocument",
 			"/ecm/digiriskdolibarr/accidentinvestigationdocument",
@@ -576,6 +577,13 @@ public function __construct($db)
 			$i++ => ['DIGIRISKDOLIBARR_LISTINGRISKSPHOTO_CUSTOM_ADDON_ODT_PATH', 'chaine', 'DOL_DATA_ROOT' . (($conf->entity == 1 ) ? '/' : '/' . $conf->entity . '/') . 'ecm/digiriskdolibarr/listingrisksphoto/', '', 0, 'current'],
 			$i++ => ['DIGIRISKDOLIBARR_LISTINGRISKSPHOTO_DEFAULT_MODEL', 'chaine', 'listingrisksphoto_odt', '', 0, 'current'],
 
+            // CONST LISTING RISKS ENVIRONMENTAL ACTION
+            $i++ => ['DIGIRISKDOLIBARR_MAIN_AGENDA_ACTIONAUTO_LISTINGRISKSENVIRONMENTALACTION_GENERATE', 'integer', 1, '', 0, 'current'],
+            $i++ => ['DIGIRISKDOLIBARR_LISTINGRISKSENVIRONMENTALACTION_ADDON', 'chaine', 'mod_listingrisksenvironmentalaction_standard', '', 0, 'current'],
+            $i++ => ['DIGIRISKDOLIBARR_LISTINGRISKSENVIRONMENTALACTION_ADDON_ODT_PATH', 'chaine', 'DOL_DOCUMENT_ROOT/custom/digiriskdolibarr/documents/doctemplates/listingrisksenvironmentaldocument/listingrisksenvironmentalaction/', '', 0, 'current'],
+            $i++ => ['DIGIRISKDOLIBARR_LISTINGRISKSENVIRONMENTALACTION_CUSTOM_ADDON_ODT_PATH', 'chaine', 'DOL_DATA_ROOT' . (($conf->entity == 1 ) ? '/' : '/' . $conf->entity . '/') . 'ecm/digiriskdolibarr/listingrisksenvironmentalaction/', '', 0, 'current'],
+            $i++ => ['DIGIRISKDOLIBARR_LISTINGRISKSENVIRONMENTALACTION_DEFAULT_MODEL', 'chaine', 'listingrisksenvironmentalaction_odt', '', 0, 'current'],
+
 			// CONST GROUPMENT DOCUMENT
 			$i++ => ['DIGIRISKDOLIBARR_MAIN_AGENDA_ACTIONAUTO_GROUPMENTDOCUMENT_GENERATE', 'integer', 1, '', 0, 'current'],
 			$i++ => ['DIGIRISKDOLIBARR_GROUPMENTDOCUMENT_ADDON', 'chaine', 'mod_groupmentdocument_standard', '', 0, 'current'],
@@ -584,6 +592,7 @@ public function __construct($db)
 			$i++ => ['DIGIRISKDOLIBARR_GROUPMENTDOCUMENT_DEFAULT_MODEL', 'chaine', 'groupmentdocument_odt', '', 0, 'current'],
 			$i++ => ['DIGIRISKDOLIBARR_GROUPMENTDOCUMENT_SHOW_TASK_DONE', 'integer', 1, '', 0, 'current'],
 
+
 			// CONST WORKUNIT DOCUMENT
 			$i++ => ['DIGIRISKDOLIBARR_MAIN_AGENDA_ACTIONAUTO_WORKUNITDOCUMENT_GENERATE', 'integer', 1, '', 0, 'current'],
 			$i++ => ['DIGIRISKDOLIBARR_WORKUNITDOCUMENT_ADDON', 'chaine', 'mod_workunitdocument_standard', '', 0, 'current'],
@@ -672,7 +681,8 @@ public function __construct($db)
             $i++ => ['DIGIRISKDOLIBARR_RISK_LIST_PARENT_VIEW', 'integer', 0, '', 0, 'current'],
 			$i++ => ['DIGIRISKDOLIBARR_SHOW_INHERITED_RISKS_IN_DOCUMENTS', 'integer', 0, '', 0, 'current'],
 			$i++ => ['DIGIRISKDOLIBARR_SHOW_INHERITED_RISKS_IN_LISTINGS', 'integer', 0, '', 0, 'current'],
-			$i++ => ['DIGIRISKDOLIBARR_SHOW_SHARED_RISKS', 'integer', 0, '', 0, 'current'],
+            $i++ => ['DIGIRISKDOLIBARR_SHOW_SHARED_RISKS', 'integer', 0, '', 0, 'current'],
+            $i++ => ['DIGIRISKDOLIBARR_CATEGORY_ON_RISK', 'integer', 0, '', 0, 'current'],
 
 			// CONST RISK ASSESSMENT
 			$i++ => ['DIGIRISKDOLIBARR_MAIN_AGENDA_ACTIONAUTO_RISKASSESSMENT_CREATE', 'integer', 1, '', 0, 'current'],
@@ -699,6 +709,7 @@ public function __construct($db)
 			// CONST PROJET
 			$i++ => ['DIGIRISKDOLIBARR_PROJECT_TAGS_SET', 'integer', 0, '', 0, 'current'],
 			$i++ => ['DIGIRISKDOLIBARR_DU_PROJECT', 'integer', 0, '', 0, 'current'],
+			$i++ => ['DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT', 'integer', 0, '', 0, 'current'],
 
 			// CONST TASK
 			$i++ => ['DIGIRISKDOLIBARR_MAIN_AGENDA_ACTIONAUTO_TASK_CREATE', 'integer', 1, '', 0, 'current'],
@@ -825,6 +836,7 @@ public function __construct($db)
 			$i++ => ['DIGIRISKDOLIBARR_ACCIDENTLESION_ADDON', 'chaine', 'mod_accidentlesion_standard', '', 0, 'current'],
 
 			// CONST TICKET DOCUMENT
+            $i++ => ['DIGIRISKDOLIBARR_MAIN_AGENDA_ACTIONAUTO_TICKETDOCUMENT_GENERATE', 'integer', 1, '', 0, 'current'],
 			$i++ => ['DIGIRISKDOLIBARR_TICKETDOCUMENT_ADDON_ODT_PATH', 'chaine', 'DOL_DOCUMENT_ROOT/custom/digiriskdolibarr/documents/doctemplates/ticketdocument/', '', 0, 'current'],
 			$i++ => ['DIGIRISKDOLIBARR_TICKETDOCUMENT_ADDON', 'chaine', 'mod_ticketdocument_standard', '', 0, 'current'],
 			$i++ => ['DIGIRISKDOLIBARR_TICKETDOCUMENT_CUSTOM_ADDON_ODT_PATH', 'chaine', 'DOL_DATA_ROOT' . (($conf->entity == 1 ) ? '/' : '/' . $conf->entity . '/') . 'ecm/digiriskdolibarr/ticketdocument/', '', 0, 'current'],
@@ -832,6 +844,7 @@ public function __construct($db)
 
 			// CONST PROJECT DOCUMENT
 			$i++ => ['DIGIRISKDOLIBARR_PROJECTDOCUMENT_ADDON', 'chaine', 'mod_projectdocument_standard', '', 0, 'current'],
+			$i++ => ['DIGIRISKDOLIBARR_PROJECTDOCUMENT_DISPLAY_RISKASSESSMENT_COLOR', 'integer', 1, '', 0, 'current'],
 
 			// GENERAL CONSTS
 			$i++ => ['MAIN_ODT_AS_PDF', 'chaine', 'libreoffice', '', 0, 'current'],
@@ -1218,7 +1231,25 @@ public function __construct($db)
 		$this->rights[$r][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->digiriskdolibarr->level1->level2)
 		$r++;
 
-		/* LISTING RISKS PHOTO PERMISSIONS */
+        /* LISTING RISKS ENVIRONMENTAL ACTION PERMISSIONS */
+        $this->rights[$r][0] = $this->numero . sprintf('%02d', $r + 1); // Permission id (must not be already used)
+        $this->rights[$r][1] = $langs->transnoentities('ReadObjects',$langs->transnoentities('ListingRisksEnvironmentalActionMin')); // Permission label
+        $this->rights[$r][4] = 'listingrisksenvironmentalaction'; // In php code, permission will be checked by test if ($user->rights->digiriskdolibarr->level1->level2)
+        $this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->digiriskdolibarr->level1->level2)
+        $r++;
+        $this->rights[$r][0] = $this->numero . sprintf('%02d', $r + 1); // Permission id (must not be already used)
+        $this->rights[$r][1] = $langs->transnoentities('CreateObjects', $langs->transnoentities('ListingRisksEnvironmentalActionMin')); // Permission label
+        $this->rights[$r][4] = 'listingrisksenvironmentalaction'; // In php code, permission will be checked by test if ($user->rights->digiriskdolibarr->level1->level2)
+        $this->rights[$r][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->digiriskdolibarr->level1->level2)
+        $r++;
+        $this->rights[$r][0] = $this->numero . sprintf('%02d', $r + 1); // Permission id (must not be already used)
+        $this->rights[$r][1] = $langs->transnoentities('DeleteObjects', $langs->transnoentities('ListingRisksEnvironmentalActionMin')); // Permission label
+        $this->rights[$r][4] = 'listingrisksenvironmentalaction'; // In php code, permission will be checked by test if ($user->rights->digiriskdolibarr->level1->level2)
+        $this->rights[$r][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->digiriskdolibarr->level1->level2)
+        $r++;
+
+
+        /* LISTING RISKS PHOTO PERMISSIONS */
 		$this->rights[$r][0] = $this->numero . sprintf('%02d', $r + 1); // Permission id (must not be already used)
 		$this->rights[$r][1] = $langs->transnoentities('ReadObjects',$langs->transnoentities('ListingRisksPhotosMin')); // Permission label
 		$this->rights[$r][4] = 'listingrisksphoto'; // In php code, permission will be checked by test if ($user->rights->digiriskdolibarr->level1->level2)
@@ -1375,13 +1406,12 @@ public function __construct($db)
 		];
 
 		$this->menu[$r++] = [
-			'fk_menu'  => 'fk_mainmenu=digiriskdolibarr',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'fk_menu'  => 'fk_mainmenu=digiriskdolibarr,fk_leftmenu=digiriskstandard',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'type'     => 'left',			                // This is a Left menu entry
-			'titre'    => $langs->trans('RiskList'),
-			'prefix'   => '<i class="fas fa-list pictofixedwidth"></i>',
+			'titre'    => '<i class="fas fa-list pictofixedwidth" style="padding-right: 4px;"></i>' . $langs->trans('Riskprofessionals'),
 			'mainmenu' => 'digiriskdolibarr',
 			'leftmenu' => 'digirisklistingrisk',
-			'url'      => '/digiriskdolibarr/view/digiriskelement/risk_list.php',
+			'url'      => '/digiriskdolibarr/view/digiriskelement/risk_list.php?type=risk',
 			'langs'    => 'digiriskdolibarr@digiriskdolibarr',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position' => 100 + $r,
 			'enabled'  => '$conf->digiriskdolibarr->enabled',  // Define condition to show or hide menu entry. Use '$conf->digiriskdolibarr->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
@@ -1390,6 +1420,82 @@ public function __construct($db)
 			'user'     => 0,				                // 0=Menu for internal users, 1=external users, 2=both
 		];
 
+        $this->menu[$r++] = [
+            'fk_menu'  => 'fk_mainmenu=digiriskdolibarr,fk_leftmenu=digiriskstandard',
+            'type'     => 'left',
+            'titre'    => '<i class="fas fa-tasks pictofixedwidth" style="padding-right: 4px;"></i>' . $langs->trans('PAPRIPACT'),
+            'mainmenu' => 'digiriskdolibarr',
+            'leftmenu' => 'digiriskactionplan',
+            'url'      => '/projet/tasks.php?id=' . $conf->global->DIGIRISKDOLIBARR_DU_PROJECT,
+            'langs'    => 'digiriskdolibarr@digiriskdolibarr',
+            'position' => 100 + $r,
+            'enabled'  => '$conf->digiriskdolibarr->enabled && $conf->projet->enabled',
+            'perms'    => '$user->rights->projet->lire',
+            'target'   => '_blank',
+            'user'     => 0,
+        ];
+
+        $this->menu[$r++] = [
+            'fk_menu'  => 'fk_mainmenu=digiriskdolibarr,fk_leftmenu=digirisklistingrisk',
+            'type'     => 'left',
+            'titre'    => '<i class="fas fa-tags pictofixedwidth" style="padding-right: 4px;"></i>' . $langs->transnoentities('Categories'),
+            'mainmenu' => 'digiriskdolibarr',
+            'leftmenu' => 'digiriskdolibarr_risktags',
+            'url'      => '/categories/index.php?type=risk',
+            'langs'    => 'digiriskdolibarr@digiriskdolibarr',
+            'position' => 100 + $r,
+            'enabled'  => '$conf->digiriskdolibarr->enabled && $conf->categorie->enabled && $user->rights->digiriskdolibarr->risk->read && $conf->global->DIGIRISKDOLIBARR_CATEGORY_ON_RISK',
+            'perms'    => '$user->rights->digiriskdolibarr->risk->read',
+            'target'   => '',
+            'user'     => 0,
+        ];
+
+        $this->menu[$r++] = [
+            'fk_menu'  => 'fk_mainmenu=digiriskdolibarr',
+            'type'     => 'left',
+            'titre'    => $langs->trans('Environment'),
+            'prefix'   => '<i class="fas fa-leaf pictofixedwidth"></i>',
+            'mainmenu' => 'digiriskdolibarr',
+            'leftmenu' => 'digiriskstandard_riskenvironmental',
+            'url'      => '/digiriskdolibarr/view/digiriskstandard/digiriskstandard_card.php',
+            'langs'    => 'digiriskdolibarr@digiriskdolibarr',
+            'position' => 100 + $r,
+            'enabled'  => '$conf->digiriskdolibarr->enabled',
+            'perms'    => '$user->rights->digiriskdolibarr->riskassessmentdocument->read',
+            'target'   => '',
+            'user'     => 0
+        ];
+
+        $this->menu[$r++] = [
+            'fk_menu'  => 'fk_mainmenu=digiriskdolibarr,fk_leftmenu=digiriskstandard_riskenvironmental',
+            'type'     => 'left',
+            'titre'    => '<i class="fas fa-list pictofixedwidth" style="padding-right: 4px;"></i>' . $langs->trans('Riskenvironmentals'),
+            'mainmenu' => 'digiriskdolibarr',
+            'leftmenu' => 'digirisklistingrisksenvironmental',
+            'url'      => '/digiriskdolibarr/view/digiriskelement/risk_list.php?type=riskenvironmental',
+            'langs'    => 'digiriskdolibarr@digiriskdolibarr',
+            'position' => 100 + $r,
+            'enabled'  => '$conf->digiriskdolibarr->enabled',
+            'perms'    => '$user->rights->digiriskdolibarr->risk->read',
+            'target'   => '',
+            'user'     => 0
+        ];
+
+        $this->menu[$r++] = [
+            'fk_menu'  => 'fk_mainmenu=digiriskdolibarr,fk_leftmenu=digiriskstandard_riskenvironmental',
+            'type'     => 'left',
+            'titre'    => '<i class="fas fa-tasks pictofixedwidth" style="padding-right: 4px;"></i>' . $langs->trans('ActionPlan'),
+            'mainmenu' => 'digiriskdolibarr',
+            'leftmenu' => 'digiriskenvironmentalactionplan',
+            'url'      => '/projet/tasks.php?id=' . $conf->global->DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT,
+            'langs'    => 'digiriskdolibarr@digiriskdolibarr',
+            'position' => 100 + $r,
+            'enabled'  => '$conf->digiriskdolibarr->enabled && $conf->projet->enabled',
+            'perms'    => '$user->rights->projet->lire',
+            'target'   => '_blank',
+            'user'     => 0,
+        ];
+
 		$this->menu[$r++] = [
 			'fk_menu'  => 'fk_mainmenu=digiriskdolibarr',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'type'     => 'left',			                // This is a Left menu entry
@@ -1514,22 +1620,6 @@ public function __construct($db)
 			'user'     => 0,				                // 0=Menu for internal users, 1=external users, 2=both
 		];
 
-		$this->menu[$r++] = [
-			'fk_menu'  => 'fk_mainmenu=digiriskdolibarr',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'     => 'left',			                // This is a Left menu entry
-			'titre'    => $langs->trans('ActionPlan'),
-			'prefix'   => '<i class="fas fa-tasks pictofixedwidth"></i>',
-			'mainmenu' => 'digiriskdolibarr',
-			'leftmenu' => 'digiriskactionplan',
-			'url'      => '/projet/tasks.php?id=' . $conf->global->DIGIRISKDOLIBARR_DU_PROJECT,
-			'langs'    => 'digiriskdolibarr@digiriskdolibarr',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position' => 100 + $r,
-			'enabled'  => '$conf->digiriskdolibarr->enabled',  // Define condition to show or hide menu entry. Use '$conf->digiriskdolibarr->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'    => '$user->rights->digiriskdolibarr->digiriskelement->read',			                // Use 'perms'=>'$user->rights->digiriskdolibarr->level1->level2' if you want your menu with a permission rules
-			'target'   => '_blank',
-			'user'     => 0,				                // 0=Menu for internal users, 1=external users, 2=both
-		];
-
 		$this->menu[$r++] = [
 			'fk_menu'  => 'fk_mainmenu=digiriskdolibarr',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'type'     => 'left',			                // This is a Left menu entry
@@ -1705,7 +1795,6 @@ public function __construct($db)
             $this->export_label[$r]      = $objectMetaData['langs']; // Translation key (used only if key ExportDataset_xxx_z not found)
             $this->export_icon[$r]       = $objectMetaData['picto'];
             $this->export_enabled[$r]    = '!empty($conf->digiriskdolibarr->enabled)';
-            $this->export_permission[$r] = [["$this->rights_class", "$key"]];
 
             $this->export_fields_array[$r]     = [];
             $this->export_TypeFields_array[$r] = [];
@@ -1723,6 +1812,11 @@ public function __construct($db)
             $this->export_sql_end[$r]  = ' FROM ' . MAIN_DB_PREFIX . $this->rights_class . '_' . $key . ' as t';
             $this->export_sql_end[$r] .= ' WHERE 1 = 1';
             $this->export_sql_end[$r] .= ' AND t.entity IN (' . getEntity($key) . ')';
+
+            if ($key == 'riskassessment') {
+                $key = 'risk';
+            }
+            $this->export_permission[$r] = [["$this->rights_class", "$key"]];
         }
 
         // Imports profiles provided by this module
@@ -1879,6 +1973,7 @@ public function init($options = '')
 		delDocumentModel('listingrisksaction_odt', 'listingrisksdocument');
         delDocumentModel('listingrisksdocument_odt', 'listingrisksdocument');
         delDocumentModel('listingrisksphoto_odt', 'listingrisksdocument');
+		delDocumentModel('listingrisksenvironmentalaction_odt', 'listingrisksenvironmentaldocument');
 		delDocumentModel('riskassessmentdocument_odt', 'riskassessmentdocument');
 		delDocumentModel('auditreportdocument_odt', 'auditreportdocument');
 		delDocumentModel('ticketdocument_odt', 'ticketdocument');
@@ -1896,6 +1991,7 @@ public function init($options = '')
         addDocumentModel('listingrisksdocument_odt', 'listingrisksdocument', 'ODT templates', 'DIGIRISKDOLIBARR_LISTINGRISKSDOCUMENT_ADDON_ODT_PATH');
         addDocumentModel('listingrisksaction_odt', 'listingrisksdocument', 'ODT templates', 'DIGIRISKDOLIBARR_LISTINGRISKSACTION_ADDON_ODT_PATH');
         addDocumentModel('listingrisksphoto_odt', 'listingrisksdocument', 'ODT templates', 'DIGIRISKDOLIBARR_LISTINGRISKSPHOTO_ADDON_ODT_PATH');
+        addDocumentModel('listingrisksenvironmentalaction_odt', 'listingrisksenvironmentaldocument', 'ODT templates', 'DIGIRISKDOLIBARR_LISTINGRISKSENVIRONMENTALACTION_ADDON_ODT_PATH');
 		addDocumentModel('riskassessmentdocument_odt', 'riskassessmentdocument', 'ODT templates', 'DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_ADDON_ODT_PATH');
 		addDocumentModel('auditreportdocument_odt', 'auditreportdocument', 'ODT templates', 'DIGIRISKDOLIBARR_AUDITREPORTDOCUMENT_ADDON_ODT_PATH');
 		addDocumentModel('ticketdocument_odt', 'ticketdocument', 'ODT templates', 'DIGIRISKDOLIBARR_TICKETDOCUMENT_ADDON_ODT_PATH');
@@ -2298,7 +2394,21 @@ public function init($options = '')
 			$tags->create($user);
 
 			dolibarr_set_const($this->db, 'DIGIRISKDOLIBARR_PROJECT_TAGS_SET', 3, 'integer', 0, '', $conf->entity);
-		}
+		} elseif ($conf->global->DIGIRISKDOLIBARR_PROJECT_TAGS_SET == 3) {
+            //Install after 10.0.0
+
+            require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+
+            $tags = new Categorie($this->db);
+
+            $tags->fetch('', 'QHSE');
+            $tags->label     = 'ENV';
+            $tags->type      = 'project';
+            $tags->fk_parent = $tags->id;
+            $tags->create($user);
+
+            dolibarr_set_const($this->db, 'DIGIRISKDOLIBARR_PROJECT_TAGS_SET', 4, 'integer', 0, '', $conf->entity);
+        }
 
 		if ($conf->global->DIGIRISKDOLIBARR_TRIGGERS_UPDATED == 0) {
 			require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
@@ -2453,18 +2563,19 @@ public function init($options = '')
             ];
 
             dolibarr_set_const($this->db, 'DIGIRISKDOLIBARR_CUSTOM_NUM_REF_SET', 1, 'integer', 0, '', $conf->entity);
-        } else if ($conf->global->DIGIRISKDOLIBARR_CUSTOM_NUM_REF_SET > 0 || $conf->global->DIGIRISKDOLIBARR_CUSTOM_NUM_REF_SET < 2) {
-            $objectTypeAndMod['RegisterDocument']     = ['thiazzi', 'RD{0}'];
-            $objectTypeAndMod['ListingRisksDocument'] = ['calypso', 'RLD{0}'];
-            $objectTypeAndMod['AuditReportDocument']  = ['lindberg', 'ARD{0}'];
-            dolibarr_set_const($this->db, 'DIGIRISKDOLIBARR_CUSTOM_NUM_REF_SET', 2, 'integer', 0, '', $conf->entity);
+        } else if ($conf->global->DIGIRISKDOLIBARR_CUSTOM_NUM_REF_SET > 0 || $conf->global->DIGIRISKDOLIBARR_CUSTOM_NUM_REF_SET < 3) {
+            $objectTypeAndMod['RegisterDocument']                = ['thiazzi', 'RD{0}'];
+            $objectTypeAndMod['ListingRisksDocument']            = ['calypso', 'RLD{0}'];
+            $objectTypeAndMod['AuditReportDocument']             = ['lindberg', 'ARD{0}'];
+            $objectTypeAndMod['ListingRisksEnvironmentalAction'] = ['jocaste', 'RLE{0}'];
+            dolibarr_set_const($this->db, 'DIGIRISKDOLIBARR_CUSTOM_NUM_REF_SET', 3, 'integer', 0, '', $conf->entity);
         }
 
         if ($conf->global->DIGIRISKDOLIBARR_CUSTOM_NUM_REF_SET >= 0) {
             foreach($objectTypeAndMod as $type => $mod) {
-                $confNumRef = 'DIGIRISKDOLIBARR_' . strtoupper($type) . '_' . strtoupper($mod[0]) . '_ADDON';
+                $confNumRef    = 'DIGIRISKDOLIBARR_' . strtoupper($type) . '_' . strtoupper($mod[0]) . '_ADDON';
                 $confObjectRef = 'DIGIRISKDOLIBARR_' . strtoupper($type) . '_ADDON';
-                $prefix = $mod[1];
+                $prefix        = $mod[1];
 
                 dolibarr_set_const($this->db, $confNumRef, $prefix, 'chaine', 0, '', $conf->entity);
                 dolibarr_set_const($this->db, $confObjectRef, 'mod_'. strtolower($type) .'_' . $mod[0], 'chaine', 0, '', $conf->entity);
diff --git a/core/tpl/digiriskdolibarr_projectcreation_action.tpl.php b/core/tpl/digiriskdolibarr_projectcreation_action.tpl.php
index 83392e706..c21bee910 100644
--- a/core/tpl/digiriskdolibarr_projectcreation_action.tpl.php
+++ b/core/tpl/digiriskdolibarr_projectcreation_action.tpl.php
@@ -298,6 +298,46 @@
 	$tags->add_type($project, 'project');
 }
 
+if ( $conf->global->DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT == 0 || $project->statut == 2 ) {
+    $project->ref         = $projectRef->getNextValue($third_party, $project);
+    $project->title       = $langs->trans('Environment') . ' - ' . $conf->global->MAIN_INFO_SOCIETE_NOM;
+    $project->description = $langs->trans('EnvironmentDescription');
+    $project->date_c      = dol_now();
+    $currentYear          = dol_print_date(dol_now(), '%Y');
+    $fiscalMonthStart     = $conf->global->SOCIETE_FISCAL_MONTH_START;
+    $startdate            = dol_mktime('0', '0', '0', $fiscalMonthStart ?: '1', '1', $currentYear);
+    $project->date_start  = $startdate;
+
+    $project->usage_task = 1;
+
+    $startdateAddYear      = dol_time_plus_duree($startdate, 1, 'y');
+    $startdateAddYearMonth = dol_time_plus_duree($startdateAddYear, -1, 'd');
+    $enddate               = dol_print_date($startdateAddYearMonth, 'dayrfc');
+    $project->date_end     = $enddate;
+    $project->statut       = 1;
+    $project_id            = $project->create($user);
+    dolibarr_set_const($db, 'DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT', $project_id, 'integer', 0, '', $conf->entity);
+
+    $tags = new Categorie($db);
+
+    $tags->fetch('', 'ENV');
+    $tags->add_type($project, 'project');
+
+    $url = '/projet/tasks.php?id=' . $project_id;
+
+    $sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
+    $sql .= " url='".$db->escape($url)."'";
+    $sql .= " WHERE leftmenu='digiriskenvironmentalactionplan'";
+    $sql .= " AND entity=" . $conf->entity;
+
+    $resql = $db->query($sql);
+    if (!$resql) {
+        $error = "Error ".$db->lasterror();
+        return -1;
+    }
+    header("Location: " . $_SERVER['PHP_SELF']);
+}
+
 if (!dolibarr_get_const($db, 'DIGIRISKDOLIBARR_USERAPI_SET', 0)) {
 	$usertmp            = new User($db);
 	$usertmp->lastname  = 'API';
@@ -337,23 +377,28 @@
         switch (getDolGlobalInt('DIGIRISKDOLIBARR_READERGROUP_UPDATED')) {
             case 0 :
             case 2 :
+            case 3 :
                 $userGroup->addrights('', 'digiriskdolibarr', 'lire'); // DigiriskDolibarr lire
                 $userGroup->addrights('', 'digiriskdolibarr', 'read'); // DigiriskDolibarr read
 
-                $userGroup->addrights(43630203, 'digiriskdolibarr'); // DigiriskStandard read
-                $userGroup->addrights(43630204, 'digiriskdolibarr'); // RiskAssessmentDocument read
-                $userGroup->addrights(43630207, 'digiriskdolibarr'); // LegalDisplay read
-                $userGroup->addrights(43630210, 'digiriskdolibarr'); // InformationsSharing read
-                $userGroup->addrights(43630213, 'digiriskdolibarr'); // FirePermit read
-                $userGroup->addrights(43630216, 'digiriskdolibarr'); // Prevention plan read
-                $userGroup->addrights(43630219, 'digiriskdolibarr'); // DigiriskElement read
-                $userGroup->addrights(43630222, 'digiriskdolibarr'); // Risk read
-                $userGroup->addrights(43630225, 'digiriskdolibarr'); // ListingRisksAction read
-                $userGroup->addrights(43630228, 'digiriskdolibarr'); // ListingRisksPhoto read
-                $userGroup->addrights(43630231, 'digiriskdolibarr'); // RiskSign read
-                $userGroup->addrights(43630234, 'digiriskdolibarr'); // Evaluator read
-                $userGroup->addrights(43630237, 'digiriskdolibarr'); // Accident read
-                $userGroup->addrights(43630240, 'digiriskdolibarr'); // AccidentInvestigation read
+                $userGroup->addrights(43630203, 'digiriskdolibarr');  // DigiriskStandard read
+                $userGroup->addrights(43630204, 'digiriskdolibarr');  // RiskAssessmentDocument read
+                $userGroup->addrights(43630207, 'digiriskdolibarr');  // AuditReportDocument read
+                $userGroup->addrights(436302010, 'digiriskdolibarr'); // LegalDisplay read
+                $userGroup->addrights(43630213, 'digiriskdolibarr');  // InformationsSharing read
+                $userGroup->addrights(43630216, 'digiriskdolibarr');  // RegisterDocument read
+                $userGroup->addrights(43630219, 'digiriskdolibarr');  // FirePermit read
+                $userGroup->addrights(43630222, 'digiriskdolibarr');  // Prevention plan read
+                $userGroup->addrights(43630225, 'digiriskdolibarr');  // DigiriskElement read
+                $userGroup->addrights(43630228, 'digiriskdolibarr');  // Risk read
+                $userGroup->addrights(43630231, 'digiriskdolibarr');  // ListingRisksDocument read
+                $userGroup->addrights(43630234, 'digiriskdolibarr');  // ListingRisksAction read
+                $userGroup->addrights(43630237, 'digiriskdolibarr');  // ListingRisksPhoto read
+                $userGroup->addrights(43630240, 'digiriskdolibarr');  // ListingRisksEnvironmentalAction read
+                $userGroup->addrights(43630243, 'digiriskdolibarr');  // RiskSign read
+                $userGroup->addrights(43630246, 'digiriskdolibarr');  // Evaluator read
+                $userGroup->addrights(43630249, 'digiriskdolibarr');  // Accident read
+                $userGroup->addrights(43630252, 'digiriskdolibarr');  // AccidentInvestigation read
 
                 $userGroup->addrights('', 'saturne', 'lire');
                 $userGroup->addrights('', 'saturne', 'read');
@@ -367,7 +412,7 @@
                 $userGroup->addrights(281, 'societe');                   // Societe contact lire
                 $userGroup->addrights('', 'ticket', 'read');
 
-                $readerGroupConf = 3;
+                $readerGroupConf = 4;
                 break;
             case 1 :
                 $userGroup->name = $conf->global->MAIN_INFO_SOCIETE_NOM . ' - ' . $langs->trans('DigiriskReaderGroup');
@@ -399,36 +444,45 @@
             case 0 :
             case 2 :
             case 3 :
+            case 4 :
                 $userGroup->addrights('', 'digiriskdolibarr', 'lire'); // DigiriskDolibarr lire
                 $userGroup->addrights('', 'digiriskdolibarr', 'read'); // DigiriskDolibarr read
 
-                $userGroup->addrights(43630203, 'digiriskdolibarr'); // DigiriskStandard read
-                $userGroup->addrights(43630204, 'digiriskdolibarr'); // RiskAssessmentDocument read
-                $userGroup->addrights(43630205, 'digiriskdolibarr'); // RiskAssessmentDocument create
-                $userGroup->addrights(43630207, 'digiriskdolibarr'); // LegalDisplay read
-                $userGroup->addrights(43630208, 'digiriskdolibarr'); // LegalDisplay create
-                $userGroup->addrights(43630210, 'digiriskdolibarr'); // InformationsSharing read
-                $userGroup->addrights(43630211, 'digiriskdolibarr'); // InformationsSharing create
-                $userGroup->addrights(43630213, 'digiriskdolibarr'); // FirePermit read
-                $userGroup->addrights(43630214, 'digiriskdolibarr'); // FirePermit create
-                $userGroup->addrights(43630216, 'digiriskdolibarr'); // Prevention plan read
-                $userGroup->addrights(43630217, 'digiriskdolibarr'); // Prevention Plan create
-                $userGroup->addrights(43630219, 'digiriskdolibarr'); // DigiriskElement read
-                $userGroup->addrights(43630220, 'digiriskdolibarr'); // DigiriskElement create
-                $userGroup->addrights(43630222, 'digiriskdolibarr'); // Risk read
-                $userGroup->addrights(43630223, 'digiriskdolibarr'); // Risk create
-                $userGroup->addrights(43630225, 'digiriskdolibarr'); // ListingRisksAction read
-                $userGroup->addrights(43630226, 'digiriskdolibarr'); // ListingRisksAction create
-                $userGroup->addrights(43630228, 'digiriskdolibarr'); // ListingRisksPhoto read
-                $userGroup->addrights(43630229, 'digiriskdolibarr'); // ListingRisksPhoto create
-                $userGroup->addrights(43630231, 'digiriskdolibarr'); // RiskSign read
-                $userGroup->addrights(43630232, 'digiriskdolibarr'); // RiskSign create
-                $userGroup->addrights(43630234, 'digiriskdolibarr'); // Evaluator read
-                $userGroup->addrights(43630235, 'digiriskdolibarr'); // Evaluator create
-                $userGroup->addrights(43630237, 'digiriskdolibarr'); // Accident read
-                $userGroup->addrights(43630238, 'digiriskdolibarr'); // Accident create
-                $userGroup->addrights(43630240, 'digiriskdolibarr'); // AccidentInvestigation read
-                $userGroup->addrights(43630241, 'digiriskdolibarr'); // AccidentInvestigation create
+                $userGroup->addrights(43630203, 'digiriskdolibarr');  // DigiriskStandard read
+                $userGroup->addrights(43630204, 'digiriskdolibarr');  // RiskAssessmentDocument read
+                $userGroup->addrights(43630205, 'digiriskdolibarr');  // RiskAssessmentDocument create
+                $userGroup->addrights(43630207, 'digiriskdolibarr');  // AuditReportDocument read
+                $userGroup->addrights(43630208, 'digiriskdolibarr');  // AuditReportDocument create
+                $userGroup->addrights(436302010, 'digiriskdolibarr'); // LegalDisplay read
+                $userGroup->addrights(436302011, 'digiriskdolibarr'); // LegalDisplay create
+                $userGroup->addrights(43630213, 'digiriskdolibarr');  // InformationsSharing read
+                $userGroup->addrights(43630214, 'digiriskdolibarr');  // InformationsSharing create
+                $userGroup->addrights(43630216, 'digiriskdolibarr');  // RegisterDocument read
+                $userGroup->addrights(43630217, 'digiriskdolibarr');  // RegisterDocument create
+                $userGroup->addrights(43630219, 'digiriskdolibarr');  // FirePermit read
+                $userGroup->addrights(43630220, 'digiriskdolibarr');  // FirePermit create
+                $userGroup->addrights(43630222, 'digiriskdolibarr');  // Prevention plan read
+                $userGroup->addrights(43630223, 'digiriskdolibarr');  // Prevention plan create
+                $userGroup->addrights(43630225, 'digiriskdolibarr');  // DigiriskElement read
+                $userGroup->addrights(43630226, 'digiriskdolibarr');  // DigiriskElement create
+                $userGroup->addrights(43630228, 'digiriskdolibarr');  // Risk read
+                $userGroup->addrights(43630229, 'digiriskdolibarr');  // Risk create
+                $userGroup->addrights(43630231, 'digiriskdolibarr');  // ListingRisksDocument read
+                $userGroup->addrights(43630232, 'digiriskdolibarr');  // ListingRisksDocument create
+                $userGroup->addrights(43630234, 'digiriskdolibarr');  // ListingRisksAction read
+                $userGroup->addrights(43630235, 'digiriskdolibarr');  // ListingRisksAction create
+                $userGroup->addrights(43630237, 'digiriskdolibarr');  // ListingRisksPhoto read
+                $userGroup->addrights(43630238, 'digiriskdolibarr');  // ListingRisksPhoto create
+                $userGroup->addrights(43630240, 'digiriskdolibarr');  // ListingRisksEnvironmentalAction read
+                $userGroup->addrights(43630241, 'digiriskdolibarr');  // ListingRisksEnvironmentalAction create
+                $userGroup->addrights(43630243, 'digiriskdolibarr');  // RiskSign read
+                $userGroup->addrights(43630244, 'digiriskdolibarr');  // RiskSign create
+                $userGroup->addrights(43630246, 'digiriskdolibarr');  // Evaluator read
+                $userGroup->addrights(43630247, 'digiriskdolibarr');  // Evaluator create
+                $userGroup->addrights(43630249, 'digiriskdolibarr');  // Accident read
+                $userGroup->addrights(43630250, 'digiriskdolibarr');  // Accident create
+                $userGroup->addrights(43630252, 'digiriskdolibarr');  // AccidentInvestigation read
+                $userGroup->addrights(43630253, 'digiriskdolibarr');  // AccidentInvestigation create
 
                 $userGroup->addrights('', 'saturne', 'lire');
                 $userGroup->addrights('', 'saturne', 'read');
@@ -450,7 +504,7 @@
                 $userGroup->addrights(342, 'user');                      // User self creer
                 $userGroup->addrights(343, 'user');                      // User self password
 
-                $userGroupConf = 4;
+                $userGroupConf = 5;
                 break;
             case 1 :
                 $userGroup->name = $conf->global->MAIN_INFO_SOCIETE_NOM . ' - ' . $langs->trans('DigiriskUserGroup');
@@ -600,7 +654,7 @@
 
 	// CONST LISTING RISKS ACTION
 	dolibarr_set_const($db, 'MAIN_AGENDA_ACTIONAUTO_LISTINGRISKSACTION_CREATE', 1, 'integer', 0, '', $conf->entity);
-	dolibarr_set_const($db, 'DIGIRISKDOLIBARR_LISTINGRISKSACTION_ADDON', 'mod_listingrisksaction_standard', 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, 'DIGIRISKDOLIBARR_LISTINGRISKSACTION_ADDON', 'mod_listingrisksenvironmentalaction_standard', 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, 'DIGIRISKDOLIBARR_LISTINGRISKSACTION_ADDON_ODT_PATH', 'DOL_DOCUMENT_ROOT/custom/digiriskdolibarr/documents/doctemplates/listingrisksaction/', 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, 'DIGIRISKDOLIBARR_LISTINGRISKSACTION_CUSTOM_ADDON_ODT_PATH', 'DOL_DATA_ROOT/ecm/digiriskdolibarr/listingrisksaction/', 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, 'DIGIRISKDOLIBARR_LISTINGRISKSACTION_DEFAULT_MODEL', 'listingrisksaction_odt', 'chaine', 0, '', $conf->entity);
diff --git a/core/tpl/riskanalysis/risk/digiriskdolibarr_inheritedrisklist_view.tpl.php b/core/tpl/riskanalysis/risk/digiriskdolibarr_inheritedrisklist_view.tpl.php
index 2b954b696..00e5dcb60 100644
--- a/core/tpl/riskanalysis/risk/digiriskdolibarr_inheritedrisklist_view.tpl.php
+++ b/core/tpl/riskanalysis/risk/digiriskdolibarr_inheritedrisklist_view.tpl.php
@@ -30,7 +30,7 @@
 
 		$alldigiriskelement = $digiriskelement->getActiveDigiriskElements();
 
-		$DUProject->fetch($conf->global->DIGIRISKDOLIBARR_DU_PROJECT);
+		$DUProject->fetch($riskType == 'risk' ? $conf->global->DIGIRISKDOLIBARR_DU_PROJECT : $conf->global->DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT);
 		$extrafields->fetch_name_optionals_label($digiriskTask->table_element);
 
 		$riskAssessmentList        = $riskAssessment->fetchAll();
@@ -92,6 +92,7 @@
 				$sql .= " AND fk_element > 0 ";
 				$sql .= " AND e.entity IN (" . getEntity($risk->element) . ") ";
 			}
+            $sql .= ' AND r.type = "' . $riskType . '"';
 
 			foreach ($search as $key => $val) {
 				if ($key == 'status' && $search[$key] == -1) continue;
@@ -205,6 +206,7 @@
 				$sql .= " AND r.fk_element > 0";
 				$sql .= " AND e.entity IN (" . getEntity($evaluation->element) . ")";
 			}
+            $sql .= ' AND r.type = "' . $riskType . '"';
 
 			foreach ($search as $key => $val) {
 				if ($key == 'status' && $search[$key] == -1) continue;
@@ -298,7 +300,7 @@
 		$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 	}
 
-	$title = $langs->trans('DigiriskElementInheritedRisksList');
+	$title = $langs->trans('DigiriskElementInherited' . ucfirst($riskType) . 'sList');
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'digiriskdolibarr_color.png@digiriskdolibarr', 0, '', '', $limit, 0, 0, 1);
 
 	include DOL_DOCUMENT_ROOT . '/core/tpl/massactions_pre.tpl.php';
diff --git a/core/tpl/riskanalysis/risk/digiriskdolibarr_risk_actions.tpl.php b/core/tpl/riskanalysis/risk/digiriskdolibarr_risk_actions.tpl.php
index 8908fb39b..b1e07c5cc 100644
--- a/core/tpl/riskanalysis/risk/digiriskdolibarr_risk_actions.tpl.php
+++ b/core/tpl/riskanalysis/risk/digiriskdolibarr_risk_actions.tpl.php
@@ -14,7 +14,7 @@
 	}
 
 	$risk->fk_element = $fk_element ?: 0;
-	$risk->fk_projet  = $conf->global->DIGIRISKDOLIBARR_DU_PROJECT;
+	$risk->fk_projet  = $riskType == 'risk' ? $conf->global->DIGIRISKDOLIBARR_DU_PROJECT : $conf->global->DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT;
 	$risk->category   = $category;
 	$risk->ref        = $refRiskMod->getNextValue($risk);
 	$risk->status     = 1;
@@ -23,6 +23,13 @@
 		$result = $risk->create($user);
 
 		if ($result > 0) {
+            if (isModEnabled('categorie') && getDolGlobalInt('DIGIRISKDOLIBARR_CATEGORY_ON_RISK') > 0) {
+                $categories = $data['categories'];
+                if (method_exists($risk, 'setCategories')) {
+                    $risk->setCategories($categories);
+                }
+            }
+
 			$evaluationComment  = $data['comment'];
 			$riskAssessmentDate = $data['date'];
 
@@ -97,7 +104,7 @@
 
 					$task->ref                              = $refTaskMod->getNextValue('', $task);
 					$task->label                            = $tasktitle;
-					$task->fk_project                       = $conf->global->DIGIRISKDOLIBARR_DU_PROJECT;
+					$task->fk_project                       = $riskType == 'risk' ? $conf->global->DIGIRISKDOLIBARR_DU_PROJECT : $conf->global->DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT;
 					$task->date_c                           = dol_now();
 					if (!empty($dateStart)) {
 						$task->date_start = strtotime(preg_replace('/\//', '-', $dateStart));
@@ -164,6 +171,12 @@
 	$result = $risk->update($user);
 
 	if ($result > 0) {
+        if (isModEnabled('categorie') && getDolGlobalInt('DIGIRISKDOLIBARR_CATEGORY_ON_RISK') > 0) {
+            $categories = $data['categories'];
+            if (method_exists($risk, 'setCategories')) {
+                $risk->setCategories($categories);
+            }
+        }
 		// Update risk OK
 		$urltogo = str_replace('__ID__', $result, $backtopage);
 		$urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $id, $urltogo); // New method to autoselect project after a New on another form object creation
@@ -399,7 +412,7 @@
 
 	$task->ref        = $refTaskMod->getNextValue('', $task);
 	$task->label      = $tasktitle;
-	$task->fk_project = $conf->global->DIGIRISKDOLIBARR_DU_PROJECT;
+	$task->fk_project = $riskType == 'risk' ? $conf->global->DIGIRISKDOLIBARR_DU_PROJECT : $conf->global->DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT;
 	$task->datec     = dol_now();
 	if (!empty($dateStart)) {
 		$task->date_start = strtotime(preg_replace('/\//', '-', $dateStart));
@@ -644,7 +657,7 @@
 //
 //	$filter = rtrim($filter, ',');
 
-	$allrisks = $risk->fetchAll('', '', 0, 0, array('customsql' => 'status > 0 AND entity NOT IN (' . $conf->entity . ') AND fk_element > 0'));
+	$allrisks = $risk->fetchAll('', '', 0, 0, array('customsql' => 'status > 0 AND type = "' . $riskType . '" AND entity NOT IN (' . $conf->entity . ') AND fk_element > 0'));
 
 	foreach ($allrisks as $key => $risks) {
 		$digiriskelementtmp->fetch($risks->fk_element);
diff --git a/core/tpl/riskanalysis/risk/digiriskdolibarr_risklist_view.tpl.php b/core/tpl/riskanalysis/risk/digiriskdolibarr_risklist_view.tpl.php
index b49aca838..e3ad7f691 100644
--- a/core/tpl/riskanalysis/risk/digiriskdolibarr_risklist_view.tpl.php
+++ b/core/tpl/riskanalysis/risk/digiriskdolibarr_risklist_view.tpl.php
@@ -302,7 +302,7 @@
 $project                     = new Project($db);
 $DUProject                   = new Project($db);
 
-$DUProject->fetch($conf->global->DIGIRISKDOLIBARR_DU_PROJECT);
+$DUProject->fetch($riskType == 'risk' ? $conf->global->DIGIRISKDOLIBARR_DU_PROJECT : $conf->global->DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT);
 $extrafields->fetch_name_optionals_label($digiriskTask->table_element);
 
 $riskAssessment->ismultientitymanaged = 0;
@@ -348,7 +348,8 @@
 	$sql                                                                                                                                          .= " FROM " . MAIN_DB_PREFIX . $risk->table_element . " as r";
 	$sql                                                                                                                                          .= " LEFT JOIN " . MAIN_DB_PREFIX . $digiriskelement->table_element . " as e on (r.fk_element = e.rowid)";
 	if (is_array($extrafields->attributes[$risk->table_element]['label']) && count($extrafields->attributes[$risk->table_element]['label'])) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $risk->table_element . "_extrafields as ef on (r.rowid = ef.fk_object)";
-	if ($risk->ismultientitymanaged == 1) $sql                                                                                                    .= " WHERE r.entity IN (" . getEntity($risk->element) . ")";
+    if (!empty($conf->categorie->enabled) && getDolGlobalInt('DIGIRISKDOLIBARR_CATEGORY_ON_RISK') > 0)                                  $sql .= Categorie::getFilterJoinQuery('risk', "r.rowid");
+    if ($risk->ismultientitymanaged == 1) $sql                                                                                                    .= " WHERE r.entity IN (" . getEntity($risk->element) . ")";
 	else $sql                                                                                                                                     .= " WHERE 1 = 1";
 
 	if ( ! $allRisks) {
@@ -369,6 +370,7 @@
 		$sql .= " AND fk_element > 0 ";
 		$sql .= " AND e.entity IN (" . $conf->entity . ") ";
 	}
+    $sql .= ' AND r.type = "' . $riskType . '"';
 
 	foreach ($search as $key => $val) {
 		if ($key == 'status' && $search[$key] == -1) continue;
@@ -392,6 +394,9 @@
 		}
 	}
 	if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+    if (!empty($conf->categorie->enabled) && getDolGlobalInt('DIGIRISKDOLIBARR_CATEGORY_ON_RISK') > 0) {
+        $sql .= Categorie::getFilterSelectQuery('risk', 'r.rowid', $search_category_array);
+    }
 	// Add where from extra fields
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_sql.tpl.php';
 	// Add where from hooks
@@ -455,11 +460,12 @@
 	$sql                                                                                                                                                      .= " LEFT JOIN " . MAIN_DB_PREFIX . $digiriskelement->table_element . " as e on (r.fk_element = e.rowid)";
 	if (is_array($extrafields->attributes[$evaluation->table_element]['label']) && count($extrafields->attributes[$evaluation->table_element]['label'])) $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $evaluation->table_element . "_extrafields as ef on (evaluation.rowid = ef.fk_object)";
 	if ($sortfield == 'evaluation.has_tasks')                                                                                                            $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'projet_task_extrafields as taskextrafields ON (taskextrafields.fk_risk = r.rowid)';
-	if ($evaluation->ismultientitymanaged == 1) $sql                                                                                                          .= " WHERE evaluation.entity IN (" . getEntity($evaluation->element) . ")";
+    if (!empty($conf->categorie->enabled) && getDolGlobalInt('DIGIRISKDOLIBARR_CATEGORY_ON_RISK') > 0)                                              $sql .= Categorie::getFilterJoinQuery('risk', "r.rowid");
+    if ($evaluation->ismultientitymanaged == 1) $sql                                                                                                          .= " WHERE evaluation.entity IN (" . getEntity($evaluation->element) . ")";
 	else $sql                                                                                                                                                 .= " WHERE 1 = 1";
 	$sql                                                                                                                                                      .= " AND evaluation.status = 1";
 	if ( ! $allRisks) {
-		$sql .= " AND r.fk_element =" . $id;
+		$sql .= " AND r.fk_element = " . $id;
 	} else {
 		if (is_array($activeDigiriskElementList) && !empty($activeDigiriskElementList)) {
 			$digiriskElementSqlFilter = '(';
@@ -475,6 +481,7 @@
 		$sql .= " AND r.fk_element > 0";
 		$sql .= " AND e.entity IN (" . $conf->entity . ")";
 	}
+    $sql .= ' AND r.type = "' . $riskType . '"';
 
 	foreach ($search as $key => $val) {
 		if ($key == 'status' && $search[$key] == -1) continue;
@@ -499,6 +506,10 @@
 	}
 	if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 
+    if (!empty($conf->categorie->enabled) && getDolGlobalInt('DIGIRISKDOLIBARR_CATEGORY_ON_RISK') > 0) {
+        $sql .= Categorie::getFilterSelectQuery('risk', 'r.rowid', $search_category_array);
+    }
+
 	// Add where from extra fields
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_sql.tpl.php';
 	// Add where from hooks
@@ -671,7 +682,7 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
 										<input class="risk-evaluation-seuil" type="hidden" value="undefined">
 										<?php
 										$evaluationMethod        = $advancedCotationMethodArray[0];
-										$evaluationMethodSurvey = $evaluationMethod['option']['variable'];
+										$evaluationMethodSurvey = $evaluationMethod['option'][$risk->type . '_variable'];
 										?>
 										<div class="wpeo-gridlayout cotation-advanced" style="display:none">
 											<input type="hidden" class="digi-method-evaluation-id" value="<?php echo $risk->id ; ?>" />
@@ -726,6 +737,15 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
 									<?php print $form->selectDate('', 'RiskAssessmentDate0', 0, 0, 0, '', 1, 1); ?>
 								</div>
 							<?php endif; ?>
+                            <?php
+                            if (!empty($conf->categorie->enabled) && getDolGlobalInt('DIGIRISKDOLIBARR_CATEGORY_ON_RISK') > 0) {
+                                print '<div class="risk-categories"><span class="title">'.$langs->trans("Categories") . '</span>';
+                                $categoryArborescence = $form->select_all_categories('risk', '', 'parent', 64, 0, 1);
+                                print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $categoryArborescence, GETPOST('categories', 'array'), '', 0, 'minwidth100imp widthcentpercentminusxx maxwidth400');
+                                print '<a class="butActionNew" href="' . DOL_URL_ROOT . '/categories/index.php?type=risk&backtopage=' . urlencode($_SERVER['PHP_SELF'] . '?action=create') . '" target="_blank"><span class="fa fa-plus-circle valignmiddle paddingleft" title="' . $langs->trans('AddCategories') . '"></span></a>';
+                                print "</div>";
+                            }
+                            ?>
                             <div class="riskassessment-medias linked-medias photo">
                                 <div class="element-linked-medias element-linked-medias-0 risk-new">
                                     <div class="medias section-title"><i class="fas fa-picture-o"></i><?php echo $langs->trans('Medias'); ?></div>
@@ -832,9 +852,16 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
 							<?php print '<textarea name="riskComment" rows="' . ROWS_2 . '">' . ('') . '</textarea>' . "\n"; ?>
 						</div>
 					<?php endif; ?>
-					<hr>
-				</div>
-				<div class="risk-evaluation-container standard">
+                </div>
+                <?php
+                if (!empty($conf->categorie->enabled) && getDolGlobalInt('DIGIRISKDOLIBARR_CATEGORY_ON_RISK') > 0) {
+                    print '<div class="risk-categories"><span class="title">'.$langs->trans("Categories") . '</span>';
+                    $categoryArborescence = $form->select_all_categories('risk', '', 'parent', 64, 0, 1);
+                    print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $categoryArborescence, GETPOST('categories', 'array'), '', 0, 'minwidth100imp widthcentpercentminusxx maxwidth400');
+                    print '<a class="butActionNew" href="' . DOL_URL_ROOT . '/categories/index.php?type=risk&backtopage=' . urlencode($_SERVER['PHP_SELF'] . '?action=create') . '" target="_blank"><span class="fa fa-plus-circle valignmiddle paddingleft" title="' . $langs->trans('AddCategories') . '"></span></a>';
+                    print "</div><hr>";
+                } ?>
+                <div class="risk-evaluation-container standard">
 					<span class="section-title"><?php echo ' ' . $langs->trans('RiskAssessment'); ?></span>
 					<div class="risk-evaluation-header">
 						<?php if ($conf->global->DIGIRISKDOLIBARR_ADVANCED_RISKASSESSMENT_METHOD) : ?>
@@ -873,7 +900,7 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
 								<input class="risk-evaluation-seuil" type="hidden" value="undefined">
 								<?php
 								$evaluationMethod        = $advancedCotationMethodArray[0];
-								$evaluationMethodSurvey = $evaluationMethod['option']['variable'];
+								$evaluationMethodSurvey = $evaluationMethod['option'][$risk->type . '_variable'];
 								?>
 								<div class="wpeo-gridlayout cotation-advanced" style="display:none">
 									<input type="hidden" class="digi-method-evaluation-id" value="<?php echo $risk->id ; ?>" />
@@ -928,6 +955,7 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
 							<?php print $form->selectDate('', 'RiskAssessmentDate', 0, 0, 0, '', 1, 1); ?>
 						</div>
 					<?php endif; ?>
+                    <hr>
                     <div class="riskassessment-medias linked-medias photo">
                         <div class="element-linked-medias element-linked-medias-0 risk-new">
                             <div class="medias section-title"><i class="fas fa-picture-o"></i><?php echo $langs->trans('Medias'); ?></div>
@@ -996,7 +1024,7 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
 	</div>
 	<?php endif; ?>
 <?php endif; ?>
-<?php $title = $langs->trans('DigiriskElementRisksList');
+<?php $title = $langs->trans('DigiriskElement' . ucfirst($riskType) . 'sList');
 print '<div class="div-title-and-table-responsive">';
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $risk->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -1013,6 +1041,12 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
 if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 else $moreforfilter                  = $hookmanager->resPrint;
 
+// Filter on categories
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && getDolGlobalInt('DIGIRISKDOLIBARR_CATEGORY_ON_RISK') > 0) {
+    $formcategory   = new FormCategory($db);
+    $moreforfilter  = $formcategory->getFilterBox('risk', $search_category_array);
+}
+
 if ( ! empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
@@ -1189,7 +1223,7 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
                             $digiriskElementIds = array_reverse($digiriskElementIds);
 
                             foreach ($digiriskElementIds as $key => $digiriskElementId) {
-                                print str_repeat(' - ', $key + 1) . $activeDigiriskElementList[$digiriskElementId]->getNomUrl(1, 'blank', 0, '', -1, 1) . '</br>';
+                                print str_repeat(' &#160', $key + 1) . '&#x21B3' . $activeDigiriskElementList[$digiriskElementId]->getNomUrl(1, 'blank', 0, '', -1, 1) . '</br>';
                             }
                         }
                     }
@@ -1282,6 +1316,23 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
 										</div>
 									<?php endif; ?>
 								</div>
+                                <?php
+                                // Tags-Categories
+                                if ($conf->categorie->enabled && getDolGlobalInt('DIGIRISKDOLIBARR_CATEGORY_ON_RISK') > 0) {
+                                    print '<div class="risk-categories"><span class="title">'.$langs->trans("Categories").'</span>';
+                                    $categoryArborescence = $form->select_all_categories('risk', '', 'parent', 64, 0, 1);
+                                    $c                    = new Categorie($db);
+                                    $cats                 = $c->containing($risk->id, 'risk');
+                                    $arrayselected        = [];
+                                    if (is_array($cats)) {
+                                        foreach ($cats as $cat) {
+                                            $arrayselected[] = $cat->id;
+                                        }
+                                    }
+                                    print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories_risk' . $risk->id, $categoryArborescence, $arrayselected, '', 0, 'minwidth100imp widthcentpercentminusxx maxwidth400');
+                                    print '<a class="butActionNew" href="' . DOL_URL_ROOT . '/categories/index.php?type=risk&backtopage=' . urlencode($_SERVER['PHP_SELF'] . '?action=create') . '" target="_blank"><span class="fa fa-plus-circle valignmiddle paddingleft" title="' . $langs->trans('AddCategories') . '"></span></a>';
+                                    print '</div><hr>';
+                                } ?>
 								<div class="move-risk <?php echo $conf->global->DIGIRISKDOLIBARR_MOVE_RISKS ? '' : 'move-disabled'?>">
 									<span class="title"><?php echo $langs->trans('MoveRisk'); ?></span>
 									<?php if (is_object($activeDigiriskElementList[$risk->fk_element])) {
diff --git a/core/tpl/riskanalysis/risk/digiriskdolibarr_sharedrisklist_view.tpl.php b/core/tpl/riskanalysis/risk/digiriskdolibarr_sharedrisklist_view.tpl.php
index 40a98bd4c..a5730691c 100644
--- a/core/tpl/riskanalysis/risk/digiriskdolibarr_sharedrisklist_view.tpl.php
+++ b/core/tpl/riskanalysis/risk/digiriskdolibarr_sharedrisklist_view.tpl.php
@@ -64,7 +64,7 @@
 $alldigiriskelement = $digiriskelement->getActiveDigiriskElements(1);
 $digiriskElementsOfEntity = $digiriskelement->getActiveDigiriskElements();
 
-$DUProject->fetch($conf->global->DIGIRISKDOLIBARR_DU_PROJECT);
+$DUProject->fetch($riskType == 'risk' ? $conf->global->DIGIRISKDOLIBARR_DU_PROJECT : $conf->global->DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT);
 $extrafields->fetch_name_optionals_label($digiriskTask->table_element);
 
 $riskAssessmentList        = $riskAssessment->fetchAll('', '', 0, 0, array(), 'AND', 1);
@@ -119,6 +119,7 @@
 		}
 	}
 	$sql .= " AND el.sourcetype = 'digiriskdolibarr_risk'";
+    $sql .= ' AND r.type = "' . $riskType . '"';
 
 	foreach ($search as $key => $val) {
 		if ($key == 'status' && $search[$key] == -1) continue;
@@ -232,6 +233,7 @@
 		}
 	}
 	$sql .= " AND el.sourcetype = 'digiriskdolibarr_risk'";
+    $sql .= ' AND r.type = "' . $riskType . '"';
 
 	foreach ($search as $key => $val) {
 		if ($key == 'status' && $search[$key] == -1) continue;
@@ -327,7 +329,7 @@
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 } ?>
 
-<?php $title = $langs->trans('DigiriskElementSharedRisksList');
+<?php $title = $langs->trans('DigiriskElementShared' . ucfirst($riskType) . 'sList');
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'digiriskdolibarr_color.png@digiriskdolibarr', 0, '', '', $limit, 0, 0, 1);
 
 include DOL_DOCUMENT_ROOT . '/core/tpl/massactions_pre.tpl.php';
@@ -554,7 +556,7 @@
                             $digiriskElementIds = array_reverse($digiriskElementIds);
 
                             foreach ($digiriskElementIds as $key => $digiriskElementId) {
-                                print str_repeat(' - ', $key + 1) . $alldigiriskelement[$digiriskElementId]->getNomUrl(1, 'blank', 0, '', -1, 1) . '</br>';
+                                print str_repeat(' &#160', $key + 1) . '&#x21B3' . $alldigiriskelement[$digiriskElementId]->getNomUrl(1, 'blank', 0, '', -1, 1) . '</br>';
                             }
                         }
                     }
diff --git a/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view.tpl.php b/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view.tpl.php
index 1384c8e75..c0efb7a22 100644
--- a/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view.tpl.php
+++ b/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view.tpl.php
@@ -313,7 +313,7 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
 								</div>
 								<input class="risk-evaluation-seuil" type="hidden">
 								<?php $evaluationMethod  = $advancedCotationMethodArray[0];
-								$evaluationMethodSurvey  = $evaluationMethod['option']['variable']; ?>
+								$evaluationMethodSurvey  = $evaluationMethod['option'][$risk->type . '_variable']; ?>
 								<div class="wpeo-gridlayout cotation-advanced" style="<?php echo ($lastRiskAssessment->method == "advanced") ? " display:block" : " display:none" ?>">
 									<input type="hidden" class="digi-method-evaluation-id" value="<?php echo $risk->id ; ?>" />
 									<textarea style="display: none" name="evaluation_variables" class="tmp_evaluation_variable"><?php echo '{}'; ?></textarea>
diff --git a/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view_edit_modal.tpl.php b/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view_edit_modal.tpl.php
index c88af562b..34c1f808c 100644
--- a/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view_edit_modal.tpl.php
+++ b/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view_edit_modal.tpl.php
@@ -77,7 +77,7 @@ class="risk-evaluation-cotation cotation<?php echo ($lastEvaluation->cotation ==
 								<?php if ( $lastEvaluation->method == "advanced" || $conf->global->DIGIRISKDOLIBARR_MULTIPLE_RISKASSESSMENT_METHOD) : ?>
 									<?php
 									$evaluationMethod       = $advancedCotationMethodArray[0];
-									$evaluationMethodSurvey = $evaluationMethod['option']['variable'];
+									$evaluationMethodSurvey = $evaluationMethod['option'][$risk->type . '_variable'];
 									?>
 									<div class="wpeo-gridlayout cotation-advanced" style="<?php echo ($lastEvaluation->method == "advanced") ? " display:block" : " display:none" ?>">
 										<input type="hidden" class="digi-method-evaluation-id" value="<?php echo $risk->id ; ?>" />
diff --git a/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view_single.tpl.php b/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view_single.tpl.php
index 999ae3dc8..e41dce1c3 100644
--- a/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view_single.tpl.php
+++ b/core/tpl/riskanalysis/riskassessment/digiriskdolibarr_riskassessment_view_single.tpl.php
@@ -1,7 +1,7 @@
 <!-- RISK EVALUATION SINGLE START -->
 <?php if ($showSingle > 0) : ?>
 
-<div class="risk-evaluation-container risk-evaluation-container-<?php echo $lastEvaluation->id ?> maxwidth400" value="<?php echo $risk->id ?>">
+<div class="risk-evaluation-container risk-evaluation-container-<?php echo $lastEvaluation->id ?>" value="<?php echo $risk->id ?>">
 	<div class="risk-evaluation-single-content risk-evaluation-single-content-<?php echo $risk->id ?>">
 		<div class="risk-evaluation-single risk-evaluation-single-<?php echo $risk->id ?>">
 			<div class="risk-evaluation-cotation risk-evaluation-list modal-open" value="<?php echo $risk->id ?>" data-scale="<?php echo $lastEvaluation->getEvaluationScale() ?>">
diff --git a/core/tpl/riskanalysis/riskassessmenttask/digiriskdolibarr_riskassessment_task_view.tpl.php b/core/tpl/riskanalysis/riskassessmenttask/digiriskdolibarr_riskassessment_task_view.tpl.php
index 9655e1f9f..630f825f8 100644
--- a/core/tpl/riskanalysis/riskassessmenttask/digiriskdolibarr_riskassessment_task_view.tpl.php
+++ b/core/tpl/riskanalysis/riskassessmenttask/digiriskdolibarr_riskassessment_task_view.tpl.php
@@ -13,7 +13,7 @@
 		<?php if (!empty($related_tasks) && $related_tasks > 0) : ?>
 			<?php foreach ($related_tasks as $related_task) {
 				if (!empty($conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS) && $contextpage == 'sharedrisk') {
-					if ($related_task->fk_projet != $conf->global->DIGIRISKDOLIBARR_DU_PROJECT) {
+					if ($related_task->fk_projet != $conf->global->DIGIRISKDOLIBARR_DU_PROJECT && $related_task->fk_projet != $conf->global->DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT) {
 						$project->fetch($related_task->fk_projet);
 					} else {
 						$project = $DUProject;
diff --git a/core/triggers/interface_99_modDigiriskdolibarr_DigiriskdolibarrTriggers.class.php b/core/triggers/interface_99_modDigiriskdolibarr_DigiriskdolibarrTriggers.class.php
index 8a819ac9d..dd0f897fa 100644
--- a/core/triggers/interface_99_modDigiriskdolibarr_DigiriskdolibarrTriggers.class.php
+++ b/core/triggers/interface_99_modDigiriskdolibarr_DigiriskdolibarrTriggers.class.php
@@ -72,7 +72,7 @@ public function __construct($db)
 		$this->name        = preg_replace('/^Interface/i', '', get_class($this));
 		$this->family      = "demo";
 		$this->description = "Digiriskdolibarr triggers.";
-		$this->version     = '9.15.0';
+		$this->version     = '10.0.0';
 		$this->picto       = 'digiriskdolibarr@digiriskdolibarr';
 	}
 
@@ -219,26 +219,27 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf
 				}
 				break;
 
-            case 'REGISTERDOCUMENT_GENERATE':
-            case 'RISKASSESSMENTDOCUMENT_GENERATE' :
             case 'AUDITREPORTDOCUMENT_GENERATE' :
-            case 'LEGALDISPLAY_GENERATE' :
-            case 'INFORMATIONSSHARING_GENERATE' :
-            case 'REGISTERDOCUMENT_GENERATE' :
+            case 'ACCIDENTINVESTIGATIONDOCUMENT_GENERATE' :
             case 'FIREPERMITDOCUMENT_GENERATE' :
-			case 'PREVENTIONPLANDOCUMENT_GENERATE' :
+            case 'GROUPMENTDOCUMENT_GENERATE' :
+            case 'INFORMATIONSSHARING_GENERATE' :
+            case 'LEGALDISPLAY_GENERATE' :
             case 'LISTINGRISKSACTION_GENERATE' :
-            case 'LISTINGRISKSPHOTO_GENERATE' :
             case 'LISTINGRISKSDOCUMENT_GENERATE' :
+            case 'LISTINGRISKSPHOTO_GENERATE' :
+            case 'LISTINGRISKSENVIRONMENTALACTION_GENERATE' :
+            case 'PREVENTIONPLANDOCUMENT_GENERATE' :
+            case 'REGISTERDOCUMENT_GENERATE':
+            case 'RISKASSESSMENTDOCUMENT_GENERATE' :
+            case 'TICKETDOCUMENT_GENERATE' :
             case 'WORKUNITDOCUMENT_GENERATE' :
-			case 'GROUPMENTDOCUMENT_GENERATE' :
 
                 if ($object->parent_type == 'groupment' || $object->parent_type == 'workunit' || preg_match('/listingrisks/', $object->parent_type)) {
                     $object->parent_type = 'digiriskelement';
                 }
 
-                $actioncomm->elementtype = $object->parent_type . '@digiriskdolibarr';
-
+                $actioncomm->elementtype = $action != 'TICKETDOCUMENT_GENERATE' ? $object->parent_type . '@digiriskdolibarr' : $object->parent_type;
                 $actioncomm->label       = $langs->trans('ObjectGenerateTrigger', $langs->transnoentities(ucfirst(get_class($object))), $object->ref);
                 $actioncomm->elementid   = $object->parent_id;
                 $actioncomm->fk_element  = $object->parent_id;
diff --git a/documents/doctemplates/listingrisksenvironmentaldocument/index.php b/documents/doctemplates/listingrisksenvironmentaldocument/index.php
new file mode 100644
index 000000000..cd6990e24
--- /dev/null
+++ b/documents/doctemplates/listingrisksenvironmentaldocument/index.php
@@ -0,0 +1,2 @@
+<?php
+//Silence is golden
diff --git a/documents/doctemplates/listingrisksenvironmentaldocument/listingrisksenvironmentalaction/index.php b/documents/doctemplates/listingrisksenvironmentaldocument/listingrisksenvironmentalaction/index.php
new file mode 100644
index 000000000..cd6990e24
--- /dev/null
+++ b/documents/doctemplates/listingrisksenvironmentaldocument/listingrisksenvironmentalaction/index.php
@@ -0,0 +1,2 @@
+<?php
+//Silence is golden
diff --git a/documents/doctemplates/listingrisksenvironmentaldocument/listingrisksenvironmentalaction/template_listingrisksenvironmentalaction.odt b/documents/doctemplates/listingrisksenvironmentaldocument/listingrisksenvironmentalaction/template_listingrisksenvironmentalaction.odt
new file mode 100644
index 000000000..bfc60937a
Binary files /dev/null and b/documents/doctemplates/listingrisksenvironmentaldocument/listingrisksenvironmentalaction/template_listingrisksenvironmentalaction.odt differ
diff --git a/img/categorieDangers/Pictogrammes_environnement_divers.png b/img/categorieDangers/Pictogrammes_environnement_divers.png
new file mode 100644
index 000000000..8fdbb1e28
Binary files /dev/null and b/img/categorieDangers/Pictogrammes_environnement_divers.png differ
diff --git a/img/categorieDangers/Pictogrammes_environnement_energie_emise.png b/img/categorieDangers/Pictogrammes_environnement_energie_emise.png
new file mode 100644
index 000000000..3017ba626
Binary files /dev/null and b/img/categorieDangers/Pictogrammes_environnement_energie_emise.png differ
diff --git a/img/categorieDangers/Pictogrammes_environnement_matieres_premieres.png b/img/categorieDangers/Pictogrammes_environnement_matieres_premieres.png
new file mode 100644
index 000000000..ca491e06b
Binary files /dev/null and b/img/categorieDangers/Pictogrammes_environnement_matieres_premieres.png differ
diff --git a/img/categorieDangers/Pictogrammes_environnement_production_dechets.png b/img/categorieDangers/Pictogrammes_environnement_production_dechets.png
new file mode 100644
index 000000000..d65676c7e
Binary files /dev/null and b/img/categorieDangers/Pictogrammes_environnement_production_dechets.png differ
diff --git a/img/categorieDangers/Pictogrammes_environnement_rejets_air.png b/img/categorieDangers/Pictogrammes_environnement_rejets_air.png
new file mode 100644
index 000000000..ced154b51
Binary files /dev/null and b/img/categorieDangers/Pictogrammes_environnement_rejets_air.png differ
diff --git a/img/categorieDangers/Pictogrammes_environnement_rejets_eau.png b/img/categorieDangers/Pictogrammes_environnement_rejets_eau.png
new file mode 100644
index 000000000..2e3fb96b7
Binary files /dev/null and b/img/categorieDangers/Pictogrammes_environnement_rejets_eau.png differ
diff --git a/img/categorieDangers/Pictogrammes_environnement_rejets_sol.png b/img/categorieDangers/Pictogrammes_environnement_rejets_sol.png
new file mode 100644
index 000000000..587474956
Binary files /dev/null and b/img/categorieDangers/Pictogrammes_environnement_rejets_sol.png differ
diff --git a/img/categorieDangers/Pictogrammes_environnement_utilisation_energie.png b/img/categorieDangers/Pictogrammes_environnement_utilisation_energie.png
new file mode 100644
index 000000000..d96c4f4e4
Binary files /dev/null and b/img/categorieDangers/Pictogrammes_environnement_utilisation_energie.png differ
diff --git a/img/categorieDangers/Pictogrammes_environnement_utilisation_espace.png b/img/categorieDangers/Pictogrammes_environnement_utilisation_espace.png
new file mode 100644
index 000000000..40c3a5a5a
Binary files /dev/null and b/img/categorieDangers/Pictogrammes_environnement_utilisation_espace.png differ
diff --git a/js/digiriskdolibarr.min.js b/js/digiriskdolibarr.min.js
index b9521189d..a44dea06a 100644
--- a/js/digiriskdolibarr.min.js
+++ b/js/digiriskdolibarr.min.js
@@ -1 +1 @@
-"use strict";window.digiriskdolibarr||(window.digiriskdolibarr={},window.digiriskdolibarr.scriptsLoaded=!1),window.digiriskdolibarr.scriptsLoaded||(window.digiriskdolibarr.init=function(){window.digiriskdolibarr.load_list_script()},window.digiriskdolibarr.load_list_script=function(){if(!window.digiriskdolibarr.scriptsLoaded){var i=void 0,e=void 0;for(i in window.digiriskdolibarr)for(e in window.digiriskdolibarr[i].init&&window.digiriskdolibarr[i].init(),window.digiriskdolibarr[i])window.digiriskdolibarr[i]&&window.digiriskdolibarr[i][e]&&window.digiriskdolibarr[i][e].init&&window.digiriskdolibarr[i][e].init();window.digiriskdolibarr.scriptsLoaded=!0}},window.digiriskdolibarr.refresh=function(){var i=void 0,e=void 0;for(i in window.digiriskdolibarr)for(e in window.digiriskdolibarr[i].refresh&&window.digiriskdolibarr[i].refresh(),window.digiriskdolibarr[i])window.digiriskdolibarr[i]&&window.digiriskdolibarr[i][e]&&window.digiriskdolibarr[i][e].refresh&&window.digiriskdolibarr[i][e].refresh()},$(document).ready(window.digiriskdolibarr.init)),window.digiriskdolibarr.accident={},window.digiriskdolibarr.accident.init=function(){window.digiriskdolibarr.accident.event()},window.digiriskdolibarr.accident.event=function(){$(document).on("submit",".sendfile",window.digiriskdolibarr.accident.tmpStockFile),$(document).on("click",".linked-file-delete-workstop",window.digiriskdolibarr.accident.removeFile),$(document).on("change","#external_accident",window.digiriskdolibarr.accident.showExternalAccidentLocation)},window.digiriskdolibarr.accident.tmpStockFile=function(e,i=""){var s=$("#sendfile").prop("files"),t=new FormData;for(let i=0;i<s.length;i++){var a=s[i];t.append("files[]",a)}var n=window.saturne.toolbox.getToken(),i=0<i.length?"&subaction="+i:"";$.ajax({url:document.URL+"&action=sendfile&objectlineid="+e+"&token="+n+i,type:"POST",processData:!1,contentType:!1,data:t,success:function(i){$("#sendFileForm"+e).html($(i).find("#fileLinkedTable"+e))},error:function(){}})},window.digiriskdolibarr.accident.removeFile=function(i){let e=$(this).attr("value");var s=$(this).hasClass("edit-line")?"&subaction=editline":"";e=e.replace("_mini","");let t=$(this).closest(".objectline").attr("value");var a=window.saturne.toolbox.getToken();$.ajax({url:document.URL+"&action=removefile&filetodelete="+e+"&objectlineid="+t+"&token="+a+s,type:"POST",processData:!1,contentType:!1,success:function(i){$("#sendFileForm"+t).html($(i).find("#fileLinkedTable"+t))},error:function(){}})},window.digiriskdolibarr.accident.showExternalAccidentLocation=function(){var i=$(this).closest(".accident-table").find(".fk_element_field"),e=$(this).closest(".accident-table").find(".fk_soc_field"),s=$(this).closest(".accident-table").find(".accident_location_field");switch($(this).closest(".accident-table").find("#select2-external_accident-container").attr("title")){case"Non":i.attr("style",""),e.attr("style","display:none"),s.attr("style","display:none"),i.removeClass("hidden"),e.addClass("hidden"),s.addClass("hidden");break;case"Oui":i.attr("style","display:none"),e.attr("style",""),s.attr("style","display:none"),i.addClass("hidden"),e.removeClass("hidden"),s.addClass("hidden");break;case"Autre":i.attr("style","display:none"),e.attr("style","display:none"),s.attr("style",""),i.addClass("hidden"),e.addClass("hidden"),s.removeClass("hidden")}},window.digiriskdolibarr.button={},window.digiriskdolibarr.button.init=function(){window.digiriskdolibarr.button.event()},window.digiriskdolibarr.button.event=function(){$(document).on("click",".wpeo-button:submit",window.digiriskdolibarr.button.addLoader),$(document).on("click",".auto-download",window.digiriskdolibarr.button.addLoader)},window.digiriskdolibarr.button.addLoader=function(){window.saturne.loader.display($(this)),$(this).toggleClass("button-blue button-disable")},window.digiriskdolibarr.dashboard={},window.digiriskdolibarr.dashboard.init=function(){window.digiriskdolibarr.dashboard.event()},window.digiriskdolibarr.dashboard.event=function(){$(document).on("change",".add-dashboard-widget",window.digiriskdolibarr.dashboard.addDashBoardInfo),$(document).on("click",".close-dashboard-widget",window.digiriskdolibarr.dashboard.closeDashBoardInfo)},window.digiriskdolibarr.dashboard.addDashBoardInfo=function(){var i=document.getElementById("dashBoardForm"),i=new FormData(i).get("boxcombo"),e=window.saturne.toolbox.getQuerySeparator(document.URL),s=window.saturne.toolbox.getToken();$.ajax({url:document.URL+e+"action=adddashboardinfo&token="+s,type:"POST",processData:!1,data:JSON.stringify({dashboardWidgetName:i}),contentType:!1,success:function(i){window.location.reload()},error:function(){}})},window.digiriskdolibarr.dashboard.closeDashBoardInfo=function(){let e=$(this);var i=e.attr("data-widgetname"),s=window.saturne.toolbox.getQuerySeparator(document.URL),t=window.saturne.toolbox.getToken();$.ajax({url:document.URL+s+"action=closedashboardinfo&token="+t,type:"POST",processData:!1,data:JSON.stringify({dashboardWidgetName:i}),contentType:!1,success:function(i){e.closest(".box-flex-item").fadeOut(400),$(".add-widget-box").attr("style",""),$(".add-widget-box").html($(i).find(".add-widget-box").children())},error:function(){}})},window.digiriskdolibarr.digiriskelement={},window.digiriskdolibarr.digiriskelement.init=function(){window.digiriskdolibarr.digiriskelement.event()},window.digiriskdolibarr.digiriskelement.event=function(){$(document).on("click","#select_all_shared_elements_by_digiriskelement",window.digiriskdolibarr.digiriskelement.selectAllSharedElementByDigiriskElement),$(document).on("click","#select_all_shared_elements",window.digiriskdolibarr.digiriskelement.selectAllSharedElements)},window.digiriskdolibarr.digiriskelement.selectAllSharedElementByDigiriskElement=function(i){var e=$(this).attr("name");this.checked?$(this).closest(".ui-widget").find(".importsharedelement-digiriskelement-"+e).not(":disabled").each(function(){this.checked=!0}):$(this).closest(".ui-widget").find(".importsharedelement-digiriskelement-"+e).not(":disabled").each(function(){this.checked=!1})},window.digiriskdolibarr.digiriskelement.selectAllSharedElements=function(i){this.checked?$(this).closest(".ui-widget").find(":checkbox").not(":disabled").not("#select_all_shared_elements_by_digiriskelement").each(function(){this.checked=!0}):$(this).closest(".ui-widget").find(":checkbox").not(":disabled").not("#select_all_shared_elements_by_digiriskelement").each(function(){this.checked=!1})},window.digiriskdolibarr.document={},window.digiriskdolibarr.document.canvas,window.digiriskdolibarr.document.buttonSignature,window.digiriskdolibarr.document.init=function(){window.digiriskdolibarr.document.event()},window.digiriskdolibarr.document.event=function(){$(document).on("click","#builddoc_generatebutton",window.digiriskdolibarr.document.displayLoader),$(document).on("click",".pdf-generation",window.digiriskdolibarr.document.displayLoader),$(document).on("click",".send-risk-assessment-document-by-mail",window.digiriskdolibarr.document.displayLoader)},window.digiriskdolibarr.document.displayLoader=function(){window.saturne.loader.display($(this).closest(".div-table-responsive-no-min"))},window.digiriskdolibarr.evaluationMethodEvarisk={},window.digiriskdolibarr.evaluationMethodEvarisk.init=function(){window.digiriskdolibarr.evaluationMethodEvarisk.event()},window.digiriskdolibarr.evaluationMethodEvarisk.event=function(){$(document).on("click",".wpeo-table.evaluation-method .table-cell.can-select",window.digiriskdolibarr.evaluationMethodEvarisk.selectSeuil)},window.digiriskdolibarr.evaluationMethodEvarisk.selectSeuil=function(i){$(this).closest(".table-row").find(".active").removeClass("active"),$(this).addClass("active");var s=$(this),t=s.closest(".modal-container"),s=s.data("evaluation-id");let a=[];if(Object.values(t.find(".table-cell.active.cell-"+s)).forEach(function(i){-1<$(i).data("seuil")&&a.push($(i).data("seuil"))}),5===a.length){let e=a[0]*a[1]*a[2]*a[3]*a[4];s=window.location.pathname.split(/view/)[0];fetch(s+"/js/json/default.json").then(i=>i.json()).then(i=>{i=i[0].option.matrix[e];t.find(".risk-evaluation-calculated-cotation").find(".risk-evaluation-cotation").attr("data-scale",window.digiriskdolibarr.evaluation.getDynamicScale(i)),t.find(".risk-evaluation-calculated-cotation").find(".risk-evaluation-cotation span").text(i),t.find(".risk-evaluation-content").find(".risk-evaluation-seuil").val(i),window.digiriskdolibarr.risk.haveDataInInput(t)})}},window.digiriskdolibarr.evaluator={},window.digiriskdolibarr.evaluator.init=function(){window.digiriskdolibarr.evaluator.event()},window.digiriskdolibarr.evaluator.event=function(){$(document).on("click",".evaluator-create",window.digiriskdolibarr.evaluator.createEvaluator),$(document).on("change","#fk_user_employer",window.digiriskdolibarr.evaluator.selectUser)},window.digiriskdolibarr.evaluator.selectUser=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".modal-container"),t=s.find("#fk_user_employer").val();window.saturne.loader.display(s.find('input[name="evaluatorJob"]')),$.ajax({url:document.URL+"&action=getEvaluatorJob&token="+e,type:"POST",processData:!1,data:JSON.stringify({userID:t}),contentType:!1,success:function(i){s.find('input[name="evaluatorJob"]').val($(i).find('input[name="evaluatorJob"]').val()),s.find('input[name="evaluatorJob"]').removeClass("wpeo-loader")},error:function(i){}}),window.digiriskdolibarr.evaluator.haveDataInInput(s)},window.digiriskdolibarr.evaluator.haveDataInInput=function(i){i=i.parent().parent();i.hasClass("evaluator-add-modal")&&(0<i.find("#fk_user_employer").val()?i.find(".button-disable").removeClass("button-disable"):i.find(".evaluator-create").addClass("button-disable"))},window.digiriskdolibarr.evaluator.createEvaluator=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".fichecenter").find(".evaluator-content"),t=$("#select2-fk_user_employer-container").attr("title"),t=$("#fk_user_employer").find("option:contains('"+t+"')").attr("value"),a=s.find("#EvaluatorDate").val(),n=s.find(".evaluator-duration .duration").val(),s=s.find(".evaluatorJob").val(),r=$(this).closest(".fichecenter").find(".div-table-responsive");window.saturne.loader.display(r),$.ajax({url:document.URL+"&action=add&token="+e,type:"POST",data:JSON.stringify({evaluatorID:t,date:a,duration:n,job:s}),processData:!1,contentType:!1,success:function(i){$(".fichecenter").html($(i).find("#searchFormEvaluator"));var e=$(".messageSuccessEvaluatorCreate");e.find($(i).find(".evaluator-create-success-notice")),e.removeClass("hidden")},error:function(i){var e=$(".messageErrorEvaluatorCreate");e.find($(i).find(".evaluator-create-error-notice")),e.removeClass("hidden")}})},window.digiriskdolibarr.form={},window.digiriskdolibarr.form.init=function(){window.digiriskdolibarr.form.event()},window.digiriskdolibarr.form.event=function(){$(document).on("submit","#searchFormListRisks, #searchFormInheritedListRisks, #searchFormSharedListRisks, #searchFormListRiskSigns, #searchFormEvaluator",window.digiriskdolibarr.form.searchForm)},window.digiriskdolibarr.form.searchForm=function(i){i.preventDefault();let e=0,s=(void 0!==i.originalEvent&&$(i.originalEvent.submitter).hasClass("button_removefilter")&&(e=1),$(this).closest("form").attr("id"));var i=document.getElementById(s),i=new FormData(i),t=new FormData,a=["token","formfilteraction","action","id","sortfield","sortorder","page","contextpage","limit","toselect[]","massaction","confirm","cancel","pageplusone","backtopage","button_removefilter_x","button_removefilter","button_removefilter.x"];if(e)t.append("button_removefilter_x","x"),t.append("token",i.entries().token);else for(const n of i.entries())(a.includes(n[0])||n[0].match(/search_/))&&t.append(n[0],n[1]);window.saturne.loader.display($("#"+s)),$.ajax({url:document.URL,type:"POST",data:t,processData:!1,contentType:!1,success:function(i){window.saturne.loader.remove($("#"+s)),$("#"+s).replaceWith($(i).find("#"+s))}})},window.digiriskdolibarr.navigation={},window.digiriskdolibarr.navigation.init=function(){window.digiriskdolibarr.navigation.event()},window.digiriskdolibarr.navigation.event=function(){$(document).on("click",".toggle-unit",window.digiriskdolibarr.navigation.switchToggle),$(document).on("click",".digirisk-wrap .navigation-container .toolbar div",window.digiriskdolibarr.navigation.toggleAll),$(document).on("click","#slider",window.digiriskdolibarr.navigation.setUnitActive),$(document).on("click",".side-nav-responsive",window.digiriskdolibarr.navigation.toggleMobileNav),$(document).on("click",".save-organization",window.digiriskdolibarr.navigation.saveOrganization)},window.digiriskdolibarr.navigation.switchToggle=function(i){var e,s=null==(s=localStorage.menu)||""==s?new Set:(s=JSON.parse(s),new Set(s));$(this).find(".toggle-icon").hasClass("fa-chevron-down")?($(this).find(".toggle-icon").removeClass("fa-chevron-down").addClass("fa-chevron-right"),e=$(this).closest(".unit").attr("id").split("unit")[1],$(this).closest(".unit").removeClass("toggled"),s.delete(e),localStorage.setItem("menu",JSON.stringify(Array.from(s.keys())))):$(this).find(".toggle-icon").hasClass("fa-chevron-right")&&($(this).find(".toggle-icon").removeClass("fa-chevron-right").addClass("fa-chevron-down"),$(this).closest(".unit").addClass("toggled"),e=$(this).closest(".unit").attr("id").split("unit")[1],s.add(e),localStorage.setItem("menu",JSON.stringify(Array.from(s.keys()))))},window.digiriskdolibarr.navigation.toggleAll=function(i){if(i.preventDefault(),$(this).hasClass("toggle-plus")){$(".digirisk-wrap .navigation-container .workunit-list .unit .toggle-icon").removeClass("fa-chevron-right").addClass("fa-chevron-down"),$(".digirisk-wrap .navigation-container .workunit-list .unit").addClass("toggled");let e=[];$(".digirisk-wrap .navigation-container .workunit-list .unit .title").get().map(function(i){e.push($(i).attr("value"))}),localStorage.setItem("menu",JSON.stringify(Array.from(e.values())))}$(this).hasClass("toggle-minus")&&($(".digirisk-wrap .navigation-container .workunit-list .unit.toggled").removeClass("toggled"),$(".digirisk-wrap .navigation-container .workunit-list .unit .toggle-icon").addClass("fa-chevron-right").removeClass("fa-chevron-down"),i=new Set("0"),localStorage.setItem("menu",JSON.stringify(Object.values(i))))},window.digiriskdolibarr.navigation.setUnitActive=function(i){$(".digirisk-wrap .navigation-container .unit.active").removeClass("active");var e=$(this).attr("value");$(this).closest(".unit").addClass("active"),$(this).closest(".unit").attr("value",e)},window.digiriskdolibarr.navigation.toggleMobileNav=function(i){$(this).closest(".side-nav").find("#id-left").toggleClass("active")},window.digiriskdolibarr.navigation.saveOrganization=function(i){var e=window.saturne.toolbox.getToken();let s=[],t=[],a,n,r=$(".messageSuccessOrganizationSaved"),o=$(".messageErrorOrganizationSaved");$(".route").each(function(){a=$(this).attr("id"),n=$(this).parent("ul").attr("id").split(/space/)[1],s.push(a),t.push(n)}),window.saturne.loader.display($(this)),$.ajax({url:document.URL+"&action=saveOrganization&ids="+s.toString()+"&parent_ids="+t+"&token="+e,success:function(){r.removeClass("hidden"),$(".wpeo-loader").addClass("button-disable"),$(".wpeo-loader").attr("style","background: #47e58e !important;border-color: #47e58e !important;"),$(".wpeo-loader").find(".fas.fa-check").attr("style",""),$("a").attr("onclick","").unbind("click"),$(".wpeo-loader").removeClass("wpeo-loader")},error:function(){o.removeClass("hidden"),$(".wpeo-loader").addClass("button-disable"),$(".wpeo-loader").attr("style","background: #e05353 !important;border-color: #e05353 !important;"),$(".wpeo-loader").find(".fas.fa-times").attr("style",""),$(".wpeo-loader").removeClass("wpeo-loader")}})},window.digiriskdolibarr.preventionplan={},window.digiriskdolibarr.preventionplan.init=function(){window.digiriskdolibarr.preventionplan.event()},window.digiriskdolibarr.preventionplan.event=function(){$(document).on("click","#prior_visit_bool",window.digiriskdolibarr.preventionplan.showDateAndText)},window.digiriskdolibarr.preventionplan.showDateAndText=function(){var i=$(this).closest(".preventionplan-table").find(".prior_visit_date_field"),e=$(this).closest(".preventionplan-table").find(".prior_visit_text_field");i.hasClass("hidden")?(i.attr("style",""),e.attr("style",""),i.removeClass("hidden"),e.removeClass("hidden")):(i.attr("style","display:none"),e.attr("style","display:none"),i.addClass("hidden"),e.addClass("hidden"))},window.digiriskdolibarr.risk={},window.digiriskdolibarr.risk.init=function(){window.digiriskdolibarr.risk.event()},window.digiriskdolibarr.risk.event=function(){$(document).on("click",".category-danger .item, .wpeo-table .category-danger .item",window.digiriskdolibarr.risk.selectDanger),$(document).on("click",".risk-create:not(.button-disable)",window.digiriskdolibarr.risk.createRisk),$(document).on("click",".risk-save",window.digiriskdolibarr.risk.saveRisk),$(document).on("click",".risk-unlink-shared",window.digiriskdolibarr.risk.unlinkSharedRisk),$(document).on("click",'div[aria-describedby="dialog-confirm-actionButtonImportSharedRisks"] .ui-button.ui-corner-all.ui-widget',window.digiriskdolibarr.risk.sharedRiskBoxLoader)},window.digiriskdolibarr.risk.selectDanger=function(i){var e=$(this);e.closest(".content").removeClass("active"),e.closest(".wpeo-dropdown").find(".dropdown-toggle span").hide(),e.closest(".wpeo-dropdown").find(".dropdown-toggle img").show(),e.closest(".wpeo-dropdown").find(".dropdown-toggle img").attr("src",e.find("img").attr("src")),e.closest(".wpeo-dropdown").find(".dropdown-toggle img").attr("aria-label",e.closest(".wpeo-tooltip-event").attr("aria-label")),e.closest(".wpeo-dropdown").find(".input-hidden-danger").val(e.data("id"));1==e.closest(".wpeo-dropdown").find(".input-risk-description-prefill").val()&&e.closest(".risk-content").find(".risk-description textarea").text(e.closest(".wpeo-tooltip-event").attr("aria-label"));e=$(this).closest(".modal-container");window.digiriskdolibarr.risk.haveDataInInput(e)},window.digiriskdolibarr.risk.haveDataInInput=function(i){var i=i.parent().parent(),e=i.find(".risk-evaluation-seuil");i.hasClass("risk-add-modal")?0<=i.find('input[name="risk_category_id"]').val()&&0<=e.val()&&i.find(".risk-create.button-disable").removeClass("button-disable"):i.hasClass("risk-evaluation-add-modal")&&0<=e.val()&&i.find(".risk-evaluation-create.button-disable").removeClass("button-disable")},window.digiriskdolibarr.risk.sanitizeBeforeRequest=function(i){return"string"==typeof i&&i.match(/"/)?i.split(/"/).join(""):i},window.digiriskdolibarr.risk.createRisk=function(i){var e=window.saturne.toolbox.getToken(),s=$(".risk-add-modal"),t=s.closest(".fichecenter").find(".risk-content"),a=s.closest(".fichecenter").find(".risk-evaluation-container"),n=s.closest(".fichecenter").find(".riskassessment-task"),r=t.find(".risk-description textarea").val(),o=a.find(".risk-evaluation-comment textarea").val(),d=n.find("input").val(),r=window.digiriskdolibarr.risk.sanitizeBeforeRequest(r),o=window.digiriskdolibarr.risk.sanitizeBeforeRequest(o),d=window.digiriskdolibarr.risk.sanitizeBeforeRequest(d),t=t.find(".risk-category input").val(),l=a.find(".risk-evaluation-header .risk-evaluation-method").val(),c=a.find(".risk-evaluation-seuil").val(),s=s.find(".photo .media-container .media-gallery-favorite.favorite .filename").val(),a=a.find("#RiskAssessmentDate").val(),k=[],u=(Object.values($(".table-cell.active.cell-0")).forEach(function(i){-1<$(i).data("seuil")&&(k[$(i).data("type")]=$(i).data("seuil"))}),n.find("#RiskassessmentTaskDateStartModalRisk").val()),m=n.find("#RiskassessmentTaskDateStartModalRiskhour").val(),v=n.find("#RiskassessmentTaskDateStartModalRiskmin").val(),w=n.find("#RiskassessmentTaskDateEndModalRisk").val(),f=n.find("#RiskassessmentTaskDateEndModalRiskhour").val(),g=n.find("#RiskassessmentTaskDateEndModalRiskmin").val(),n=n.find(".riskassessment-task-budget").val();window.saturne.loader.display($(".fichecenter.risklist")),$.ajax({url:document.URL+"&action=add&token="+e,type:"POST",data:JSON.stringify({cotation:c,comment:o,category:t,description:r,method:l,photo:s,date:a,task:d,dateStart:u,hourStart:m,minStart:v,dateEnd:w,hourEnd:f,minEnd:g,budget:n,criteres:{gravite:k.gravite||0,occurrence:k.occurrence||0,protection:k.protection||0,formation:k.formation||0,exposition:k.exposition||0}}),processData:!1,contentType:!1,success:function(i){$(".fichecenter.risklist").html($(i).find("#searchFormListRisks"));var e=$(".messageSuccessRiskCreate");e.html($(i).find(".risk-create-success-notice")),e.removeClass("hidden"),$(".fichecenter.risklist").removeClass("wpeo-loader")},error:function(i){var e=$(".messageErrorRiskCreate");e.html($(i).find(".risk-create-error-notice")),e.removeClass("hidden"),$(".fichecenter.risklist").removeClass("wpeo-loader")}})},window.digiriskdolibarr.risk.saveRisk=function(i){var e=window.saturne.toolbox.getToken();let t=$(this).attr("value");var s=$(this).closest(".risk-container").find(".risk-content"),a=new window.URLSearchParams(window.location.search).get("id");let n=$(this).closest(".risk-container").find(".move-risk").hasClass("move-disabled");var r=s.find(".risk-description textarea").val(),r=window.digiriskdolibarr.risk.sanitizeBeforeRequest(r),s=s.find(".risk-category input").val(),o=(r=r||"",$(this).closest(".risk-container").find("#socid option:selected").val());o==a||n?(window.saturne.loader.display($(this).closest(".risk-row-content-"+t).find(".risk-description-"+t)),window.saturne.loader.display($(this).closest(".risk-row-content-"+t).find(".risk-category"))):window.saturne.loader.display($(this).closest(".risk-row-content-"+t));let d=$(".risk_row_"+t).find(".risk-container > div:nth-child(1)").text();$.ajax({url:document.URL+"&action=saveRisk&token="+e,type:"POST",processData:!1,data:JSON.stringify({riskID:t,category:s,comment:r,newParent:o}),contentType:!1,success:function(i){$(".wpeo-loader").removeClass("wpeo-loader");var e=$(".messageSuccessRiskEdit"),s=(o==a||n?($(".modal-active").removeClass("modal-active"),$(".risk-description-"+t).html($(i).find(".risk-description-"+t)),$(".risk-row-content-"+t).find(".risk-category .cell-risk").html($(i).find(".risk-row-content-"+t).find(".risk-category .cell-risk").children()),$(".risk-row-content-"+t).find(".risk-category").fadeOut(800),$(".risk-row-content-"+t).find(".risk-category").fadeIn(800),$(".risk-row-content-"+t).find(".risk-description-"+t).fadeOut(800),$(".risk-row-content-"+t).find(".risk-description-"+t).fadeIn(800)):$(".risk-row-content-"+t).fadeOut(800,function(){$(".fichecenter .opacitymedium.colorblack.paddingleft").html($(i).find("#searchFormListRisks .opacitymedium.colorblack.paddingleft"))}),""),s=(s=(s+=e.find(".valueForEditRisk1").val())+d)+e.find(".valueForEditRisk2").val();e.find("a").attr("href","#risk_row_"+t),e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")},error:function(i){var e=$(".messageErrorRiskEdit"),s="",s=(s=(s+=e.find(".valueForEditRisk1").val())+d)+e.find(".valueForEditRisk2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})},window.digiriskdolibarr.risk.unlinkSharedRisk=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).attr("value"),t=(window.saturne.loader.display($(this)),$(".risk_row_"+s).find(".risk-container > div:nth-child(1)").text());var a=document.URL.split(/#/);$.ajax({url:a[0]+"&action=unlinkSharedRisk&token="+e,type:"POST",processData:!1,data:JSON.stringify({riskID:s}),contentType:!1,success:function(i){$(".confirmquestions").html($(i).find(".confirmquestions").children()),$(".fichecenter.sharedrisklist .opacitymedium.colorblack.paddingleft").html($(i).find("#searchFormSharedListRisks .opacitymedium.colorblack.paddingleft"));var i=$(".messageSuccessRiskUnlinkShared"),e=($("#risk_row_"+s).fadeOut(800),""),e=(e=(e+=i.find(".valueForUnlinkSharedRisk1").val())+t)+i.find(".valueForUnlinkSharedRisk2").val();i.find(".notice-subtitle .text").text(e),i.removeClass("hidden")},error:function(i){var e=$(".messageErrorRiskUnlinkShared"),s="",s=(s=(s+=e.find(".valueForUnlinkSharedRisk1").val())+t)+e.find(".valueForUnlinkSharedRisk2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})},window.digiriskdolibarr.risk.sharedRiskBoxLoader=function(i){"Oui"==$(this).text()&&window.saturne.loader.display($("#searchFormSharedListRisks"))},window.digiriskdolibarr.evaluation={},window.digiriskdolibarr.evaluation.init=function(){window.digiriskdolibarr.evaluation.event()},window.digiriskdolibarr.evaluation.event=function(){$(document).on("click",".select-evaluation-method",window.digiriskdolibarr.evaluation.selectEvaluationMethod),$(document).on("click",".cotation-container .risk-evaluation-cotation.cotation",window.digiriskdolibarr.evaluation.selectSeuil),$(document).on("click",".risk-evaluation-create",window.digiriskdolibarr.evaluation.createEvaluation),$(document).on("click",".risk-evaluation-save",window.digiriskdolibarr.evaluation.saveEvaluation),$(document).on("click",".risk-evaluation-delete",window.digiriskdolibarr.evaluation.deleteEvaluation)},window.digiriskdolibarr.evaluation.selectEvaluationMethod=function(i){var e=$(this).closest(".modal-container");0<e.find(".risk-evaluation-multiple-method").val()&&(e.find(".select-evaluation-method.selected").removeClass("selected"),$(this).addClass("selected"),$(this).removeClass("button-grey"),$(this).addClass("button-blue"),e.find(".select-evaluation-method:not(.selected)").removeClass("button-blue"),e.find(".select-evaluation-method:not(.selected)").addClass("button-grey"),$(this).hasClass("evaluation-standard")?(e.find(".cotation-advanced").attr("style","display:none"),e.find(".cotation-standard").attr("style","display:block"),e.find(".risk-evaluation-calculated-cotation").attr("style","display:none"),e.find(".risk-evaluation-method").val("standard"),e.find(this).closest(".risk-evaluation-container").removeClass("advanced"),e.find(this).closest(".risk-evaluation-container").addClass("standard")):(e.find(".cotation-standard").attr("style","display:none"),e.find(".cotation-advanced").attr("style","display:block"),e.find(".risk-evaluation-calculated-cotation").attr("style","display:block"),e.find(".risk-evaluation-method").val("advanced"),e.find(this).closest(".risk-evaluation-container").addClass("advanced"),e.find(this).closest(".risk-evaluation-container").removeClass("standard")))},window.digiriskdolibarr.evaluation.selectSeuil=function(i){var e=$(this),s=$(this).closest(".modal-container"),t=e.data("seuil"),a=e.data("variable-id"),n=e.data("evaluation-id");e.closest(".cotation-container").find(".risk-evaluation-seuil").val(n),e.closest(".cotation-container").find(".selected-cotation").removeClass("selected-cotation"),e.addClass("selected-cotation"),a&&t&&window.digiriskdolibarr.risk.haveDataInInput(s)},window.digiriskdolibarr.evaluation.getDynamicScale=function(i){switch(!0){case 0===i:case i<48:return 1;case i<51:return 2;case i<79:return 3;case i<101:return 4}},window.digiriskdolibarr.evaluation.createEvaluation=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".risk-evaluation-add-modal"),t=s.find(".modal-risk").attr("value"),a=s.find(".risk-evaluation-container"),n=a.find(".risk-evaluation-comment textarea").val(),n=window.digiriskdolibarr.risk.sanitizeBeforeRequest(n),r=a.find(".risk-evaluation-method").val(),o=a.find(".risk-evaluation-seuil").val(),d=a.find("#RiskAssessmentDateCreate0").val(),a=a.find(".photo .media-container .file-name").val();let l=[];Object.values($(".table-cell.active.cell-0")).forEach(function(i){-1<$(i).data("seuil")&&(l[$(i).data("type")]=$(i).data("seuil"))}),console.log(s),console.log(s.find(".modal-risk.modal-active")),window.saturne.loader.display($(this)),window.saturne.loader.display($(".risk-evaluation-list-container-"+t)),$.ajax({url:document.URL+"&action=addEvaluation&token="+e,type:"POST",data:JSON.stringify({cotation:o,comment:n,method:r,photo:a,date:d,riskId:t,criteres:{gravite:l.gravite||0,occurrence:l.occurrence||0,protection:l.protection||0,formation:l.formation||0,exposition:l.exposition||0}}),processData:!1,contentType:!1,success:function(i){0<$(i).find(".risk-evaluation-list-container-"+t).length?$(".risk-evaluation-list-container-"+t).replaceWith($(i).find(".risk-evaluation-list-container-"+t)):$(".div-table-responsive").replaceWith($(i).find(".div-table-responsive"));var e=$(".messageSuccessEvaluationCreate");$(".risk-evaluation-list-container-"+t).fadeOut(800),$(".risk-evaluation-list-container-"+t).fadeIn(800),e.empty(),e.html($(i).find(".riskassessment-create-success-notice")),e.find("a").attr("href","#risk_row_"+t),$(".wpeo-loader").removeClass("wpeo-loader"),e.removeClass("hidden")},error:function(i){var e=$(".messageErrorEvaluationCreate");$(this).closest(".risk-row-content-"+t).removeClass("wpeo-loader"),e.empty(),e.html($(i).find(".riskassessment-create-error-notice")),e.removeClass("hidden")}})},window.digiriskdolibarr.evaluation.deleteEvaluation=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".risk-evaluation-in-modal"),t=s.find(".labelForDelete").val();let r=$(".messageSuccessEvaluationDelete"),o=$(".messageErrorEvaluationDelete"),d=s.attr("value");if(1!=confirm(t))return!1;{let t=$(this).closest(".risk-evaluations-list-content"),a=t.attr("value"),n=$(".risk-evaluation-ref-"+d).attr("value");window.saturne.loader.display($(".risk-evaluation-ref-"+d)),$.ajax({url:document.URL+"&action=deleteEvaluation&deletedEvaluationId="+d+"&token="+e,type:"POST",processData:!1,contentType:!1,success:function(i){$(".risk-evaluation-container-"+d).fadeOut(400),$(".risk-evaluation-list-content-"+a).replaceWith($(i).find(".risk-evaluation-list-content-"+a)),$("#risk_evaluation_add"+a).replaceWith($(i).find("#risk_evaluation_add"+a));var e=$("#risk_row_"+a).find(".table-cell-header-label").text(),s=e.split(/\(/)[1].split(/\)/)[0],e=($("#risk_row_"+a).find(".table-cell-header-label").html("<strong>"+e.split(/\(/)[0]+"("+(+s-1)+")</strong>"),s-1<1&&$(".fichecenter.risklist").html($(i).find("#searchFormListRisks")),t.removeClass("wpeo-loader"),""),e=(e=(e+=r.find(".valueForDeleteEvaluation1").val())+n)+r.find(".valueForDeleteEvaluation2").val();r.find(".notice-subtitle .text").text(e),r.removeClass("hidden")},error:function(i){var e="",e=(e=(e+=o.find(".valueForDeleteEvaluation1").val())+n)+o.find(".valueForDeleteEvaluation2").val();o.find(".notice-subtitle .text").text(e),o.removeClass("hidden")}})}},window.digiriskdolibarr.evaluation.saveEvaluation=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).closest(".risk-evaluation-edit-modal"),t=s.attr("value");var a=s.find(".risk-evaluation-comment textarea").val();let n=$(this).closest(".risk-row").find(".risk-evaluations-list-content").attr("value"),r=$(".risk-evaluation-ref-"+t).attr("value"),o=$(".risk-evaluation-list-modal-"+n),d=$("#risk_evaluation_list"+n).hasClass("modal-active");var a=window.digiriskdolibarr.risk.sanitizeBeforeRequest(a),l=s.find(".risk-evaluation-method").val(),c=s.find(".risk-evaluation-seuil").val(),k=s.find("#RiskAssessmentDateEdit"+t).val(),u=s.find(".risk-evaluation-photo .filename").val();let m=[];Object.values($(".table-cell.active.cell-"+t)).forEach(function(i){-1<$(i).data("seuil")&&(m[$(i).data("type")]=$(i).data("seuil"))}),window.saturne.loader.display($(this)),$.ajax({url:document.URL+"&action=saveEvaluation&token="+e,type:"POST",processData:!1,data:JSON.stringify({cotation:c,comment:a,method:l,photo:u,date:k,evaluationID:t,criteres:{gravite:m.gravite||0,occurrence:m.occurrence||0,protection:m.protection||0,formation:m.formation||0,exposition:m.exposition||0}}),contentType:!1,success:function(i){$("#risk_evaluation_edit"+t).removeClass("modal-active"),0<$(i).find(".risk-evaluation-container.risk-evaluation-container-"+t+":not(.last-risk-assessment)").length?((d?($(".risk-evaluation-ref-"+t+":not(.last-risk-assessment)").fadeOut(800),$(".risk-evaluation-ref-"+t+":not(.last-risk-assessment)")):($(".risk-evaluation-container-"+t+":not(.last-risk-assessment)").fadeOut(800),$(".risk-evaluation-container-"+t+":not(.last-risk-assessment)"))).fadeIn(800),o.find(".risk-evaluation-ref-"+t).replaceWith($(i).find(".risk-evaluation-ref-"+t)),$(".risk-evaluation-container.risk-evaluation-container-"+t+":not(.last-risk-assessment)").replaceWith($(i).find(".risk-evaluation-container.risk-evaluation-container-"+t+":not(.last-risk-assessment)")),$("#risk_evaluation_add"+n).html($(i).find("#risk_evaluation_add"+n).children())):($(".div-table-responsive").html($(i).find(".div-table-responsive").children()),(d?($(".risk-evaluation-ref-"+t+":not(.last-risk-assessment)").fadeOut(800),$(".risk-evaluation-ref-"+t+":not(.last-risk-assessment)")):($(".risk-evaluation-container-"+t+":not(.last-risk-assessment)").fadeOut(800),$(".risk-evaluation-container-"+t+":not(.last-risk-assessment)"))).fadeIn(800)),$(".wpeo-loader").removeClass("wpeo-loader");var i=$(".messageSuccessEvaluationEdit"),e=(s.find("#risk_evaluation_edit"+t).removeClass("modal-active"),""),e=(e=(e+=i.find(".valueForEditEvaluation1").val())+r)+i.find(".valueForEditEvaluation2").val();i.find("a").attr("href","#risk_row_"+n),i.find(".notice-subtitle .text").text(e),i.removeClass("hidden")},error:function(){var i=$(".messageErrorEvaluationEdit"),e="",e=(e=(e+=i.find(".valueForEditEvaluation1").val())+r)+i.find(".valueForEditEvaluation2").val();i.find(".notice-subtitle .text").text(e),i.removeClass("hidden")}})},window.digiriskdolibarr.risksign={},window.digiriskdolibarr.risksign.init=function(){window.digiriskdolibarr.risksign.event()},window.digiriskdolibarr.risksign.event=function(){$(document).on("click",".risksign-category-danger .item, .wpeo-table .risksign-category-danger .item",window.digiriskdolibarr.risksign.selectRiskSign),$(document).on("click",".risksign-create:not(.button-disable)",window.digiriskdolibarr.risksign.createRiskSign),$(document).on("click",".risksign-save",window.digiriskdolibarr.risksign.saveRiskSign),$(document).on("click",".risksign-unlink-shared",window.digiriskdolibarr.risksign.unlinkSharedRiskSign)},window.digiriskdolibarr.risksign.selectRiskSign=function(i){var e=$(this),e=(e.closest(".content").removeClass("active"),e.closest(".wpeo-dropdown").find(".dropdown-toggle span").hide(),e.closest(".wpeo-dropdown").find(".dropdown-toggle img").show(),e.closest(".wpeo-dropdown").find(".dropdown-toggle img").attr("src",e.find("img").attr("src")),e.closest(".wpeo-dropdown").find(".dropdown-toggle img").attr("aria-label",e.closest(".wpeo-tooltip-event").attr("aria-label")),e.closest(".fichecenter").find(".input-hidden-danger").val(e.data("id")),$(this).closest(".modal-container"));window.digiriskdolibarr.risksign.haveDataInInput(e)},window.digiriskdolibarr.risksign.haveDataInInput=function(i){i=i.parent().parent();i.hasClass("risksign-add-modal")&&0<=i.find('input[name="risksign_category_id"]').val()&&i.find(".button-disable").removeClass("button-disable")},window.digiriskdolibarr.risksign.createRiskSign=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".fichecenter").find(".risksign-content"),t=s.find(".risksign-category input").val(),s=s.find(".risksign-description textarea").val();window.saturne.loader.display($(".fichecenter.risksignlist")),$.ajax({url:document.URL+"&action=add&token="+e,type:"POST",data:JSON.stringify({riskSignCategory:t,riskSignDescription:s}),processData:!1,contentType:!1,success:function(i){$(".fichecenter.risksignlist").html($(i).find("#searchFormListRiskSigns"));var e=$(".messageSuccessRiskSignCreate");$(".fichecenter.risksignlist").removeClass("wpeo-loader"),e.html($(i).find(".risksign-create-success-notice")),e.removeClass("hidden")},error:function(i){var e=$(".messageErrorRiskCreate");e.html($(i).find(".risksign-create-error-notice")),e.removeClass("hidden")}})},window.digiriskdolibarr.risksign.saveRiskSign=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).attr("value");let t=$(this).closest(".risksign-container").find(".risksign-content"),a="";var n=t.find(".risksign-category input").val(),r=t.find(".risksign-description textarea").val();let o=$(".risksign_row_"+s).find(".risksign-container > div:nth-child(1)").text();window.saturne.loader.display(t),$.ajax({url:document.URL+"&action=saveRiskSign&token="+e,data:JSON.stringify({riskSignID:s,riskSignCategory:n,riskSignDescription:r}),type:"POST",processData:!1,contentType:!1,success:function(i){$(".fichecenter.risksignlist").html($(i).find("#searchFormListRiskSigns"));i=$(".messageSuccessRiskSignEdit");t.removeClass("wpeo-loader"),a=(a=(a+=i.find(".valueForEditRiskSign1").val())+o)+i.find(".valueForEditRiskSign2").val(),i.find(".notice-subtitle .text").text(a),i.removeClass("hidden")},error:function(){var i=$(".messageErrorRiskSignEdit");t.removeClass("wpeo-loader"),a=(a=(a+=i.find(".valueForEditRiskSign1").val())+o)+i.find(".valueForEditRiskSign2").val(),i.find(".notice-subtitle .text").text(a),i.removeClass("hidden")}})},window.digiriskdolibarr.risksign.unlinkSharedRiskSign=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).attr("value"),t=(window.saturne.loader.display($(this)),$(".risksign_row_"+s).find(".risksign-container > div:nth-child(1)").text());var a=document.URL.split(/#/);$.ajax({url:a[0]+"&action=unlinkSharedRiskSign&token="+e,type:"POST",processData:!1,data:JSON.stringify({risksignID:s}),contentType:!1,success:function(i){$(".fichecenter.sharedrisksignlist .opacitymedium.colorblack.paddingleft").html($(i).find("#searchFormSharedListRiskSigns .opacitymedium.colorblack.paddingleft"));var i=$(".messageSuccessRiskSignUnlinkShared"),e=($("#risksign_row_"+s).fadeOut(800),""),e=(e=(e+=i.find(".valueForUnlinkSharedRiskSign1").val())+t)+i.find(".valueForUnlinkSharedRiskSign2").val();i.find(".notice-subtitle .text").text(e),i.removeClass("hidden")},error:function(i){var e=$(".messageErrorRiskSignUnlinkShared"),s="",s=(s=(s+=e.find(".valueForUnlinkSharedRiskSign1").val())+t)+e.find(".valueForUnlinkSharedRiskSign2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask={},window.digiriskdolibarr.riskassessmenttask.init=function(){window.digiriskdolibarr.riskassessmenttask.event()},window.digiriskdolibarr.riskassessmenttask.event=function(){$(document).on("input",".riskassessment-task-label",window.digiriskdolibarr.riskassessmenttask.fillRiskAssessmentTaskLabel),$(document).on("click",".riskassessment-task-create",window.digiriskdolibarr.riskassessmenttask.createRiskAssessmentTask),$(document).on("click",".riskassessment-task-save",window.digiriskdolibarr.riskassessmenttask.saveRiskAssessmentTask),$(document).on("click",".riskassessment-task-delete",window.digiriskdolibarr.riskassessmenttask.deleteRiskAssessmentTask),$(document).on("click",".riskassessment-task-timespent-create",window.digiriskdolibarr.riskassessmenttask.createRiskAssessmentTaskTimeSpent),$(document).on("click",".riskassessment-task-timespent-save",window.digiriskdolibarr.riskassessmenttask.saveRiskAssessmentTaskTimeSpent),$(document).on("click",".riskassessment-task-timespent-delete",window.digiriskdolibarr.riskassessmenttask.deleteRiskAssessmentTaskTimeSpent),$(document).on("click",".riskassessment-task-progress-checkbox:not(.riskassessment-task-progress-checkbox-readonly)",window.digiriskdolibarr.riskassessmenttask.checkTaskProgress),$(document).on("change","#RiskassessmentTaskTimespentDatehour",window.digiriskdolibarr.riskassessmenttask.selectRiskassessmentTaskTimespentDateHour),$(document).on("change","#RiskassessmentTaskTimespentDatemin",window.digiriskdolibarr.riskassessmenttask.selectRiskassessmentTaskTimespentDateMin),$(document).on("keyup",".riskassessment-task-label",window.digiriskdolibarr.riskassessmenttask.checkRiskassessmentTaskLabelLength),$(document).on("click",".listingHeaderTaskTooltip",window.digiriskdolibarr.riskassessmenttask.redirectOnSharedTaskConfig)},window.digiriskdolibarr.riskassessmenttask.fillRiskAssessmentTaskLabel=function(i){var e=$(this).closest(".modal-container");window.digiriskdolibarr.riskassessmenttask.haveDataInInput(e)},window.digiriskdolibarr.riskassessmenttask.haveDataInInput=function(i){i=i.parent().parent();i.hasClass("riskassessment-task-add-modal")&&i.find('input[name="label"]').val().length&&i.find(".button-disable").removeClass("button-disable")},window.digiriskdolibarr.riskassessmenttask.createRiskAssessmentTask=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".riskassessment-task-add-modal"),t=s.find(".modal-risk").attr("value"),s=s.find(".riskassessment-task-container"),a=s.find(".riskassessment-task-label").val(),a=window.digiriskdolibarr.risk.sanitizeBeforeRequest(a),n=s.find("#RiskassessmentTaskDateStart"+t).val(),r=s.find("#RiskassessmentTaskDateStart"+t+"hour").val(),o=s.find("#RiskassessmentTaskDateStart"+t+"min").val(),d=s.find("#RiskassessmentTaskDateEnd"+t).val(),l=s.find("#RiskassessmentTaskDateEnd"+t+"hour").val(),c=s.find("#RiskassessmentTaskDateEnd"+t+"min").val(),s=s.find(".riskassessment-task-budget").val();window.saturne.loader.display($(this)),window.saturne.loader.display($(".riskassessment-tasks"+t)),$.ajax({url:document.URL+"&action=addRiskAssessmentTask&token="+e,type:"POST",data:JSON.stringify({tasktitle:a,dateStart:n,hourStart:r,minStart:o,dateEnd:d,hourEnd:l,minEnd:c,budget:s,riskToAssign:t}),processData:!1,contentType:!1,success:function(i){$(".tasks-list-container-"+t).replaceWith($(i).find(".tasks-list-container-"+t));var e=$(".messageSuccessTaskCreate");$(".riskassessment-tasks"+t).fadeOut(800),$(".riskassessment-tasks"+t).fadeIn(800),e.find("a").attr("href","#risk_row_"+t),e.html($(i).find(".task-create-success-notice")),e.removeClass("hidden")},error:function(i){$(".wpeo-loader").removeClass("wpeo-loader"),window.scrollTo(0,0);var i=JSON.parse(i.responseText),e=$(".messageErrorTaskCreate"),s=($("#risk_assessment_task_add"+t).removeClass("modal-active"),""),s=(s=(s+=e.find(".valueForCreateTask1").val())+e.find(".valueForCreateTask2").val())+" : "+i.message;e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask.deleteRiskAssessmentTask=function(i){var e=window.saturne.toolbox.getToken(),t=$(this).closest(".wpeo-table.riskassessment-tasks").attr("value"),a=$(this).closest(".riskassessment-task-single-content").attr("value"),s=$(this).closest(".riskassessment-task-container-"+a).find(".labelForDelete").val();let n=$(".messageSuccessTaskDelete"),r=$(".messageErrorTaskDelete");if(1!=confirm(s))return!1;{let s=$(".riskassessment-task-container-"+a).attr("value");window.saturne.loader.display($(".riskassessment-task-container-"+a)),$.ajax({url:document.URL+"&action=deleteRiskAssessmentTask&deletedRiskAssessmentTaskId="+a+"&token="+e,type:"POST",processData:!1,contentType:!1,success:function(i){console.log($(".riskassessment-task-listing-wrapper-"+t)),console.log(t),$(".riskassessment-task-listing-wrapper-"+t).replaceWith($(i).find(".riskassessment-task-listing-wrapper-"+t)),$(".riskassessment-tasks"+t).fadeOut(800),$(".riskassessment-tasks"+t).fadeIn(800);i="",i=(i=(i+=n.find(".valueForDeleteTask1").val())+s)+n.find(".valueForDeleteTask2").val();n.find("a").attr("href","#risk_row_"+t),n.find(".notice-subtitle .text").text(i),n.removeClass("hidden")},error:function(i){$(".wpeo-loader").removeClass("wpeo-loader"),window.scrollTo(0,0);var i=JSON.parse(i.responseText),e="",e=(e=(e=(e+=r.find(".valueForDeleteTask1").val())+s)+r.find(".valueForDeleteTask2").val())+" : "+i.message;r.find(".notice-subtitle .text").text(e),r.removeClass("hidden")}})}},window.digiriskdolibarr.riskassessmenttask.saveRiskAssessmentTask=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).attr("value");var t=$(this).closest(".modal-container"),a=$(this).closest(".modal-risk").attr("value");let n="";var r=t.find(".riskassessment-task-label"+s).val(),r=window.digiriskdolibarr.risk.sanitizeBeforeRequest(r);let o=$(".riskassessment-task-single-"+s+" .riskassessment-task-reference").attr("value"),d=0;t.find(".riskassessment-task-progress-checkbox"+s).is(":checked")&&(d=1);var l=t.find("#RiskassessmentTaskDateStartEdit"+s).val(),c=t.find("#RiskassessmentTaskDateStartEdit"+s+"hour").val(),k=t.find("#RiskassessmentTaskDateStartEdit"+s+"min").val(),u=t.find("#RiskassessmentTaskDateEndEdit"+s).val(),m=t.find("#RiskassessmentTaskDateEndEdit"+s+"hour").val(),v=t.find("#RiskassessmentTaskDateEndEdit"+s+"min").val(),t=t.find(".riskassessment-task-budget"+s).val();window.saturne.loader.display($(this)),window.saturne.loader.display($(".riskassessment-task-single-"+s)),$.ajax({url:document.URL+"&action=saveRiskAssessmentTask&token="+e,data:JSON.stringify({riskAssessmentTaskID:s,tasktitle:r,dateStart:l,hourStart:c,minStart:k,dateEnd:u,hourEnd:m,minEnd:v,budget:t,taskProgress:d}),type:"POST",processData:!1,contentType:!1,success:function(i){$("#risk_assessment_task_edit"+s).removeClass("modal-active"),$(".riskassessment-task-container-"+s).replaceWith($(i).find(".riskassessment-task-container-"+s).first());i=$(".messageSuccessTaskEdit");$(".riskassessment-tasks"+a).fadeOut(800),$(".riskassessment-tasks"+a).fadeIn(800),n=(n=(n+=i.find(".valueForEditTask1").val())+o)+i.find(".valueForEditTask2").val(),$(".wpeo-loader").removeClass("wpeo-loader"),$(".loader-spin").remove(),i.find("a").attr("href","#risk_row_"+a),i.find(".notice-subtitle .text").text(n),i.removeClass("hidden")},error:function(i){$(".wpeo-loader").removeClass("wpeo-loader"),window.scrollTo(0,0);var i=JSON.parse(i.responseText),e=$(".messageErrorTaskEdit");$("#risk_assessment_task_edit"+s).removeClass("modal-active"),$(".wpeo-loader").removeClass("wpeo-loader"),n=(n=(n=(n+=e.find(".valueForEditTask1").val())+o)+e.find(".valueForEditTask2").val()+" : ")+i.message,e.find(".notice-subtitle .text").text(n),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask.createRiskAssessmentTaskTimeSpent=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).attr("value");var t=$(this).closest(".riskassessment-task-edit-modal"),a=t.find(".riskassessment-task-timespent-container");let n=t.find("riskassessment-task-single").attr("value"),r="",o=t.find(".riskassessment-task-reference").attr("value"),d=$(".id-container").find(".riskassessment-total-task-timespent-"+s);var t=a.find("#RiskassessmentTaskTimespentDate"+s).val(),l=a.find("#RiskassessmentTaskTimespentDate"+s+"hour").val(),c=a.find("#RiskassessmentTaskTimespentDate"+s+"min").val(),k=a.find(".riskassessment-task-timespent-comment").val(),k=window.digiriskdolibarr.risk.sanitizeBeforeRequest(k),a=a.find(".riskassessment-task-timespent-duration").val();window.saturne.loader.display($(this)),window.saturne.loader.display($(".riskassessment-task-single-"+s)),$.ajax({url:document.URL+"&action=addRiskAssessmentTaskTimeSpent&token="+e,type:"POST",data:JSON.stringify({taskID:s,date:t,hour:l,min:c,comment:k,duration:a}),processData:!1,contentType:!1,success:function(i){var e=$(".messageSuccessTaskTimeSpentCreate"+s);$(".riskassessment-tasks"+n).fadeOut(800),$(".riskassessment-tasks"+n).fadeIn(800),r=(r=(r+=e.find(".valueForCreateTaskTimeSpent1").val())+o)+e.find(".valueForCreateTaskTimeSpent2").val(),$(".riskassessment-task-timespent-container").find(".riskassessment-task-timespent-list-"+s).replaceWith($(i).find(".riskassessment-task-timespent-container").find(".riskassessment-task-timespent-list-"+s)),$(".riskassessment-task-container-"+s).closest(".riskassessment-tasks").replaceWith($(i).find(".riskassessment-task-container-"+s).closest(".riskassessment-tasks")),$(".loader-spin").remove(),$(".wpeo-loader").removeClass("wpeo-loader"),e.find(".notice-subtitle .text").text(r),e.removeClass("hidden"),d.html($(i).find(".modal-content").find(".riskassessment-total-task-timespent-"+s).first())},error:function(i){$(this).closest(".risk-row-content-"+n).removeClass("wpeo-loader");var e=$(".messageErrorTaskTimeSpentCreate"+s);e.html($(i).find(".task-timespent-create-error-notice")),e.removeClass("hidden")},complete:function(){$("#risk_assessment_task_edit"+s+".wpeo-modal").addClass("modal-active")}})},window.digiriskdolibarr.riskassessmenttask.deleteRiskAssessmentTaskTimeSpent=function(i){var e=window.saturne.toolbox.getToken();let a=$(this).closest(".riskassessment-task-timespent-list").attr("value"),n=$(this).attr("value");var s=$(this).attr("value"),t=$(this).closest(".riskassessment-task-timespent-"+n).find(".labelForDelete").val();let r=$(".id-container").first().find(".riskassessment-total-task-timespent-"+a);if(1!=confirm(t))return!1;{let t=$(".riskassessment-task-container-"+a).attr("value");window.saturne.loader.display($(this)),$.ajax({url:document.URL+"&action=deleteRiskAssessmentTaskTimeSpent&deletedRiskAssessmentTaskTimeSpentId="+s+"&token="+e,type:"POST",processData:!1,contentType:!1,success:function(i){var e=$(".messageSuccessTaskTimeSpentDelete"+a),s=($(".riskassessment-task-timespent-"+n).fadeOut(800),""),s=(s=(s+=e.find(".valueForDeleteTaskTimeSpent1").val())+t)+e.find(".valueForDeleteTaskTimeSpent2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden"),r.html($(i).find(".modal-content").find(".riskassessment-total-task-timespent-"+a).first())},error:function(i){var e=$(".messageErrorTaskDeleteTimeSpent"+a),s="",s=(s=(s+=e.find(".valueForDeleteTaskTimeSpent1").val())+t)+e.find(".valueForDeleteTaskTimeSpent2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})}},window.digiriskdolibarr.riskassessmenttask.saveRiskAssessmentTaskTimeSpent=function(i){var e=window.saturne.toolbox.getToken();let s=$(this);var t=$(this).attr("value"),a=$(this).closest(".riskassessment-task-timespent-edit-modal").find(".riskassessment-task-timespent-container");let n=a.attr("value"),r="",o=$(".riskassessment-task-container-"+n).attr("value"),d=$(".id-container").first().find(".riskassessment-total-task-timespent-"+n);var l=a.find("#RiskassessmentTaskTimespentDateEdit"+t).val(),c=a.find("#RiskassessmentTaskTimespentDateEdit"+t+"hour").val(),k=a.find("#RiskassessmentTaskTimespentDateEdit"+t+"min").val(),u=a.find(".riskassessment-task-timespent-comment").val(),u=window.digiriskdolibarr.risk.sanitizeBeforeRequest(u),a=a.find(".riskassessment-task-timespent-duration").val();window.saturne.loader.display($(this)),window.saturne.loader.display($(".riskassessment-task-single-"+n)),$.ajax({url:document.URL+"&action=saveRiskAssessmentTaskTimeSpent&token="+e,data:JSON.stringify({riskAssessmentTaskTimeSpentID:t,taskID:n,date:l,hour:c,min:k,comment:u,duration:a}),type:"POST",processData:!1,contentType:!1,success:function(i){s.closest(".modal-active").removeClass("modal-active");var e=$(".messageSuccessTaskTimeSpentEdit"+n);$(".wpeo-loader").removeClass("wpeo-loader"),r=(r=(r+=e.find(".valueForEditTaskTimeSpent1").val())+o)+e.find(".valueForEditTaskTimeSpent2").val(),d.html($(i).find(".modal-content").find(".riskassessment-total-task-timespent-"+n).first()),$(".riskassessment-task-timespent-list-"+n).html($(i).find(".riskassessment-task-timespent-list-"+n).children()),e.find(".notice-subtitle .text").text(r),e.removeClass("hidden")},error:function(i){var e=$(".messageSuccessTaskTimeSpentEdit"+n);r=(r=(r+=e.find(".valueForEditTaskTimeSpent1").val())+o)+e.find(".valueForEditTaskTimeSpent2").val(),e.find(".notice-subtitle .text").text(r),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask.checkTaskProgress=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".risk-row").find(".riskassessment-task-container"),t=$(this).closest(".riskassessment-task-single-content").attr("value");let a=$(this).closest(".riskassessment-tasks").attr("value"),n="",r=s.attr("value"),o="";s.find(".riskassessment-task-progress-checkbox"+t).hasClass("progress-checkbox-check")?(o=0,s.find(".riskassessment-task-progress-checkbox"+t).toggleClass("progress-checkbox-check").toggleClass("progress-checkbox-uncheck")):s.find(".riskassessment-task-progress-checkbox"+t).hasClass("progress-checkbox-uncheck")&&(o=1,s.find(".riskassessment-task-progress-checkbox"+t).toggleClass("progress-checkbox-uncheck").toggleClass("progress-checkbox-check")),window.saturne.loader.display($(".riskassessment-task-single-"+t));s=window.location.href.replace(/#.*/,"");$.ajax({url:s+"&action=checkTaskProgress&token="+e,data:JSON.stringify({riskAssessmentTaskID:t,taskProgress:o}),type:"POST",processData:!1,contentType:!1,success:function(i){$(".fichecenter.risklist").html($(i).find("#searchFormListRisks"));i=$(".messageSuccessTaskEdit");$(".riskassessment-tasks"+a).fadeOut(800),$(".riskassessment-tasks"+a).fadeIn(800),n=(n=(n+=i.find(".valueForEditTask1").val())+r)+i.find(".valueForEditTask2").val(),i.find(".notice-subtitle .text").text(n),i.removeClass("hidden")},error:function(i){var e=$(".messageErrorTaskEdit");n=(n=(n+=e.find(".valueForEditTask1").val())+r)+e.find(".valueForEditTask2").val(),e.find(".notice-subtitle .text").text(n),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask.selectRiskassessmentTaskTimespentDateHour=function(i){$(this).closest(".nowraponall").find(".select-riskassessmenttask-timespent-datehour").remove(),$(this).before('<input class="select-riskassessmenttask-timespent-datehour" type="hidden" id="RiskassessmentTaskTimespentDatehour" name="RiskassessmentTaskTimespentDatehour" value='+$(this).val()+">")},window.digiriskdolibarr.riskassessmenttask.selectRiskassessmentTaskTimespentDateMin=function(i){$(this).closest(".nowraponall").find(".select-riskassessmenttask-timespent-datemin").remove(),$(this).before('<input class="select-riskassessmenttask-timespent-datemin" type="hidden" id="RiskassessmentTaskTimespentDatemin" name="RiskassessmentTaskTimespentDatemin" value='+$(this).val()+">")},window.digiriskdolibarr.riskassessmenttask.checkRiskassessmentTaskLabelLength=function(i){255<$(this).val().length?($(".messageWarningTaskLabel").removeClass("hidden"),$(".riskassessment-task-create").removeClass("button-blue"),$(".riskassessment-task-create").addClass("button-grey"),$(".riskassessment-task-create").addClass("button-disable")):($(".messageWarningTaskLabel").addClass("hidden"),$(".riskassessment-task-create").addClass("button-blue"),$(".riskassessment-task-create").removeClass("button-grey"),$(".riskassessment-task-create").removeClass("button-disable"))},window.digiriskdolibarr.riskassessmenttask.redirectOnSharedTaskConfig=function(i){var e=$(".riskassessment-tasks").find('input[name="sharedTaskTooltipUrl"]').val();window.open(location.origin+e,"_blank")},window.digiriskdolibarr.ticket={},window.digiriskdolibarr.ticket.init=function(){window.digiriskdolibarr.ticket.event()},window.digiriskdolibarr.ticket.event=function(){$(document).on("click",".ticket-parentCategory",window.digiriskdolibarr.ticket.selectParentCategory),$(document).on("click",".ticket-subCategory",window.digiriskdolibarr.ticket.selectSubCategory),$(document).on("submit","#sendFile",window.digiriskdolibarr.ticket.tmpStockFile),$(document).on("click",".linked-file-delete",window.digiriskdolibarr.ticket.removeFile),$(document).on("change",".add-dashboard-info",window.digiriskdolibarr.ticket.addDashBoardTicketInfo),$(document).on("click",".close-dashboard-info",window.digiriskdolibarr.ticket.closeDashBoardTicketInfo),$(document).on("keyup",".email",window.digiriskdolibarr.ticket.checkValidEmail),$(document).on("keyup",".options_digiriskdolibarr_ticket_phone",window.digiriskdolibarr.ticket.checkValidPhone)},window.digiriskdolibarr.ticket.updateFormData=function(){var i=window.digiriskdolibarr.ticket.getParentCategory(),e=window.digiriskdolibarr.ticket.getSubCategory();$(".ticket-parentCategory.active").removeClass("active"),$(".ticket-parentCategory"+i).addClass("active"),$(".subCategories").attr("style","display:none"),$(".children"+i).attr("style",""),$(".ticket-subCategory.active").removeClass("active"),$(".ticket-subCategory"+e).addClass("active")},window.digiriskdolibarr.ticket.selectParentCategory=function(){var i=$(".ticketpublicarea").find("#subCategory"),e=$(".ticketpublicarea").find("#parentCategory");i.val(0),e.val($(this).attr("id")),window.digiriskdolibarr.ticket.updateFormData()},window.digiriskdolibarr.ticket.getParentCategory=function(){return $(".ticketpublicarea").find("#parentCategory").val()},window.digiriskdolibarr.ticket.selectSubCategory=function(){$(".ticketpublicarea").find("#subCategory").val($(this).attr("id")),window.digiriskdolibarr.ticket.updateFormData()},window.digiriskdolibarr.ticket.getSubCategory=function(){return $(".ticketpublicarea").find("#subCategory").val()},window.digiriskdolibarr.ticket.tmpStockFile=function(){event.preventDefault();var e=$("#sendfile").prop("files"),s=new FormData;for(let i=0;i<e.length;i++){var t=e[i];s.append("files[]",t)}var a=$("#ticket_id").val();let n=window.saturne.toolbox.getQuerySeparator(document.URL);window.saturne.loader.display($(".files-uploaded")),fetch(document.URL+n+"action=sendfile&ticket_id="+a,{method:"POST",body:s}).then(i=>{$("#sendFileForm").load(document.URL+n+"ticket_id="+a+" #fileLinkedTable")})},window.digiriskdolibarr.ticket.removeFile=function(i){let e=$(this).attr("value");e=e.replace("_mini","");var s=$("#ticket_id").val(),t=window.saturne.toolbox.getQuerySeparator(document.URL);fetch(document.URL+t+"action=removefile&filetodelete="+e+"&ticket_id="+s,{method:"POST"}).then(i=>{$(this).parent().parent().hide()})},window.digiriskdolibarr.ticket.addDashBoardTicketInfo=function(){var i=window.saturne.toolbox.getToken(),e=$("#select2-boxcombo-container").attr("title"),s=e.split(" : ")[0],e=e.split(" : ")[2],t=window.saturne.toolbox.getQuerySeparator(document.URL);$.ajax({url:document.URL+t+"action=adddashboardinfo&token="+i,type:"POST",processData:!1,data:JSON.stringify({digiriskelementID:s,catID:e}),contentType:!1,success:function(i){window.location.reload()},error:function(){}})},window.digiriskdolibarr.ticket.closeDashBoardTicketInfo=function(){var i=window.saturne.toolbox.getToken();let e=$(this);var s=e.attr("data-digiriskelementid"),t=e.attr("data-catid"),a=window.saturne.toolbox.getQuerySeparator(document.URL);$.ajax({url:document.URL+a+"action=closedashboardinfo&token="+i,type:"POST",processData:!1,data:JSON.stringify({digiriskelementID:s,catID:t}),contentType:!1,success:function(i){e.closest(".box-flex-item").fadeOut(400),$(".add-widget-box").attr("style",""),$(".add-widget-box").html($(i).find(".add-widget-box").children())},error:function(){}})},window.digiriskdolibarr.ticket.checkValidEmail=function(){0==/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(this.value)?$(this).css("border","3px solid red"):$(this).css("border","3px solid green")},window.digiriskdolibarr.ticket.checkValidPhone=function(){0==/^(?:(?:(?:\+|00)\d{2}[\s]?(?:\(0\)[\s]?)?)|0){1}[1-9]{1}([\s.-]?)(?:\d{2}\1?){3}\d{2}$/.test(this.value)?$(this).css("border","3px solid red"):$(this).css("border","3px solid green")},window.digiriskdolibarr.digiriskusers={},window.digiriskdolibarr.digiriskusers.init=function(){window.digiriskdolibarr.digiriskusers.event()},window.digiriskdolibarr.digiriskusers.event=function(){$(document).on("input",".digirisk-users #firstname",window.digiriskdolibarr.digiriskusers.fillEmail),$(document).on("input",".digirisk-users #lastname",window.digiriskdolibarr.digiriskusers.fillEmail)},window.digiriskdolibarr.digiriskusers.fillEmail=function(i){var e=$(".digirisk-users #firstname").val(),s=$(".digirisk-users #lastname").val(),t=$(".input-domain-mail").val(),e=window.digiriskdolibarr.digiriskusers.removeDiacritics(e+"."+s+"@"+t).toLowerCase();$(".digirisk-users #email").val(e)},window.digiriskdolibarr.digiriskusers.removeDiacritics=function(i){for(var e="",s=i.normalize("NFD"),t=0,a=0;t<i.length;)e+=s[a],a+=i[t]==s[a]?1:2,t++;return e};
\ No newline at end of file
+"use strict";window.digiriskdolibarr||(window.digiriskdolibarr={},window.digiriskdolibarr.scriptsLoaded=!1),window.digiriskdolibarr.scriptsLoaded||(window.digiriskdolibarr.init=function(){window.digiriskdolibarr.load_list_script()},window.digiriskdolibarr.load_list_script=function(){if(!window.digiriskdolibarr.scriptsLoaded){var i=void 0,e=void 0;for(i in window.digiriskdolibarr)for(e in window.digiriskdolibarr[i].init&&window.digiriskdolibarr[i].init(),window.digiriskdolibarr[i])window.digiriskdolibarr[i]&&window.digiriskdolibarr[i][e]&&window.digiriskdolibarr[i][e].init&&window.digiriskdolibarr[i][e].init();window.digiriskdolibarr.scriptsLoaded=!0}},window.digiriskdolibarr.refresh=function(){var i=void 0,e=void 0;for(i in window.digiriskdolibarr)for(e in window.digiriskdolibarr[i].refresh&&window.digiriskdolibarr[i].refresh(),window.digiriskdolibarr[i])window.digiriskdolibarr[i]&&window.digiriskdolibarr[i][e]&&window.digiriskdolibarr[i][e].refresh&&window.digiriskdolibarr[i][e].refresh()},$(document).ready(window.digiriskdolibarr.init)),window.digiriskdolibarr.accident={},window.digiriskdolibarr.accident.init=function(){window.digiriskdolibarr.accident.event()},window.digiriskdolibarr.accident.event=function(){$(document).on("submit",".sendfile",window.digiriskdolibarr.accident.tmpStockFile),$(document).on("click",".linked-file-delete-workstop",window.digiriskdolibarr.accident.removeFile),$(document).on("change","#external_accident",window.digiriskdolibarr.accident.showExternalAccidentLocation)},window.digiriskdolibarr.accident.tmpStockFile=function(e,i=""){var s=$("#sendfile").prop("files"),t=new FormData;for(let i=0;i<s.length;i++){var a=s[i];t.append("files[]",a)}var n=window.saturne.toolbox.getToken(),i=0<i.length?"&subaction="+i:"";$.ajax({url:document.URL+"&action=sendfile&objectlineid="+e+"&token="+n+i,type:"POST",processData:!1,contentType:!1,data:t,success:function(i){$("#sendFileForm"+e).html($(i).find("#fileLinkedTable"+e))},error:function(){}})},window.digiriskdolibarr.accident.removeFile=function(i){let e=$(this).attr("value");var s=$(this).hasClass("edit-line")?"&subaction=editline":"";e=e.replace("_mini","");let t=$(this).closest(".objectline").attr("value");var a=window.saturne.toolbox.getToken();$.ajax({url:document.URL+"&action=removefile&filetodelete="+e+"&objectlineid="+t+"&token="+a+s,type:"POST",processData:!1,contentType:!1,success:function(i){$("#sendFileForm"+t).html($(i).find("#fileLinkedTable"+t))},error:function(){}})},window.digiriskdolibarr.accident.showExternalAccidentLocation=function(){var i=$(this).closest(".accident-table").find(".fk_element_field"),e=$(this).closest(".accident-table").find(".fk_soc_field"),s=$(this).closest(".accident-table").find(".accident_location_field");switch($(this).closest(".accident-table").find("#select2-external_accident-container").attr("title")){case"Non":i.attr("style",""),e.attr("style","display:none"),s.attr("style","display:none"),i.removeClass("hidden"),e.addClass("hidden"),s.addClass("hidden");break;case"Oui":i.attr("style","display:none"),e.attr("style",""),s.attr("style","display:none"),i.addClass("hidden"),e.removeClass("hidden"),s.addClass("hidden");break;case"Autre":i.attr("style","display:none"),e.attr("style","display:none"),s.attr("style",""),i.addClass("hidden"),e.addClass("hidden"),s.removeClass("hidden")}},window.digiriskdolibarr.button={},window.digiriskdolibarr.button.init=function(){window.digiriskdolibarr.button.event()},window.digiriskdolibarr.button.event=function(){$(document).on("click",".wpeo-button:submit",window.digiriskdolibarr.button.addLoader),$(document).on("click",".auto-download",window.digiriskdolibarr.button.addLoader)},window.digiriskdolibarr.button.addLoader=function(){window.saturne.loader.display($(this)),$(this).toggleClass("button-blue button-disable")},window.digiriskdolibarr.dashboard={},window.digiriskdolibarr.dashboard.init=function(){window.digiriskdolibarr.dashboard.event()},window.digiriskdolibarr.dashboard.event=function(){$(document).on("change",".add-dashboard-widget",window.digiriskdolibarr.dashboard.addDashBoardInfo),$(document).on("click",".close-dashboard-widget",window.digiriskdolibarr.dashboard.closeDashBoardInfo)},window.digiriskdolibarr.dashboard.addDashBoardInfo=function(){var i=document.getElementById("dashBoardForm"),i=new FormData(i).get("boxcombo"),e=window.saturne.toolbox.getQuerySeparator(document.URL),s=window.saturne.toolbox.getToken();$.ajax({url:document.URL+e+"action=adddashboardinfo&token="+s,type:"POST",processData:!1,data:JSON.stringify({dashboardWidgetName:i}),contentType:!1,success:function(i){window.location.reload()},error:function(){}})},window.digiriskdolibarr.dashboard.closeDashBoardInfo=function(){let e=$(this);var i=e.attr("data-widgetname"),s=window.saturne.toolbox.getQuerySeparator(document.URL),t=window.saturne.toolbox.getToken();$.ajax({url:document.URL+s+"action=closedashboardinfo&token="+t,type:"POST",processData:!1,data:JSON.stringify({dashboardWidgetName:i}),contentType:!1,success:function(i){e.closest(".box-flex-item").fadeOut(400),$(".add-widget-box").attr("style",""),$(".add-widget-box").html($(i).find(".add-widget-box").children())},error:function(){}})},window.digiriskdolibarr.digiriskelement={},window.digiriskdolibarr.digiriskelement.init=function(){window.digiriskdolibarr.digiriskelement.event()},window.digiriskdolibarr.digiriskelement.event=function(){$(document).on("click","#select_all_shared_elements_by_digiriskelement",window.digiriskdolibarr.digiriskelement.selectAllSharedElementByDigiriskElement),$(document).on("click","#select_all_shared_elements",window.digiriskdolibarr.digiriskelement.selectAllSharedElements)},window.digiriskdolibarr.digiriskelement.selectAllSharedElementByDigiriskElement=function(i){var e=$(this).attr("name");this.checked?$(this).closest(".ui-widget").find(".importsharedelement-digiriskelement-"+e).not(":disabled").each(function(){this.checked=!0}):$(this).closest(".ui-widget").find(".importsharedelement-digiriskelement-"+e).not(":disabled").each(function(){this.checked=!1})},window.digiriskdolibarr.digiriskelement.selectAllSharedElements=function(i){this.checked?$(this).closest(".ui-widget").find(":checkbox").not(":disabled").not("#select_all_shared_elements_by_digiriskelement").each(function(){this.checked=!0}):$(this).closest(".ui-widget").find(":checkbox").not(":disabled").not("#select_all_shared_elements_by_digiriskelement").each(function(){this.checked=!1})},window.digiriskdolibarr.document={},window.digiriskdolibarr.document.canvas,window.digiriskdolibarr.document.buttonSignature,window.digiriskdolibarr.document.init=function(){window.digiriskdolibarr.document.event()},window.digiriskdolibarr.document.event=function(){$(document).on("click","#builddoc_generatebutton",window.digiriskdolibarr.document.displayLoader),$(document).on("click",".pdf-generation",window.digiriskdolibarr.document.displayLoader),$(document).on("click",".send-risk-assessment-document-by-mail",window.digiriskdolibarr.document.displayLoader)},window.digiriskdolibarr.document.displayLoader=function(){window.saturne.loader.display($(this).closest(".div-table-responsive-no-min"))},window.digiriskdolibarr.evaluationMethodEvarisk={},window.digiriskdolibarr.evaluationMethodEvarisk.init=function(){window.digiriskdolibarr.evaluationMethodEvarisk.event()},window.digiriskdolibarr.evaluationMethodEvarisk.event=function(){$(document).on("click",".wpeo-table.evaluation-method .table-cell.can-select",window.digiriskdolibarr.evaluationMethodEvarisk.selectSeuil)},window.digiriskdolibarr.evaluationMethodEvarisk.selectSeuil=function(i){$(this).closest(".table-row").find(".active").removeClass("active"),$(this).addClass("active");var s=$(this),t=s.closest(".modal-container"),s=s.data("evaluation-id");let a=[];if(Object.values(t.find(".table-cell.active.cell-"+s)).forEach(function(i){-1<$(i).data("seuil")&&a.push($(i).data("seuil"))}),5===a.length){let e=a[0]*a[1]*a[2]*a[3]*a[4];s=window.location.pathname.split(/view/)[0];fetch(s+"/js/json/default.json").then(i=>i.json()).then(i=>{i=i[0].option.matrix[e];t.find(".risk-evaluation-calculated-cotation").find(".risk-evaluation-cotation").attr("data-scale",window.digiriskdolibarr.evaluation.getDynamicScale(i)),t.find(".risk-evaluation-calculated-cotation").find(".risk-evaluation-cotation span").text(i),t.find(".risk-evaluation-content").find(".risk-evaluation-seuil").val(i),window.digiriskdolibarr.risk.haveDataInInput(t)})}},window.digiriskdolibarr.evaluator={},window.digiriskdolibarr.evaluator.init=function(){window.digiriskdolibarr.evaluator.event()},window.digiriskdolibarr.evaluator.event=function(){$(document).on("click",".evaluator-create",window.digiriskdolibarr.evaluator.createEvaluator),$(document).on("change","#fk_user_employer",window.digiriskdolibarr.evaluator.selectUser)},window.digiriskdolibarr.evaluator.selectUser=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".modal-container"),t=s.find("#fk_user_employer").val();window.saturne.loader.display(s.find('input[name="evaluatorJob"]')),$.ajax({url:document.URL+"&action=getEvaluatorJob&token="+e,type:"POST",processData:!1,data:JSON.stringify({userID:t}),contentType:!1,success:function(i){s.find('input[name="evaluatorJob"]').val($(i).find('input[name="evaluatorJob"]').val()),s.find('input[name="evaluatorJob"]').removeClass("wpeo-loader")},error:function(i){}}),window.digiriskdolibarr.evaluator.haveDataInInput(s)},window.digiriskdolibarr.evaluator.haveDataInInput=function(i){i=i.parent().parent();i.hasClass("evaluator-add-modal")&&(0<i.find("#fk_user_employer").val()?i.find(".button-disable").removeClass("button-disable"):i.find(".evaluator-create").addClass("button-disable"))},window.digiriskdolibarr.evaluator.createEvaluator=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".fichecenter").find(".evaluator-content"),t=$("#select2-fk_user_employer-container").attr("title"),t=$("#fk_user_employer").find("option:contains('"+t+"')").attr("value"),a=s.find("#EvaluatorDate").val(),n=s.find(".evaluator-duration .duration").val(),s=s.find(".evaluatorJob").val(),r=$(this).closest(".fichecenter").find(".div-table-responsive");window.saturne.loader.display(r),$.ajax({url:document.URL+"&action=add&token="+e,type:"POST",data:JSON.stringify({evaluatorID:t,date:a,duration:n,job:s}),processData:!1,contentType:!1,success:function(i){$(".fichecenter").html($(i).find("#searchFormEvaluator"));var e=$(".messageSuccessEvaluatorCreate");e.find($(i).find(".evaluator-create-success-notice")),e.removeClass("hidden")},error:function(i){var e=$(".messageErrorEvaluatorCreate");e.find($(i).find(".evaluator-create-error-notice")),e.removeClass("hidden")}})},window.digiriskdolibarr.form={},window.digiriskdolibarr.form.init=function(){window.digiriskdolibarr.form.event()},window.digiriskdolibarr.form.event=function(){$(document).on("submit","#searchFormListRisks, #searchFormInheritedListRisks, #searchFormSharedListRisks, #searchFormListRiskSigns, #searchFormEvaluator",window.digiriskdolibarr.form.searchForm)},window.digiriskdolibarr.form.searchForm=function(i){i.preventDefault();let e=0,s=(void 0!==i.originalEvent&&$(i.originalEvent.submitter).hasClass("button_removefilter")&&(e=1),$(this).closest("form").attr("id"));var i=document.getElementById(s),i=new FormData(i),t=new FormData,a=["token","formfilteraction","action","id","sortfield","sortorder","page","contextpage","limit","toselect[]","massaction","confirm","cancel","pageplusone","backtopage","button_removefilter_x","button_removefilter","button_removefilter.x"];if(e)t.append("button_removefilter_x","x"),t.append("token",i.entries().token);else for(const n of i.entries())(a.includes(n[0])||n[0].match(/search_/))&&t.append(n[0],n[1]);window.saturne.loader.display($("#"+s)),$.ajax({url:document.URL,type:"POST",data:t,processData:!1,contentType:!1,success:function(i){window.saturne.loader.remove($("#"+s)),$("#"+s).replaceWith($(i).find("#"+s))}})},window.digiriskdolibarr.navigation={},window.digiriskdolibarr.navigation.init=function(){window.digiriskdolibarr.navigation.event()},window.digiriskdolibarr.navigation.event=function(){$(document).on("click",".toggle-unit",window.digiriskdolibarr.navigation.switchToggle),$(document).on("click",".digirisk-wrap .navigation-container .toolbar div",window.digiriskdolibarr.navigation.toggleAll),$(document).on("click","#slider",window.digiriskdolibarr.navigation.setUnitActive),$(document).on("click",".side-nav-responsive",window.digiriskdolibarr.navigation.toggleMobileNav),$(document).on("click",".save-organization",window.digiriskdolibarr.navigation.saveOrganization)},window.digiriskdolibarr.navigation.switchToggle=function(i){var e,s=null==(s=localStorage.menu)||""==s?new Set:(s=JSON.parse(s),new Set(s));$(this).find(".toggle-icon").hasClass("fa-chevron-down")?($(this).find(".toggle-icon").removeClass("fa-chevron-down").addClass("fa-chevron-right"),e=$(this).closest(".unit").attr("id").split("unit")[1],$(this).closest(".unit").removeClass("toggled"),s.delete(e),localStorage.setItem("menu",JSON.stringify(Array.from(s.keys())))):$(this).find(".toggle-icon").hasClass("fa-chevron-right")&&($(this).find(".toggle-icon").removeClass("fa-chevron-right").addClass("fa-chevron-down"),$(this).closest(".unit").addClass("toggled"),e=$(this).closest(".unit").attr("id").split("unit")[1],s.add(e),localStorage.setItem("menu",JSON.stringify(Array.from(s.keys()))))},window.digiriskdolibarr.navigation.toggleAll=function(i){if(i.preventDefault(),$(this).hasClass("toggle-plus")){$(".digirisk-wrap .navigation-container .workunit-list .unit .toggle-icon").removeClass("fa-chevron-right").addClass("fa-chevron-down"),$(".digirisk-wrap .navigation-container .workunit-list .unit").addClass("toggled");let e=[];$(".digirisk-wrap .navigation-container .workunit-list .unit .title").get().map(function(i){e.push($(i).attr("value"))}),localStorage.setItem("menu",JSON.stringify(Array.from(e.values())))}$(this).hasClass("toggle-minus")&&($(".digirisk-wrap .navigation-container .workunit-list .unit.toggled").removeClass("toggled"),$(".digirisk-wrap .navigation-container .workunit-list .unit .toggle-icon").addClass("fa-chevron-right").removeClass("fa-chevron-down"),i=new Set("0"),localStorage.setItem("menu",JSON.stringify(Object.values(i))))},window.digiriskdolibarr.navigation.setUnitActive=function(i){$(".digirisk-wrap .navigation-container .unit.active").removeClass("active");var e=$(this).attr("value");$(this).closest(".unit").addClass("active"),$(this).closest(".unit").attr("value",e)},window.digiriskdolibarr.navigation.toggleMobileNav=function(i){$(this).closest(".side-nav").find("#id-left").toggleClass("active")},window.digiriskdolibarr.navigation.saveOrganization=function(i){var e=window.saturne.toolbox.getToken();let s=[],t=[],a,n,r=$(".messageSuccessOrganizationSaved"),o=$(".messageErrorOrganizationSaved");$(".route").each(function(){a=$(this).attr("id"),n=$(this).parent("ul").attr("id").split(/space/)[1],s.push(a),t.push(n)}),window.saturne.loader.display($(this)),$.ajax({url:document.URL+"&action=saveOrganization&ids="+s.toString()+"&parent_ids="+t+"&token="+e,success:function(){r.removeClass("hidden"),$(".wpeo-loader").addClass("button-disable"),$(".wpeo-loader").attr("style","background: #47e58e !important;border-color: #47e58e !important;"),$(".wpeo-loader").find(".fas.fa-check").attr("style",""),$("a").attr("onclick","").unbind("click"),$(".wpeo-loader").removeClass("wpeo-loader")},error:function(){o.removeClass("hidden"),$(".wpeo-loader").addClass("button-disable"),$(".wpeo-loader").attr("style","background: #e05353 !important;border-color: #e05353 !important;"),$(".wpeo-loader").find(".fas.fa-times").attr("style",""),$(".wpeo-loader").removeClass("wpeo-loader")}})},window.digiriskdolibarr.preventionplan={},window.digiriskdolibarr.preventionplan.init=function(){window.digiriskdolibarr.preventionplan.event()},window.digiriskdolibarr.preventionplan.event=function(){$(document).on("click","#prior_visit_bool",window.digiriskdolibarr.preventionplan.showDateAndText)},window.digiriskdolibarr.preventionplan.showDateAndText=function(){var i=$(this).closest(".preventionplan-table").find(".prior_visit_date_field"),e=$(this).closest(".preventionplan-table").find(".prior_visit_text_field");i.hasClass("hidden")?(i.attr("style",""),e.attr("style",""),i.removeClass("hidden"),e.removeClass("hidden")):(i.attr("style","display:none"),e.attr("style","display:none"),i.addClass("hidden"),e.addClass("hidden"))},window.digiriskdolibarr.risk={},window.digiriskdolibarr.risk.init=function(){window.digiriskdolibarr.risk.event()},window.digiriskdolibarr.risk.event=function(){$(document).on("click",".category-danger .item, .wpeo-table .category-danger .item",window.digiriskdolibarr.risk.selectDanger),$(document).on("click",".risk-create:not(.button-disable)",window.digiriskdolibarr.risk.createRisk),$(document).on("click",".risk-save",window.digiriskdolibarr.risk.saveRisk),$(document).on("click",".risk-unlink-shared",window.digiriskdolibarr.risk.unlinkSharedRisk),$(document).on("click",'div[aria-describedby="dialog-confirm-actionButtonImportSharedRisks"] .ui-button.ui-corner-all.ui-widget',window.digiriskdolibarr.risk.sharedRiskBoxLoader)},window.digiriskdolibarr.risk.selectDanger=function(i){var e=$(this);e.closest(".content").removeClass("active"),e.closest(".wpeo-dropdown").find(".dropdown-toggle span").hide(),e.closest(".wpeo-dropdown").find(".dropdown-toggle img").show(),e.closest(".wpeo-dropdown").find(".dropdown-toggle img").attr("src",e.find("img").attr("src")),e.closest(".wpeo-dropdown").find(".dropdown-toggle img").attr("aria-label",e.closest(".wpeo-tooltip-event").attr("aria-label")),e.closest(".wpeo-dropdown").find(".input-hidden-danger").val(e.data("id"));1==e.closest(".wpeo-dropdown").find(".input-risk-description-prefill").val()&&e.closest(".risk-content").find(".risk-description textarea").text(e.closest(".wpeo-tooltip-event").attr("aria-label"));e=$(this).closest(".modal-container");window.digiriskdolibarr.risk.haveDataInInput(e)},window.digiriskdolibarr.risk.haveDataInInput=function(i){var i=i.parent().parent(),e=i.find(".risk-evaluation-seuil");i.hasClass("risk-add-modal")?0<=i.find('input[name="risk_category_id"]').val()&&0<=e.val()&&i.find(".risk-create.button-disable").removeClass("button-disable"):i.hasClass("risk-evaluation-add-modal")&&0<=e.val()&&i.find(".risk-evaluation-create.button-disable").removeClass("button-disable")},window.digiriskdolibarr.risk.sanitizeBeforeRequest=function(i){return"string"==typeof i&&i.match(/"/)?i.split(/"/).join(""):i},window.digiriskdolibarr.risk.createRisk=function(i){var e=window.saturne.toolbox.getToken(),s=$(".risk-add-modal"),t=s.closest(".fichecenter").find(".risk-content"),a=s.closest(".fichecenter").find(".risk-evaluation-container"),n=s.closest(".fichecenter").find(".riskassessment-task"),r=t.find(".risk-description textarea").val(),o=a.find(".risk-evaluation-comment textarea").val(),d=n.find("input").val(),r=window.digiriskdolibarr.risk.sanitizeBeforeRequest(r),o=window.digiriskdolibarr.risk.sanitizeBeforeRequest(o),d=window.digiriskdolibarr.risk.sanitizeBeforeRequest(d),t=t.find(".risk-category input").val(),l=a.find(".risk-evaluation-header .risk-evaluation-method").val(),c=a.find(".risk-evaluation-seuil").val(),s=s.find(".photo .media-container .media-gallery-favorite.favorite .filename").val(),a=a.find("#RiskAssessmentDate").val(),k=[],u=(Object.values($(".table-cell.active.cell-0")).forEach(function(i){-1<$(i).data("seuil")&&(k[$(i).data("type")]=$(i).data("seuil"))}),[]),m=($(this).closest(".modal-container").find(".risk-categories").find(":selected").each(function(){u.push($(this).val())}),n.find("#RiskassessmentTaskDateStartModalRisk").val()),v=n.find("#RiskassessmentTaskDateStartModalRiskhour").val(),w=n.find("#RiskassessmentTaskDateStartModalRiskmin").val(),f=n.find("#RiskassessmentTaskDateEndModalRisk").val(),g=n.find("#RiskassessmentTaskDateEndModalRiskhour").val(),h=n.find("#RiskassessmentTaskDateEndModalRiskmin").val(),n=n.find(".riskassessment-task-budget").val();window.saturne.loader.display($(".fichecenter.risklist")),$.ajax({url:document.URL+"&action=add&token="+e,type:"POST",data:JSON.stringify({cotation:c,comment:o,category:t,description:r,method:l,photo:s,date:a,task:d,dateStart:m,hourStart:v,minStart:w,dateEnd:f,hourEnd:g,minEnd:h,budget:n,categories:u,criteres:{gravite:k.gravite||0,occurrence:k.occurrence||0,protection:k.protection||0,formation:k.formation||0,exposition:k.exposition||0}}),processData:!1,contentType:!1,success:function(i){$(".fichecenter.risklist").html($(i).find("#searchFormListRisks"));var e=$(".messageSuccessRiskCreate");e.html($(i).find(".risk-create-success-notice")),e.removeClass("hidden"),$(".fichecenter.risklist").removeClass("wpeo-loader")},error:function(i){var e=$(".messageErrorRiskCreate");e.html($(i).find(".risk-create-error-notice")),e.removeClass("hidden"),$(".fichecenter.risklist").removeClass("wpeo-loader")}})},window.digiriskdolibarr.risk.saveRisk=function(i){var e=window.saturne.toolbox.getToken();let t=$(this).attr("value");var s=$(this).closest(".risk-container").find(".risk-content"),a=new window.URLSearchParams(window.location.search).get("id");let n=$(this).closest(".risk-container").find(".move-risk").hasClass("move-disabled");var r=s.find(".risk-description textarea").val(),r=window.digiriskdolibarr.risk.sanitizeBeforeRequest(r),s=s.find(".risk-category input").val(),o=(r=r||"",$(this).closest(".risk-container").find("#socid option:selected").val());o==a||n?(window.saturne.loader.display($(this).closest(".risk-row-content-"+t).find(".risk-description-"+t)),window.saturne.loader.display($(this).closest(".risk-row-content-"+t).find(".risk-category"))):window.saturne.loader.display($(this).closest(".risk-row-content-"+t));let d=$(".risk_row_"+t).find(".risk-container > div:nth-child(1)").text();var l=[];$(this).closest(".modal-container").find(".risk-categories").find(":selected").each(function(){l.push($(this).val())}),$.ajax({url:document.URL+"&action=saveRisk&token="+e,type:"POST",processData:!1,data:JSON.stringify({riskID:t,category:s,comment:r,newParent:o,categories:l}),contentType:!1,success:function(i){$(".wpeo-loader").removeClass("wpeo-loader");var e=$(".messageSuccessRiskEdit"),s=(o==a||n?($(".modal-active").removeClass("modal-active"),$(".risk-description-"+t).html($(i).find(".risk-description-"+t)),$(".risk-row-content-"+t).find(".risk-category .cell-risk").html($(i).find(".risk-row-content-"+t).find(".risk-category .cell-risk").children()),$(".risk-row-content-"+t).find(".risk-category").fadeOut(800),$(".risk-row-content-"+t).find(".risk-category").fadeIn(800),$(".risk-row-content-"+t).find(".risk-description-"+t).fadeOut(800),$(".risk-row-content-"+t).find(".risk-description-"+t).fadeIn(800)):$(".risk-row-content-"+t).fadeOut(800,function(){$(".fichecenter .opacitymedium.colorblack.paddingleft").html($(i).find("#searchFormListRisks .opacitymedium.colorblack.paddingleft"))}),""),s=(s=(s+=e.find(".valueForEditRisk1").val())+d)+e.find(".valueForEditRisk2").val();e.find("a").attr("href","#risk_row_"+t),e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")},error:function(i){var e=$(".messageErrorRiskEdit"),s="",s=(s=(s+=e.find(".valueForEditRisk1").val())+d)+e.find(".valueForEditRisk2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})},window.digiriskdolibarr.risk.unlinkSharedRisk=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).attr("value"),t=(window.saturne.loader.display($(this)),$(".risk_row_"+s).find(".risk-container > div:nth-child(1)").text());var a=document.URL.split(/#/);$.ajax({url:a[0]+"&action=unlinkSharedRisk&token="+e,type:"POST",processData:!1,data:JSON.stringify({riskID:s}),contentType:!1,success:function(i){$(".confirmquestions").html($(i).find(".confirmquestions").children()),$(".fichecenter.sharedrisklist .opacitymedium.colorblack.paddingleft").html($(i).find("#searchFormSharedListRisks .opacitymedium.colorblack.paddingleft"));var i=$(".messageSuccessRiskUnlinkShared"),e=($("#risk_row_"+s).fadeOut(800),""),e=(e=(e+=i.find(".valueForUnlinkSharedRisk1").val())+t)+i.find(".valueForUnlinkSharedRisk2").val();i.find(".notice-subtitle .text").text(e),i.removeClass("hidden")},error:function(i){var e=$(".messageErrorRiskUnlinkShared"),s="",s=(s=(s+=e.find(".valueForUnlinkSharedRisk1").val())+t)+e.find(".valueForUnlinkSharedRisk2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})},window.digiriskdolibarr.risk.sharedRiskBoxLoader=function(i){"Oui"==$(this).text()&&window.saturne.loader.display($("#searchFormSharedListRisks"))},window.digiriskdolibarr.evaluation={},window.digiriskdolibarr.evaluation.init=function(){window.digiriskdolibarr.evaluation.event()},window.digiriskdolibarr.evaluation.event=function(){$(document).on("click",".select-evaluation-method",window.digiriskdolibarr.evaluation.selectEvaluationMethod),$(document).on("click",".cotation-container .risk-evaluation-cotation.cotation",window.digiriskdolibarr.evaluation.selectSeuil),$(document).on("click",".risk-evaluation-create",window.digiriskdolibarr.evaluation.createEvaluation),$(document).on("click",".risk-evaluation-save",window.digiriskdolibarr.evaluation.saveEvaluation),$(document).on("click",".risk-evaluation-delete",window.digiriskdolibarr.evaluation.deleteEvaluation)},window.digiriskdolibarr.evaluation.selectEvaluationMethod=function(i){var e=$(this).closest(".modal-container");0<e.find(".risk-evaluation-multiple-method").val()&&(e.find(".select-evaluation-method.selected").removeClass("selected"),$(this).addClass("selected"),$(this).removeClass("button-grey"),$(this).addClass("button-blue"),e.find(".select-evaluation-method:not(.selected)").removeClass("button-blue"),e.find(".select-evaluation-method:not(.selected)").addClass("button-grey"),$(this).hasClass("evaluation-standard")?(e.find(".cotation-advanced").attr("style","display:none"),e.find(".cotation-standard").attr("style","display:block"),e.find(".risk-evaluation-calculated-cotation").attr("style","display:none"),e.find(".risk-evaluation-method").val("standard"),e.find(this).closest(".risk-evaluation-container").removeClass("advanced"),e.find(this).closest(".risk-evaluation-container").addClass("standard")):(e.find(".cotation-standard").attr("style","display:none"),e.find(".cotation-advanced").attr("style","display:block"),e.find(".risk-evaluation-calculated-cotation").attr("style","display:block"),e.find(".risk-evaluation-method").val("advanced"),e.find(this).closest(".risk-evaluation-container").addClass("advanced"),e.find(this).closest(".risk-evaluation-container").removeClass("standard")))},window.digiriskdolibarr.evaluation.selectSeuil=function(i){var e=$(this),s=$(this).closest(".modal-container"),t=e.data("seuil"),a=e.data("variable-id"),n=e.data("evaluation-id");e.closest(".cotation-container").find(".risk-evaluation-seuil").val(n),e.closest(".cotation-container").find(".selected-cotation").removeClass("selected-cotation"),e.addClass("selected-cotation"),a&&t&&window.digiriskdolibarr.risk.haveDataInInput(s)},window.digiriskdolibarr.evaluation.getDynamicScale=function(i){switch(!0){case 0===i:case i<48:return 1;case i<51:return 2;case i<79:return 3;case i<101:return 4}},window.digiriskdolibarr.evaluation.createEvaluation=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".risk-evaluation-add-modal"),t=s.find(".modal-risk").attr("value"),a=s.find(".risk-evaluation-container"),n=a.find(".risk-evaluation-comment textarea").val(),n=window.digiriskdolibarr.risk.sanitizeBeforeRequest(n),r=a.find(".risk-evaluation-method").val(),o=a.find(".risk-evaluation-seuil").val(),d=a.find("#RiskAssessmentDateCreate0").val(),a=a.find(".photo .media-container .file-name").val();let l=[];Object.values($(".table-cell.active.cell-0")).forEach(function(i){-1<$(i).data("seuil")&&(l[$(i).data("type")]=$(i).data("seuil"))}),console.log(s),console.log(s.find(".modal-risk.modal-active")),window.saturne.loader.display($(this)),window.saturne.loader.display($(".risk-evaluation-list-container-"+t)),$.ajax({url:document.URL+"&action=addEvaluation&token="+e,type:"POST",data:JSON.stringify({cotation:o,comment:n,method:r,photo:a,date:d,riskId:t,criteres:{gravite:l.gravite||0,occurrence:l.occurrence||0,protection:l.protection||0,formation:l.formation||0,exposition:l.exposition||0}}),processData:!1,contentType:!1,success:function(i){0<$(i).find(".risk-evaluation-list-container-"+t).length?$(".risk-evaluation-list-container-"+t).replaceWith($(i).find(".risk-evaluation-list-container-"+t)):$(".div-table-responsive").replaceWith($(i).find(".div-table-responsive"));var e=$(".messageSuccessEvaluationCreate");$(".risk-evaluation-list-container-"+t).fadeOut(800),$(".risk-evaluation-list-container-"+t).fadeIn(800),e.empty(),e.html($(i).find(".riskassessment-create-success-notice")),e.find("a").attr("href","#risk_row_"+t),$(".wpeo-loader").removeClass("wpeo-loader"),e.removeClass("hidden")},error:function(i){var e=$(".messageErrorEvaluationCreate");$(this).closest(".risk-row-content-"+t).removeClass("wpeo-loader"),e.empty(),e.html($(i).find(".riskassessment-create-error-notice")),e.removeClass("hidden")}})},window.digiriskdolibarr.evaluation.deleteEvaluation=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".risk-evaluation-in-modal"),t=s.find(".labelForDelete").val();let r=$(".messageSuccessEvaluationDelete"),o=$(".messageErrorEvaluationDelete"),d=s.attr("value");if(1!=confirm(t))return!1;{let t=$(this).closest(".risk-evaluations-list-content"),a=t.attr("value"),n=$(".risk-evaluation-ref-"+d).attr("value");window.saturne.loader.display($(".risk-evaluation-ref-"+d)),$.ajax({url:document.URL+"&action=deleteEvaluation&deletedEvaluationId="+d+"&token="+e,type:"POST",processData:!1,contentType:!1,success:function(i){$(".risk-evaluation-container-"+d).fadeOut(400),$(".risk-evaluation-list-content-"+a).replaceWith($(i).find(".risk-evaluation-list-content-"+a)),$("#risk_evaluation_add"+a).replaceWith($(i).find("#risk_evaluation_add"+a));var e=$("#risk_row_"+a).find(".table-cell-header-label").text(),s=e.split(/\(/)[1].split(/\)/)[0],e=($("#risk_row_"+a).find(".table-cell-header-label").html("<strong>"+e.split(/\(/)[0]+"("+(+s-1)+")</strong>"),s-1<1&&$(".fichecenter.risklist").html($(i).find("#searchFormListRisks")),t.removeClass("wpeo-loader"),""),e=(e=(e+=r.find(".valueForDeleteEvaluation1").val())+n)+r.find(".valueForDeleteEvaluation2").val();r.find(".notice-subtitle .text").text(e),r.removeClass("hidden")},error:function(i){var e="",e=(e=(e+=o.find(".valueForDeleteEvaluation1").val())+n)+o.find(".valueForDeleteEvaluation2").val();o.find(".notice-subtitle .text").text(e),o.removeClass("hidden")}})}},window.digiriskdolibarr.evaluation.saveEvaluation=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).closest(".risk-evaluation-edit-modal"),t=s.attr("value");var a=s.find(".risk-evaluation-comment textarea").val();let n=$(this).closest(".risk-row").find(".risk-evaluations-list-content").attr("value"),r=$(".risk-evaluation-ref-"+t).attr("value"),o=$(".risk-evaluation-list-modal-"+n),d=$("#risk_evaluation_list"+n).hasClass("modal-active");var a=window.digiriskdolibarr.risk.sanitizeBeforeRequest(a),l=s.find(".risk-evaluation-method").val(),c=s.find(".risk-evaluation-seuil").val(),k=s.find("#RiskAssessmentDateEdit"+t).val(),u=s.find(".risk-evaluation-photo .filename").val();let m=[];Object.values($(".table-cell.active.cell-"+t)).forEach(function(i){-1<$(i).data("seuil")&&(m[$(i).data("type")]=$(i).data("seuil"))}),window.saturne.loader.display($(this)),$.ajax({url:document.URL+"&action=saveEvaluation&token="+e,type:"POST",processData:!1,data:JSON.stringify({cotation:c,comment:a,method:l,photo:u,date:k,evaluationID:t,criteres:{gravite:m.gravite||0,occurrence:m.occurrence||0,protection:m.protection||0,formation:m.formation||0,exposition:m.exposition||0}}),contentType:!1,success:function(i){$("#risk_evaluation_edit"+t).removeClass("modal-active"),0<$(i).find(".risk-evaluation-container.risk-evaluation-container-"+t+":not(.last-risk-assessment)").length?((d?($(".risk-evaluation-ref-"+t+":not(.last-risk-assessment)").fadeOut(800),$(".risk-evaluation-ref-"+t+":not(.last-risk-assessment)")):($(".risk-evaluation-container-"+t+":not(.last-risk-assessment)").fadeOut(800),$(".risk-evaluation-container-"+t+":not(.last-risk-assessment)"))).fadeIn(800),o.find(".risk-evaluation-ref-"+t).replaceWith($(i).find(".risk-evaluation-ref-"+t)),$(".risk-evaluation-container.risk-evaluation-container-"+t+":not(.last-risk-assessment)").replaceWith($(i).find(".risk-evaluation-container.risk-evaluation-container-"+t+":not(.last-risk-assessment)")),$("#risk_evaluation_add"+n).html($(i).find("#risk_evaluation_add"+n).children())):($(".div-table-responsive").html($(i).find(".div-table-responsive").children()),(d?($(".risk-evaluation-ref-"+t+":not(.last-risk-assessment)").fadeOut(800),$(".risk-evaluation-ref-"+t+":not(.last-risk-assessment)")):($(".risk-evaluation-container-"+t+":not(.last-risk-assessment)").fadeOut(800),$(".risk-evaluation-container-"+t+":not(.last-risk-assessment)"))).fadeIn(800)),$(".wpeo-loader").removeClass("wpeo-loader");var i=$(".messageSuccessEvaluationEdit"),e=(s.find("#risk_evaluation_edit"+t).removeClass("modal-active"),""),e=(e=(e+=i.find(".valueForEditEvaluation1").val())+r)+i.find(".valueForEditEvaluation2").val();i.find("a").attr("href","#risk_row_"+n),i.find(".notice-subtitle .text").text(e),i.removeClass("hidden")},error:function(){var i=$(".messageErrorEvaluationEdit"),e="",e=(e=(e+=i.find(".valueForEditEvaluation1").val())+r)+i.find(".valueForEditEvaluation2").val();i.find(".notice-subtitle .text").text(e),i.removeClass("hidden")}})},window.digiriskdolibarr.risksign={},window.digiriskdolibarr.risksign.init=function(){window.digiriskdolibarr.risksign.event()},window.digiriskdolibarr.risksign.event=function(){$(document).on("click",".risksign-category-danger .item, .wpeo-table .risksign-category-danger .item",window.digiriskdolibarr.risksign.selectRiskSign),$(document).on("click",".risksign-create:not(.button-disable)",window.digiriskdolibarr.risksign.createRiskSign),$(document).on("click",".risksign-save",window.digiriskdolibarr.risksign.saveRiskSign),$(document).on("click",".risksign-unlink-shared",window.digiriskdolibarr.risksign.unlinkSharedRiskSign)},window.digiriskdolibarr.risksign.selectRiskSign=function(i){var e=$(this),e=(e.closest(".content").removeClass("active"),e.closest(".wpeo-dropdown").find(".dropdown-toggle span").hide(),e.closest(".wpeo-dropdown").find(".dropdown-toggle img").show(),e.closest(".wpeo-dropdown").find(".dropdown-toggle img").attr("src",e.find("img").attr("src")),e.closest(".wpeo-dropdown").find(".dropdown-toggle img").attr("aria-label",e.closest(".wpeo-tooltip-event").attr("aria-label")),e.closest(".fichecenter").find(".input-hidden-danger").val(e.data("id")),$(this).closest(".modal-container"));window.digiriskdolibarr.risksign.haveDataInInput(e)},window.digiriskdolibarr.risksign.haveDataInInput=function(i){i=i.parent().parent();i.hasClass("risksign-add-modal")&&0<=i.find('input[name="risksign_category_id"]').val()&&i.find(".button-disable").removeClass("button-disable")},window.digiriskdolibarr.risksign.createRiskSign=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".fichecenter").find(".risksign-content"),t=s.find(".risksign-category input").val(),s=s.find(".risksign-description textarea").val();window.saturne.loader.display($(".fichecenter.risksignlist")),$.ajax({url:document.URL+"&action=add&token="+e,type:"POST",data:JSON.stringify({riskSignCategory:t,riskSignDescription:s}),processData:!1,contentType:!1,success:function(i){$(".fichecenter.risksignlist").html($(i).find("#searchFormListRiskSigns"));var e=$(".messageSuccessRiskSignCreate");$(".fichecenter.risksignlist").removeClass("wpeo-loader"),e.html($(i).find(".risksign-create-success-notice")),e.removeClass("hidden")},error:function(i){var e=$(".messageErrorRiskCreate");e.html($(i).find(".risksign-create-error-notice")),e.removeClass("hidden")}})},window.digiriskdolibarr.risksign.saveRiskSign=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).attr("value");let t=$(this).closest(".risksign-container").find(".risksign-content"),a="";var n=t.find(".risksign-category input").val(),r=t.find(".risksign-description textarea").val();let o=$(".risksign_row_"+s).find(".risksign-container > div:nth-child(1)").text();window.saturne.loader.display(t),$.ajax({url:document.URL+"&action=saveRiskSign&token="+e,data:JSON.stringify({riskSignID:s,riskSignCategory:n,riskSignDescription:r}),type:"POST",processData:!1,contentType:!1,success:function(i){$(".fichecenter.risksignlist").html($(i).find("#searchFormListRiskSigns"));i=$(".messageSuccessRiskSignEdit");t.removeClass("wpeo-loader"),a=(a=(a+=i.find(".valueForEditRiskSign1").val())+o)+i.find(".valueForEditRiskSign2").val(),i.find(".notice-subtitle .text").text(a),i.removeClass("hidden")},error:function(){var i=$(".messageErrorRiskSignEdit");t.removeClass("wpeo-loader"),a=(a=(a+=i.find(".valueForEditRiskSign1").val())+o)+i.find(".valueForEditRiskSign2").val(),i.find(".notice-subtitle .text").text(a),i.removeClass("hidden")}})},window.digiriskdolibarr.risksign.unlinkSharedRiskSign=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).attr("value"),t=(window.saturne.loader.display($(this)),$(".risksign_row_"+s).find(".risksign-container > div:nth-child(1)").text());var a=document.URL.split(/#/);$.ajax({url:a[0]+"&action=unlinkSharedRiskSign&token="+e,type:"POST",processData:!1,data:JSON.stringify({risksignID:s}),contentType:!1,success:function(i){$(".fichecenter.sharedrisksignlist .opacitymedium.colorblack.paddingleft").html($(i).find("#searchFormSharedListRiskSigns .opacitymedium.colorblack.paddingleft"));var i=$(".messageSuccessRiskSignUnlinkShared"),e=($("#risksign_row_"+s).fadeOut(800),""),e=(e=(e+=i.find(".valueForUnlinkSharedRiskSign1").val())+t)+i.find(".valueForUnlinkSharedRiskSign2").val();i.find(".notice-subtitle .text").text(e),i.removeClass("hidden")},error:function(i){var e=$(".messageErrorRiskSignUnlinkShared"),s="",s=(s=(s+=e.find(".valueForUnlinkSharedRiskSign1").val())+t)+e.find(".valueForUnlinkSharedRiskSign2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask={},window.digiriskdolibarr.riskassessmenttask.init=function(){window.digiriskdolibarr.riskassessmenttask.event()},window.digiriskdolibarr.riskassessmenttask.event=function(){$(document).on("input",".riskassessment-task-label",window.digiriskdolibarr.riskassessmenttask.fillRiskAssessmentTaskLabel),$(document).on("click",".riskassessment-task-create",window.digiriskdolibarr.riskassessmenttask.createRiskAssessmentTask),$(document).on("click",".riskassessment-task-save",window.digiriskdolibarr.riskassessmenttask.saveRiskAssessmentTask),$(document).on("click",".riskassessment-task-delete",window.digiriskdolibarr.riskassessmenttask.deleteRiskAssessmentTask),$(document).on("click",".riskassessment-task-timespent-create",window.digiriskdolibarr.riskassessmenttask.createRiskAssessmentTaskTimeSpent),$(document).on("click",".riskassessment-task-timespent-save",window.digiriskdolibarr.riskassessmenttask.saveRiskAssessmentTaskTimeSpent),$(document).on("click",".riskassessment-task-timespent-delete",window.digiriskdolibarr.riskassessmenttask.deleteRiskAssessmentTaskTimeSpent),$(document).on("click",".riskassessment-task-progress-checkbox:not(.riskassessment-task-progress-checkbox-readonly)",window.digiriskdolibarr.riskassessmenttask.checkTaskProgress),$(document).on("change","#RiskassessmentTaskTimespentDatehour",window.digiriskdolibarr.riskassessmenttask.selectRiskassessmentTaskTimespentDateHour),$(document).on("change","#RiskassessmentTaskTimespentDatemin",window.digiriskdolibarr.riskassessmenttask.selectRiskassessmentTaskTimespentDateMin),$(document).on("keyup",".riskassessment-task-label",window.digiriskdolibarr.riskassessmenttask.checkRiskassessmentTaskLabelLength),$(document).on("click",".listingHeaderTaskTooltip",window.digiriskdolibarr.riskassessmenttask.redirectOnSharedTaskConfig)},window.digiriskdolibarr.riskassessmenttask.fillRiskAssessmentTaskLabel=function(i){var e=$(this).closest(".modal-container");window.digiriskdolibarr.riskassessmenttask.haveDataInInput(e)},window.digiriskdolibarr.riskassessmenttask.haveDataInInput=function(i){i=i.parent().parent();i.hasClass("riskassessment-task-add-modal")&&i.find('input[name="label"]').val().length&&i.find(".button-disable").removeClass("button-disable")},window.digiriskdolibarr.riskassessmenttask.createRiskAssessmentTask=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".riskassessment-task-add-modal"),t=s.find(".modal-risk").attr("value"),s=s.find(".riskassessment-task-container"),a=s.find(".riskassessment-task-label").val(),a=window.digiriskdolibarr.risk.sanitizeBeforeRequest(a),n=s.find("#RiskassessmentTaskDateStart"+t).val(),r=s.find("#RiskassessmentTaskDateStart"+t+"hour").val(),o=s.find("#RiskassessmentTaskDateStart"+t+"min").val(),d=s.find("#RiskassessmentTaskDateEnd"+t).val(),l=s.find("#RiskassessmentTaskDateEnd"+t+"hour").val(),c=s.find("#RiskassessmentTaskDateEnd"+t+"min").val(),s=s.find(".riskassessment-task-budget").val();window.saturne.loader.display($(this)),window.saturne.loader.display($(".riskassessment-tasks"+t)),$.ajax({url:document.URL+"&action=addRiskAssessmentTask&token="+e,type:"POST",data:JSON.stringify({tasktitle:a,dateStart:n,hourStart:r,minStart:o,dateEnd:d,hourEnd:l,minEnd:c,budget:s,riskToAssign:t}),processData:!1,contentType:!1,success:function(i){$(".tasks-list-container-"+t).replaceWith($(i).find(".tasks-list-container-"+t));var e=$(".messageSuccessTaskCreate");$(".riskassessment-tasks"+t).fadeOut(800),$(".riskassessment-tasks"+t).fadeIn(800),e.find("a").attr("href","#risk_row_"+t),e.html($(i).find(".task-create-success-notice")),e.removeClass("hidden")},error:function(i){$(".wpeo-loader").removeClass("wpeo-loader"),window.scrollTo(0,0);var i=JSON.parse(i.responseText),e=$(".messageErrorTaskCreate"),s=($("#risk_assessment_task_add"+t).removeClass("modal-active"),""),s=(s=(s+=e.find(".valueForCreateTask1").val())+e.find(".valueForCreateTask2").val())+" : "+i.message;e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask.deleteRiskAssessmentTask=function(i){var e=window.saturne.toolbox.getToken(),t=$(this).closest(".wpeo-table.riskassessment-tasks").attr("value"),a=$(this).closest(".riskassessment-task-single-content").attr("value"),s=$(this).closest(".riskassessment-task-container-"+a).find(".labelForDelete").val();let n=$(".messageSuccessTaskDelete"),r=$(".messageErrorTaskDelete");if(1!=confirm(s))return!1;{let s=$(".riskassessment-task-container-"+a).attr("value");window.saturne.loader.display($(".riskassessment-task-container-"+a)),$.ajax({url:document.URL+"&action=deleteRiskAssessmentTask&deletedRiskAssessmentTaskId="+a+"&token="+e,type:"POST",processData:!1,contentType:!1,success:function(i){console.log($(".riskassessment-task-listing-wrapper-"+t)),console.log(t),$(".riskassessment-task-listing-wrapper-"+t).replaceWith($(i).find(".riskassessment-task-listing-wrapper-"+t)),$(".riskassessment-tasks"+t).fadeOut(800),$(".riskassessment-tasks"+t).fadeIn(800);i="",i=(i=(i+=n.find(".valueForDeleteTask1").val())+s)+n.find(".valueForDeleteTask2").val();n.find("a").attr("href","#risk_row_"+t),n.find(".notice-subtitle .text").text(i),n.removeClass("hidden")},error:function(i){$(".wpeo-loader").removeClass("wpeo-loader"),window.scrollTo(0,0);var i=JSON.parse(i.responseText),e="",e=(e=(e=(e+=r.find(".valueForDeleteTask1").val())+s)+r.find(".valueForDeleteTask2").val())+" : "+i.message;r.find(".notice-subtitle .text").text(e),r.removeClass("hidden")}})}},window.digiriskdolibarr.riskassessmenttask.saveRiskAssessmentTask=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).attr("value");var t=$(this).closest(".modal-container"),a=$(this).closest(".modal-risk").attr("value");let n="";var r=t.find(".riskassessment-task-label"+s).val(),r=window.digiriskdolibarr.risk.sanitizeBeforeRequest(r);let o=$(".riskassessment-task-single-"+s+" .riskassessment-task-reference").attr("value"),d=0;t.find(".riskassessment-task-progress-checkbox"+s).is(":checked")&&(d=1);var l=t.find("#RiskassessmentTaskDateStartEdit"+s).val(),c=t.find("#RiskassessmentTaskDateStartEdit"+s+"hour").val(),k=t.find("#RiskassessmentTaskDateStartEdit"+s+"min").val(),u=t.find("#RiskassessmentTaskDateEndEdit"+s).val(),m=t.find("#RiskassessmentTaskDateEndEdit"+s+"hour").val(),v=t.find("#RiskassessmentTaskDateEndEdit"+s+"min").val(),t=t.find(".riskassessment-task-budget"+s).val();window.saturne.loader.display($(this)),window.saturne.loader.display($(".riskassessment-task-single-"+s)),$.ajax({url:document.URL+"&action=saveRiskAssessmentTask&token="+e,data:JSON.stringify({riskAssessmentTaskID:s,tasktitle:r,dateStart:l,hourStart:c,minStart:k,dateEnd:u,hourEnd:m,minEnd:v,budget:t,taskProgress:d}),type:"POST",processData:!1,contentType:!1,success:function(i){$("#risk_assessment_task_edit"+s).removeClass("modal-active"),$(".riskassessment-task-container-"+s).replaceWith($(i).find(".riskassessment-task-container-"+s).first());i=$(".messageSuccessTaskEdit");$(".riskassessment-tasks"+a).fadeOut(800),$(".riskassessment-tasks"+a).fadeIn(800),n=(n=(n+=i.find(".valueForEditTask1").val())+o)+i.find(".valueForEditTask2").val(),$(".wpeo-loader").removeClass("wpeo-loader"),$(".loader-spin").remove(),i.find("a").attr("href","#risk_row_"+a),i.find(".notice-subtitle .text").text(n),i.removeClass("hidden")},error:function(i){$(".wpeo-loader").removeClass("wpeo-loader"),window.scrollTo(0,0);var i=JSON.parse(i.responseText),e=$(".messageErrorTaskEdit");$("#risk_assessment_task_edit"+s).removeClass("modal-active"),$(".wpeo-loader").removeClass("wpeo-loader"),n=(n=(n=(n+=e.find(".valueForEditTask1").val())+o)+e.find(".valueForEditTask2").val()+" : ")+i.message,e.find(".notice-subtitle .text").text(n),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask.createRiskAssessmentTaskTimeSpent=function(i){var e=window.saturne.toolbox.getToken();let s=$(this).attr("value");var t=$(this).closest(".riskassessment-task-edit-modal"),a=t.find(".riskassessment-task-timespent-container");let n=t.find("riskassessment-task-single").attr("value"),r="",o=t.find(".riskassessment-task-reference").attr("value"),d=$(".id-container").find(".riskassessment-total-task-timespent-"+s);var t=a.find("#RiskassessmentTaskTimespentDate"+s).val(),l=a.find("#RiskassessmentTaskTimespentDate"+s+"hour").val(),c=a.find("#RiskassessmentTaskTimespentDate"+s+"min").val(),k=a.find(".riskassessment-task-timespent-comment").val(),k=window.digiriskdolibarr.risk.sanitizeBeforeRequest(k),a=a.find(".riskassessment-task-timespent-duration").val();window.saturne.loader.display($(this)),window.saturne.loader.display($(".riskassessment-task-single-"+s)),$.ajax({url:document.URL+"&action=addRiskAssessmentTaskTimeSpent&token="+e,type:"POST",data:JSON.stringify({taskID:s,date:t,hour:l,min:c,comment:k,duration:a}),processData:!1,contentType:!1,success:function(i){var e=$(".messageSuccessTaskTimeSpentCreate"+s);$(".riskassessment-tasks"+n).fadeOut(800),$(".riskassessment-tasks"+n).fadeIn(800),r=(r=(r+=e.find(".valueForCreateTaskTimeSpent1").val())+o)+e.find(".valueForCreateTaskTimeSpent2").val(),$(".riskassessment-task-timespent-container").find(".riskassessment-task-timespent-list-"+s).replaceWith($(i).find(".riskassessment-task-timespent-container").find(".riskassessment-task-timespent-list-"+s)),$(".riskassessment-task-container-"+s).closest(".riskassessment-tasks").replaceWith($(i).find(".riskassessment-task-container-"+s).closest(".riskassessment-tasks")),$(".loader-spin").remove(),$(".wpeo-loader").removeClass("wpeo-loader"),e.find(".notice-subtitle .text").text(r),e.removeClass("hidden"),d.html($(i).find(".modal-content").find(".riskassessment-total-task-timespent-"+s).first())},error:function(i){$(this).closest(".risk-row-content-"+n).removeClass("wpeo-loader");var e=$(".messageErrorTaskTimeSpentCreate"+s);e.html($(i).find(".task-timespent-create-error-notice")),e.removeClass("hidden")},complete:function(){$("#risk_assessment_task_edit"+s+".wpeo-modal").addClass("modal-active")}})},window.digiriskdolibarr.riskassessmenttask.deleteRiskAssessmentTaskTimeSpent=function(i){var e=window.saturne.toolbox.getToken();let a=$(this).closest(".riskassessment-task-timespent-list").attr("value"),n=$(this).attr("value");var s=$(this).attr("value"),t=$(this).closest(".riskassessment-task-timespent-"+n).find(".labelForDelete").val();let r=$(".id-container").first().find(".riskassessment-total-task-timespent-"+a);if(1!=confirm(t))return!1;{let t=$(".riskassessment-task-container-"+a).attr("value");window.saturne.loader.display($(this)),$.ajax({url:document.URL+"&action=deleteRiskAssessmentTaskTimeSpent&deletedRiskAssessmentTaskTimeSpentId="+s+"&token="+e,type:"POST",processData:!1,contentType:!1,success:function(i){var e=$(".messageSuccessTaskTimeSpentDelete"+a),s=($(".riskassessment-task-timespent-"+n).fadeOut(800),""),s=(s=(s+=e.find(".valueForDeleteTaskTimeSpent1").val())+t)+e.find(".valueForDeleteTaskTimeSpent2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden"),r.html($(i).find(".modal-content").find(".riskassessment-total-task-timespent-"+a).first())},error:function(i){var e=$(".messageErrorTaskDeleteTimeSpent"+a),s="",s=(s=(s+=e.find(".valueForDeleteTaskTimeSpent1").val())+t)+e.find(".valueForDeleteTaskTimeSpent2").val();e.find(".notice-subtitle .text").text(s),e.removeClass("hidden")}})}},window.digiriskdolibarr.riskassessmenttask.saveRiskAssessmentTaskTimeSpent=function(i){var e=window.saturne.toolbox.getToken();let s=$(this);var t=$(this).attr("value"),a=$(this).closest(".riskassessment-task-timespent-edit-modal").find(".riskassessment-task-timespent-container");let n=a.attr("value"),r="",o=$(".riskassessment-task-container-"+n).attr("value"),d=$(".id-container").first().find(".riskassessment-total-task-timespent-"+n);var l=a.find("#RiskassessmentTaskTimespentDateEdit"+t).val(),c=a.find("#RiskassessmentTaskTimespentDateEdit"+t+"hour").val(),k=a.find("#RiskassessmentTaskTimespentDateEdit"+t+"min").val(),u=a.find(".riskassessment-task-timespent-comment").val(),u=window.digiriskdolibarr.risk.sanitizeBeforeRequest(u),a=a.find(".riskassessment-task-timespent-duration").val();window.saturne.loader.display($(this)),window.saturne.loader.display($(".riskassessment-task-single-"+n)),$.ajax({url:document.URL+"&action=saveRiskAssessmentTaskTimeSpent&token="+e,data:JSON.stringify({riskAssessmentTaskTimeSpentID:t,taskID:n,date:l,hour:c,min:k,comment:u,duration:a}),type:"POST",processData:!1,contentType:!1,success:function(i){s.closest(".modal-active").removeClass("modal-active");var e=$(".messageSuccessTaskTimeSpentEdit"+n);$(".wpeo-loader").removeClass("wpeo-loader"),r=(r=(r+=e.find(".valueForEditTaskTimeSpent1").val())+o)+e.find(".valueForEditTaskTimeSpent2").val(),d.html($(i).find(".modal-content").find(".riskassessment-total-task-timespent-"+n).first()),$(".riskassessment-task-timespent-list-"+n).html($(i).find(".riskassessment-task-timespent-list-"+n).children()),e.find(".notice-subtitle .text").text(r),e.removeClass("hidden")},error:function(i){var e=$(".messageSuccessTaskTimeSpentEdit"+n);r=(r=(r+=e.find(".valueForEditTaskTimeSpent1").val())+o)+e.find(".valueForEditTaskTimeSpent2").val(),e.find(".notice-subtitle .text").text(r),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask.checkTaskProgress=function(i){var e=window.saturne.toolbox.getToken(),s=$(this).closest(".risk-row").find(".riskassessment-task-container"),t=$(this).closest(".riskassessment-task-single-content").attr("value");let a=$(this).closest(".riskassessment-tasks").attr("value"),n="",r=s.attr("value"),o="";s.find(".riskassessment-task-progress-checkbox"+t).hasClass("progress-checkbox-check")?(o=0,s.find(".riskassessment-task-progress-checkbox"+t).toggleClass("progress-checkbox-check").toggleClass("progress-checkbox-uncheck")):s.find(".riskassessment-task-progress-checkbox"+t).hasClass("progress-checkbox-uncheck")&&(o=1,s.find(".riskassessment-task-progress-checkbox"+t).toggleClass("progress-checkbox-uncheck").toggleClass("progress-checkbox-check")),window.saturne.loader.display($(".riskassessment-task-single-"+t));s=window.location.href.replace(/#.*/,"");$.ajax({url:s+"&action=checkTaskProgress&token="+e,data:JSON.stringify({riskAssessmentTaskID:t,taskProgress:o}),type:"POST",processData:!1,contentType:!1,success:function(i){$(".fichecenter.risklist").html($(i).find("#searchFormListRisks"));i=$(".messageSuccessTaskEdit");$(".riskassessment-tasks"+a).fadeOut(800),$(".riskassessment-tasks"+a).fadeIn(800),n=(n=(n+=i.find(".valueForEditTask1").val())+r)+i.find(".valueForEditTask2").val(),i.find(".notice-subtitle .text").text(n),i.removeClass("hidden")},error:function(i){var e=$(".messageErrorTaskEdit");n=(n=(n+=e.find(".valueForEditTask1").val())+r)+e.find(".valueForEditTask2").val(),e.find(".notice-subtitle .text").text(n),e.removeClass("hidden")}})},window.digiriskdolibarr.riskassessmenttask.selectRiskassessmentTaskTimespentDateHour=function(i){$(this).closest(".nowraponall").find(".select-riskassessmenttask-timespent-datehour").remove(),$(this).before('<input class="select-riskassessmenttask-timespent-datehour" type="hidden" id="RiskassessmentTaskTimespentDatehour" name="RiskassessmentTaskTimespentDatehour" value='+$(this).val()+">")},window.digiriskdolibarr.riskassessmenttask.selectRiskassessmentTaskTimespentDateMin=function(i){$(this).closest(".nowraponall").find(".select-riskassessmenttask-timespent-datemin").remove(),$(this).before('<input class="select-riskassessmenttask-timespent-datemin" type="hidden" id="RiskassessmentTaskTimespentDatemin" name="RiskassessmentTaskTimespentDatemin" value='+$(this).val()+">")},window.digiriskdolibarr.riskassessmenttask.checkRiskassessmentTaskLabelLength=function(i){255<$(this).val().length?($(".messageWarningTaskLabel").removeClass("hidden"),$(".riskassessment-task-create").removeClass("button-blue"),$(".riskassessment-task-create").addClass("button-grey"),$(".riskassessment-task-create").addClass("button-disable")):($(".messageWarningTaskLabel").addClass("hidden"),$(".riskassessment-task-create").addClass("button-blue"),$(".riskassessment-task-create").removeClass("button-grey"),$(".riskassessment-task-create").removeClass("button-disable"))},window.digiriskdolibarr.riskassessmenttask.redirectOnSharedTaskConfig=function(i){var e=$(".riskassessment-tasks").find('input[name="sharedTaskTooltipUrl"]').val();window.open(location.origin+e,"_blank")},window.digiriskdolibarr.ticket={},window.digiriskdolibarr.ticket.init=function(){window.digiriskdolibarr.ticket.event()},window.digiriskdolibarr.ticket.event=function(){$(document).on("click",".ticket-parentCategory",window.digiriskdolibarr.ticket.selectParentCategory),$(document).on("click",".ticket-subCategory",window.digiriskdolibarr.ticket.selectSubCategory),$(document).on("submit","#sendFile",window.digiriskdolibarr.ticket.tmpStockFile),$(document).on("click",".linked-file-delete",window.digiriskdolibarr.ticket.removeFile),$(document).on("change",".add-dashboard-info",window.digiriskdolibarr.ticket.addDashBoardTicketInfo),$(document).on("click",".close-dashboard-info",window.digiriskdolibarr.ticket.closeDashBoardTicketInfo),$(document).on("keyup",".email",window.digiriskdolibarr.ticket.checkValidEmail),$(document).on("keyup",".options_digiriskdolibarr_ticket_phone",window.digiriskdolibarr.ticket.checkValidPhone)},window.digiriskdolibarr.ticket.updateFormData=function(){var i=window.digiriskdolibarr.ticket.getParentCategory(),e=window.digiriskdolibarr.ticket.getSubCategory();$(".ticket-parentCategory.active").removeClass("active"),$(".ticket-parentCategory"+i).addClass("active"),$(".subCategories").attr("style","display:none"),$(".children"+i).attr("style",""),$(".ticket-subCategory.active").removeClass("active"),$(".ticket-subCategory"+e).addClass("active")},window.digiriskdolibarr.ticket.selectParentCategory=function(){var i=$(".ticketpublicarea").find("#subCategory"),e=$(".ticketpublicarea").find("#parentCategory");i.val(0),e.val($(this).attr("id")),window.digiriskdolibarr.ticket.updateFormData()},window.digiriskdolibarr.ticket.getParentCategory=function(){return $(".ticketpublicarea").find("#parentCategory").val()},window.digiriskdolibarr.ticket.selectSubCategory=function(){$(".ticketpublicarea").find("#subCategory").val($(this).attr("id")),window.digiriskdolibarr.ticket.updateFormData()},window.digiriskdolibarr.ticket.getSubCategory=function(){return $(".ticketpublicarea").find("#subCategory").val()},window.digiriskdolibarr.ticket.tmpStockFile=function(){event.preventDefault();var e=$("#sendfile").prop("files"),s=new FormData;for(let i=0;i<e.length;i++){var t=e[i];s.append("files[]",t)}var a=$("#ticket_id").val();let n=window.saturne.toolbox.getQuerySeparator(document.URL);window.saturne.loader.display($(".files-uploaded")),fetch(document.URL+n+"action=sendfile&ticket_id="+a,{method:"POST",body:s}).then(i=>{$("#sendFileForm").load(document.URL+n+"ticket_id="+a+" #fileLinkedTable")})},window.digiriskdolibarr.ticket.removeFile=function(i){let e=$(this).attr("value");e=e.replace("_mini","");var s=$("#ticket_id").val(),t=window.saturne.toolbox.getQuerySeparator(document.URL);fetch(document.URL+t+"action=removefile&filetodelete="+e+"&ticket_id="+s,{method:"POST"}).then(i=>{$(this).parent().parent().hide()})},window.digiriskdolibarr.ticket.addDashBoardTicketInfo=function(){var i=window.saturne.toolbox.getToken(),e=$("#select2-boxcombo-container").attr("title"),s=e.split(" : ")[0],e=e.split(" : ")[2],t=window.saturne.toolbox.getQuerySeparator(document.URL);$.ajax({url:document.URL+t+"action=adddashboardinfo&token="+i,type:"POST",processData:!1,data:JSON.stringify({digiriskelementID:s,catID:e}),contentType:!1,success:function(i){window.location.reload()},error:function(){}})},window.digiriskdolibarr.ticket.closeDashBoardTicketInfo=function(){var i=window.saturne.toolbox.getToken();let e=$(this);var s=e.attr("data-digiriskelementid"),t=e.attr("data-catid"),a=window.saturne.toolbox.getQuerySeparator(document.URL);$.ajax({url:document.URL+a+"action=closedashboardinfo&token="+i,type:"POST",processData:!1,data:JSON.stringify({digiriskelementID:s,catID:t}),contentType:!1,success:function(i){e.closest(".box-flex-item").fadeOut(400),$(".add-widget-box").attr("style",""),$(".add-widget-box").html($(i).find(".add-widget-box").children())},error:function(){}})},window.digiriskdolibarr.ticket.checkValidEmail=function(){0==/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(this.value)?$(this).css("border","3px solid red"):$(this).css("border","3px solid green")},window.digiriskdolibarr.ticket.checkValidPhone=function(){0==/^(?:(?:(?:\+|00)\d{2}[\s]?(?:\(0\)[\s]?)?)|0){1}[1-9]{1}([\s.-]?)(?:\d{2}\1?){3}\d{2}$/.test(this.value)?$(this).css("border","3px solid red"):$(this).css("border","3px solid green")},window.digiriskdolibarr.digiriskusers={},window.digiriskdolibarr.digiriskusers.init=function(){window.digiriskdolibarr.digiriskusers.event()},window.digiriskdolibarr.digiriskusers.event=function(){$(document).on("input",".digirisk-users #firstname",window.digiriskdolibarr.digiriskusers.fillEmail),$(document).on("input",".digirisk-users #lastname",window.digiriskdolibarr.digiriskusers.fillEmail)},window.digiriskdolibarr.digiriskusers.fillEmail=function(i){var e=$(".digirisk-users #firstname").val(),s=$(".digirisk-users #lastname").val(),t=$(".input-domain-mail").val(),e=window.digiriskdolibarr.digiriskusers.removeDiacritics(e+"."+s+"@"+t).toLowerCase();$(".digirisk-users #email").val(e)},window.digiriskdolibarr.digiriskusers.removeDiacritics=function(i){for(var e="",s=i.normalize("NFD"),t=0,a=0;t<i.length;)e+=s[a],a+=i[t]==s[a]?1:2,t++;return e};
\ No newline at end of file
diff --git a/js/json/dangerCategories.json b/js/json/dangerCategories.json
index be42c5c0b..a93a6a456 100644
--- a/js/json/dangerCategories.json
+++ b/js/json/dangerCategories.json
@@ -1,116 +1,165 @@
-[
-  {
-    "name": "Risques de chute de plain-pied",
-    "nameDigiriskWordPress": "Risques de trébuchement, heurt ou autre pertubation du mouvement",
-    "thumbnail_name": "chutePP_PictoCategorie_v2",
-    "position": 0
-  },
-  {
-    "name": "Risques de chute de hauteur",
-    "thumbnail_name": "chuteH_PictoCategorie_v2",
-    "position": 1
-  },
-  {
-    "name": "Risques liés aux circulations internes de véhicules et d'engins",
-    "nameDigiriskWordPress": "Risques liés aux circulations internes de véhicules",
-    "thumbnail_name": "circulation_PictoCategorie_v2",
-    "position": 3
-  },
-  {
-    "name": "Risques routiers en mission",
-    "thumbnail_name": "circulation_v2",
-    "position": 4
-  },
-  {
-    "name": "Risques liés à la charge physique de travail",
-    "thumbnail_name": "activitePhysique_v2",
-    "position": 5
-  },
-  {
-    "name": "Risques liés à la manutention mécanique",
-    "thumbnail_name": "manutentionMe_PictoCategorie_v2",
-    "position": 6
-  },
-  {
-    "name": "Risques liés aux produits chimiques, aux émissions et aux déchets",
-    "nameDigiriskWordPress": "Risques liés aux produits, aux émissions et aux déchets",
-    "thumbnail_name": "produitsC_PictoCategorie_v2",
-    "position": 7
-  },
-  {
-    "name": "Risques liés aux agents biologiques",
-    "thumbnail_name": "manqueHygiene_PictoCategorie_v2",
-    "position": 8
-  },
-  {
-    "name": "Risques liés aux équipements de travail",
-    "thumbnail_name": "machine_PictoCategorie_v2",
-    "position": 9
-  },
-  {
-    "name": "Risques liés aux effondrements et aux chutes d'objets",
-    "thumbnail_name": "effondrement_PictoCategorie_v2",
-    "position": 10
-  },
-  {
-    "name": "Risques et nuisances liés au bruit",
-    "thumbnail_name": "nuisances_PictoCategorie_v2",
-    "position": 11
-  },
-  {
-    "name": "Risques liés aux ambiances thermiques",
-    "thumbnail_name": "climat_PictoCategorie_v2",
-    "position": 12
-  },
-  {
-    "name": "Risques d'incendie et d'explosion",
-    "nameDigiriskWordPress": "Risques d'incendie, d'explosion",
-    "thumbnail_name": "incendies_PictoCategorie_v2",
-    "position": 13
-  },
-  {
-    "name": "Risques liés à l'électricité",
-    "thumbnail_name": "electricite_PictoCategorie_v2",
-    "position": 14
-  },
-  {
-    "name": "Risques liés aux ambiances lumineuses",
-    "thumbnail_name": "eclairage_PictoCategorie_v2",
-    "position": 15
-  },
-  {
-    "name": "Risques liés aux rayonnements",
-    "thumbnail_name": "rayonnement_v2",
-    "position": 16
-  },
-  {
-    "name": "Risques psychosociaux",
-    "thumbnail_name": "rps_v2",
-    "position": 17
-  },
-  {
-    "name": "Risques liés aux vibrations",
-    "thumbnail_name": "vibration_PictoCategorie_v2",
-    "position": 18
-  },
-  {
-    "name": "Risques de heurt, de cognement",
-    "thumbnail_name": "heurt_PictoCategorie_v2",
-    "position": 19
-  },
-  {
-    "name": "Risques liés aux pratiques addictives",
-    "thumbnail_name": "pratiques_addictives_PictoCategorie_v2",
-    "position": 20
-  },
-  {
-    "name": "Risques liés à l'amiante",
-    "thumbnail_name": "amiante_v2",
-    "position": 21
-  },
-  {
-    "name": "Risques autres",
-    "thumbnail_name": "autre_PictoCategorie_v2",
-    "position": 22
-  }
-]
+[{
+  "risk": [
+    {
+      "name": "Risques de chute de plain-pied",
+      "nameDigiriskWordPress": "Risques de trébuchement, heurt ou autre pertubation du mouvement",
+      "thumbnail_name": "chutePP_PictoCategorie_v2",
+      "position": 0
+    },
+    {
+      "name": "Risques de chute de hauteur",
+      "thumbnail_name": "chuteH_PictoCategorie_v2",
+      "position": 1
+    },
+    {
+      "name": "Risques liés aux circulations internes de véhicules et d'engins",
+      "nameDigiriskWordPress": "Risques liés aux circulations internes de véhicules",
+      "thumbnail_name": "circulation_PictoCategorie_v2",
+      "position": 3
+    },
+    {
+      "name": "Risques routiers en mission",
+      "thumbnail_name": "circulation_v2",
+      "position": 4
+    },
+    {
+      "name": "Risques liés à la charge physique de travail",
+      "thumbnail_name": "activitePhysique_v2",
+      "position": 5
+    },
+    {
+      "name": "Risques liés à la manutention mécanique",
+      "thumbnail_name": "manutentionMe_PictoCategorie_v2",
+      "position": 6
+    },
+    {
+      "name": "Risques liés aux produits chimiques, aux émissions et aux déchets",
+      "nameDigiriskWordPress": "Risques liés aux produits, aux émissions et aux déchets",
+      "thumbnail_name": "produitsC_PictoCategorie_v2",
+      "position": 7
+    },
+    {
+      "name": "Risques liés aux agents biologiques",
+      "thumbnail_name": "manqueHygiene_PictoCategorie_v2",
+      "position": 8
+    },
+    {
+      "name": "Risques liés aux équipements de travail",
+      "thumbnail_name": "machine_PictoCategorie_v2",
+      "position": 9
+    },
+    {
+      "name": "Risques liés aux effondrements et aux chutes d'objets",
+      "thumbnail_name": "effondrement_PictoCategorie_v2",
+      "position": 10
+    },
+    {
+      "name": "Risques et nuisances liés au bruit",
+      "thumbnail_name": "nuisances_PictoCategorie_v2",
+      "position": 11
+    },
+    {
+      "name": "Risques liés aux ambiances thermiques",
+      "thumbnail_name": "climat_PictoCategorie_v2",
+      "position": 12
+    },
+    {
+      "name": "Risques d'incendie et d'explosion",
+      "nameDigiriskWordPress": "Risques d'incendie, d'explosion",
+      "thumbnail_name": "incendies_PictoCategorie_v2",
+      "position": 13
+    },
+    {
+      "name": "Risques liés à l'électricité",
+      "thumbnail_name": "electricite_PictoCategorie_v2",
+      "position": 14
+    },
+    {
+      "name": "Risques liés aux ambiances lumineuses",
+      "thumbnail_name": "eclairage_PictoCategorie_v2",
+      "position": 15
+    },
+    {
+      "name": "Risques liés aux rayonnements",
+      "thumbnail_name": "rayonnement_v2",
+      "position": 16
+    },
+    {
+      "name": "Risques psychosociaux",
+      "thumbnail_name": "rps_v2",
+      "position": 17
+    },
+    {
+      "name": "Risques liés aux vibrations",
+      "thumbnail_name": "vibration_PictoCategorie_v2",
+      "position": 18
+    },
+    {
+      "name": "Risques de heurt, de cognement",
+      "thumbnail_name": "heurt_PictoCategorie_v2",
+      "position": 19
+    },
+    {
+      "name": "Risques liés aux pratiques addictives",
+      "thumbnail_name": "pratiques_addictives_PictoCategorie_v2",
+      "position": 20
+    },
+    {
+      "name": "Risques liés à l'amiante",
+      "thumbnail_name": "amiante_v2",
+      "position": 21
+    },
+    {
+      "name": "Risques autres",
+      "thumbnail_name": "autre_PictoCategorie_v2",
+      "position": 22
+    }
+  ],
+  "riskenvironmental": [
+    {
+      "name": "Risques liés aux émissions dans l’air",
+      "thumbnail_name": "Pictogrammes_environnement_rejets_air",
+      "position": 1
+    },
+    {
+      "name": "Risques liés aux rejets dans l’eau",
+      "thumbnail_name": "Pictogrammes_environnement_rejets_eau",
+      "position": 2
+    },
+    {
+      "name": "Risques liés aux rejets dans le sol",
+      "thumbnail_name": "Pictogrammes_environnement_rejets_sol",
+      "position": 3
+    },
+    {
+      "name": "Risques liés à l’utilisation des matières premières et des ressources naturelles",
+      "thumbnail_name": "Pictogrammes_environnement_matieres_premieres",
+      "position": 4
+    },
+    {
+      "name": "Risques liés à l’utilisation de l’énergie",
+      "thumbnail_name": "Pictogrammes_environnement_utilisation_energie",
+      "position": 5
+    },
+    {
+      "name": "Risques liés à l’énergie émise",
+      "thumbnail_name": "Pictogrammes_environnement_energie_emise",
+      "position": 6
+    },
+    {
+      "name": "Risques liés à la production de déchets et/ou de sous-produits",
+      "thumbnail_name": "Pictogrammes_environnement_production_dechets",
+      "position": 7
+    },
+    {
+      "name": "Risques liés à l’utilisation de l’espace",
+      "thumbnail_name": "Pictogrammes_environnement_utilisation_espace",
+      "position": 8
+    },
+    {
+      "name": "Divers risques environnementaux",
+      "thumbnail_name": "Pictogrammes_environnement_divers",
+      "position": 9
+    }
+  ]
+}]
diff --git a/js/json/default.json b/js/json/default.json
index b4d53d964..1963a72f9 100644
--- a/js/json/default.json
+++ b/js/json/default.json
@@ -43,7 +43,7 @@
 			"768": 98,
 			"1024": 100
 		},
-		"variable": [
+		"risk_variable": [
 		{
 			"name": "Gravite",
 			"description": "0 : Pas de blessure possible 1 : Blessure légère 2 : ITT5 < jours ou effet irréversible 4 : Menace sur la vie",
@@ -224,7 +224,189 @@
 				}
 			}
 		}
-		]
+		],
+    "riskenvironmental_variable": [
+      {
+        "name": "Gravite",
+        "description": "0 : Pas d'impact possible 1 : Impact faible 2 : Impact modéré 3 : Impact important 4 : Impact majeur",
+        "option": {
+          "display_type": "slide",
+          "range": [
+            "0",
+            "4"
+          ],
+          "survey": {
+            "titre": "",
+            "request": [
+              {
+                "question": "Pas d'impact possible",
+                "seuil": "0"
+              },
+              {
+                "question": "Impact faible",
+                "seuil": "1"
+              },
+              {
+                "question": "Impact modéré",
+                "seuil": "2"
+              },
+              {
+                "question": "Impact important",
+                "seuil": "3"
+              },
+              {
+                "question": "Impact majeur",
+                "seuil": "4"
+              }
+            ]
+          }
+        }
+      },
+      {
+        "name": "Fréquence",
+        "description": "0 : Jamais en contact 1 : Evénement exceptionnel (1 fois par an) 2 Evénement peu fréquent (Plusieurs fois par an) 3 : Evénement occasionnelle (1 fois par semaine) 4 : Continu très fréquent (1 fois par jour)",
+        "option": {
+          "display_type": "slide",
+          "range": [
+            "0",
+            "4"
+          ],
+          "survey": {
+            "titre": "",
+            "request": [
+              {
+                "question": "Jamais en contact",
+                "seuil": "0"
+              },
+              {
+                "question": "Evénement exceptionnel (1 fois par an)",
+                "seuil": "1"
+              },
+              {
+                "question": "Evénement peu fréquent (Plusieurs fois par an)",
+                "seuil": "2"
+              },
+              {
+                "question": "Evénement occasionnelle (1 fois par semaine)",
+                "seuil": "3"
+              },
+              {
+                "question": "Continu très fréquent (1 fois par jour)",
+                "seuil": "4"
+              }
+            ]
+          }
+        }
+      },
+      {
+        "name": "Historique",
+        "description": "1 : Jamais arrivé 2 : Circonstances exceptionnelles 3 : S'est produit 2 sur l'an passé 4 : Se produit tous les mois",
+        "option": {
+          "display_type": "slide",
+          "range": [
+            "1",
+            "4"
+          ],
+          "survey": {
+            "titre": "",
+            "request": [
+              {
+                "question": null,
+                "seuil": null
+              },
+              {
+                "question": "Jamais arrivé",
+                "seuil": "1"
+              },
+              {
+                "question": "Circonstances exceptionnelles",
+                "seuil": "2"
+              },
+              {
+                "question": "S'est produit 2 sur l'an passé",
+                "seuil": "3"
+              },
+              {
+                "question": "Se produit tous les mois",
+                "seuil": "4"
+              }
+            ]
+          }
+        }
+      },
+      {
+        "name": "Maitrise",
+        "description": "1 : Bonne maitrise (Compétence, contrôle, procédure) 2 : Assez maitrisé (Compétence, procédure) 3 : Peu maitrisé 4 : Pas maitrisé",
+        "option": {
+          "display_type": "slide",
+          "range": [
+            "1",
+            "4"
+          ],
+          "survey": {
+            "titre": "",
+            "request": [
+              {
+                "question": null,
+                "seuil": null
+              },
+              {
+                "question": "Bonne maitrise (Compétence, contrôle, procédure)",
+                "seuil": "1"
+              },
+              {
+                "question": "Assez maitrisé (Compétence, procédure)",
+                "seuil": "2"
+              },
+              {
+                "question": "Peu maitrisé",
+                "seuil": "3"
+              },
+              {
+                "question": "Pas maitrisé",
+                "seuil": "4"
+              }
+            ]
+          }
+        }
+      },
+      {
+        "name": "Milieu",
+        "description": "1 : Sensibilité nulle 2 : Sensibilité faible 3 : Sensibilité moyenne 4 : Sensibilité forte",
+        "option": {
+          "display_type": "slide",
+          "range": [
+            "1",
+            "4"
+          ],
+          "survey": {
+            "titre": "",
+            "request": [
+              {
+                "question": null,
+                "seuil": null
+              },
+              {
+                "question": "Sensibilité nulle",
+                "seuil": "1"
+              },
+              {
+                "question": "Sensibilité faible",
+                "seuil": "2"
+              },
+              {
+                "question": "Sensibilité moyenne",
+                "seuil": "3"
+              },
+              {
+                "question": "Sensibilité forte",
+                "seuil": "4"
+              }
+            ]
+          }
+        }
+      }
+    ]
 	}
 },
 {
diff --git a/js/modules/risk.js b/js/modules/risk.js
index a1a828758..18bf78679 100644
--- a/js/modules/risk.js
+++ b/js/modules/risk.js
@@ -149,6 +149,11 @@ window.digiriskdolibarr.risk.createRisk = function ( event ) {
 		}
 	})
 
+  var categories = [];
+  $(this).closest('.modal-container').find('.risk-categories').find(":selected").each(function() {
+    categories.push($(this).val());
+  });
+
 	//Task
 	var task      = taskText;
 	let dateStart = elementTask.find('#RiskassessmentTaskDateStartModalRisk').val();
@@ -181,6 +186,7 @@ window.digiriskdolibarr.risk.createRisk = function ( event ) {
 			hourEnd: hourEnd,
 			minEnd: minEnd,
 			budget: budget,
+      categories: categories,
 			criteres: {
 				gravite: criteres['gravite'] ? criteres['gravite'] : 0,
 				occurrence: criteres['occurrence'] ? criteres['occurrence'] : 0,
@@ -249,6 +255,10 @@ window.digiriskdolibarr.risk.saveRisk = function ( event ) {
 	}
 	let riskRef =  $('.risk_row_'+editedRiskId).find('.risk-container > div:nth-child(1)').text();
 
+  var categories = [];
+  $(this).closest('.modal-container').find('.risk-categories').find(":selected").each(function() {
+    categories.push($(this).val());
+  });
 
 	$.ajax({
 		url:  document.URL + '&action=saveRisk&token='+token,
@@ -258,7 +268,8 @@ window.digiriskdolibarr.risk.saveRisk = function ( event ) {
 			riskID: editedRiskId,
 			category: category,
 			comment: description,
-			newParent: newParent
+			newParent: newParent,
+      categories: categories
 		}),
 		contentType: false,
 		success: function ( resp ) {
diff --git a/langs/fr_FR/digiriskdolibarr.lang b/langs/fr_FR/digiriskdolibarr.lang
index 7f84c5272..d19c90742 100644
--- a/langs/fr_FR/digiriskdolibarr.lang
+++ b/langs/fr_FR/digiriskdolibarr.lang
@@ -126,14 +126,15 @@ SocieteSchedules = Horaires de la société
 #
 
 # Data - Donnée
-DigiriskDocuments        = Document Digirisk
-Responsible              = Responsable
-ContactsAction           = Contacts action
-PERCOTooltip             = Si votre société possède un PERCO, cochez cette case
-PEETooltip               = Si votre société possède un PEE, cochez cette case
-ShowPictoName            = Afficher le nom du pictogramme de danger
-ShowPictoNameDescription = Afficher le nom du pictogramme de danger de risque dans les documents <br> Utile si on souhaite transférer le tableau dans un tableur
-
+DigiriskDocuments              = Document Digirisk
+Responsible                    = Responsable
+ContactsAction                 = Contacts action
+PERCOTooltip                   = Si votre société possède un PERCO, cochez cette case
+PEETooltip                     = Si votre société possède un PEE, cochez cette case
+ShowPictoName                  = Afficher le nom du pictogramme de danger
+ShowPictoNameDescription       = Afficher le nom du pictogramme de danger de risque dans les documents <br> Utile si on souhaite transférer le tableau dans un tableur
+RiskAssessmentColor            = Couleur des évaluations
+RiskAssessmentColorDescription = Affiche la couleur des évaluations dans le document Orque
 
 #
 # LegalDisplay - Affichage légal
@@ -144,6 +145,7 @@ LegalDisplaysMin = Affichages Légaux
 
 # Data - Donnée
 LegalDisplay             = Affichage légal
+Legaldisplay             = Affichage légal
 HowToSetDataLegalDisplay = Pour configurer les données sur l'affichage légal, aller dans Accueil - Configuration - Société/Organisation - Sécurité
 
 LegalDisplayDocumentGenerated       = Génération de l'affichage légal
@@ -183,6 +185,7 @@ InformationsSharingsMin = Diffusions d'Informations
 
 # Data - Donnée
 InformationsSharing                  = Diffusion d'informations
+Informationssharing                  = Diffusion d'informations
 InformationsSharingDocumentGenerated = Génération de Diffusion d'Informations
 HowToSetDataInformationsSharing      = Pour configurer les données sur la diffusion d'informations, aller dans Accueil - Configuration - Société/Organisation - Social
 ConfigureSecurityAndSocialData       = Configurer les données de la société
@@ -225,6 +228,7 @@ PreventionPlan                                        = Plan de prévention
 Preventionplan                                        = Plan de prévention
 ThePreventionplan                                     = le plan de prévention
 PreventionPlanDocument                                = Plan de prévention
+Preventionplandocument                                = Plan de prévention
 PreventionPlanDocumentGenerated                       = Génération du plan de prévention
 PreventionPlanList                                    = Liste des plans de prévention
 PreventionPlanLine                                    = risque(s)
@@ -323,6 +327,7 @@ FirePermit                                        = Permis de feu
 Firepermit                                        = Permis de feu
 TheFirepermit                                     = le permis de feu
 FirePermitDocument                                = Permis de feu
+Firepermitdocument                                = Permis de feu
 FirePermitDocumentGenerated                       = Génération de Permis de Feu
 FirePermitCreated                                 = Création de Permis de Feu
 FirePermitModified                                = Modification de Permis de Feu
@@ -544,6 +549,7 @@ TheAccident                       = l'accident
 AccidentInvestigation             = Enquête accident
 Accident_investigation            = Enquête accident
 AccidentInvestigationDocument     = Document d'enquête accident
+Accidentinvestigationdocument     = Document d'enquête accident
 accidentinvestigationdocument.odt = Enquête accident
 NewAccidentInvestigation          = Nouvelle enquête accident
 UpdateAccidentInvestigation       = Modifier une enquête accident
@@ -582,6 +588,8 @@ PreventionplansCategoriesArea     =	Espace des tags/catégories des plans de pr
 AddPreventionplanIntoCategory     = Assigner cette catégorie au plan de prévention
 FirepermitsCategoriesArea         =	Espace des tags/catégories des permis de feu
 AddFirepermitIntoCategory         = Assigner cette catégorie au permis de feu
+RisksCategoriesArea               =	Espace des tags/catégories des risques
+AddRiskIntoCategory               = Assigner cette catégorie au risque
 
 # AccidentTooltip - Tooltip des accidents
 VictimActivityTooltip              = Précisez l’activité ou la tâche de la victime au moment de l’accident, c’est-à-dire ce que faisait la victime
@@ -644,7 +652,8 @@ Rescuer      = Secouriste
 ListingRisksDocumentMin = listings des risques avec documents
 
 # Data - Donnée
-ListingRisksDocument            = Listing des risques avec documents
+ListingRisksDocument            = Listing risques
+Listingrisksdocument            = Listing risques
 ListingRisksDocumentGenerated   = Génération de listing des Risques avec Documents
 listingrisksdocument.odt        = Listing des risques avec documents
 listingrisksdocument_custom.odt = Listing des risques avec documents personnalisé
@@ -658,6 +667,7 @@ ListingRisksPhotosMin = listings des risques avec photos
 
 # Data - Donnée
 ListingRisksPhoto            = Listing des risques avec photos
+Listingrisksphoto            = Listing des risques avec photos
 ListingRisksPhotoGenerated   = Génération de listing des Risques avec Photos
 listingrisksphoto.odt        = Listing des risques avec photos
 listingrisksphoto_custom.odt = Listing des risques avec photos personnalisé
@@ -672,6 +682,7 @@ ListingRisksActionsMin = listings des risques avec actions correctives
 
 # Data - Donnée
 ListingRisksAction                        = Listing des risques avec actions correctives
+Listingrisksaction                        = Listing des risques avec actions correctives
 ListingRisksActionGenerated               = Génération de listing des Risques avec Actions Correctives
 listingrisksaction.odt                    = Listing des risques avec actions correctives
 listingrisksaction_custom.odt             = Listing des risques avec actions correctives personnalisé
@@ -688,8 +699,8 @@ ShowTaskDoneListingRisksActionDescription = Permettre d'afficher ou non les tâc
 RiskAssessmentDocumentsMin = Documents Uniques
 
 # Data - Donnée
-RiskAssessmentDocument = Document unique
-
+RiskAssessmentDocument                                    = Document unique
+Riskassessmentdocument                                    = Document unique
 RiskAssessmentDocumentGenerated                           = Génération du Document Unique
 AuditStartDate                                            = Date de début d'audit
 AuditEndDate                                              = Date de fin d'audit
@@ -729,6 +740,7 @@ RiskAssessmentDocumentContent = Veuillez trouver ci-joint le ZIP et le document
 
 # Data - Donnée
 AuditReportDocument     = Rapport d'audit
+Auditreportdocument     = Rapport d'audit
 AuditReportDocumentsMin = rapports d'audit
 auditreportdocument.odt = Rapport d'audit
 
@@ -742,6 +754,7 @@ auditreportdocument.odt = Rapport d'audit
 
 # Data - Donnée
 GroupmentDocument                        = Fiche de Groupement
+Groupmentdocument                        = Fiche de Groupement
 GroupmentDocumentGenerated               = Génération de fiche de Groupement
 groupmentdocument.odt                    = Fiche de Groupement
 groupmentdocument_custom.odt             = Fiche de Groupement personnalisée
@@ -756,6 +769,7 @@ ShowTaskDoneGroupmentDocumentDescription = Permettre d'afficher ou non les tâch
 
 # Data - Donnée
 WorkUnitDocument                        = Fiche d'Unité de travail
+Workunitdocument                        = Fiche d'Unité de travail
 WorkUnitDocumentGenerated               = Génération de fiche d'Unité de Travail
 workunitdocument.odt                    = Fiche d'Unité de travail
 workunitdocument_custom.odt             = Fiche d'Unité de travail personnalisée
@@ -884,6 +898,7 @@ RisksMin = risques
 # Data - Donnée
 Risks                                      = Risques
 Risk                                       = Risque
+Riskprofessionals                          = Risques professionnels
 RiskCreated                                = Création d'un risque
 RiskModified                               = Modification d'un risque
 RiskDeleted                                = Suppression d'un risque
@@ -973,6 +988,38 @@ RedRisk    = Risque à traiter
 BlackRisk  = Risque inacceptable
 
 
+
+#
+# RiskEnvironmentals - Risques environnementaux
+#
+
+# Data - Donnée
+Environment                                    = Environnement
+RiskEnvironmentals                             = Risques environnementaux
+Riskenvironmentals                             = Risques environnementaux
+DigiriskElementRiskenvironmentalsList          = Liste des risques environnementaux
+DigiriskElementInheritedRiskenvironmentalsList = Liste des risques hérités environnementaux
+DigiriskElementSharedRiskenvironmentalsList    = Liste des risques partagés environnementaux
+ImportSharedRiskenvironmentals                 = Importer des risques environnementaux partagés
+ConfirmImportSharedRiskenvironmentals          = Veuillez choisir les risques partagés environnementaux à importer
+EnvironmentDescription                         = Planification - Actions à mettre en œuvre face aux risques et opportunités
+
+#
+# ListingRisksEnvironmentalAction - Listing des risques environnementaux action
+#
+
+# Right - Droit
+ListingRisksEnvironmentalActionMin = Listing des risques environnementaux avec actions correctives
+
+# Data - Donnée
+ListingRisksEnvironmentalAction            = Listing des risques environnementaux avec actions correctives
+Listingrisksenvironmentalaction            = Listing des risques environnementaux avec actions correctives
+ListingRisksEnvironmentalActionGenerated   = Génération de listing des risques environnementaux avec actions correctives
+listingrisksenvironmentalaction.odt        = Listing des risques environnementaux avec actions correctives
+listingrisksenvironmentalaction_custom.odt = Listing des risques environnementaux avec actions correctives personnalisé
+
+
+
 #
 # RiskAssessment - Évaluation
 #
@@ -1333,6 +1380,7 @@ TicketPublicInterfaceOtherName = Interface de gestion des registres SST et DGI
 
 # Data - Donnée
 TicketDocument            = Fiche du ticket
+Ticketdocument            = Fiche du ticket
 ticketdocument.odt        = Fiche du ticket
 ticketdocument_custom.odt = Fiche personnalisée du ticket
 ticketdocument_events.odt = Fiche du ticket avec événements
@@ -1350,6 +1398,7 @@ DocumentModelOrque              = Modèles de document de rapport prévisionnel
 # Register Document
 
 RegisterDocument     = Registre des accidents bénins
+Registerdocument     = Registre des accidents bénins
 RegisterDocumentsMin = registres des accidents bénins
 registerdocument.odt = Registre des accidents bénins
 
diff --git a/lib/digiriskdolibarr_digiriskelement.lib.php b/lib/digiriskdolibarr_digiriskelement.lib.php
index 2379358b6..1d8a2532b 100644
--- a/lib/digiriskdolibarr_digiriskelement.lib.php
+++ b/lib/digiriskdolibarr_digiriskelement.lib.php
@@ -49,10 +49,15 @@ function digiriskelement_prepare_head(DigiriskElement $object)
         }
 
         if ($user->rights->digiriskdolibarr->risk->read) {
-            $head[$h][0] = dol_buildpath('/digiriskdolibarr/view/digiriskelement/digiriskelement_risk.php', 1) . '?id=' . $object->id;
+            $head[$h][0] = dol_buildpath('/digiriskdolibarr/view/digiriskelement/digiriskelement_risk.php', 1) . '?id=' . $object->id . '&type=risk';
             $head[$h][1] = $conf->browser->layout != 'phone' ? '<i class="fas fa-exclamation-triangle pictofixedwidth"></i>' . $langs->trans('Risks') : '<i class="fas fa-exclamation-triangle"></i>';
             $head[$h][2] = 'elementRisk';
             $h++;
+
+            $head[$h][0] = dol_buildpath('/digiriskdolibarr/view/digiriskelement/digiriskelement_risk.php', 1) . '?id=' . $object->id . '&type=riskenvironmental';
+            $head[$h][1] = $conf->browser->layout != 'phone' ? '<i class="fas fa-leaf pictofixedwidth"></i>' . $langs->trans('RiskEnvironmentals') : '<i class="fas fa-leaf"></i>';
+            $head[$h][2] = 'elementRiskenvironmental';
+            $h++;
         }
 
         if ($user->rights->digiriskdolibarr->evaluator->read) {
@@ -79,10 +84,17 @@ function digiriskelement_prepare_head(DigiriskElement $object)
         if ($object->element_type == 'groupment') {
             if ($user->rights->digiriskdolibarr->listingrisksaction->read && $user->rights->digiriskdolibarr->listingrisksphoto->read && $user->rights->digiriskdolibarr->listingrisksdocument->read) {
                 $head[$h][0] = dol_buildpath('/digiriskdolibarr/view/digiriskelement/digiriskelement_listingrisksdocument.php', 1) . '?id=' . $object->id;
-                $head[$h][1] = $conf->browser->layout != 'phone' ? '<i class="fas fa-exclamation pictofixedwidth"></i>' . $langs->trans('ListingRisksDocument') : '<i class="fas fa-exclamation"></i>';
+                $head[$h][1] = $conf->browser->layout != 'phone' ? '<i class="fas fa-list pictofixedwidth"></i>' . $langs->trans('ListingRisksDocument') : '<i class="fas fa-list"></i>';
                 $head[$h][2] = 'elementListingRisksDocument';
                 $h++;
             }
+
+            if ($user->rights->digiriskdolibarr->listingrisksenvironmentalaction->read) {
+                $head[$h][0] = dol_buildpath('/digiriskdolibarr/view/digiriskelement/digiriskelement_environment.php', 1) . '?id=' . $object->id;
+                $head[$h][1] = $conf->browser->layout != 'phone' ? '<i class="fas fa-list pictofixedwidth"></i>' . $langs->trans('Environment') : '<i class="fas fa-list"></i>';
+                $head[$h][2] = 'elementEnvironment';
+                $h++;
+            }
         }
 
         $head[$h][0] = dol_buildpath('/digiriskdolibarr/view/digiriskelement/digiriskelement_register.php', 1) . '?id=' . $object->id;
diff --git a/lib/digiriskdolibarr_digiriskstandard.lib.php b/lib/digiriskdolibarr_digiriskstandard.lib.php
index b105b9055..631cb5d7e 100644
--- a/lib/digiriskdolibarr_digiriskstandard.lib.php
+++ b/lib/digiriskdolibarr_digiriskstandard.lib.php
@@ -68,11 +68,18 @@ function digiriskstandard_prepare_head(DigiriskStandard $object): array
 
     if ($user->rights->digiriskdolibarr->listingrisksaction->read && $user->rights->digiriskdolibarr->listingrisksphoto->read  && $user->rights->digiriskdolibarr->listingrisksdocument->read) {
         $head[$h][0] = dol_buildpath('/digiriskdolibarr/view/digiriskelement/digiriskelement_listingrisksdocument.php', 1) . '?type=standard';
-        $head[$h][1] = $conf->browser->layout != 'phone' ? '<i class="fas fa-exclamation pictofixedwidth"></i>' . $langs->trans('ListingRisksDocument') : '<i class="fas fa-exclamation"></i>';
+        $head[$h][1] = $conf->browser->layout != 'phone' ? '<i class="fas fa-list pictofixedwidth"></i>' . $langs->trans('ListingRisksDocument') : '<i class="fas fa-list"></i>';
         $head[$h][2] = 'elementListingRisksDocument';
         $h++;
     }
 
+    if ($user->rights->digiriskdolibarr->listingrisksenvironmentalaction->read) {
+        $head[$h][0] = dol_buildpath('/digiriskdolibarr/view/digiriskelement/digiriskelement_environment.php', 1) . '?type=standard';
+        $head[$h][1] = $conf->browser->layout != 'phone' ? '<i class="fas fa-list pictofixedwidth"></i>' . $langs->trans('Environment') : '<i class="fas fa-list"></i>';
+        $head[$h][2] = 'elementEnvironment';
+        $h++;
+    }
+
     if ($user->rights->digiriskdolibarr->riskassessmentdocument->read) {
         $head[$h][0] = dol_buildpath('/digiriskdolibarr/view/digiriskstandard/digiriskstandard_riskassessmentdocument.php', 1);
         $head[$h][1] = $conf->browser->layout != 'phone' ? '<i class="fas fa-file-alt pictofixedwidth"></i>' . $langs->trans("RiskAssessmentDocument") : '<i class="fas fa-file-alt"></i>';
diff --git a/sql/data.sql b/sql/data.sql
index 75e1d939b..53567fb63 100644
--- a/sql/data.sql
+++ b/sql/data.sql
@@ -913,3 +913,6 @@ INSERT INTO llx_c_digiriskdolibarr_action_trigger (rowid, entity, elementtype, r
 -- 9.15.0
 INSERT INTO llx_c_digiriskdolibarr_action_trigger (rowid, entity, elementtype, ref, label, description, active, position) VALUES (77, 0, 'listingrisksdocument@digiriskdolibarr', 'LISTINGRISKSDOCUMENT_GENERATE', 'ListingRisksDocumentGenerated', 'Executed when a listing risks document is generated', 1, 81);
 INSERT INTO llx_c_digiriskdolibarr_action_trigger (rowid, entity, elementtype, ref, label, description, active, position) VALUES (78, 0, 'auditreportdocument@digiriskdolibarr', 'AUDITREPORTDOCUMENT_GENERATE', 'AuditReportDocumentGenerated', 'Executed when a audit report document is generated', 1, 91);
+
+-- 10.0.0
+INSERT INTO llx_c_digiriskdolibarr_action_trigger (rowid, entity, elementtype, ref, label, description, active, position) VALUES (79, 0, 'listingrisksenvironmentalaction@digiriskdolibarr', 'LISTINGRISKSENVIRONMENTALACTION_GENERATE', 'ListingRisksEnvironmentalActionGenerated', 'Executed when a listing risks environmental action is generated', 1, 82);
diff --git a/sql/riskanalysis/llx_categorie_risk.key.sql b/sql/riskanalysis/llx_categorie_risk.key.sql
new file mode 100644
index 000000000..c9e521a68
--- /dev/null
+++ b/sql/riskanalysis/llx_categorie_risk.key.sql
@@ -0,0 +1,21 @@
+-- Copyright (C) 2024 EVARISK <technique@evarisk.com>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+
+ALTER TABLE llx_categorie_risk ADD PRIMARY KEY pk_categorie_risk (fk_categorie, fk_risk);
+ALTER TABLE llx_categorie_risk ADD INDEX idx_categorie_risk_fk_categorie (fk_categorie);
+ALTER TABLE llx_categorie_risk ADD INDEX idx_categorie_risk_fk_risk (fk_risk);
+
+ALTER TABLE llx_categorie_risk ADD CONSTRAINT fk_categorie_risk_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+ALTER TABLE llx_categorie_risk ADD CONSTRAINT fk_categorie_risk_risk_rowid FOREIGN KEY (fk_risk) REFERENCES llx_risk (rowid);
diff --git a/sql/riskanalysis/llx_categorie_risk.sql b/sql/riskanalysis/llx_categorie_risk.sql
new file mode 100644
index 000000000..a7c03d4f1
--- /dev/null
+++ b/sql/riskanalysis/llx_categorie_risk.sql
@@ -0,0 +1,21 @@
+-- Copyright (C) 2024 EVARISK <technique@evarisk.com>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+
+create table llx_categorie_risk
+(
+  fk_categorie  integer NOT NULL,
+  fk_risk       integer NOT NULL,
+  import_key    varchar(14)
+)ENGINE=innodb;
diff --git a/sql/riskanalysis/llx_digiriskdolibarr_risk.sql b/sql/riskanalysis/llx_digiriskdolibarr_risk.sql
index 0e0d9b055..057efb6a2 100644
--- a/sql/riskanalysis/llx_digiriskdolibarr_risk.sql
+++ b/sql/riskanalysis/llx_digiriskdolibarr_risk.sql
@@ -1,4 +1,4 @@
--- Copyright (C) 2021-2023 EVARISK <technique@evarisk.com>
+-- Copyright (C) 2021-2024 EVARISK <technique@evarisk.com>
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -14,18 +14,19 @@
 -- along with this program.  If not, see https://www.gnu.org/licenses/.
 
 CREATE TABLE llx_digiriskdolibarr_risk(
-	rowid         integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
-	ref           varchar(128) DEFAULT '(PROV)' NOT NULL,
-	ref_ext       varchar(128),
-	entity        integer DEFAULT 1 NOT NULL,
-	date_creation datetime NOT NULL,
-	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-	import_key    varchar(14),
-	status        smallint DEFAULT 1,
-	category      varchar(255),
+  rowid         integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+  ref           varchar(128) DEFAULT '(PROV)' NOT NULL,
+  ref_ext       varchar(128),
+  entity        integer DEFAULT 1 NOT NULL,
+  date_creation datetime NOT NULL,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  import_key    varchar(14),
+  status        smallint DEFAULT 1,
+  category      varchar(255),
   description   text,
-	fk_user_creat integer NOT NULL,
-	fk_user_modif integer,
-	fk_element    integer NOT NULL,
-	fk_projet     integer NOT NULL
+  type          varchar(255) DEFAULT 'risk' NOT NULL,
+  fk_user_creat integer NOT NULL,
+  fk_user_modif integer,
+  fk_element    integer NOT NULL,
+  fk_projet     integer NOT NULL
 ) ENGINE=innodb;
diff --git a/sql/update.sql b/sql/update.sql
index caf5492f3..35397d1da 100644
--- a/sql/update.sql
+++ b/sql/update.sql
@@ -249,3 +249,6 @@ DELETE FROM llx_c_digiriskdolibarr_action_trigger WHERE ref = 'PREVENTIONPLAN_IN
 -- 9.15.0
 -- Check if ref are duplicate and delete them
 DELETE t1 FROM llx_c_digiriskdolibarr_action_trigger t1 JOIN llx_c_digiriskdolibarr_action_trigger t2 WHERE t1.rowid > t2.rowid AND t1.ref = t2.ref;
+
+-- 10.0.0
+ALTER TABLE `llx_digiriskdolibarr_risk` ADD `type` VARCHAR(255) NOT NULL DEFAULT 'risk' AFTER `description`;
diff --git a/view/digiriskelement/digiriskelement_environment.php b/view/digiriskelement/digiriskelement_environment.php
new file mode 100644
index 000000000..21e41c5be
--- /dev/null
+++ b/view/digiriskelement/digiriskelement_environment.php
@@ -0,0 +1,150 @@
+<?php
+/* Copyright (C) 2024 EVARISK <technique@evarisk.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    view/digiriskelement/digiriskelement_environment.php
+ * \ingroup digiriskdolibarr
+ * \brief   Page to view environment document
+ */
+
+// Load DigiriskDolibarr environment
+if (file_exists('../digiriskdolibarr.main.inc.php')) {
+    require_once __DIR__ . '/../digiriskdolibarr.main.inc.php';
+} elseif (file_exists('../../digiriskdolibarr.main.inc.php')) {
+    require_once __DIR__ . '/../../digiriskdolibarr.main.inc.php';
+} else {
+    die('Include of digiriskdolibarr main fails');
+}
+
+require_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+
+require_once __DIR__ . '/../../class/digiriskelement.class.php';
+require_once __DIR__ . '/../../class/digiriskstandard.class.php';
+require_once __DIR__ . '/../../class/digiriskdolibarrdocuments/listingrisksenvironmentaldocument.class.php';
+require_once __DIR__ . '/../../lib/digiriskdolibarr_digiriskelement.lib.php';
+require_once __DIR__ . '/../../lib/digiriskdolibarr_digiriskstandard.lib.php';
+require_once __DIR__ . '/../../lib/digiriskdolibarr_function.lib.php';
+
+global $conf, $db, $hookmanager, $langs, $user;
+
+// Load translation files required by the page
+saturne_load_langs(['other']);
+
+// Get parameters
+$id          = GETPOST('id', 'int');
+$action      = GETPOST('action', 'aZ09');
+$subaction   = GETPOST('subaction', 'aZ09');
+$type        = GETPOST('type', 'aZ09');
+
+// Initialize technical objects
+$document = new ListingRisksEnvironmentalDocument($db);
+$hookmanager->initHooks(array('digiriskelementenvironment', 'digiriskelementview', 'digiriskstandardview', 'globalcard')); // Note that conf->hooks_modules contains array
+
+if ($type != 'standard') {
+    $object = new DigiriskElement($db);
+    $object->fetch($id);
+} else {
+    $object = new DigiriskStandard($db);
+    $object->fetch($conf->global->DIGIRISKDOLIBARR_ACTIVE_STANDARD);
+}
+$digiriskstandard = new DigiriskStandard($db);
+$project          = new Project($db);
+
+$upload_dir = $conf->digiriskdolibarr->multidir_output[isset($conf->entity) ? $conf->entity : 1];
+
+// Security check
+$permissionToRead   = $user->rights->digiriskdolibarr->digiriskstandard->read && ($user->rights->digiriskdolibarr->listingrisksenvironmentalaction->read);
+$permissiontoadd    = $user->rights->digiriskdolibarr->listingrisksenvironmentalaction->write;
+$permissiontodelete = $user->rights->digiriskdolibarr->listingrisksenvironmentalaction->delete;
+saturne_check_access($permissionToRead, $object);
+
+/*
+ * Actions
+ */
+
+$parameters = [];
+$resHook    = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($resHook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($resHook)) {
+    if ($object->element == 'digiriskstandard') {
+        $previousRef = $object->ref;
+        $object->ref = '';
+    }
+
+    // Actions builddoc, forcebuilddoc, remove_file
+    require_once __DIR__ . '/../../../saturne/core/tpl/documents/documents_action.tpl.php';
+
+    // Action to generate pdf from odt file
+    require_once __DIR__ . '/../../../saturne/core/tpl/documents/saturne_manual_pdf_generation_action.tpl.php';
+
+    if ($object->element == 'digiriskstandard') {
+        $object->ref = $previousRef;
+    }
+}
+
+/*
+ * View
+ */
+
+$title   = $langs->trans('Environment');
+$helpUrl = 'FR:Module_Digirisk#Impression_des_listings_de_risques';
+
+digirisk_header($title, $helpUrl);
+
+// Part to show record
+saturne_get_fiche_head($object, 'elementEnvironment', $title);
+
+// Object card
+// ------------------------------------------------------------
+if ($type != 'standard') {
+    list($moreHtmlref, $moreParams) = $object->getBannerTabContent();
+
+    saturne_banner_tab($object,'ref','none', 0, 'ref', 'ref', $moreHtmlref, true, $moreParams);
+} else {
+    // Project
+    $moreHtmlref = '<div class="refidno">';
+    $project->fetch($conf->global->DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT);
+    $moreHtmlref .= $langs->trans('Project') . ' : ' . getNomUrlProject($project, 1, 'blank', 1);
+    $moreHtmlref .= '</div>';
+    $moduleNameLowerCase = 'mycompany';
+    saturne_banner_tab($object,'ref','none', 0, 'ref', 'ref', $moreHtmlref, true);
+    $moduleNameLowerCase = 'digiriskdolibarr';
+}
+
+print dol_get_fiche_end();
+
+// Document Generation -- Génération des documents
+$urlSource = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
+if ($type != 'standard') {
+	$objRef    = dol_sanitizeFileName($object->ref);
+	$dirFiles  = ['listingrisksenvironmentalaction/' . $objRef];
+} else {
+    $dirFiles   = ['listingrisksenvironmentalaction'];
+	$urlSource .= '&type=standard';
+}
+$fileDir    = [$upload_dir . '/' . $dirFiles[0]];
+$modulePart = 'digiriskdolibarr:ListingRisksEnvironmentalDocument';
+
+print saturne_show_documents($modulePart, $dirFiles, $fileDir, $urlSource, $permissiontoadd, $permissiontodelete, '', 1, 0, 0, 0, 0, '', '', $langs->defaultlang, 0, $object);
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/view/digiriskelement/digiriskelement_listingrisksdocument.php b/view/digiriskelement/digiriskelement_listingrisksdocument.php
index 310fcbd8b..bf894dc8b 100644
--- a/view/digiriskelement/digiriskelement_listingrisksdocument.php
+++ b/view/digiriskelement/digiriskelement_listingrisksdocument.php
@@ -68,8 +68,8 @@
 
 // Security check
 $permissionToRead   = $user->rights->digiriskdolibarr->digiriskstandard->read && ($user->rights->digiriskdolibarr->listingrisksdocument->read || $user->rights->digiriskdolibarr->listingrisksaction->read || $user->rights->digiriskdolibarr->listingrisksphoto->read);
-$permissiontoadd    = $user->rights->digiriskdolibarr->listingrisksdocument->write || $user->rights->digiriskdolibarr->listingrisksaction->write || $user->rights->digiriskdolibarr->listingrisksphoto->write;
-$permissiontodelete = $user->rights->digiriskdolibarr->listingrisksdocument->delete || $user->rights->digiriskdolibarr->listingrisksaction->write || $user->rights->digiriskdolibarr->listingrisksphoto->write;
+$permissiontoadd    = $user->rights->digiriskdolibarr->listingrisksdocument->write || $user->rights->digiriskdolibarr->listingrisksaction->write ||  $user->rights->digiriskdolibarr->listingrisksphoto->write;
+$permissiontodelete = $user->rights->digiriskdolibarr->listingrisksdocument->delete || $user->rights->digiriskdolibarr->listingrisksaction->delete || $user->rights->digiriskdolibarr->listingrisksphoto->delete;
 saturne_check_access($permissionToRead, $object);
 
 /*
@@ -136,7 +136,7 @@
 	$objRef    = dol_sanitizeFileName($object->ref);
 	$dirFiles  = ['listingrisksaction/' . $objRef, 'listingrisksphoto/' . $objRef, 'listingrisksdocument/' . $objRef];
 } else {
-    $dirFiles    = ['listingrisksaction', 'listingrisksphoto', 'listingrisksdocument'];
+    $dirFiles   = ['listingrisksaction', 'listingrisksphoto', 'listingrisksdocument'];
 	$urlSource .= '&type=standard';
 }
 $fileDir    = [$upload_dir . '/' . $dirFiles[0], $upload_dir . '/' . $dirFiles[1], $upload_dir . '/' . $dirFiles[2]];
diff --git a/view/digiriskelement/digiriskelement_risk.php b/view/digiriskelement/digiriskelement_risk.php
index b20591276..c15266e08 100644
--- a/view/digiriskelement/digiriskelement_risk.php
+++ b/view/digiriskelement/digiriskelement_risk.php
@@ -40,6 +40,10 @@
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
 require_once DOL_DOCUMENT_ROOT . '/ecm/class/ecmdirectory.class.php';
 require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+if (isModEnabled('categorie')) {
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+}
 
 // Load DigiriskDolibarr libraries
 require_once __DIR__ . '/../../class/digiriskelement.class.php';
@@ -69,9 +73,13 @@
 $sortorder      = GETPOST('sortorder', 'alpha');
 $sharedrisks    = GETPOST('sharedrisks', 'int') ? GETPOST('sharedrisks', 'int') : $conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS;
 $inheritedrisks = GETPOST('inheritedrisks', 'int') ? GETPOST('inheritedrisks', 'int') : $conf->global->DIGIRISKDOLIBARR_SHOW_INHERITED_RISKS_IN_LISTINGS;
+$riskType       = GETPOSTISSET('type') ? GETPOST('type') : 'risk';
 $page           = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $page           = is_numeric($page) ? $page : 0;
 $page           = $page == -1 ? 0 : $page;
+if (isModEnabled('categorie')) {
+    $search_category_array = GETPOST('search_category_risk_list', 'array');
+}
 
 // Initialize technical objects
 $object           = new DigiriskElement($db);
@@ -190,7 +198,7 @@
 
 	$error = 0;
 
-	$backtopage = dol_buildpath('/digiriskdolibarr/view/digiriskelement/digiriskelement_risk.php', 1) . '?id=' . ($id > 0 ? $id : '__ID__');
+	$backtopage = dol_buildpath('/digiriskdolibarr/view/digiriskelement/digiriskelement_risk.php', 1) . '?id=' . ($id > 0 ? $id : '__ID__') . '&type=' . $riskType;
 
 	require_once __DIR__ . '/../../core/tpl/riskanalysis/risk/digiriskdolibarr_risk_actions.tpl.php';
 }
@@ -200,7 +208,7 @@
  */
 
 $form    = new Form($db);
-$title   = $langs->trans("DigiriskElementRisk");
+$title   = $langs->trans(ucfirst($riskType) . 's');
 $helpUrl = 'FR:Module_Digirisk#.C3.89valuation_des_Risques';
 
 digirisk_header($title, $helpUrl);
@@ -222,9 +230,9 @@
 	if (($action == 'import_shared_risks' && (empty($conf->use_javascript_ajax) || !empty($conf->dol_use_jmobile)))        // Output when action = clone if jmobile or no js
 		|| (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))) {                            // Always output when not jmobile nor js
 
-		$allrisks = $risk->fetchAll('ASC', 'fk_element', 0, 0, array('customsql' => 'status > 0 AND entity NOT IN (' . $conf->entity . ') AND fk_element > 0'));
+		$allrisks = $risk->fetchAll('ASC', 'fk_element', 0, 0, array('customsql' => 'status > 0 AND type = "' . $riskType . '" AND entity NOT IN (' . $conf->entity . ') AND fk_element > 0'));
 		$formquestionimportsharedrisks = array(
-			'text' => '<i class="fas fa-circle-info"></i>' . $langs->trans("ConfirmImportSharedRisks"),
+			'text' => '<i class="fas fa-circle-info"></i>' . $langs->trans('ConfirmImportShared' . ucfirst($riskType) . 's'),
 		);
 
         $evaluation->ismultientitymanaged = 0;
@@ -322,7 +330,7 @@
 			}
 
 		}
-		$formconfirm .= digiriskformconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ImportSharedRisks'), '', 'confirm_import_shared_risks', $formquestionimportsharedrisks, 'yes', 'actionButtonImportSharedRisks', 800, 800);
+		$formconfirm .= digiriskformconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&type=' . $riskType, $langs->trans('ImportShared' . ucfirst($riskType) . 's'), '', 'confirm_import_shared_risks', $formquestionimportsharedrisks, 'yes', 'actionButtonImportSharedRisks', 800, 800);
 	}
 
 	// Call Hook formConfirm
@@ -338,7 +346,7 @@
 if ($object->id > 0) {
 	$res = $object->fetch_optionals();
 
-	saturne_get_fiche_head($object, 'elementRisk', $title);
+	saturne_get_fiche_head($object, 'element' . ucfirst($riskType), $title);
 
 	// Object card
 	// ------------------------------------------------------------
@@ -349,7 +357,7 @@
 	// Buttons for actions
 	print '<div class="tabsAction" >';
 	if ($permissiontoadd && !empty($conf->global->DIGIRISKDOLIBARR_SHOW_SHARED_RISKS)) {
-		print '<span class="butAction" id="actionButtonImportSharedRisks" title="" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=import_shared_risks' . '">' . $langs->trans("ImportSharedRisks") . '</span>';
+		print '<span class="butAction" id="actionButtonImportSharedRisks" title="" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&type=' . $riskType . '&action=import_shared_risks' . '">' . $langs->trans('ImportShared' . ucfirst($riskType) . 's') . '</span>';
 	}
 	print '</div>';
 
diff --git a/view/digiriskelement/risk_list.php b/view/digiriskelement/risk_list.php
index f770b354e..666d4652e 100644
--- a/view/digiriskelement/risk_list.php
+++ b/view/digiriskelement/risk_list.php
@@ -51,6 +51,10 @@
 require_once './../../core/modules/digiriskdolibarr/riskanalysis/riskassessment/mod_riskassessment_standard.php';
 require_once './../../lib/digiriskdolibarr_digiriskstandard.lib.php';
 require_once './../../lib/digiriskdolibarr_function.lib.php';
+if (isModEnabled('categorie')) {
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+}
 
 // Load translation files required by the page
 saturne_load_langs(['other']);
@@ -68,9 +72,13 @@
 $limit       = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield   = GETPOST('sortfield', 'alpha');
 $sortorder   = GETPOST('sortorder', 'alpha');
+$riskType    = GETPOSTISSET('type') ? GETPOST('type') : 'risk';
 $page        = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $page        = is_numeric($page) ? $page : 0;
 $page        = $page == -1 ? 0 : $page;
+if (isModEnabled('categorie')) {
+    $search_category_array = GETPOST('search_category_risk_list', 'array');
+}
 
 // Initialize technical objects
 $object           = new DigiriskStandard($db);
@@ -173,8 +181,9 @@
 		foreach ($evaluation->fields as $key => $val) {
 			$search[$key] = '';
 		}
-		$toselect             = '';
-		$search_array_options = array();
+		$toselect              = '';
+		$search_array_options  = [];
+        $search_category_array = [];
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
 		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
@@ -183,7 +192,7 @@
 
 	$error = 0;
 
-	$backtopage = dol_buildpath('/digiriskdolibarr/view/digiriskelement/risk_list.php', 1);
+	$backtopage = dol_buildpath('/digiriskdolibarr/view/digiriskelement/risk_list.php?type=' . $riskType, 1);
 
 	require_once './../../core/tpl/riskanalysis/risk/digiriskdolibarr_risk_actions.tpl.php';
 }
@@ -194,7 +203,7 @@
 
 $form = new Form($db);
 
-$title    = $langs->trans("RiskList");
+$title    = $langs->trans(ucfirst($riskType) . 's');
 $helpUrl = 'FR:Module_Digirisk#.C3.89valuation_des_Risques';
 
 saturne_header(1,'', $title, $helpUrl);
diff --git a/view/digirisktools.php b/view/digirisktools.php
index b3be3c0fc..4c99dfdd1 100644
--- a/view/digirisktools.php
+++ b/view/digirisktools.php
@@ -512,6 +512,7 @@
 					$risksExportArray['status']      = $risksingle->status;
 					$risksExportArray['category']    = $risksingle->category;
 					$risksExportArray['description'] = $risksingle->description;
+                    $risksExportArray['type']        = $risksingle->type;
 					$risksExportArray['fk_element']  = $risksingle->fk_element;
 					$risksExportArray['fk_projet']   = $risksingle->fk_projet;
 
@@ -682,8 +683,9 @@
 							$risk->status      = $digiriskExportRisk['status'];
 							$risk->category    = $digiriskExportRisk['category'];
 							$risk->description = $digiriskExportRisk['description'];
+                            $risk->type        = $digiriskExportRisk['type'];
 							$risk->fk_element  = $digiriskelementid;
-							$risk->fk_projet   = $conf->global->DIGIRISKDOLIBARR_DU_PROJECT;
+							$risk->fk_projet   = $digiriskExportRisk['type'] == 'risk' ? $conf->global->DIGIRISKDOLIBARR_DU_PROJECT : $conf->global->DIGIRISKDOLIBARR_ENVIRONMENT_PROJECT;
 
 							if ( ! $error) {
 								$result = $risk->create($user, true);