9.4.0

.github/ISSUE_TEMPLATE/demande-d-am-lioration.md

@@ -2,7 +2,7 @@
 name: Demande d'amélioration
 about: Une idée, des idées pour le projet c'est par ici
 title: "[Amélioration]"
-labels: Enhancement
+labels: Amélioration
 assignees: lmag
 
 ---

README.md

@@ -2,9 +2,9 @@
 
 ## Informations
 
-Version du module: 9.3.3
+Version du module: 9.4.0
 
-Dernière mise à jour: 24/06/2022
+Dernière mise à jour: 25/07/2022
 
 Prérequis:
 * Dolibarr min version 14.0.0

admin/config/digiriskdocuments.php

@@ -357,6 +357,30 @@
 	}
 
 	print '</table>';
+
+	if ($documentType == 'riskassessmentdocument') {
+		print load_fiche_titre($langs->trans("DigiriskRiskAssessmentDocumentData"), '', '');
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<td>' . $langs->trans("Name") . '</td>';
+		print '<td>' . $langs->trans("Description") . '</td>';
+		print '<td class="center">' . $langs->trans("Status") . '</td>';
+		print '</tr>';
+
+		print '<tr class="oddeven"><td>';
+		print $langs->trans('ShowTaskDone');
+		print "</td><td>";
+		print $langs->trans('ShowTaskDoneDescription');
+		print '</td>';
+
+		print '<td class="center">';
+		print ajax_constantonoff('DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_SHOW_TASK_DONE');
+		print '</td>';
+		print '</tr>';
+		print '</table>';
+	}
+
 	print '<hr>';
 
 }

admin/config/riskassessmentdocument.php

@@ -762,6 +762,42 @@
 }
 print '</table>';
 
+print load_fiche_titre($langs->trans("DigiriskRiskSignData"), '', '');
+
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
+print '<td>' . $langs->trans("Name") . '</td>';
+print '<td>' . $langs->trans("Description") . '</td>';
+print '<td class="center">' . $langs->trans("Status") . '</td>';
+print '</tr>';
+
+print '<tr class="oddeven"><td>';
+print $langs->trans('ShowInheritedRiskSigns');
+print "</td><td>";
+print $langs->trans('ShowInheritedRiskSignsDescription');
+print '</td>';
+
+print '<td class="center">';
+print ajax_constantonoff('DIGIRISKDOLIBARR_SHOW_INHERITED_RISKSIGNS');
+print '</td>';
+print '</tr>';
+
+$result = !empty($conf->mc->entities['risksign']) ? strpos($conf->mc->entities['risksign'], $conf->entity) : 0;
+
+if ($conf->multicompany->enabled && !empty($conf->mc->sharings['risksign']) && $result > 0) {
+	print '<tr class="oddeven"><td>';
+	print $langs->trans('ShowSharedRiskSigns');
+	print "</td><td>";
+	print $langs->trans('ShowSharedRiskSignsDescription');
+	print '</td>';
+
+	print '<td class="center">';
+	print ajax_constantonoff('DIGIRISKDOLIBARR_SHOW_SHARED_RISKSIGNS');
+	print '</td>';
+	print '</tr>';
+}
+print '</table>';
+
 // Page end
 print dol_get_fiche_end();
 llxFooter();

admin/setup.php

@@ -157,6 +157,17 @@
 print ajax_constantonoff('DIGIRISKDOLIBARR_USE_CAPTCHA');
 print '</td>';
 print '</tr>';
+
+// Advanced Import
+print '<tr class="oddeven"><td>';
+print  $langs->trans("AdvancedImport");
+print '</td><td>';
+print $langs->trans('AdvancedImportDescription');
+print '</td>';
+print '<td class="center">';
+print ajax_constantonoff('DIGIRISKDOLIBARR_TOOLS_ADVANCED_IMPORT');
+print '</td>';
+print '</tr>';
 print '</table>';
 
 print load_fiche_titre($langs->trans("MediaData"), '', '');

admin/ticket/ticket.php

@@ -92,14 +92,14 @@
 }
 
 if ($action == 'generateExtrafields') {
-	$ret1 = $extra_fields->addExtraField('digiriskdolibarr_ticket_lastname', $langs->trans("LastName"), 'varchar', 2000, 255, 'ticket', 0, 0, '', '', 1, '', 1);
-	$ret2 = $extra_fields->addExtraField('digiriskdolibarr_ticket_firstname', $langs->transnoentities("FirstName"), 'varchar', 2100, 255, 'ticket', 0, 0, '', '', 1, '', 1);
-	$ret3 = $extra_fields->addExtraField('digiriskdolibarr_ticket_phone', $langs->transnoentities("Phone"), 'phone', 2200, '', 'ticket', 0, 0, '', '', 1, '', 1);
-	$ret4 = $extra_fields->addExtraField('digiriskdolibarr_ticket_service', $langs->trans("Service"), 'varchar', 2300, 255, 'ticket', 0, 0, '', '', 1, '', 1);
-	$ret5 = $extra_fields->addExtraField('digiriskdolibarr_ticket_location', $langs->trans("Location"), 'varchar', 2400, 255, 'ticket', 0, 0, '', '', 1, '', 1);
-	$ret6 = $extra_fields->addExtraField('digiriskdolibarr_ticket_date', $langs->trans("Date"), 'datetime', 2500, '', 'ticket', 0, 0, '', '', 1, '', 1);
+	$ret1 = $extra_fields->addExtraField('digiriskdolibarr_ticket_lastname', $langs->trans("LastName"), 'varchar', 2000, 255, 'ticket', 0, 0, '', '', 1, '', 1, '', '', 0);
+	$ret2 = $extra_fields->addExtraField('digiriskdolibarr_ticket_firstname', $langs->transnoentities("FirstName"), 'varchar', 2100, 255, 'ticket', 0, 0, '', '', 1, '', 1, '', '', 0);
+	$ret3 = $extra_fields->addExtraField('digiriskdolibarr_ticket_phone', $langs->transnoentities("Phone"), 'phone', 2200, '', 'ticket', 0, 0, '', '', 1, '', 1, '', '', 0);
+	$ret4 = $extra_fields->addExtraField('digiriskdolibarr_ticket_service', $langs->trans("Service"), 'varchar', 2300, 255, 'ticket', 0, 0, '', '', 1, '', 1, '', '', 0);
+	$ret5 = $extra_fields->addExtraField('digiriskdolibarr_ticket_location', $langs->trans("Location"), 'varchar', 2400, 255, 'ticket', 0, 0, '', '', 1, '', 1, '', '', 0);
+	$ret6 = $extra_fields->addExtraField('digiriskdolibarr_ticket_date', $langs->trans("Date"), 'datetime', 2500, '', 'ticket', 0, 0, '', '', 1, '', 1, '', '', 0);
 	if ($ret1 > 0 && $ret2 > 0 && $ret3 > 0 && $ret4 > 0 && $ret5 > 0 && $ret6 > 0) {
-		dolibarr_set_const($db, 'DIGIRISKDOLIBARR_TICKET_EXTRAFIELDS', 1, 'integer', 0, '', $conf->entity);
+		dolibarr_set_const($db, 'DIGIRISKDOLIBARR_TICKET_EXTRAFIELDS', 1, 'integer', 0, '', 0);
 		setEventMessages($langs->trans('ExtrafieldsCreated'), array());
 	} else {
 		setEventMessages($extra_fields->error, null, 'errors');
@@ -191,6 +191,12 @@
 	setEventMessages($langs->trans('ChildCategoryLabelSet'), array());
 }
 
+if ($action == 'setTicketSuccessMessage') {
+	$successmessage = GETPOST('DIGIRISKDOLIBARR_TICKET_SUCCESS_MESSAGE');
+	dolibarr_set_const($db, 'DIGIRISKDOLIBARR_TICKET_SUCCESS_MESSAGE', $successmessage, 'chaine', 0, '', $conf->entity);
+	setEventMessages($langs->trans('TicketSuccessMessageSet'), array());
+}
+
 /*
  * View
  */
@@ -294,6 +300,34 @@
 	print '</form>';
 
 	print '</table>';
+
+	print load_fiche_titre($langs->trans("TicketSuccessMessageData"), '', '');
+
+	print '<table class="noborder centpercent">';
+
+	print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" enctype="multipart/form-data" >';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="setTicketSuccessMessage">';
+
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Name").'</td>';
+	print '<td>' . $langs->trans("Description") . '</td>';
+	print '<td class="center">' . $langs->trans("Action") . '</td>';
+	print "</tr>";
+
+	// Ticket success message
+	$successmessage = $langs->trans($conf->global->DIGIRISKDOLIBARR_TICKET_SUCCESS_MESSAGE) ?: $langs->trans('YouMustNotifyYourHierarchy');
+	print '<tr class="oddeven"><td>'.$langs->trans("TicketSuccessMessage");
+	print '</td><td>';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor('DIGIRISKDOLIBARR_TICKET_SUCCESS_MESSAGE', $successmessage, '100%', 120, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70);
+	$doleditor->Create();
+	print '</td>';
+	print '<td><input type="submit" class="button" name="save" value="' . $langs->trans("Save") . '">';
+	print '</td></tr>';
+	print '</form>';
+	print '</table>';
+
 	print '</div>';
 
 	// Project
@@ -440,6 +474,7 @@
 	print '<input type="hidden" name="action" value="generateExtrafields">';
 	print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
 
+
 	print '<tr class="oddeven"><td>' . $langs->trans("GenerateExtrafields") . '<sup><a href="https://wiki.dolibarr.org/index.php?title=Module_Digirisk#DigiRisk_-_Registre_de_s.C3.A9curit.C3.A9_et_Tickets" target="_blank" > 4</a></sup></td>';
 	print '<td class="center">';
 	print $conf->global->DIGIRISKDOLIBARR_TICKET_EXTRAFIELDS ? $langs->trans('AlreadyGenerated') : $langs->trans('NotCreated');

class/accident.class.php

@@ -514,15 +514,15 @@ class AccidentWorkStop extends CommonObjectLine
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid'             => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
-		'ref'               => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 1, 'noteditable' => '1', 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of object"),
-		'entity'            => array('type' => 'integer', 'label' => 'Entity', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 0,),
-		'date_creation'     => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 40, 'notnull' => 1, 'visible' => 0,),
-		'tms'               => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 50, 'notnull' => 0, 'visible' => 0,),
-		'status'            => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 0, 'index' => 0,),
-		'workstop_days'     => array('type' => 'integer', 'label' => 'WorkStopDays', 'enabled' => '1', 'position' => 70, 'notnull' => -1, 'visible' => -1,),
-		'date_end_workstop' => array('type' => 'datetime', 'label' => 'DateEndWorkStop', 'enabled' => '1', 'position' => 80, 'notnull' => 0, 'visible' => 0,),
-		'fk_accident'       => array('type' => 'integer', 'label' => 'FkAccident', 'enabled' => '1', 'position' => 90, 'notnull' => 1, 'visible' => 0,),
+		'rowid'               => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
+		'ref'                 => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 1, 'noteditable' => '1', 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of object"),
+		'entity'              => array('type' => 'integer', 'label' => 'Entity', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 0,),
+		'date_creation'       => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 40, 'notnull' => 1, 'visible' => 0,),
+		'tms'                 => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 50, 'notnull' => 0, 'visible' => 0,),
+		'status'              => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 0, 'index' => 0,),
+		'workstop_days'       => array('type' => 'integer', 'label' => 'WorkStopDays', 'enabled' => '1', 'position' => 70, 'notnull' => -1, 'visible' => -1,),
+		'date_start_workstop' => array('type' => 'datetime', 'label' => 'DateEndWorkStop', 'enabled' => '1', 'position' => 80, 'notnull' => 0, 'visible' => 0,),
+		'fk_accident'         => array('type' => 'integer', 'label' => 'FkAccident', 'enabled' => '1', 'position' => 90, 'notnull' => 1, 'visible' => 0,),
 	);
 
 	public $rowid;
@@ -532,7 +532,7 @@ class AccidentWorkStop extends CommonObjectLine
 	public $tms;
 	public $status;
 	public $workstop_days;
-	public $date_end_workstop;
+	public $date_start_workstop;
 	public $fk_accident;
 
 	/**
@@ -560,7 +560,7 @@ public function fetch($rowid)
 	{
 		global $db;
 
-		$sql  = 'SELECT t.rowid, t.ref, t.date_creation, t.status, t.workstop_days, t.date_end_workstop, t.fk_accident';
+		$sql  = 'SELECT t.rowid, t.ref, t.date_creation, t.status, t.workstop_days, t.date_start_workstop, t.fk_accident';
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . 'digiriskdolibarr_accident_workstop as t';
 		$sql .= ' WHERE t.rowid = ' . $rowid;
 		$sql .= ' AND entity IN (' . getEntity($this->table_element) . ')';
@@ -569,13 +569,13 @@ public function fetch($rowid)
 		if ($result) {
 			$objp = $db->fetch_object($result);
 
-			$this->id                = $objp->rowid;
-			$this->ref               = $objp->ref;
-			$this->date_creation     = $objp->date_creation;
-			$this->status            = $objp->status;
-			$this->workstop_days     = $objp->workstop_days;
-			$this->date_end_workstop = $objp->date_end_workstop;
-			$this->fk_accident       = $objp->fk_accident;
+			$this->id                  = $objp->rowid;
+			$this->ref                 = $objp->ref;
+			$this->date_creation       = $objp->date_creation;
+			$this->status              = $objp->status;
+			$this->workstop_days       = $objp->workstop_days;
+			$this->date_start_workstop = $objp->date_start_workstop;
+			$this->fk_accident         = $objp->fk_accident;
 
 			$db->free($result);
 
@@ -596,7 +596,7 @@ public function fetch($rowid)
 	public function fetchFromParent($parent_id = 0, $limit = 0)
 	{
 		global $db;
-		$sql  = 'SELECT t.rowid, t.ref, t.date_creation, t.status, t.workstop_days, t.date_end_workstop';
+		$sql  = 'SELECT t.rowid, t.ref, t.date_creation, t.status, t.workstop_days, t.date_start_workstop';
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . 'digiriskdolibarr_accident_workstop as t';
 		if ($parent_id > 0) {
 			$sql .= ' WHERE t.fk_accident = ' . $parent_id;
@@ -617,13 +617,13 @@ public function fetchFromParent($parent_id = 0, $limit = 0)
 
 				$record = new self($db);
 
-				$record->id                = $obj->rowid;
-				$record->ref               = $obj->ref;
-				$record->date_creation     = $obj->date_creation;
-				$record->status            = $obj->status;
-				$record->workstop_days     = $obj->workstop_days;
-				$record->date_end_workstop = $obj->date_end_workstop;
-				$record->fk_accident       = $obj->fk_accident;
+				$record->id                  = $obj->rowid;
+				$record->ref                 = $obj->ref;
+				$record->date_creation       = $obj->date_creation;
+				$record->status              = $obj->status;
+				$record->workstop_days       = $obj->workstop_days;
+				$record->date_start_workstop = $obj->date_start_workstop;
+				$record->fk_accident         = $obj->fk_accident;
 
 				$records[$record->id] = $record;
 
@@ -656,15 +656,15 @@ public function insert(User $user, $notrigger = false)
 
 		// Insertion dans base de la ligne
 		$sql  = 'INSERT INTO ' . MAIN_DB_PREFIX . 'digiriskdolibarr_accident_workstop';
-		$sql .= ' (ref, entity, date_creation, status, workstop_days, date_end_workstop, fk_accident';
+		$sql .= ' (ref, entity, date_creation, status, workstop_days, date_start_workstop, fk_accident';
 		$sql .= ')';
 		$sql .= " VALUES (";
 		$sql .= "'" . $db->escape($this->ref) . "'" . ", ";
 		$sql .= $this->entity . ", ";
 		$sql .= "'" . $db->escape($db->idate($now)) . "'" . ", ";
 		$sql .= $this->status . ", ";
 		$sql .= $this->workstop_days . ", ";
-		$sql .= "'" . $db->escape($db->idate($this->date_end_workstop)) . "'" . ", ";
+		$sql .= "'" . $db->escape($db->idate($this->date_start_workstop)) . "'" . ", ";
 		$sql .= $this->fk_accident;
 
 		$sql .= ')';
@@ -708,7 +708,7 @@ public function update($user = '', $notrigger = false)
 		$sql .= " ref='" . $db->escape($this->ref) . "',";
 		$sql .= " status=" . $this->status . ",";
 		$sql .= " workstop_days=" . $this->workstop_days . ",";
-		$sql .= " date_end_workstop='" . $db->escape($db->idate($this->date_end_workstop)) . "',";
+		$sql .= " date_start_workstop='" . $db->escape($db->idate($this->date_start_workstop)) . "',";
 		$sql .= " fk_accident=" . $db->escape($this->fk_accident);
 		$sql .= " WHERE rowid = " . $this->id;
 

class/actions_changeselectedfields.php

@@ -0,0 +1,46 @@
+<?php
+/* Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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			htdocs/core/actions_changeselectedfields.inc.php
+ *  \brief			Code for actions when we change list of fields on a list page
+ */
+
+
+// $action must be defined
+// $db must be defined
+// $conf must be defined
+// $object must be defined (object is loaded in this file with fetch)
+
+// Save selection
+if (GETPOST('formfilteraction', 'alphanohtml') == 'listafterchangingselectedfields') {
+	$tabparam = array();
+
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+
+	if (GETPOST($selectedfields_label)) {
+		$tabparam["MAIN_SELECTEDFIELDS_".$varpage] = GETPOST($selectedfields_label);
+	}
+
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+	$result = dol_set_user_param($db, $conf, $user, $tabparam);
+
+	//$action='list';
+	//var_dump($tabparam);exit;
+}