Skip to content

Commit

Permalink
Merge pull request #1640 from Evarisk/9.1.1
Browse files Browse the repository at this point in the history 
9.1.1
  • Loading branch information
@nicolas-eoxia
nicolas-eoxia authored Mar 14, 2022
2 parents 8219b0f + f9d7b60 commit 3136921
Show file tree
Hide file tree
Showing 72 changed files with 1,199 additions and 426 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

## Informations

Version du module: 9.1.0
Version du module: 9.1.1

Dernière mise à jour: 10/03/2022
Dernière mise à jour: 14/03/2022

Prérequis:
* Dolibarr min version 13.0.0
Expand Down
34 changes: 17 additions & 17 deletions admin/securityconf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,14 @@
$resources->digirisk_dolibarr_set_resources($db, $user->id, 'PoisonControlCenter', 'societe', $antipoison_id, $conf->entity);
$resources->digirisk_dolibarr_set_resources($db, $user->id, 'Responsible', 'societe', $responsible_id, $conf->entity);

dolibarr_set_const($db, "DIGIRISK_LOCATION_OF_DETAILED_INSTRUCTION", GETPOST("emplacementCD", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISK_SOCIETY_DESCRIPTION", GETPOST("description", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISK_GENERAL_MEANS", GETPOST("moyensgeneraux", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISK_GENERAL_RULES", GETPOST("consignesgenerales", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISK_FIRST_AID", GETPOST("firstaid", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISK_RULES_LOCATION", GETPOST("emplacementRI", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISK_DUER_LOCATION", GETPOST("emplacementDU", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISK_COLLECTIVE_AGREEMENT_LOCATION", GETPOST("emplacementCC", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISKDOLIBARR_LOCATION_OF_DETAILED_INSTRUCTION", GETPOST("emplacementCD", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISKDOLIBARR_SOCIETY_DESCRIPTION", GETPOST("description", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISKDOLIBARR_GENERAL_MEANS", GETPOST("moyensgeneraux", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISKDOLIBARR_GENERAL_RULES", GETPOST("consignesgenerales", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISKDOLIBARR_FIRST_AID", GETPOST("firstaid", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISKDOLIBARR_RULES_LOCATION", GETPOST("emplacementRI", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISKDOLIBARR_DUER_LOCATION", GETPOST("emplacementDU", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISKDOLIBARR_COLLECTIVE_AGREEMENT_LOCATION", GETPOST("emplacementCC", 'none'), 'chaine', 0, '', $conf->entity);

if ($action != 'updateedit' && ! $error) {
header("Location: " . $_SERVER["PHP_SELF"]);
Expand All @@ -138,7 +138,7 @@
$counter = 0;

$securityResources = array("SAMU","Pompiers","Police","AllEmergencies","RightsDefender","PoisonControlCenter", "Responsible", "LabourDoctorSociety", "LabourDoctorContact", "LabourInspectorSociety", "LabourInspectorContact" );
$securityConsts = array("DIGIRISK_LOCATION_OF_DETAILED_INSTRUCTION", "DIGIRISK_SOCIETY_DESCRIPTION", "DIGIRISK_GENERAL_MEANS", "DIGIRISK_GENERAL_RULES", "DIGIRISK_FIRST_AID", "DIGIRISK_RULES_LOCATION", "DIGIRISK_DUER_LOCATION", "DIGIRISK_COLLECTIVE_AGREEMENT_LOCATION");
$securityConsts = array("DIGIRISKDOLIBARR_LOCATION_OF_DETAILED_INSTRUCTION", "DIGIRISKDOLIBARR_SOCIETY_DESCRIPTION", "DIGIRISKDOLIBARR_GENERAL_MEANS", "DIGIRISKDOLIBARR_GENERAL_RULES", "DIGIRISKDOLIBARR_FIRST_AID", "DIGIRISKDOLIBARR_RULES_LOCATION", "DIGIRISKDOLIBARR_DUER_LOCATION", "DIGIRISKDOLIBARR_COLLECTIVE_AGREEMENT_LOCATION");
$socialResources = array("TitularsCSE", "AlternatesCSE", "TitularsDP", "AlternatesDP");

$maxnumber = count($securityResources) + count($securityConsts);
Expand Down Expand Up @@ -480,7 +480,7 @@
// * Location of detailed instructions - Emplacement de la consigne détaillée *

print '<tr class="oddeven"><td><label for="emplacementCD">' . $langs->trans("LocationOfDetailedInstructions") . '</label></td><td>';
$doleditor = new DolEditor('emplacementCD', $conf->global->DIGIRISK_LOCATION_OF_DETAILED_INSTRUCTION ? $conf->global->DIGIRISK_LOCATION_OF_DETAILED_INSTRUCTION : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor = new DolEditor('emplacementCD', $conf->global->DIGIRISKDOLIBARR_LOCATION_OF_DETAILED_INSTRUCTION ? $conf->global->DIGIRISKDOLIBARR_LOCATION_OF_DETAILED_INSTRUCTION : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor->Create();
print '</td></tr>';

Expand All @@ -493,28 +493,28 @@
// * Description - Emplacement de la consigne détaillée *

print '<tr class="oddeven"><td><label for="description">' . $langs->trans("Description") . '</label></td><td>';
$doleditor = new DolEditor('description', $conf->global->DIGIRISK_SOCIETY_DESCRIPTION ? $conf->global->DIGIRISK_SOCIETY_DESCRIPTION : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor = new DolEditor('description', $conf->global->DIGIRISKDOLIBARR_SOCIETY_DESCRIPTION ? $conf->global->DIGIRISKDOLIBARR_SOCIETY_DESCRIPTION : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor->Create();
print '</td></tr>';

// * General means at disposal - Moyens généraux mis à disposition *

print '<tr class="oddeven"><td><label for="moyensgeneraux">' . $langs->trans("GeneralMeansAtDisposal") . '</label></td><td>';
$doleditor = new DolEditor('moyensgeneraux', $conf->global->DIGIRISK_GENERAL_MEANS ? $conf->global->DIGIRISK_GENERAL_MEANS : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor = new DolEditor('moyensgeneraux', $conf->global->DIGIRISKDOLIBARR_GENERAL_MEANS ? $conf->global->DIGIRISKDOLIBARR_GENERAL_MEANS : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor->Create();
print '</td></tr>';

// * General instructions - Consignes générales *

print '<tr class="oddeven"><td><label for="consignesgenerales">' . $langs->trans("GeneralInstructions") . '</label></td><td>';
$doleditor = new DolEditor('consignesgenerales', $conf->global->DIGIRISK_GENERAL_RULES ? $conf->global->DIGIRISK_GENERAL_RULES : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor = new DolEditor('consignesgenerales', $conf->global->DIGIRISKDOLIBARR_GENERAL_RULES ? $conf->global->DIGIRISKDOLIBARR_GENERAL_RULES : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor->Create();
print '</td></tr>';

// * General instructions - Consignes générales *

print '<tr class="oddeven"><td><label for="firstaid">' . $langs->trans("FirstAid") . '</label></td><td>';
$doleditor = new DolEditor('firstaid', $conf->global->DIGIRISK_FIRST_AID ? $conf->global->DIGIRISK_FIRST_AID : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor = new DolEditor('firstaid', $conf->global->DIGIRISKDOLIBARR_FIRST_AID ? $conf->global->DIGIRISKDOLIBARR_FIRST_AID : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor->Create();
print '</td></tr>';

Expand All @@ -525,7 +525,7 @@
// * Rules of procedure location - Emplacement du règlement intérieur *

print '<tr class="oddeven"><td><label for="emplacementRI">' . $langs->trans("Location") . '</label></td><td>';
$doleditor = new DolEditor('emplacementRI', $conf->global->DIGIRISK_RULES_LOCATION ? $conf->global->DIGIRISK_RULES_LOCATION : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor = new DolEditor('emplacementRI', $conf->global->DIGIRISKDOLIBARR_RULES_LOCATION ? $conf->global->DIGIRISKDOLIBARR_RULES_LOCATION : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor->Create();
print '</td></tr>';

Expand All @@ -536,7 +536,7 @@
// * Risks evaluation location - Emplacement du Document Unique *

print '<tr class="oddeven"><td><label for="emplacementDU">' . $langs->trans("Location") . '</label></td><td>';
$doleditor = new DolEditor('emplacementDU', $conf->global->DIGIRISK_DUER_LOCATION ? $conf->global->DIGIRISK_DUER_LOCATION : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor = new DolEditor('emplacementDU', $conf->global->DIGIRISKDOLIBARR_DUER_LOCATION ? $conf->global->DIGIRISKDOLIBARR_DUER_LOCATION : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor->Create();
print '</td></tr>';

Expand All @@ -547,7 +547,7 @@
// * Collective Agreement location - Emplacement de la Convention collective *

print '<tr class="oddeven"><td><label for="emplacementCC">' . $langs->trans("Location") . '</label></td><td>';
$doleditor = new DolEditor('emplacementCC', $conf->global->DIGIRISK_COLLECTIVE_AGREEMENT_LOCATION ? $conf->global->DIGIRISK_COLLECTIVE_AGREEMENT_LOCATION : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor = new DolEditor('emplacementCC', $conf->global->DIGIRISKDOLIBARR_COLLECTIVE_AGREEMENT_LOCATION ? $conf->global->DIGIRISKDOLIBARR_COLLECTIVE_AGREEMENT_LOCATION : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor->Create();
print '</td></tr>';
print '</table>';
Expand Down
13 changes: 12 additions & 1 deletion admin/setup.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@

print '<tr class="oddeven"><td>';
print $langs->trans('DigiriskManagement');
print "</td><td>";
print '</td><td>';
print $langs->trans('DigiriskDescription');
print '</td>';

Expand All @@ -126,6 +126,17 @@
}
print '</td>';
print '</tr>';

//Use captcha
print '<tr class="oddeven"><td>';
print $langs->trans("UseCaptcha");
print '</td><td>';
print $langs->trans('UseCaptchaDescription');
print '</td>';
print '<td class="center">';
print ajax_constantonoff('DIGIRISKDOLIBARR_USE_CAPTCHA');
print '</td>';
print '</tr>';
print '</table>';

// Page end
Expand Down
22 changes: 11 additions & 11 deletions admin/socialconf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@
$electionDateDP = explode('/', $electionDateDP);
$electionDateDP = $electionDateDP[2] . '-' . $electionDateDP[1] . '-' . $electionDateDP[0];

dolibarr_set_const($db, "DIGIRISK_PARTICIPATION_AGREEMENT_INFORMATION_PROCEDURE", GETPOST("modalites", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISK_DEROGATION_SCHEDULE_PERMANENT", GETPOST("permanent", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISK_DEROGATION_SCHEDULE_OCCASIONAL", GETPOST("occasional", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISK_CSE_ELECTION_DATE", $electionDateCSE, 'date', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISK_DP_ELECTION_DATE", $electionDateDP, 'date', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISKDOLIBARR_PARTICIPATION_AGREEMENT_INFORMATION_PROCEDURE", GETPOST("modalites", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISKDOLIBARR_DEROGATION_SCHEDULE_PERMANENT", GETPOST("permanent", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISKDOLIBARR_DEROGATION_SCHEDULE_OCCASIONAL", GETPOST("occasional", 'none'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISKDOLIBARR_CSE_ELECTION_DATE", $electionDateCSE, 'date', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISKDOLIBARR_DP_ELECTION_DATE", $electionDateDP, 'date', 0, '', $conf->entity);

$CSEtitulaires = ! empty(GETPOST('TitularsCSE', 'array')) ? GETPOST('TitularsCSE', 'array') : (GETPOST('TitularsCSE', 'int') > 0 ? array(GETPOST('TitularsCSE', 'int')) : array());
$CSEsuppleants = ! empty(GETPOST('AlternatesCSE', 'array')) ? GETPOST('AlternatesCSE', 'array') : (GETPOST('AlternatesCSE', 'int') > 0 ? array(GETPOST('AlternatesCSE', 'int')) : array());
Expand Down Expand Up @@ -124,7 +124,7 @@
$counter = 0;

$socialResources = array("TitularsCSE", "AlternatesCSE", "TitularsDP", "AlternatesDP");
$socialConsts = array("DIGIRISK_PARTICIPATION_AGREEMENT_INFORMATION_PROCEDURE", "DIGIRISK_DEROGATION_SCHEDULE_PERMANENT", "DIGIRISK_DEROGATION_SCHEDULE_OCCASIONAL", "DIGIRISK_CSE_ELECTION_DATE", "DIGIRISK_DP_ELECTION_DATE");
$socialConsts = array("DIGIRISKDOLIBARR_PARTICIPATION_AGREEMENT_INFORMATION_PROCEDURE", "DIGIRISKDOLIBARR_DEROGATION_SCHEDULE_PERMANENT", "DIGIRISKDOLIBARR_DEROGATION_SCHEDULE_OCCASIONAL", "DIGIRISKDOLIBARR_CSE_ELECTION_DATE", "DIGIRISKDOLIBARR_DP_ELECTION_DATE");

$maxnumber = count($socialResources) + count($socialConsts);

Expand Down Expand Up @@ -152,8 +152,8 @@

$allLinks = $resources->digirisk_dolibarr_fetch_resources();

$electionDateCSE = $conf->global->DIGIRISK_CSE_ELECTION_DATE;
$electionDateDP = $conf->global->DIGIRISK_DP_ELECTION_DATE;
$electionDateCSE = $conf->global->DIGIRISKDOLIBARR_CSE_ELECTION_DATE;
$electionDateDP = $conf->global->DIGIRISKDOLIBARR_DP_ELECTION_DATE;

print '<span class="opacitymedium">' . $langs->trans("DigiriskMenu") . "</span><br>\n";
print "<br>";
Expand All @@ -179,7 +179,7 @@
// * Terms And Conditions - Modalités *

print '<tr class="oddeven"><td><label for="modalites">' . $langs->trans("TermsAndConditions") . '</label></td><td>';
$doleditor = new DolEditor('modalites', $conf->global->DIGIRISK_PARTICIPATION_AGREEMENT_INFORMATION_PROCEDURE ? $conf->global->DIGIRISK_PARTICIPATION_AGREEMENT_INFORMATION_PROCEDURE : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor = new DolEditor('modalites', $conf->global->DIGIRISKDOLIBARR_PARTICIPATION_AGREEMENT_INFORMATION_PROCEDURE ? $conf->global->DIGIRISKDOLIBARR_PARTICIPATION_AGREEMENT_INFORMATION_PROCEDURE : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor->Create();
print '</td></tr>';

Expand All @@ -194,14 +194,14 @@
// * Permanent - Permanentes *

print '<tr class="oddeven"><td><label for="permanent">' . $langs->trans("PermanentDerogation") . '</label></td><td>';
$doleditor = new DolEditor('permanent', $conf->global->DIGIRISK_DEROGATION_SCHEDULE_PERMANENT ? $conf->global->DIGIRISK_DEROGATION_SCHEDULE_PERMANENT : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor = new DolEditor('permanent', $conf->global->DIGIRISKDOLIBARR_DEROGATION_SCHEDULE_PERMANENT ? $conf->global->DIGIRISKDOLIBARR_DEROGATION_SCHEDULE_PERMANENT : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor->Create();
print '</td></tr>';

// * Permanent - Permanentes *

print '<tr class="oddeven"><td><label for="occasional">' . $langs->trans("OccasionalDerogation") . '</label></td><td>';
$doleditor = new DolEditor('occasional', $conf->global->DIGIRISK_DEROGATION_SCHEDULE_OCCASIONAL ? $conf->global->DIGIRISK_DEROGATION_SCHEDULE_OCCASIONAL : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor = new DolEditor('occasional', $conf->global->DIGIRISKDOLIBARR_DEROGATION_SCHEDULE_OCCASIONAL ? $conf->global->DIGIRISKDOLIBARR_DEROGATION_SCHEDULE_OCCASIONAL : '', '', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
$doleditor->Create();
print '</td></tr>';

Expand Down
13 changes: 0 additions & 13 deletions admin/ticket/ticket.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,19 +318,6 @@
print '</td>';
print '</tr>';

//Use captcha on create ticket paghe
print '<tr class="oddeven"><td>' . $langs->trans("UseCaptchaOnCreateTicketPage") . '</td>';
print '<td class="center">';
print ajax_constantonoff('DIGIRISKDOLIBARR_USE_CAPTCHA');
print '</td>';
print '<td class="center">';
print '';
print '</td>';
print '<td class="center">';
print '</td>';
print '</tr>';


//Email to send ticket submitted
print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
print '<input type="hidden" name="token" value="' . newToken() . '">';
Expand Down
6 changes: 3 additions & 3 deletions class/actions_digiriskdolibarr.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function printCommonFooter($parameters)
$form = new Form($db);
?>
<script>
IDCC_form = '<?php $formother->select_dictionary('DIGIRISK_COLLECTIVE_AGREEMENT_TITLE', 'c_conventions_collectives', 'code', 'libelle', $conf->global->DIGIRISK_COLLECTIVE_AGREEMENT_TITLE, 1);?>';
IDCC_form = '<?php $formother->select_dictionary('DIGIRISKDOLIBARR_COLLECTIVE_AGREEMENT_TITLE', 'c_conventions_collectives', 'code', 'libelle', $conf->global->DIGIRISKDOLIBARR_COLLECTIVE_AGREEMENT_TITLE, 1);?>';

let $tr = $('<tr class="oddeven"><td><label for="selectidcc_id"><?php print $form->textwithpicto($langs->trans('IDCC'), $langs->trans('IDCCTooltip'));?></label></td>');
$tr.append('<td>' + IDCC_form + '</td></tr>');
Expand All @@ -91,7 +91,7 @@ public function printCommonFooter($parameters)
</script>
<?php
}
print ajax_combobox('selectDIGIRISK_COLLECTIVE_AGREEMENT_TITLE');
print ajax_combobox('selectDIGIRISKDOLIBARR_COLLECTIVE_AGREEMENT_TITLE');
}

if (true) {
Expand All @@ -118,7 +118,7 @@ public function doActions($parameters, $action)
/* print_r($parameters); print_r($object); echo "action: " . $action; */
if ($parameters['currentcontext'] == 'admincompany') { // do something only for the context 'somecontext1' or 'somecontext2'
if ($action == 'updateedit' || $action == 'update') {
dolibarr_set_const($db, "DIGIRISK_COLLECTIVE_AGREEMENT_TITLE", GETPOST("DIGIRISK_COLLECTIVE_AGREEMENT_TITLE", 'nohtml'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "DIGIRISKDOLIBARR_COLLECTIVE_AGREEMENT_TITLE", GETPOST("DIGIRISKDOLIBARR_COLLECTIVE_AGREEMENT_TITLE", 'nohtml'), 'chaine', 0, '', $conf->entity);
}
}

Expand Down
6 changes: 3 additions & 3 deletions class/digiriskdocuments/firepermitdocument.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,9 @@ public function FirePermitDocumentFillJSON()
$json['FirePermit']['ref'] = $firepermit->ref;
$json['FirePermit']['label'] = $firepermit->label;

$json['FirePermit']['moyen_generaux_mis_disposition'] = $conf->global->DIGIRISK_GENERAL_MEANS;
$json['FirePermit']['consigne_generale'] = $conf->global->DIGIRISK_GENERAL_RULES;
$json['FirePermit']['premiers_secours'] = $conf->global->DIGIRISK_FIRST_AID;
$json['FirePermit']['moyen_generaux_mis_disposition'] = $conf->global->DIGIRISKDOLIBARR_GENERAL_MEANS;
$json['FirePermit']['consigne_generale'] = $conf->global->DIGIRISKDOLIBARR_GENERAL_RULES;
$json['FirePermit']['premiers_secours'] = $conf->global->DIGIRISKDOLIBARR_FIRST_AID;

$json['FirePermit']['date']['start'] = $firepermit->date_start;
$json['FirePermit']['date']['end'] = $firepermit->date_end;
Expand Down
4 changes: 2 additions & 2 deletions class/digiriskdocuments/informationssharing.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public function InformationsSharingFillJSON($object) {
// *** JSON FILLING ***
if (!empty ($digirisk_resources)) {

$json['InformationsSharing']['delegues_du_personnels_date'] = $conf->global->DIGIRISK_DP_ELECTION_DATE;
$json['InformationsSharing']['delegues_du_personnels_date'] = $conf->global->DIGIRISKDOLIBARR_DP_ELECTION_DATE;
$json['InformationsSharing']['delegues_du_personnels_titulaires'] = '';

if (!empty ($digirisk_resources['TitularsDP']->id )) {
Expand Down Expand Up @@ -153,7 +153,7 @@ public function InformationsSharingFillJSON($object) {
}

// CSE
$json['InformationsSharing']['membres_du_comite_entreprise_date'] = $conf->global->DIGIRISK_CSE_ELECTION_DATE;
$json['InformationsSharing']['membres_du_comite_entreprise_date'] = $conf->global->DIGIRISKDOLIBARR_CSE_ELECTION_DATE;


$json['InformationsSharing']['membres_du_comite_entreprise_titulaires'] = '';
Expand Down
Loading

0 comments on commit 3136921

Please sign in to comment.