Evarisk#3204 [Accident] fix: error on document

evarisk-micka · Aug 17, 2023 · 9ae0ae7 · 9ae0ae7
1 parent 66c237d
commit 9ae0ae7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/core/modules/modDigiriskDolibarr.class.php b/core/modules/modDigiriskDolibarr.class.php
@@ -449,6 +449,7 @@ public function __construct($db)
 			"/ecm/digiriskdolibarr/listingrisksaction",
 			"/ecm/digiriskdolibarr/listingrisksphoto",
 			"/ecm/digiriskdolibarr/ticketdocument",
+			"/ecm/digiriskdolibarr/accidentinvestigationdocument",
 			"/ecm/digiriskdolibarr/medias"
 		);
 
@@ -764,12 +765,14 @@ public function __construct($db)
 			391 => array('DIGIRISKDOLIBARR_AUTOMATIC_PDF_GENERATION', 'integer', 0, '', 0, 'current'),
 			392 => array('DIGIRISKDOLIBARR_MANUAL_PDF_GENERATION', 'integer', 0, '', 0, 'current'),
 
+			// CONST ACCIDENT INVESTIGATION
+			395 => array('DIGIRISKDOLIBARR_ACCIDENTINVESTIGATION_ADDON', 'chaine', 'mod_accident_investigation_standard', '', 0, 'current'),
+
 			// CONST ACCIDENT INVESTIGATION DOCUMENT
-			395 => array('DIGIRISKDOLIBARR_ACCIDENT_INVESTIGATION_ADDON', 'chaine', 'mod_accident_investigation_standard', '', 0, 'current'),
 			396 => array('DIGIRISKDOLIBARR_ACCIDENTINVESTIGATIONDOCUMENT_ADDON', 'chaine', 'mod_accident_investigation_document_standard', '', 0, 'current'),
-			397 => array('DIGIRISKDOLIBARR_ACCIDENTINVESTIGATIONDOCUMENT_ADDON_ODT_PATH','chaine', 'DOL_DOCUMENT_ROOT/custom/digiriskdolibarr/documents/doctemplates/accident_investigation/', '', 0, 'current'),
-			398 => array('DIGIRISKDOLIBARR_ACCIDENTINVESTIGATIONDOCUMENT_CUSTOM_ADDON_ODT_PATH', 'chaine', 'DOL_DATA_ROOT/ecm/digiriskdolibarr/accident_investigation/', '', 0, 'current'),
-			399 => array('DIGIRISKDOLIBARR_ACCIDENTINVESTIGATION_DOCUMENT_DEFAULT_MODEL', 'chaine', 'template_accidentinvestigation_odt', '', 0, 'current'),
+			397 => array('DIGIRISKDOLIBARR_ACCIDENTINVESTIGATIONDOCUMENT_ADDON_ODT_PATH','chaine', 'DOL_DOCUMENT_ROOT/custom/digiriskdolibarr/documents/doctemplates/accidentinvestigationdocument/', '', 0, 'current'),
+			398 => array('DIGIRISKDOLIBARR_ACCIDENTINVESTIGATIONDOCUMENT_CUSTOM_ADDON_ODT_PATH', 'chaine', 'DOL_DATA_ROOT' . (($conf->entity == 1 ) ? '/' : '/' . $conf->entity . '/') . 'ecm/digiriskdolibarr/accidentinvestigationdocument/', '', 0, 'current'),
+			399 => array('DIGIRISKDOLIBARR_ACCIDENTINVESTIGATIONDOCUMENT_DEFAULT_MODEL', 'chaine', 'template_accidentinvestigationdocument_odt', '', 0, 'current'),
 		);
 
 		if ( ! isset($conf->digiriskdolibarr) || ! isset($conf->digiriskdolibarr->enabled) ) {

diff --git a/...templates/accidentinvestigation/index.php → ...s/accidentinvestigationdocument/index.php b/...templates/accidentinvestigation/index.php → ...s/accidentinvestigationdocument/index.php
diff --git a/...gation/template_accidentinvestigation.odt → ...emplate_accidentinvestigationdocument.odt b/...gation/template_accidentinvestigation.odt → ...emplate_accidentinvestigationdocument.odt
diff --git a/langs/fr_FR/digiriskdolibarr.lang b/langs/fr_FR/digiriskdolibarr.lang
@@ -660,7 +660,7 @@ NbWorkedHours = Nombre d\'heures travaillées
 AccidentInvestigation = Enquête Accident
 Accident_investigation = Enquête Accident
 AccidentInvestigationDocument = Document d'enquête accident
-accidentinvestigation.odt = Enquête accident
+accidentinvestigationdocument.odt = Enquête accident
 NewAccidentInvestigation = Nouvelle Enquête Accident
 AccidentInvestigationList = Liste des Enquêtes Accidents